diff --git a/smartwatchmaplibrary/CHANGELOG.md b/smartwatchmaplibrary/CHANGELOG.md new file mode 100644 index 0000000000000000000000000000000000000000..0b643496d9f5507110c0bb1fa2bf9ecbee481a8b --- /dev/null +++ b/smartwatchmaplibrary/CHANGELOG.md @@ -0,0 +1,6 @@ +# 版本记录 +## 1.0.0（2025.07.11） + +--- +### Initial +- 初始版本 \ No newline at end of file diff --git a/smartwatchmaplibrary/Index.ets b/smartwatchmaplibrary/Index.ets index 16da773df81355ed7aef21656c1e64a5c37ea1a0..4505e531b832c3cd5d12a35ee302cf1c173d6e59 100644 --- a/smartwatchmaplibrary/Index.ets +++ b/smartwatchmaplibrary/Index.ets @@ -1 +1 @@ -export { SmartWatchMap } from './src/main/ets/pages/SmartWatchMap'; +export { SmartWatchMapComponent } from './src/main/ets/component/SmartWatchMapComponent'; diff --git a/smartwatchmaplibrary/LICENSE b/smartwatchmaplibrary/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..b14c5d1cb97a99722c557b121ae2429fd8204b50 --- /dev/null +++ b/smartwatchmaplibrary/LICENSE @@ -0,0 +1,78 @@ + Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +Apache License, Version 2.0 +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. + +Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. + +Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. + +You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: +1.You must give any other recipients of the Work or Derivative Works a copy of this License; and +2.You must cause any modified files to carry prominent notices stating that You changed the files; and +3.You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and +4.If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + +You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. + +Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. + +This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. + +Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. + +In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. + +While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/smartwatchmaplibrary/README.md b/smartwatchmaplibrary/README.md new file mode 100644 index 0000000000000000000000000000000000000000..7bbb6d38fcbe9f57d9080213e5ccee8b38b637ce --- /dev/null +++ b/smartwatchmaplibrary/README.md @@ -0,0 +1,39 @@ +## 实现智能手表上的地图应用 + +### 介绍 + +本示例使用Map Kit的基本能力，实现了智能手表上查看地图并实现定位的功能，指导开发者在穿戴设备上适配地图。 + +### 下载安装 + +使用ohpm安装依赖 + +```shell +ohpm install @ohos_samples/smartwatchmaplibrary +``` + +或者按需在模块中修改oh-package.json5 + +```json5 +{ + "dependencies": { + "@ohos_samples/smartwatchmaplibrary": "^1.0.0" + } +} +``` + +### 使用说明 + +```typescript +import { SmartWatchMapComponent } from '@ohos_samples/smartwatchmaplibrary'; +``` + +按需在文件中使用导出模块即可，其中SmartWatchMapComponent是整个sample的入口页面。进入主页，授予应用获取位置权限；点击定位按钮，地图视图移动至当前位置；点击返回按钮，可以将应用切至后台。示例如下： + +```typescript +// Page.ets +import { SmartWatchMapComponent } from '@ohos_samples/smartwatchmaplibrary'; +Column() { + SmartWatchMapComponent() +} +``` \ No newline at end of file diff --git a/smartwatchmaplibrary/oh-package.json5 b/smartwatchmaplibrary/oh-package.json5 index d258415728f48995d1b4d62c7b76613c5fa57788..4c2a738a8a59079c6312af537d9a7645e59482d9 100644 --- a/smartwatchmaplibrary/oh-package.json5 +++ b/smartwatchmaplibrary/oh-package.json5 @@ -1,9 +1,10 @@ { - "name": "smartwatchmaplibrary", + "name": "@ohos_samples/smartwatchmaplibrary", "version": "1.0.0", - "description": "Please describe the basic information.", + "description": "This sample implements the function of viewing maps and positioning on a smart watch.", "main": "Index.ets", - "author": "", + "author": "@ohos_samples", "license": "Apache-2.0", + "repository": "https://gitee.com/harmonyos_samples/SmartWatchMap/tree/br_release_hmos/", "dependencies": {} } diff --git a/smartwatchmaplibrary/src/main/ets/common/utils/PermissionUtil.ets b/smartwatchmaplibrary/src/main/ets/common/utils/PermissionUtil.ets index 976db9fc84b02676d490d4fb2c997250501efb70..ea4e77a8eaf35587fd44c0edf8d3b83359b6cae7 100644 --- a/smartwatchmaplibrary/src/main/ets/common/utils/PermissionUtil.ets +++ b/smartwatchmaplibrary/src/main/ets/common/utils/PermissionUtil.ets @@ -39,9 +39,9 @@ export class PermissionUtil { return false; } - async requestPermissions(): Promise { + async requestPermissions(context: common.UIAbilityContext): Promise { let atManager: abilityAccessCtrl.AtManager = abilityAccessCtrl.createAtManager(); - atManager.requestPermissionsFromUser(getContext() as common.UIAbilityContext, + atManager.requestPermissionsFromUser(context, ['ohos.permission.LOCATION', 'ohos.permission.APPROXIMATELY_LOCATION']).then(() => { this.mapController?.setMyLocationEnabled(true); }).catch((err: BusinessError) => { diff --git a/smartwatchmaplibrary/src/main/ets/pages/SmartWatchMap.ets b/smartwatchmaplibrary/src/main/ets/component/SmartWatchMapComponent.ets similarity index 66% rename from smartwatchmaplibrary/src/main/ets/pages/SmartWatchMap.ets rename to smartwatchmaplibrary/src/main/ets/component/SmartWatchMapComponent.ets index 36a4edfeccfe0e3a246359c01354b436e614f2b9..f056e0b596a0e12c52d80f0508d03732b4650854 100644 --- a/smartwatchmaplibrary/src/main/ets/pages/SmartWatchMap.ets +++ b/smartwatchmaplibrary/src/main/ets/component/SmartWatchMapComponent.ets @@ -13,12 +13,13 @@ * limitations under the License. */ +import { common } from '@kit.AbilityKit'; import { AsyncCallback } from '@kit.BasicServicesKit'; import { MapComponent, mapCommon, map } from '@kit.MapKit'; import { PermissionUtil } from '../common/utils/PermissionUtil'; @Component -export struct SmartWatchMap { +export struct SmartWatchMapComponent { private mapOptions?: mapCommon.MapOptions; private callback?: AsyncCallback; private mapController?: map.MapComponentController; @@ -45,10 +46,12 @@ export struct SmartWatchMap { this.mapController = mapController; this.mapController.setMyLocationEnabled(true); mapController.setMyLocationStyle(this.style); - let util = new PermissionUtil(this.mapController); + const util = new PermissionUtil(this.mapController); util.checkPermissions().then((flag: Boolean) => { if (!flag) { - util.requestPermissions(); + const uiAbilityContext: common.UIAbilityContext = + this.getUIContext().getHostContext() as common.UIAbilityContext; + util.requestPermissions(uiAbilityContext); } }); } @@ -70,10 +73,29 @@ export struct SmartWatchMap { } build() { - Column() { + Stack({ alignContent: Alignment.TopStart }) { MapComponent({ mapOptions: this.mapOptions, mapCallback: this.callback }) .width('100%') .height('100%') + + Button({ type: ButtonType.Circle }) { + SymbolGlyph($r('sys.symbol.chevron_backward')) + .fontSize($r('app.float.backward_button_font_size')) + .width('100%') + .height('100%') + } + .backgroundColor(Color.White) + .width($r('app.float.backward_button_size')) + .height($r('app.float.backward_button_size')) + .margin({ + top: $r('sys.float.padding_level16'), + left: $r('sys.float.padding_level16'), + }) + .onClick(() => { + const uiAbilityContext: common.UIAbilityContext = + this.getUIContext().getHostContext() as common.UIAbilityContext; + uiAbilityContext.moveAbilityToBackground(); + }) } } } \ No newline at end of file diff --git a/smartwatchmapsample/oh-package.json5 b/smartwatchmapsample/oh-package.json5 index fbaad40ddd7d02645fb0eaef94dbcd9eef052124..1b53370101119431d01c0b48ff1a4e3be39718c1 100644 --- a/smartwatchmapsample/oh-package.json5 +++ b/smartwatchmapsample/oh-package.json5 @@ -6,6 +6,6 @@ "author": "", "license": "", "dependencies": { - "smartwatchmaplibrary": "file:../smartwatchmaplibrary" + "@ohos_samples/smartwatchmaplibrary": "file:../smartwatchmaplibrary" } } \ No newline at end of file diff --git a/smartwatchmapsample/src/main/ets/pages/Index.ets b/smartwatchmapsample/src/main/ets/pages/Index.ets index f3e0eaf44e79a30a936735c6202f6586de8732fa..a18b29f6be23b8be7c43430d16bd4e1e979883af 100644 --- a/smartwatchmapsample/src/main/ets/pages/Index.ets +++ b/smartwatchmapsample/src/main/ets/pages/Index.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { SmartWatchMap } from 'smartwatchmaplibrary'; +import { SmartWatchMapComponent } from '@ohos_samples/smartwatchmaplibrary'; @Entry @Component @@ -21,7 +21,7 @@ struct Index { build() { Column() { - SmartWatchMap() + SmartWatchMapComponent() } } } \ No newline at end of file diff --git a/smartwatchmapsample/src/main/resources/base/element/float.json b/smartwatchmapsample/src/main/resources/base/element/float.json new file mode 100644 index 0000000000000000000000000000000000000000..3626b2f5eae60a0b7454200089a4a237ea5e0375 --- /dev/null +++ b/smartwatchmapsample/src/main/resources/base/element/float.json @@ -0,0 +1,12 @@ +{ + "float": [ + { + "name": "backward_button_size", + "value": "40vp" + }, + { + "name": "backward_button_font_size", + "value": "24vp" + } + ] +} \ No newline at end of file