From fbf0a58412114700e5524c6ead33a2053a654b97 Mon Sep 17 00:00:00 2001 From: adslk Date: Thu, 25 Aug 2022 20:30:16 +0800 Subject: [PATCH] update IDE 992 Signed-off-by: adslk --- DFX/JsDotTest/.gitignore | 8 + DFX/JsDotTest/README_zh.md | 2 +- .../main/js/MainAbility/pages/index/index.hml | 18 +- DFX/JsDotTest/package.json | 6 +- FileManager/FileIo/.gitignore | 8 + FileManager/FileIo/README_zh.md | 2 +- .../src/main/ets/MainAbility/pages/Index.ets | 2 +- .../AdaptiveCapabilities/.gitignore | 8 + .../AdaptiveCapabilities/README_zh.md | 2 +- .../AdaptiveCapabilities/package.json | 6 +- .../JsAdaptiveCapabilities/.gitignore | 8 + .../JsAdaptiveCapabilities/README_zh.md | 2 +- .../JsAdaptiveCapabilities/entry/package.json | 24 +- .../JsAdaptiveCapabilities/package.json | 28 +- Network/UploadDownload/entry/package.json | 24 +- .../src/main/ets/MainAbility/pages/Index.ets | 22 +- .../src/main/ets/MainAbility/pages/Upload.ets | 11 +- Network/UploadDownload/package.json | 36 +- .../src/main/ets/MainAbility/pages/index.ets | 6 +- .../entry/src/main/ets/pages/Index.ets | 21 +- .../src/main/ets/MainAbility/pages/Index.ets | 6 +- .../src/main/ets/ServiceAbility/service.ts | 119 ++-- .../ets/MainAbility/component/ContactInfo.ets | 25 +- .../src/main/ets/Application/AbilityStage.ts | 6 +- .../src/main/ets/MainAbility/MainAbility.ts | 64 +- .../entry/src/main/ets/model/Logger.ts | 56 +- Telephony/MobileNetwork/package.json | 30 +- .../screenshots/device/index.png | Bin 38754 -> 26922 bytes UI/AtomicLayout/.gitignore | 8 + UI/AtomicLayout/README_zh.md | 2 +- .../entry/src/main/js/default/app.js | 12 +- .../src/main/js/default/pages/fixed/index.hml | 14 +- .../src/main/js/default/pages/fixed/index.js | 24 +- .../src/main/js/default/pages/hide/index.hml | 18 +- .../src/main/js/default/pages/hide/index.js | 18 +- .../src/main/js/default/pages/index/index.hml | 6 +- .../src/main/js/default/pages/index/index.js | 12 +- .../js/default/pages/percentage/index.hml | 18 +- .../main/js/default/pages/percentage/index.js | 18 +- UI/AtomicLayout/package.json | 6 +- UI/Badge/.gitignore | 8 + UI/Badge/README_zh.md | 2 +- UI/Badge/entry/src/main/js/default/app.js | 12 +- .../src/main/js/default/pages/index/index.css | 3 + .../src/main/js/default/pages/index/index.hml | 26 +- .../src/main/js/default/pages/index/index.js | 88 +-- UI/Badge/package.json | 6 +- UI/International/.gitignore | 8 + UI/International/README_zh.md | 2 +- .../entry/src/main/js/default/app.js | 12 +- .../entry/src/main/js/default/i18n/zh-CN.json | 1 - .../src/main/js/default/pages/index/index.hml | 16 +- .../src/main/js/default/pages/index/index.js | 50 +- UI/International/package.json | 6 +- UI/JSComponments/.gitignore | 8 + UI/JSComponments/README_zh.md | 2 +- .../entry/src/main/js/MainAbility/app.js | 12 +- .../main/js/MainAbility/pages/comp/comp.hml | 16 +- .../main/js/MainAbility/pages/comp/comp.js | 32 +- .../js/MainAbility/pages/details/details.hml | 8 +- .../js/MainAbility/pages/details/details.js | 12 +- .../main/js/MainAbility/pages/index/index.hml | 394 +++++------ .../main/js/MainAbility/pages/index/index.js | 202 +++--- UI/JSComponments/package.json | 6 +- .../src/main/js/default/pages/index/index.hml | 1 + UI/JsAdaptivePortalList/.gitignore | 8 + UI/JsAdaptivePortalList/README_zh.md | 2 +- .../entry/src/main/js/MainAbility/app.js | 12 +- .../js/MainAbility/common/template-tabbar.hml | 8 +- .../main/js/MainAbility/pages/index/index.hml | 100 +-- .../main/js/MainAbility/pages/index/index.js | 52 +- UI/JsAdaptivePortalList/package.json | 6 +- UI/JsAdaptivePortalPage/.gitignore | 8 + UI/JsAdaptivePortalPage/README_zh.md | 2 +- UI/JsAdaptivePortalPage/entry/package.json | 2 +- .../entry/src/main/js/MainAbility/app.js | 12 +- .../MainAbility/common/template-card-item.css | 2 +- .../MainAbility/common/template-card-item.hml | 14 +- .../common/template-group-header.hml | 14 +- .../js/MainAbility/common/template-tabbar.css | 2 + .../js/MainAbility/common/template-tabbar.hml | 8 +- .../main/js/MainAbility/pages/index/index.hml | 336 ++++----- .../main/js/MainAbility/pages/index/index.js | 72 +- UI/JsAdaptivePortalPage/package.json | 6 +- UI/JsAdaptiveServiceWidget/.gitignore | 8 + UI/JsAdaptiveServiceWidget/README_zh.md | 2 +- .../entry/src/main/js/FormAbility/Logger.js | 34 +- .../entry/src/main/js/FormAbility/form.js | 299 ++++---- .../entry/src/main/js/MainAbility/app.js | 27 +- .../main/js/MainAbility/pages/index/index.css | 2 +- .../main/js/MainAbility/pages/index/index.hml | 12 +- .../main/js/MainAbility/pages/index/index.js | 12 +- .../src/main/js/complex/pages/index/index.hml | 64 +- .../src/main/js/grid/pages/index/index.css | 1 + .../src/main/js/grid/pages/index/index.hml | 48 +- .../src/main/js/imgText/pages/index/index.hml | 28 +- .../main/js/immersive/pages/index/index.hml | 12 +- .../src/main/js/text/pages/index/index.hml | 18 +- UI/JsAdaptiveServiceWidget/package.json | 6 +- UI/JsAnimation/.gitignore | 8 + UI/JsAnimation/README_zh.md | 2 +- UI/JsAnimation/package.json | 6 +- UI/JsAnimationStyle/.gitignore | 8 + UI/JsAnimationStyle/README_zh.md | 2 +- .../entry/src/main/js/default/app.js | 12 +- .../compositeanimation/compositeanimation.css | 11 +- .../compositeanimation/compositeanimation.hml | 6 +- .../compositeanimation/compositeanimation.js | 7 +- .../default/pages/animation/index/index.css | 35 +- .../default/pages/animation/index/index.hml | 24 +- .../js/default/pages/animation/index/index.js | 46 +- .../default/pages/animation/rotate/rotate.css | 8 +- .../default/pages/animation/rotate/rotate.hml | 6 +- .../default/pages/animation/rotate/rotate.js | 7 +- .../default/pages/animation/scale/scale.css | 6 +- .../default/pages/animation/scale/scale.hml | 6 +- .../js/default/pages/animation/scale/scale.js | 7 +- .../pages/animation/translate/translate.css | 8 +- .../pages/animation/translate/translate.hml | 6 +- .../pages/animation/translate/translate.js | 7 +- .../js/default/pages/customfont/index.css | 20 +- .../js/default/pages/customfont/index.hml | 14 +- .../main/js/default/pages/customfont/index.js | 7 +- .../main/js/default/pages/gradient/index.css | 25 +- .../main/js/default/pages/gradient/index.hml | 24 +- .../main/js/default/pages/gradient/index.js | 7 +- .../src/main/js/default/pages/index/index.css | 1 + .../src/main/js/default/pages/index/index.hml | 8 +- .../src/main/js/default/pages/index/index.js | 46 +- .../cardtargetpage/cardtargetpage.css | 1 + .../cardtargetpage/cardtargetpage.hml | 6 +- .../cardtargetpage/cardtargetpage.js | 12 +- .../cardtransition/cardtransition.css | 2 + .../cardtransition/cardtransition.hml | 18 +- .../transitions/customtarget/customtarget.css | 1 + .../transitions/customtarget/customtarget.hml | 6 +- .../transitions/customtarget/customtarget.js | 12 +- .../customtransition/customtransition.css | 1 + .../customtransition/customtransition.hml | 2 +- .../customtransition/customtransition.js | 16 +- .../default/pages/transitions/index/index.hml | 6 +- .../default/pages/transitions/index/index.js | 36 +- .../sharedelement/sharedelement.css | 6 +- .../sharedelement/sharedelement.hml | 3 +- .../sharedelement/sharedelement.js | 16 +- .../sharedtargetpage/sharedtargetpage.css | 6 +- .../sharedtargetpage/sharedtargetpage.hml | 3 +- .../sharedtargetpage/sharedtargetpage.js | 12 +- UI/JsAnimationStyle/package.json | 6 +- UI/JsAnimator/.gitignore | 8 + UI/JsAnimator/README_zh.md | 2 +- .../entry/src/main/js/MainAbility/app.js | 12 +- .../main/js/MainAbility/pages/index/index.css | 84 +-- UI/JsAnimator/package.json | 6 +- UI/JsBasicComponents/.gitignore | 8 + UI/JsBrightness/.gitignore | 8 + UI/JsBrightness/README_zh.md | 2 +- .../entry/src/main/js/default/app.js | 12 +- .../src/main/js/default/pages/index/index.hml | 12 +- .../src/main/js/default/pages/index/index.js | 18 +- UI/JsBrightness/package.json | 6 +- UI/JsCanvas/.gitignore | 8 + UI/JsCanvas/README_zh.md | 2 +- UI/JsCanvas/entry/src/main/js/default/app.js | 12 +- .../src/main/js/default/pages/index/index.hml | 47 +- .../src/main/js/default/pages/index/index.js | 224 +++--- UI/JsCanvas/package.json | 6 +- UI/JsDevice/.gitignore | 8 + UI/JsDevice/README_zh.md | 2 +- UI/JsDevice/entry/src/main/js/default/app.js | 12 +- .../src/main/js/default/common/common.css | 2 +- .../default/pages/batteryInfo/batteryInfo.hml | 20 +- .../default/pages/batteryInfo/batteryInfo.js | 148 ++-- .../default/pages/deviceInfo/deviceInfo.hml | 32 +- .../js/default/pages/deviceInfo/deviceInfo.js | 76 +- .../src/main/js/default/pages/index/index.css | 15 + .../src/main/js/default/pages/index/index.hml | 21 +- .../src/main/js/default/pages/index/index.js | 45 +- .../systemProperties/systemProperties.css | 1 + .../systemProperties/systemProperties.hml | 38 +- .../systemProperties/systemProperties.js | 204 +++--- UI/JsDevice/package.json | 6 +- UI/JsDialog/.gitignore | 8 + UI/JsDialog/README_zh.md | 2 +- UI/JsDialog/entry/src/main/js/default/app.js | 12 +- .../src/main/js/default/pages/index/index.hml | 110 +-- .../src/main/js/default/pages/index/index.js | 82 +-- UI/JsDialog/package.json | 6 +- UI/chart/.gitignore | 8 + UI/chart/README_zh.md | 2 +- UI/chart/entry/package.json | 2 +- UI/chart/entry/src/main/js/default/app.js | 12 +- .../src/main/js/default/pages/bar/index.css | 2 +- .../src/main/js/default/pages/bar/index.hml | 2 +- .../src/main/js/default/pages/bar/index.js | 60 +- .../src/main/js/default/pages/guage/index.css | 2 +- .../src/main/js/default/pages/guage/index.hml | 6 +- .../src/main/js/default/pages/index/index.hml | 12 +- .../src/main/js/default/pages/index/index.js | 12 +- .../src/main/js/default/pages/line/index.css | 2 +- .../src/main/js/default/pages/line/index.hml | 2 +- .../src/main/js/default/pages/line/index.js | 202 +++--- .../main/js/default/pages/loading/index.css | 2 +- .../main/js/default/pages/loading/index.hml | 2 +- .../main/js/default/pages/loading/index.js | 8 +- .../main/js/default/pages/progress/index.css | 2 +- .../main/js/default/pages/progress/index.hml | 2 +- .../main/js/default/pages/progress/index.js | 8 +- .../main/js/default/pages/rainbow/index.css | 2 +- .../main/js/default/pages/rainbow/index.hml | 44 +- .../main/js/default/pages/rainbow/index.js | 58 +- UI/chart/package.json | 6 +- ability/FormAbility/.gitignore | 8 + ability/FormAbility/README_zh.md | 2 +- .../entry/src/main/ets/FormAbility/form.ts | 252 +++---- .../entry/src/main/ets/model/Logger.ts | 38 +- .../src/main/js/widget/pages/index/index.hml | 18 +- ability/FormAbility/package.json | 6 +- ability/FormExtAbility/.gitignore | 8 + ability/FormExtAbility/README_zh.md | 2 +- .../src/main/ets/Application/AbilityStage.ts | 6 +- .../src/main/ets/FormAbility/FormAbility.ts | 270 +++---- .../src/main/ets/MainAbility/MainAbility.ts | 60 +- .../entry/src/main/ets/model/Logger.ts | 38 +- .../src/main/js/widget/pages/index/index.hml | 18 +- ability/FormExtAbility/package.json | 6 +- ability/FormLauncher/.gitignore | 8 + ability/FormLauncher/README_zh.md | 2 +- ability/FormLauncher/entry/package.json | 16 +- .../entry/src/main/ets/model/Logger.ts | 38 +- ability/FormLauncher/package.json | 22 +- ability/JsDistributedMusicPlayer/.gitignore | 8 + ability/JsDistributedMusicPlayer/README_zh.md | 2 +- .../entry/src/main/js/MainAbility/app.js | 12 +- .../main/js/MainAbility/model/KvStoreModel.js | 172 ++--- .../js/MainAbility/model/RemoteDeviceModel.js | 298 ++++---- .../main/js/MainAbility/pages/index/index.hml | 84 +-- .../main/js/MainAbility/pages/index/index.js | 660 +++++++++--------- common/AirQuality/.gitignore | 8 + common/AirQuality/README_zh.md | 2 +- .../entry/src/main/js/default/app.js | 12 +- .../src/main/js/default/pages/index/index.css | 8 +- .../src/main/js/default/pages/index/index.hml | 208 +++--- .../src/main/js/default/pages/index/index.js | 150 ++-- .../main/js/default/pages/second/second.hml | 262 +++---- .../main/js/default/pages/second/second.js | 24 +- common/AirQuality/package.json | 6 +- common/Clock/.gitignore | 8 + common/Clock/README_zh.md | 2 +- common/Clock/entry/src/main/js/default/app.js | 12 +- .../src/main/js/default/pages/index/index.hml | 20 +- .../src/main/js/default/pages/index/index.js | 54 +- common/Clock/package.json | 6 +- common/DistributeCalc/.gitignore | 8 + common/DistributeCalc/README_zh.md | 2 +- .../entry/src/main/js/MainAbility/app.js | 12 +- .../MainAbility/common/RemoteDeviceModel.js | 302 ++++---- .../main/js/MainAbility/common/calculator.js | 236 +++---- .../js/MainAbility/common/kvstoreModel.js | 145 ++-- .../main/js/MainAbility/pages/index/index.hml | 188 ++--- .../main/js/MainAbility/pages/index/index.js | 502 ++++++------- common/ECG/.gitignore | 8 + common/ECG/README_zh.md | 2 +- common/ECG/entry/src/main/js/default/app.js | 12 +- .../src/main/js/default/pages/index/index.css | 8 + .../src/main/js/default/pages/index/index.hml | 38 +- .../src/main/js/default/pages/index/index.js | 376 +++++----- common/ECG/package.json | 6 +- common/Flashlight/.gitignore | 8 + common/Flashlight/README_zh.md | 2 +- .../entry/src/main/js/default/app.js | 12 +- .../src/main/js/default/pages/index/index.hml | 10 +- .../src/main/js/default/pages/index/index.js | 75 +- common/Flashlight/package.json | 8 +- .../ets/MainAbility/common/lockSwitch.ets | 2 +- .../src/main/ets/MainAbility/pages/index.ets | 2 +- data/DDMQuery/.gitignore | 8 + data/DDMQuery/README_zh.md | 2 +- .../src/main/ets/MainAbility/pages/Index.ets | 3 +- data/DDMQuery/package.json | 6 +- device/Bluetooth/README_zh.md | 2 +- device/Browser/AppScope/app.json5 | 2 +- .../src/main/resources/rawfile/favicon.ico | Bin 4286 -> 0 bytes device/DeviceManager/.gitignore | 8 + device/DeviceManager/README_zh.md | 2 +- .../entry/src/main/ets/pages/Index.ets | 4 +- media/JsAudioPlayer/.gitignore | 8 + media/JsAudioPlayer/README_zh.md | 2 +- .../entry/src/main/js/default/app.js | 12 +- .../src/main/js/default/common/PlayerModel.js | 428 ++++++------ .../src/main/js/default/pages/index/index.hml | 72 +- .../src/main/js/default/pages/index/index.js | 178 ++--- media/JsAudioPlayer/package.json | 6 +- 293 files changed, 5591 insertions(+), 5168 deletions(-) create mode 100644 DFX/JsDotTest/.gitignore create mode 100644 FileManager/FileIo/.gitignore create mode 100644 MultiDeviceAppDev/AdaptiveCapabilities/.gitignore create mode 100644 MultiDeviceAppDev/JsAdaptiveCapabilities/.gitignore create mode 100644 UI/AtomicLayout/.gitignore create mode 100644 UI/Badge/.gitignore create mode 100644 UI/International/.gitignore create mode 100644 UI/JSComponments/.gitignore create mode 100644 UI/JsAdaptivePortalList/.gitignore create mode 100644 UI/JsAdaptivePortalPage/.gitignore create mode 100644 UI/JsAdaptiveServiceWidget/.gitignore create mode 100644 UI/JsAnimation/.gitignore create mode 100644 UI/JsAnimationStyle/.gitignore create mode 100644 UI/JsAnimator/.gitignore create mode 100644 UI/JsBasicComponents/.gitignore create mode 100644 UI/JsBrightness/.gitignore create mode 100644 UI/JsCanvas/.gitignore create mode 100644 UI/JsDevice/.gitignore create mode 100644 UI/JsDialog/.gitignore create mode 100644 UI/chart/.gitignore create mode 100644 ability/FormAbility/.gitignore create mode 100644 ability/FormExtAbility/.gitignore create mode 100644 ability/FormLauncher/.gitignore create mode 100644 ability/JsDistributedMusicPlayer/.gitignore create mode 100644 common/AirQuality/.gitignore create mode 100644 common/Clock/.gitignore create mode 100644 common/DistributeCalc/.gitignore create mode 100644 common/ECG/.gitignore create mode 100644 common/Flashlight/.gitignore create mode 100644 data/DDMQuery/.gitignore delete mode 100644 device/Browser/entry/src/main/resources/rawfile/favicon.ico create mode 100644 device/DeviceManager/.gitignore create mode 100644 media/JsAudioPlayer/.gitignore diff --git a/DFX/JsDotTest/.gitignore b/DFX/JsDotTest/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/DFX/JsDotTest/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/DFX/JsDotTest/README_zh.md b/DFX/JsDotTest/README_zh.md index b63a7108d..11fb27fd2 100644 --- a/DFX/JsDotTest/README_zh.md +++ b/DFX/JsDotTest/README_zh.md @@ -32,4 +32,4 @@ 2.性能打点验证只能通过上述命令获取日志来进行验证。 -3.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 \ No newline at end of file +3.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 \ No newline at end of file diff --git a/DFX/JsDotTest/entry/src/main/js/MainAbility/pages/index/index.hml b/DFX/JsDotTest/entry/src/main/js/MainAbility/pages/index/index.hml index c30232738..d99877171 100644 --- a/DFX/JsDotTest/entry/src/main/js/MainAbility/pages/index/index.hml +++ b/DFX/JsDotTest/entry/src/main/js/MainAbility/pages/index/index.hml @@ -14,14 +14,14 @@ -->
- {{ $t('strings.appName') }} - {{ this.Text }} -
- -
-
- {{ $t('strings.disable') }} - -
+ {{ $t('strings.appName') }} + {{ this.Text }} +
+ +
+
+ {{ $t('strings.disable') }} + +
diff --git a/DFX/JsDotTest/package.json b/DFX/JsDotTest/package.json index 890101f4d..511a79fe1 100644 --- a/DFX/JsDotTest/package.json +++ b/DFX/JsDotTest/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } diff --git a/FileManager/FileIo/.gitignore b/FileManager/FileIo/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/FileManager/FileIo/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/FileManager/FileIo/README_zh.md b/FileManager/FileIo/README_zh.md index 04425af9a..000ea8c45 100644 --- a/FileManager/FileIo/README_zh.md +++ b/FileManager/FileIo/README_zh.md @@ -30,4 +30,4 @@ 1.本示例仅支持在标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 \ No newline at end of file +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 \ No newline at end of file diff --git a/FileManager/FileIo/entry/src/main/ets/MainAbility/pages/Index.ets b/FileManager/FileIo/entry/src/main/ets/MainAbility/pages/Index.ets index 0faf3eadb..107df277e 100644 --- a/FileManager/FileIo/entry/src/main/ets/MainAbility/pages/Index.ets +++ b/FileManager/FileIo/entry/src/main/ets/MainAbility/pages/Index.ets @@ -39,7 +39,7 @@ struct Index { $r('app.string.read_fileIo'), $r('app.string.delete_fileIo') ] - private stream: fileIo.Stream + private stream: fileIo.Stream create_fileIo() { this.result = path + '/xxx.txt' diff --git a/MultiDeviceAppDev/AdaptiveCapabilities/.gitignore b/MultiDeviceAppDev/AdaptiveCapabilities/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/MultiDeviceAppDev/AdaptiveCapabilities/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/MultiDeviceAppDev/AdaptiveCapabilities/README_zh.md b/MultiDeviceAppDev/AdaptiveCapabilities/README_zh.md index 8d55bbac2..649f0f45f 100644 --- a/MultiDeviceAppDev/AdaptiveCapabilities/README_zh.md +++ b/MultiDeviceAppDev/AdaptiveCapabilities/README_zh.md @@ -32,6 +32,6 @@ 2.本示例为Stage模型，从API version 9开始支持。 -3.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 +3.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 4.本示例着重介绍了一多的自适应布局能力，未引入断点能力，建议查看相关能力在IDE提供的MatePadPro预览器中运行和查看效果。 \ No newline at end of file diff --git a/MultiDeviceAppDev/AdaptiveCapabilities/package.json b/MultiDeviceAppDev/AdaptiveCapabilities/package.json index fcad2c1b2..5e5384cfd 100644 --- a/MultiDeviceAppDev/AdaptiveCapabilities/package.json +++ b/MultiDeviceAppDev/AdaptiveCapabilities/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } diff --git a/MultiDeviceAppDev/JsAdaptiveCapabilities/.gitignore b/MultiDeviceAppDev/JsAdaptiveCapabilities/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/MultiDeviceAppDev/JsAdaptiveCapabilities/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/MultiDeviceAppDev/JsAdaptiveCapabilities/README_zh.md b/MultiDeviceAppDev/JsAdaptiveCapabilities/README_zh.md index 5569177a6..4fb766f0c 100644 --- a/MultiDeviceAppDev/JsAdaptiveCapabilities/README_zh.md +++ b/MultiDeviceAppDev/JsAdaptiveCapabilities/README_zh.md @@ -36,6 +36,6 @@ 2.本示例为FA模型，从API version 8开始支持。 -3.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 +3.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 4.本示例着重介绍了一多的自适应布局能力，未引入断点能力，建议查看相关能力在IDE提供的MatePadPro预览器中运行和查看效果。 \ No newline at end of file diff --git a/MultiDeviceAppDev/JsAdaptiveCapabilities/entry/package.json b/MultiDeviceAppDev/JsAdaptiveCapabilities/entry/package.json index 992c771b9..db08bbf9d 100644 --- a/MultiDeviceAppDev/JsAdaptiveCapabilities/entry/package.json +++ b/MultiDeviceAppDev/JsAdaptiveCapabilities/entry/package.json @@ -1,14 +1,14 @@ { - "license":"ISC", - "devDependencies":{}, - "name":"entry", - "ohos":{ - "org":"huawei", - "directoryLevel":"module", - "buildTool":"hvigor" - }, - "description":"example description", - "repository":{}, - "version":"1.0.0", - "dependencies":{} + "license": "ISC", + "devDependencies": {}, + "name": "entry", + "ohos": { + "org": "huawei", + "directoryLevel": "module", + "buildTool": "hvigor" + }, + "description": "example description", + "repository": {}, + "version": "1.0.0", + "dependencies": {} } \ No newline at end of file diff --git a/MultiDeviceAppDev/JsAdaptiveCapabilities/package.json b/MultiDeviceAppDev/JsAdaptiveCapabilities/package.json index 95bb76461..8a465e39e 100644 --- a/MultiDeviceAppDev/JsAdaptiveCapabilities/package.json +++ b/MultiDeviceAppDev/JsAdaptiveCapabilities/package.json @@ -1,18 +1,18 @@ { - "license":"ISC", - "devDependencies":{}, - "name":"jsadaptivecapabilities", - "ohos":{ - "org":"huawei", - "directoryLevel":"project", - "buildTool":"hvigor" + "license": "ISC", + "devDependencies": {}, + "name": "jsadaptivecapabilities", + "ohos": { + "org": "huawei", + "directoryLevel": "project", + "buildTool": "hvigor" }, - "description":"example description", - "repository":{}, - "version":"1.0.0", - "dependencies":{ - "@ohos/hypium":"1.0.1", - "@ohos/hvigor-ohos-plugin":"1.1.6", - "@ohos/hvigor":"1.1.6" + "description": "example description", + "repository": {}, + "version": "1.0.0", + "dependencies": { + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } \ No newline at end of file diff --git a/Network/UploadDownload/entry/package.json b/Network/UploadDownload/entry/package.json index 29732ffea..c7685ac4e 100644 --- a/Network/UploadDownload/entry/package.json +++ b/Network/UploadDownload/entry/package.json @@ -1,14 +1,14 @@ { - "license": "ISC", - "devDependencies": {}, - "name": "entry", - "ohos": { - "org": "huawei", - "directoryLevel": "module", - "buildTool": "hvigor" - }, - "description": "example description", - "repository": {}, - "version": "1.0.0", - "dependencies": {} + "license": "ISC", + "devDependencies": {}, + "name": "entry", + "ohos": { + "org": "huawei", + "directoryLevel": "module", + "buildTool": "hvigor" + }, + "description": "example description", + "repository": {}, + "version": "1.0.0", + "dependencies": {} } diff --git a/Network/UploadDownload/entry/src/main/ets/MainAbility/pages/Index.ets b/Network/UploadDownload/entry/src/main/ets/MainAbility/pages/Index.ets index 5734a8b41..c3680b819 100644 --- a/Network/UploadDownload/entry/src/main/ets/MainAbility/pages/Index.ets +++ b/Network/UploadDownload/entry/src/main/ets/MainAbility/pages/Index.ets @@ -19,7 +19,6 @@ import resourceManager from '@ohos.resourceManager' import featureAbility from '@ohos.ability.featureAbility' import logger from '../model/Logger' import { TitleBar } from '../common/TitleBar' -import { UploadDownSource } from "../model/DataSource" const TAG: string = 'Index' @@ -29,8 +28,8 @@ struct Index { @State receivedSize: number = 0 @State totalSize: number = 0 @State message: string = '' - @State files: UploadDownSource = new UploadDownSource([]) - @State uploads: UploadDownSource = new UploadDownSource([]) + @State files: Array = [] + @State uploads: Array = [] private downloadConfig = { url: '', filePath: '' @@ -65,10 +64,10 @@ struct Index { let splitFiles = tempFiles[i].split('//')[1].split('/') logger.info(TAG, `splitFiles = ${JSON.stringify(splitFiles)}`) if (splitFiles.indexOf('upload') === -1) { - this.files.pushData(tempFiles[i]) + this.files.push(tempFiles[i]) } } - logger.info(TAG, `files = ${JSON.stringify(this.files['uploadDownData'])}`) + logger.info(TAG, `files = ${JSON.stringify(this.files)}`) } else { logger.info(TAG, `error: ${JSON.stringify(err)}`) httpRequest.destroy() @@ -85,7 +84,7 @@ struct Index { .fontSize(25) .alignSelf(ItemAlign.Start) .margin({ top: 20, left: 10 }) - LazyForEach(this.files, (item, index) => { + ForEach(this.files, (item, index) => { Divider() .margin({ top: 20 }) Row() { @@ -121,11 +120,8 @@ struct Index { }) downloadTask.on('complete', async () => { - await this.files['uploadDownData'].splice(index, 1) - await this.files.notifyDataReload() - await this.uploads['uploadDownData'].push(item) - await this.uploads.notifyDataReload() - + await this.files.splice(index, 1) + await this.uploads.push(item) AlertDialog.show({ message: `${item}${downloadSuccess}`, confirm: { @@ -161,7 +157,7 @@ struct Index { } .width('100%') - if (index === this.files['uploadDownData'].length - 1) { + if (index === this.files.length - 1) { Divider() .margin({ top: 20 }) } @@ -182,7 +178,7 @@ struct Index { } .constraintSize({ maxHeight: '87%' }) - if (this.receivedSize !== 0 && this.totalSize !== 0 && this.files['uploadDownData'].length > 0) { + if (this.receivedSize !== 0 && this.totalSize !== 0 && this.files.length > 0) { Row() { Text($r('app.string.download_progress')) .fontSize(25) diff --git a/Network/UploadDownload/entry/src/main/ets/MainAbility/pages/Upload.ets b/Network/UploadDownload/entry/src/main/ets/MainAbility/pages/Upload.ets index 80bc2f5e7..90cbf8277 100644 --- a/Network/UploadDownload/entry/src/main/ets/MainAbility/pages/Upload.ets +++ b/Network/UploadDownload/entry/src/main/ets/MainAbility/pages/Upload.ets @@ -17,9 +17,8 @@ import request from '@ohos.request' import logger from '../model/Logger' import { TitleBar } from '../common/TitleBar' import { UploadFile } from '../model/UploadFile' -import { UploadConfigs } from '../model/UploadConfigs' +import { UploadConfigs } from '../model/UploadConfigs' import { UploadRequestData } from '../model/UploadRequestData' -import { UploadDownSource } from "../model/DataSource" const TAG: string = 'Upload' @@ -30,7 +29,7 @@ struct Upload { private uploadConfig: UploadConfigs = new UploadConfigs() @State uploadedSize: number = 0 @State totalSize: number = 0 - @State uploads: UploadDownSource = router.getParams()['uploads'] + @State uploads: Array = router.getParams()['uploads'] @State isDialog: boolean = false @State selectIndex: number = -1 handlerClickButton = () => { @@ -46,7 +45,7 @@ struct Upload { .fontSize(25) .alignSelf(ItemAlign.Start) .margin({ top: 20, left: 10 }) - LazyForEach(this.uploads, (item, index) => { + ForEach(this.uploads, (item, index) => { Divider() .margin({ top: 20 }) Row() { @@ -121,7 +120,7 @@ struct Upload { .width('100%') .margin({ top: 10, left: 10 }) - if (index === this.uploads['uploadDownData'].length - 1) { + if (index === this.uploads.length - 1) { Divider() .margin({ top: 20 }) } @@ -131,7 +130,7 @@ struct Upload { } .constraintSize({ maxHeight: '87%' }) - if (this.uploadedSize !== 0 && this.totalSize !== 0 && this.uploads['uploadDownData'].length > 0) { + if (this.uploadedSize !== 0 && this.totalSize !== 0 && this.uploads.length > 0) { Row() { Text($r('app.string.upload_progress')) .fontSize(25) diff --git a/Network/UploadDownload/package.json b/Network/UploadDownload/package.json index 7f69c1ec1..b8ef18e85 100644 --- a/Network/UploadDownload/package.json +++ b/Network/UploadDownload/package.json @@ -1,19 +1,19 @@ { - "license": "ISC", - "devDependencies": {}, - "name": "uploaddownload", - "ohos": { - "org": "huawei", - "directoryLevel": "project", - "buildTool": "hvigor" - }, - "description": "example description", - "repository": {}, - "version": "1.0.0", - "dependencies": { - "@ohos/hvigor-ohos-plugin": "1.1.6", - "hypium": "^1.0.0", - "@ohos/hvigor": "1.1.6", - "@ohos/hypium": "1.0.1" - } -} + "license":"ISC", + "devDependencies":{}, + "name":"uploaddownload", + "ohos":{ + "org":"huawei", + "directoryLevel":"project", + "buildTool":"hvigor" + }, + "description":"example description", + "repository":{}, + "version":"1.0.0", + "dependencies":{ + "@ohos/hypium":"1.0.1", + "@ohos/hvigor-ohos-plugin":"1.1.6", + "hypium":"^1.0.0", + "@ohos/hvigor":"1.1.6" + } +} \ No newline at end of file diff --git a/Notification/CommonEvent/entry/src/main/ets/MainAbility/pages/index.ets b/Notification/CommonEvent/entry/src/main/ets/MainAbility/pages/index.ets index e21e886ff..9a0fccfc2 100644 --- a/Notification/CommonEvent/entry/src/main/ets/MainAbility/pages/index.ets +++ b/Notification/CommonEvent/entry/src/main/ets/MainAbility/pages/index.ets @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {PublishEventView} from '../common/publishEvent' -import {SubscribeEventView} from '../common/subscribeEvent' +import { PublishEventView } from '../common/publishEvent' +import { SubscribeEventView } from '../common/subscribeEvent' @Entry @Component @@ -36,7 +36,7 @@ struct Index { Line() .width("100%").height(2) .backgroundColor("#D5D5D5") - .margin({ top: 15}) + .margin({ top: 15 }) PublishEventView() diff --git a/Preset/DistributedMusicPlayer/entry/src/main/ets/pages/Index.ets b/Preset/DistributedMusicPlayer/entry/src/main/ets/pages/Index.ets index 61b90a855..f697bd104 100644 --- a/Preset/DistributedMusicPlayer/entry/src/main/ets/pages/Index.ets +++ b/Preset/DistributedMusicPlayer/entry/src/main/ets/pages/Index.ets @@ -203,13 +203,24 @@ struct Index { } getShownTimer(ms) { - let seconds = Math.floor(ms / ONE_THOUSAND) - let sec = seconds % SIXTY let minStr: string let secStr: string + let seconds = Math.floor(ms / ONE_THOUSAND) + let sec = seconds % SIXTY + Logger.info(TAG, `getShownTimer sec = ${sec}`) let min = (seconds - sec) / SIXTY - sec < 10 ? secStr = '0' + sec : '' + sec - min < 10 ? minStr = '0' + min : '' + min + Logger.info(TAG, `getShownTimer min = ${min}`) + if (sec < 10) { + secStr = '0' + sec + } else { + secStr = sec.toString(10) + } + if (min < 10) { + minStr = '0' + min + } else { + minStr = min.toString(10) + } + Logger.warn(TAG, `getShownTimer = ${minStr}:${secStr}`) return minStr + ':' + secStr } @@ -287,7 +298,7 @@ struct Index { PlayerModel.pause() this.imageArrays[2] = $r('app.media.ic_play') } else { - PlayerModel.preLoad(0, () => { + PlayerModel.preLoad(PlayerModel.index, () => { PlayerModel.play(-1, true) this.imageArrays[2] = $r('app.media.ic_pause') }) diff --git a/ResourcesSchedule/BackgroundTaskManager/entry/src/main/ets/MainAbility/pages/Index.ets b/ResourcesSchedule/BackgroundTaskManager/entry/src/main/ets/MainAbility/pages/Index.ets index c6a77d567..b55969d04 100644 --- a/ResourcesSchedule/BackgroundTaskManager/entry/src/main/ets/MainAbility/pages/Index.ets +++ b/ResourcesSchedule/BackgroundTaskManager/entry/src/main/ets/MainAbility/pages/Index.ets @@ -39,18 +39,18 @@ struct Index { Image($r('app.media.file')) .width('100%') .height('30%') - .margin({top:30}) + .margin({ top: 30 }) .objectFit(ImageFit.Contain) Text($r('app.string.fileName')) .fontSize(30) Button() { Text($r('app.string.download')) - .fontSize(20) + .fontSize(20) } .margin({ top: 60 }) .type(ButtonType.Capsule) .backgroundColor('#0D9FFB') - .size({width:'60%'}) + .size({ width: '60%' }) .onClick(() => { Logger.info(TAG, 'ServiceAbility Start') startServiceAbility() diff --git a/ResourcesSchedule/BackgroundTaskManager/entry/src/main/ets/ServiceAbility/service.ts b/ResourcesSchedule/BackgroundTaskManager/entry/src/main/ets/ServiceAbility/service.ts index 6598759f1..df9c3d6c1 100644 --- a/ResourcesSchedule/BackgroundTaskManager/entry/src/main/ets/ServiceAbility/service.ts +++ b/ResourcesSchedule/BackgroundTaskManager/entry/src/main/ets/ServiceAbility/service.ts @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * 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. + */ + import wantAgent from '@ohos.wantAgent' import backgroundTaskManager from '@ohos.backgroundTaskManager' import featureAbility from '@ohos.ability.featureAbility' @@ -9,67 +24,67 @@ let num: number = 0 let timerID: number = 0 let notificationRequest = { - content: { - contentType: Notification.ContentType.NOTIFICATION_CONTENT_BASIC_TEXT, - normal: { - title: '文件名', - text: '' - } - }, - id: 1 + content: { + contentType: Notification.ContentType.NOTIFICATION_CONTENT_BASIC_TEXT, + normal: { + title: '文件名', + text: '' + } + }, + id: 1 } function callback(err, data) { - if (err) { - Logger.error(TAG, `Operation failed Cause: ${err}`) - return - } - if (timerID !== 0) { - clearInterval(timerID) + if (err) { + Logger.error(TAG, `Operation failed Cause: ${err}`) + return + } + if (timerID !== 0) { + clearInterval(timerID) + } + Logger.info(TAG, `Operation startBackgroundRunning succeeded`) + timerID = setInterval(() => { + notificationRequest.content.normal.text = `${num}%` + Notification.publish(notificationRequest).then(() => { + Logger.info(TAG, `==========================>publishCallback=======================>`); + }) + num += 5 + if (num > 20) { + clearInterval(timerID) } - Logger.info(TAG, `Operation startBackgroundRunning succeeded`) - timerID = setInterval(() => { - notificationRequest.content.normal.text = `${num}%` - Notification.publish(notificationRequest).then(() => { - Logger.info(TAG, `==========================>publishCallback=======================>`); - }) - num += 5 - if (num > 20) { - clearInterval(timerID) - } - }, 5000) + }, 5000) } function startContinuousTask() { - Logger.info(TAG, `startBackground use new api`) - let wantAgentInfo = { - wants: [ - { - bundleName: "ohos.samples.backgroundtaskmanager", - abilityName: "ohos.samples.backgroundtaskmanager.MainAbility" - } - ], - operationType: wantAgent.OperationType.START_ABILITIES, - requestCode: 0, - wantAgentFlags: [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] - }; + Logger.info(TAG, `startBackground use new api`) + let wantAgentInfo = { + wants: [ + { + bundleName: "ohos.samples.backgroundtaskmanager", + abilityName: "ohos.samples.backgroundtaskmanager.MainAbility" + } + ], + operationType: wantAgent.OperationType.START_ABILITIES, + requestCode: 0, + wantAgentFlags: [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] + }; - wantAgent.getWantAgent(wantAgentInfo).then((data) => { - Logger.info(TAG, `startBackground begin`) - backgroundTaskManager.startBackgroundRunning(featureAbility.getContext(), backgroundTaskManager.BackgroundMode.DATA_TRANSFER, data, callback) - }) + wantAgent.getWantAgent(wantAgentInfo).then((data) => { + Logger.info(TAG, `startBackground begin`) + backgroundTaskManager.startBackgroundRunning(featureAbility.getContext(), backgroundTaskManager.BackgroundMode.DATA_TRANSFER, data, callback) + }) } export default { - onStart() { - Logger.info(TAG, 'ServiceAbility onStart') - startContinuousTask() - }, - onStop() { - Logger.info(TAG, 'ServiceAbility onStop') - backgroundTaskManager.stopBackgroundRunning(featureAbility.getContext()) - }, - onCommand(want, startId) { - Logger.info(TAG, 'ServiceAbility onCommand') - } + onStart() { + Logger.info(TAG, 'ServiceAbility onStart') + startContinuousTask() + }, + onStop() { + Logger.info(TAG, 'ServiceAbility onStop') + backgroundTaskManager.stopBackgroundRunning(featureAbility.getContext()) + }, + onCommand(want, startId) { + Logger.info(TAG, 'ServiceAbility onCommand') + } } \ No newline at end of file diff --git a/Telephony/Contact/entry/src/main/ets/MainAbility/component/ContactInfo.ets b/Telephony/Contact/entry/src/main/ets/MainAbility/component/ContactInfo.ets index 881d481f0..9bf188916 100644 --- a/Telephony/Contact/entry/src/main/ets/MainAbility/component/ContactInfo.ets +++ b/Telephony/Contact/entry/src/main/ets/MainAbility/component/ContactInfo.ets @@ -15,6 +15,7 @@ import router from '@ohos.router' import contact from '@ohos.contact' +import resourceManager from '@ohos.resourceManager'; import Logger from '../data/Logger' const TAG: string = 'ContactInfo' @@ -22,9 +23,9 @@ const TAG: string = 'ContactInfo' @Preview @Component export struct ContactInfo { - @State phone: string | Resource = '' - @State email: string | Resource = '' - @State address: string | Resource = '' + @State phone: string = '' + @State email: string = '' + @State address: string = '' private contact: contact.Contact build() { @@ -185,17 +186,29 @@ export struct ContactInfo { try { this.phone = this.contact.phoneNumbers[0].phoneNumber } catch (err) { - this.phone = $r('app.string.not_fill') + resourceManager.getResourceManager((error, msg) => { + msg.getString($r('app.string.not_fill').id).then(value => { + this.phone = value + }) + }) } try { this.email = this.contact.emails[0].email } catch (err) { - this.email = $r('app.string.not_fill') + resourceManager.getResourceManager((error, msg) => { + msg.getString($r('app.string.not_fill').id).then(value => { + this.email = value + }) + }) } try { this.address = this.contact.postalAddresses[0].postalAddress } catch (err) { - this.address = $r('app.string.not_fill') + resourceManager.getResourceManager((error, msg) => { + msg.getString($r('app.string.not_fill').id).then(value => { + this.address = value + }) + }) } } } \ No newline at end of file diff --git a/Telephony/MobileNetwork/entry/src/main/ets/Application/AbilityStage.ts b/Telephony/MobileNetwork/entry/src/main/ets/Application/AbilityStage.ts index 809ccc5ab..6e24bab18 100644 --- a/Telephony/MobileNetwork/entry/src/main/ets/Application/AbilityStage.ts +++ b/Telephony/MobileNetwork/entry/src/main/ets/Application/AbilityStage.ts @@ -19,7 +19,7 @@ import AbilityStage from '@ohos.application.AbilityStage' const TAG: string = '[AbilityStage]' export default class MyAbilityStage extends AbilityStage { - onCreate() { - Logger.info(TAG, `[Demo] MyAbilityStage onCreate`) - } + onCreate() { + Logger.info(TAG, `[Demo] MyAbilityStage onCreate`) + } } \ No newline at end of file diff --git a/Telephony/MobileNetwork/entry/src/main/ets/MainAbility/MainAbility.ts b/Telephony/MobileNetwork/entry/src/main/ets/MainAbility/MainAbility.ts index f2aafcbe8..5966390b7 100644 --- a/Telephony/MobileNetwork/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/Telephony/MobileNetwork/entry/src/main/ets/MainAbility/MainAbility.ts @@ -16,38 +16,38 @@ import Logger from '../model/Logger' import Ability from '@ohos.application.Ability' -const TAG: string = '[MainAbility]' +const TAG:string = '[MainAbility]' export default class MainAbility extends Ability { - onCreate(want, launchParam) { - Logger.info(TAG, `[Demo] MainAbility onCreate`) - globalThis.abilityWant = want - globalThis.context = this.context - } - - onDestroy() { - Logger.info(TAG, `[Demo] MainAbility onDestroy`) - } - - onWindowStageCreate(windowStage) { - // Main window is created, set main page for this ability - Logger.info(TAG, `[Demo] MainAbility onWindowStageCreate`) - - windowStage.setUIContent(this.context, 'pages/Index', null) - } - - onWindowStageDestroy() { - // Main window is destroyed, release UI related resources - Logger.info(TAG, `[Demo] MainAbility onWindowStageDestroy`) - } - - onForeground() { - // Ability has brought to foreground - Logger.info(TAG, `[Demo] MainAbility onForeground`) - } - - onBackground() { - // Ability has back to background - Logger.info(TAG, `[Demo] MainAbility onBackground`) - } + onCreate(want, launchParam) { + Logger.info(TAG, `[Demo] MainAbility onCreate`) + globalThis.abilityWant = want + globalThis.context = this.context + } + + onDestroy() { + Logger.info(TAG, `[Demo] MainAbility onDestroy`) + } + + onWindowStageCreate(windowStage) { + // Main window is created, set main page for this ability + Logger.info(TAG, `[Demo] MainAbility onWindowStageCreate`) + + windowStage.setUIContent(this.context, 'pages/Index', null) + } + + onWindowStageDestroy() { + // Main window is destroyed, release UI related resources + Logger.info(TAG, `[Demo] MainAbility onWindowStageDestroy`) + } + + onForeground() { + // Ability has brought to foreground + Logger.info(TAG, `[Demo] MainAbility onForeground`) + } + + onBackground() { + // Ability has back to background + Logger.info(TAG, `[Demo] MainAbility onBackground`) + } }; diff --git a/Telephony/MobileNetwork/entry/src/main/ets/model/Logger.ts b/Telephony/MobileNetwork/entry/src/main/ets/model/Logger.ts index 554025733..c00b8013e 100644 --- a/Telephony/MobileNetwork/entry/src/main/ets/model/Logger.ts +++ b/Telephony/MobileNetwork/entry/src/main/ets/model/Logger.ts @@ -16,34 +16,34 @@ import hilog from '@ohos.hilog' export class Logger { - private domain: number - private prefix: string - private format: string = `%{public}s, %{public}s` - - constructor(prefix: string) { - this.prefix = prefix - this.domain = 0xFF00 - } - - debug(...args: any[]) { - hilog.debug(this.domain, this.prefix, this.format, args) - } - - info(...args: any[]) { - hilog.info(this.domain, this.prefix, this.format, args) - } - - warn(...args: any[]) { - hilog.warn(this.domain, this.prefix, this.format, args) - } - - error(...args: any[]) { - hilog.error(this.domain, this.prefix, this.format, args) - } - - fatal(...args: any[]) { - hilog.fatal(this.domain, this.prefix, this.format, args) - } + private domain: number + private prefix: string + private format: string = `%{public}s, %{public}s` + + constructor(prefix: string) { + this.prefix = prefix + this.domain = 0xFF00 + } + + debug(...args: any[]) { + hilog.debug(this.domain, this.prefix, this.format, args) + } + + info(...args: any[]) { + hilog.info(this.domain, this.prefix, this.format, args) + } + + warn(...args: any[]) { + hilog.warn(this.domain, this.prefix, this.format, args) + } + + error(...args: any[]) { + hilog.error(this.domain, this.prefix, this.format, args) + } + + fatal(...args: any[]) { + hilog.fatal(this.domain, this.prefix, this.format, args) + } } export default new Logger('[MobileNetwork]') \ No newline at end of file diff --git a/Telephony/MobileNetwork/package.json b/Telephony/MobileNetwork/package.json index 504228df6..a3510f0cd 100644 --- a/Telephony/MobileNetwork/package.json +++ b/Telephony/MobileNetwork/package.json @@ -1,18 +1,18 @@ { - "license": "ISC", - "devDependencies": {}, - "name": "mobilenetwork", - "ohos": { - "org": "huawei", - "directoryLevel": "project", - "buildTool": "hvigor" + "license":"ISC", + "devDependencies":{}, + "name":"mobilenetwork", + "ohos":{ + "org":"huawei", + "directoryLevel":"project", + "buildTool":"hvigor" }, - "description": "example description", - "repository": {}, - "version": "1.0.0", - "dependencies": { - "@ohos/hypium": "1.0.1", - "@ohos/hvigor-ohos-plugin": "1.1.6", - "@ohos/hvigor": "1.1.6" + "description":"example description", + "repository":{}, + "version":"1.0.0", + "dependencies":{ + "@ohos/hypium":"1.0.1", + "@ohos/hvigor-ohos-plugin":"1.1.6", + "@ohos/hvigor":"1.1.6" } -} +} \ No newline at end of file diff --git a/Telephony/MobileNetwork/screenshots/device/index.png b/Telephony/MobileNetwork/screenshots/device/index.png index 1b26b62b4c5ce4c53ec8ab6cd59b00b7c8da39d2..00220fb2afdb5a5d2197bc3aa41e8ede7b26ba7b 100644 GIT binary patch literal 26922 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 diff --git a/UI/AtomicLayout/.gitignore b/UI/AtomicLayout/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/UI/AtomicLayout/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/UI/AtomicLayout/README_zh.md b/UI/AtomicLayout/README_zh.md index 7af3f3186..f5bac2ed1 100644 --- a/UI/AtomicLayout/README_zh.md +++ b/UI/AtomicLayout/README_zh.md @@ -32,4 +32,4 @@ 2.本示例支持在标准系统使用。 -3.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 \ No newline at end of file +3.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 \ No newline at end of file diff --git a/UI/AtomicLayout/entry/src/main/js/default/app.js b/UI/AtomicLayout/entry/src/main/js/default/app.js index 8e47afff1..50007322f 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/app.js +++ b/UI/AtomicLayout/entry/src/main/js/default/app.js @@ -14,10 +14,10 @@ */ export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } }; diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.hml b/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.hml index 43cea8b30..ec243cb0b 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.hml +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.hml @@ -14,11 +14,11 @@ -->

-
- A -
-
- - -
+
+ A +
+
+ + +
\ No newline at end of file diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.js b/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.js index e6fc0affd..aa1e7d3cc 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.js +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.js @@ -14,16 +14,16 @@ */ export default { - data: { - "height": "300px", - "width": "300px" - }, - onClickReturn() { - this.height = "300px" - this.width = "300px" - }, - onClickRefresh() { - this.height = "100px" - this.width = "200px" - } + data: { + "height": "300px", + "width": "300px" + }, + onClickReturn() { + this.height = "300px" + this.width = "300px" + }, + onClickRefresh() { + this.height = "100px" + this.width = "200px" + } } \ No newline at end of file diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.hml b/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.hml index 7bb8007b8..7a4c0937f 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.hml +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.hml @@ -14,13 +14,13 @@ -->
-
- A - B - C -
-
- - -
+
+ A + B + C +
+
+ + +
\ No newline at end of file diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.js b/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.js index 6b22dfdbd..e4afa5705 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.js +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.js @@ -14,13 +14,13 @@ */ export default { - data: { - height: "200px", - }, - onClickReturn() { - this.height = "200px" - }, - onClickRefresh() { - this.height = "500px" - } + data: { + height: "200px", + }, + onClickReturn() { + this.height = "200px" + }, + onClickRefresh() { + this.height = "500px" + } } \ No newline at end of file diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.hml b/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.hml index a9aeeee80..260cfc5b9 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.hml +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.hml @@ -14,7 +14,7 @@ -->
- - - + + +
\ No newline at end of file diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.js b/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.js index 98965c67f..05cdbf2d3 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.js +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.js @@ -16,10 +16,10 @@ import router from '@ohos.router'; export default { - data: {}, - onchange(type) { - router.push({ - url: 'pages/' + type + '/index' - }) - } + data: {}, + onchange(type) { + router.push({ + url: 'pages/' + type + '/index' + }) + } } diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.hml b/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.hml index 7bb8007b8..7a4c0937f 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.hml +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.hml @@ -14,13 +14,13 @@ -->
-
- A - B - C -
-
- - -
+
+ A + B + C +
+
+ + +
\ No newline at end of file diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.js b/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.js index 6b22dfdbd..e4afa5705 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.js +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.js @@ -14,13 +14,13 @@ */ export default { - data: { - height: "200px", - }, - onClickReturn() { - this.height = "200px" - }, - onClickRefresh() { - this.height = "500px" - } + data: { + height: "200px", + }, + onClickReturn() { + this.height = "200px" + }, + onClickRefresh() { + this.height = "500px" + } } \ No newline at end of file diff --git a/UI/AtomicLayout/package.json b/UI/AtomicLayout/package.json index 3c6c841a5..e8b4f8ec9 100644 --- a/UI/AtomicLayout/package.json +++ b/UI/AtomicLayout/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } \ No newline at end of file diff --git a/UI/Badge/.gitignore b/UI/Badge/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/UI/Badge/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/UI/Badge/README_zh.md b/UI/Badge/README_zh.md index 85e1aab15..3a001151a 100644 --- a/UI/Badge/README_zh.md +++ b/UI/Badge/README_zh.md @@ -26,4 +26,4 @@ 1.本示例仅支持在标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 diff --git a/UI/Badge/entry/src/main/js/default/app.js b/UI/Badge/entry/src/main/js/default/app.js index 8e47afff1..50007322f 100644 --- a/UI/Badge/entry/src/main/js/default/app.js +++ b/UI/Badge/entry/src/main/js/default/app.js @@ -14,10 +14,10 @@ */ export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } }; diff --git a/UI/Badge/entry/src/main/js/default/pages/index/index.css b/UI/Badge/entry/src/main/js/default/pages/index/index.css index 55c4e304a..69707d450 100644 --- a/UI/Badge/entry/src/main/js/default/pages/index/index.css +++ b/UI/Badge/entry/src/main/js/default/pages/index/index.css @@ -82,6 +82,7 @@ height: 100%; justify-content: center; } + .container { width: 35%; height: 100%; @@ -91,6 +92,7 @@ margin-right: 12px; margin-left: 12px; } + .item { height: 50px; width: 100%; @@ -99,6 +101,7 @@ margin-bottom: 2px; background-color: white; } + .badge { position: absolute; height: 100%; diff --git a/UI/Badge/entry/src/main/js/default/pages/index/index.hml b/UI/Badge/entry/src/main/js/default/pages/index/index.hml index 98a3c1462..470dca45b 100644 --- a/UI/Badge/entry/src/main/js/default/pages/index/index.hml +++ b/UI/Badge/entry/src/main/js/default/pages/index/index.hml @@ -13,18 +13,18 @@ limitations under the License. -->
-
-
- -
- {{ $item.contacts }} - {{ $item.message }} -
- - - -
+
+
+ +
+ {{ $item.contacts }} + {{ $item.message }} +
+ + +
+
\ No newline at end of file diff --git a/UI/Badge/entry/src/main/js/default/pages/index/index.js b/UI/Badge/entry/src/main/js/default/pages/index/index.js index 10257b51b..215768b01 100644 --- a/UI/Badge/entry/src/main/js/default/pages/index/index.js +++ b/UI/Badge/entry/src/main/js/default/pages/index/index.js @@ -14,49 +14,49 @@ */ export default { - data: { - array: [ - { - imgPath: '/common/images/Image1.jpg', - contacts: "", - message: "", - visibility: "", - count: "", - maxCount: "" - }, - { - imgPath: '/common/images/Image2.jpg', - contacts: '', - message: '', - visibility: "", - count: "100", - maxCount: "99" - }, - { - imgPath: '/common/images/Image3.jpg', - contacts: '', - message: '', - visibility: "", - count: "35", - maxCount: "99" - } - ], - badgeConfig: { - badgeColor: "#FFFF0F0F", - textColor: "#ffffff", - } - }, - onInit() { - for (var arr in this.array) { - this.array[arr].contacts = this.$t('strings.contacts'); - this.array[arr].message = this.$t('strings.message'); - this.array[arr].visibility = "visible" - } - }, - badgeInvalidation(id) { - var idx = JSON.stringify(id) - console.log(idx) - this.array[idx].visibility = "hidden"; - console.log(this.array[idx].visibility) + data: { + array: [ + { + imgPath: '/common/images/Image1.jpg', + contacts: "", + message: "", + visibility: "", + count: "", + maxCount: "" + }, + { + imgPath: '/common/images/Image2.jpg', + contacts: '', + message: '', + visibility: "", + count: "100", + maxCount: "99" + }, + { + imgPath: '/common/images/Image3.jpg', + contacts: '', + message: '', + visibility: "", + count: "35", + maxCount: "99" + } + ], + badgeConfig: { + badgeColor: "#FFFF0F0F", + textColor: "#ffffff", } + }, + onInit() { + for (var arr in this.array) { + this.array[arr].contacts = this.$t('strings.contacts'); + this.array[arr].message = this.$t('strings.message'); + this.array[arr].visibility = "visible" + } + }, + badgeInvalidation(id) { + var idx = JSON.stringify(id) + console.log(idx) + this.array[idx].visibility = "hidden"; + console.log(this.array[idx].visibility) + } } \ No newline at end of file diff --git a/UI/Badge/package.json b/UI/Badge/package.json index 43ec0e1dd..137ee4c65 100644 --- a/UI/Badge/package.json +++ b/UI/Badge/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } diff --git a/UI/International/.gitignore b/UI/International/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/UI/International/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/UI/International/README_zh.md b/UI/International/README_zh.md index df51a5854..61d98b67b 100644 --- a/UI/International/README_zh.md +++ b/UI/International/README_zh.md @@ -30,4 +30,4 @@ TextClock：TextClock组件通过文本将当前系统时间显示在设备上 1.本示例仅支持在标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 \ No newline at end of file +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 \ No newline at end of file diff --git a/UI/International/entry/src/main/js/default/app.js b/UI/International/entry/src/main/js/default/app.js index 58d12b7b5..6d4065abc 100644 --- a/UI/International/entry/src/main/js/default/app.js +++ b/UI/International/entry/src/main/js/default/app.js @@ -14,10 +14,10 @@ */ export default { - onCreate() { - console.info("Application onCreate"); - }, - onDestroy() { - console.info("Application onDestroy"); - } + onCreate() { + console.info("Application onCreate"); + }, + onDestroy() { + console.info("Application onDestroy"); + } }; diff --git a/UI/International/entry/src/main/js/default/i18n/zh-CN.json b/UI/International/entry/src/main/js/default/i18n/zh-CN.json index 92e779de8..a63cd6b66 100644 --- a/UI/International/entry/src/main/js/default/i18n/zh-CN.json +++ b/UI/International/entry/src/main/js/default/i18n/zh-CN.json @@ -5,5 +5,4 @@ "cn": "中文国际化", "ja": "日文国际化" } - } \ No newline at end of file diff --git a/UI/International/entry/src/main/js/default/pages/index/index.hml b/UI/International/entry/src/main/js/default/pages/index/index.hml index 7b3479ba8..291e84cd3 100644 --- a/UI/International/entry/src/main/js/default/pages/index/index.hml +++ b/UI/International/entry/src/main/js/default/pages/index/index.hml @@ -14,12 +14,12 @@ -->
- - {{ dateTime }} - - {{ result1 }} - - {{ result }} - - {{ result2 }} + + {{ dateTime }} + + {{ result1 }} + + {{ result }} + + {{ result2 }}
diff --git a/UI/International/entry/src/main/js/default/pages/index/index.js b/UI/International/entry/src/main/js/default/pages/index/index.js index a1fd3dd03..fb383b186 100644 --- a/UI/International/entry/src/main/js/default/pages/index/index.js +++ b/UI/International/entry/src/main/js/default/pages/index/index.js @@ -16,31 +16,31 @@ import Intl from '@ohos.intl'; export default { - data: { - result: '', - result1: '', - result2: '', - dataDate: null, - dateTime: '' - }, - onInit() { - var datet = new Date() - this.dateTime = datet.getFullYear() + '-' + (datet.getMonth() + 1) + '-' + datet.getDate() - this.dataDate = new Date(datet.getFullYear(), datet.getMonth(), datet.getDate(), datet.getHours(), - datet.getMinutes(), datet.getSeconds()) - }, - cn() { - var dateFmt = new Intl.DateTimeFormat('zh-CN') - this.result = dateFmt.format(this.dataDate) - }, - en() { - var dateFmt1 = new Intl.DateTimeFormat('en-GB') - this.result1 = dateFmt1.format(this.dataDate) - }, - ja() { - var dateFmt2 = new Intl.DateTimeFormat('ja-JP') - this.result2 = dateFmt2.format(this.dataDate) - } + data: { + result: '', + result1: '', + result2: '', + dataDate: null, + dateTime: '' + }, + onInit() { + var datet = new Date() + this.dateTime = datet.getFullYear() + '-' + (datet.getMonth() + 1) + '-' + datet.getDate() + this.dataDate = new Date(datet.getFullYear(), datet.getMonth(), datet.getDate(), datet.getHours(), + datet.getMinutes(), datet.getSeconds()) + }, + cn() { + var dateFmt = new Intl.DateTimeFormat('zh-CN') + this.result = dateFmt.format(this.dataDate) + }, + en() { + var dateFmt1 = new Intl.DateTimeFormat('en-GB') + this.result1 = dateFmt1.format(this.dataDate) + }, + ja() { + var dateFmt2 = new Intl.DateTimeFormat('ja-JP') + this.result2 = dateFmt2.format(this.dataDate) + } } diff --git a/UI/International/package.json b/UI/International/package.json index 6f0716b89..43d0b1222 100644 --- a/UI/International/package.json +++ b/UI/International/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } \ No newline at end of file diff --git a/UI/JSComponments/.gitignore b/UI/JSComponments/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/UI/JSComponments/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/UI/JSComponments/README_zh.md b/UI/JSComponments/README_zh.md index c4391798d..d4285568d 100644 --- a/UI/JSComponments/README_zh.md +++ b/UI/JSComponments/README_zh.md @@ -22,4 +22,4 @@ 1.本示例仅支持在标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 \ No newline at end of file +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 \ No newline at end of file diff --git a/UI/JSComponments/entry/src/main/js/MainAbility/app.js b/UI/JSComponments/entry/src/main/js/MainAbility/app.js index 8e47afff1..50007322f 100644 --- a/UI/JSComponments/entry/src/main/js/MainAbility/app.js +++ b/UI/JSComponments/entry/src/main/js/MainAbility/app.js @@ -14,10 +14,10 @@ */ export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } }; diff --git a/UI/JSComponments/entry/src/main/js/MainAbility/pages/comp/comp.hml b/UI/JSComponments/entry/src/main/js/MainAbility/pages/comp/comp.hml index d8ee5b997..6048bb3ef 100644 --- a/UI/JSComponments/entry/src/main/js/MainAbility/pages/comp/comp.hml +++ b/UI/JSComponments/entry/src/main/js/MainAbility/pages/comp/comp.hml @@ -14,12 +14,12 @@ -->
- {{ title }} - - - Click here to view hidden text - - - hello worldshow - + {{ title }} + + + Click here to view hidden text + + + hello worldshow +
\ No newline at end of file diff --git a/UI/JSComponments/entry/src/main/js/MainAbility/pages/comp/comp.js b/UI/JSComponments/entry/src/main/js/MainAbility/pages/comp/comp.js index 65c31d2eb..4893d9c07 100644 --- a/UI/JSComponments/entry/src/main/js/MainAbility/pages/comp/comp.js +++ b/UI/JSComponments/entry/src/main/js/MainAbility/pages/comp/comp.js @@ -14,21 +14,21 @@ */ export default { - props: { - title: { - default: 'title', - }, - showObject: {}, - }, - data() { - return { - display: this.showObject, - }; - }, - childClicked() { - this.$emit('eventType1', { - text: 'Get Child Component Parameter' - }); - this.show = !this.show; + props: { + title: { + default: 'title', }, + showObject: {}, + }, + data() { + return { + display: this.showObject, + }; + }, + childClicked() { + this.$emit('eventType1', { + text: 'Get Child Component Parameter' + }); + this.show = !this.show; + }, } \ No newline at end of file diff --git a/UI/JSComponments/entry/src/main/js/MainAbility/pages/details/details.hml b/UI/JSComponments/entry/src/main/js/MainAbility/pages/details/details.hml index ddd539162..82a8844f4 100644 --- a/UI/JSComponments/entry/src/main/js/MainAbility/pages/details/details.hml +++ b/UI/JSComponments/entry/src/main/js/MainAbility/pages/details/details.hml @@ -14,8 +14,8 @@ -->
- - This is the detail page. - - + + This is the detail page. + +
\ No newline at end of file diff --git a/UI/JSComponments/entry/src/main/js/MainAbility/pages/details/details.js b/UI/JSComponments/entry/src/main/js/MainAbility/pages/details/details.js index ecec2055b..c0261a409 100644 --- a/UI/JSComponments/entry/src/main/js/MainAbility/pages/details/details.js +++ b/UI/JSComponments/entry/src/main/js/MainAbility/pages/details/details.js @@ -16,10 +16,10 @@ import router from '@ohos.router'; export default { - data: { - title: 'World' - }, - launch: function () { - router.back(); - } + data: { + title: 'World' + }, + launch: function () { + router.back(); + } } diff --git a/UI/JSComponments/entry/src/main/js/MainAbility/pages/index/index.hml b/UI/JSComponments/entry/src/main/js/MainAbility/pages/index/index.hml index 510a9d395..5ac80210c 100644 --- a/UI/JSComponments/entry/src/main/js/MainAbility/pages/index/index.hml +++ b/UI/JSComponments/entry/src/main/js/MainAbility/pages/index/index.hml @@ -15,206 +15,206 @@ - -
- - Case 1：Build Layout + +
+ + Case 1：Build Layout + +
+ + +
+
+ {{ headTitle }} + + {{ paragraphFirst }} + + {{ paragraphSecond }} + + + Comment + +
+ + + Done + +
+
+ {{ inputValue }} + + + Delete + +
+
+
+ +
+
+ + +
+ + Case 2：Add Interaction + +
+ + + + + +
+ + Case 3：Add an External Container + +
+ + +
+
+ + + + Image Show -
- - -
-
- {{ headTitle }} - - {{ paragraphFirst }} - - {{ paragraphSecond }} - - - Comment - -
- - - Done - -
-
- {{ inputValue }} - - - Delete - -
-
-
- -
-
- - -
- - Case 2：Add Interaction - -
- - - - - -
- - Case 3：Add an External Container - -
- - -
-
- - - - Image Show - - - - - - -
-
- - - {{ $item.value0 }} - - - - {{ $item.value1 }} - - - - {{ $item.value2 }} - - - - {{ $item.value3 }} - - - -
-
- - -
- - Case 4：Add Static Animation - -
- - -
- - hello - - - hello - - - hello + + + + + +
+
+ + + {{ $item.value0 }} -
- - -
- - Case 5：Add Continuous Animation + + + {{ $item.value1 }} -
- - -
- - continuous animation + + + {{ $item.value2 }} -
- - color - -
-
- - opacity - -
- -
- - -
- - Case 6：Add Gesture Event + + + {{ $item.value3 }} -
- - -
-
- {{ onClick }} - -
-
- {{ touchstart }} - -
-
- {{ touchmove }} - -
-
- {{ touchend }} - -
-
- {{ onLongPress }} - -
-
- - -
- - Case 7：Add Page Routing - -
- - -
- - This is the index page. - - -
- - -
- - Case 8：Add Custom Component - -
- - -
- - Parent Component：{{ text }} - - -
- + + +
+
+ + +
+ + Case 4：Add Static Animation + +
+ + +
+ + hello + + + hello + + + hello + +
+ + +
+ + Case 5：Add Continuous Animation + +
+ + +
+ + continuous animation + +
+ + color + +
+
+ + opacity + +
+ +
+ + +
+ + Case 6：Add Gesture Event + +
+ + +
+
+ {{ onClick }} + +
+
+ {{ touchstart }} + +
+
+ {{ touchmove }} + +
+
+ {{ touchend }} + +
+
+ {{ onLongPress }} + +
+
+ + +
+ + Case 7：Add Page Routing + +
+ + +
+ + This is the index page. + + +
+ + +
+ + Case 8：Add Custom Component + +
+ + +
+ + Parent Component：{{ text }} + + +
+ \ No newline at end of file diff --git a/UI/JSComponments/entry/src/main/js/MainAbility/pages/index/index.js b/UI/JSComponments/entry/src/main/js/MainAbility/pages/index/index.js index cc499d3a3..b0e54d48c 100644 --- a/UI/JSComponments/entry/src/main/js/MainAbility/pages/index/index.js +++ b/UI/JSComponments/entry/src/main/js/MainAbility/pages/index/index.js @@ -16,106 +16,106 @@ import router from '@ohos.router'; export default { - data: { - inputValue: '', - commentText: false, - likeImage: '/common/unlike.png', - isPressed: false, - total: 20, - headTitle: 'Capture the Beauty in This Moment', - paragraphFirst: 'Capture the beauty of light during the transition and fusion of ice and water. At the instant of movement and stillness, softness and rigidity, force and beauty, condensing moving moments.', - paragraphSecond: 'Reflecting the purity of nature, the innovative design upgrades your visual entertainment and ergonomic comfort. Effortlessly capture what you see and let it speak for what you feel.', - middleImage: '/common/common.png', - textList: [{ - value0: 'JS FA' - }, { - value1: 'JS AA' - }, { - value2: 'Java FA' - }, { - value3: 'Java AA' - }], - tabImage: '/common/ice.png', - colorParam: '', - opacityParam: '', - touchstart: 'touchstart', - touchmove: 'touchmove', - touchend: 'touchend', - touchcancel: 'touchcancel', - onClick: 'onclick', - onLongPress: 'onlongpress', - up: 'up', - down: 'down', - text: 'start', - showState: false - }, - textClicked(e) { - this.text = e.detail.text; - }, - focusUp: function () { - this.up = 'up focused'; - }, - blurUp: function () { - this.up = 'up'; - }, - keyUp: function () { - this.up = 'up keyed'; - }, - focusDown: function () { - this.down = 'down focused'; - }, - blurDown: function () { - this.down = 'down'; - }, - keyDown: function () { - this.down = 'down keyed'; - }, - touchEnd: function () { - this.touchend = 'ended'; - }, - touchMove: function () { - this.touchmove = 'moved'; - }, - touchStart: function () { - this.touchstart = 'touched'; - }, - longPress: function () { - this.onLongPress = 'longpressed'; - }, - click: function () { - this.onClick = 'clicked'; - }, - showAnimation: function () { - this.colorParam = ''; - this.opacityParam = ''; - this.colorParam = 'animation-color'; - this.opacityParam = 'animation-opacity'; - }, - update() { - this.commentText = !this.commentText; - }, - delete() { - this.inputValue = '' - this.commentText = !this.commentText; - }, - updateValue(e) { - this.inputValue = e.text; - }, - likeClick() { - var temp; - if (!this.isPressed) { - temp = this.total + 1; - this.likeImage = '/common/like.png'; - } else { - temp = this.total - 1; - this.likeImage = '/common/unlike.png'; - } - this.total = temp; - this.isPressed = !this.isPressed; - }, - launch: function () { - router.push({ - url: 'pages/details/details', - }); + data: { + inputValue: '', + commentText: false, + likeImage: '/common/unlike.png', + isPressed: false, + total: 20, + headTitle: 'Capture the Beauty in This Moment', + paragraphFirst: 'Capture the beauty of light during the transition and fusion of ice and water. At the instant of movement and stillness, softness and rigidity, force and beauty, condensing moving moments.', + paragraphSecond: 'Reflecting the purity of nature, the innovative design upgrades your visual entertainment and ergonomic comfort. Effortlessly capture what you see and let it speak for what you feel.', + middleImage: '/common/common.png', + textList: [{ + value0: 'JS FA' + }, { + value1: 'JS AA' + }, { + value2: 'Java FA' + }, { + value3: 'Java AA' + }], + tabImage: '/common/ice.png', + colorParam: '', + opacityParam: '', + touchstart: 'touchstart', + touchmove: 'touchmove', + touchend: 'touchend', + touchcancel: 'touchcancel', + onClick: 'onclick', + onLongPress: 'onlongpress', + up: 'up', + down: 'down', + text: 'start', + showState: false + }, + textClicked(e) { + this.text = e.detail.text; + }, + focusUp: function () { + this.up = 'up focused'; + }, + blurUp: function () { + this.up = 'up'; + }, + keyUp: function () { + this.up = 'up keyed'; + }, + focusDown: function () { + this.down = 'down focused'; + }, + blurDown: function () { + this.down = 'down'; + }, + keyDown: function () { + this.down = 'down keyed'; + }, + touchEnd: function () { + this.touchend = 'ended'; + }, + touchMove: function () { + this.touchmove = 'moved'; + }, + touchStart: function () { + this.touchstart = 'touched'; + }, + longPress: function () { + this.onLongPress = 'longpressed'; + }, + click: function () { + this.onClick = 'clicked'; + }, + showAnimation: function () { + this.colorParam = ''; + this.opacityParam = ''; + this.colorParam = 'animation-color'; + this.opacityParam = 'animation-opacity'; + }, + update() { + this.commentText = !this.commentText; + }, + delete() { + this.inputValue = '' + this.commentText = !this.commentText; + }, + updateValue(e) { + this.inputValue = e.text; + }, + likeClick() { + var temp; + if (!this.isPressed) { + temp = this.total + 1; + this.likeImage = '/common/like.png'; + } else { + temp = this.total - 1; + this.likeImage = '/common/unlike.png'; } + this.total = temp; + this.isPressed = !this.isPressed; + }, + launch: function () { + router.push({ + url: 'pages/details/details', + }); + } } \ No newline at end of file diff --git a/UI/JSComponments/package.json b/UI/JSComponments/package.json index 02f5a3363..1d823ce9d 100644 --- a/UI/JSComponments/package.json +++ b/UI/JSComponments/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "^1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } diff --git a/UI/JSUICustomComponent/entry/src/main/js/default/pages/index/index.hml b/UI/JSUICustomComponent/entry/src/main/js/default/pages/index/index.hml index a95dab97f..83def44f2 100644 --- a/UI/JSUICustomComponent/entry/src/main/js/default/pages/index/index.hml +++ b/UI/JSUICustomComponent/entry/src/main/js/default/pages/index/index.hml @@ -1,3 +1,4 @@ +
-
- -
- {{ text }} +
+ +
+ {{ text }}
\ No newline at end of file diff --git a/UI/JsAdaptivePortalList/entry/src/main/js/MainAbility/pages/index/index.hml b/UI/JsAdaptivePortalList/entry/src/main/js/MainAbility/pages/index/index.hml index 755df01d9..905c9257d 100644 --- a/UI/JsAdaptivePortalList/entry/src/main/js/MainAbility/pages/index/index.hml +++ b/UI/JsAdaptivePortalList/entry/src/main/js/MainAbility/pages/index/index.hml @@ -15,57 +15,57 @@
-
- +
+ +
+
+
+ + +
-
-
- - - -
- - -
- {{ $t('strings.title') }} -
- -
- - -
- -
- {{ $t('strings.item_name') }} - {{ $t('strings.item_description') }} -
-
- {{ $t('strings.item_right_text') }} - -
-
- - -
-
- {{ $t('strings.second_page') }} -
-
- {{ $t('strings.third_page') }} + + +
+ {{ $t('strings.title') }} +
+ +
+ + +
+ +
+ {{ $t('strings.item_name') }} + {{ $t('strings.item_description') }}
-
- {{ $t('strings.fourth_page') }} +
+ {{ $t('strings.item_right_text') }} +
-
- {{ $t('strings.fifth_page') }} -
- - -
-
- -
+
+ + +
+
+ {{ $t('strings.second_page') }} +
+
+ {{ $t('strings.third_page') }} +
+
+ {{ $t('strings.fourth_page') }} +
+
+ {{ $t('strings.fifth_page') }} +
+ + +
+
+ +
\ No newline at end of file diff --git a/UI/JsAdaptivePortalList/entry/src/main/js/MainAbility/pages/index/index.js b/UI/JsAdaptivePortalList/entry/src/main/js/MainAbility/pages/index/index.js index 2b22f51fe..73baa5d4e 100644 --- a/UI/JsAdaptivePortalList/entry/src/main/js/MainAbility/pages/index/index.js +++ b/UI/JsAdaptivePortalList/entry/src/main/js/MainAbility/pages/index/index.js @@ -16,30 +16,30 @@ import mediaquery from '@ohos.mediaquery'; export default { - data: { - list_data: Array(16).fill().map((_, index) => ({ - id: "item_" + index - })), - tabBars: [ - { - icon: "icon_person_blue.png", text: "页签" - }, - { - icon: "icon_person_gray.png", text: "页签" - }, - { - icon: "icon_person_gray.png", text: "页签" - }, - { - icon: "icon_person_gray.png", text: "页签" - }, - ], - menu_tabs_index: 0, - isTabletLandscape: false - }, - onInit() { - mediaquery.matchMediaSync('screen and (min-aspect-ratio: 1.5) or (orientation: landscape)').on("change", (data) => { - this.isTabletLandscape = data.matches - }) - } + data: { + list_data: Array(16).fill().map((_, index) => ({ + id: "item_" + index + })), + tabBars: [ + { + icon: "icon_person_blue.png", text: "页签" + }, + { + icon: "icon_person_gray.png", text: "页签" + }, + { + icon: "icon_person_gray.png", text: "页签" + }, + { + icon: "icon_person_gray.png", text: "页签" + }, + ], + menu_tabs_index: 0, + isTabletLandscape: false + }, + onInit() { + mediaquery.matchMediaSync('screen and (min-aspect-ratio: 1.5) or (orientation: landscape)').on("change", (data) => { + this.isTabletLandscape = data.matches + }) + } } \ No newline at end of file diff --git a/UI/JsAdaptivePortalList/package.json b/UI/JsAdaptivePortalList/package.json index d8a911bd2..ed01f6a14 100644 --- a/UI/JsAdaptivePortalList/package.json +++ b/UI/JsAdaptivePortalList/package.json @@ -8,8 +8,8 @@ }, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } \ No newline at end of file diff --git a/UI/JsAdaptivePortalPage/.gitignore b/UI/JsAdaptivePortalPage/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/UI/JsAdaptivePortalPage/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/UI/JsAdaptivePortalPage/README_zh.md b/UI/JsAdaptivePortalPage/README_zh.md index 9b8779f9a..e0600efc0 100644 --- a/UI/JsAdaptivePortalPage/README_zh.md +++ b/UI/JsAdaptivePortalPage/README_zh.md @@ -30,4 +30,4 @@ 1.本示例仅支持在大型系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 \ No newline at end of file +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 \ No newline at end of file diff --git a/UI/JsAdaptivePortalPage/entry/package.json b/UI/JsAdaptivePortalPage/entry/package.json index db08bbf9d..29732ffea 100644 --- a/UI/JsAdaptivePortalPage/entry/package.json +++ b/UI/JsAdaptivePortalPage/entry/package.json @@ -11,4 +11,4 @@ "repository": {}, "version": "1.0.0", "dependencies": {} -} \ No newline at end of file +} diff --git a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/app.js b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/app.js index c15844220..524b4481d 100644 --- a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/app.js +++ b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/app.js @@ -13,10 +13,10 @@ * limitations under the License. */ export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } }; diff --git a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-card-item.css b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-card-item.css index 7bffbb4b4..ce4726189 100644 --- a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-card-item.css +++ b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-card-item.css @@ -25,7 +25,7 @@ .img-hmqs-three { width: 48px; height: 48px; - background-image:url('/common/images/item.png'); + background-image: url('/common/images/item.png'); background-size: contain; background-repeat: no-repeat; } diff --git a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-card-item.hml b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-card-item.hml index 54b83193f..37e47fed3 100644 --- a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-card-item.hml +++ b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-card-item.hml @@ -14,12 +14,12 @@ -->
- -
- {{ title }} -
- - {{ author }} -
+ +
+ {{ title }} +
+ + {{ author }}
+
\ No newline at end of file diff --git a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-group-header.hml b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-group-header.hml index 103093456..c9c5a1da9 100644 --- a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-group-header.hml +++ b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-group-header.hml @@ -14,11 +14,11 @@ -->
-
- {{ $t('strings.txt-content-title')}} -
-
- {{ $t('strings.txt-content-more') }} - -
+
+ {{ $t('strings.txt-content-title') }} +
+
+ {{ $t('strings.txt-content-more') }} + +
\ No newline at end of file diff --git a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-tabbar.css b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-tabbar.css index c8debbd21..9614f64f5 100644 --- a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-tabbar.css +++ b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-tabbar.css @@ -45,9 +45,11 @@ width: 100%; height: 20%; } + .img-tab-bar-bottom { margin-bottom: 2px; } + .txt-tab-bar-bottom { font-size: 10px; text-align: center; diff --git a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-tabbar.hml b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-tabbar.hml index 35ebf5dab..c30e59456 100644 --- a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-tabbar.hml +++ b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-tabbar.hml @@ -14,8 +14,8 @@ -->
-
- -
- {{ text }} +
+ +
+ {{ text }}
\ No newline at end of file diff --git a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/pages/index/index.hml b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/pages/index/index.hml index 2ba1ee201..06b4c9261 100644 --- a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/pages/index/index.hml +++ b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/pages/index/index.hml @@ -18,185 +18,185 @@
-
-
- -
+
+
+
- - -
- - - - - {{ $item }} - - - - -
-
-
- - {{ $item.title }} -
-
- - - -
- -
- {{ $item.title }} -
-
- - +
+ + +
+ + + + + {{ $item }} + + + + +
+
+
+ + {{ $item.title }} +
+
+ + + +
+ +
+ {{ $item.title }} +
+
+ + - - - - -
- - - - - - - - - -
- - + + + + +
+ + + + + + + + + +
+ + - - - - -
- - - - - - - - - -
- - + + + + +
+ + + + + + + + + +
+ + - - - - -
- - - - - - - - - -
- - -
- - -
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
-
- {{ $t('strings.txt-show') }} -
- - + + + + +
+ + + + + + + + + +
+ + +
+ + +
+ {{ $t('strings.txt-show') }}
- {{ $t('strings.txt-show') }} + {{ $t('strings.txt-show') }}
- {{ $t('strings.txt-show') }} + {{ $t('strings.txt-show') }}
- {{ $t('strings.txt-show') }} + {{ $t('strings.txt-show') }}
- {{ $t('strings.txt-show') }} + {{ $t('strings.txt-show') }}
- - -
- -
+
+ {{ $t('strings.txt-show') }} +
+
+ {{ $t('strings.txt-show') }} +
+
+ {{ $t('strings.txt-show') }} +
+
+ {{ $t('strings.txt-show') }} +
+
+ {{ $t('strings.txt-show') }} +
+
+ {{ $t('strings.txt-show') }} +
+
+ {{ $t('strings.txt-show') }} +
+
+ {{ $t('strings.txt-show') }} +
+
+ {{ $t('strings.txt-show') }} +
+
+ {{ $t('strings.txt-show') }} +
+
+ {{ $t('strings.txt-show') }} +
+
+ {{ $t('strings.txt-show') }} +
+
+ {{ $t('strings.txt-show') }} +
+
+ {{ $t('strings.txt-show') }} +
+
+ {{ $t('strings.txt-show') }} +
+ + +
+
+ {{ $t('strings.txt-show') }} +
+
+ {{ $t('strings.txt-show') }} +
+
+ {{ $t('strings.txt-show') }} +
+
+ {{ $t('strings.txt-show') }} +
+ + +
+ +
\ No newline at end of file diff --git a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/pages/index/index.js b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/pages/index/index.js index ee23e8115..7e7e9d91b 100644 --- a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/pages/index/index.js +++ b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/pages/index/index.js @@ -16,40 +16,40 @@ import mediaquery from '@ohos.mediaquery'; export default { - data: { - subTabList: ["子页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签"], - listOne: Array(5).fill(0).map((_, index) => ({ - uri: "", title: "item", id: "item_" + index - })), - listTwo: Array(16).fill(0).map((_, index) => ({ - uri: "", title: "item " + index, id: "item_" + index - })), - listThree: Array(16).fill(0).map((_, index) => ({ - msg1: "The End Of The World", msg2: "Justin Timberland", id: "item_" + index - })), - tabBars: [ - { - icon: "icon_person_blue.png", text: "页签" - }, - { - icon: "icon_person_gray.png", text: "页签" - }, - { - icon: "icon_person_gray.png", text: "页签" - }, - { - icon: "icon_person_gray.png", text: "页签" - }, - { - icon: "icon_person_gray.png", text: "页签" - }, - ], - isTablet: false, - menu_tabs_index: 0 - }, - onInit() { - mediaquery.matchMediaSync('screen and (min-aspect-ratio: 1.5) or (orientation: landscape)').on("change", (data) => { - this.isTablet = data.matches - }) - } + data: { + subTabList: ["子页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签", "页签"], + listOne: Array(5).fill(0).map((_, index) => ({ + uri: "", title: "item", id: "item_" + index + })), + listTwo: Array(16).fill(0).map((_, index) => ({ + uri: "", title: "item " + index, id: "item_" + index + })), + listThree: Array(16).fill(0).map((_, index) => ({ + msg1: "The End Of The World", msg2: "Justin Timberland", id: "item_" + index + })), + tabBars: [ + { + icon: "icon_person_blue.png", text: "页签" + }, + { + icon: "icon_person_gray.png", text: "页签" + }, + { + icon: "icon_person_gray.png", text: "页签" + }, + { + icon: "icon_person_gray.png", text: "页签" + }, + { + icon: "icon_person_gray.png", text: "页签" + }, + ], + isTablet: false, + menu_tabs_index: 0 + }, + onInit() { + mediaquery.matchMediaSync('screen and (min-aspect-ratio: 1.5) or (orientation: landscape)').on("change", (data) => { + this.isTablet = data.matches + }) + } } \ No newline at end of file diff --git a/UI/JsAdaptivePortalPage/package.json b/UI/JsAdaptivePortalPage/package.json index 56a139289..c207eead3 100644 --- a/UI/JsAdaptivePortalPage/package.json +++ b/UI/JsAdaptivePortalPage/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } \ No newline at end of file diff --git a/UI/JsAdaptiveServiceWidget/.gitignore b/UI/JsAdaptiveServiceWidget/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/UI/JsAdaptiveServiceWidget/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/UI/JsAdaptiveServiceWidget/README_zh.md b/UI/JsAdaptiveServiceWidget/README_zh.md index c457602ad..58d4a4c70 100644 --- a/UI/JsAdaptiveServiceWidget/README_zh.md +++ b/UI/JsAdaptiveServiceWidget/README_zh.md @@ -22,4 +22,4 @@ Ability开发：Ability开发概述。 1.本示例支持在标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 \ No newline at end of file +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 \ No newline at end of file diff --git a/UI/JsAdaptiveServiceWidget/entry/src/main/js/FormAbility/Logger.js b/UI/JsAdaptiveServiceWidget/entry/src/main/js/FormAbility/Logger.js index db0515069..962b6f3d9 100644 --- a/UI/JsAdaptiveServiceWidget/entry/src/main/js/FormAbility/Logger.js +++ b/UI/JsAdaptiveServiceWidget/entry/src/main/js/FormAbility/Logger.js @@ -13,30 +13,28 @@ * limitations under the License. */ -// - class Logger { - prefix = '' + prefix = '' - constructor(prefix) { - this.prefix = prefix - } + constructor(prefix) { + this.prefix = prefix + } - debug(...args) { - console.debug(this.prefix + args) - } + debug(...args) { + console.debug(this.prefix + args) + } - info(...args) { - console.info(this.prefix + args) - } + info(...args) { + console.info(this.prefix + args) + } - warn(...args) { - console.warn(this.prefix + args) - } + warn(...args) { + console.warn(this.prefix + args) + } - error(...args) { - console.error(this.prefix + args) - } + error(...args) { + console.error(this.prefix + args) + } } export default new Logger('[JsAdaptiveServiceWidget]') \ No newline at end of file diff --git a/UI/JsAdaptiveServiceWidget/entry/src/main/js/FormAbility/form.js b/UI/JsAdaptiveServiceWidget/entry/src/main/js/FormAbility/form.js index e0f250f2d..c7d472dbd 100644 --- a/UI/JsAdaptiveServiceWidget/entry/src/main/js/FormAbility/form.js +++ b/UI/JsAdaptiveServiceWidget/entry/src/main/js/FormAbility/form.js @@ -1,3 +1,17 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * 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. + */ import dataStorage from '@ohos.data.storage'; import formBindingData from '@ohos.application.formBindingData'; @@ -5,176 +19,175 @@ import formInfo from '@ohos.application.formInfo'; import formProvider from '@ohos.application.formProvider'; import Logger from './Logger' - const DATA_STORAGE_PATH = "/data/storage/el2/base/haps/form_store"; const FORM_PARAM_IDENTITY_KEY = "ohos.extra.param.key.form_identity"; const FORM_PARAM_NAME_KEY = "ohos.extra.param.key.form_name"; const FORM_PARAM_TEMPORARY_KEY = "ohos.extra.param.key.form_temporary"; function getTemperature(formId, count) { - const DECIMAL = 10; - const parsedFormId = parseInt(formId, DECIMAL); - const BASE_TEMP_MOD = 20; - const baseTemperature = parsedFormId % BASE_TEMP_MOD; - const RANGE_TEMP_MOD = 20; - return baseTemperature + Math.abs(count % RANGE_TEMP_MOD - RANGE_TEMP_MOD / 2); + const DECIMAL = 10; + const parsedFormId = parseInt(formId, DECIMAL); + const BASE_TEMP_MOD = 20; + const baseTemperature = parsedFormId % BASE_TEMP_MOD; + const RANGE_TEMP_MOD = 20; + return baseTemperature + Math.abs(count % RANGE_TEMP_MOD - RANGE_TEMP_MOD / 2); } function padZero(num) { - // trans num to string and pad 0 - if (num < 10) { - return `0${num}`; - } else { - return num.toString(); - } + // trans num to string and pad 0 + if (num < 10) { + return `0${num}`; + } else { + return num.toString(); + } } function getTime() { - const date = new Date(); - const hours = padZero(date.getHours()); - const minutes = padZero(date.getMinutes()); - const seconds = padZero(date.getSeconds()); - return `${hours}:${minutes}:${seconds}` + const date = new Date(); + const hours = padZero(date.getHours()); + const minutes = padZero(date.getMinutes()); + const seconds = padZero(date.getSeconds()); + return `${hours}:${minutes}:${seconds}` } async function storeFormInfo(formId, formName, tempFlag) { - let formInfo = { - "formName": formName, - "tempFlag": tempFlag, - "updateCount": 0 - }; - try { - const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); - // put form info - await storage.put(formId, JSON.stringify(formInfo)); - Logger.info(`storeFormInfo, put form info successfully, formId: ${formId}`); - await storage.flush(); - } catch (err) { - Logger.error(`failed to storeFormInfo, err: ${JSON.stringify(err)}`); - } + let formInfo = { + "formName": formName, + "tempFlag": tempFlag, + "updateCount": 0 + }; + try { + const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); + // put form info + await storage.put(formId, JSON.stringify(formInfo)); + Logger.info(`storeFormInfo, put form info successfully, formId: ${formId}`); + await storage.flush(); + } catch (err) { + Logger.error(`failed to storeFormInfo, err: ${JSON.stringify(err)}`); + } } async function updateTempFormInfo(formId) { - let formInfoDefault = { - "formName": "", - "tempFlag": false, - "updateCount": 0 - }; - try { - const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); - // get form info - const data = await storage.get(formId, JSON.stringify(formInfoDefault)); - Logger.info(`updateTempFormInfo, get form info successfully, formId: ${formId}`); - const formInfo = JSON.parse(data.toString()); - if (!formInfo.tempFlag) { - Logger.info(`updateTempFormInfo, formId: ${formId} is not temporary.`); - return; - } - - formInfo.tempFlag = false; - // update form info - await storage.put(formId, JSON.stringify(formInfo)); - Logger.info(`updateTempFormInfo, update form info successfully, formId: ${formId}`); - await storage.flush(); - } catch (err) { - Logger.error(`failed to updateTempFormInfo, err: ${JSON.stringify(err)}`); + let formInfoDefault = { + "formName": "", + "tempFlag": false, + "updateCount": 0 + }; + try { + const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); + // get form info + const data = await storage.get(formId, JSON.stringify(formInfoDefault)); + Logger.info(`updateTempFormInfo, get form info successfully, formId: ${formId}`); + const formInfo = JSON.parse(data.toString()); + if (!formInfo.tempFlag) { + Logger.info(`updateTempFormInfo, formId: ${formId} is not temporary.`); + return; } + + formInfo.tempFlag = false; + // update form info + await storage.put(formId, JSON.stringify(formInfo)); + Logger.info(`updateTempFormInfo, update form info successfully, formId: ${formId}`); + await storage.flush(); + } catch (err) { + Logger.error(`failed to updateTempFormInfo, err: ${JSON.stringify(err)}`); + } } async function updateForm(formId) { - let formInfoDefault = { - "formName": "", - "tempFlag": false, - "updateCount": 0 + let formInfoDefault = { + "formName": "", + "tempFlag": false, + "updateCount": 0 + }; + try { + const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); + // get form info + const data = await storage.get(formId, JSON.stringify(formInfoDefault)); + Logger.info(`updateForm, get form info successfully, formId: ${formId}`); + const formInfo = JSON.parse(data.toString()); + formInfo.updateCount = formInfo.updateCount + 1; + + let obj = { + "temperature": getTemperature(formId, formInfo.updateCount).toString(), + "time": getTime() }; - try { - const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); - // get form info - const data = await storage.get(formId, JSON.stringify(formInfoDefault)); - Logger.info(`updateForm, get form info successfully, formId: ${formId}`); - const formInfo = JSON.parse(data.toString()); - formInfo.updateCount = formInfo.updateCount + 1; - - let obj = { - "temperature": getTemperature(formId, formInfo.updateCount).toString(), - "time": getTime() - }; - let formData = formBindingData.createFormBindingData(obj); - formProvider.updateForm(formId, formData).catch((err) => { - Logger.error(`updateForm, err: ${JSON.stringify(err)}`); - }); - - // update form info - await storage.put(formId, JSON.stringify(formInfo)); - Logger.info(`updateForm, update form info successfully, formId: ${formId}`); - await storage.flush(); - } catch (err) { - Logger.error(`failed to updateForm, err: ${JSON.stringify(err)}`); - } + let formData = formBindingData.createFormBindingData(obj); + formProvider.updateForm(formId, formData).catch((err) => { + Logger.error(`updateForm, err: ${JSON.stringify(err)}`); + }); + + // update form info + await storage.put(formId, JSON.stringify(formInfo)); + Logger.info(`updateForm, update form info successfully, formId: ${formId}`); + await storage.flush(); + } catch (err) { + Logger.error(`failed to updateForm, err: ${JSON.stringify(err)}`); + } } async function deleteFormInfo(formId) { - try { - const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); - // del form info - await storage.delete(formId); - Logger.info(`deleteFormInfo, del form info successfully, formId: ${formId}`); - await storage.flush(); - } catch (err) { - Logger.error(`failed to deleteFormInfo, err: ${JSON.stringify(err)}`); - } + try { + const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); + // del form info + await storage.delete(formId); + Logger.info(`deleteFormInfo, del form info successfully, formId: ${formId}`); + await storage.flush(); + } catch (err) { + Logger.error(`failed to deleteFormInfo, err: ${JSON.stringify(err)}`); + } } export default { - onCreate(want) { - Logger.info(`FormAbility onCreate, want: ${JSON.stringify(want)}`); - // Called to return a FormBindingData object. - - let formId = want.parameters[FORM_PARAM_IDENTITY_KEY]; - let formName = want.parameters[FORM_PARAM_NAME_KEY]; - let tempFlag = want.parameters[FORM_PARAM_TEMPORARY_KEY]; - storeFormInfo(formId, formName, tempFlag); - - let obj = { - "temperature": getTemperature(formId, 0).toString(), - "time": getTime() - }; - let formData = {}; - return formBindingData.createFormBindingData(formData); - }, - - onCastToNormal(formId) { - // Called when the form provider is notified that a temporary form is successfully - // converted to a normal form. - Logger.info(`FormAbility onCastToNormal, formId: ${formId}`); - updateTempFormInfo(formId); - }, - - onUpdate(formId) { - // Called to notify the form provider to update a specified form. - Logger.info(`FormAbility onUpdate, formId: ${formId}`); - updateForm(formId); - }, - - onVisibilityChange(newStatus) { - // Called when the form provider receives form events from the system. - Logger.info(`FormAbility onVisibilityChange`); - }, - - onEvent(formId, message) { - // Called when a specified message event defined by the form provider is triggered. - Logger.info(`FormAbility onEvent, formId = ${formId}, message: ${JSON.stringify(message)}`); - }, - - onDestroy(formId) { - // Called to notify the form provider that a specified form has been destroyed. - Logger.info(`FormAbility onDestroy, formId = ${formId}`); - deleteFormInfo(formId); - }, - - onAcquireFormState(want) { - // Called to return a {@link FormState} object. - Logger.info(`FormAbility onAcquireFormState`); - return formInfo.FormState.READY; - } + onCreate(want) { + Logger.info(`FormAbility onCreate, want: ${JSON.stringify(want)}`); + // Called to return a FormBindingData object. + + let formId = want.parameters[FORM_PARAM_IDENTITY_KEY]; + let formName = want.parameters[FORM_PARAM_NAME_KEY]; + let tempFlag = want.parameters[FORM_PARAM_TEMPORARY_KEY]; + storeFormInfo(formId, formName, tempFlag); + + let obj = { + "temperature": getTemperature(formId, 0).toString(), + "time": getTime() + }; + let formData = {}; + return formBindingData.createFormBindingData(formData); + }, + + onCastToNormal(formId) { + // Called when the form provider is notified that a temporary form is successfully + // converted to a normal form. + Logger.info(`FormAbility onCastToNormal, formId: ${formId}`); + updateTempFormInfo(formId); + }, + + onUpdate(formId) { + // Called to notify the form provider to update a specified form. + Logger.info(`FormAbility onUpdate, formId: ${formId}`); + updateForm(formId); + }, + + onVisibilityChange(newStatus) { + // Called when the form provider receives form events from the system. + Logger.info(`FormAbility onVisibilityChange`); + }, + + onEvent(formId, message) { + // Called when a specified message event defined by the form provider is triggered. + Logger.info(`FormAbility onEvent, formId = ${formId}, message: ${JSON.stringify(message)}`); + }, + + onDestroy(formId) { + // Called to notify the form provider that a specified form has been destroyed. + Logger.info(`FormAbility onDestroy, formId = ${formId}`); + deleteFormInfo(formId); + }, + + onAcquireFormState(want) { + // Called to return a {@link FormState} object. + Logger.info(`FormAbility onAcquireFormState`); + return formInfo.FormState.READY; + } } \ No newline at end of file diff --git a/UI/JsAdaptiveServiceWidget/entry/src/main/js/MainAbility/app.js b/UI/JsAdaptiveServiceWidget/entry/src/main/js/MainAbility/app.js index 6d060ffe5..6d4065abc 100644 --- a/UI/JsAdaptiveServiceWidget/entry/src/main/js/MainAbility/app.js +++ b/UI/JsAdaptiveServiceWidget/entry/src/main/js/MainAbility/app.js @@ -1,8 +1,23 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * 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. + */ + export default { - onCreate() { - console.info("Application onCreate"); - }, - onDestroy() { - console.info("Application onDestroy"); - } + onCreate() { + console.info("Application onCreate"); + }, + onDestroy() { + console.info("Application onDestroy"); + } }; diff --git a/UI/JsAdaptiveServiceWidget/entry/src/main/js/MainAbility/pages/index/index.css b/UI/JsAdaptiveServiceWidget/entry/src/main/js/MainAbility/pages/index/index.css index dcd80e57a..3b173216d 100644 --- a/UI/JsAdaptiveServiceWidget/entry/src/main/js/MainAbility/pages/index/index.css +++ b/UI/JsAdaptiveServiceWidget/entry/src/main/js/MainAbility/pages/index/index.css @@ -39,7 +39,7 @@ margin-right: 6.7%; } -.body{ +.body { margin-top: 10%; margin-bottom: 1%; margin-left: 6.7%; diff --git a/UI/JsAdaptiveServiceWidget/entry/src/main/js/MainAbility/pages/index/index.hml b/UI/JsAdaptiveServiceWidget/entry/src/main/js/MainAbility/pages/index/index.hml index 1c4427466..d9a2a0434 100644 --- a/UI/JsAdaptiveServiceWidget/entry/src/main/js/MainAbility/pages/index/index.hml +++ b/UI/JsAdaptiveServiceWidget/entry/src/main/js/MainAbility/pages/index/index.hml @@ -14,10 +14,10 @@ -->
-
- {{ $t('strings.title') }} -
-
- {{ text }} -
+
+ {{ $t('strings.title') }} +
+
+ {{ text }} +
diff --git a/UI/JsAdaptiveServiceWidget/entry/src/main/js/MainAbility/pages/index/index.js b/UI/JsAdaptiveServiceWidget/entry/src/main/js/MainAbility/pages/index/index.js index 456819aff..9d81b589b 100644 --- a/UI/JsAdaptiveServiceWidget/entry/src/main/js/MainAbility/pages/index/index.js +++ b/UI/JsAdaptiveServiceWidget/entry/src/main/js/MainAbility/pages/index/index.js @@ -14,10 +14,10 @@ */ export default { - data: { - text: "" - }, - onInit() { - this.text = this.$t('strings.text'); - } + data: { + text: "" + }, + onInit() { + this.text = this.$t('strings.text'); + } } diff --git a/UI/JsAdaptiveServiceWidget/entry/src/main/js/complex/pages/index/index.hml b/UI/JsAdaptiveServiceWidget/entry/src/main/js/complex/pages/index/index.hml index 36297fce9..27aa25fec 100644 --- a/UI/JsAdaptiveServiceWidget/entry/src/main/js/complex/pages/index/index.hml +++ b/UI/JsAdaptiveServiceWidget/entry/src/main/js/complex/pages/index/index.hml @@ -14,41 +14,41 @@ -->
-
- - {{ title }} +
+ + {{ title }} +
+
+
+ {{ $item.name }} + {{ $item.num }} +
+ {{ $item.float }} + {{ $item.per }} +
-
-
- {{ $item.name }} - {{ $item.num }} -
- {{ $item.float }} - {{ $item.per }} -
-
+
+
+
+ {{ fundText }} + {{ timeText }} + {{ timeText }}
-
-
- {{ fundText }} - {{ timeText }} - {{ timeText }} -
-
-
-
- {{ $item.name }} - {{ $item.coded }} -
- {{ $item.perFront }} - {{ $item.perAfter }} -
+
+
+
+ {{ $item.name }} + {{ $item.coded }}
+ {{ $item.perFront }} + {{ $item.perAfter }} +
-
-
- - {{ $item.text }} -
+
+
+
+ + {{ $item.text }}
+
\ No newline at end of file diff --git a/UI/JsAdaptiveServiceWidget/entry/src/main/js/grid/pages/index/index.css b/UI/JsAdaptiveServiceWidget/entry/src/main/js/grid/pages/index/index.css index 4cf68faa1..a498a7f39 100644 --- a/UI/JsAdaptiveServiceWidget/entry/src/main/js/grid/pages/index/index.css +++ b/UI/JsAdaptiveServiceWidget/entry/src/main/js/grid/pages/index/index.css @@ -74,6 +74,7 @@ align-items: flex-end; align-content: flex-end; } + .stack-right { margin-left: 5%; justify-content: flex-end; diff --git a/UI/JsAdaptiveServiceWidget/entry/src/main/js/grid/pages/index/index.hml b/UI/JsAdaptiveServiceWidget/entry/src/main/js/grid/pages/index/index.hml index 4f2fa11cd..5f0618820 100644 --- a/UI/JsAdaptiveServiceWidget/entry/src/main/js/grid/pages/index/index.hml +++ b/UI/JsAdaptiveServiceWidget/entry/src/main/js/grid/pages/index/index.hml @@ -14,28 +14,28 @@ -->
-
- - {{ $t('strings.title') }} -
-
- - - 0.33 - - - - 0.33 - -
-
- - - 0.33 - - - - 0.33 - -
+
+ + {{ $t('strings.title') }} +
+
+ + + 0.33 + + + + 0.33 + +
+
+ + + 0.33 + + + + 0.33 + +
\ No newline at end of file diff --git a/UI/JsAdaptiveServiceWidget/entry/src/main/js/imgText/pages/index/index.hml b/UI/JsAdaptiveServiceWidget/entry/src/main/js/imgText/pages/index/index.hml index 4523b3c5c..e6fc60922 100644 --- a/UI/JsAdaptiveServiceWidget/entry/src/main/js/imgText/pages/index/index.hml +++ b/UI/JsAdaptiveServiceWidget/entry/src/main/js/imgText/pages/index/index.hml @@ -14,19 +14,19 @@ -->
- -
- -
-
- {{title}} -
- -
-
- - {{ $item.title }} - {{ $item.detail }} -
+ +
+
+
+ {{ title }} +
+ +
+
+ + {{ $item.title }} + {{ $item.detail }} +
+
\ No newline at end of file diff --git a/UI/JsAdaptiveServiceWidget/entry/src/main/js/immersive/pages/index/index.hml b/UI/JsAdaptiveServiceWidget/entry/src/main/js/immersive/pages/index/index.hml index d15d47279..4ce2593b3 100644 --- a/UI/JsAdaptiveServiceWidget/entry/src/main/js/immersive/pages/index/index.hml +++ b/UI/JsAdaptiveServiceWidget/entry/src/main/js/immersive/pages/index/index.hml @@ -14,10 +14,10 @@ -->
-
- -
-
- -
+
+ +
+
+ +
\ No newline at end of file diff --git a/UI/JsAdaptiveServiceWidget/entry/src/main/js/text/pages/index/index.hml b/UI/JsAdaptiveServiceWidget/entry/src/main/js/text/pages/index/index.hml index 434ea8fb8..1c23ccaad 100644 --- a/UI/JsAdaptiveServiceWidget/entry/src/main/js/text/pages/index/index.hml +++ b/UI/JsAdaptiveServiceWidget/entry/src/main/js/text/pages/index/index.hml @@ -14,14 +14,14 @@ -->
-
-
- {{ $item.name }} - {{ $item.exponent }} -
-
- {{ $item.coded }} - {{ $item.per }} -
+
+
+ {{ $item.name }} + {{ $item.exponent }}
+
+ {{ $item.coded }} + {{ $item.per }} +
+
\ No newline at end of file diff --git a/UI/JsAdaptiveServiceWidget/package.json b/UI/JsAdaptiveServiceWidget/package.json index 45f295749..ce0caaf36 100644 --- a/UI/JsAdaptiveServiceWidget/package.json +++ b/UI/JsAdaptiveServiceWidget/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } diff --git a/UI/JsAnimation/.gitignore b/UI/JsAnimation/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/UI/JsAnimation/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/UI/JsAnimation/README_zh.md b/UI/JsAnimation/README_zh.md index 1e81fa3d8..d9b57e179 100644 --- a/UI/JsAnimation/README_zh.md +++ b/UI/JsAnimation/README_zh.md @@ -22,4 +22,4 @@ 1.本示例仅支持在大型系统上运行，且参考内存 ≥ 1GiB。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 \ No newline at end of file +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 \ No newline at end of file diff --git a/UI/JsAnimation/package.json b/UI/JsAnimation/package.json index e9b2e3698..b6dc67013 100644 --- a/UI/JsAnimation/package.json +++ b/UI/JsAnimation/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } diff --git a/UI/JsAnimationStyle/.gitignore b/UI/JsAnimationStyle/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/UI/JsAnimationStyle/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/UI/JsAnimationStyle/README_zh.md b/UI/JsAnimationStyle/README_zh.md index c1e0f8d39..9c4412083 100644 --- a/UI/JsAnimationStyle/README_zh.md +++ b/UI/JsAnimationStyle/README_zh.md @@ -32,5 +32,5 @@ 1.本示例仅支持在标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/app.js b/UI/JsAnimationStyle/entry/src/main/js/default/app.js index 8e47afff1..50007322f 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/app.js +++ b/UI/JsAnimationStyle/entry/src/main/js/default/app.js @@ -14,10 +14,10 @@ */ export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } }; diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.css b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.css index b9308ce62..0f438433d 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.css +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.css @@ -26,20 +26,21 @@ background-color: #f76160; width: 100px; height: 100px; - animation-name:compositeAnimation ; + animation-name: compositeAnimation; animation-duration: 4s; animation-delay: 0s; animation-iteration-count: infinite; animation-timing-function: linear; } -@keyframes compositeAnimation -{ + +@keyframes compositeAnimation { from { background-color: #f76160; - transform:translate(100px,100px) rotate(0deg) scale(1.0); + transform: translate(100px, 100px) rotate(0deg) scale(1.0); } + to { background-color: #09ba07; - transform:translate(200px,200px) rotate(180deg) scale(1.5); + transform: translate(200px, 200px) rotate(180deg) scale(1.5); } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.hml b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.hml index dd10b0876..ebe2bd346 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.hml +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.hml @@ -14,7 +14,7 @@ -->
- - {{ $t('strings.compositeAnimation') }} - + + {{ $t('strings.compositeAnimation') }} +
\ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.js b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.js index 699c71d0b..7859b5b08 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.js +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.js @@ -14,8 +14,7 @@ */ export default { - data: { - }, - onInit() { - } + data: {}, + onInit() { + } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/index/index.css b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/index/index.css index 25abd2fe5..678cddeb2 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/index/index.css +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/index/index.css @@ -19,7 +19,7 @@ flex-direction: column; justify-content: center; align-items: center; - padding:10px; + padding: 10px; } .translate_style { @@ -37,13 +37,13 @@ animation-timing-function: linear; } -@keyframes translate_animation -{ +@keyframes translate_animation { from { - transform:translate(0px) ; + transform: translate(0px); } + to { - transform:translate(150px) ; + transform: translate(150px); } } @@ -62,13 +62,13 @@ animation-timing-function: linear; } -@keyframes rotate_animation -{ +@keyframes rotate_animation { from { - transform:rotate(0deg); + transform: rotate(0deg); } + to { - transform:rotate(180deg); + transform: rotate(180deg); } } @@ -87,13 +87,13 @@ animation-timing-function: linear; } -@keyframes scale_animation -{ +@keyframes scale_animation { from { transform: scale(1.0); } + to { - transform:scale(2.0); + transform: scale(2.0); } } @@ -104,20 +104,21 @@ background-color: #f76160; width: 100px; height: 100px; - animation-name:compositeAnimation ; + animation-name: compositeAnimation; animation-duration: 4s; animation-delay: 0s; animation-iteration-count: infinite; animation-timing-function: linear; } -@keyframes compositeAnimation -{ + +@keyframes compositeAnimation { from { background-color: #f76160; - transform:translate(-100px,-100px) rotate(0deg) scale(1.0); + transform: translate(-100px, -100px) rotate(0deg) scale(1.0); } + to { background-color: #09ba07; - transform:translate(200px,100px) rotate(180deg) scale(1.5); + transform: translate(200px, 100px) rotate(180deg) scale(1.5); } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/index/index.hml b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/index/index.hml index 73cffeb81..cc0a6a1e4 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/index/index.hml +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/index/index.hml @@ -14,16 +14,16 @@ -->
- - {{ $t('strings.translate') }} - - - {{ $t('strings.rotate') }} - - - {{ $t('strings.scale') }} - - - {{ $t('strings.compositeAnimation') }} - + + {{ $t('strings.translate') }} + + + {{ $t('strings.rotate') }} + + + {{ $t('strings.scale') }} + + + {{ $t('strings.compositeAnimation') }} +
\ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/index/index.js b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/index/index.js index 03be156b1..72890be93 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/index/index.js +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/index/index.js @@ -16,30 +16,30 @@ import router from '@ohos.router' export default { - data: {}, - onInit() { - }, - onClickTranslate() { - router.push({ - url: 'pages/animation/translate/translate' - }) - }, + data: {}, + onInit() { + }, + onClickTranslate() { + router.push({ + url: 'pages/animation/translate/translate' + }) + }, - onClickRotate() { - router.push({ - url: 'pages/animation/rotate/rotate' - }) - }, + onClickRotate() { + router.push({ + url: 'pages/animation/rotate/rotate' + }) + }, - onClickScale() { - router.push({ - url: 'pages/animation/scale/scale' - }) - }, + onClickScale() { + router.push({ + url: 'pages/animation/scale/scale' + }) + }, - onClickComposite() { - router.push({ - url: 'pages/animation/compositeanimation/compositeanimation' - }) - } + onClickComposite() { + router.push({ + url: 'pages/animation/compositeanimation/compositeanimation' + }) + } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/rotate/rotate.css b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/rotate/rotate.css index 0fc7efce2..a1e8d3452 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/rotate/rotate.css +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/rotate/rotate.css @@ -33,12 +33,12 @@ animation-timing-function: linear; } -@keyframes rotate_animation -{ +@keyframes rotate_animation { from { - transform:rotate(0deg); + transform: rotate(0deg); } + to { - transform:rotate(180deg); + transform: rotate(180deg); } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/rotate/rotate.hml b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/rotate/rotate.hml index e8ab77dd0..61f9602e5 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/rotate/rotate.hml +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/rotate/rotate.hml @@ -14,7 +14,7 @@ -->
- - {{ $t('strings.rotate') }} - + + {{ $t('strings.rotate') }} +
\ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/rotate/rotate.js b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/rotate/rotate.js index 699c71d0b..7859b5b08 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/rotate/rotate.js +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/rotate/rotate.js @@ -14,8 +14,7 @@ */ export default { - data: { - }, - onInit() { - } + data: {}, + onInit() { + } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/scale/scale.css b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/scale/scale.css index 783217395..e2beb2d70 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/scale/scale.css +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/scale/scale.css @@ -33,12 +33,12 @@ animation-timing-function: linear; } -@keyframes scale_animation -{ +@keyframes scale_animation { from { transform: scale(1.0); } + to { - transform:scale(2.0); + transform: scale(2.0); } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/scale/scale.hml b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/scale/scale.hml index ed2f6797e..edcfaa01c 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/scale/scale.hml +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/scale/scale.hml @@ -14,7 +14,7 @@ -->
- - {{ $t('strings.scale') }} - + + {{ $t('strings.scale') }} +
\ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/scale/scale.js b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/scale/scale.js index 699c71d0b..7859b5b08 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/scale/scale.js +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/scale/scale.js @@ -14,8 +14,7 @@ */ export default { - data: { - }, - onInit() { - } + data: {}, + onInit() { + } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/translate/translate.css b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/translate/translate.css index 9de123358..230c7ac8a 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/translate/translate.css +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/translate/translate.css @@ -34,12 +34,12 @@ animation-timing-function: linear; } -@keyframes translate_animation -{ +@keyframes translate_animation { from { - transform:translate(0px) ; + transform: translate(0px); } + to { - transform:translate(150px) ; + transform: translate(150px); } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/translate/translate.hml b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/translate/translate.hml index 9216ca711..d570447a2 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/translate/translate.hml +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/translate/translate.hml @@ -14,7 +14,7 @@ -->
- - {{ $t('strings.translate') }} - + + {{ $t('strings.translate') }} +
\ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/translate/translate.js b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/translate/translate.js index 699c71d0b..7859b5b08 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/translate/translate.js +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/translate/translate.js @@ -14,8 +14,7 @@ */ export default { - data: { - }, - onInit() { - } + data: {}, + onInit() { + } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/customfont/index.css b/UI/JsAnimationStyle/entry/src/main/js/default/pages/customfont/index.css index 13422eed2..60e4c9dda 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/customfont/index.css +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/customfont/index.css @@ -21,7 +21,7 @@ background-color: aliceblue; } -.demo-default{ +.demo-default { font-size: 20px; } @@ -30,7 +30,8 @@ margin-top: 10px; font-size: 20px; } -@font-face{ + +@font-face { font-family: font_bold; src: url("/common/style/SourceHanSansSC-Bold.otf"); } @@ -40,7 +41,8 @@ margin-top: 10px; font-size: 20px; } -@font-face{ + +@font-face { font-family: font_extraLight; src: url("/common/style/SourceHanSansSC-ExtraLight.otf"); } @@ -50,7 +52,8 @@ margin-top: 10px; font-size: 20px; } -@font-face{ + +@font-face { font-family: font_heavy; src: url("/common/style/SourceHanSansSC-Heavy.otf"); } @@ -60,7 +63,8 @@ margin-top: 10px; font-size: 20px; } -@font-face{ + +@font-face { font-family: font_medium; src: url("/common/style/SourceHanSansSC-Medium.otf"); } @@ -70,7 +74,8 @@ margin-top: 10px; font-size: 20px; } -@font-face{ + +@font-face { font-family: font_normal; src: url("/common/style/SourceHanSansSC-Normal.otf"); } @@ -80,7 +85,8 @@ margin-top: 10px; font-size: 20px; } -@font-face{ + +@font-face { font-family: font_regular; src: url("/common/style/SourceHanSansSC-Regular.otf"); } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/customfont/index.hml b/UI/JsAnimationStyle/entry/src/main/js/default/pages/customfont/index.hml index 6a8aeb19a..880615349 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/customfont/index.hml +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/customfont/index.hml @@ -14,11 +14,11 @@ -->
- {{$t('strings.txt_default')}} - {{$t('strings.txt_bold')}} - {{$t('strings.txt_extraLight')}} - {{$t('strings.txt_heavy')}} - {{$t('strings.txt_medium')}} - {{$t('strings.txt_normal')}} - {{$t('strings.txt_regular')}} + {{ $t('strings.txt_default') }} + {{ $t('strings.txt_bold') }} + {{ $t('strings.txt_extraLight') }} + {{ $t('strings.txt_heavy') }} + {{ $t('strings.txt_medium') }} + {{ $t('strings.txt_normal') }} + {{ $t('strings.txt_regular') }}
\ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/customfont/index.js b/UI/JsAnimationStyle/entry/src/main/js/default/pages/customfont/index.js index 699c71d0b..7859b5b08 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/customfont/index.js +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/customfont/index.js @@ -14,8 +14,7 @@ */ export default { - data: { - }, - onInit() { - } + data: {}, + onInit() { + } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/gradient/index.css b/UI/JsAnimationStyle/entry/src/main/js/default/pages/gradient/index.css index 0dab878c3..70b577e7f 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/gradient/index.css +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/gradient/index.css @@ -19,40 +19,41 @@ align-items: center; } -.style_default{ +.style_default { height: 20%; width: 100%; - font-size:10px; + font-size: 10px; text-color: black; padding-left: 10px; - background: linear-gradient(rgb(255,0,0),rgb(0, 255, 0)); + background: linear-gradient(rgb(255, 0, 0), rgb(0, 255, 0)); } -.style_angle{ + +.style_angle { height: 20%; width: 100%; - font-size:10px; + font-size: 10px; text-color: black; padding-left: 10px; margin-top: 2%; - background: linear-gradient(45deg, rgb(255,0,0),rgb(0, 255, 0)); + background: linear-gradient(45deg, rgb(255, 0, 0), rgb(0, 255, 0)); } -.style_right{ +.style_right { height: 20%; width: 100%; - font-size:10px; + font-size: 10px; text-color: black; padding-left: 10px; margin-top: 2%; - background: linear-gradient(to right, rgb(255,0,0) 90px, rgb(0, 0, 255) 60%); + background: linear-gradient(to right, rgb(255, 0, 0) 90px, rgb(0, 0, 255) 60%); } -.style_repeat{ +.style_repeat { height: 20%; width: 100%; - font-size:10px; + font-size: 10px; text-color: black; padding-left: 10px; margin-top: 2%; - background: repeating-linear-gradient(to right, rgba(255, 255, 0, 1) 30px,rgba(0, 0, 255, .5) 60px); + background: repeating-linear-gradient(to right, rgba(255, 255, 0, 1) 30px, rgba(0, 0, 255, .5) 60px); } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/gradient/index.hml b/UI/JsAnimationStyle/entry/src/main/js/default/pages/gradient/index.hml index dc580baa3..f473aa1ff 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/gradient/index.hml +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/gradient/index.hml @@ -14,19 +14,19 @@ -->
- - {{ $t('strings.default') }} - + + {{ $t('strings.default') }} + - - {{ $t('strings.angle') }} - + + {{ $t('strings.angle') }} + - - {{ $t('strings.right') }} - + + {{ $t('strings.right') }} + - - {{ $t('strings.repeat') }} - + + {{ $t('strings.repeat') }} +
\ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/gradient/index.js b/UI/JsAnimationStyle/entry/src/main/js/default/pages/gradient/index.js index 699c71d0b..7859b5b08 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/gradient/index.js +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/gradient/index.js @@ -14,8 +14,7 @@ */ export default { - data: { - }, - onInit() { - } + data: {}, + onInit() { + } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/index/index.css b/UI/JsAnimationStyle/entry/src/main/js/default/pages/index/index.css index 5d24ce870..f21db4184 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/index/index.css +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/index/index.css @@ -20,6 +20,7 @@ align-items: center; padding: 10px; } + .btn { width: 60%; height: 50px; diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/index/index.hml b/UI/JsAnimationStyle/entry/src/main/js/default/pages/index/index.hml index c5fe11013..eec681d73 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/index/index.hml +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/index/index.hml @@ -14,8 +14,8 @@ -->
- - - - + + + +
\ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/index/index.js b/UI/JsAnimationStyle/entry/src/main/js/default/pages/index/index.js index d23469de4..8167e2a5b 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/index/index.js +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/index/index.js @@ -16,31 +16,31 @@ import router from '@ohos.router' export default { - data: {}, - onInit() { - }, + data: {}, + onInit() { + }, - onClickAnimationStyle() { - router.push({ - url: 'pages/animation/index/index' - }) - }, + onClickAnimationStyle() { + router.push({ + url: 'pages/animation/index/index' + }) + }, - onClickGradientStyle() { - router.push({ - url: 'pages/gradient/index' - }) - }, + onClickGradientStyle() { + router.push({ + url: 'pages/gradient/index' + }) + }, - onClickTransitionStyle() { - router.push({ - url: 'pages/transitions/index/index' - }) - }, + onClickTransitionStyle() { + router.push({ + url: 'pages/transitions/index/index' + }) + }, - onClickCustomFontStyle() { - router.push({ - url: 'pages/customfont/index' - }) - } + onClickCustomFontStyle() { + router.push({ + url: 'pages/customfont/index' + }) + } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.css b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.css index fce3ae36d..b4cdb9d05 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.css +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.css @@ -18,6 +18,7 @@ align-items: center; background-color: #EBFFD7; } + .div { height: 100%; flex-direction: column; diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.hml b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.hml index 513b0dc3f..6ad0530f5 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.hml +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.hml @@ -14,7 +14,7 @@ -->
-
- {{ $t('strings.detail') }} -
+
+ {{ $t('strings.detail') }} +
\ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.js b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.js index 00a5a554a..e950aaa20 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.js +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.js @@ -16,11 +16,11 @@ import router from '@ohos.router' export default { - data: {}, - onInit() { - }, + data: {}, + onInit() { + }, - jumpBack() { - router.back(); - } + jumpBack() { + router.back(); + } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtransition/cardtransition.css b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtransition/cardtransition.css index 31afc0135..095e3af5d 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtransition/cardtransition.css +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtransition/cardtransition.css @@ -20,11 +20,13 @@ align-items: center; background-color: #ABDAFF; } + .item { height: 80px; background-color: #FAFAFA; margin-top: 2px; } + .outer { width: 300px; height: 100px; diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtransition/cardtransition.hml b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtransition/cardtransition.hml index b49a715ec..267f0524b 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtransition/cardtransition.hml +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtransition/cardtransition.hml @@ -14,13 +14,13 @@ -->
-
- {{$t('strings.remove')}} -
- - - {{$item.title}} - - +
+ {{ $t('strings.remove') }} +
+ + + {{ $item.title }} + +
\ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtarget/customtarget.css b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtarget/customtarget.css index 80d5b38da..257707b2f 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtarget/customtarget.css +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtarget/customtarget.css @@ -41,6 +41,7 @@ transform: translateX(750px); opacity: 0; } + to { transform: translateX(0px); opacity: 1; diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtarget/customtarget.hml b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtarget/customtarget.hml index 1a2e075bb..3f5155661 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtarget/customtarget.hml +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtarget/customtarget.hml @@ -14,7 +14,7 @@ -->
-
- -
+
+ +
\ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtarget/customtarget.js b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtarget/customtarget.js index 00a5a554a..e950aaa20 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtarget/customtarget.js +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtarget/customtarget.js @@ -16,11 +16,11 @@ import router from '@ohos.router' export default { - data: {}, - onInit() { - }, + data: {}, + onInit() { + }, - jumpBack() { - router.back(); - } + jumpBack() { + router.back(); + } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtransition/customtransition.css b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtransition/customtransition.css index fd3947b83..55b3d896a 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtransition/customtransition.css +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtransition/customtransition.css @@ -33,6 +33,7 @@ transform: translateX(0px); opacity: 1; } + to { transform: translateX(-750px); opacity: 0; diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtransition/customtransition.hml b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtransition/customtransition.hml index fb159cef0..cf31bdd51 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtransition/customtransition.hml +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtransition/customtransition.hml @@ -14,5 +14,5 @@ -->
- +
\ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtransition/customtransition.js b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtransition/customtransition.js index 99c31be27..e7788c17f 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtransition/customtransition.js +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/customtransition/customtransition.js @@ -16,13 +16,13 @@ import router from '@ohos.router' export default { - data: {}, - onInit() { - }, + data: {}, + onInit() { + }, - onClickCustomTarget() { - router.push({ - url: 'pages/transitions/customtarget/customtarget' - }) - } + onClickCustomTarget() { + router.push({ + url: 'pages/transitions/customtarget/customtarget' + }) + } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/index/index.hml b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/index/index.hml index b8f9e8901..e21f7d9a8 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/index/index.hml +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/index/index.hml @@ -14,7 +14,7 @@ -->
- - - + + +
\ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/index/index.js b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/index/index.js index 4969d13c2..aa9f759ec 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/index/index.js +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/index/index.js @@ -16,24 +16,24 @@ import router from '@ohos.router' export default { - data: {}, - onInit() { - }, - onClickElement() { - router.push({ - url: 'pages/transitions/sharedelement/sharedelement' - }) - }, + data: {}, + onInit() { + }, + onClickElement() { + router.push({ + url: 'pages/transitions/sharedelement/sharedelement' + }) + }, - onClickCard() { - router.push({ - url: 'pages/transitions/cardtransition/cardtransition' - }) - }, + onClickCard() { + router.push({ + url: 'pages/transitions/cardtransition/cardtransition' + }) + }, - onClickCustomTransition() { - router.push({ - url: 'pages/transitions/customtransition/customtransition' - }) - } + onClickCustomTransition() { + router.push({ + url: 'pages/transitions/customtransition/customtransition' + }) + } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedelement/sharedelement.css b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedelement/sharedelement.css index e3b311ad1..f387db350 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedelement/sharedelement.css +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedelement/sharedelement.css @@ -31,13 +31,15 @@ shared-transition-name: shared-transition; shared-transition-timing-function: friction; } + @keyframes shared-transition { from { opacity: 0; - transform:translate(20px) ; + transform: translate(20px); } + to { opacity: 1; - transform:translate(100px) ; + transform: translate(100px); } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedelement/sharedelement.hml b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedelement/sharedelement.hml index 1e89d5893..85b3fcae5 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedelement/sharedelement.hml +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedelement/sharedelement.hml @@ -14,5 +14,6 @@ -->
- {{ $t('strings.sharedjump') }} + {{ + $t('strings.sharedjump') }}
\ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedelement/sharedelement.js b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedelement/sharedelement.js index 3599c6e45..bf9bc810f 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedelement/sharedelement.js +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedelement/sharedelement.js @@ -16,13 +16,13 @@ import router from '@ohos.router' export default { - data: {}, - onInit() { - }, + data: {}, + onInit() { + }, - jumpSharedTargetPage() { - router.push({ - url: 'pages/transitions/sharedtargetpage/sharedtargetpage', - }); - } + jumpSharedTargetPage() { + router.push({ + url: 'pages/transitions/sharedtargetpage/sharedtargetpage', + }); + } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedtargetpage/sharedtargetpage.css b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedtargetpage/sharedtargetpage.css index 580ed254d..4f582854e 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedtargetpage/sharedtargetpage.css +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedtargetpage/sharedtargetpage.css @@ -30,13 +30,15 @@ shared-transition-name: shared-transition; shared-transition-timing-function: friction; } + @keyframes shared-transition { from { opacity: 1; - transform:translate(20px) ; + transform: translate(20px); } + to { opacity: 0; - transform:translate(100px) ; + transform: translate(100px); } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedtargetpage/sharedtargetpage.hml b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedtargetpage/sharedtargetpage.hml index 11faef5e1..64dd5757f 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedtargetpage/sharedtargetpage.hml +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedtargetpage/sharedtargetpage.hml @@ -14,5 +14,6 @@ -->
- {{ $t('strings.sharedpaget') }} + {{ + $t('strings.sharedpaget') }}
\ No newline at end of file diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedtargetpage/sharedtargetpage.js b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedtargetpage/sharedtargetpage.js index 00a5a554a..e950aaa20 100644 --- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedtargetpage/sharedtargetpage.js +++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/sharedtargetpage/sharedtargetpage.js @@ -16,11 +16,11 @@ import router from '@ohos.router' export default { - data: {}, - onInit() { - }, + data: {}, + onInit() { + }, - jumpBack() { - router.back(); - } + jumpBack() { + router.back(); + } } \ No newline at end of file diff --git a/UI/JsAnimationStyle/package.json b/UI/JsAnimationStyle/package.json index 3c6c841a5..e8b4f8ec9 100644 --- a/UI/JsAnimationStyle/package.json +++ b/UI/JsAnimationStyle/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } \ No newline at end of file diff --git a/UI/JsAnimator/.gitignore b/UI/JsAnimator/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/UI/JsAnimator/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/UI/JsAnimator/README_zh.md b/UI/JsAnimator/README_zh.md index 2442026c2..7c65c7927 100644 --- a/UI/JsAnimator/README_zh.md +++ b/UI/JsAnimator/README_zh.md @@ -29,4 +29,4 @@ 2.@ohos.animator库目前仅支持类web方式调用，ets暂不支持。 -3.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 \ No newline at end of file +3.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 \ No newline at end of file diff --git a/UI/JsAnimator/entry/src/main/js/MainAbility/app.js b/UI/JsAnimator/entry/src/main/js/MainAbility/app.js index e3a0891c0..e2e723dcb 100644 --- a/UI/JsAnimator/entry/src/main/js/MainAbility/app.js +++ b/UI/JsAnimator/entry/src/main/js/MainAbility/app.js @@ -14,10 +14,10 @@ */ export default { - onCreate() { - console.info("Application onCreate"); - }, - onDestroy() { - console.info("Application onDestroy"); - } + onCreate() { + console.info("Application onCreate"); + }, + onDestroy() { + console.info("Application onDestroy"); + } }; diff --git a/UI/JsAnimator/entry/src/main/js/MainAbility/pages/index/index.css b/UI/JsAnimator/entry/src/main/js/MainAbility/pages/index/index.css index 81233c12b..aa9665e4d 100644 --- a/UI/JsAnimator/entry/src/main/js/MainAbility/pages/index/index.css +++ b/UI/JsAnimator/entry/src/main/js/MainAbility/pages/index/index.css @@ -14,76 +14,76 @@ */ .container { - flex-direction: column; - width: 100%; - height: 100%; - opacity: 0.75; - background-color: #F2F3F5; + flex-direction: column; + width: 100%; + height: 100%; + opacity: 0.75; + background-color: #F2F3F5; } .title { - align-items: center; - font-size: 30fp; - text-align: center; - width: 100%; - height: 8%; - background-color: deepskyblue; + align-items: center; + font-size: 30fp; + text-align: center; + width: 100%; + height: 8%; + background-color: deepskyblue; } .sunAnimation { - display: flex; - flex-direction: column; - justify-content: flex-end; - left: 0px; - top: 0px; - width: 100%; - height: 40%; + display: flex; + flex-direction: column; + justify-content: flex-end; + left: 0px; + top: 0px; + width: 100%; + height: 40%; } .moonAnimation { - display: flex; - flex-direction: column; - justify-content: flex-start; - left: 0px; - top: 0px; - width: 100%; - height: 40%; + display: flex; + flex-direction: column; + justify-content: flex-start; + left: 0px; + top: 0px; + width: 100%; + height: 40%; } .image-sun { - width: 160px; - height: 120vp; - object-fit: contain; + width: 160px; + height: 120vp; + object-fit: contain; } .image-moon { - width: 120px; - height: 120vp; - object-fit: contain; + width: 120px; + height: 120vp; + object-fit: contain; } .divider { - height: 2%; + height: 2%; } .div-button { - height: 15%; - width: 100%; - flex-direction: row; - justify-content: space-around; - align-items: center; + height: 15%; + width: 100%; + flex-direction: row; + justify-content: space-around; + align-items: center; } .button { - height: 100%; - width: 150px; + height: 100%; + width: 150px; } .image-button { - object-fit: contain; + object-fit: contain; } .button-reverse { - height: 100%; - width: 135px; + height: 100%; + width: 135px; } diff --git a/UI/JsAnimator/package.json b/UI/JsAnimator/package.json index e99223849..a3a7d0b10 100644 --- a/UI/JsAnimator/package.json +++ b/UI/JsAnimator/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "^1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } diff --git a/UI/JsBasicComponents/.gitignore b/UI/JsBasicComponents/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/UI/JsBasicComponents/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/UI/JsBrightness/.gitignore b/UI/JsBrightness/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/UI/JsBrightness/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/UI/JsBrightness/README_zh.md b/UI/JsBrightness/README_zh.md index 1b9e0055e..cb4205e23 100644 --- a/UI/JsBrightness/README_zh.md +++ b/UI/JsBrightness/README_zh.md @@ -22,5 +22,5 @@ 1.本示例仅支持在标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 diff --git a/UI/JsBrightness/entry/src/main/js/default/app.js b/UI/JsBrightness/entry/src/main/js/default/app.js index 58d12b7b5..6d4065abc 100644 --- a/UI/JsBrightness/entry/src/main/js/default/app.js +++ b/UI/JsBrightness/entry/src/main/js/default/app.js @@ -14,10 +14,10 @@ */ export default { - onCreate() { - console.info("Application onCreate"); - }, - onDestroy() { - console.info("Application onDestroy"); - } + onCreate() { + console.info("Application onCreate"); + }, + onDestroy() { + console.info("Application onDestroy"); + } }; diff --git a/UI/JsBrightness/entry/src/main/js/default/pages/index/index.hml b/UI/JsBrightness/entry/src/main/js/default/pages/index/index.hml index f5428ebc1..9dd0e24a1 100644 --- a/UI/JsBrightness/entry/src/main/js/default/pages/index/index.hml +++ b/UI/JsBrightness/entry/src/main/js/default/pages/index/index.hml @@ -14,10 +14,10 @@ -->
- {{ $t('strings.tip') }} -
- {{ $t('strings.dark') }} - - {{ $t('strings.bright') }} -
+ {{ $t('strings.tip') }} +
+ {{ $t('strings.dark') }} + + {{ $t('strings.bright') }} +
\ No newline at end of file diff --git a/UI/JsBrightness/entry/src/main/js/default/pages/index/index.js b/UI/JsBrightness/entry/src/main/js/default/pages/index/index.js index c20db2c0e..c504d7647 100644 --- a/UI/JsBrightness/entry/src/main/js/default/pages/index/index.js +++ b/UI/JsBrightness/entry/src/main/js/default/pages/index/index.js @@ -16,13 +16,13 @@ import brightness from '@ohos.brightness'; export default { - data: { - defaultValue: 125 - }, - onInit() { - brightness.setValue(this.defaultValue); - }, - brightness(e) { - brightness.setValue(e.value); - } + data: { + defaultValue: 125 + }, + onInit() { + brightness.setValue(this.defaultValue); + }, + brightness(e) { + brightness.setValue(e.value); + } } \ No newline at end of file diff --git a/UI/JsBrightness/package.json b/UI/JsBrightness/package.json index 5fe0a3efa..64b02ffde 100644 --- a/UI/JsBrightness/package.json +++ b/UI/JsBrightness/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor": "1.1.3", - "@ohos/hvigor-ohos-plugin": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor": "1.1.6", + "@ohos/hvigor-ohos-plugin": "1.1.6" } } diff --git a/UI/JsCanvas/.gitignore b/UI/JsCanvas/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/UI/JsCanvas/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/UI/JsCanvas/README_zh.md b/UI/JsCanvas/README_zh.md index 49444944d..3fd77cf42 100644 --- a/UI/JsCanvas/README_zh.md +++ b/UI/JsCanvas/README_zh.md @@ -40,4 +40,4 @@ Canvas：提供画布组件，用于自定义绘制图形。 1.本示例仅支持标准系统运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 \ No newline at end of file +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 \ No newline at end of file diff --git a/UI/JsCanvas/entry/src/main/js/default/app.js b/UI/JsCanvas/entry/src/main/js/default/app.js index 8e47afff1..50007322f 100644 --- a/UI/JsCanvas/entry/src/main/js/default/app.js +++ b/UI/JsCanvas/entry/src/main/js/default/app.js @@ -14,10 +14,10 @@ */ export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } }; diff --git a/UI/JsCanvas/entry/src/main/js/default/pages/index/index.hml b/UI/JsCanvas/entry/src/main/js/default/pages/index/index.hml index ec7fc6f4e..dcc366037 100644 --- a/UI/JsCanvas/entry/src/main/js/default/pages/index/index.hml +++ b/UI/JsCanvas/entry/src/main/js/default/pages/index/index.hml @@ -13,29 +13,32 @@ limitations under the License. -->
-
+
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
+
+ + +
+
+ + + +
+
+ + +
+
+ + + + +
+
+ + +
-
+
diff --git a/UI/JsCanvas/entry/src/main/js/default/pages/index/index.js b/UI/JsCanvas/entry/src/main/js/default/pages/index/index.js index 197645a9f..e883045d4 100644 --- a/UI/JsCanvas/entry/src/main/js/default/pages/index/index.js +++ b/UI/JsCanvas/entry/src/main/js/default/pages/index/index.js @@ -14,128 +14,128 @@ */ export default { - data: { - ctx: null - }, - onShow() { - const cav = this.$refs.canvas; - this.ctx = cav.getContext('2d'); - }, - imageClick() { - this.ctx.clearRect(0, 0, 300, 300); - var ctx1 = this.$element('drawImage').getContext('2d'); - var img = new Image(); - img.src = 'common/images/like_yellow.png'; - img.onload = function () { - console.log('Image load success'); - ctx1.drawImage(img, 50, 50, 200, 200); - }; - img.onerror = function () { - console.log('Image load fail'); - }; - }, - handleClick() { - this.ctx.beginPath(); - this.ctx.arc(150, 150, 50, 0, 6.28); - this.ctx.stroke(); - }, - strokeClick() { - this.ctx.beginPath(); - this.ctx.font = '25px sans-serif'; - this.ctx.strokeText("Hello World!", 80, 60); - this.ctx.stroke(); - }, - closeClick() { - this.ctx.beginPath(); - this.ctx.lineJoin = 'miter'; - this.ctx.moveTo(150, 200); - this.ctx.lineTo(120, 150); - this.ctx.lineTo(150, 100); - this.ctx.lineTo(180, 150); + data: { + ctx: null + }, + onShow() { + const cav = this.$refs.canvas; + this.ctx = cav.getContext('2d'); + }, + imageClick() { + this.ctx.clearRect(0, 0, 300, 300); + var ctx1 = this.$element('drawImage').getContext('2d'); + var img = new Image(); + img.src = 'common/images/like_yellow.png'; + img.onload = function () { + console.log('Image load success'); + ctx1.drawImage(img, 50, 50, 200, 200); + }; + img.onerror = function () { + console.log('Image load fail'); + }; + }, + handleClick() { + this.ctx.beginPath(); + this.ctx.arc(150, 150, 50, 0, 6.28); + this.ctx.stroke(); + }, + strokeClick() { + this.ctx.beginPath(); + this.ctx.font = '25px sans-serif'; + this.ctx.strokeText("Hello World!", 80, 60); + this.ctx.stroke(); + }, + closeClick() { + this.ctx.beginPath(); + this.ctx.lineJoin = 'miter'; + this.ctx.moveTo(150, 200); + this.ctx.lineTo(120, 150); + this.ctx.lineTo(150, 100); + this.ctx.lineTo(180, 150); - this.ctx.closePath(); - this.ctx.stroke(); - }, - bezierCurve() { - this.ctx.beginPath(); - this.ctx.moveTo(10, 10); - this.ctx.bezierCurveTo(90, 100, 200, 100, 290, 10); - this.ctx.stroke(); - }, - clearRect() { - this.ctx.fillStyle = '#000000' - this.ctx.clearRect(0, 0, 300, 300); - }, - textBase() { - this.ctx.beginPath(); - this.ctx.moveTo(0, 220); - this.ctx.lineTo(300, 220); + this.ctx.closePath(); + this.ctx.stroke(); + }, + bezierCurve() { + this.ctx.beginPath(); + this.ctx.moveTo(10, 10); + this.ctx.bezierCurveTo(90, 100, 200, 100, 290, 10); + this.ctx.stroke(); + }, + clearRect() { + this.ctx.fillStyle = '#000000' + this.ctx.clearRect(0, 0, 300, 300); + }, + textBase() { + this.ctx.beginPath(); + this.ctx.moveTo(0, 220); + this.ctx.lineTo(300, 220); - this.ctx.stroke(); + this.ctx.stroke(); - this.ctx.font = '20px sans-serif'; - this.ctx.strokeStyle = '#100f0f'; - this.ctx.textBaseline = 'top'; - this.ctx.fillText('Top', 10, 220); - this.ctx.textBaseline = 'bottom'; - this.ctx.fillText('Bottom', 55, 220); - this.ctx.textBaseline = 'middle'; - this.ctx.fillText('Middle', 125, 220); - this.ctx.textBaseline = 'alphabetic'; - this.ctx.fillText('Alphabetic', 195, 220); - }, - offScreen() { - var offscreen = new OffscreenCanvas(360, 500); - var offCanvas2 = offscreen.getContext("2d"); - var img = new Image(); - img.src = 'common/images/ai.png'; - offCanvas2.drawImage(img, 0, 0, 100, 100); - offCanvas2.filter = 'blur(5px)'; - offCanvas2.drawImage(img, 100, 0, 100, 100); + this.ctx.font = '20px sans-serif'; + this.ctx.strokeStyle = '#100f0f'; + this.ctx.textBaseline = 'top'; + this.ctx.fillText('Top', 10, 220); + this.ctx.textBaseline = 'bottom'; + this.ctx.fillText('Bottom', 55, 220); + this.ctx.textBaseline = 'middle'; + this.ctx.fillText('Middle', 125, 220); + this.ctx.textBaseline = 'alphabetic'; + this.ctx.fillText('Alphabetic', 195, 220); + }, + offScreen() { + var offscreen = new OffscreenCanvas(360, 500); + var offCanvas2 = offscreen.getContext("2d"); + var img = new Image(); + img.src = 'common/images/ai.png'; + offCanvas2.drawImage(img, 0, 0, 100, 100); + offCanvas2.filter = 'blur(5px)'; + offCanvas2.drawImage(img, 100, 0, 100, 100); - offCanvas2.filter = 'grayscale(50%)'; - offCanvas2.drawImage(img, 200, 0, 100, 100); + offCanvas2.filter = 'grayscale(50%)'; + offCanvas2.drawImage(img, 200, 0, 100, 100); - offCanvas2.filter = 'hue-rotate(90deg)'; - offCanvas2.drawImage(img, 0, 100, 100, 100); + offCanvas2.filter = 'hue-rotate(90deg)'; + offCanvas2.drawImage(img, 0, 100, 100, 100); - offCanvas2.filter = 'invert(100%)'; - offCanvas2.drawImage(img, 100, 100, 100, 100); + offCanvas2.filter = 'invert(100%)'; + offCanvas2.drawImage(img, 100, 100, 100, 100); - offCanvas2.filter = 'drop-shadow(8px 8px 10px green)'; - offCanvas2.drawImage(img, 200, 100, 100, 100); + offCanvas2.filter = 'drop-shadow(8px 8px 10px green)'; + offCanvas2.drawImage(img, 200, 100, 100, 100); - offCanvas2.filter = 'brightness(0.4)'; - offCanvas2.drawImage(img, 0, 200, 100, 100); + offCanvas2.filter = 'brightness(0.4)'; + offCanvas2.drawImage(img, 0, 200, 100, 100); - offCanvas2.filter = 'opacity(25%)'; - offCanvas2.drawImage(img, 100, 200, 100, 100); + offCanvas2.filter = 'opacity(25%)'; + offCanvas2.drawImage(img, 100, 200, 100, 100); - offCanvas2.filter = 'saturate(30%)'; - offCanvas2.drawImage(img, 200, 200, 100, 100); + offCanvas2.filter = 'saturate(30%)'; + offCanvas2.drawImage(img, 200, 200, 100, 100); - offCanvas2.filter = 'sepia(60%)'; - offCanvas2.drawImage(img, 0, 300, 100, 100); + offCanvas2.filter = 'sepia(60%)'; + offCanvas2.drawImage(img, 0, 300, 100, 100); - offCanvas2.filter = 'contrast(200%)'; - offCanvas2.drawImage(img, 100, 300, 100, 100); - var bitmap = offscreen.transferToImageBitmap(); - this.ctx.transferFromImageBitmap(bitmap); - }, - linearGradient() { - var gradient = this.ctx.createLinearGradient(50, 0, 300, 100); - gradient.addColorStop(0.0, 'red'); - gradient.addColorStop(0.5, 'white'); - gradient.addColorStop(1.0, 'green'); - this.ctx.fillStyle = gradient; - this.ctx.fillRect(0, 0, 500, 500); - }, - radialGradient() { - var gradient = this.ctx.createRadialGradient(150, 150, 50, 150, 150, 150); - gradient.addColorStop(0.0, 'red'); - gradient.addColorStop(0.5, 'white'); - gradient.addColorStop(1.0, 'green'); - this.ctx.fillStyle = gradient; - this.ctx.fillRect(0, 0, 500, 500); - } + offCanvas2.filter = 'contrast(200%)'; + offCanvas2.drawImage(img, 100, 300, 100, 100); + var bitmap = offscreen.transferToImageBitmap(); + this.ctx.transferFromImageBitmap(bitmap); + }, + linearGradient() { + var gradient = this.ctx.createLinearGradient(50, 0, 300, 100); + gradient.addColorStop(0.0, 'red'); + gradient.addColorStop(0.5, 'white'); + gradient.addColorStop(1.0, 'green'); + this.ctx.fillStyle = gradient; + this.ctx.fillRect(0, 0, 500, 500); + }, + radialGradient() { + var gradient = this.ctx.createRadialGradient(150, 150, 50, 150, 150, 150); + gradient.addColorStop(0.0, 'red'); + gradient.addColorStop(0.5, 'white'); + gradient.addColorStop(1.0, 'green'); + this.ctx.fillStyle = gradient; + this.ctx.fillRect(0, 0, 500, 500); + } } diff --git a/UI/JsCanvas/package.json b/UI/JsCanvas/package.json index de25679ec..83b997dd3 100644 --- a/UI/JsCanvas/package.json +++ b/UI/JsCanvas/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } \ No newline at end of file diff --git a/UI/JsDevice/.gitignore b/UI/JsDevice/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/UI/JsDevice/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/UI/JsDevice/README_zh.md b/UI/JsDevice/README_zh.md index fd4235144..fd87b0dda 100644 --- a/UI/JsDevice/README_zh.md +++ b/UI/JsDevice/README_zh.md @@ -24,4 +24,4 @@ 1.本示例仅支持在标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 diff --git a/UI/JsDevice/entry/src/main/js/default/app.js b/UI/JsDevice/entry/src/main/js/default/app.js index 58d12b7b5..6d4065abc 100644 --- a/UI/JsDevice/entry/src/main/js/default/app.js +++ b/UI/JsDevice/entry/src/main/js/default/app.js @@ -14,10 +14,10 @@ */ export default { - onCreate() { - console.info("Application onCreate"); - }, - onDestroy() { - console.info("Application onDestroy"); - } + onCreate() { + console.info("Application onCreate"); + }, + onDestroy() { + console.info("Application onDestroy"); + } }; diff --git a/UI/JsDevice/entry/src/main/js/default/common/common.css b/UI/JsDevice/entry/src/main/js/default/common/common.css index b32bf06f2..c82f2c6fd 100644 --- a/UI/JsDevice/entry/src/main/js/default/common/common.css +++ b/UI/JsDevice/entry/src/main/js/default/common/common.css @@ -20,7 +20,7 @@ align-items: center; } -.title-box{ +.title-box { flex-direction: row; width: 100%; height: 90px; diff --git a/UI/JsDevice/entry/src/main/js/default/pages/batteryInfo/batteryInfo.hml b/UI/JsDevice/entry/src/main/js/default/pages/batteryInfo/batteryInfo.hml index 9a20e637c..646028d68 100644 --- a/UI/JsDevice/entry/src/main/js/default/pages/batteryInfo/batteryInfo.hml +++ b/UI/JsDevice/entry/src/main/js/default/pages/batteryInfo/batteryInfo.hml @@ -14,14 +14,14 @@ -->
-
- {{ $t('strings.batteryInfo_title') }} -
- {{ $t('strings.batterySOC') }}: {{ batterySOC }} - {{ $t('strings.chargingStatus') }}: {{ chargingStatus }} - {{ $t('strings.healthStatus') }}: {{ healthStatus }} - {{ $t('strings.pluggedType') }}: {{ pluggedType }} - {{ $t('strings.voltage') }}: {{ voltage }} - {{ $t('strings.technology') }}: {{ technology }} - {{ $t('strings.batteryTemperature') }}: {{ batteryTemperature }} +
+ {{ $t('strings.batteryInfo_title') }} +
+ {{ $t('strings.batterySOC') }}: {{ batterySOC }} + {{ $t('strings.chargingStatus') }}: {{ chargingStatus }} + {{ $t('strings.healthStatus') }}: {{ healthStatus }} + {{ $t('strings.pluggedType') }}: {{ pluggedType }} + {{ $t('strings.voltage') }}: {{ voltage }} + {{ $t('strings.technology') }}: {{ technology }} + {{ $t('strings.batteryTemperature') }}: {{ batteryTemperature }}
diff --git a/UI/JsDevice/entry/src/main/js/default/pages/batteryInfo/batteryInfo.js b/UI/JsDevice/entry/src/main/js/default/pages/batteryInfo/batteryInfo.js index 76139d85a..1418ed5fe 100644 --- a/UI/JsDevice/entry/src/main/js/default/pages/batteryInfo/batteryInfo.js +++ b/UI/JsDevice/entry/src/main/js/default/pages/batteryInfo/batteryInfo.js @@ -17,79 +17,79 @@ import router from '@ohos.router'; import batteryInfo from '@ohos.batteryInfo'; export default { - data: { - batterySOC: '', - chargingStatus: '', - healthStatus: '', - pluggedType: '', - voltage: '', - technology: '', - batteryTemperature: '' - }, - onInit() { - this.batteryInfo(); - }, - batteryInfo() { - this.batterySOC = batteryInfo.batterySOC; - switch (batteryInfo.chargingStatus) { - case 0: - this.chargingStatus = this.$t('strings.none'); - break; - case 1: - this.chargingStatus = this.$t('strings.enable'); - break; - case 2: - this.chargingStatus = this.$t('strings.disable'); - break; - case 3: - this.chargingStatus = this.$t('strings.full'); - break; - default: - break; - } - switch (batteryInfo.healthStatus) { - case 0: - this.healthStatus = this.$t('strings.unknown'); - break; - case 1: - this.healthStatus = this.$t('strings.good'); - break; - case 2: - this.healthStatus = this.$t('strings.overheat'); - break; - case 3: - this.healthStatus = this.$t('strings.overVoltage'); - break; - case 4: - this.healthStatus = this.$t('strings.cold'); - break; - case 5: - this.healthStatus = this.$t('strings.dead'); - break; - default: - break; - } - switch (batteryInfo.pluggedType) { - case 0: - this.pluggedType = this.$t('strings.none'); - break; - case 1: - this.pluggedType = this.$t('strings.ac'); - break; - case 2: - this.pluggedType = this.$t('strings.usb'); - break; - case 3: - this.pluggedType = this.$t('strings.wireless'); - break; - default: - break; - } - this.voltage = batteryInfo.voltage; - this.technology = batteryInfo.technology; - this.batteryTemperature = batteryInfo.batteryTemperature; - }, - back() { - router.back(); + data: { + batterySOC: '', + chargingStatus: '', + healthStatus: '', + pluggedType: '', + voltage: '', + technology: '', + batteryTemperature: '' + }, + onInit() { + this.batteryInfo(); + }, + batteryInfo() { + this.batterySOC = batteryInfo.batterySOC; + switch (batteryInfo.chargingStatus) { + case 0: + this.chargingStatus = this.$t('strings.none'); + break; + case 1: + this.chargingStatus = this.$t('strings.enable'); + break; + case 2: + this.chargingStatus = this.$t('strings.disable'); + break; + case 3: + this.chargingStatus = this.$t('strings.full'); + break; + default: + break; } + switch (batteryInfo.healthStatus) { + case 0: + this.healthStatus = this.$t('strings.unknown'); + break; + case 1: + this.healthStatus = this.$t('strings.good'); + break; + case 2: + this.healthStatus = this.$t('strings.overheat'); + break; + case 3: + this.healthStatus = this.$t('strings.overVoltage'); + break; + case 4: + this.healthStatus = this.$t('strings.cold'); + break; + case 5: + this.healthStatus = this.$t('strings.dead'); + break; + default: + break; + } + switch (batteryInfo.pluggedType) { + case 0: + this.pluggedType = this.$t('strings.none'); + break; + case 1: + this.pluggedType = this.$t('strings.ac'); + break; + case 2: + this.pluggedType = this.$t('strings.usb'); + break; + case 3: + this.pluggedType = this.$t('strings.wireless'); + break; + default: + break; + } + this.voltage = batteryInfo.voltage; + this.technology = batteryInfo.technology; + this.batteryTemperature = batteryInfo.batteryTemperature; + }, + back() { + router.back(); + } } diff --git a/UI/JsDevice/entry/src/main/js/default/pages/deviceInfo/deviceInfo.hml b/UI/JsDevice/entry/src/main/js/default/pages/deviceInfo/deviceInfo.hml index 2d1e1039a..ceb752fe6 100644 --- a/UI/JsDevice/entry/src/main/js/default/pages/deviceInfo/deviceInfo.hml +++ b/UI/JsDevice/entry/src/main/js/default/pages/deviceInfo/deviceInfo.hml @@ -14,20 +14,20 @@ -->
-
- {{ $t('strings.deviceInfo_title') }} -
- {{ $t('strings.serial') }}: {{ serial }} - {{ $t('strings.bootloaderVersion') }}: {{ bootloaderVersion }} - {{ $t('strings.securityPatchTag') }}: {{ securityPatchTag }} - {{ $t('strings.displayVersion') }}: {{ displayVersion }} - {{ $t('strings.osReleaseType') }}: {{ osReleaseType }} - {{ $t('strings.osFullName') }}: {{ osFullName }} - {{ $t('strings.majorVersion') }}: {{ majorVersion }} - {{ $t('strings.seniorVersion') }}: {{ seniorVersion }} - {{ $t('strings.featureVersion') }}: {{ featureVersion }} - {{ $t('strings.buildVersion') }}: {{ buildVersion }} - {{ $t('strings.sdkApiVersion') }}: {{ sdkApiVersion }} - {{ $t('strings.firstApiVersion') }}: {{ firstApiVersion }} - {{ $t('strings.versionId') }}: {{ versionId }} +
+ {{ $t('strings.deviceInfo_title') }} +
+ {{ $t('strings.serial') }}: {{ serial }} + {{ $t('strings.bootloaderVersion') }}: {{ bootloaderVersion }} + {{ $t('strings.securityPatchTag') }}: {{ securityPatchTag }} + {{ $t('strings.displayVersion') }}: {{ displayVersion }} + {{ $t('strings.osReleaseType') }}: {{ osReleaseType }} + {{ $t('strings.osFullName') }}: {{ osFullName }} + {{ $t('strings.majorVersion') }}: {{ majorVersion }} + {{ $t('strings.seniorVersion') }}: {{ seniorVersion }} + {{ $t('strings.featureVersion') }}: {{ featureVersion }} + {{ $t('strings.buildVersion') }}: {{ buildVersion }} + {{ $t('strings.sdkApiVersion') }}: {{ sdkApiVersion }} + {{ $t('strings.firstApiVersion') }}: {{ firstApiVersion }} + {{ $t('strings.versionId') }}: {{ versionId }}
diff --git a/UI/JsDevice/entry/src/main/js/default/pages/deviceInfo/deviceInfo.js b/UI/JsDevice/entry/src/main/js/default/pages/deviceInfo/deviceInfo.js index db71ef788..0d72dcf91 100644 --- a/UI/JsDevice/entry/src/main/js/default/pages/deviceInfo/deviceInfo.js +++ b/UI/JsDevice/entry/src/main/js/default/pages/deviceInfo/deviceInfo.js @@ -17,42 +17,42 @@ import router from '@ohos.router' import deviceInfo from '@ohos.deviceInfo'; export default { - data: { - serial: '', - bootloaderVersion: '', - abiList: '', - securityPatchTag: '', - displayVersion: '', - osReleaseType: '', - osFullName: '', - majorVersion: '', - seniorVersion: '', - featureVersion: '', - buildVersion: '', - sdkApiVersion: '', - firstApiVersion: '', - versionId: '', - data1: '' - }, - onInit() { - this.deviceInfo(); - }, - deviceInfo() { - this.serial = deviceInfo.serial; - this.bootloaderVersion = deviceInfo.bootloaderVersion; - this.securityPatchTag = deviceInfo.securityPatchTag; - this.displayVersion = deviceInfo.displayVersion; - this.osReleaseType = deviceInfo.osReleaseType; - this.osFullName = deviceInfo.osFullName; - this.majorVersion = deviceInfo.majorVersion; - this.seniorVersion = deviceInfo.seniorVersion; - this.featureVersion = deviceInfo.featureVersion; - this.buildVersion = deviceInfo.buildVersion; - this.sdkApiVersion = deviceInfo.sdkApiVersion; - this.firstApiVersion = deviceInfo.firstApiVersion; - this.versionId = deviceInfo.versionId; - }, - back() { - router.back(); - } + data: { + serial: '', + bootloaderVersion: '', + abiList: '', + securityPatchTag: '', + displayVersion: '', + osReleaseType: '', + osFullName: '', + majorVersion: '', + seniorVersion: '', + featureVersion: '', + buildVersion: '', + sdkApiVersion: '', + firstApiVersion: '', + versionId: '', + data1: '' + }, + onInit() { + this.deviceInfo(); + }, + deviceInfo() { + this.serial = deviceInfo.serial; + this.bootloaderVersion = deviceInfo.bootloaderVersion; + this.securityPatchTag = deviceInfo.securityPatchTag; + this.displayVersion = deviceInfo.displayVersion; + this.osReleaseType = deviceInfo.osReleaseType; + this.osFullName = deviceInfo.osFullName; + this.majorVersion = deviceInfo.majorVersion; + this.seniorVersion = deviceInfo.seniorVersion; + this.featureVersion = deviceInfo.featureVersion; + this.buildVersion = deviceInfo.buildVersion; + this.sdkApiVersion = deviceInfo.sdkApiVersion; + this.firstApiVersion = deviceInfo.firstApiVersion; + this.versionId = deviceInfo.versionId; + }, + back() { + router.back(); + } } \ No newline at end of file diff --git a/UI/JsDevice/entry/src/main/js/default/pages/index/index.css b/UI/JsDevice/entry/src/main/js/default/pages/index/index.css index 01a3d082c..c11dda5a0 100644 --- a/UI/JsDevice/entry/src/main/js/default/pages/index/index.css +++ b/UI/JsDevice/entry/src/main/js/default/pages/index/index.css @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * 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. + */ + .container { display: flex; flex-direction: column; diff --git a/UI/JsDevice/entry/src/main/js/default/pages/index/index.hml b/UI/JsDevice/entry/src/main/js/default/pages/index/index.hml index ac8f48b3e..4b6bb32d9 100644 --- a/UI/JsDevice/entry/src/main/js/default/pages/index/index.hml +++ b/UI/JsDevice/entry/src/main/js/default/pages/index/index.hml @@ -1,5 +1,20 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * 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. + */ +
- - - + + +
diff --git a/UI/JsDevice/entry/src/main/js/default/pages/index/index.js b/UI/JsDevice/entry/src/main/js/default/pages/index/index.js index d748a7a2c..119a9a436 100644 --- a/UI/JsDevice/entry/src/main/js/default/pages/index/index.js +++ b/UI/JsDevice/entry/src/main/js/default/pages/index/index.js @@ -1,19 +1,34 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * 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. + */ + import router from '@ohos.router' export default { - deviceInfo() { - router.push({ - url: 'pages/deviceInfo/deviceInfo' - }) - }, - systemProperties() { - router.push({ - url: 'pages/systemProperties/systemProperties' - }) - }, - batteryInfo() { - router.push({ - url: 'pages/batteryInfo/batteryInfo' - }) - } + deviceInfo() { + router.push({ + url: 'pages/deviceInfo/deviceInfo' + }) + }, + systemProperties() { + router.push({ + url: 'pages/systemProperties/systemProperties' + }) + }, + batteryInfo() { + router.push({ + url: 'pages/batteryInfo/batteryInfo' + }) + } } \ No newline at end of file diff --git a/UI/JsDevice/entry/src/main/js/default/pages/systemProperties/systemProperties.css b/UI/JsDevice/entry/src/main/js/default/pages/systemProperties/systemProperties.css index fe2ae24f6..fa5656187 100644 --- a/UI/JsDevice/entry/src/main/js/default/pages/systemProperties/systemProperties.css +++ b/UI/JsDevice/entry/src/main/js/default/pages/systemProperties/systemProperties.css @@ -23,6 +23,7 @@ margin: 20px; padding: 20px; } + .button-row { flex-direction: row; align-items: center; diff --git a/UI/JsDevice/entry/src/main/js/default/pages/systemProperties/systemProperties.hml b/UI/JsDevice/entry/src/main/js/default/pages/systemProperties/systemProperties.hml index e00bf588f..76c113b1b 100644 --- a/UI/JsDevice/entry/src/main/js/default/pages/systemProperties/systemProperties.hml +++ b/UI/JsDevice/entry/src/main/js/default/pages/systemProperties/systemProperties.hml @@ -14,23 +14,23 @@ -->
-
- {{ $t('strings.systemProperties_title') }} -
- {{ $t('strings.results') }}: {{ results }} -
- - -
-
- - -
-
- - -
-
- -
+
+ {{ $t('strings.systemProperties_title') }} +
+ {{ $t('strings.results') }}: {{ results }} +
+ + +
+
+ + +
+
+ + +
+
+ +
diff --git a/UI/JsDevice/entry/src/main/js/default/pages/systemProperties/systemProperties.js b/UI/JsDevice/entry/src/main/js/default/pages/systemProperties/systemProperties.js index 66266ddd3..1b64ef7c6 100644 --- a/UI/JsDevice/entry/src/main/js/default/pages/systemProperties/systemProperties.js +++ b/UI/JsDevice/entry/src/main/js/default/pages/systemProperties/systemProperties.js @@ -19,110 +19,110 @@ import systemParameter from '@ohos.systemParameter'; let self = null export default { - data: { - results: '' - }, - onInit() { - self = this - }, - setKey() { - try { - var promise = systemParameter.set("test.parameter.key", "testValue"); - promise.then(function (data) { - self.results = "setKey pass"; - console.log("set test.parameter.key success" + data); - }).catch(function (err) { - self.results = "set test.parameter.key error" + err.code; - console.log("set test.parameter.key error" + err.code); - }); - } catch (e) { - self.results = "set unexpected error:" + e; - console.log("set unexpected error:" + e); - } - }, - getKey() { - try { - var promise = systemParameter.get("test.parameter.key", "default"); - promise.then(function (data) { - self.results = "getKey pass"; - console.log("get test.parameter.key success:" + JSON.stringify(data)); - }).catch(function (err) { - self.results = "get test.parameter.key error:" + err.code; - console.log("get test.parameter.key error:" + err.code); - }); - } catch (e) { - self.results = "get unexpected error:" + e; - console.log("get unexpected error:" + e); - } - }, - setSync() { - try { - systemParameter.setSync("test.parameter.key", "testValue"); - this.results = "setSync pass"; - } catch (e) { - this.results = "setSync unexpected error:" + e; - console.log("setSync unexpected error:" + e); - } - }, - getSync() { - try { - var getSync = systemParameter.getSync("test.parameter.key", "default"); - console.log("getSync test.parameter.key value success:" + JSON.stringify(getSync)); - this.results = "getSync pass"; - } catch (e) { - this.results = "getSync unexpected error:" + e; - console.log("getSync unexpected error"); - } - }, - setASyncCallback() { - try { - systemParameter.set("test.parameter.key", "testValue", function (err, data) { - if (err == undefined) { - self.results = "setASyncCallback pass" - console.log("set test.parameter.key value success:" + data); - } else { - self.results = "set test.parameter.key value err:" + err.code; - console.log("set test.parameter.key value err:" + err.code); - } - }); - } catch (e) { - self.results = "set unexpected error:" + e; - console.log("set unexpected error:" + e); + data: { + results: '' + }, + onInit() { + self = this + }, + setKey() { + try { + var promise = systemParameter.set("test.parameter.key", "testValue"); + promise.then(function (data) { + self.results = "setKey pass"; + console.log("set test.parameter.key success" + data); + }).catch(function (err) { + self.results = "set test.parameter.key error" + err.code; + console.log("set test.parameter.key error" + err.code); + }); + } catch (e) { + self.results = "set unexpected error:" + e; + console.log("set unexpected error:" + e); + } + }, + getKey() { + try { + var promise = systemParameter.get("test.parameter.key", "default"); + promise.then(function (data) { + self.results = "getKey pass"; + console.log("get test.parameter.key success:" + JSON.stringify(data)); + }).catch(function (err) { + self.results = "get test.parameter.key error:" + err.code; + console.log("get test.parameter.key error:" + err.code); + }); + } catch (e) { + self.results = "get unexpected error:" + e; + console.log("get unexpected error:" + e); + } + }, + setSync() { + try { + systemParameter.setSync("test.parameter.key", "testValue"); + this.results = "setSync pass"; + } catch (e) { + this.results = "setSync unexpected error:" + e; + console.log("setSync unexpected error:" + e); + } + }, + getSync() { + try { + var getSync = systemParameter.getSync("test.parameter.key", "default"); + console.log("getSync test.parameter.key value success:" + JSON.stringify(getSync)); + this.results = "getSync pass"; + } catch (e) { + this.results = "getSync unexpected error:" + e; + console.log("getSync unexpected error"); + } + }, + setASyncCallback() { + try { + systemParameter.set("test.parameter.key", "testValue", function (err, data) { + if (err == undefined) { + self.results = "setASyncCallback pass" + console.log("set test.parameter.key value success:" + data); + } else { + self.results = "set test.parameter.key value err:" + err.code; + console.log("set test.parameter.key value err:" + err.code); } - }, - getAsyncCallback() { - try { - systemParameter.get("test.parameter.key", function (err, data) { - if (err == undefined) { - self.results = "getAsyncCallback pass"; - console.log("get test.parameter.key value success:" + data); - } else { - self.results = "get test.parameter.key value err:" + err.code; - console.log("get test.parameter.key value err:" + err.code); - } - }); - } catch (e) { - self.results = "getSync unexpected error:" + e; - console.log("getSync unexpected error:" + e); + }); + } catch (e) { + self.results = "set unexpected error:" + e; + console.log("set unexpected error:" + e); + } + }, + getAsyncCallback() { + try { + systemParameter.get("test.parameter.key", function (err, data) { + if (err == undefined) { + self.results = "getAsyncCallback pass"; + console.log("get test.parameter.key value success:" + data); + } else { + self.results = "get test.parameter.key value err:" + err.code; + console.log("get test.parameter.key value err:" + err.code); } - }, - getDefAsyncCallback() { - try { - systemParameter.get("test.parameter.key", "default", function (err, data) { - if (err == undefined) { - self.results = "getDefAsyncCallback pass"; - console.log("get test.parameter.key value success:" + data); - } else { - self.results = "get test.parameter.key value err:" + err.code; - console.log("get test.parameter.key value err:" + err.code); - } - }); - } catch (e) { - self.results = "get test.parameter.key value err:" + e; - console.log("get test.parameter.key value err:" + e); + }); + } catch (e) { + self.results = "getSync unexpected error:" + e; + console.log("getSync unexpected error:" + e); + } + }, + getDefAsyncCallback() { + try { + systemParameter.get("test.parameter.key", "default", function (err, data) { + if (err == undefined) { + self.results = "getDefAsyncCallback pass"; + console.log("get test.parameter.key value success:" + data); + } else { + self.results = "get test.parameter.key value err:" + err.code; + console.log("get test.parameter.key value err:" + err.code); } - }, - back() { - router.back(); + }); + } catch (e) { + self.results = "get test.parameter.key value err:" + e; + console.log("get test.parameter.key value err:" + e); } + }, + back() { + router.back(); + } } \ No newline at end of file diff --git a/UI/JsDevice/package.json b/UI/JsDevice/package.json index 49e4c0947..1d823ce9d 100644 --- a/UI/JsDevice/package.json +++ b/UI/JsDevice/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } diff --git a/UI/JsDialog/.gitignore b/UI/JsDialog/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/UI/JsDialog/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/UI/JsDialog/README_zh.md b/UI/JsDialog/README_zh.md index 442dfa92d..34dd42c26 100644 --- a/UI/JsDialog/README_zh.md +++ b/UI/JsDialog/README_zh.md @@ -24,4 +24,4 @@ JS中支持用户自定义弹窗，组件作为容器组件，用户可 1.本示例支持标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 diff --git a/UI/JsDialog/entry/src/main/js/default/app.js b/UI/JsDialog/entry/src/main/js/default/app.js index 58d12b7b5..6d4065abc 100644 --- a/UI/JsDialog/entry/src/main/js/default/app.js +++ b/UI/JsDialog/entry/src/main/js/default/app.js @@ -14,10 +14,10 @@ */ export default { - onCreate() { - console.info("Application onCreate"); - }, - onDestroy() { - console.info("Application onDestroy"); - } + onCreate() { + console.info("Application onCreate"); + }, + onDestroy() { + console.info("Application onDestroy"); + } }; diff --git a/UI/JsDialog/entry/src/main/js/default/pages/index/index.hml b/UI/JsDialog/entry/src/main/js/default/pages/index/index.hml index 05882115d..5711cf039 100644 --- a/UI/JsDialog/entry/src/main/js/default/pages/index/index.hml +++ b/UI/JsDialog/entry/src/main/js/default/pages/index/index.hml @@ -14,62 +14,62 @@ -->
-
- {{ $t('strings.title') }} - {{ $t('strings.add') }} -
- - - -
-
-
- {{ $t('strings.name') }} - {{ $item.name }} -
-
- {{ $t('strings.phone') }} - {{ $item.phone }} -
-
- {{ $t('strings.delete') }} - -
- - - - - {{ $t('strings.tips') }} - - - -
- {{ $t('strings.delete_tips') }} -
- - - -
-
- - -
-
- {{ $t('strings.name') }} - {{ name }} +
+ {{ $t('strings.title') }} + {{ $t('strings.add') }} +
+ + + +
+
+
+ {{ $t('strings.name') }} + {{ $item.name }}
-
- {{ $t('strings.phone') }} - {{ phone }} -
-
- - - +
+ {{ $t('strings.phone') }} + {{ $item.phone }}
+
+ {{ $t('strings.delete') }} +
-
+ + + + + {{ $t('strings.tips') }} + + + +
+ {{ $t('strings.delete_tips') }} +
+ + + +
+
+ + +
+
+ {{ $t('strings.name') }} + {{ name }} +
+
+ {{ $t('strings.phone') }} + {{ phone }} +
+
+ + + +
+
+
diff --git a/UI/JsDialog/entry/src/main/js/default/pages/index/index.js b/UI/JsDialog/entry/src/main/js/default/pages/index/index.js index a50135089..a48ed056f 100644 --- a/UI/JsDialog/entry/src/main/js/default/pages/index/index.js +++ b/UI/JsDialog/entry/src/main/js/default/pages/index/index.js @@ -14,48 +14,48 @@ */ export default { - data: { - listItem: [], - showTips: true, - name: '', - phone: '17700000000', - num: 0, - deleteItem: null - }, - onclick: function () { - this.name = this.$t('strings.contact') + this.num - this.$element('showDialog').show(); - }, - showDeleteDialog: function (object) { - console.info('delete:' + JSON.stringify(object)) - this.deleteItem = object - this.$element('deleteDialog').show(); - }, - cancelDeleteDialog: function () { - this.deleteItem = null - this.$element('deleteDialog').close(); - }, - cancelDialog: function () { - this.$element('showDialog').close(); - }, - onConfirm: function () { - this.num += 1 - this.listItem.push({ - 'name': this.name, 'phone': this.phone - }) - this.showTips = false - this.$element('showDialog').close(); - }, - onDeleteSure: function () { - var index = this.listItem.indexOf(this.deleteItem) - console.info('index=' + index) - this.listItem.splice(index, 1) - if (this.listItem.length === 0) { - this.num = 0 - this.showTips = true - } - this.$element('deleteDialog').close(); + data: { + listItem: [], + showTips: true, + name: '', + phone: '17700000000', + num: 0, + deleteItem: null + }, + onclick: function () { + this.name = this.$t('strings.contact') + this.num + this.$element('showDialog').show(); + }, + showDeleteDialog: function (object) { + console.info('delete:' + JSON.stringify(object)) + this.deleteItem = object + this.$element('deleteDialog').show(); + }, + cancelDeleteDialog: function () { + this.deleteItem = null + this.$element('deleteDialog').close(); + }, + cancelDialog: function () { + this.$element('showDialog').close(); + }, + onConfirm: function () { + this.num += 1 + this.listItem.push({ + 'name': this.name, 'phone': this.phone + }) + this.showTips = false + this.$element('showDialog').close(); + }, + onDeleteSure: function () { + var index = this.listItem.indexOf(this.deleteItem) + console.info('index=' + index) + this.listItem.splice(index, 1) + if (this.listItem.length === 0) { + this.num = 0 + this.showTips = true } + this.$element('deleteDialog').close(); + } } diff --git a/UI/JsDialog/package.json b/UI/JsDialog/package.json index 65f095238..5b989f73f 100644 --- a/UI/JsDialog/package.json +++ b/UI/JsDialog/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } \ No newline at end of file diff --git a/UI/chart/.gitignore b/UI/chart/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/UI/chart/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/UI/chart/README_zh.md b/UI/chart/README_zh.md index ea2202a51..02957c446 100644 --- a/UI/chart/README_zh.md +++ b/UI/chart/README_zh.md @@ -24,6 +24,6 @@ 1.本示例仅支持在标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行 diff --git a/UI/chart/entry/package.json b/UI/chart/entry/package.json index 459f5f8dc..48ec2fafe 100644 --- a/UI/chart/entry/package.json +++ b/UI/chart/entry/package.json @@ -11,4 +11,4 @@ "repository": {}, "version": "1.0.0", "dependencies": {} -} \ No newline at end of file +} diff --git a/UI/chart/entry/src/main/js/default/app.js b/UI/chart/entry/src/main/js/default/app.js index 8e47afff1..50007322f 100644 --- a/UI/chart/entry/src/main/js/default/app.js +++ b/UI/chart/entry/src/main/js/default/app.js @@ -14,10 +14,10 @@ */ export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } }; diff --git a/UI/chart/entry/src/main/js/default/pages/bar/index.css b/UI/chart/entry/src/main/js/default/pages/bar/index.css index 00e94fc6c..44f7f2bf2 100644 --- a/UI/chart/entry/src/main/js/default/pages/bar/index.css +++ b/UI/chart/entry/src/main/js/default/pages/bar/index.css @@ -13,7 +13,7 @@ * limitations under the License. */ - @import '../../common/common.css'; +@import '../../common/common.css'; .data-bar { width: 95%; diff --git a/UI/chart/entry/src/main/js/default/pages/bar/index.hml b/UI/chart/entry/src/main/js/default/pages/bar/index.hml index 4c3aae497..bc6959835 100644 --- a/UI/chart/entry/src/main/js/default/pages/bar/index.hml +++ b/UI/chart/entry/src/main/js/default/pages/bar/index.hml @@ -14,5 +14,5 @@ -->
- +
\ No newline at end of file diff --git a/UI/chart/entry/src/main/js/default/pages/bar/index.js b/UI/chart/entry/src/main/js/default/pages/bar/index.js index 82c60cc98..7d5f806d5 100644 --- a/UI/chart/entry/src/main/js/default/pages/bar/index.js +++ b/UI/chart/entry/src/main/js/default/pages/bar/index.js @@ -14,34 +14,34 @@ */ export default { - data: { - barData: [ - { - fillColor: '#f07826', - data: [763, 550, 551, 554, 731], - }, - { - fillColor: '#cce9ff', - data: [535, 776, 615, 444, 694], - }, - { - fillColor: '#ff88bb', - data: [673, 500, 574, 483, 702], - }, - ], - barOps: { - xAxis: { - min: 0, - max: 20, - display: true, - axisTick: 5, - }, - yAxis: { - min: 0, - max: 1000, - display: true, - axisTick: 10, - }, - }, - } + data: { + barData: [ + { + fillColor: '#f07826', + data: [763, 550, 551, 554, 731], + }, + { + fillColor: '#cce9ff', + data: [535, 776, 615, 444, 694], + }, + { + fillColor: '#ff88bb', + data: [673, 500, 574, 483, 702], + }, + ], + barOps: { + xAxis: { + min: 0, + max: 20, + display: true, + axisTick: 5, + }, + yAxis: { + min: 0, + max: 1000, + display: true, + axisTick: 10, + }, + }, + } } \ No newline at end of file diff --git a/UI/chart/entry/src/main/js/default/pages/guage/index.css b/UI/chart/entry/src/main/js/default/pages/guage/index.css index 20b1bb1e5..ec56340e3 100644 --- a/UI/chart/entry/src/main/js/default/pages/guage/index.css +++ b/UI/chart/entry/src/main/js/default/pages/guage/index.css @@ -13,7 +13,7 @@ * limitations under the License. */ - @import '../../common/common.css'; +@import '../../common/common.css'; .gauge-region { height: 200px; diff --git a/UI/chart/entry/src/main/js/default/pages/guage/index.hml b/UI/chart/entry/src/main/js/default/pages/guage/index.hml index 498cc88cc..8b9c0bf82 100644 --- a/UI/chart/entry/src/main/js/default/pages/guage/index.hml +++ b/UI/chart/entry/src/main/js/default/pages/guage/index.hml @@ -14,7 +14,7 @@ -->
-
- -
+
+ +
\ No newline at end of file diff --git a/UI/chart/entry/src/main/js/default/pages/index/index.hml b/UI/chart/entry/src/main/js/default/pages/index/index.hml index 8efdb5817..ff3976d05 100644 --- a/UI/chart/entry/src/main/js/default/pages/index/index.hml +++ b/UI/chart/entry/src/main/js/default/pages/index/index.hml @@ -14,10 +14,10 @@ -->
- - - - - - + + + + + +
\ No newline at end of file diff --git a/UI/chart/entry/src/main/js/default/pages/index/index.js b/UI/chart/entry/src/main/js/default/pages/index/index.js index 6138068e8..3b6afc025 100644 --- a/UI/chart/entry/src/main/js/default/pages/index/index.js +++ b/UI/chart/entry/src/main/js/default/pages/index/index.js @@ -16,10 +16,10 @@ import router from '@ohos.router'; export default { - data: {}, - onClick(type) { - router.push({ - url: 'pages/' + type +'/index' - }) - } + data: {}, + onClick(type) { + router.push({ + url: 'pages/' + type + '/index' + }) + } } diff --git a/UI/chart/entry/src/main/js/default/pages/line/index.css b/UI/chart/entry/src/main/js/default/pages/line/index.css index 33b306ad5..af994d323 100644 --- a/UI/chart/entry/src/main/js/default/pages/line/index.css +++ b/UI/chart/entry/src/main/js/default/pages/line/index.css @@ -13,7 +13,7 @@ * limitations under the License. */ - @import '../../common/common.css'; +@import '../../common/common.css'; .chart-data { width: 100%; diff --git a/UI/chart/entry/src/main/js/default/pages/line/index.hml b/UI/chart/entry/src/main/js/default/pages/line/index.hml index 581690989..4076f96ae 100644 --- a/UI/chart/entry/src/main/js/default/pages/line/index.hml +++ b/UI/chart/entry/src/main/js/default/pages/line/index.hml @@ -14,5 +14,5 @@ -->
- +
\ No newline at end of file diff --git a/UI/chart/entry/src/main/js/default/pages/line/index.js b/UI/chart/entry/src/main/js/default/pages/line/index.js index 79f26436f..1837e5af6 100644 --- a/UI/chart/entry/src/main/js/default/pages/line/index.js +++ b/UI/chart/entry/src/main/js/default/pages/line/index.js @@ -14,107 +14,107 @@ */ export default { - data: { - lineData: [ - { - strokeColor: '#0081ff', - fillColor: '#cce5ff', - data: [ - { - value: 25, - description: "25", - textLocation: "top", - textColor: '#000000' - }, - { - value: 20, - description: "20", - textLocation: "bottom", - textColor: '#000000' - }, - { - value: 37, - description: "37", - textLocation: "top", - textColor: '#000000' - }, - { - value: 48, - description: "48", - textLocation: "top", - textColor: '#000000' - }, - { - value: 27, - description: "27", - textLocation: "bottom", - textColor: '#000000' - }, - { - value: 80, - description: "80", - textLocation: "top", - textColor: '#000000' - }, - { - value: 20, - description: "20", - textLocation: "bottom", - textColor: '#000000' - }, - { - value: 66, - description: "66", - textLocation: "top", - textColor: '#000000' - }, - { - value: 21, - description: "21", - textLocation: "bottom", - textColor: '#000000' - }, - { - value: 81, - description: "81", - textLocation: "top", - textColor: '#000000' - }, - ], - gradient: true, - } + data: { + lineData: [ + { + strokeColor: '#0081ff', + fillColor: '#cce5ff', + data: [ + { + value: 25, + description: "25", + textLocation: "top", + textColor: '#000000' + }, + { + value: 20, + description: "20", + textLocation: "bottom", + textColor: '#000000' + }, + { + value: 37, + description: "37", + textLocation: "top", + textColor: '#000000' + }, + { + value: 48, + description: "48", + textLocation: "top", + textColor: '#000000' + }, + { + value: 27, + description: "27", + textLocation: "bottom", + textColor: '#000000' + }, + { + value: 80, + description: "80", + textLocation: "top", + textColor: '#000000' + }, + { + value: 20, + description: "20", + textLocation: "bottom", + textColor: '#000000' + }, + { + value: 66, + description: "66", + textLocation: "top", + textColor: '#000000' + }, + { + value: 21, + description: "21", + textLocation: "bottom", + textColor: '#000000' + }, + { + value: 81, + description: "81", + textLocation: "top", + textColor: '#000000' + }, ], - lineOps: { - xAxis: { - min: 0, - max: 10, - axisTick: 10, - display: true, - }, - yAxis: { - min: 0, - max: 100, - axisTick: 20, - display: true, - }, - series: { - lineStyle: { - width: "3px", - smooth: true, - }, - headPoint: { - shape: "circle", - size: 5, - strokeWidth: 5, - fillColor: '#000000', - strokeColor: '#007aff', - display: true, - }, - loop: { - margin: 2, - gradient: true, - } - } + gradient: true, + } + ], + lineOps: { + xAxis: { + min: 0, + max: 10, + axisTick: 10, + display: true, + }, + yAxis: { + min: 0, + max: 100, + axisTick: 20, + display: true, + }, + series: { + lineStyle: { + width: "3px", + smooth: true, }, - } + headPoint: { + shape: "circle", + size: 5, + strokeWidth: 5, + fillColor: '#000000', + strokeColor: '#007aff', + display: true, + }, + loop: { + margin: 2, + gradient: true, + } + } + }, + } } \ No newline at end of file diff --git a/UI/chart/entry/src/main/js/default/pages/loading/index.css b/UI/chart/entry/src/main/js/default/pages/loading/index.css index e0928b14f..778677361 100644 --- a/UI/chart/entry/src/main/js/default/pages/loading/index.css +++ b/UI/chart/entry/src/main/js/default/pages/loading/index.css @@ -13,7 +13,7 @@ * limitations under the License. */ - @import '../../common/common.css'; +@import '../../common/common.css'; .chart-data { width: 200px; diff --git a/UI/chart/entry/src/main/js/default/pages/loading/index.hml b/UI/chart/entry/src/main/js/default/pages/loading/index.hml index a773997ed..12b30c7d0 100644 --- a/UI/chart/entry/src/main/js/default/pages/loading/index.hml +++ b/UI/chart/entry/src/main/js/default/pages/loading/index.hml @@ -14,5 +14,5 @@ -->
- +
\ No newline at end of file diff --git a/UI/chart/entry/src/main/js/default/pages/loading/index.js b/UI/chart/entry/src/main/js/default/pages/loading/index.js index 601b567c3..92047bab9 100644 --- a/UI/chart/entry/src/main/js/default/pages/loading/index.js +++ b/UI/chart/entry/src/main/js/default/pages/loading/index.js @@ -14,9 +14,9 @@ */ export default { - data: { - segment: { - value: 100 - } + data: { + segment: { + value: 100 } + } } \ No newline at end of file diff --git a/UI/chart/entry/src/main/js/default/pages/progress/index.css b/UI/chart/entry/src/main/js/default/pages/progress/index.css index e0928b14f..778677361 100644 --- a/UI/chart/entry/src/main/js/default/pages/progress/index.css +++ b/UI/chart/entry/src/main/js/default/pages/progress/index.css @@ -13,7 +13,7 @@ * limitations under the License. */ - @import '../../common/common.css'; +@import '../../common/common.css'; .chart-data { width: 200px; diff --git a/UI/chart/entry/src/main/js/default/pages/progress/index.hml b/UI/chart/entry/src/main/js/default/pages/progress/index.hml index 34bf424e2..60ac1a33f 100644 --- a/UI/chart/entry/src/main/js/default/pages/progress/index.hml +++ b/UI/chart/entry/src/main/js/default/pages/progress/index.hml @@ -14,5 +14,5 @@ -->
- +
\ No newline at end of file diff --git a/UI/chart/entry/src/main/js/default/pages/progress/index.js b/UI/chart/entry/src/main/js/default/pages/progress/index.js index 601b567c3..92047bab9 100644 --- a/UI/chart/entry/src/main/js/default/pages/progress/index.js +++ b/UI/chart/entry/src/main/js/default/pages/progress/index.js @@ -14,9 +14,9 @@ */ export default { - data: { - segment: { - value: 100 - } + data: { + segment: { + value: 100 } + } } \ No newline at end of file diff --git a/UI/chart/entry/src/main/js/default/pages/rainbow/index.css b/UI/chart/entry/src/main/js/default/pages/rainbow/index.css index 3855e1e2b..e793cdfee 100644 --- a/UI/chart/entry/src/main/js/default/pages/rainbow/index.css +++ b/UI/chart/entry/src/main/js/default/pages/rainbow/index.css @@ -13,7 +13,7 @@ * limitations under the License. */ - @import '../../common/common.css'; +@import '../../common/common.css'; .chart-data { width: 170px; diff --git a/UI/chart/entry/src/main/js/default/pages/rainbow/index.hml b/UI/chart/entry/src/main/js/default/pages/rainbow/index.hml index 4b5cb5bed..294772da2 100644 --- a/UI/chart/entry/src/main/js/default/pages/rainbow/index.hml +++ b/UI/chart/entry/src/main/js/default/pages/rainbow/index.hml @@ -14,27 +14,27 @@ -->
- -
-
-
- {{ $t('strings.accounted') }} 40% -
-
-
- {{ $t('strings.accounted') }} 20% -
-
-
- {{ $t('strings.accounted') }} 10% -
-
-
- {{ $t('strings.accounted') }} 15% -
-
-
- {{ $t('strings.accounted') }} 15% -
+ +
+
+
+ {{ $t('strings.accounted') }} 40%
+
+
+ {{ $t('strings.accounted') }} 20% +
+
+
+ {{ $t('strings.accounted') }} 10% +
+
+
+ {{ $t('strings.accounted') }} 15% +
+
+
+ {{ $t('strings.accounted') }} 15% +
+
\ No newline at end of file diff --git a/UI/chart/entry/src/main/js/default/pages/rainbow/index.js b/UI/chart/entry/src/main/js/default/pages/rainbow/index.js index 04614d8e0..c042d17b1 100644 --- a/UI/chart/entry/src/main/js/default/pages/rainbow/index.js +++ b/UI/chart/entry/src/main/js/default/pages/rainbow/index.js @@ -14,33 +14,33 @@ */ export default { - data: { - segment: [ - { - startColor: "#f7ce00", - endColor: "#f99b11", - value: 40 - }, - { - startColor: "#f76223", - endColor: "#f2400a", - value: 20 - }, - { - startColor: "#f772ac", - endColor: "#e65392", - value: 10 - }, - { - startColor: "#a575eb", - endColor: "#a12df7", - value: 15 - }, - { - startColor: "#7b79f7", - endColor: "#4b48f7", - value: 15 - } - ] - } + data: { + segment: [ + { + startColor: "#f7ce00", + endColor: "#f99b11", + value: 40 + }, + { + startColor: "#f76223", + endColor: "#f2400a", + value: 20 + }, + { + startColor: "#f772ac", + endColor: "#e65392", + value: 10 + }, + { + startColor: "#a575eb", + endColor: "#a12df7", + value: 15 + }, + { + startColor: "#7b79f7", + endColor: "#4b48f7", + value: 15 + } + ] + } } \ No newline at end of file diff --git a/UI/chart/package.json b/UI/chart/package.json index 5a670c660..aac0e27f1 100644 --- a/UI/chart/package.json +++ b/UI/chart/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } \ No newline at end of file diff --git a/ability/FormAbility/.gitignore b/ability/FormAbility/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/ability/FormAbility/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/ability/FormAbility/README_zh.md b/ability/FormAbility/README_zh.md index a8d84af52..6296336d9 100644 --- a/ability/FormAbility/README_zh.md +++ b/ability/FormAbility/README_zh.md @@ -26,4 +26,4 @@ 1.本示例仅支持标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 \ No newline at end of file +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 \ No newline at end of file diff --git a/ability/FormAbility/entry/src/main/ets/FormAbility/form.ts b/ability/FormAbility/entry/src/main/ets/FormAbility/form.ts index 30b83a370..5fb511fa1 100644 --- a/ability/FormAbility/entry/src/main/ets/FormAbility/form.ts +++ b/ability/FormAbility/entry/src/main/ets/FormAbility/form.ts @@ -25,156 +25,156 @@ const FORM_PARAM_NAME_KEY = "ohos.extra.param.key.form_name"; const FORM_PARAM_TEMPORARY_KEY = "ohos.extra.param.key.form_temporary"; function getTemperature(formId: string, count: number) { - const DECIMAL: number = 10; - const parsedFormId: number = parseInt(formId, DECIMAL); - const BASE_TEMP_MOD: number = 20; - const baseTemperature: number = parsedFormId % BASE_TEMP_MOD; - const RANGE_TEMP_MOD: number = 20; - return baseTemperature + Math.abs(count % RANGE_TEMP_MOD - RANGE_TEMP_MOD / 2); + const DECIMAL: number = 10; + const parsedFormId: number = parseInt(formId, DECIMAL); + const BASE_TEMP_MOD: number = 20; + const baseTemperature: number = parsedFormId % BASE_TEMP_MOD; + const RANGE_TEMP_MOD: number = 20; + return baseTemperature + Math.abs(count % RANGE_TEMP_MOD - RANGE_TEMP_MOD / 2); } function padZero(num: number) { - // trans num to string and pad 0 - if (num < 10) { - return `0${num}`; - } else { - return num.toString(); - } + // trans num to string and pad 0 + if (num < 10) { + return `0${num}`; + } else { + return num.toString(); + } } function getTime() { - const date = new Date(); - const hours = padZero(date.getHours()); - const minutes = padZero(date.getMinutes()); - const seconds = padZero(date.getSeconds()); - return `${hours}:${minutes}:${seconds}` + const date = new Date(); + const hours = padZero(date.getHours()); + const minutes = padZero(date.getMinutes()); + const seconds = padZero(date.getSeconds()); + return `${hours}:${minutes}:${seconds}` } async function storeFormInfo(formId: string, formName: string, tempFlag: boolean) { - let formInfo = { - "formName": formName, - "tempFlag": tempFlag, - "updateCount": 0 - }; - try { - const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); - // put form info - await storage.put(formId, JSON.stringify(formInfo)); - Logger.log(`storeFormInfo, put form info successfully, formId: ${formId}`); - await storage.flush(); - } catch (err) { - Logger.error(`failed to storeFormInfo, err: ${JSON.stringify(err)}`); - } + let formInfo = { + "formName": formName, + "tempFlag": tempFlag, + "updateCount": 0 + }; + try { + const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); + // put form info + await storage.put(formId, JSON.stringify(formInfo)); + Logger.log(`storeFormInfo, put form info successfully, formId: ${formId}`); + await storage.flush(); + } catch (err) { + Logger.error(`failed to storeFormInfo, err: ${JSON.stringify(err)}`); + } } async function updateTempFormInfo(formId: string) { - let formInfoDefault = { - "formName": "", - "tempFlag": false, - "updateCount": 0 - }; - try { - const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); - // get form info - const data = await storage.get(formId, JSON.stringify(formInfoDefault)); - Logger.log(`updateTempFormInfo, get form info successfully, formId: ${formId}`); - const formInfo = JSON.parse(data.toString()); - if (!formInfo.tempFlag) { - Logger.log(`updateTempFormInfo, formId: ${formId} is not temporary.`); - return; - } - - formInfo.tempFlag = false; - // update form info - await storage.put(formId, JSON.stringify(formInfo)); - Logger.log(`updateTempFormInfo, update form info successfully, formId: ${formId}`); - await storage.flush(); - } catch (err) { - Logger.error(`failed to updateTempFormInfo, err: ${JSON.stringify(err)}`); + let formInfoDefault = { + "formName": "", + "tempFlag": false, + "updateCount": 0 + }; + try { + const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); + // get form info + const data = await storage.get(formId, JSON.stringify(formInfoDefault)); + Logger.log(`updateTempFormInfo, get form info successfully, formId: ${formId}`); + const formInfo = JSON.parse(data.toString()); + if (!formInfo.tempFlag) { + Logger.log(`updateTempFormInfo, formId: ${formId} is not temporary.`); + return; } + + formInfo.tempFlag = false; + // update form info + await storage.put(formId, JSON.stringify(formInfo)); + Logger.log(`updateTempFormInfo, update form info successfully, formId: ${formId}`); + await storage.flush(); + } catch (err) { + Logger.error(`failed to updateTempFormInfo, err: ${JSON.stringify(err)}`); + } } async function updateForm(formId: string) { - let formInfoDefault = { - "formName": "", - "tempFlag": false, - "updateCount": 0 - }; - try { - const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); - // get form info - const data = await storage.get(formId, JSON.stringify(formInfoDefault)); - Logger.log(`updateForm, get form info successfully, formId: ${formId}`); - const formInfo = JSON.parse(data.toString()); - formInfo.updateCount = formInfo.updateCount + 1; + let formInfoDefault = { + "formName": "", + "tempFlag": false, + "updateCount": 0 + }; + try { + const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); + // get form info + const data = await storage.get(formId, JSON.stringify(formInfoDefault)); + Logger.log(`updateForm, get form info successfully, formId: ${formId}`); + const formInfo = JSON.parse(data.toString()); + formInfo.updateCount = formInfo.updateCount + 1; - let obj = { - "temperature": getTemperature(formId, formInfo.updateCount).toString(), - "time": getTime() - }; - let formData = formBindingData.createFormBindingData(obj); - formProvider.updateForm(formId, formData).catch((err) => { - Logger.error(`updateForm, err: ${JSON.stringify(err)}`); - }); + let obj = { + "temperature": getTemperature(formId, formInfo.updateCount).toString(), + "time": getTime() + }; + let formData = formBindingData.createFormBindingData(obj); + formProvider.updateForm(formId, formData).catch((err) => { + Logger.error(`updateForm, err: ${JSON.stringify(err)}`); + }); - // update form info - await storage.put(formId, JSON.stringify(formInfo)); - Logger.log(`updateForm, update form info successfully, formId: ${formId}`); - await storage.flush(); - } catch (err) { - Logger.error(`failed to updateForm, err: ${JSON.stringify(err)}`); - } + // update form info + await storage.put(formId, JSON.stringify(formInfo)); + Logger.log(`updateForm, update form info successfully, formId: ${formId}`); + await storage.flush(); + } catch (err) { + Logger.error(`failed to updateForm, err: ${JSON.stringify(err)}`); + } } async function deleteFormInfo(formId: string) { - try { - const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); - // del form info - await storage.delete(formId); - Logger.log(`deleteFormInfo, del form info successfully, formId: ${formId}`); - await storage.flush(); - } catch (err) { - Logger.error(`failed to deleteFormInfo, err: ${JSON.stringify(err)}`); - } + try { + const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); + // del form info + await storage.delete(formId); + Logger.log(`deleteFormInfo, del form info successfully, formId: ${formId}`); + await storage.flush(); + } catch (err) { + Logger.error(`failed to deleteFormInfo, err: ${JSON.stringify(err)}`); + } } export default { - onCreate(want) { - Logger.log(`FormAbility onCreate, want: ${JSON.stringify(want)}`); + onCreate(want) { + Logger.log(`FormAbility onCreate, want: ${JSON.stringify(want)}`); - // get form info - let formId = want.parameters[FORM_PARAM_IDENTITY_KEY]; - let formName = want.parameters[FORM_PARAM_NAME_KEY]; - let tempFlag = want.parameters[FORM_PARAM_TEMPORARY_KEY]; - storeFormInfo(formId, formName, tempFlag); + // get form info + let formId = want.parameters[FORM_PARAM_IDENTITY_KEY]; + let formName = want.parameters[FORM_PARAM_NAME_KEY]; + let tempFlag = want.parameters[FORM_PARAM_TEMPORARY_KEY]; + storeFormInfo(formId, formName, tempFlag); - let obj = { - "temperature": getTemperature(formId, 0).toString(), - "time": getTime() - }; - let formData = formBindingData.createFormBindingData(obj); - return formData; - }, - onCastToNormal(formId) { - Logger.log(`FormAbility onCastToNormal, formId: ${formId}`); - updateTempFormInfo(formId); - }, - onUpdate(formId) { - Logger.log(`FormAbility onUpdate, formId: ${formId}`); - updateForm(formId); - }, - onVisibilityChange(newStatus) { - Logger.log(`FormAbility onVisibilityChange`); - }, - onEvent(formId, message) { - Logger.log(`FormAbility onEvent, formId = ${formId}, message: ${JSON.stringify(message)}`); - }, - onDestroy(formId) { - Logger.log(`FormAbility onDestroy, formId = ${formId}`); - deleteFormInfo(formId); - }, - onAcquireFormState(want) { - Logger.log(`FormAbility onAcquireFormState`); - return formInfo.FormState.READY; - }, + let obj = { + "temperature": getTemperature(formId, 0).toString(), + "time": getTime() + }; + let formData = formBindingData.createFormBindingData(obj); + return formData; + }, + onCastToNormal(formId) { + Logger.log(`FormAbility onCastToNormal, formId: ${formId}`); + updateTempFormInfo(formId); + }, + onUpdate(formId) { + Logger.log(`FormAbility onUpdate, formId: ${formId}`); + updateForm(formId); + }, + onVisibilityChange(newStatus) { + Logger.log(`FormAbility onVisibilityChange`); + }, + onEvent(formId, message) { + Logger.log(`FormAbility onEvent, formId = ${formId}, message: ${JSON.stringify(message)}`); + }, + onDestroy(formId) { + Logger.log(`FormAbility onDestroy, formId = ${formId}`); + deleteFormInfo(formId); + }, + onAcquireFormState(want) { + Logger.log(`FormAbility onAcquireFormState`); + return formInfo.FormState.READY; + }, } diff --git a/ability/FormAbility/entry/src/main/ets/model/Logger.ts b/ability/FormAbility/entry/src/main/ets/model/Logger.ts index 28f4cb864..1708e3bf8 100644 --- a/ability/FormAbility/entry/src/main/ets/model/Logger.ts +++ b/ability/FormAbility/entry/src/main/ets/model/Logger.ts @@ -14,22 +14,28 @@ */ class Logger { - constructor(private prefix: string) {} - public log(...args: any[]) { - console.log(`[${this.prefix}]: ${args.join('')}`) - } - public info(...args: any[]) { - console.info(`[${this.prefix}]: ${args.join('')}`) - } - public debug(...args: any[]) { - console.debug(`[${this.prefix}]: ${args.join('')}`) - } - public warn(...args: any[]) { - console.warn(`[${this.prefix}]: ${args.join('')}`) - } - public error(...args: any[]) { - console.error(`[${this.prefix}]: ${args.join('')}`) - } + constructor(private prefix: string) { + } + + public log(...args: any[]) { + console.log(`[${this.prefix}]: ${args.join('')}`) + } + + public info(...args: any[]) { + console.info(`[${this.prefix}]: ${args.join('')}`) + } + + public debug(...args: any[]) { + console.debug(`[${this.prefix}]: ${args.join('')}`) + } + + public warn(...args: any[]) { + console.warn(`[${this.prefix}]: ${args.join('')}`) + } + + public error(...args: any[]) { + console.error(`[${this.prefix}]: ${args.join('')}`) + } } export default new Logger('eTSFormAbility') diff --git a/ability/FormAbility/entry/src/main/js/widget/pages/index/index.hml b/ability/FormAbility/entry/src/main/js/widget/pages/index/index.hml index 05b5b96a9..23930fa54 100644 --- a/ability/FormAbility/entry/src/main/js/widget/pages/index/index.hml +++ b/ability/FormAbility/entry/src/main/js/widget/pages/index/index.hml @@ -1,11 +1,11 @@
- -
- -
-
- {{ $t('strings.temperature') }}{{temperature}} ℃ - {{ $t('strings.time') }} {{time}} -
- + +
+ +
+
+ {{ $t('strings.temperature') }}{{ temperature }} ℃ + {{ $t('strings.time') }} {{ time }} +
+
\ No newline at end of file diff --git a/ability/FormAbility/package.json b/ability/FormAbility/package.json index 4671fd268..bdbbe79e6 100644 --- a/ability/FormAbility/package.json +++ b/ability/FormAbility/package.json @@ -8,8 +8,8 @@ }, "version": "1.0.0", "dependencies": { - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3", - "@ohos/hypium": "1.0.0" + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6", + "@ohos/hypium": "1.0.1" } } diff --git a/ability/FormExtAbility/.gitignore b/ability/FormExtAbility/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/ability/FormExtAbility/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/ability/FormExtAbility/README_zh.md b/ability/FormExtAbility/README_zh.md index 8b4fe7144..381e0565c 100644 --- a/ability/FormExtAbility/README_zh.md +++ b/ability/FormExtAbility/README_zh.md @@ -27,4 +27,4 @@ Ability：Ability是应用所具备能力的抽象，也是应用程序的重要 2.本示例为Stage模型，从API version 9开始支持。 -3.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 \ No newline at end of file +3.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 \ No newline at end of file diff --git a/ability/FormExtAbility/entry/src/main/ets/Application/AbilityStage.ts b/ability/FormExtAbility/entry/src/main/ets/Application/AbilityStage.ts index 9c26d446b..7ce4d8d98 100644 --- a/ability/FormExtAbility/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/FormExtAbility/entry/src/main/ets/Application/AbilityStage.ts @@ -17,7 +17,7 @@ import AbilityStage from "@ohos.application.AbilityStage" import Logger from '../model/Logger'; export default class MyAbilityStage extends AbilityStage { - onCreate() { - Logger.log("[Demo] MyAbilityStage onCreate") - } + onCreate() { + Logger.log("[Demo] MyAbilityStage onCreate") + } } \ No newline at end of file diff --git a/ability/FormExtAbility/entry/src/main/ets/FormAbility/FormAbility.ts b/ability/FormExtAbility/entry/src/main/ets/FormAbility/FormAbility.ts index 5711dd129..6432ecec3 100644 --- a/ability/FormExtAbility/entry/src/main/ets/FormAbility/FormAbility.ts +++ b/ability/FormExtAbility/entry/src/main/ets/FormAbility/FormAbility.ts @@ -26,162 +26,162 @@ const FORM_PARAM_NAME_KEY = "ohos.extra.param.key.form_name"; const FORM_PARAM_TEMPORARY_KEY = "ohos.extra.param.key.form_temporary"; function getTemperature(formId: string, count: number) { - const DECIMAL: number = 10; - const parsedFormId: number = parseInt(formId, DECIMAL); - const BASE_TEMP_MOD: number = 20; - const baseTemperature: number = parsedFormId % BASE_TEMP_MOD; - const RANGE_TEMP_MOD: number = 20; - return baseTemperature + Math.abs(count % RANGE_TEMP_MOD - RANGE_TEMP_MOD / 2); + const DECIMAL: number = 10; + const parsedFormId: number = parseInt(formId, DECIMAL); + const BASE_TEMP_MOD: number = 20; + const baseTemperature: number = parsedFormId % BASE_TEMP_MOD; + const RANGE_TEMP_MOD: number = 20; + return baseTemperature + Math.abs(count % RANGE_TEMP_MOD - RANGE_TEMP_MOD / 2); } function padZero(num: number) { - // trans num to string and pad 0 - if (num < 10) { - return `0${num}`; - } else { - return num.toString(); - } + // trans num to string and pad 0 + if (num < 10) { + return `0${num}`; + } else { + return num.toString(); + } } function getTime() { - const date = new Date(); - const hours = padZero(date.getHours()); - const minutes = padZero(date.getMinutes()); - const seconds = padZero(date.getSeconds()); - return `${hours}:${minutes}:${seconds}` + const date = new Date(); + const hours = padZero(date.getHours()); + const minutes = padZero(date.getMinutes()); + const seconds = padZero(date.getSeconds()); + return `${hours}:${minutes}:${seconds}` } async function storeFormInfo(formId: string, formName: string, tempFlag: boolean) { - let formInfo = { - "formName": formName, - "tempFlag": tempFlag, - "updateCount": 0 - }; - try { - const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); - // put form info - await storage.put(formId, JSON.stringify(formInfo)); - Logger.log(`storeFormInfo, put form info successfully, formId: ${formId}`); - await storage.flush(); - } catch (err) { - Logger.error(`failed to storeFormInfo, err: ${JSON.stringify(err)}`); - } + let formInfo = { + "formName": formName, + "tempFlag": tempFlag, + "updateCount": 0 + }; + try { + const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); + // put form info + await storage.put(formId, JSON.stringify(formInfo)); + Logger.log(`storeFormInfo, put form info successfully, formId: ${formId}`); + await storage.flush(); + } catch (err) { + Logger.error(`failed to storeFormInfo, err: ${JSON.stringify(err)}`); + } } async function updateTempFormInfo(formId: string) { - let formInfoDefault = { - "formName": "", - "tempFlag": false, - "updateCount": 0 - }; - try { - const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); - // get form info - const data = await storage.get(formId, JSON.stringify(formInfoDefault)); - Logger.log(`updateTempFormInfo, get form info successfully, formId: ${formId}`); - const formInfo = JSON.parse(data.toString()); - if (!formInfo.tempFlag) { - Logger.log(`updateTempFormInfo, formId: ${formId} is not temporary.`); - return; - } - - formInfo.tempFlag = false; - // update form info - await storage.put(formId, JSON.stringify(formInfo)); - Logger.log(`updateTempFormInfo, update form info successfully, formId: ${formId}`); - await storage.flush(); - } catch (err) { - Logger.error(`failed to updateTempFormInfo, err: ${JSON.stringify(err)}`); + let formInfoDefault = { + "formName": "", + "tempFlag": false, + "updateCount": 0 + }; + try { + const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); + // get form info + const data = await storage.get(formId, JSON.stringify(formInfoDefault)); + Logger.log(`updateTempFormInfo, get form info successfully, formId: ${formId}`); + const formInfo = JSON.parse(data.toString()); + if (!formInfo.tempFlag) { + Logger.log(`updateTempFormInfo, formId: ${formId} is not temporary.`); + return; } + + formInfo.tempFlag = false; + // update form info + await storage.put(formId, JSON.stringify(formInfo)); + Logger.log(`updateTempFormInfo, update form info successfully, formId: ${formId}`); + await storage.flush(); + } catch (err) { + Logger.error(`failed to updateTempFormInfo, err: ${JSON.stringify(err)}`); + } } async function updateForm(formId: string) { - let formInfoDefault = { - "formName": "", - "tempFlag": false, - "updateCount": 0 + let formInfoDefault = { + "formName": "", + "tempFlag": false, + "updateCount": 0 + }; + try { + const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); + // get form info + const data = await storage.get(formId, JSON.stringify(formInfoDefault)); + Logger.log(`updateForm, get form info successfully, formId: ${formId}`); + const formInfo = JSON.parse(data.toString()); + formInfo.updateCount = formInfo.updateCount + 1; + + let obj = { + "temperature": getTemperature(formId, formInfo.updateCount).toString(), + "time": getTime() }; - try { - const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); - // get form info - const data = await storage.get(formId, JSON.stringify(formInfoDefault)); - Logger.log(`updateForm, get form info successfully, formId: ${formId}`); - const formInfo = JSON.parse(data.toString()); - formInfo.updateCount = formInfo.updateCount + 1; - - let obj = { - "temperature": getTemperature(formId, formInfo.updateCount).toString(), - "time": getTime() - }; - let formData = formBindingData.createFormBindingData(obj); - formProvider.updateForm(formId, formData).catch((err) => { - Logger.error(`updateForm, err: ${JSON.stringify(err)}`); - }); - - // update form info - await storage.put(formId, JSON.stringify(formInfo)); - Logger.log(`updateForm, update form info successfully, formId: ${formId}`); - await storage.flush(); - } catch (err) { - Logger.error(`failed to updateForm, err: ${JSON.stringify(err)}`); - } + let formData = formBindingData.createFormBindingData(obj); + formProvider.updateForm(formId, formData).catch((err) => { + Logger.error(`updateForm, err: ${JSON.stringify(err)}`); + }); + + // update form info + await storage.put(formId, JSON.stringify(formInfo)); + Logger.log(`updateForm, update form info successfully, formId: ${formId}`); + await storage.flush(); + } catch (err) { + Logger.error(`failed to updateForm, err: ${JSON.stringify(err)}`); + } } async function deleteFormInfo(formId: string) { - try { - const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); - // del form info - await storage.delete(formId); - Logger.log(`deleteFormInfo, del form info successfully, formId: ${formId}`); - await storage.flush(); - } catch (err) { - Logger.error(`failed to deleteFormInfo, err: ${JSON.stringify(err)}`); - } + try { + const storage = await dataStorage.getStorage(DATA_STORAGE_PATH); + // del form info + await storage.delete(formId); + Logger.log(`deleteFormInfo, del form info successfully, formId: ${formId}`); + await storage.flush(); + } catch (err) { + Logger.error(`failed to deleteFormInfo, err: ${JSON.stringify(err)}`); + } } export default class FormAbility extends FormExtension { - onCreate(want) { - Logger.log(`FormAbility onCreate, want: ${JSON.stringify(want)}`); - - // get form info - let formId = want.parameters[FORM_PARAM_IDENTITY_KEY]; - let formName = want.parameters[FORM_PARAM_NAME_KEY]; - let tempFlag = want.parameters[FORM_PARAM_TEMPORARY_KEY]; - storeFormInfo(formId, formName, tempFlag); - - let obj = { - "temperature": getTemperature(formId, 0).toString(), - "time": getTime() - }; - let formData = formBindingData.createFormBindingData(obj); - return formData; - } - - onCastToNormal(formId) { - Logger.log(`FormAbility onCastToNormal, formId: ${formId}`); - updateTempFormInfo(formId); - } - - onUpdate(formId) { - Logger.log(`FormAbility onUpdate, formId: ${formId}`); - updateForm(formId); - } - - onVisibilityChange(newStatus) { - Logger.log(`FormAbility onVisibilityChange`); - } - - onEvent(formId, message) { - Logger.log(`FormAbility onEvent, formId = ${formId}, message: ${JSON.stringify(message)}`); - } - - onDestroy(formId) { - Logger.log(`FormAbility onDestroy, formId = ${formId}`); - deleteFormInfo(formId); - } - - onAcquireFormState(want) { - Logger.log(`FormAbility onAcquireFormState`); - return formInfo.FormState.READY; - } + onCreate(want) { + Logger.log(`FormAbility onCreate, want: ${JSON.stringify(want)}`); + + // get form info + let formId = want.parameters[FORM_PARAM_IDENTITY_KEY]; + let formName = want.parameters[FORM_PARAM_NAME_KEY]; + let tempFlag = want.parameters[FORM_PARAM_TEMPORARY_KEY]; + storeFormInfo(formId, formName, tempFlag); + + let obj = { + "temperature": getTemperature(formId, 0).toString(), + "time": getTime() + }; + let formData = formBindingData.createFormBindingData(obj); + return formData; + } + + onCastToNormal(formId) { + Logger.log(`FormAbility onCastToNormal, formId: ${formId}`); + updateTempFormInfo(formId); + } + + onUpdate(formId) { + Logger.log(`FormAbility onUpdate, formId: ${formId}`); + updateForm(formId); + } + + onVisibilityChange(newStatus) { + Logger.log(`FormAbility onVisibilityChange`); + } + + onEvent(formId, message) { + Logger.log(`FormAbility onEvent, formId = ${formId}, message: ${JSON.stringify(message)}`); + } + + onDestroy(formId) { + Logger.log(`FormAbility onDestroy, formId = ${formId}`); + deleteFormInfo(formId); + } + + onAcquireFormState(want) { + Logger.log(`FormAbility onAcquireFormState`); + return formInfo.FormState.READY; + } }; \ No newline at end of file diff --git a/ability/FormExtAbility/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/FormExtAbility/entry/src/main/ets/MainAbility/MainAbility.ts index 22a007f3a..88b9239b2 100644 --- a/ability/FormExtAbility/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/FormExtAbility/entry/src/main/ets/MainAbility/MainAbility.ts @@ -17,34 +17,34 @@ import Ability from '@ohos.application.Ability' import Logger from '../model/Logger'; export default class MainAbility extends Ability { - onCreate(want, launchParam) { - Logger.log("[Demo] MainAbility onCreate") - globalThis.abilityWant = want; - } - - onDestroy() { - Logger.log("[Demo] MainAbility onDestroy") - } - - onWindowStageCreate(windowStage) { - // Main window is created, set main page for this ability - Logger.log("[Demo] MainAbility onWindowStageCreate") - - windowStage.setUIContent(this.context, "pages/index", null) - } - - onWindowStageDestroy() { - // Main window is destroyed, release UI related resources - Logger.log("[Demo] MainAbility onWindowStageDestroy") - } - - onForeground() { - // Ability has brought to foreground - Logger.log("[Demo] MainAbility onForeground") - } - - onBackground() { - // Ability has back to background - Logger.log("[Demo] MainAbility onBackground") - } + onCreate(want, launchParam) { + Logger.log("[Demo] MainAbility onCreate") + globalThis.abilityWant = want; + } + + onDestroy() { + Logger.log("[Demo] MainAbility onDestroy") + } + + onWindowStageCreate(windowStage) { + // Main window is created, set main page for this ability + Logger.log("[Demo] MainAbility onWindowStageCreate") + + windowStage.setUIContent(this.context, "pages/index", null) + } + + onWindowStageDestroy() { + // Main window is destroyed, release UI related resources + Logger.log("[Demo] MainAbility onWindowStageDestroy") + } + + onForeground() { + // Ability has brought to foreground + Logger.log("[Demo] MainAbility onForeground") + } + + onBackground() { + // Ability has back to background + Logger.log("[Demo] MainAbility onBackground") + } }; diff --git a/ability/FormExtAbility/entry/src/main/ets/model/Logger.ts b/ability/FormExtAbility/entry/src/main/ets/model/Logger.ts index 11447d0b7..25d2b130f 100644 --- a/ability/FormExtAbility/entry/src/main/ets/model/Logger.ts +++ b/ability/FormExtAbility/entry/src/main/ets/model/Logger.ts @@ -14,22 +14,28 @@ */ class Logger { - constructor(private prefix: string) {} - public log(...args: any[]) { - console.log(`[${this.prefix}]: ${args.join('')}`) - } - public info(...args: any[]) { - console.info(`[${this.prefix}]: ${args.join('')}`) - } - public debug(...args: any[]) { - console.debug(`[${this.prefix}]: ${args.join('')}`) - } - public warn(...args: any[]) { - console.warn(`[${this.prefix}]: ${args.join('')}`) - } - public error(...args: any[]) { - console.error(`[${this.prefix}]: ${args.join('')}`) - } + constructor(private prefix: string) { + } + + public log(...args: any[]) { + console.log(`[${this.prefix}]: ${args.join('')}`) + } + + public info(...args: any[]) { + console.info(`[${this.prefix}]: ${args.join('')}`) + } + + public debug(...args: any[]) { + console.debug(`[${this.prefix}]: ${args.join('')}`) + } + + public warn(...args: any[]) { + console.warn(`[${this.prefix}]: ${args.join('')}`) + } + + public error(...args: any[]) { + console.error(`[${this.prefix}]: ${args.join('')}`) + } } export default new Logger('eTSFormExtAbility') diff --git a/ability/FormExtAbility/entry/src/main/js/widget/pages/index/index.hml b/ability/FormExtAbility/entry/src/main/js/widget/pages/index/index.hml index 05b5b96a9..23930fa54 100644 --- a/ability/FormExtAbility/entry/src/main/js/widget/pages/index/index.hml +++ b/ability/FormExtAbility/entry/src/main/js/widget/pages/index/index.hml @@ -1,11 +1,11 @@
- -
- -
-
- {{ $t('strings.temperature') }}{{temperature}} ℃ - {{ $t('strings.time') }} {{time}} -
- + +
+ +
+
+ {{ $t('strings.temperature') }}{{ temperature }} ℃ + {{ $t('strings.time') }} {{ time }} +
+
\ No newline at end of file diff --git a/ability/FormExtAbility/package.json b/ability/FormExtAbility/package.json index 8dba951ce..3b6b3ead3 100644 --- a/ability/FormExtAbility/package.json +++ b/ability/FormExtAbility/package.json @@ -8,8 +8,8 @@ }, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } \ No newline at end of file diff --git a/ability/FormLauncher/.gitignore b/ability/FormLauncher/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/ability/FormLauncher/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/ability/FormLauncher/README_zh.md b/ability/FormLauncher/README_zh.md index 76fa7014b..5982e4a4b 100644 --- a/ability/FormLauncher/README_zh.md +++ b/ability/FormLauncher/README_zh.md @@ -33,7 +33,7 @@ 1.本示例仅支持标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 3.本示例需要使用@ohos.application.formHost系统权限的系统接口。使用Full SDK时需要手动从镜像站点获取，并在DevEco Studio中替换，具体操作可参考[替换指南](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/full-sdk-switch-guide.md)。 diff --git a/ability/FormLauncher/entry/package.json b/ability/FormLauncher/entry/package.json index f04a697de..4857e2867 100644 --- a/ability/FormLauncher/entry/package.json +++ b/ability/FormLauncher/entry/package.json @@ -1,11 +1,11 @@ { - "devDependencies":{}, - "name":"entry", - "ohos":{ - "org":"huawei", - "directoryLevel":"module", - "buildTool":"hvigor" + "devDependencies": {}, + "name": "entry", + "ohos": { + "org": "huawei", + "directoryLevel": "module", + "buildTool": "hvigor" }, - "version":"1.0.0", - "dependencies":{} + "version": "1.0.0", + "dependencies": {} } \ No newline at end of file diff --git a/ability/FormLauncher/entry/src/main/ets/model/Logger.ts b/ability/FormLauncher/entry/src/main/ets/model/Logger.ts index f50d883d9..e2aeb095d 100644 --- a/ability/FormLauncher/entry/src/main/ets/model/Logger.ts +++ b/ability/FormLauncher/entry/src/main/ets/model/Logger.ts @@ -14,22 +14,28 @@ */ class Logger { - constructor(private prefix: string) {} - public log(...args: any[]) { - console.log(`[${this.prefix}]: ${args.join('')}`) - } - public info(...args: any[]) { - console.info(`[${this.prefix}]: ${args.join('')}`) - } - public debug(...args: any[]) { - console.debug(`[${this.prefix}]: ${args.join('')}`) - } - public warn(...args: any[]) { - console.warn(`[${this.prefix}]: ${args.join('')}`) - } - public error(...args: any[]) { - console.error(`[${this.prefix}]: ${args.join('')}`) - } + constructor(private prefix: string) { + } + + public log(...args: any[]) { + console.log(`[${this.prefix}]: ${args.join('')}`) + } + + public info(...args: any[]) { + console.info(`[${this.prefix}]: ${args.join('')}`) + } + + public debug(...args: any[]) { + console.debug(`[${this.prefix}]: ${args.join('')}`) + } + + public warn(...args: any[]) { + console.warn(`[${this.prefix}]: ${args.join('')}`) + } + + public error(...args: any[]) { + console.error(`[${this.prefix}]: ${args.join('')}`) + } } export default new Logger('eTSFormLauncher') diff --git a/ability/FormLauncher/package.json b/ability/FormLauncher/package.json index 0b1dcaa99..200f19709 100644 --- a/ability/FormLauncher/package.json +++ b/ability/FormLauncher/package.json @@ -1,15 +1,15 @@ { - "devDependencies":{}, - "name":"mylauncher", - "ohos":{ - "org":"huawei", - "directoryLevel":"project", - "buildTool":"hvigor" + "devDependencies": {}, + "name": "mylauncher", + "ohos": { + "org": "huawei", + "directoryLevel": "project", + "buildTool": "hvigor" }, - "version":"1.0.0", - "dependencies":{ - "@ohos/hypium":"1.0.1", - "@ohos/hvigor-ohos-plugin":"1.1.6", - "@ohos/hvigor":"1.1.6" + "version": "1.0.0", + "dependencies": { + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } \ No newline at end of file diff --git a/ability/JsDistributedMusicPlayer/.gitignore b/ability/JsDistributedMusicPlayer/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/ability/JsDistributedMusicPlayer/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/ability/JsDistributedMusicPlayer/README_zh.md b/ability/JsDistributedMusicPlayer/README_zh.md index 993b0eaa1..85edb9555 100644 --- a/ability/JsDistributedMusicPlayer/README_zh.md +++ b/ability/JsDistributedMusicPlayer/README_zh.md @@ -26,7 +26,7 @@ 1.本示例仅支持标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 3.如果安装本示例报错为error：install sign info inconsistent，则有可能本应用被设置为系统预置应用，已安装在系统中，此时需使用命令进行替换安装，并在替换安装后对设备进行重启操作，具体命令如下： diff --git a/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/app.js b/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/app.js index e3a0891c0..e2e723dcb 100644 --- a/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/app.js +++ b/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/app.js @@ -14,10 +14,10 @@ */ export default { - onCreate() { - console.info("Application onCreate"); - }, - onDestroy() { - console.info("Application onDestroy"); - } + onCreate() { + console.info("Application onCreate"); + }, + onDestroy() { + console.info("Application onDestroy"); + } }; diff --git a/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/model/KvStoreModel.js b/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/model/KvStoreModel.js index 441b020d7..3b31b7b8e 100644 --- a/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/model/KvStoreModel.js +++ b/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/model/KvStoreModel.js @@ -18,97 +18,97 @@ import distributedData from '@ohos.data.distributedData'; const STORE_ID = 'musicplayer_kvstore'; export default class KvStoreModel { - kvManager; - kvStore; + kvManager; + kvStore; - constructor() { - } + constructor() { + } - createKvStore(callback) { - if (typeof (this.kvStore) === 'undefined') { - var config = { - bundleName: 'ohos.samples.distributedmusicplayer', - userInfo: { - userId: '0', - userType: 0 - } - }; - let self = this; - console.info('MusicPlayer[KvStoreModel] createKVManager begin'); - distributedData.createKVManager(config).then((manager) => { - console.info('MusicPlayer[KvStoreModel] createKVManager success, kvManager=' + JSON.stringify(manager)); - self.kvManager = manager; - var options = { - createIfMissing: true, - encrypt: false, - backup: false, - autoSync: true, - kvStoreType: 1, - schema: '', - securityLevel: 3, - }; - console.info('MusicPlayer[KvStoreModel] kvManager.getKVStore begin'); - self.kvManager.getKVStore(STORE_ID, options).then((store) => { - console.info('MusicPlayer[KvStoreModel] getKVStore success, kvStore=' + store); - self.kvStore = store; - callback(); - }); - console.info('MusicPlayer[KvStoreModel] kvManager.getKVStore end'); - }); - console.info('MusicPlayer[KvStoreModel] createKVManager end'); - } else { - callback(); + createKvStore(callback) { + if (typeof (this.kvStore) === 'undefined') { + var config = { + bundleName: 'ohos.samples.distributedmusicplayer', + userInfo: { + userId: '0', + userType: 0 } - } - - broadcastMessage(msg) { - console.info('MusicPlayer[KvStoreModel] broadcastMessage ' + msg); - var num = Math.random(); - let self = this; - this.createKvStore(() => { - self.put(msg, num); + }; + let self = this; + console.info('MusicPlayer[KvStoreModel] createKVManager begin'); + distributedData.createKVManager(config).then((manager) => { + console.info('MusicPlayer[KvStoreModel] createKVManager success, kvManager=' + JSON.stringify(manager)); + self.kvManager = manager; + var options = { + createIfMissing: true, + encrypt: false, + backup: false, + autoSync: true, + kvStoreType: 1, + schema: '', + securityLevel: 3, + }; + console.info('MusicPlayer[KvStoreModel] kvManager.getKVStore begin'); + self.kvManager.getKVStore(STORE_ID, options).then((store) => { + console.info('MusicPlayer[KvStoreModel] getKVStore success, kvStore=' + store); + self.kvStore = store; + callback(); }); + console.info('MusicPlayer[KvStoreModel] kvManager.getKVStore end'); + }); + console.info('MusicPlayer[KvStoreModel] createKVManager end'); + } else { + callback(); } + } - put(key, value) { - console.info('MusicPlayer[KvStoreModel] kvStore.put ' + key + '=' + value); - this.kvStore.put(key, value).then((data) => { - this.kvStore.get(key).then((data) => { - console.info('MusicPlayer[KvStoreModel] kvStore.get ' + key + '=' + JSON.stringify(data)); - }); - console.info('MusicPlayer[KvStoreModel] kvStore.put ' + key + ' finished, data=' + JSON.stringify(data)); - }).catch((err) => { - console.error('MusicPlayer[KvStoreModel] kvStore.put ' + key + ' failed, ' + JSON.stringify(err)); - }); - } + broadcastMessage(msg) { + console.info('MusicPlayer[KvStoreModel] broadcastMessage ' + msg); + var num = Math.random(); + let self = this; + this.createKvStore(() => { + self.put(msg, num); + }); + } - setOnMessageReceivedListener(msg, callback) { - console.info('MusicPlayer[KvStoreModel] setOnMessageReceivedListener ' + msg); - let self = this; - this.createKvStore(() => { - console.info('MusicPlayer[KvStoreModel] kvStore.on(dataChange) begin'); - self.kvStore.on('dataChange', 1, (data) => { - console.info('MusicPlayer[KvStoreModel] dataChange, ' + JSON.stringify(data)); - console.info('MusicPlayer[KvStoreModel] dataChange, insert ' + data.insertEntries.length + ' udpate ' - + data.updateEntries.length); - for (var i = 0; i < data.insertEntries.length; i++) { - if (data.insertEntries[i].key === msg) { - console.info('MusicPlayer[KvStoreModel] insertEntries receive ' + msg + '=' - + JSON.stringify(data.insertEntries[i].value)); - callback(); - return; - } - } - for (i = 0; i < data.updateEntries.length; i++) { - if (data.updateEntries[i].key === msg) { - console.info('MusicPlayer[KvStoreModel] updateEntries receive ' + msg + '=' - + JSON.stringify(data.updateEntries[i].value)); - callback(); - return; - } - } - }); - console.info('MusicPlayer[KvStoreModel] kvStore.on(dataChange) end'); - }); - } + put(key, value) { + console.info('MusicPlayer[KvStoreModel] kvStore.put ' + key + '=' + value); + this.kvStore.put(key, value).then((data) => { + this.kvStore.get(key).then((data) => { + console.info('MusicPlayer[KvStoreModel] kvStore.get ' + key + '=' + JSON.stringify(data)); + }); + console.info('MusicPlayer[KvStoreModel] kvStore.put ' + key + ' finished, data=' + JSON.stringify(data)); + }).catch((err) => { + console.error('MusicPlayer[KvStoreModel] kvStore.put ' + key + ' failed, ' + JSON.stringify(err)); + }); + } + + setOnMessageReceivedListener(msg, callback) { + console.info('MusicPlayer[KvStoreModel] setOnMessageReceivedListener ' + msg); + let self = this; + this.createKvStore(() => { + console.info('MusicPlayer[KvStoreModel] kvStore.on(dataChange) begin'); + self.kvStore.on('dataChange', 1, (data) => { + console.info('MusicPlayer[KvStoreModel] dataChange, ' + JSON.stringify(data)); + console.info('MusicPlayer[KvStoreModel] dataChange, insert ' + data.insertEntries.length + ' udpate ' + + data.updateEntries.length); + for (var i = 0; i < data.insertEntries.length; i++) { + if (data.insertEntries[i].key === msg) { + console.info('MusicPlayer[KvStoreModel] insertEntries receive ' + msg + '=' + + JSON.stringify(data.insertEntries[i].value)); + callback(); + return; + } + } + for (i = 0; i < data.updateEntries.length; i++) { + if (data.updateEntries[i].key === msg) { + console.info('MusicPlayer[KvStoreModel] updateEntries receive ' + msg + '=' + + JSON.stringify(data.updateEntries[i].value)); + callback(); + return; + } + } + }); + console.info('MusicPlayer[KvStoreModel] kvStore.on(dataChange) end'); + }); + } } \ No newline at end of file diff --git a/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/model/RemoteDeviceModel.js b/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/model/RemoteDeviceModel.js index fd11945c4..5cf965212 100644 --- a/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/model/RemoteDeviceModel.js +++ b/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/model/RemoteDeviceModel.js @@ -18,167 +18,167 @@ import deviceManager from '@ohos.distributedHardware.deviceManager'; var SUBSCRIBE_ID = 100; export default class RemoteDeviceModel { - deviceList = []; - discoverList = []; - callback; - authCallback = null; - #deviceManager; + deviceList = []; + discoverList = []; + callback; + authCallback = null; + #deviceManager; - constructor() { - } + constructor() { + } - registerDeviceListCallback(callback) { - if (typeof (this.#deviceManager) === 'undefined') { - console.log('MusicPlayer[RemoteDeviceModel] deviceManager.createDeviceManager begin'); - deviceManager.createDeviceManager('com.ohos.distributedmusicplayer', (error, value) => { - if (error) { - console.error('createDeviceManager failed.'); - return; - } - this.#deviceManager = value; - this.registerDeviceListCallback_(callback); - console.log('MusicPlayer[RemoteDeviceModel] createDeviceManager callback returned, error=' + error + ' value=' + value); - }); - console.log('MusicPlayer[RemoteDeviceModel] deviceManager.createDeviceManager end'); - } else { - this.registerDeviceListCallback_(callback); + registerDeviceListCallback(callback) { + if (typeof (this.#deviceManager) === 'undefined') { + console.log('MusicPlayer[RemoteDeviceModel] deviceManager.createDeviceManager begin'); + deviceManager.createDeviceManager('com.ohos.distributedmusicplayer', (error, value) => { + if (error) { + console.error('createDeviceManager failed.'); + return; } + this.#deviceManager = value; + this.registerDeviceListCallback_(callback); + console.log('MusicPlayer[RemoteDeviceModel] createDeviceManager callback returned, error=' + error + ' value=' + value); + }); + console.log('MusicPlayer[RemoteDeviceModel] deviceManager.createDeviceManager end'); + } else { + this.registerDeviceListCallback_(callback); } + } - registerDeviceListCallback_(callback) { - console.info('MusicPlayer[RemoteDeviceModel] registerDeviceListCallback'); - this.callback = callback; - if (this.#deviceManager == undefined) { - console.error('MusicPlayer[RemoteDeviceModel] deviceManager has not initialized'); - this.callback(); - return; - } + registerDeviceListCallback_(callback) { + console.info('MusicPlayer[RemoteDeviceModel] registerDeviceListCallback'); + this.callback = callback; + if (this.#deviceManager == undefined) { + console.error('MusicPlayer[RemoteDeviceModel] deviceManager has not initialized'); + this.callback(); + return; + } - console.info('MusicPlayer[RemoteDeviceModel] getTrustedDeviceListSync begin'); - var list = this.#deviceManager.getTrustedDeviceListSync(); - console.info('MusicPlayer[RemoteDeviceModel] getTrustedDeviceListSync end, deviceList=' + JSON.stringify(list)); - if (typeof (list) != 'undefined' && typeof (list.length) != 'undefined') { - this.deviceList = list; - } - this.callback(); - console.info('MusicPlayer[RemoteDeviceModel] callback finished'); - - this.#deviceManager.on('deviceStateChange', (data) => { - console.info('MusicPlayer[RemoteDeviceModel] deviceStateChange data=' + JSON.stringify(data)); - switch (data.action) { - case 0: - this.deviceList[this.deviceList.length] = data.device; - console.info('MusicPlayer[RemoteDeviceModel] online, updated device list=' + JSON.stringify(this.deviceList)); - this.callback(); - if (this.authCallback != null) { - this.authCallback(); - this.authCallback = null; - } - break; - case 2: - if (this.deviceList.length > 0) { - for (var i = 0; i < this.deviceList.length; i++) { - if (this.deviceList[i].deviceId === data.device.deviceId) { - this.deviceList[i] = data.device; - break; - } - } - } - console.info('MusicPlayer[RemoteDeviceModel] change, updated device list=' + JSON.stringify(this.deviceList)); - this.callback(); - break; - case 1: - if (this.deviceList.length > 0) { - var list = []; - for (var i = 0; i < this.deviceList.length; i++) { - if (this.deviceList[i].deviceId != data.device.deviceId) { - list[i] = data.device; - } - } - this.deviceList = list; - } - console.info('MusicPlayer[RemoteDeviceModel] offline, updated device list=' + JSON.stringify(data.device)); - this.callback(); + console.info('MusicPlayer[RemoteDeviceModel] getTrustedDeviceListSync begin'); + var list = this.#deviceManager.getTrustedDeviceListSync(); + console.info('MusicPlayer[RemoteDeviceModel] getTrustedDeviceListSync end, deviceList=' + JSON.stringify(list)); + if (typeof (list) != 'undefined' && typeof (list.length) != 'undefined') { + this.deviceList = list; + } + this.callback(); + console.info('MusicPlayer[RemoteDeviceModel] callback finished'); + + this.#deviceManager.on('deviceStateChange', (data) => { + console.info('MusicPlayer[RemoteDeviceModel] deviceStateChange data=' + JSON.stringify(data)); + switch (data.action) { + case 0: + this.deviceList[this.deviceList.length] = data.device; + console.info('MusicPlayer[RemoteDeviceModel] online, updated device list=' + JSON.stringify(this.deviceList)); + this.callback(); + if (this.authCallback != null) { + this.authCallback(); + this.authCallback = null; + } + break; + case 2: + if (this.deviceList.length > 0) { + for (var i = 0; i < this.deviceList.length; i++) { + if (this.deviceList[i].deviceId === data.device.deviceId) { + this.deviceList[i] = data.device; break; - default: - break; + } } - }); - this.#deviceManager.on('deviceFound', (data) => { - console.info('MusicPlayer[RemoteDeviceModel] deviceFound data=' + JSON.stringify(data)); - console.info('MusicPlayer[RemoteDeviceModel] deviceFound this.deviceList=' + this.deviceList); - console.info('MusicPlayer[RemoteDeviceModel] deviceFound this.deviceList.length=' + this.deviceList.length); - for (var i = 0; i < this.discoverList.length; i++) { - if (this.discoverList[i].deviceId === data.device.deviceId) { - console.info('MusicPlayer[RemoteDeviceModel] device founded, ignored'); - return; - } + } + console.info('MusicPlayer[RemoteDeviceModel] change, updated device list=' + JSON.stringify(this.deviceList)); + this.callback(); + break; + case 1: + if (this.deviceList.length > 0) { + var list = []; + for (var i = 0; i < this.deviceList.length; i++) { + if (this.deviceList[i].deviceId != data.device.deviceId) { + list[i] = data.device; + } } - this.discoverList[this.discoverList.length] = data.device; - this.callback(); - }); - this.#deviceManager.on('discoverFail', (data) => { - console.info('MusicPlayer[RemoteDeviceModel] discoverFail data=' + JSON.stringify(data)); - }); - this.#deviceManager.on('serviceDie', () => { - console.error('MusicPlayer[RemoteDeviceModel] serviceDie'); - }); + this.deviceList = list; + } + console.info('MusicPlayer[RemoteDeviceModel] offline, updated device list=' + JSON.stringify(data.device)); + this.callback(); + break; + default: + break; + } + }); + this.#deviceManager.on('deviceFound', (data) => { + console.info('MusicPlayer[RemoteDeviceModel] deviceFound data=' + JSON.stringify(data)); + console.info('MusicPlayer[RemoteDeviceModel] deviceFound this.deviceList=' + this.deviceList); + console.info('MusicPlayer[RemoteDeviceModel] deviceFound this.deviceList.length=' + this.deviceList.length); + for (var i = 0; i < this.discoverList.length; i++) { + if (this.discoverList[i].deviceId === data.device.deviceId) { + console.info('MusicPlayer[RemoteDeviceModel] device founded, ignored'); + return; + } + } + this.discoverList[this.discoverList.length] = data.device; + this.callback(); + }); + this.#deviceManager.on('discoverFail', (data) => { + console.info('MusicPlayer[RemoteDeviceModel] discoverFail data=' + JSON.stringify(data)); + }); + this.#deviceManager.on('serviceDie', () => { + console.error('MusicPlayer[RemoteDeviceModel] serviceDie'); + }); - SUBSCRIBE_ID = Math.floor(65536 * Math.random()); - var info = { - subscribeId: SUBSCRIBE_ID, - mode: 0xAA, - medium: 2, - freq: 2, - isSameAccount: false, - isWakeRemote: true, - capability: 0 - }; - console.info('MusicPlayer[RemoteDeviceModel] startDeviceDiscovery ' + SUBSCRIBE_ID); - this.#deviceManager.startDeviceDiscovery(info); - } + SUBSCRIBE_ID = Math.floor(65536 * Math.random()); + var info = { + subscribeId: SUBSCRIBE_ID, + mode: 0xAA, + medium: 2, + freq: 2, + isSameAccount: false, + isWakeRemote: true, + capability: 0 + }; + console.info('MusicPlayer[RemoteDeviceModel] startDeviceDiscovery ' + SUBSCRIBE_ID); + this.#deviceManager.startDeviceDiscovery(info); + } - authDevice(deviceId, callback) { - console.info('MusicPlayer[RemoteDeviceModel] authDevice ' + deviceId); - for (var i = 0; i < this.discoverList.length; i++) { - if (this.discoverList[i].deviceId === deviceId) { - console.info('MusicPlayer[RemoteDeviceModel] device founded, ignored'); - let extraInfo = { - "targetPkgName": 'ohos.samples.distributedmusicplayer', - "appName": 'Music', - "appDescription": 'Music player application', - "business": '0' - }; - let authParam = { - "authType": 1, - "appIcon": '', - "appThumbnail": '', - "extraInfo": extraInfo - }; - console.info('MusicPlayer[RemoteDeviceModel] authenticateDevice ' + JSON.stringify(this.discoverList[i])); - this.#deviceManager.authenticateDevice(this.discoverList[i], authParam, (err, data) => { - if (err) { - console.info('MusicPlayer[RemoteDeviceModel] authenticateDevice failed, err=' + JSON.stringify(err)); - this.authCallback = null; - } else { - console.info('MusicPlayer[RemoteDeviceModel] authenticateDevice succeed, data=' + JSON.stringify(data)); - this.authCallback = callback; - } - }); - } - } + authDevice(deviceId, callback) { + console.info('MusicPlayer[RemoteDeviceModel] authDevice ' + deviceId); + for (var i = 0; i < this.discoverList.length; i++) { + if (this.discoverList[i].deviceId === deviceId) { + console.info('MusicPlayer[RemoteDeviceModel] device founded, ignored'); + let extraInfo = { + "targetPkgName": 'ohos.samples.distributedmusicplayer', + "appName": 'Music', + "appDescription": 'Music player application', + "business": '0' + }; + let authParam = { + "authType": 1, + "appIcon": '', + "appThumbnail": '', + "extraInfo": extraInfo + }; + console.info('MusicPlayer[RemoteDeviceModel] authenticateDevice ' + JSON.stringify(this.discoverList[i])); + this.#deviceManager.authenticateDevice(this.discoverList[i], authParam, (err, data) => { + if (err) { + console.info('MusicPlayer[RemoteDeviceModel] authenticateDevice failed, err=' + JSON.stringify(err)); + this.authCallback = null; + } else { + console.info('MusicPlayer[RemoteDeviceModel] authenticateDevice succeed, data=' + JSON.stringify(data)); + this.authCallback = callback; + } + }); + } } + } - unregisterDeviceListCallback() { - console.info('MusicPlayer[RemoteDeviceModel] stopDeviceDiscovery ' + SUBSCRIBE_ID); - if(typeof (this.#deviceManager) === 'undefined'){ - return - } - this.#deviceManager.stopDeviceDiscovery(SUBSCRIBE_ID); - this.#deviceManager.off('deviceStateChange'); - this.#deviceManager.off('deviceFound'); - this.#deviceManager.off('discoverFail'); - this.#deviceManager.off('serviceDie'); - this.deviceList = []; + unregisterDeviceListCallback() { + console.info('MusicPlayer[RemoteDeviceModel] stopDeviceDiscovery ' + SUBSCRIBE_ID); + if (typeof (this.#deviceManager) === 'undefined') { + return } + this.#deviceManager.stopDeviceDiscovery(SUBSCRIBE_ID); + this.#deviceManager.off('deviceStateChange'); + this.#deviceManager.off('deviceFound'); + this.#deviceManager.off('discoverFail'); + this.#deviceManager.off('serviceDie'); + this.deviceList = []; + } } \ No newline at end of file diff --git a/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/pages/index/index.hml b/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/pages/index/index.hml index 14de1e58b..2bbf617e3 100644 --- a/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/pages/index/index.hml +++ b/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/pages/index/index.hml @@ -14,48 +14,48 @@ */-->
-
- - {{ title }} +
+ + {{ title }} + +
+ + +
+
+
+ {{ currentTimeText }} + + {{ totalTimeText }} -
- - -
-
-
- {{ currentTimeText }} - - {{ totalTimeText }} - -
- -
-
- - - - -
+
+ +
+
+ + + + +
+
+ +
+ {{ $t('strings.select') }} + + +
+ + +
+ + +
+ +
- -
- {{ $t('strings.select') }} - - -
- - -
- - -
- -
-
- +
diff --git a/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/pages/index/index.js b/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/pages/index/index.js index 9a253272a..118420a7a 100644 --- a/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/pages/index/index.js +++ b/ability/JsDistributedMusicPlayer/entry/src/main/js/MainAbility/pages/index/index.js @@ -20,16 +20,16 @@ import KvStoreModel from '../../model/KvStoreModel.js'; import display from '@ohos.display'; function getShownTimer(ms) { - var seconds = Math.floor(ms / 1000); - var sec = seconds % 60; - var min = (seconds - sec) / 60; - if (sec < 10) { - sec = '0' + sec; - } - if (min < 10) { - min = '0' + min; - } - return min + ':' + sec; + var seconds = Math.floor(ms / 1000); + var sec = seconds % 60; + var min = (seconds - sec) / 60; + if (sec < 10) { + sec = '0' + sec; + } + if (min < 10) { + min = '0' + min; + } + return min + ':' + sec; } const REMOTE_ABILITY_STARTED = 'remoteAbilityStarted'; @@ -39,336 +39,336 @@ const DESIGN_WIDTH = 720.0; const DESIGN_RATIO = 16 / 9; export default { - data: { - title: '', - currentTimeText: '', - totalTimeText: '', - totalMs: 0, - currentProgress: 0, - deviceList: [], - btnPlaySrc: '/common/media/ic_play.svg', - albumSrc: '/common/media/album.png', - remoteDeviceModel: new RemoteDeviceModel(), - playerModel: new PlayerModel(), - kvStoreModel: new KvStoreModel(), - isDialogShowing: false, - isSwitching: false, - riscale: 1, // ratio independent scale ratio - risw: 720, // ratio independent screen width - rish: 1280, // ratio independent screen height - hasInitialized: false, - }, - onInit() { - console.info('MusicPlayer[IndexPage] onInit begin'); - this.grantPermission() - console.info("MusicPlayer[IndexPage] getDefaultDisplay begin"); - display.getDefaultDisplay().then(dis => { - console.info("MusicPlayer[IndexPage] getDefaultDisplay dis=" + JSON.stringify(dis)); - var proportion = DESIGN_WIDTH / dis.width; - var screenWidth = DESIGN_WIDTH; - var screenHeight = (dis.height - SYSTEM_UI_HEIGHT) * proportion; - this.riscale = (screenHeight / screenWidth) / DESIGN_RATIO; - if (this.riscale < 1) { - // The screen ratio is shorter than design ratio - this.risw = screenWidth * this.riscale; - this.rish = screenHeight; - } else { - // The screen ratio is longer than design ratio - this.risw = screenWidth; - this.rish = screenHeight / this.riscale; - } - this.hasInitialized = true; - console.info("MusicPlayer[IndexPage] proportion=" + proportion + ", screenWidth=" - + screenWidth + ", screenHeight=" + screenHeight + ", riscale=" + this.riscale - + ", risw=" + this.risw + ", rish=" + this.rish); - }); - console.info("MusicPlayer[IndexPage] getDefaultDisplay end"); - DEVICE_LIST_LOCALHOST = { - name: this.$t('strings.localhost'), - id: 'localhost', - }; - this.deviceList = [DEVICE_LIST_LOCALHOST]; + data: { + title: '', + currentTimeText: '', + totalTimeText: '', + totalMs: 0, + currentProgress: 0, + deviceList: [], + btnPlaySrc: '/common/media/ic_play.svg', + albumSrc: '/common/media/album.png', + remoteDeviceModel: new RemoteDeviceModel(), + playerModel: new PlayerModel(), + kvStoreModel: new KvStoreModel(), + isDialogShowing: false, + isSwitching: false, + riscale: 1, // ratio independent scale ratio + risw: 720, // ratio independent screen width + rish: 1280, // ratio independent screen height + hasInitialized: false, + }, + onInit() { + console.info('MusicPlayer[IndexPage] onInit begin'); + this.grantPermission() + console.info("MusicPlayer[IndexPage] getDefaultDisplay begin"); + display.getDefaultDisplay().then(dis => { + console.info("MusicPlayer[IndexPage] getDefaultDisplay dis=" + JSON.stringify(dis)); + var proportion = DESIGN_WIDTH / dis.width; + var screenWidth = DESIGN_WIDTH; + var screenHeight = (dis.height - SYSTEM_UI_HEIGHT) * proportion; + this.riscale = (screenHeight / screenWidth) / DESIGN_RATIO; + if (this.riscale < 1) { + // The screen ratio is shorter than design ratio + this.risw = screenWidth * this.riscale; + this.rish = screenHeight; + } else { + // The screen ratio is longer than design ratio + this.risw = screenWidth; + this.rish = screenHeight / this.riscale; + } + this.hasInitialized = true; + console.info("MusicPlayer[IndexPage] proportion=" + proportion + ", screenWidth=" + + screenWidth + ", screenHeight=" + screenHeight + ", riscale=" + this.riscale + + ", risw=" + this.risw + ", rish=" + this.rish); + }); + console.info("MusicPlayer[IndexPage] getDefaultDisplay end"); + DEVICE_LIST_LOCALHOST = { + name: this.$t('strings.localhost'), + id: 'localhost', + }; + this.deviceList = [DEVICE_LIST_LOCALHOST]; - this.currentTimeText = getShownTimer(0); - this.playerModel.setOnStatusChangedListener((isPlaying) => { - console.info('MusicPlayer[IndexPage] on player status changed, isPlaying=' + isPlaying + ', refresh ui'); - this.playerModel.setOnPlayingProgressListener((currentTimeMs) => { - this.currentTimeText = getShownTimer(currentTimeMs); - this.currentProgress = Math.floor(currentTimeMs / this.totalMs * 100); + this.currentTimeText = getShownTimer(0); + this.playerModel.setOnStatusChangedListener((isPlaying) => { + console.info('MusicPlayer[IndexPage] on player status changed, isPlaying=' + isPlaying + ', refresh ui'); + this.playerModel.setOnPlayingProgressListener((currentTimeMs) => { + this.currentTimeText = getShownTimer(currentTimeMs); + this.currentProgress = Math.floor(currentTimeMs / this.totalMs * 100); + }); + if (isPlaying) { + this.btnPlaySrc = '/common/media/ic_pause.svg'; + } else { + this.btnPlaySrc = '/common/media/ic_play.svg'; + } + }); + this.playerModel.getPlaylist(() => { + console.info('MusicPlayer[IndexPage] on playlist generated, refresh ui'); + this.restoreFromWant(); + }); + console.info('MusicPlayer[IndexPage] onInit end'); + }, + grantPermission() { + console.info('MusicPlayer[IndexPage] grantPermission') + let context = featureAbility.getContext() + context.requestPermissionsFromUser(['ohos.permission.DISTRIBUTED_DATASYNC'], 666, function (result) { + console.info(`MusicPlayer[IndexPage] grantPermission,requestPermissionsFromUser,result.requestCode=${result.requestCode}`) + }) + }, + restoreFromWant() { + featureAbility.getWant((error, want) => { + console.info('MusicPlayer[IndexPage] featureAbility.getWant=' + JSON.stringify(want)); + var status = want.parameters; + if (status != null && status.uri != null) { + this.kvStoreModel.broadcastMessage(REMOTE_ABILITY_STARTED); + console.info('MusicPlayer[IndexPage] restorePlayingStatus'); + this.playerModel.restorePlayingStatus(status, (index) => { + console.info('MusicPlayer[IndexPage] restorePlayingStatus finished, index=' + index); + if (index >= 0) { + this.refreshSongInfo(index); + } else { + this.playerModel.preLoad(0, () => { + this.refreshSongInfo(0); }); - if (isPlaying) { - this.btnPlaySrc = '/common/media/ic_pause.svg'; - } else { - this.btnPlaySrc = '/common/media/ic_play.svg'; - } + } }); - this.playerModel.getPlaylist(() => { - console.info('MusicPlayer[IndexPage] on playlist generated, refresh ui'); - this.restoreFromWant(); + } else { + this.playerModel.preLoad(0, () => { + this.refreshSongInfo(0); }); - console.info('MusicPlayer[IndexPage] onInit end'); - }, - grantPermission() { - console.info('MusicPlayer[IndexPage] grantPermission') - let context = featureAbility.getContext() - context.requestPermissionsFromUser(['ohos.permission.DISTRIBUTED_DATASYNC'], 666, function (result) { - console.info(`MusicPlayer[IndexPage] grantPermission,requestPermissionsFromUser,result.requestCode=${result.requestCode}`) - }) - }, - restoreFromWant() { - featureAbility.getWant((error, want) => { - console.info('MusicPlayer[IndexPage] featureAbility.getWant=' + JSON.stringify(want)); - var status = want.parameters; - if (status != null && status.uri != null) { - this.kvStoreModel.broadcastMessage(REMOTE_ABILITY_STARTED); - console.info('MusicPlayer[IndexPage] restorePlayingStatus'); - this.playerModel.restorePlayingStatus(status, (index) => { - console.info('MusicPlayer[IndexPage] restorePlayingStatus finished, index=' + index); - if (index >= 0) { - this.refreshSongInfo(index); - } else { - this.playerModel.preLoad(0, () => { - this.refreshSongInfo(0); - }); - } - }); - } else { - this.playerModel.preLoad(0, () => { - this.refreshSongInfo(0); - }); - } - }); - }, - onNewRequest() { - console.info('MusicPlayer[IndexPage] onNewRequest'); - this.playerModel.pause(); - this.playerModel.seek(0); - this.restoreFromWant(); - }, - onBackPress() { - console.info('MusicPlayer[IndexPage] onBackPress isDialogShowing=' + this.isDialogShowing); - if (this.isDialogShowing === true) { - this.dismissDialog(); - return true; - } - return false; - }, - onDestroy() { - console.info('MusicPlayer[IndexPage] onDestroy begin'); - if (this.playerModel === undefined) { - return - } - this.playerModel.release(); - this.remoteDeviceModel.unregisterDeviceListCallback(); - console.info('MusicPlayer[IndexPage] onDestroy end'); - }, - refreshSongInfo(index) { - console.info('MusicPlayer[IndexPage] refreshSongInfo ' + index + '/' - + this.playerModel.playlist.audioFiles.length); - if (index >= this.playerModel.playlist.audioFiles.length) { - console.warn('MusicPlayer[IndexPage] refreshSongInfo ignored'); - return; - } - // update song title - this.title = this.playerModel.playlist.audioFiles[index].name; - this.albumSrc = (index % 2 === 0) ? '/common/media/album.png' : '/common/media/album2.png'; + } + }); + }, + onNewRequest() { + console.info('MusicPlayer[IndexPage] onNewRequest'); + this.playerModel.pause(); + this.playerModel.seek(0); + this.restoreFromWant(); + }, + onBackPress() { + console.info('MusicPlayer[IndexPage] onBackPress isDialogShowing=' + this.isDialogShowing); + if (this.isDialogShowing === true) { + this.dismissDialog(); + return true; + } + return false; + }, + onDestroy() { + console.info('MusicPlayer[IndexPage] onDestroy begin'); + if (this.playerModel === undefined) { + return + } + this.playerModel.release(); + this.remoteDeviceModel.unregisterDeviceListCallback(); + console.info('MusicPlayer[IndexPage] onDestroy end'); + }, + refreshSongInfo(index) { + console.info('MusicPlayer[IndexPage] refreshSongInfo ' + index + '/' + + this.playerModel.playlist.audioFiles.length); + if (index >= this.playerModel.playlist.audioFiles.length) { + console.warn('MusicPlayer[IndexPage] refreshSongInfo ignored'); + return; + } + // update song title + this.title = this.playerModel.playlist.audioFiles[index].name; + this.albumSrc = (index % 2 === 0) ? '/common/media/album.png' : '/common/media/album2.png'; - // update duration - this.totalMs = this.playerModel.getDuration(); - this.totalTimeText = getShownTimer(this.totalMs); - this.currentTimeText = getShownTimer(this.playerModel.getCurrentMs()); + // update duration + this.totalMs = this.playerModel.getDuration(); + this.totalTimeText = getShownTimer(this.totalMs); + this.currentTimeText = getShownTimer(this.playerModel.getCurrentMs()); - console.info('MusicPlayer[IndexPage] refreshSongInfo this.title=' + this.title + ' this.totalMs=' - + this.totalMs + ' this.totalTimeText=' + this.totalTimeText + ' this.currentTimeText=' + this.currentTimeText); - }, - setProgress(e) { - console.info('MusicPlayer[IndexPage] setProgress ' + e.mode + ', ' + e.value); - this.currentProgress = e.value; - if (isNaN(this.totalMs)) { - this.currentProgress = 0; - console.info('MusicPlayer[IndexPage] setProgress ignored, totalMs=' + this.totalMs); - return; - } - var currentMs = this.currentProgress / 100 * this.totalMs; - this.currentTimeText = getShownTimer(currentMs); - if (e.mode === 'end' || e.mode === 'click') { - console.info('MusicPlayer[IndexPage] player.seek ' + currentMs); - this.playerModel.seek(currentMs); - } - }, - onPreviousClick() { - if (this.isSwitching) { - console.info('MusicPlayer[IndexPage] onPreviousClick ignored, isSwitching'); - return; - } - console.info('MusicPlayer[IndexPage] onPreviousClick'); - this.playerModel.index--; - if (this.playerModel.index < 0 && this.playerModel.playlist.audioFiles.length >= 1) { - this.playerModel.index = this.playerModel.playlist.audioFiles.length - 1; - } - this.currentProgress = 0; - this.isSwitching = true; - this.playerModel.preLoad(this.playerModel.index, () => { - this.refreshSongInfo(this.playerModel.index); - this.playerModel.play(0, true); - this.isSwitching = false; - }); - }, - onNextClick() { - if (this.isSwitching) { - console.info('MusicPlayer[IndexPage] onNextClick ignored, isSwitching'); - return; - } - console.info('MusicPlayer[IndexPage] onNextClick'); - this.playerModel.index++; - if (this.playerModel.index >= this.playerModel.playlist.audioFiles.length) { - this.playerModel.index = 0; - } - this.currentProgress = 0; - this.isSwitching = true; - this.playerModel.preLoad(this.playerModel.index, () => { - this.refreshSongInfo(this.playerModel.index); - this.playerModel.play(0, true); - this.isSwitching = false; - }); - }, - onPlayClick() { - if (this.isSwitching) { - console.info('MusicPlayer[IndexPage] onPlayClick ignored, isSwitching'); - return; - } - console.info('MusicPlayer[IndexPage] onPlayClick, isPlaying=' + this.playerModel.isPlaying); - if (this.playerModel.isPlaying) { - this.playerModel.pause(); - } else { - this.playerModel.preLoad(this.playerModel.index, () => { - this.playerModel.play(-1, true); - }); - } - }, - onContinueAbilityClick() { - console.info('MusicPlayer[IndexPage] onContinueAbilityClick begin'); - this.remoteDeviceModel.registerDeviceListCallback(() => { - console.info('MusicPlayer[IndexPage] registerDeviceListCallback, callback entered'); - var list = []; - list[0] = DEVICE_LIST_LOCALHOST; - var deviceList; - if (this.remoteDeviceModel.discoverList.length > 0) { - deviceList = this.remoteDeviceModel.discoverList; - } else { - deviceList = this.remoteDeviceModel.deviceList; - } - console.info('MusicPlayer[IndexPage] on remote device updated, count=' + deviceList.length); - for (var i = 0; i < deviceList.length; i++) { - console.info('MusicPlayer[IndexPage] device ' + i + '/' + deviceList.length + ' deviceId=' - + deviceList[i].deviceId + ' deviceName=' + deviceList[i].deviceName + ' deviceType=' - + deviceList[i].deviceType); - list[i + 1] = { - name: deviceList[i].deviceName, - id: deviceList[i].deviceId, - }; - } - this.deviceList = list; - }); - this.$element('continueAbilityDialog').show(); - this.isDialogShowing = true; - console.info('MusicPlayer[IndexPage] onContinueAbilityClick end'); - }, - startAbilityContinuation(deviceId, deviceName) { + console.info('MusicPlayer[IndexPage] refreshSongInfo this.title=' + this.title + ' this.totalMs=' + + this.totalMs + ' this.totalTimeText=' + this.totalTimeText + ' this.currentTimeText=' + this.currentTimeText); + }, + setProgress(e) { + console.info('MusicPlayer[IndexPage] setProgress ' + e.mode + ', ' + e.value); + this.currentProgress = e.value; + if (isNaN(this.totalMs)) { + this.currentProgress = 0; + console.info('MusicPlayer[IndexPage] setProgress ignored, totalMs=' + this.totalMs); + return; + } + var currentMs = this.currentProgress / 100 * this.totalMs; + this.currentTimeText = getShownTimer(currentMs); + if (e.mode === 'end' || e.mode === 'click') { + console.info('MusicPlayer[IndexPage] player.seek ' + currentMs); + this.playerModel.seek(currentMs); + } + }, + onPreviousClick() { + if (this.isSwitching) { + console.info('MusicPlayer[IndexPage] onPreviousClick ignored, isSwitching'); + return; + } + console.info('MusicPlayer[IndexPage] onPreviousClick'); + this.playerModel.index--; + if (this.playerModel.index < 0 && this.playerModel.playlist.audioFiles.length >= 1) { + this.playerModel.index = this.playerModel.playlist.audioFiles.length - 1; + } + this.currentProgress = 0; + this.isSwitching = true; + this.playerModel.preLoad(this.playerModel.index, () => { + this.refreshSongInfo(this.playerModel.index); + this.playerModel.play(0, true); + this.isSwitching = false; + }); + }, + onNextClick() { + if (this.isSwitching) { + console.info('MusicPlayer[IndexPage] onNextClick ignored, isSwitching'); + return; + } + console.info('MusicPlayer[IndexPage] onNextClick'); + this.playerModel.index++; + if (this.playerModel.index >= this.playerModel.playlist.audioFiles.length) { + this.playerModel.index = 0; + } + this.currentProgress = 0; + this.isSwitching = true; + this.playerModel.preLoad(this.playerModel.index, () => { + this.refreshSongInfo(this.playerModel.index); + this.playerModel.play(0, true); + this.isSwitching = false; + }); + }, + onPlayClick() { + if (this.isSwitching) { + console.info('MusicPlayer[IndexPage] onPlayClick ignored, isSwitching'); + return; + } + console.info('MusicPlayer[IndexPage] onPlayClick, isPlaying=' + this.playerModel.isPlaying); + if (this.playerModel.isPlaying) { + this.playerModel.pause(); + } else { + this.playerModel.preLoad(this.playerModel.index, () => { + this.playerModel.play(-1, true); + }); + } + }, + onContinueAbilityClick() { + console.info('MusicPlayer[IndexPage] onContinueAbilityClick begin'); + this.remoteDeviceModel.registerDeviceListCallback(() => { + console.info('MusicPlayer[IndexPage] registerDeviceListCallback, callback entered'); + var list = []; + list[0] = DEVICE_LIST_LOCALHOST; + var deviceList; + if (this.remoteDeviceModel.discoverList.length > 0) { + deviceList = this.remoteDeviceModel.discoverList; + } else { + deviceList = this.remoteDeviceModel.deviceList; + } + console.info('MusicPlayer[IndexPage] on remote device updated, count=' + deviceList.length); + for (var i = 0; i < deviceList.length; i++) { + console.info('MusicPlayer[IndexPage] device ' + i + '/' + deviceList.length + ' deviceId=' + + deviceList[i].deviceId + ' deviceName=' + deviceList[i].deviceName + ' deviceType=' + + deviceList[i].deviceType); + list[i + 1] = { + name: deviceList[i].deviceName, + id: deviceList[i].deviceId, + }; + } + this.deviceList = list; + }); + this.$element('continueAbilityDialog').show(); + this.isDialogShowing = true; + console.info('MusicPlayer[IndexPage] onContinueAbilityClick end'); + }, + startAbilityContinuation(deviceId, deviceName) { + this.$element('continueAbilityDialog').close(); + var params; + if (this.playerModel.index >= 0 && this.playerModel.index <= this.playerModel.playlist.audioFiles.length) { + params = { + uri: this.playerModel.playlist.audioFiles[this.playerModel.index].fileUri, + seekTo: this.playerModel.getCurrentMs(), + isPlaying: this.playerModel.isPlaying + }; + } else { + params = { + uri: '', + seekTo: 0, + isPlaying: false + }; + } + console.info('MusicPlayer[IndexPage] featureAbility.startAbility deviceId=' + deviceId + + ' deviceName=' + deviceName); + var wantValue = { + bundleName: 'ohos.samples.distributedmusicplayer', + abilityName: 'ohos.samples.distributedmusicplayer.MainAbility', + deviceId: deviceId, + parameters: params + }; + var timerId = setTimeout(() => { + console.info('MusicPlayer[IndexPage] onMessageReceiveTimeout, terminateSelf'); + featureAbility.terminateSelf((error) => { + console.info('MusicPlayer[IndexPage] terminateSelf finished, error=' + error); + }); + }, 3000); + this.kvStoreModel.setOnMessageReceivedListener(REMOTE_ABILITY_STARTED, () => { + console.info('MusicPlayer[IndexPage] OnMessageReceived, terminateSelf'); + clearTimeout(timerId); + featureAbility.terminateSelf((error) => { + console.info('MusicPlayer[IndexPage] terminateSelf finished, error=' + error); + }); + }); + featureAbility.startAbility({ + want: wantValue + }).then((data) => { + console.info('MusicPlayer[IndexPage] featureAbility.startAbility finished, ' + JSON.stringify(data)); + }); + console.info('MusicPlayer[IndexPage] featureAbility.startAbility want=' + JSON.stringify(wantValue)); + console.info('MusicPlayer[IndexPage] featureAbility.startAbility end'); + }, + onRadioChange(inputValue, e) { + console.info('MusicPlayer[IndexPage] onRadioChange ' + inputValue + ', ' + e.value); + if (inputValue === e.value) { + if (e.value === 'localhost') { this.$element('continueAbilityDialog').close(); - var params; - if (this.playerModel.index >= 0 && this.playerModel.index <= this.playerModel.playlist.audioFiles.length) { - params = { - uri: this.playerModel.playlist.audioFiles[this.playerModel.index].fileUri, - seekTo: this.playerModel.getCurrentMs(), - isPlaying: this.playerModel.isPlaying - }; - } else { - params = { - uri: '', - seekTo: 0, - isPlaying: false - }; + return; + } + if (this.remoteDeviceModel.discoverList.length > 0) { + console.info('MusicPlayer[IndexPage] continue to unauthed device'); + var name = null; + for (var i = 0; i < this.remoteDeviceModel.discoverList.length; i++) { + if (this.remoteDeviceModel.discoverList[i].deviceId === e.value) { + name = this.remoteDeviceModel.discoverList[i].deviceName; + break; + } } - console.info('MusicPlayer[IndexPage] featureAbility.startAbility deviceId=' + deviceId - + ' deviceName=' + deviceName); - var wantValue = { - bundleName: 'ohos.samples.distributedmusicplayer', - abilityName: 'ohos.samples.distributedmusicplayer.MainAbility', - deviceId: deviceId, - parameters: params - }; - var timerId = setTimeout(() => { - console.info('MusicPlayer[IndexPage] onMessageReceiveTimeout, terminateSelf'); - featureAbility.terminateSelf((error) => { - console.info('MusicPlayer[IndexPage] terminateSelf finished, error=' + error); - }); - }, 3000); - this.kvStoreModel.setOnMessageReceivedListener(REMOTE_ABILITY_STARTED, () => { - console.info('MusicPlayer[IndexPage] OnMessageReceived, terminateSelf'); - clearTimeout(timerId); - featureAbility.terminateSelf((error) => { - console.info('MusicPlayer[IndexPage] terminateSelf finished, error=' + error); - }); - }); - featureAbility.startAbility({ - want: wantValue - }).then((data) => { - console.info('MusicPlayer[IndexPage] featureAbility.startAbility finished, ' + JSON.stringify(data)); - }); - console.info('MusicPlayer[IndexPage] featureAbility.startAbility want=' + JSON.stringify(wantValue)); - console.info('MusicPlayer[IndexPage] featureAbility.startAbility end'); - }, - onRadioChange(inputValue, e) { - console.info('MusicPlayer[IndexPage] onRadioChange ' + inputValue + ', ' + e.value); - if (inputValue === e.value) { - if (e.value === 'localhost') { - this.$element('continueAbilityDialog').close(); - return; - } - if (this.remoteDeviceModel.discoverList.length > 0) { - console.info('MusicPlayer[IndexPage] continue to unauthed device'); - var name = null; - for (var i = 0; i < this.remoteDeviceModel.discoverList.length; i++) { - if (this.remoteDeviceModel.discoverList[i].deviceId === e.value) { - name = this.remoteDeviceModel.discoverList[i].deviceName; - break; - } - } - if (name == null) { - console.error('MusicPlayer[IndexPage] onRadioChange failed, can not get name from discoverList'); - return; - } - console.info('MusicPlayer[IndexPage] onRadioChange name=' + name); + if (name == null) { + console.error('MusicPlayer[IndexPage] onRadioChange failed, can not get name from discoverList'); + return; + } + console.info('MusicPlayer[IndexPage] onRadioChange name=' + name); - this.remoteDeviceModel.authDevice(e.value, () => { - console.info('MusicPlayer[IndexPage] auth and online finished'); - for (i = 0; i < this.remoteDeviceModel.deviceList.length; i++) { - if (this.remoteDeviceModel.deviceList[i].deviceName === name) { - this.startAbilityContinuation(this.remoteDeviceModel.deviceList[i].deviceId, this.remoteDeviceModel.deviceList[i].deviceName); - } - } - }); - } else { - console.info('MusicPlayer[IndexPage] continue to authed device'); - for (i = 0; i < this.remoteDeviceModel.deviceList.length; i++) { - if (this.remoteDeviceModel.deviceList[i].deviceId === e.value) { - this.startAbilityContinuation(this.remoteDeviceModel.deviceList[i].deviceId, this.remoteDeviceModel.deviceList[i].deviceName); - } - } + this.remoteDeviceModel.authDevice(e.value, () => { + console.info('MusicPlayer[IndexPage] auth and online finished'); + for (i = 0; i < this.remoteDeviceModel.deviceList.length; i++) { + if (this.remoteDeviceModel.deviceList[i].deviceName === name) { + this.startAbilityContinuation(this.remoteDeviceModel.deviceList[i].deviceId, this.remoteDeviceModel.deviceList[i].deviceName); } + } + }); + } else { + console.info('MusicPlayer[IndexPage] continue to authed device'); + for (i = 0; i < this.remoteDeviceModel.deviceList.length; i++) { + if (this.remoteDeviceModel.deviceList[i].deviceId === e.value) { + this.startAbilityContinuation(this.remoteDeviceModel.deviceList[i].deviceId, this.remoteDeviceModel.deviceList[i].deviceName); + } } - }, - cancelDialog(e) { - this.remoteDeviceModel.unregisterDeviceListCallback(); - this.isDialogShowing = false; - }, - onDismissDialogClicked(e) { - this.dismissDialog(); - }, - dismissDialog() { - this.$element('continueAbilityDialog').close(); - this.remoteDeviceModel.unregisterDeviceListCallback(); - this.isDialogShowing = false; + } } + }, + cancelDialog(e) { + this.remoteDeviceModel.unregisterDeviceListCallback(); + this.isDialogShowing = false; + }, + onDismissDialogClicked(e) { + this.dismissDialog(); + }, + dismissDialog() { + this.$element('continueAbilityDialog').close(); + this.remoteDeviceModel.unregisterDeviceListCallback(); + this.isDialogShowing = false; + } }; diff --git a/common/AirQuality/.gitignore b/common/AirQuality/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/common/AirQuality/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/common/AirQuality/README_zh.md b/common/AirQuality/README_zh.md index 8fb746695..bb77546ac 100644 --- a/common/AirQuality/README_zh.md +++ b/common/AirQuality/README_zh.md @@ -26,7 +26,7 @@ chart：图表组件，用于呈现线形图、柱状图、量规图界面。 1.本示例支持在标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 3.如果安装本示例报错为error：install sign info inconsistent，则有可能本应用被设置为系统预置应用，已安装在系统中，此时需使用命令进行替换安装，并在替换安装后对设备进行重启操作，具体命令如下： diff --git a/common/AirQuality/entry/src/main/js/default/app.js b/common/AirQuality/entry/src/main/js/default/app.js index 50449ecbe..8f942067b 100644 --- a/common/AirQuality/entry/src/main/js/default/app.js +++ b/common/AirQuality/entry/src/main/js/default/app.js @@ -13,10 +13,10 @@ * limitations under the License. */ export default { - onCreate() { - console.info("Application onCreate"); - }, - onDestroy() { - console.info("Application onDestroy"); - } + onCreate() { + console.info("Application onCreate"); + }, + onDestroy() { + console.info("Application onDestroy"); + } }; diff --git a/common/AirQuality/entry/src/main/js/default/pages/index/index.css b/common/AirQuality/entry/src/main/js/default/pages/index/index.css index c385c6623..cd4b36230 100644 --- a/common/AirQuality/entry/src/main/js/default/pages/index/index.css +++ b/common/AirQuality/entry/src/main/js/default/pages/index/index.css @@ -61,11 +61,13 @@ height: 50px; font-size: 35px; } + .progress-div { width: 320px; height: 220px; flex-direction: column; } + .progress { width: 100%; height: 100%; @@ -83,13 +85,13 @@ stroke-width: 20px; width: 100%; height: 100%; - top:5px; + top: 5px; } .mask-layer { width: 100%; height: 100%; - top:10px; + top: 10px; flex-direction: column; } @@ -164,7 +166,7 @@ width: 100%; height: 100%; flex-direction: row; - flex-wrap:wrap; + flex-wrap: wrap; align-items: center; justify-content: center; } diff --git a/common/AirQuality/entry/src/main/js/default/pages/index/index.hml b/common/AirQuality/entry/src/main/js/default/pages/index/index.hml index f8529da6a..b3afd7803 100644 --- a/common/AirQuality/entry/src/main/js/default/pages/index/index.hml +++ b/common/AirQuality/entry/src/main/js/default/pages/index/index.hml @@ -13,108 +13,108 @@ See the License for the specific language governing permissions and limitations under the License. -->
-
- - {{ $t('strings.title') }} -
- - - -
-
- - {{ airData[0].location }} - - - - -
- AQI - {{ airData[0].detailData }} - {{ airData[0].airQuality }} - -
- -
-
-
- CO - 100 -
-
- NO2 - 90 -
-
- PM10 - 120 -
-
- PM2.5 - 40 -
-
- SO2 - 150 -
-
-
- -
-
- {{ $t('strings.update_time') }} - {{ $t('strings.source_info') }} -
-
-
-
- - {{ airData[1].location }} - - - - -
- AQI - {{ airData[1].detailData }} - {{ airData[1].airQuality }} - -
- -
-
-
- CO - 100 -
-
- NO2 - 90 -
-
- PM10 - 120 -
-
- PM2.5 - 40 -
-
- SO2 - 150 -
-
- -
- {{ $t('strings.update_time') }} - {{ $t('strings.source_info') }} -
-
- - - +
+ + {{ $t('strings.title') }} +
+ + + +
+
+ + {{ airData[0].location }} + + + + +
+ AQI + {{ airData[0].detailData }} + {{ airData[0].airQuality }} + +
+ +
+
+
+ CO + 100 +
+
+ NO2 + 90 +
+
+ PM10 + 120 +
+
+ PM2.5 + 40 +
+
+ SO2 + 150 +
+
+
+ +
+
+ {{ $t('strings.update_time') }} + {{ $t('strings.source_info') }} +
+
+
+
+ + {{ airData[1].location }} + + + + +
+ AQI + {{ airData[1].detailData }} + {{ airData[1].airQuality }} + +
+ +
+
+
+ CO + 100 +
+
+ NO2 + 90 +
+
+ PM10 + 120 +
+
+ PM2.5 + 40 +
+
+ SO2 + 150 +
+
+ +
+ {{ $t('strings.update_time') }} + {{ $t('strings.source_info') }} +
+
+ + +
diff --git a/common/AirQuality/entry/src/main/js/default/pages/index/index.js b/common/AirQuality/entry/src/main/js/default/pages/index/index.js index d06306b65..506962cf9 100644 --- a/common/AirQuality/entry/src/main/js/default/pages/index/index.js +++ b/common/AirQuality/entry/src/main/js/default/pages/index/index.js @@ -16,82 +16,82 @@ import router from '@ohos.router'; import app from '@system.app'; export default { - data: { - textColor1: '#00ff00', - textColor2: '#00ff00', - bgColor1: '#669966', - bgColor2: '#669966', - swiperPage: 0, - percent1: 40, - percent2: 90, - iconcheckedBR: '6px', - iconcheckedColor: '#ffffff', - iconUncheckedColor: '#262626', - src1: '/common/cloud_green.png', - src2: '/common/cloud_green.png', - airData: [{ - location: '东莞', - airQuality: '良', - detailData: 40 - }, { - location: '深圳', - airQuality: '差', - detailData: 90 - }] - }, - onInit() { - if (this.airData[0].detailData > 100) { - this.src1 = '/common/cloud_red.png'; - this.textColor1 = '#ff0000'; - this.bgColor1 = '#9d7462'; - } else if (this.airData[0].detailData > 50 ) { - this.src1 = '/common/cloud_yellow.png'; - this.textColor1 = '#ecf19a'; - this.bgColor1 = '#9d9d62'; - } - if (this.airData[1].detailData > 100) { - this.src2 = '/common/cloud_red.png'; - this.textColor2 = '#ff0000'; - this.bgColor2 = '#9d9d62'; - } else if (50 < this.airData[1].detailData) { - this.src2 = '/common/cloud_yellow.png' - this.textColor2 = '#ecf19a'; - this.bgColor2 = '#9d9d62'; - } - if (this.selectedCityIndex) { - this.swiperPage = this.selectedCityIntex - if (this.swiperPage == 0) { - this.iconcheckedBR = '#ffffff'; - this.iconUncheckedColor = '#262626'; - } else { - this.iconcheckedColor = '#262626'; - this.iconUncheckedColor = '#ffffff'; - } - } - }, - openDetail() { - router.push({ - url: 'pages/second/second', - params: { - selectedCityIndex: this.swiperPage - } - }); - }, - exitApp() { - console.log('start exit'); - app.terminate(); - console.log('end exit') - }, - swiperChange(e) { - this.swiperPage = e.index; - if (e.index == 0) { - this.iconcheckedColor = '#ffffff'; - this.iconUncheckedColor = '#262626'; - } else { - this.iconcheckedColor = '#262626'; - this.iconUncheckedColor = '#ffffff'; - } + data: { + textColor1: '#00ff00', + textColor2: '#00ff00', + bgColor1: '#669966', + bgColor2: '#669966', + swiperPage: 0, + percent1: 40, + percent2: 90, + iconcheckedBR: '6px', + iconcheckedColor: '#ffffff', + iconUncheckedColor: '#262626', + src1: '/common/cloud_green.png', + src2: '/common/cloud_green.png', + airData: [{ + location: '东莞', + airQuality: '良', + detailData: 40 + }, { + location: '深圳', + airQuality: '差', + detailData: 90 + }] + }, + onInit() { + if (this.airData[0].detailData > 100) { + this.src1 = '/common/cloud_red.png'; + this.textColor1 = '#ff0000'; + this.bgColor1 = '#9d7462'; + } else if (this.airData[0].detailData > 50) { + this.src1 = '/common/cloud_yellow.png'; + this.textColor1 = '#ecf19a'; + this.bgColor1 = '#9d9d62'; } + if (this.airData[1].detailData > 100) { + this.src2 = '/common/cloud_red.png'; + this.textColor2 = '#ff0000'; + this.bgColor2 = '#9d9d62'; + } else if (50 < this.airData[1].detailData) { + this.src2 = '/common/cloud_yellow.png' + this.textColor2 = '#ecf19a'; + this.bgColor2 = '#9d9d62'; + } + if (this.selectedCityIndex) { + this.swiperPage = this.selectedCityIntex + if (this.swiperPage == 0) { + this.iconcheckedBR = '#ffffff'; + this.iconUncheckedColor = '#262626'; + } else { + this.iconcheckedColor = '#262626'; + this.iconUncheckedColor = '#ffffff'; + } + } + }, + openDetail() { + router.push({ + url: 'pages/second/second', + params: { + selectedCityIndex: this.swiperPage + } + }); + }, + exitApp() { + console.log('start exit'); + app.terminate(); + console.log('end exit') + }, + swiperChange(e) { + this.swiperPage = e.index; + if (e.index == 0) { + this.iconcheckedColor = '#ffffff'; + this.iconUncheckedColor = '#262626'; + } else { + this.iconcheckedColor = '#262626'; + this.iconUncheckedColor = '#ffffff'; + } + } } diff --git a/common/AirQuality/entry/src/main/js/default/pages/second/second.hml b/common/AirQuality/entry/src/main/js/default/pages/second/second.hml index b8bbd13c4..bbdf7a1ac 100644 --- a/common/AirQuality/entry/src/main/js/default/pages/second/second.hml +++ b/common/AirQuality/entry/src/main/js/default/pages/second/second.hml @@ -13,135 +13,135 @@ See the License for the specific language governing permissions and limitations under the License. -->
-
- - {{ $t('strings.title') }} -
- - - {{ location }} - - -
-
- CO -
-
-
-
-
-
-
-
-
-
-
- MON - TUE - WED - THU - FRI - SAT - SUN -
-
-
- SO2 -
-
-
-
-
-
-
-
-
-
-
- MON - TUE - WED - THU - FRI - SAT - SUN -
-
-
- - -
-
- PM10 -
-
-
-
-
-
-
-
-
-
-
- MON - TUE - WED - THU - FRI - SAT - SUN -
-
-
- PM2.5 -
-
-
-
-
-
-
-
-
-
-
- MON - TUE - WED - THU - FRI - SAT - SUN -
-
-
- - -
-
- NO2 -
-
-
-
-
-
-
-
-
-
-
- MON - TUE - WED - THU - FRI - SAT - SUN -
-
-
- - +
+ + {{ $t('strings.title') }} +
+ + + {{ location }} + + +
+
+ CO +
+
+
+
+
+
+
+
+
+
+
+ MON + TUE + WED + THU + FRI + SAT + SUN +
+
+
+ SO2 +
+
+
+
+
+
+
+
+
+
+
+ MON + TUE + WED + THU + FRI + SAT + SUN +
+
+
+ + +
+
+ PM10 +
+
+
+
+
+
+
+
+
+
+
+ MON + TUE + WED + THU + FRI + SAT + SUN +
+
+
+ PM2.5 +
+
+
+
+
+
+
+
+
+
+
+ MON + TUE + WED + THU + FRI + SAT + SUN +
+
+
+ + +
+
+ NO2 +
+
+
+
+
+
+
+
+
+
+
+ MON + TUE + WED + THU + FRI + SAT + SUN +
+
+
+ +
diff --git a/common/AirQuality/entry/src/main/js/default/pages/second/second.js b/common/AirQuality/entry/src/main/js/default/pages/second/second.js index fb9374634..abdfbe16f 100644 --- a/common/AirQuality/entry/src/main/js/default/pages/second/second.js +++ b/common/AirQuality/entry/src/main/js/default/pages/second/second.js @@ -15,17 +15,17 @@ import router from '@ohos.router' export default { - data: { - location: '' - }, - onInit() { - if (this.selectedCityIndex === 0) { - this.location = '东莞'; - } else { - this.location = '深圳'; - } - }, - backMain() { - router.back() + data: { + location: '' + }, + onInit() { + if (this.selectedCityIndex === 0) { + this.location = '东莞'; + } else { + this.location = '深圳'; } + }, + backMain() { + router.back() + } } diff --git a/common/AirQuality/package.json b/common/AirQuality/package.json index 19efc1764..c948a751b 100644 --- a/common/AirQuality/package.json +++ b/common/AirQuality/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3", - "@ohos/hypium": "1.0.0" + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6", + "@ohos/hypium": "1.0.1" } } diff --git a/common/Clock/.gitignore b/common/Clock/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/common/Clock/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/common/Clock/README_zh.md b/common/Clock/README_zh.md index 6d134cd30..89ecc7a6c 100644 --- a/common/Clock/README_zh.md +++ b/common/Clock/README_zh.md @@ -24,7 +24,7 @@ TextClock：TextClock组件通过文本将当前系统时间显示在设备上 1.本示例仅支持在标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 3.如果安装本示例报错为error：install sign info inconsistent，则有可能本应用被设置为系统预置应用，已安装在系统中，此时需使用命令进行替换安装，并在替换安装后对设备进行重启操作，具体命令如下： diff --git a/common/Clock/entry/src/main/js/default/app.js b/common/Clock/entry/src/main/js/default/app.js index 58d12b7b5..6d4065abc 100644 --- a/common/Clock/entry/src/main/js/default/app.js +++ b/common/Clock/entry/src/main/js/default/app.js @@ -14,10 +14,10 @@ */ export default { - onCreate() { - console.info("Application onCreate"); - }, - onDestroy() { - console.info("Application onDestroy"); - } + onCreate() { + console.info("Application onCreate"); + }, + onDestroy() { + console.info("Application onDestroy"); + } }; diff --git a/common/Clock/entry/src/main/js/default/pages/index/index.hml b/common/Clock/entry/src/main/js/default/pages/index/index.hml index 61032a70c..93effc73a 100644 --- a/common/Clock/entry/src/main/js/default/pages/index/index.hml +++ b/common/Clock/entry/src/main/js/default/pages/index/index.hml @@ -14,14 +14,14 @@ -->
- - - - - - - {{ hour }}:{{ minute }}:{{ second }} + + + + + + + {{ hour }}:{{ minute }}:{{ second }}
\ No newline at end of file diff --git a/common/Clock/entry/src/main/js/default/pages/index/index.js b/common/Clock/entry/src/main/js/default/pages/index/index.js index ac1a561be..c43671bfd 100644 --- a/common/Clock/entry/src/main/js/default/pages/index/index.js +++ b/common/Clock/entry/src/main/js/default/pages/index/index.js @@ -14,32 +14,32 @@ */ export default { - timer: undefined, - data: { - hour: 0, - minute: 0, - second: 0 - }, - onInit() { - this.updateTime(); - this.timer = setInterval(this.updateTime, 1000) - }, - updateTime: function () { - var nowTime = new Date() - this.hour = nowTime.getHours() - this.minute = nowTime.getMinutes() - this.second = nowTime.getSeconds() - if (this.hour < 10) { - this.hour = '0' + this.hour - } - if (this.minute < 10) { - this.minute = '0' + this.minute - } - if (this.second < 10) { - this.second = '0' + this.second - } - }, - onDestroy() { - clearInterval(this.timer) + timer: undefined, + data: { + hour: 0, + minute: 0, + second: 0 + }, + onInit() { + this.updateTime(); + this.timer = setInterval(this.updateTime, 1000) + }, + updateTime: function () { + var nowTime = new Date() + this.hour = nowTime.getHours() + this.minute = nowTime.getMinutes() + this.second = nowTime.getSeconds() + if (this.hour < 10) { + this.hour = '0' + this.hour } + if (this.minute < 10) { + this.minute = '0' + this.minute + } + if (this.second < 10) { + this.second = '0' + this.second + } + }, + onDestroy() { + clearInterval(this.timer) + } } \ No newline at end of file diff --git a/common/Clock/package.json b/common/Clock/package.json index 8643303d7..a2e460b82 100644 --- a/common/Clock/package.json +++ b/common/Clock/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } \ No newline at end of file diff --git a/common/DistributeCalc/.gitignore b/common/DistributeCalc/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/common/DistributeCalc/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/common/DistributeCalc/README_zh.md b/common/DistributeCalc/README_zh.md index bdb8adb7a..39bd18075 100644 --- a/common/DistributeCalc/README_zh.md +++ b/common/DistributeCalc/README_zh.md @@ -40,7 +40,7 @@ 3.分布式计算功能使用的前提是分布式组网。 -4.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 +4.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 5.本示例需要使用@ohos.distributedHardware.deviceManager系统权限的系统接口。使用Full SDK时需要手动从镜像站点获取，并在DevEco Studio中替换，具体操作可参考[替换指南](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/full-sdk-switch-guide.md)。 diff --git a/common/DistributeCalc/entry/src/main/js/MainAbility/app.js b/common/DistributeCalc/entry/src/main/js/MainAbility/app.js index e3a0891c0..e2e723dcb 100644 --- a/common/DistributeCalc/entry/src/main/js/MainAbility/app.js +++ b/common/DistributeCalc/entry/src/main/js/MainAbility/app.js @@ -14,10 +14,10 @@ */ export default { - onCreate() { - console.info("Application onCreate"); - }, - onDestroy() { - console.info("Application onDestroy"); - } + onCreate() { + console.info("Application onCreate"); + }, + onDestroy() { + console.info("Application onDestroy"); + } }; diff --git a/common/DistributeCalc/entry/src/main/js/MainAbility/common/RemoteDeviceModel.js b/common/DistributeCalc/entry/src/main/js/MainAbility/common/RemoteDeviceModel.js index 82cd0ad31..ba3dd0193 100644 --- a/common/DistributeCalc/entry/src/main/js/MainAbility/common/RemoteDeviceModel.js +++ b/common/DistributeCalc/entry/src/main/js/MainAbility/common/RemoteDeviceModel.js @@ -19,171 +19,171 @@ import deviceManager from '@ohos.distributedHardware.deviceManager'; let SUBSCRIBE_ID = 100; export default class RemoteDeviceModel { - deviceList = []; - discoverList = []; - callback; - authCallback; - deviceManager = undefined; + deviceList = []; + discoverList = []; + callback; + authCallback; + deviceManager = undefined; - registerDeviceListCallback(callback) { - if (typeof (this.deviceManager) === 'undefined') { - console.log("Calc[RemoteDeviceModel] deviceManager.createDeviceManager begin"); - deviceManager.createDeviceManager("ohos.samples.distributedcalc", (error, value) => { - if (error) { - console.error("Calc[RemoteDeviceModel] createDeviceManager failed."); - return; - } - this.deviceManager = value; - this.registerDeviceListCallback_(callback); - console.log("Calc[RemoteDeviceModel] createDeviceManager callback returned, error=" + error + " value=" + value); - }); - console.log("Calc[RemoteDeviceModel] deviceManager.createDeviceManager end"); - } else { - this.registerDeviceListCallback_(callback); + registerDeviceListCallback(callback) { + if (typeof (this.deviceManager) === 'undefined') { + console.log("Calc[RemoteDeviceModel] deviceManager.createDeviceManager begin"); + deviceManager.createDeviceManager("ohos.samples.distributedcalc", (error, value) => { + if (error) { + console.error("Calc[RemoteDeviceModel] createDeviceManager failed."); + return; } + this.deviceManager = value; + this.registerDeviceListCallback_(callback); + console.log("Calc[RemoteDeviceModel] createDeviceManager callback returned, error=" + error + " value=" + value); + }); + console.log("Calc[RemoteDeviceModel] deviceManager.createDeviceManager end"); + } else { + this.registerDeviceListCallback_(callback); } + } - registerDeviceListCallback_(callback) { - console.info('Calc[RemoteDeviceModel] registerDeviceListCallback'); - this.callback = callback; - if (this.deviceManager === undefined) { - console.error('Calc[RemoteDeviceModel] deviceManager has not initialized'); - this.callback(); - return; - } + registerDeviceListCallback_(callback) { + console.info('Calc[RemoteDeviceModel] registerDeviceListCallback'); + this.callback = callback; + if (this.deviceManager === undefined) { + console.error('Calc[RemoteDeviceModel] deviceManager has not initialized'); + this.callback(); + return; + } - console.info('Calc[RemoteDeviceModel] getTrustedDeviceListSync begin'); - let list = this.deviceManager.getTrustedDeviceListSync(); - console.info('Calc[RemoteDeviceModel] getTrustedDeviceListSync end, deviceList=' + JSON.stringify(list)); - if (typeof (list) !== 'undefined' && typeof (list.length) !== 'undefined') { - this.deviceList = list; - } - this.callback(); - console.info('Calc[RemoteDeviceModel] callback finished'); + console.info('Calc[RemoteDeviceModel] getTrustedDeviceListSync begin'); + let list = this.deviceManager.getTrustedDeviceListSync(); + console.info('Calc[RemoteDeviceModel] getTrustedDeviceListSync end, deviceList=' + JSON.stringify(list)); + if (typeof (list) !== 'undefined' && typeof (list.length) !== 'undefined') { + this.deviceList = list; + } + this.callback(); + console.info('Calc[RemoteDeviceModel] callback finished'); - this.deviceManager.on('deviceStateChange', (data) => { - console.info('Calc[RemoteDeviceModel] deviceStateChange data=' + JSON.stringify(data)); - switch (data.action) { - case 0: - this.deviceList[this.deviceList.length] = data.device; - console.info('Calc[RemoteDeviceModel] online, updated device list=' + JSON.stringify(this.deviceList)); - this.callback(); - if (this.authCallback != null) { - this.authCallback(); - this.authCallback = null; - } - break; - case 2: - if (this.deviceList.length > 0) { - for (let i = 0; i < this.deviceList.length; i++) { - if (this.deviceList[i].deviceId === data.device.deviceId) { - this.deviceList[i] = data.device; - break; - } - } - } - console.info('Calc[RemoteDeviceModel] change, updated device list=' + JSON.stringify(this.deviceList)); - this.callback(); + this.deviceManager.on('deviceStateChange', (data) => { + console.info('Calc[RemoteDeviceModel] deviceStateChange data=' + JSON.stringify(data)); + switch (data.action) { + case 0: + this.deviceList[this.deviceList.length] = data.device; + console.info('Calc[RemoteDeviceModel] online, updated device list=' + JSON.stringify(this.deviceList)); + this.callback(); + if (this.authCallback != null) { + this.authCallback(); + this.authCallback = null; + } + break; + case 2: + if (this.deviceList.length > 0) { + for (let i = 0; i < this.deviceList.length; i++) { + if (this.deviceList[i].deviceId === data.device.deviceId) { + this.deviceList[i] = data.device; break; - case 1: - if (this.deviceList.length > 0) { - let list = []; - for (let j = 0; j < this.deviceList.length; j++) { - if (this.deviceList[j].deviceId != data.device.deviceId) { - list[j] = data.device; - } - } - this.deviceList = list; - } - console.info('Calc[RemoteDeviceModel] offline, updated device list=' + JSON.stringify(data.device)); - this.callback(); - break; - default: - break; + } } - }); - this.deviceManager.on('deviceFound', (data) => { - console.info('Calc[RemoteDeviceModel] deviceFound data=' + JSON.stringify(data)); - console.info('Calc[RemoteDeviceModel] deviceFound this.discoverList=' + this.discoverList); - for (let i = 0;i < this.discoverList.length; i++) { - if (this.discoverList[i].deviceId === data.device.deviceId) { - console.info('Calc[RemoteDeviceModel] device founded ignored'); - return; - } + } + console.info('Calc[RemoteDeviceModel] change, updated device list=' + JSON.stringify(this.deviceList)); + this.callback(); + break; + case 1: + if (this.deviceList.length > 0) { + let list = []; + for (let j = 0; j < this.deviceList.length; j++) { + if (this.deviceList[j].deviceId != data.device.deviceId) { + list[j] = data.device; + } } - this.discoverList[this.discoverList.length] = data.device; - console.info('Calc[RemoteDeviceModel] deviceFound this.discoverList=' + this.discoverList); - this.callback(); - }); - this.deviceManager.on('discoverFail', (data) => { - prompt.showToast({ - message: 'discoverFail reason=' + data.reason, - duration: 3000, - }); - console.info('Calc[RemoteDeviceModel] discoverFail data=' + JSON.stringify(data)); - }); - this.deviceManager.on('serviceDie', () => { - prompt.showToast({ - message: 'serviceDie', - duration: 3000, - }); - console.error('Calc[RemoteDeviceModel] serviceDie'); - }); + this.deviceList = list; + } + console.info('Calc[RemoteDeviceModel] offline, updated device list=' + JSON.stringify(data.device)); + this.callback(); + break; + default: + break; + } + }); + this.deviceManager.on('deviceFound', (data) => { + console.info('Calc[RemoteDeviceModel] deviceFound data=' + JSON.stringify(data)); + console.info('Calc[RemoteDeviceModel] deviceFound this.discoverList=' + this.discoverList); + for (let i = 0;i < this.discoverList.length; i++) { + if (this.discoverList[i].deviceId === data.device.deviceId) { + console.info('Calc[RemoteDeviceModel] device founded ignored'); + return; + } + } + this.discoverList[this.discoverList.length] = data.device; + console.info('Calc[RemoteDeviceModel] deviceFound this.discoverList=' + this.discoverList); + this.callback(); + }); + this.deviceManager.on('discoverFail', (data) => { + prompt.showToast({ + message: 'discoverFail reason=' + data.reason, + duration: 3000, + }); + console.info('Calc[RemoteDeviceModel] discoverFail data=' + JSON.stringify(data)); + }); + this.deviceManager.on('serviceDie', () => { + prompt.showToast({ + message: 'serviceDie', + duration: 3000, + }); + console.error('Calc[RemoteDeviceModel] serviceDie'); + }); - SUBSCRIBE_ID = Math.floor(65536 * Math.random()); - let info = { - subscribeId: SUBSCRIBE_ID, - mode: 0xAA, - medium: 2, - freq: 2, - isSameAccount: false, - isWakeRemote: true, - capability: 0 - }; - console.info('Calc[RemoteDeviceModel] startDeviceDiscovery ' + SUBSCRIBE_ID); - this.deviceManager.startDeviceDiscovery(info); + SUBSCRIBE_ID = Math.floor(65536 * Math.random()); + let info = { + subscribeId: SUBSCRIBE_ID, + mode: 0xAA, + medium: 2, + freq: 2, + isSameAccount: false, + isWakeRemote: true, + capability: 0 + }; + console.info('Calc[RemoteDeviceModel] startDeviceDiscovery ' + SUBSCRIBE_ID); + this.deviceManager.startDeviceDiscovery(info); + } + + unregisterDeviceListCallback() { + console.info('Calc[RemoteDeviceModel] stopDeviceDiscovery ' + SUBSCRIBE_ID); + if (this.deviceManager === undefined) { + return } + this.deviceManager.stopDeviceDiscovery(SUBSCRIBE_ID); + this.deviceManager.off('deviceStateChange'); + this.deviceManager.off('deviceFound'); + this.deviceManager.off('discoverFail'); + this.deviceManager.off('serviceDie'); + this.deviceList = []; + } - unregisterDeviceListCallback() { - console.info('Calc[RemoteDeviceModel] stopDeviceDiscovery ' + SUBSCRIBE_ID); + authenticateDevice(device, callBack) { + console.info('Calc[RemoteDeviceModel] authenticateDevice ' + JSON.stringify(device)); + for (let i = 0; i < this.discoverList.length; i++) { + if (this.discoverList[i].deviceId === device.deviceId) { + let extraInfo = { + 'targetPkgName': 'ohos.samples.distributedcalc', + 'appName': 'Distributed Calc', + 'appDescription': 'Distributed Calc', + 'business': '0' + }; + let authParam = { + 'authType': 1, + 'extraInfo': extraInfo + }; if (this.deviceManager === undefined) { return } - this.deviceManager.stopDeviceDiscovery(SUBSCRIBE_ID); - this.deviceManager.off('deviceStateChange'); - this.deviceManager.off('deviceFound'); - this.deviceManager.off('discoverFail'); - this.deviceManager.off('serviceDie'); - this.deviceList = []; - } - - authenticateDevice(device, callBack) { - console.info('Calc[RemoteDeviceModel] authenticateDevice ' + JSON.stringify(device)); - for (let i = 0; i < this.discoverList.length; i++) { - if (this.discoverList[i].deviceId === device.deviceId) { - let extraInfo = { - 'targetPkgName': 'ohos.samples.distributedcalc', - 'appName': 'Distributed Calc', - 'appDescription': 'Distributed Calc', - 'business': '0' - }; - let authParam = { - 'authType': 1, - 'extraInfo': extraInfo - }; - if (this.deviceManager === undefined) { - return - } - this.deviceManager.authenticateDevice(device, authParam, (err, data) => { - if (err) { - console.info('Calc[RemoteDeviceModel] authenticateDevice error:' + JSON.stringify(err)); - this.authCallback = null; - return; - } - console.info('Calc[RemoteDeviceModel] authenticateDevice succeed:' + JSON.stringify(data)); - this.authCallback = callBack; - }) - } - } + this.deviceManager.authenticateDevice(device, authParam, (err, data) => { + if (err) { + console.info('Calc[RemoteDeviceModel] authenticateDevice error:' + JSON.stringify(err)); + this.authCallback = null; + return; + } + console.info('Calc[RemoteDeviceModel] authenticateDevice succeed:' + JSON.stringify(data)); + this.authCallback = callBack; + }) + } } + } } \ No newline at end of file diff --git a/common/DistributeCalc/entry/src/main/js/MainAbility/common/calculator.js b/common/DistributeCalc/entry/src/main/js/MainAbility/common/calculator.js index ffbb349cf..ffefbd388 100644 --- a/common/DistributeCalc/entry/src/main/js/MainAbility/common/calculator.js +++ b/common/DistributeCalc/entry/src/main/js/MainAbility/common/calculator.js @@ -14,162 +14,162 @@ */ const OperatorLevels = { - '+': 0, - '-': 0, - '*': 1, - '/': 1, + '+': 0, + '-': 0, + '*': 1, + '/': 1, }; const OperatorHandlers = { - '+': (one, other) => (parseFloat(one) + parseFloat(other)).toFixed(getFloatNum(one, other, '+')), - '-': (one, other) => (one - other).toFixed(getFloatNum(one, other, '-')), - '*': (one, other) => (one * other).toFixed(getFloatNum(one, other, '*')), - '/': (one, other) => (one / other).toFixed(getFloatNum(one, other, '/')), + '+': (one, other) => (parseFloat(one) + parseFloat(other)).toFixed(getFloatNum(one, other, '+')), + '-': (one, other) => (one - other).toFixed(getFloatNum(one, other, '-')), + '*': (one, other) => (one * other).toFixed(getFloatNum(one, other, '*')), + '/': (one, other) => (one / other).toFixed(getFloatNum(one, other, '/')), }; function getFloatNum(one, other, oprate) { - let num = 0; - let s1 = (new String(one)).toString(); - let s2 = (new String(other)).toString(); - let num1 = 0; - if (s1.indexOf('.') !== -1) { - num1 = s1.split('.')[1].length; - } - let num2 = 0; - if (s2.indexOf('.') !== -1) { - num2 = s2.split('.')[1].length; - } - if (oprate === '+' || oprate === '-') { - num = Math.max(num1, num2); - } - if (oprate === '*') { - num = num1 + num2; - } - if (oprate === '/') { - num = (num1 + s2.length) > 3 ? (num1 + s2.length) : 3; - } - return num; + let num = 0; + let s1 = (new String(one)).toString(); + let s2 = (new String(other)).toString(); + let num1 = 0; + if (s1.indexOf('.') !== -1) { + num1 = s1.split('.')[1].length; + } + let num2 = 0; + if (s2.indexOf('.') !== -1) { + num2 = s2.split('.')[1].length; + } + if (oprate === '+' || oprate === '-') { + num = Math.max(num1, num2); + } + if (oprate === '*') { + num = num1 + num2; + } + if (oprate === '/') { + num = (num1 + s2.length) > 3 ? (num1 + s2.length) : 3; + } + return num; } function calcSuffixExpression(expression) { - const numberStack = []; + const numberStack = []; - while (expression.length) { - let element = expression.shift(); - if (!isOperator(element)) { - numberStack.push(element); - } else { - const one = numberStack.pop(); - const other = numberStack.pop(); - const result = OperatorHandlers[element](other, one); - if (result.length > 15) { - numberStack.push(parseFloat(result).toExponential()); - } else { - numberStack.push(result); - } - } + while (expression.length) { + let element = expression.shift(); + if (!isOperator(element)) { + numberStack.push(element); + } else { + const one = numberStack.pop(); + const other = numberStack.pop(); + const result = OperatorHandlers[element](other, one); + if (result.length > 15) { + numberStack.push(parseFloat(result).toExponential()); + } else { + numberStack.push(result); + } } - return numberStack[0]; + } + return numberStack[0]; } function toSuffixExpression(expression) { - const operatorStack = []; - const suffixExpression = []; - let topOperator; - for (let idx = 0, size = expression.length; idx < size; idx++) { - const element = expression[idx]; - if (element === '(') { - operatorStack.push(element); - continue; - } - if (element === ')') { - if (operatorStack.length) { - let operator = operatorStack.pop(); - while (operator !== '(') { - suffixExpression.push(operator); - operator = operatorStack.pop(); - } - } - continue; - } - if (isOperator(element)) { - if (!operatorStack.length) { - operatorStack.push(element); - } else { - topOperator = operatorStack[operatorStack.length - 1]; - if (!isGrouping(topOperator) && !isPrioritized(element, topOperator)) { - suffixExpression.push(operatorStack.pop()); - } - operatorStack.push(element); - } - continue; + const operatorStack = []; + const suffixExpression = []; + let topOperator; + for (let idx = 0, size = expression.length; idx < size; idx++) { + const element = expression[idx]; + if (element === '(') { + operatorStack.push(element); + continue; + } + if (element === ')') { + if (operatorStack.length) { + let operator = operatorStack.pop(); + while (operator !== '(') { + suffixExpression.push(operator); + operator = operatorStack.pop(); } - suffixExpression.push(element); + } + continue; } - while (operatorStack.length) { - suffixExpression.push(operatorStack.pop()); + if (isOperator(element)) { + if (!operatorStack.length) { + operatorStack.push(element); + } else { + topOperator = operatorStack[operatorStack.length - 1]; + if (!isGrouping(topOperator) && !isPrioritized(element, topOperator)) { + suffixExpression.push(operatorStack.pop()); + } + operatorStack.push(element); + } + continue; } - return suffixExpression; + suffixExpression.push(element); + } + while (operatorStack.length) { + suffixExpression.push(operatorStack.pop()); + } + return suffixExpression; } function parseInfixExpression(content) { - const size = content.length; - const lastIdx = size - 1; - let number = ''; - const expression = []; - for (let idx = 0; idx < size; idx++) { - const element = content[idx]; - if (isGrouping(element)) { - if (number !== '') { - expression.push(number); - number = ''; - } - expression.push(element); - } else if (isOperator(element)) { - if (isSymbol(element) && (idx === 0 || content[idx - 1] === '(')) { - number += element; - } else { - if (number !== '') { - expression.push(number); - number = ''; - } - - if (idx !== lastIdx) { - expression.push(element); - } - } - } else { - number += element; + const size = content.length; + const lastIdx = size - 1; + let number = ''; + const expression = []; + for (let idx = 0; idx < size; idx++) { + const element = content[idx]; + if (isGrouping(element)) { + if (number !== '') { + expression.push(number); + number = ''; + } + expression.push(element); + } else if (isOperator(element)) { + if (isSymbol(element) && (idx === 0 || content[idx - 1] === '(')) { + number += element; + } else { + if (number !== '') { + expression.push(number); + number = ''; } - if (idx === lastIdx && number !== '') { - expression.push(number); + if (idx !== lastIdx) { + expression.push(element); } + } + } else { + number += element; + } + + if (idx === lastIdx && number !== '') { + expression.push(number); } - return expression; + } + return expression; } function isPrioritized(one, other) { - return OperatorLevels[one] > OperatorLevels[other]; + return OperatorLevels[one] > OperatorLevels[other]; } export function isOperator(operator) { - return ( - operator === '+' || operator === '-' || operator === '*' || operator === '/' - ); + return ( + operator === '+' || operator === '-' || operator === '*' || operator === '/' + ); } function isSymbol(symbol) { - return symbol === '+' || symbol === '-'; + return symbol === '+' || symbol === '-'; } function isGrouping(operator) { - return operator === '(' || operator === ')'; + return operator === '(' || operator === ')'; } export function calc(content) { - const infixExpression = parseInfixExpression(content); - const suffixExpression = toSuffixExpression(infixExpression); - return calcSuffixExpression(suffixExpression); + const infixExpression = parseInfixExpression(content); + const suffixExpression = toSuffixExpression(infixExpression); + return calcSuffixExpression(suffixExpression); } diff --git a/common/DistributeCalc/entry/src/main/js/MainAbility/common/kvstoreModel.js b/common/DistributeCalc/entry/src/main/js/MainAbility/common/kvstoreModel.js index 5d148a4e9..ca7e2c9ee 100644 --- a/common/DistributeCalc/entry/src/main/js/MainAbility/common/kvstoreModel.js +++ b/common/DistributeCalc/entry/src/main/js/MainAbility/common/kvstoreModel.js @@ -17,84 +17,83 @@ import distributedData from '@ohos.data.distributedData'; const STORE_ID = 'distributedcalc'; export class KvStoreModel { - kvManager; - kvStore; + kvManager; + kvStore; - constructor() { - } + constructor() { + } - createKvStore(callback) { - if ((typeof (this.kvStore) !== 'undefined')) { - callback(); - return; - } - var config = { - bundleName: 'ohos.samples.distributedcalc', - userInfo: { - userId: '0', - userType: 0 - } - }; - console.info('[KvStoreModel] createKVManager begin'); - distributedData.createKVManager(config).then((manager) => { - console.info('[KvStoreModel] createKVManager success, kvManager=' + JSON.stringify(manager)); - this.kvManager = manager; - let options = { - createIfMissing: true, - encrypt: false, - backup: false, - autoSync: true, - kvStoreType: 1, - securityLevel: 1, - }; - console.info('[KvStoreModel] kvManager.getKVStore begin'); - this.kvManager.getKVStore(STORE_ID, options).then((store) => { - console.info('[KvStoreModel] getKVStore success, kvStore=' + store); - this.kvStore = store; - callback(); - }); - console.info('[KvStoreModel] kvManager.getKVStore end'); - }); - console.info('[KvStoreModel] createKVManager end'); + createKvStore(callback) { + if ((typeof (this.kvStore) !== 'undefined')) { + callback(); + return; } + var config = { + bundleName: 'ohos.samples.distributedcalc', + userInfo: { + userId: '0', + userType: 0 + } + }; + console.info('[KvStoreModel] createKVManager begin'); + distributedData.createKVManager(config).then((manager) => { + console.info('[KvStoreModel] createKVManager success, kvManager=' + JSON.stringify(manager)); + this.kvManager = manager; + let options = { + createIfMissing: true, + encrypt: false, + backup: false, + autoSync: true, + kvStoreType: 1, + securityLevel: 1, + }; + console.info('[KvStoreModel] kvManager.getKVStore begin'); + this.kvManager.getKVStore(STORE_ID, options).then((store) => { + console.info('[KvStoreModel] getKVStore success, kvStore=' + store); + this.kvStore = store; + callback(); + }); + console.info('[KvStoreModel] kvManager.getKVStore end'); + }); + console.info('[KvStoreModel] createKVManager end'); + } - put(key, value) { - console.info('[KvStoreModel] kvStore.put ' + key + '=' + value); - this.kvStore.put(key, value + 'end').then((data) => { - console.info('[KvStoreModel] kvStore.put ' + key + ' finished, data=' + JSON.stringify(data)); - }).catch((err) => { - console.error('[KvStoreModel] kvStore.put ' + key + ' failed, ' + JSON.stringify(err)); - }); - } + put(key, value) { + console.info('[KvStoreModel] kvStore.put ' + key + '=' + value); + this.kvStore.put(key, value + 'end').then((data) => { + console.info('[KvStoreModel] kvStore.put ' + key + ' finished, data=' + JSON.stringify(data)); + }).catch((err) => { + console.error('[KvStoreModel] kvStore.put ' + key + ' failed, ' + JSON.stringify(err)); + }); + } - off() { - if (this.kvStore !== null) { - this.kvStore.off('dataChange'); - }) - } + off() { + if (this.kvStore !== null) { + this.kvStore.off('dataChange') } + } - setOnMessageReceivedListener(msg, refreshdata) { - console.info('[KvStoreModel] setOnMessageReceivedListener ' + msg); - this.createKvStore(() => { - console.info('[KvStoreModel] kvStore.on(dataChange) begin'); - this.kvStore.on('dataChange', 1, (data) => { - console.info('[KvStoreModel] dataChange, ' + JSON.stringify(data)); - console.info('[KvStoreModel] dataChange, insert ' + data.insertEntries.length + ' udpate ' - + data.updateEntries.length); - let entries = data.insertEntries.length > 0 ? data.insertEntries : data.updateEntries; - for (let i = 0; i < entries.length; i++) { - if (entries[i].key === msg) { - let value = entries[i].value.value; - console.info('[KvStoreModel] Entries receive ' + msg + '=' + value); - let valueResult = value.substring(0, value.lastIndexOf('end')); - console.info('[KvStoreModel] Entries receive valueResult = ' + valueResult); - refreshdata(valueResult); - return; - } - } - }); - console.info('[KvStoreModel] kvStore.on(dataChange) end'); - }); - } + setOnMessageReceivedListener(msg, refreshdata) { + console.info('[KvStoreModel] setOnMessageReceivedListener ' + msg); + this.createKvStore(() => { + console.info('[KvStoreModel] kvStore.on(dataChange) begin'); + this.kvStore.on('dataChange', 1, (data) => { + console.info('[KvStoreModel] dataChange, ' + JSON.stringify(data)); + console.info('[KvStoreModel] dataChange, insert ' + data.insertEntries.length + ' udpate ' + + data.updateEntries.length); + let entries = data.insertEntries.length > 0 ? data.insertEntries : data.updateEntries; + for (let i = 0; i < entries.length; i++) { + if (entries[i].key === msg) { + let value = entries[i].value.value; + console.info('[KvStoreModel] Entries receive ' + msg + '=' + value); + let valueResult = value.substring(0, value.lastIndexOf('end')); + console.info('[KvStoreModel] Entries receive valueResult = ' + valueResult); + refreshdata(valueResult); + return; + } + } + }); + console.info('[KvStoreModel] kvStore.on(dataChange) end'); + }); + } } \ No newline at end of file diff --git a/common/DistributeCalc/entry/src/main/js/MainAbility/pages/index/index.hml b/common/DistributeCalc/entry/src/main/js/MainAbility/pages/index/index.hml index c52260a68..8c38ccb7c 100644 --- a/common/DistributeCalc/entry/src/main/js/MainAbility/pages/index/index.hml +++ b/common/DistributeCalc/entry/src/main/js/MainAbility/pages/index/index.hml @@ -14,100 +14,100 @@ limitations under the License. -->
-
- -
- - - {{ title }} - -
- - - - {{ expression }} +
+ +
+ + + {{ title }} - - {{ result }} - -
-
- -
- 7 -
-
- 8 -
-
- 9 -
-
- -
-
- -
-
- 4 -
-
- 5 -
-
- 6 -
-
- -
-
- -
-
- 1 -
-
- 2 -
-
- 3 -
-
- -
-
- -
-
- 0 -
-
- . -
-
- -
- -
- -
- 选择设备 - - -
- {{ $item.deviceName - }} - - -
- - - 取消 +
+ + + + {{ expression }} + + + {{ result }} + +
+
+ +
+ 7 +
+
+ 8 +
+
+ 9 +
+
+ +
+
+ +
+
+ 4 +
+
+ 5 +
+
+ 6 +
+
+ +
+
+ +
+
+ 1 +
+
+ 2 +
+
+ 3 +
+
+ +
+
+ +
+
+ 0 +
+
+ . +
+
+ +
+ +
+ +
+ 选择设备 + + +
+ {{ $item.deviceName + }} -
-
+ +
+ + + 取消 + +
+
\ No newline at end of file diff --git a/common/DistributeCalc/entry/src/main/js/MainAbility/pages/index/index.js b/common/DistributeCalc/entry/src/main/js/MainAbility/pages/index/index.js index fa812e293..0aefb21e0 100644 --- a/common/DistributeCalc/entry/src/main/js/MainAbility/pages/index/index.js +++ b/common/DistributeCalc/entry/src/main/js/MainAbility/pages/index/index.js @@ -25,263 +25,263 @@ let remoteDeviceModel = new RemoteDeviceModel() let timerId = 0 export default { - data: { - title: '计算器', - expression: '', - result: '', - selectedIndex: 0, - isFA: false, - isPush: false, - isDistributed: false, - deviceList: [] - }, - onInit() { - this.grantPermission() - this.$watch('expression', (value) => { - if (value !== '') { - console.info('Calc[IndexPage] value ' + value); - this.result = calc(value); - console.info('Calc[IndexPage] result = ' + this.result); - console.log('Calc[IndexPage] put key start'); - this.dataChange('expression', value); - } - }); - this.initKVManager(); - }, - onShow() { - featureAbility.getWant((error, want) => { - console.info('Calc[IndexPage] featureAbility.getWant =' + JSON.stringify(want.parameters)); - if (want.parameters.isFA === 'FA') { - this.isFA = true; - this.isDistributed = true; - } - }); - }, - grantPermission() { - console.info('Calc[IndexPage] grantPermission') - let context = featureAbility.getContext() - context.requestPermissionsFromUser(['ohos.permission.DISTRIBUTED_DATASYNC'], 666, function (result) { - console.info(`Calc[IndexPage] grantPermission,requestPermissionsFromUser,result.requestCode=${result}`) - }) - }, - dataChange(key, value) { - console.log('Calc[IndexPage] dataChange isDistributed = ' + this.isDistributed); - if (this.isDistributed && kvStoreModel != null) { - kvStoreModel.put(key, value); - } - }, - initKVManager() { - kvStoreModel.setOnMessageReceivedListener('expression', (value) => { - console.log('Calc[IndexPage] data changed:' + value); - if (value === 'exit') { - console.info('Calc[CalcPage] app exit!'); - app.terminate(); - return; - } - if (value === 'clear') { - console.log('Calc[IndexPage] data expression:clear'); - this.expression = ''; - this.result = ''; - return; - } - if (value === 'equal') { - if (this.result !== '') { - console.log('Calc[IndexPage] data expression:equal'); - this.expression = this.result; - this.result = ''; - pressedEqual = true; - } - return; - } - this.expression = value; - pressedEqual = false; - console.log('Calc[IndexPage] data expression:' + this.expression); - }); - timerId = setInterval(() => { - if (this.isDistributed) { - let temp = this.expression; - this.expression = temp; - } - }, 200); - }, - stopDataListener() { - console.log('Calc[IndexPage] stopDataListener'); - if(kvStoreModel === null || kvStoreModel === undefined) { - return - } - kvStoreModel.off() - }, - onHide() { - if (remoteDeviceModel === undefined) { - return - } - remoteDeviceModel.unregisterDeviceListCallback(); - if (this.isDistributed && kvStoreModel != null) { - this.stopDataListener(); - this.isDistributed = false; - } - clearInterval(timerId) - kvStoreModel = null - remoteDeviceModel = undefined - }, - showDialog() { - console.info('Calc[IndexPage] showDialog start'); - this.deviceList = []; - if (remoteDeviceModel === undefined) { - remoteDeviceModel = new RemoteDeviceModel() - } - remoteDeviceModel.registerDeviceListCallback(() => { - console.info('Calc[IndexPage] registerDeviceListCallback on remote device updated, count=' - + remoteDeviceModel.deviceList.length); - let list = []; - list.push({ - deviceId: '0', - deviceName: 'Local device', - deviceType: 0, - networkId: '', - checked: this.selectedIndex === 0 - }); - let tempList = remoteDeviceModel.discoverList.length > 0 ? remoteDeviceModel.discoverList : remoteDeviceModel.deviceList; - for (let i = 0; i < tempList.length; i++) { - console.info('Calc[IndexPage] device ' + i + '/' + tempList.length - + ' deviceId=' + tempList[i].deviceId + ' deviceName=' + tempList[i].deviceName - + ' deviceType=' + tempList[i].deviceType); - list.push({ - deviceId: tempList[i].deviceId, - deviceName: tempList[i].deviceName, - deviceType: tempList[i].deviceType, - networkId: tempList[i].networkId, - checked: this.selectedIndex === (i + 1) - }); - } - this.deviceList = list; - this.$element('showDialog').close(); - this.$element('showDialog').show(); - }); - }, - cancelDialog() { - this.$element('showDialog').close(); - if(remoteDeviceModel === undefined) { - return; - } - remoteDeviceModel.unregisterDeviceListCallback(); - }, - - selectDevice(item) { - let index = this.deviceList.indexOf(item); - console.log('Calc[IndexPage] select index:' + index); - console.log('Calc[IndexPage] select selectedIndex:' + this.selectedIndex); - if (index === this.selectedIndex) { - console.log('Calc[IndexPage] index === this.selectedIndex'); - return; - } - this.selectedIndex = index; - if (index === 0) { - console.log('Calc[IndexPage] stop ability'); - this.dataChange('expression', 'exit'); - this.isDistributed = false; - this.stopDataListener(); - this.clearSelectState(); - return; - } - console.log('Calc[IndexPage] start ability ......'); + data: { + title: '计算器', + expression: '', + result: '', + selectedIndex: 0, + isFA: false, + isPush: false, + isDistributed: false, + deviceList: [] + }, + onInit() { + this.grantPermission() + this.$watch('expression', (value) => { + if (value !== '') { + console.info('Calc[IndexPage] value ' + value); + this.result = calc(value); + console.info('Calc[IndexPage] result = ' + this.result); + console.log('Calc[IndexPage] put key start'); + this.dataChange('expression', value); + } + }); + this.initKVManager(); + }, + onShow() { + featureAbility.getWant((error, want) => { + console.info('Calc[IndexPage] featureAbility.getWant =' + JSON.stringify(want.parameters)); + if (want.parameters.isFA === 'FA') { + this.isFA = true; this.isDistributed = true; - if (remoteDeviceModel === undefined || remoteDeviceModel.discoverList.length <= 0) { - console.log('Calc[IndexPage] continue device:' + JSON.stringify(this.deviceList)); - this.startAbility(this.deviceList[index].deviceId); - this.clearSelectState(); - return; - } - console.log('Calc[IndexPage] start ability1, needAuth'); - remoteDeviceModel.authenticateDevice(this.deviceList[index], () => { - console.log('Calc[IndexPage] auth and online finished'); - this.startAbility(this.deviceList[index].deviceId); - }); - this.clearSelectState(); - console.log('Calc[IndexPage] start ability end....'); - }, - clearSelectState() { - this.deviceList = []; - this.$element('showDialog').close(); - }, - async startAbility(deviceId) { - console.log('Calc[IndexPage] startAbility deviceId:' + deviceId); - await featureAbility.startAbility({ - want: { - bundleName: 'ohos.samples.distributedcalc', - abilityName: 'ohos.samples.distributedcalc.MainAbility', - deviceId: deviceId, - parameters: { - isFA: 'FA' - } - } - }) - console.log('Calc[IndexPage] start ability finished'); - this.dataChange('expression', this.expression); - console.log('Calc[IndexPage] startAbility end'); - }, - handleClear() { + } + }); + }, + grantPermission() { + console.info('Calc[IndexPage] grantPermission') + let context = featureAbility.getContext() + context.requestPermissionsFromUser(['ohos.permission.DISTRIBUTED_DATASYNC'], 666, function (result) { + console.info(`Calc[IndexPage] grantPermission,requestPermissionsFromUser,result.requestCode=${result}`) + }) + }, + dataChange(key, value) { + console.log('Calc[IndexPage] dataChange isDistributed = ' + this.isDistributed); + if (this.isDistributed && kvStoreModel != null) { + kvStoreModel.put(key, value); + } + }, + initKVManager() { + kvStoreModel.setOnMessageReceivedListener('expression', (value) => { + console.log('Calc[IndexPage] data changed:' + value); + if (value === 'exit') { + console.info('Calc[CalcPage] app exit!'); + app.terminate(); + return; + } + if (value === 'clear') { + console.log('Calc[IndexPage] data expression:clear'); this.expression = ''; this.result = ''; - console.log('Calc[IndexPage] handleClear'); - this.dataChange('expression', 'clear'); - }, - handleInput(value) { - console.log('Calc[IndexPage] handle input value:' + value); - this.isPush = false; - if (isOperator(value)) { - if (pressedEqual) { - pressedEqual = false; - } else { - const size = this.expression.length; - if (size) { - const last = this.expression.charAt(size - 1); - if (isOperator(last)) { - this.expression = this.expression.substring(0, this.expression.length - 1); - } - } - } - if (!this.expression && (value === '*' || value === '/')) { - return; - } - this.expression += value; - } else { - if (pressedEqual) { - pressedEqual = false; - } - this.expression += value; + return; + } + if (value === 'equal') { + if (this.result !== '') { + console.log('Calc[IndexPage] data expression:equal'); + this.expression = this.result; + this.result = ''; + pressedEqual = true; } + return; + } + this.expression = value; + pressedEqual = false; + console.log('Calc[IndexPage] data expression:' + this.expression); + }); + timerId = setInterval(() => { + if (this.isDistributed) { + let temp = this.expression; + this.expression = temp; + } + }, 200); + }, + stopDataListener() { + console.log('Calc[IndexPage] stopDataListener'); + if (kvStoreModel === null || kvStoreModel === undefined) { + return + } + kvStoreModel.off() + }, + onHide() { + if (remoteDeviceModel === undefined) { + return + } + remoteDeviceModel.unregisterDeviceListCallback(); + if (this.isDistributed && kvStoreModel != null) { + this.stopDataListener(); + this.isDistributed = false; + } + clearInterval(timerId) + kvStoreModel = null + remoteDeviceModel = undefined + }, + showDialog() { + console.info('Calc[IndexPage] showDialog start'); + this.deviceList = []; + if (remoteDeviceModel === undefined) { + remoteDeviceModel = new RemoteDeviceModel() + } + remoteDeviceModel.registerDeviceListCallback(() => { + console.info('Calc[IndexPage] registerDeviceListCallback on remote device updated, count=' + + remoteDeviceModel.deviceList.length); + let list = []; + list.push({ + deviceId: '0', + deviceName: 'Local device', + deviceType: 0, + networkId: '', + checked: this.selectedIndex === 0 + }); + let tempList = remoteDeviceModel.discoverList.length > 0 ? remoteDeviceModel.discoverList : remoteDeviceModel.deviceList; + for (let i = 0; i < tempList.length; i++) { + console.info('Calc[IndexPage] device ' + i + '/' + tempList.length + + ' deviceId=' + tempList[i].deviceId + ' deviceName=' + tempList[i].deviceName + + ' deviceType=' + tempList[i].deviceType); + list.push({ + deviceId: tempList[i].deviceId, + deviceName: tempList[i].deviceName, + deviceType: tempList[i].deviceType, + networkId: tempList[i].networkId, + checked: this.selectedIndex === (i + 1) + }); + } + this.deviceList = list; + this.$element('showDialog').close(); + this.$element('showDialog').show(); + }); + }, + cancelDialog() { + this.$element('showDialog').close(); + if (remoteDeviceModel === undefined) { + return; + } + remoteDeviceModel.unregisterDeviceListCallback(); + }, - }, - handleBackspace() { - if (pressedEqual) { - this.expression = ''; - this.result = ''; - pressedEqual = false; - console.log('Calc[IndexPage] handleBackspace1'); - this.dataChange('expression', 'clear'); - } else { - this.isPush = false; - this.expression = this.expression.substring(0, this.expression.length - 1); - if (!this.expression.length) { - this.result = ''; - console.log('Calc[IndexPage] handleBackspace2'); - this.dataChange('expression', 'clear'); - } + selectDevice(item) { + let index = this.deviceList.indexOf(item); + console.log('Calc[IndexPage] select index:' + index); + console.log('Calc[IndexPage] select selectedIndex:' + this.selectedIndex); + if (index === this.selectedIndex) { + console.log('Calc[IndexPage] index === this.selectedIndex'); + return; + } + this.selectedIndex = index; + if (index === 0) { + console.log('Calc[IndexPage] stop ability'); + this.dataChange('expression', 'exit'); + this.isDistributed = false; + this.stopDataListener(); + this.clearSelectState(); + return; + } + console.log('Calc[IndexPage] start ability ......'); + this.isDistributed = true; + if (remoteDeviceModel === undefined || remoteDeviceModel.discoverList.length <= 0) { + console.log('Calc[IndexPage] continue device:' + JSON.stringify(this.deviceList)); + this.startAbility(this.deviceList[index].deviceId); + this.clearSelectState(); + return; + } + console.log('Calc[IndexPage] start ability1, needAuth'); + remoteDeviceModel.authenticateDevice(this.deviceList[index], () => { + console.log('Calc[IndexPage] auth and online finished'); + this.startAbility(this.deviceList[index].deviceId); + }); + this.clearSelectState(); + console.log('Calc[IndexPage] start ability end....'); + }, + clearSelectState() { + this.deviceList = []; + this.$element('showDialog').close(); + }, + async startAbility(deviceId) { + console.log('Calc[IndexPage] startAbility deviceId:' + deviceId); + await featureAbility.startAbility({ + want: { + bundleName: 'ohos.samples.distributedcalc', + abilityName: 'ohos.samples.distributedcalc.MainAbility', + deviceId: deviceId, + parameters: { + isFA: 'FA' } - }, - handleEqual() { - if (this.result !== '') { - this.isPush = true; - this.expression = this.result; - this.result = ''; - pressedEqual = true; - console.log('Calc[IndexPage] handleEqual'); - this.dataChange('expression', 'equal'); + } + }) + console.log('Calc[IndexPage] start ability finished'); + this.dataChange('expression', this.expression); + console.log('Calc[IndexPage] startAbility end'); + }, + handleClear() { + this.expression = ''; + this.result = ''; + console.log('Calc[IndexPage] handleClear'); + this.dataChange('expression', 'clear'); + }, + handleInput(value) { + console.log('Calc[IndexPage] handle input value:' + value); + this.isPush = false; + if (isOperator(value)) { + if (pressedEqual) { + pressedEqual = false; + } else { + const size = this.expression.length; + if (size) { + const last = this.expression.charAt(size - 1); + if (isOperator(last)) { + this.expression = this.expression.substring(0, this.expression.length - 1); + } } - }, - handleExist() { - console.log('Calc[IndexPage] handleExist'); - app.terminate(); + } + if (!this.expression && (value === '*' || value === '/')) { + return; + } + this.expression += value; + } else { + if (pressedEqual) { + pressedEqual = false; + } + this.expression += value; + } + + }, + handleBackspace() { + if (pressedEqual) { + this.expression = ''; + this.result = ''; + pressedEqual = false; + console.log('Calc[IndexPage] handleBackspace1'); + this.dataChange('expression', 'clear'); + } else { + this.isPush = false; + this.expression = this.expression.substring(0, this.expression.length - 1); + if (!this.expression.length) { + this.result = ''; + console.log('Calc[IndexPage] handleBackspace2'); + this.dataChange('expression', 'clear'); + } + } + }, + handleEqual() { + if (this.result !== '') { + this.isPush = true; + this.expression = this.result; + this.result = ''; + pressedEqual = true; + console.log('Calc[IndexPage] handleEqual'); + this.dataChange('expression', 'equal'); } + }, + handleExist() { + console.log('Calc[IndexPage] handleExist'); + app.terminate(); + } }; \ No newline at end of file diff --git a/common/ECG/.gitignore b/common/ECG/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/common/ECG/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/common/ECG/README_zh.md b/common/ECG/README_zh.md index 9c156c5ff..9a5d060f4 100644 --- a/common/ECG/README_zh.md +++ b/common/ECG/README_zh.md @@ -22,7 +22,7 @@ Stack：堆叠容器，子组件按照顺序依次入栈，后一个子组件覆 1.本示例仅支持在标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 3.如果安装本示例报错为error：install sign info inconsistent，则有可能本应用被设置为系统预置应用，已安装在系统中，此时需使用命令进行替换安装，并在替换安装后对设备进行重启操作，具体命令如下： diff --git a/common/ECG/entry/src/main/js/default/app.js b/common/ECG/entry/src/main/js/default/app.js index 58d12b7b5..6d4065abc 100644 --- a/common/ECG/entry/src/main/js/default/app.js +++ b/common/ECG/entry/src/main/js/default/app.js @@ -14,10 +14,10 @@ */ export default { - onCreate() { - console.info("Application onCreate"); - }, - onDestroy() { - console.info("Application onDestroy"); - } + onCreate() { + console.info("Application onCreate"); + }, + onDestroy() { + console.info("Application onDestroy"); + } }; diff --git a/common/ECG/entry/src/main/js/default/pages/index/index.css b/common/ECG/entry/src/main/js/default/pages/index/index.css index e5e9577f9..e31ac9c10 100644 --- a/common/ECG/entry/src/main/js/default/pages/index/index.css +++ b/common/ECG/entry/src/main/js/default/pages/index/index.css @@ -43,38 +43,46 @@ display: flex; flex-shrink: 1; } + .hundredImg { left: 100px; object-fit: contain; display: flex; flex-shrink: 1; } + .chart_t_r { width: 80px; height: 40px; color: #a6a6a6; } + .stack_main { width: 100%; height: 60%; flex-direction: column; justify-content: center; } + .chart_bg { width: 100%; height: 100%; } + .chart { width: 100%; height: 171px; } + .chart_time { text-align: center; color: white; } + font_size { font-size: 38px; } + .div_bottom { width: 100%; height: 20%; diff --git a/common/ECG/entry/src/main/js/default/pages/index/index.hml b/common/ECG/entry/src/main/js/default/pages/index/index.hml index 458d99130..fa547a2f5 100644 --- a/common/ECG/entry/src/main/js/default/pages/index/index.hml +++ b/common/ECG/entry/src/main/js/default/pages/index/index.hml @@ -13,22 +13,24 @@ limitations under the License. -->
-
- - - - - - {{ $t('strings.times_minute') }} - -
- - - - -
- - {{ chartTime }}{{ $t('strings.count_down') }} - -
+
+ + + + + + {{ $t('strings.times_minute') }} + +
+ + + + +
+ + {{ chartTime }}{{ $t('strings.count_down') }} + +
\ No newline at end of file diff --git a/common/ECG/entry/src/main/js/default/pages/index/index.js b/common/ECG/entry/src/main/js/default/pages/index/index.js index 325a11538..19a909fdf 100644 --- a/common/ECG/entry/src/main/js/default/pages/index/index.js +++ b/common/ECG/entry/src/main/js/default/pages/index/index.js @@ -13,199 +13,207 @@ * limitations under the License. */ export default { - data: { - hundredImg: "/common/A054_110.png", - tensImg: "/common/A054_110.png", - onesImg: "/common/A054_110.png", - tensLeft: "100px", - onesLeft: "120px", - chartUnit: "170px", - hundredDisplay: "none", - realHrValue: 0, - moving: false, - leftNum: 0, - passTime: 0, - chartTime: 30, - chartHeartImg: '/common/A054_078.png', - isFill: false, - chartHeartInterval: '', - electrocardInterval: '', - heartDataInterval: '', - maskLeft: 454, - tipTop: "320px", - hideFlag: false, - isBreak: true, - digMaskLeft: 454, - times_minute: "", - ecgData: [ - 45,45,45,46,46,46,46,47,47,47, - 47,46,46,46,46,46,46,45,45,45, - 44,44,45,49,73,94,97,80,51,43, - 42,43,43,43,43,43,43,43,43,43, - 44,44,44,44,44,45,45,45,45,46, - 46,47,47,47,48,48,49,50,51,52, - 54,54,55,56,56,55,54,53,52,48, - 47,45,45,44,44,43,43,43,43,43, - 44,44,44,44,45,45,45,46,46,46, - 46,46,46,46,47,47,47,47,47,47 - ], - heartData: [70,78,80,89,90,85,95,99,101,106,118], - datasets: [ - { - strokeColor: '#fc3159', - data: [50] - } - ], - options: { - xAxis: { display: false, min: 0, max: 454}, - yAxis: { display: false, min: 0, max: 100}, - series: { - lineStyle: { - width: "5", - smooth: true - }, - headPoint: { - shape: 'circle', - size: '8px', - strokeColor: '#ffffff', - fillColor: '#ffffff', - }, - loop: { - margin: 30, - gradient: true - } - } + data: { + hundredImg: "/common/A054_110.png", + tensImg: "/common/A054_110.png", + onesImg: "/common/A054_110.png", + tensLeft: "100px", + onesLeft: "120px", + chartUnit: "170px", + hundredDisplay: "none", + realHrValue: 0, + moving: false, + leftNum: 0, + passTime: 0, + chartTime: 30, + chartHeartImg: '/common/A054_078.png', + isFill: false, + chartHeartInterval: '', + electrocardInterval: '', + heartDataInterval: '', + maskLeft: 454, + tipTop: "320px", + hideFlag: false, + isBreak: true, + digMaskLeft: 454, + times_minute: "", + ecgData: [ + 45, 45, 45, 46, 46, 46, 46, 47, 47, 47, + 47, 46, 46, 46, 46, 46, 46, 45, 45, 45, + 44, 44, 45, 49, 73, 94, 97, 80, 51, 43, + 42, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 44, 44, 44, 44, 44, 45, 45, 45, 45, 46, + 46, 47, 47, 47, 48, 48, 49, 50, 51, 52, + 54, 54, 55, 56, 56, 55, 54, 53, 52, 48, + 47, 45, 45, 44, 44, 43, 43, 43, 43, 43, + 44, 44, 44, 44, 45, 45, 45, 46, 46, 46, + 46, 46, 46, 46, 47, 47, 47, 47, 47, 47 + ], + heartData: [70, 78, 80, 89, 90, 85, 95, 99, 101, 106, 118], + datasets: [ + { + strokeColor: '#fc3159', + data: [50] + } + ], + options: { + xAxis: { + display: false, min: 0, max: 454 + }, + yAxis: { + display: false, min: 0, max: 100 + }, + series: { + lineStyle: { + width: "5", + smooth: true + }, + headPoint: { + shape: 'circle', + size: '8px', + strokeColor: '#ffffff', + fillColor: '#ffffff', + }, + loop: { + margin: 30, + gradient: true } - }, - onInit() { - this.times_minute = this.$t('strings.times_minute'); - }, - onShow() { - this.startChartHeart(); - this.handleMeasureData(); - }, - onHide() { - console.log('onHide'); - this.clearChart() - this.clearTimes() - }, - handleMeasureData() { - this.updateElectrocarddiogram(); - this.updateHeart(); - }, - updateElectrocarddiogram() { - let minEcgIndex = 0; - let maxEcgIndex = 99; - let curEcgIndex = minEcgIndex; - this.electrocardInterval = setInterval(() => { - let arrayObj = []; - for (let i = 0; i < 13; i++) { - if (curEcgIndex == maxEcgIndex) { - curEcgIndex = minEcgIndex; - } else { - arrayObj.push(this.ecgData[curEcgIndex]); - curEcgIndex++; - } - } - this.addChartDate(arrayObj); - this.handleCountDown(); - }, 100); - }, - updateHeart() { - this.heartDataInterval = setInterval(() => { - this.realHrValue = this.heartData[Math.floor(Math.random() * this.heartData.length)]; - }, 1000); - }, - addChartDate(list) { - let appendDate = { serial: 0, data: list }; - this.$refs.chart.append(appendDate); - }, - handleCountDown() { - let countdownValue = 30; - this.passTime++; - if (this.passTime % 10 == 0) { - countdownValue -= (this.passTime / 10); - this.setRealHrValue(); - if (countdownValue > 0) { - if (countdownValue < 10) { - this.chartTime = '0' + countdownValue; - } else { - this.chartTime = countdownValue; - } - } else { - this.chartTime = 0; - } + } + } + }, + onInit() { + this.times_minute = this.$t('strings.times_minute'); + }, + onShow() { + this.startChartHeart(); + this.handleMeasureData(); + }, + onHide() { + console.log('onHide'); + this.clearChart() + this.clearTimes() + }, + handleMeasureData() { + this.updateElectrocarddiogram(); + this.updateHeart(); + }, + updateElectrocarddiogram() { + let minEcgIndex = 0; + let maxEcgIndex = 99; + let curEcgIndex = minEcgIndex; + this.electrocardInterval = setInterval(() => { + let arrayObj = []; + for (let i = 0; i < 13; i++) { + if (curEcgIndex == maxEcgIndex) { + curEcgIndex = minEcgIndex; + } else { + arrayObj.push(this.ecgData[curEcgIndex]); + curEcgIndex++; } - }, - setRealHrValue() { - let hundreds, tens, ones; - let realHrMin = 0; - let realHrMax = 255; - let doubleAvgHr = 2; - let threeAvgHr = 3; - let subIndexZero = 0; - let subIndexOne = 1; - let subIndexTwo = 2; - let subIndexEnd = 3; - if (this.realHrValue == realHrMin || this.realHrValue == realHrMax) { - this.initRealHrValue(); + } + this.addChartDate(arrayObj); + this.handleCountDown(); + }, 100); + }, + updateHeart() { + this.heartDataInterval = setInterval(() => { + this.realHrValue = this.heartData[Math.floor(Math.random() * this.heartData.length)]; + }, 1000); + }, + addChartDate(list) { + let appendDate = { + serial: 0, data: list + }; + this.$refs.chart.append(appendDate); + }, + handleCountDown() { + let countdownValue = 30; + this.passTime++; + if (this.passTime % 10 == 0) { + countdownValue -= (this.passTime / 10); + this.setRealHrValue(); + if (countdownValue > 0) { + if (countdownValue < 10) { + this.chartTime = '0' + countdownValue; } else { - this.times_minute = this.$t('strings.ecg_times_minute_many_id'); - let number = this.realHrValue.toString(); - if (number.length == doubleAvgHr) { - this.hundredDisplay = 'none'; - this.tensLeft = '100px'; - this.onesLeft = '120px'; - this.chartUnit = '170px'; - tens = number.substring(subIndexZero, subIndexOne); - ones = number.substring(subIndexOne, subIndexTwo); - this.tensImg = '/common/A054_10' + tens + '.png'; - this.onesImg = '/common/A054_10' + ones + '.png'; - } else if (number.length == threeAvgHr) { - this.hundredDisplay = 'block'; - this.tensLeft = '130px'; - this.onesLeft = '150px'; - this.chartUnit = '170px'; - hundreds = number.substring(subIndexZero, subIndexOne); - tens = number.substring(subIndexOne, subIndexTwo); - ones = number.substring(subIndexTwo, subIndexEnd); - this.hundredImg = '/common/A054_10' + hundreds + '.png'; - this.tensImg = '/common/A054_10' + tens + '.png'; - this.onesImg = '/common/A054_10' + ones + '.png'; - } else { - } + this.chartTime = countdownValue; } - }, - initRealHrValue() { + } else { + this.chartTime = 0; + } + } + }, + setRealHrValue() { + let hundreds, tens, ones; + let realHrMin = 0; + let realHrMax = 255; + let doubleAvgHr = 2; + let threeAvgHr = 3; + let subIndexZero = 0; + let subIndexOne = 1; + let subIndexTwo = 2; + let subIndexEnd = 3; + if (this.realHrValue == realHrMin || this.realHrValue == realHrMax) { + this.initRealHrValue(); + } else { + this.times_minute = this.$t('strings.ecg_times_minute_many_id'); + let number = this.realHrValue.toString(); + if (number.length == doubleAvgHr) { this.hundredDisplay = 'none'; this.tensLeft = '100px'; this.onesLeft = '120px'; this.chartUnit = '170px'; - this.tensImg = '/common/A054_110.png'; - this.onesImg = '/common/A054_110.png'; - }, - startChartHeart() { - let chartHeartIndex = 78; - let chartEndHeartIndex = 97; - let heartImgIndex = chartHeartIndex; - this.chartHeartInterval = setInterval(() => { - if (heartImgIndex == chartEndHeartIndex) { - heartImgIndex = chartHeartIndex; - } else { - this.chartHeartImg = '/common/A054_0' + heartImgIndex + '.png'; - heartImgIndex++; - } - }, 50); - }, - clearTimes() { - clearInterval(this.chartHeartInterval); - clearInterval(this.electrocardInterval); - clearInterval(this.heartDataInterval); - }, - clearChart() { - this.chartTime = 30; - this.datasets = [{ strokeColor: '#fc3159', data: [50]}]; + tens = number.substring(subIndexZero, subIndexOne); + ones = number.substring(subIndexOne, subIndexTwo); + this.tensImg = '/common/A054_10' + tens + '.png'; + this.onesImg = '/common/A054_10' + ones + '.png'; + } else if (number.length == threeAvgHr) { + this.hundredDisplay = 'block'; + this.tensLeft = '130px'; + this.onesLeft = '150px'; + this.chartUnit = '170px'; + hundreds = number.substring(subIndexZero, subIndexOne); + tens = number.substring(subIndexOne, subIndexTwo); + ones = number.substring(subIndexTwo, subIndexEnd); + this.hundredImg = '/common/A054_10' + hundreds + '.png'; + this.tensImg = '/common/A054_10' + tens + '.png'; + this.onesImg = '/common/A054_10' + ones + '.png'; + } else { + } } + }, + initRealHrValue() { + this.hundredDisplay = 'none'; + this.tensLeft = '100px'; + this.onesLeft = '120px'; + this.chartUnit = '170px'; + this.tensImg = '/common/A054_110.png'; + this.onesImg = '/common/A054_110.png'; + }, + startChartHeart() { + let chartHeartIndex = 78; + let chartEndHeartIndex = 97; + let heartImgIndex = chartHeartIndex; + this.chartHeartInterval = setInterval(() => { + if (heartImgIndex == chartEndHeartIndex) { + heartImgIndex = chartHeartIndex; + } else { + this.chartHeartImg = '/common/A054_0' + heartImgIndex + '.png'; + heartImgIndex++; + } + }, 50); + }, + clearTimes() { + clearInterval(this.chartHeartInterval); + clearInterval(this.electrocardInterval); + clearInterval(this.heartDataInterval); + }, + clearChart() { + this.chartTime = 30; + this.datasets = [{ + strokeColor: '#fc3159', data: [50] + }]; + } } diff --git a/common/ECG/package.json b/common/ECG/package.json index 22166ab82..75cf93354 100644 --- a/common/ECG/package.json +++ b/common/ECG/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } \ No newline at end of file diff --git a/common/Flashlight/.gitignore b/common/Flashlight/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/common/Flashlight/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/common/Flashlight/README_zh.md b/common/Flashlight/README_zh.md index 6a2c773da..0a5cf34ee 100644 --- a/common/Flashlight/README_zh.md +++ b/common/Flashlight/README_zh.md @@ -22,7 +22,7 @@ 1.本示例仅支持在标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 3.如果安装本示例报错为error：install sign info inconsistent，则有可能本应用被设置为系统预置应用，已安装在系统中，此时需使用命令进行替换安装，并在替换安装后对设备进行重启操作，具体命令如下： diff --git a/common/Flashlight/entry/src/main/js/default/app.js b/common/Flashlight/entry/src/main/js/default/app.js index 58d12b7b5..6d4065abc 100644 --- a/common/Flashlight/entry/src/main/js/default/app.js +++ b/common/Flashlight/entry/src/main/js/default/app.js @@ -14,10 +14,10 @@ */ export default { - onCreate() { - console.info("Application onCreate"); - }, - onDestroy() { - console.info("Application onDestroy"); - } + onCreate() { + console.info("Application onCreate"); + }, + onDestroy() { + console.info("Application onDestroy"); + } }; diff --git a/common/Flashlight/entry/src/main/js/default/pages/index/index.hml b/common/Flashlight/entry/src/main/js/default/pages/index/index.hml index d93af6f89..dc1e44eec 100644 --- a/common/Flashlight/entry/src/main/js/default/pages/index/index.hml +++ b/common/Flashlight/entry/src/main/js/default/pages/index/index.hml @@ -13,9 +13,9 @@ limitations under the License. --> -
- - {{ time }} -
+
+ + {{ time }} +
\ No newline at end of file diff --git a/common/Flashlight/entry/src/main/js/default/pages/index/index.js b/common/Flashlight/entry/src/main/js/default/pages/index/index.js index 4be071386..2b9b391e4 100644 --- a/common/Flashlight/entry/src/main/js/default/pages/index/index.js +++ b/common/Flashlight/entry/src/main/js/default/pages/index/index.js @@ -15,43 +15,44 @@ import app from '@system.app'; export default { - data: { - lightShow: true, - time: '' - }, - onInit() { - setTimeout(() => { - app.terminate(); - }, 300000); - }, - onShow() { - this.refreshTime(); - }, - onDestroy() {}, - refreshTime() { - setTimeout(() => { - let nowTime = new Date(); - let minutes = nowTime.getMinutes(); - let hours = nowTime.getHours(); - let minStr = ''; - let hourStr = ''; - if (minutes < 10) { - minStr = '0' + minutes.toString(); - } else { - minStr = minutes.toString(); - } - if (hours < 10) { - hourStr = '0' + hours.toString(); - } else { - hourStr = hours.toString(); - } - this.time = hourStr + ':' + minStr; - this.refreshTime(); - }, 1000); - }, - changeMode() { - this.lightShow = !this.lightShow; - } + data: { + lightShow: true, + time: '' + }, + onInit() { + setTimeout(() => { + app.terminate(); + }, 300000); + }, + onShow() { + this.refreshTime(); + }, + onDestroy() { + }, + refreshTime() { + setTimeout(() => { + let nowTime = new Date(); + let minutes = nowTime.getMinutes(); + let hours = nowTime.getHours(); + let minStr = ''; + let hourStr = ''; + if (minutes < 10) { + minStr = '0' + minutes.toString(); + } else { + minStr = minutes.toString(); + } + if (hours < 10) { + hourStr = '0' + hours.toString(); + } else { + hourStr = hours.toString(); + } + this.time = hourStr + ':' + minStr; + this.refreshTime(); + }, 1000); + }, + changeMode() { + this.lightShow = !this.lightShow; + } } diff --git a/common/Flashlight/package.json b/common/Flashlight/package.json index 853387125..9bc4425a1 100644 --- a/common/Flashlight/package.json +++ b/common/Flashlight/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } -} \ No newline at end of file +} diff --git a/common/Runninglock/entry/src/main/ets/MainAbility/common/lockSwitch.ets b/common/Runninglock/entry/src/main/ets/MainAbility/common/lockSwitch.ets index 31836e206..5f64a9c28 100644 --- a/common/Runninglock/entry/src/main/ets/MainAbility/common/lockSwitch.ets +++ b/common/Runninglock/entry/src/main/ets/MainAbility/common/lockSwitch.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import lock from '@ohos.runninglock' +import lock from '@ohos.runningLock' import Logger from '../util/Logger' const TAG: string = 'RunningLock' diff --git a/common/Runninglock/entry/src/main/ets/MainAbility/pages/index.ets b/common/Runninglock/entry/src/main/ets/MainAbility/pages/index.ets index 052dbd4f8..89dd03c2f 100644 --- a/common/Runninglock/entry/src/main/ets/MainAbility/pages/index.ets +++ b/common/Runninglock/entry/src/main/ets/MainAbility/pages/index.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import lock from '@ohos.runninglock' +import lock from '@ohos.runningLock' import { LockSwitch } from '../common/lockSwitch' import Logger from '../util/Logger' diff --git a/data/DDMQuery/.gitignore b/data/DDMQuery/.gitignore new file mode 100644 index 000000000..4222b9919 --- /dev/null +++ b/data/DDMQuery/.gitignore @@ -0,0 +1,8 @@ +/node_modules +/local.properties +/.idea +**/build +/.hvigor +/build-profile.json5 +/package-lock.json +/entry/package-lock.json \ No newline at end of file diff --git a/data/DDMQuery/README_zh.md b/data/DDMQuery/README_zh.md index b95f7ef4f..63141b716 100644 --- a/data/DDMQuery/README_zh.md +++ b/data/DDMQuery/README_zh.md @@ -32,4 +32,4 @@ KvStoreResultSet：提供获取KVStore数据库结果集的方法，提供查询 1.本示例仅支持在标准系统上运行。 -2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。 \ No newline at end of file +2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 \ No newline at end of file diff --git a/data/DDMQuery/entry/src/main/ets/MainAbility/pages/Index.ets b/data/DDMQuery/entry/src/main/ets/MainAbility/pages/Index.ets index d65513a68..54744183f 100644 --- a/data/DDMQuery/entry/src/main/ets/MainAbility/pages/Index.ets +++ b/data/DDMQuery/entry/src/main/ets/MainAbility/pages/Index.ets @@ -19,9 +19,8 @@ import { TitleBar } from "../common/TitleBar" @Entry @Component struct Index { - build() { - Column(){ + Column() { TitleBar() Query() } diff --git a/data/DDMQuery/package.json b/data/DDMQuery/package.json index e6ddf8f92..ef64eda02 100644 --- a/data/DDMQuery/package.json +++ b/data/DDMQuery/package.json @@ -8,8 +8,8 @@ }, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } diff --git a/device/Bluetooth/README_zh.md b/device/Bluetooth/README_zh.md index 59aa0e92e..f5af0a7fd 100644 --- a/device/Bluetooth/README_zh.md +++ b/device/Bluetooth/README_zh.md @@ -34,6 +34,6 @@ 2.本示例仅支持API9版本SDK，本示例涉及使用系统接口：cancelPairedDevice()，需要手动替换Full SDK才能编译通过，具体操作可参考[替换指南](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/full-sdk-switch-guide.md)。 -3.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version： 3.0.0.992， built on July 14， 2022)才可编译运行。。 +3.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。 4.本示例所配置的权限ohos.permission.MANAGE_BLUETOOTH为system_basic级别(相关权限级别可通过[权限定义列表](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/security/permission-list.md)查看)，需要手动配置对应级别的权限签名(具体操作可查看[自动化签名方案](https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ohos-auto-configuring-signature-information-0000001271659465))。 \ No newline at end of file diff --git a/device/Browser/AppScope/app.json5 b/device/Browser/AppScope/app.json5 index b8f840ab2..88cbd2163 100644 --- a/device/Browser/AppScope/app.json5 +++ b/device/Browser/AppScope/app.json5 @@ -1,6 +1,6 @@ { "app": { - "bundleName": "ohos.samples.browser1", + "bundleName": "ohos.samples.browser", "vendor": "samples", "versionCode": 1000000, "versionName": "1.0.0", diff --git a/device/Browser/entry/src/main/resources/rawfile/favicon.ico b/device/Browser/entry/src/main/resources/rawfile/favicon.ico deleted file mode 100644 index fdc021cfebd1341e379d891a8218f4d299def273..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4286 zcmdUzZ%h++7{|}>!WVlXVb1x#pq&DWR47zh6;y73GeD>~rXy%Z$CDCJMr@18>sJM6hKZI)g0>F@4$ zzvuZp_uO65lws!4Cp?_tznKf646}$~m`H-Am=uDapWf(P*mDnfFu^bY{ug-LGQ&Kr z>LO2bj()N!2k!c8xPHlm^ZQ+}Rj1c*=Tp;ybuHfZoJ6lK*WhW*#ZnC(M6Z62)2rKqC;7Q){|?wcNp?C;DT|&-4INow=y=she)#i`KI}hN zodNDV3$A?H4||CUjuVPT`_VY*Q`OPAyVU$?>PTPy24jyp$~{n!IP9q0IVSY~G5;6a zVLP)Gwo@wDiWJ}q;+)*u>+}9?4d#+@dQ|o$Y6SFJqAuDXy#gjyP7>{*h{gyrG9bOXQhq)yvxA*tySr; zoJ)m;{ML^)!&0n(`B*%Rhhs2&FcJg%q;6f$ft0z_U@DO14DVYDF@#)>@6t;x-=sM$ zU+#eUvt*b{l`y@R0AryHLx-XsSI}_~x)wrb`~?n(RBLoqA?G5p02mnqYRO5}RO z@mSnH9EE%PBhaZ{iuQLSOdVah)PvUpz6Z7=u`B^G{P~5s{=(>@o_D0qj@On!_r?-y z_pR-?+m!`ScfEa>n_GoQh7HVu+c))Od`49IltwNt(j-JjGblu&F&MtMp z{?Vd1mVg+uy<-j0p(BkimDz4cV7|2&!>tQpxD$cNJ4ifOFhVx&5jd0b`{67 z1jLvfH-2@!)^#lsj;2+x{6;BJV<==C+Q-w220))MML7z}L^+}Eu`uU=8?8}m>5<7X0B0%G{a|5+DbHg!b? z>H)^CMZwv$8r;nlFx_5+p|-^sxFc=pZq)_H3av%R$mpdMgKyAc!hF&Jxz!bqbO zwwo)p=G!mM>AHoyQx)W|AioI0I%pJ^c)zz+K3xOfgNM&z!0*~jE}!3mljk { - console.error(`MusicPlayer[PlayerModel] player error`); - }); - this.#player.on('finish', () => { - console.log('MusicPlayer[PlayerModel] finish() callback is called'); - this.notifyPlayingStatus(false); - }); - this.#player.on('timeUpdate', () => { - console.log('MusicPlayer[PlayerModel] timeUpdate() callback is called ') - }); - console.info('MusicPlayer[PlayerModel] initAudioPlayer end'); - } + initAudioPlayer() { + console.info('MusicPlayer[PlayerModel] initAudioPlayer begin'); + this.#player.on('error', () => { + console.error(`MusicPlayer[PlayerModel] player error`); + }); + this.#player.on('finish', () => { + console.log('MusicPlayer[PlayerModel] finish() callback is called'); + this.notifyPlayingStatus(false); + }); + this.#player.on('timeUpdate', () => { + console.log('MusicPlayer[PlayerModel] timeUpdate() callback is called ') + }); + console.info('MusicPlayer[PlayerModel] initAudioPlayer end'); + } - release() { - if (typeof (this.#player) != 'undefined') { - console.info('MusicPlayer[PlayerModel] player.release begin'); - this.#player.release(); - console.info('MusicPlayer[PlayerModel] player.release end'); - this.#player = undefined; - } + release() { + if (typeof (this.#player) != 'undefined') { + console.info('MusicPlayer[PlayerModel] player.release begin'); + this.#player.release(); + console.info('MusicPlayer[PlayerModel] player.release end'); + this.#player = undefined; } + } - restorePlayingStatus(status, callback) { - console.info('MusicPlayer[PlayerModel] restorePlayingStatus ' + JSON.stringify(status)); - for (var i = 0; i < this.playlist.audioFiles.length; i++) { - if (this.playlist.audioFiles[i].fileUri === status.uri) { - console.info('MusicPlayer[PlayerModel] restore to index ' + i); - this.preLoad(i, () => { - this.play(status.seekTo, status.isPlaying); - console.info('MusicPlayer[PlayerModel] restore play status'); - callback(i); - }); - return; - } - } - console.warn('MusicPlayer[PlayerModel] restorePlayingStatus failed'); - callback(-1); + restorePlayingStatus(status, callback) { + console.info('MusicPlayer[PlayerModel] restorePlayingStatus ' + JSON.stringify(status)); + for (var i = 0; i < this.playlist.audioFiles.length; i++) { + if (this.playlist.audioFiles[i].fileUri === status.uri) { + console.info('MusicPlayer[PlayerModel] restore to index ' + i); + this.preLoad(i, () => { + this.play(status.seekTo, status.isPlaying); + console.info('MusicPlayer[PlayerModel] restore play status'); + callback(i); + }); + return; + } } + console.warn('MusicPlayer[PlayerModel] restorePlayingStatus failed'); + callback(-1); + } - getPlaylist(callback) { - // generate play list - console.info('MusicPlayer[PlayerModel] generatePlayList'); + getPlaylist(callback) { + // generate play list + console.info('MusicPlayer[PlayerModel] generatePlayList'); - console.info('MusicPlayer[PlayerModel] getAudioAssets begin'); - this.playlist = new Playlist(); - this.playlist.audioFiles = []; - this.playlist.audioFiles[0] = new Song('dynamic.wav', 'system/etc/dynamic.wav', 0); - this.playlist.audioFiles[1] = new Song('demo.wav', 'system/etc/demo.wav', 0); - callback() - console.info('MusicPlayer[PlayerModel] getAudioAssets end'); - } + console.info('MusicPlayer[PlayerModel] getAudioAssets begin'); + this.playlist = new Playlist(); + this.playlist.audioFiles = []; + this.playlist.audioFiles[0] = new Song('dynamic.wav', 'system/etc/dynamic.wav', 0); + this.playlist.audioFiles[1] = new Song('demo.wav', 'system/etc/demo.wav', 0); + callback() + console.info('MusicPlayer[PlayerModel] getAudioAssets end'); + } - setOnStatusChangedListener(callback) { - this.#statusChangedListener = callback; - } + setOnStatusChangedListener(callback) { + this.#statusChangedListener = callback; + } - setOnPlayingProgressListener(callback) { - this.#playingProgressListener = callback; - } + setOnPlayingProgressListener(callback) { + this.#playingProgressListener = callback; + } - notifyPlayingStatus(isPlaying) { - this.isPlaying = isPlaying; - this.#statusChangedListener(this.isPlaying); - console.log('MusicPlayer[PlayerModel] notifyPlayingStatus isPlaying=' + isPlaying + ' intervalId=' + this.#intervalID); - if (isPlaying) { - if (typeof (this.#intervalID) === 'undefined') { - let self = this; - this.#intervalID = setInterval(() => { - if (typeof (self.#playingProgressListener) != "undefined" && self.#playingProgressListener != null) { - var timeMs = self.#player.currentTime; - this.#currentTimeMs = timeMs; - if (typeof (timeMs) === 'undefined') { - timeMs = 0; - } - console.log('MusicPlayer[PlayerModel] player.currentTime=' + timeMs); - self.#playingProgressListener(timeMs); - } - }, 500); - console.log('MusicPlayer[PlayerModel] set update interval ' + this.#intervalID); + notifyPlayingStatus(isPlaying) { + this.isPlaying = isPlaying; + this.#statusChangedListener(this.isPlaying); + console.log('MusicPlayer[PlayerModel] notifyPlayingStatus isPlaying=' + isPlaying + ' intervalId=' + this.#intervalID); + if (isPlaying) { + if (typeof (this.#intervalID) === 'undefined') { + let self = this; + this.#intervalID = setInterval(() => { + if (typeof (self.#playingProgressListener) != "undefined" && self.#playingProgressListener != null) { + var timeMs = self.#player.currentTime; + this.#currentTimeMs = timeMs; + if (typeof (timeMs) === 'undefined') { + timeMs = 0; } - } else { - this.cancelTimer(); - } + console.log('MusicPlayer[PlayerModel] player.currentTime=' + timeMs); + self.#playingProgressListener(timeMs); + } + }, 500); + console.log('MusicPlayer[PlayerModel] set update interval ' + this.#intervalID); + } + } else { + this.cancelTimer(); } + } - cancelTimer() { - if (typeof (this.#intervalID) != 'undefined') { - console.log('MusicPlayer[PlayerModel] clear update interval ' + this.#intervalID); - clearInterval(this.#intervalID); - this.#intervalID = undefined; - } + cancelTimer() { + if (typeof (this.#intervalID) != 'undefined') { + console.log('MusicPlayer[PlayerModel] clear update interval ' + this.#intervalID); + clearInterval(this.#intervalID); + this.#intervalID = undefined; } + } - preLoad(index, callback) { - console.info('MusicPlayer[PlayerModel] preLoad ' + index + "/" + this.playlist.audioFiles.length); - if (index < 0 || index >= this.playlist.audioFiles.length) { - console.error('MusicPlayer[PlayerModel] preLoad ignored'); - return 0; - } - this.index = index; + preLoad(index, callback) { + console.info('MusicPlayer[PlayerModel] preLoad ' + index + "/" + this.playlist.audioFiles.length); + if (index < 0 || index >= this.playlist.audioFiles.length) { + console.error('MusicPlayer[PlayerModel] preLoad ignored'); + return 0; + } + this.index = index; - let uri = this.playlist.audioFiles[index].fileUri - fileIo.open(uri, (err, fdNumber) => { - let fdPath = 'fd://' - let source = fdPath + fdNumber + let uri = this.playlist.audioFiles[index].fileUri + fileIo.open(uri, (err, fdNumber) => { + let fdPath = 'fd://' + let source = fdPath + fdNumber - if (typeof (source) === 'undefined') { - console.error('MusicPlayer[PlayerModel] preLoad ignored, source=' + source); - return; - } - console.info('MusicPlayer[PlayerModel] preLoad ' + source + ' begin'); - console.info('MusicPlayer[PlayerModel] state=' + this.#player.state); - let self = this; - if (source === this.#player.src && this.#player.state != 'idle') { - console.info('MusicPlayer[PlayerModel] preLoad finished. src not changed'); - callback(); - } else if (this.#player.state === 'idle') { - this.#player.on('dataLoad', () => { - console.info('MusicPlayer[PlayerModel] dataLoad callback, state=' + self.#player.state); - callback(); - }); - console.info('MusicPlayer[PlayerModel] player.src=' + source); - this.#player.src = source; - } else { - this.notifyPlayingStatus(false); - this.cancelTimer(); - console.info('MusicPlayer[PlayerModel] player.reset'); - self.#player.reset(); - console.info('MusicPlayer[PlayerModel] player.reset done, state=' + self.#player.state); - self.#player.on('dataLoad', () => { - console.info('MusicPlayer[PlayerModel] dataLoad callback, state=' + self.#player.state); - callback(); - }); - console.info('MusicPlayer[PlayerModel] player.src=' + source); - self.#player.src = source; - } - console.info('MusicPlayer[PlayerModel] preLoad ' + source + ' end'); - }) - } + if (typeof (source) === 'undefined') { + console.error('MusicPlayer[PlayerModel] preLoad ignored, source=' + source); + return; + } + console.info('MusicPlayer[PlayerModel] preLoad ' + source + ' begin'); + console.info('MusicPlayer[PlayerModel] state=' + this.#player.state); + let self = this; + if (source === this.#player.src && this.#player.state != 'idle') { + console.info('MusicPlayer[PlayerModel] preLoad finished. src not changed'); + callback(); + } else if (this.#player.state === 'idle') { + this.#player.on('dataLoad', () => { + console.info('MusicPlayer[PlayerModel] dataLoad callback, state=' + self.#player.state); + callback(); + }); + console.info('MusicPlayer[PlayerModel] player.src=' + source); + this.#player.src = source; + } else { + this.notifyPlayingStatus(false); + this.cancelTimer(); + console.info('MusicPlayer[PlayerModel] player.reset'); + self.#player.reset(); + console.info('MusicPlayer[PlayerModel] player.reset done, state=' + self.#player.state); + self.#player.on('dataLoad', () => { + console.info('MusicPlayer[PlayerModel] dataLoad callback, state=' + self.#player.state); + callback(); + }); + console.info('MusicPlayer[PlayerModel] player.src=' + source); + self.#player.src = source; + } + console.info('MusicPlayer[PlayerModel] preLoad ' + source + ' end'); + }) + } - getDuration() { - console.info('MusicPlayer[PlayerModel] getDuration index=' + this.index); - if (this.playlist.audioFiles[this.index].duration > 0) { - return this.playlist.audioFiles[this.index].duration; - } - console.info('MusicPlayer[PlayerModel] getDuration state=' + this.#player.state); - if (this.#player.state === 'idle') { - console.warn('MusicPlayer[PlayerModel] getDuration ignored, player.state=' + this.#player.state); - return 0; - } - this.playlist.audioFiles[this.index].duration = Math.min(this.#player.duration, 97615); - console.info('MusicPlayer[PlayerModel] getDuration player.src=' + this.#player.src + ", player.duration=" + this.playlist.audioFiles[this.index].duration); - return this.playlist.audioFiles[this.index].duration; + getDuration() { + console.info('MusicPlayer[PlayerModel] getDuration index=' + this.index); + if (this.playlist.audioFiles[this.index].duration > 0) { + return this.playlist.audioFiles[this.index].duration; } - - getCurrentMs() { - return this.#currentTimeMs; + console.info('MusicPlayer[PlayerModel] getDuration state=' + this.#player.state); + if (this.#player.state === 'idle') { + console.warn('MusicPlayer[PlayerModel] getDuration ignored, player.state=' + this.#player.state); + return 0; } + this.playlist.audioFiles[this.index].duration = Math.min(this.#player.duration, 97615); + console.info('MusicPlayer[PlayerModel] getDuration player.src=' + this.#player.src + ", player.duration=" + this.playlist.audioFiles[this.index].duration); + return this.playlist.audioFiles[this.index].duration; + } - play(seekTo, startPlay) { - console.info('MusicPlayer[PlayerModel] play seekTo=' + seekTo + ', startPlay=' + startPlay); - this.notifyPlayingStatus(startPlay); - if (startPlay) { - if (seekTo < 0 && this.#currentTimeMs > 0) { - console.info('MusicPlayer[PlayerModel] pop seekTo=' + this.#currentTimeMs); - seekTo = this.#currentTimeMs; - } - let self = this; - this.#player.on('play', (err, action) => { - if (err) { - console.error(`MusicPlayer[PlayerModel] error returned in play() callback`); - return; - } - console.log('MusicPlayer[PlayerModel] play() callback entered, player.state=' + self.#player.state); - if (seekTo > 0) { - self.seek(seekTo); - } - }); - console.info('MusicPlayer[PlayerModel] call player.play'); - this.#player.play(); - console.info('MusicPlayer[PlayerModel] player.play called player.state=' + this.#player.state); - } else if (seekTo > 0) { - this.#playingProgressListener(seekTo); - this.#currentTimeMs = seekTo; - console.info('MusicPlayer[PlayerModel] stash seekTo=' + this.#currentTimeMs); + getCurrentMs() { + return this.#currentTimeMs; + } + + play(seekTo, startPlay) { + console.info('MusicPlayer[PlayerModel] play seekTo=' + seekTo + ', startPlay=' + startPlay); + this.notifyPlayingStatus(startPlay); + if (startPlay) { + if (seekTo < 0 && this.#currentTimeMs > 0) { + console.info('MusicPlayer[PlayerModel] pop seekTo=' + this.#currentTimeMs); + seekTo = this.#currentTimeMs; + } + let self = this; + this.#player.on('play', (err, action) => { + if (err) { + console.error(`MusicPlayer[PlayerModel] error returned in play() callback`); + return; } + console.log('MusicPlayer[PlayerModel] play() callback entered, player.state=' + self.#player.state); + if (seekTo > 0) { + self.seek(seekTo); + } + }); + console.info('MusicPlayer[PlayerModel] call player.play'); + this.#player.play(); + console.info('MusicPlayer[PlayerModel] player.play called player.state=' + this.#player.state); + } else if (seekTo > 0) { + this.#playingProgressListener(seekTo); + this.#currentTimeMs = seekTo; + console.info('MusicPlayer[PlayerModel] stash seekTo=' + this.#currentTimeMs); } + } - pause() { - if (!this.isPlaying) { - console.info('MusicPlayer[PlayerModel] pause ignored, isPlaying=' + this.isPlaying); - return; - } - this.notifyPlayingStatus(false); - console.info('MusicPlayer[PlayerModel] call player.pause'); - this.#player.pause(); - console.info('MusicPlayer[PlayerModel] player.pause called, player.state=' + this.#player.state); + pause() { + if (!this.isPlaying) { + console.info('MusicPlayer[PlayerModel] pause ignored, isPlaying=' + this.isPlaying); + return; } + this.notifyPlayingStatus(false); + console.info('MusicPlayer[PlayerModel] call player.pause'); + this.#player.pause(); + console.info('MusicPlayer[PlayerModel] player.pause called, player.state=' + this.#player.state); + } - seek(ms) { - this.#currentTimeMs = ms; - if (this.isPlaying) { - console.log('MusicPlayer[PlayerModel] player.seek ' + ms); - this.#player.seek(ms); - } else { - console.log('MusicPlayer[PlayerModel] stash seekTo=' + ms); - } + seek(ms) { + this.#currentTimeMs = ms; + if (this.isPlaying) { + console.log('MusicPlayer[PlayerModel] player.seek ' + ms); + this.#player.seek(ms); + } else { + console.log('MusicPlayer[PlayerModel] stash seekTo=' + ms); } + } - stop() { - if (!this.isPlaying) { - console.info('MusicPlayer[PlayerModel] stop ignored, isPlaying=' + this.isPlaying); - return; - } - this.notifyPlayingStatus(false); - console.info('MusicPlayer[PlayerModel] call player.stop'); - this.#player.stop(); - console.info('MusicPlayer[PlayerModel] player.stop called, player.state=' + this.#player.state); + stop() { + if (!this.isPlaying) { + console.info('MusicPlayer[PlayerModel] stop ignored, isPlaying=' + this.isPlaying); + return; } + this.notifyPlayingStatus(false); + console.info('MusicPlayer[PlayerModel] call player.stop'); + this.#player.stop(); + console.info('MusicPlayer[PlayerModel] player.stop called, player.state=' + this.#player.state); + } } \ No newline at end of file diff --git a/media/JsAudioPlayer/entry/src/main/js/default/pages/index/index.hml b/media/JsAudioPlayer/entry/src/main/js/default/pages/index/index.hml index f6bf819a5..beeb54095 100644 --- a/media/JsAudioPlayer/entry/src/main/js/default/pages/index/index.hml +++ b/media/JsAudioPlayer/entry/src/main/js/default/pages/index/index.hml @@ -14,42 +14,42 @@ -->
-
- -
- - {{ title }} - +
+ +
+ + {{ title }} + -
-
- -
-
- -
-
- -
-
- -
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + {{ $t('strings.media') }} +
+
+ 0 + + 15 +
+
+ +
- -
-
- - {{ $t('strings.media') }} -
-
- 0 - - 15 -
-
- -
-
- +
diff --git a/media/JsAudioPlayer/entry/src/main/js/default/pages/index/index.js b/media/JsAudioPlayer/entry/src/main/js/default/pages/index/index.js index 4374b78ee..b2b777761 100644 --- a/media/JsAudioPlayer/entry/src/main/js/default/pages/index/index.js +++ b/media/JsAudioPlayer/entry/src/main/js/default/pages/index/index.js @@ -17,97 +17,97 @@ import audio from '@ohos.multimedia.audio' import PlayerModel from '../../common/PlayerModel.js'; export default { - data: { - title: '', - audioUrl: '', - index: 0, - audioPlayer: null, - isSwitching: false, - playerModel: new PlayerModel(), - audioManager: null, - volume: 0 - }, - onInit() { + data: { + title: '', + audioUrl: '', + index: 0, + audioPlayer: null, + isSwitching: false, + playerModel: new PlayerModel(), + audioManager: null, + volume: 0 + }, + onInit() { + this.audioUrl = 'common/images/pause.png'; + this.playerModel.setOnStatusChangedListener((isPlaying) => { + console.info('MusicPlayer[IndexPage] on player status changed, isPlaying=' + isPlaying + ', refresh ui'); + if (isPlaying) { + this.audioUrl = 'common/images/play.png'; + } else { this.audioUrl = 'common/images/pause.png'; - this.playerModel.setOnStatusChangedListener((isPlaying) => { - console.info('MusicPlayer[IndexPage] on player status changed, isPlaying=' + isPlaying + ', refresh ui'); - if (isPlaying) { - this.audioUrl = 'common/images/play.png'; - } else { - this.audioUrl = 'common/images/pause.png'; - } - }); - this.playerModel.getPlaylist(() => { - console.info('MusicPlayer[IndexPage] on playlist generated, refresh ui'); - }); - this.title = this.playerModel.playlist.audioFiles[this.index].name; - this.audioManager = audio.getAudioManager(); - }, - onPlayClick() { - if (this.isSwitching) { - console.info('MusicPlayer[IndexPage] onPlayClick ignored, isSwitching'); - return; - } - console.info('MusicPlayer[IndexPage] onPlayClick, isPlaying=' + this.playerModel.isPlaying); - if (this.playerModel.isPlaying) { - this.playerModel.pause(); - } else { - this.playerModel.preLoad(this.index, () => { - this.playerModel.play(-1, true); - }); - } - }, - onPreviousClick() { - if (this.isSwitching) { - console.info('MusicPlayer[IndexPage] onPreviousClick ignored, isSwitching'); - return; - } - console.info('MusicPlayer[IndexPage] onPreviousClick'); - this.index--; - if (this.index < 0 && this.playerModel.playlist.audioFiles.length >= 1) { - this.index = this.playerModel.playlist.audioFiles.length - 1; - } - this.currentProgress = 0; - this.isSwitching = true; - let self = this; - this.playerModel.preLoad(this.index, () => { - self.playerModel.play(0, true); - self.isSwitching = false; - }); - this.title = this.playerModel.playlist.audioFiles[this.index].name; - }, - onNextClick() { - if (this.isSwitching) { - console.info('MusicPlayer[IndexPage] onNextClick ignored, isSwitching'); - return; - } - console.info('MusicPlayer[IndexPage] onNextClick'); - this.index++; - if (this.index >= this.playerModel.playlist.audioFiles.length) { - this.index = 0; - } - this.currentProgress = 0; - this.isSwitching = true; - let self = this; - this.playerModel.preLoad(this.index, () => { - self.playerModel.play(0, true); - self.isSwitching = false; - }); - this.title = this.playerModel.playlist.audioFiles[this.index].name; - }, - media(e) { - this.volume = e.value - this.audioManager.setVolume(audio.AudioVolumeType.MEDIA, this.volume).then(() => { - console.log('Promise returned to indicate a successful volume setting.'); - }) - - }, - showPanel() { - this.$element('showPanel').show(); - }, - closePanel() { - this.$element('showPanel').close(); + } + }); + this.playerModel.getPlaylist(() => { + console.info('MusicPlayer[IndexPage] on playlist generated, refresh ui'); + }); + this.title = this.playerModel.playlist.audioFiles[this.index].name; + this.audioManager = audio.getAudioManager(); + }, + onPlayClick() { + if (this.isSwitching) { + console.info('MusicPlayer[IndexPage] onPlayClick ignored, isSwitching'); + return; + } + console.info('MusicPlayer[IndexPage] onPlayClick, isPlaying=' + this.playerModel.isPlaying); + if (this.playerModel.isPlaying) { + this.playerModel.pause(); + } else { + this.playerModel.preLoad(this.index, () => { + this.playerModel.play(-1, true); + }); + } + }, + onPreviousClick() { + if (this.isSwitching) { + console.info('MusicPlayer[IndexPage] onPreviousClick ignored, isSwitching'); + return; + } + console.info('MusicPlayer[IndexPage] onPreviousClick'); + this.index--; + if (this.index < 0 && this.playerModel.playlist.audioFiles.length >= 1) { + this.index = this.playerModel.playlist.audioFiles.length - 1; } + this.currentProgress = 0; + this.isSwitching = true; + let self = this; + this.playerModel.preLoad(this.index, () => { + self.playerModel.play(0, true); + self.isSwitching = false; + }); + this.title = this.playerModel.playlist.audioFiles[this.index].name; + }, + onNextClick() { + if (this.isSwitching) { + console.info('MusicPlayer[IndexPage] onNextClick ignored, isSwitching'); + return; + } + console.info('MusicPlayer[IndexPage] onNextClick'); + this.index++; + if (this.index >= this.playerModel.playlist.audioFiles.length) { + this.index = 0; + } + this.currentProgress = 0; + this.isSwitching = true; + let self = this; + this.playerModel.preLoad(this.index, () => { + self.playerModel.play(0, true); + self.isSwitching = false; + }); + this.title = this.playerModel.playlist.audioFiles[this.index].name; + }, + media(e) { + this.volume = e.value + this.audioManager.setVolume(audio.AudioVolumeType.MEDIA, this.volume).then(() => { + console.log('Promise returned to indicate a successful volume setting.'); + }) + + }, + showPanel() { + this.$element('showPanel').show(); + }, + closePanel() { + this.$element('showPanel').close(); + } } diff --git a/media/JsAudioPlayer/package.json b/media/JsAudioPlayer/package.json index b329e588e..ddfc4f26e 100644 --- a/media/JsAudioPlayer/package.json +++ b/media/JsAudioPlayer/package.json @@ -11,8 +11,8 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hypium": "1.0.0", - "@ohos/hvigor-ohos-plugin": "1.1.3", - "@ohos/hvigor": "1.1.3" + "@ohos/hypium": "1.0.1", + "@ohos/hvigor-ohos-plugin": "1.1.6", + "@ohos/hvigor": "1.1.6" } } -- Gitee