From 4130b6360a0b1a97243883b2d74a35f04f69c2b7 Mon Sep 17 00:00:00 2001 From: zhuchengfeng <940848916@qq.com> Date: Sun, 24 Apr 2022 10:09:18 +0800 Subject: [PATCH] update api9 Signed-off-by: zhuchengfeng <940848916@qq.com> --- .gitattributes | 15 - .gitignore | 17 +- AppScope/app.json5 | 15 + AppScope/resources/base/element/string.json | 8 + AppScope/resources/base/media/app_icon.png | Bin 0 -> 6790 bytes build-profile.json5 | 90 + build.gradle | 40 - common/.gitignore | 3 + common/build-profile.json5 | 5 + common/build.gradle | 21 - common/hvigorfile.js | 3 + common/index.ets | 1 + common/package-lock.json | 5 + common/package.json | 14 + common/src/main/config.json | 24 - .../main/ets/components/MainPage/MainPage.ets | 17 + common/src/main/ets/default/TimeManager.ts | 26 +- common/src/main/module.json5 | 11 + entry/.gitignore | 3 +- entry/build-profile.json5 | 13 + entry/build.gradle | 22 - entry/hvigorfile.js | 2 + entry/package-lock.json | 5 + entry/package.json | 14 + entry/proguard-rules.pro | 1 - entry/src/main/config.json | 64 - entry/src/main/ets/AbilityStage.ts | 25 - .../src/main/ets/Application/AbilityStage.ts | 7 + entry/src/main/ets/MainAbility/MainAbility.ts | 63 +- entry/src/main/ets/MainAbility/app.ets | 23 - .../src/main/ets/MainAbility/pages/index.ets | 28 - entry/src/main/ets/pages/index.ets | 17 + entry/src/main/module.json5 | 37 + .../main/resources/base/element/string.json | 12 +- .../resources/base/profile/main_pages.json | 5 + features/batterycomponent/.gitignore | 4 +- features/batterycomponent/build-profile.json5 | 5 + features/batterycomponent/build.gradle | 19 - features/batterycomponent/hvigorfile.js | 3 + features/batterycomponent/index.ets | 1 + features/batterycomponent/package-lock.json | 5 + features/batterycomponent/package.json | 14 + .../batterycomponent/src/main/config.json | 23 - .../main/ets/components/MainPage/MainPage.ets | 17 + .../src/main/ets/default/app.ets | 23 - .../batterycomponent/src/main/module.json5 | 11 + features/clockcomponent/.gitignore | 4 +- features/clockcomponent/build-profile.json5 | 5 + features/clockcomponent/build.gradle | 19 - features/clockcomponent/hvigorfile.js | 3 + features/clockcomponent/index.ets | 1 + features/clockcomponent/package-lock.json | 5 + features/clockcomponent/package.json | 14 + features/clockcomponent/src/main/config.json | 23 - .../main/ets/components/MainPage/MainPage.ets | 17 + .../src/main/ets/default/pages/clockIcon.ets | 2 +- features/clockcomponent/src/main/module.json5 | 11 + features/datetimecomponent/.gitignore | 3 + .../datetimecomponent/build-profile.json5 | 5 + features/datetimecomponent/build.gradle | 21 - features/datetimecomponent/hvigorfile.js | 3 + features/datetimecomponent/index.ets | 1 + features/datetimecomponent/package-lock.json | 5 + features/datetimecomponent/package.json | 14 + .../datetimecomponent/src/main/config.json | 23 - .../main/ets/com/ohos/vm/dateTimeViewModel.ts | 15 +- .../main/ets/components/MainPage/MainPage.ets | 17 + .../datetimecomponent/src/main/module.json5 | 11 + features/noticeitem/.gitignore | 3 + features/noticeitem/build-profile.json5 | 5 + features/noticeitem/build.gradle | 19 - features/noticeitem/hvigorfile.js | 3 + features/noticeitem/index.ets | 1 + features/noticeitem/package-lock.json | 5 + features/noticeitem/package.json | 14 + features/noticeitem/src/main/config.json | 24 - .../noticeItem/view/item/confirmDialog.ets | 2 +- .../main/ets/components/MainPage/MainPage.ets | 17 + features/noticeitem/src/main/module.json5 | 11 + features/screenlock/.gitignore | 3 + features/screenlock/build-profile.json5 | 5 + features/screenlock/build.gradle | 26 - features/screenlock/hvigorfile.js | 3 + features/screenlock/index.ets | 1 + features/screenlock/package-lock.json | 5 + features/screenlock/package.json | 14 + features/screenlock/src/main/config.json | 23 - .../main/ets/com/ohos/common/constants.ets | 70 - .../src/main/ets/com/ohos/common/constants.ts | 142 ++ .../ets/com/ohos/model/screenLockModel.ts | 32 +- .../ets/com/ohos/model/screenLockService.ts | 1 - .../ets/com/ohos/view/component/customPSD.ets | 6 +- .../com/ohos/view/component/digitalPSD.ets | 6 +- .../ets/com/ohos/view/component/mixedPSD.ets | 4 +- .../com/ohos/view/component/numkeyBoard.ets | 2 +- .../src/main/ets/com/ohos/vm/baseViewModel.ts | 65 +- .../ets/com/ohos/vm/customPSDViewModel.ts | 6 +- .../main/ets/com/ohos/vm/dateTimeViewModel.ts | 72 - .../ets/com/ohos/vm/digitalPSDViewModel.ts | 8 +- .../main/ets/com/ohos/vm/mixedPSDViewModel.ts | 6 +- .../main/ets/components/MainPage/MainPage.ets | 17 + features/screenlock/src/main/module.json5 | 11 + features/shortcutcomponent/.gitignore | 3 + .../shortcutcomponent/build-profile.json5 | 5 + features/shortcutcomponent/build.gradle | 21 - features/shortcutcomponent/hvigorfile.js | 3 + features/shortcutcomponent/index.ets | 1 + features/shortcutcomponent/package-lock.json | 5 + features/shortcutcomponent/package.json | 14 + .../shortcutcomponent/src/main/config.json | 23 - .../main/ets/components/MainPage/MainPage.ets | 17 + .../shortcutcomponent/src/main/module.json5 | 11 + features/signalcomponent/.gitignore | 4 +- features/signalcomponent/build-profile.json5 | 5 + features/signalcomponent/build.gradle | 19 - features/signalcomponent/hvigorfile.js | 3 + features/signalcomponent/index.ets | 1 + features/signalcomponent/package-lock.json | 5 + features/signalcomponent/package.json | 14 + features/signalcomponent/src/main/config.json | 23 - .../main/ets/components/MainPage/MainPage.ets | 17 + .../signalcomponent/src/main/module.json5 | 11 + features/wallpapercomponent/.gitignore | 3 + .../wallpapercomponent/build-profile.json5 | 5 + features/wallpapercomponent/build.gradle | 21 - features/wallpapercomponent/hvigorfile.js | 3 + features/wallpapercomponent/index.ets | 1 + features/wallpapercomponent/package-lock.json | 5 + features/wallpapercomponent/package.json | 14 + .../wallpapercomponent/src/main/config.json | 23 - .../main/ets/components/MainPage/MainPage.ets | 17 + .../wallpapercomponent/src/main/module.json5 | 11 + .../main/resources/base/element/string.json | 8 + features/wificomponent/.gitignore | 4 +- features/wificomponent/build-profile.json5 | 5 + features/wificomponent/build.gradle | 19 - features/wificomponent/hvigorfile.js | 3 + features/wificomponent/index.ets | 1 + features/wificomponent/package-lock.json | 5 + features/wificomponent/package.json | 14 + features/wificomponent/src/main/config.json | 23 - .../main/ets/components/MainPage/MainPage.ets | 17 + features/wificomponent/src/main/module.json5 | 11 + .../main/resources/base/element/string.json | 8 + figures/screenlock.png | Bin 27998 -> 0 bytes gradle.properties | 10 - gradlew | 183 -- gradlew.bat | 103 - hvigorfile.js | 2 + package-lock.json | 1657 +++++++++++++++++ package.json | 18 + product/pc/.gitignore | 3 + product/pc/build-profile.json5 | 13 + product/pc/hvigorfile.js | 2 + product/pc/package-lock.json | 38 + product/pc/package.json | 25 + .../ets/{ => Application}/AbilityStage.ts | 2 +- .../ServiceExtAbility/ServiceExtAbility.ts | 5 +- .../pc/src/main/ets/ServiceExtAbility/app.ets | 26 - .../common/StyleConfiguration.ts | 4 +- .../common/StyleManager.ts | 14 +- .../common/constants.ts | 0 .../pages/customPassword.ets | 10 +- .../src/main/ets}/pages/customscreenlock.ets | 3 +- .../pages/digitalPassword.ets | 10 +- .../src/main/ets}/pages/index.ets | 29 +- .../pages/journalscreenlock.ets | 3 +- .../pages/mixedPassword.ets | 10 +- .../pages/slidescreenlock.ets | 19 +- .../vm/indexViewModel.ts | 6 +- .../vm/slideScreenLockViewModel.ts | 6 +- .../pc/src/main/{config.json => module.json5} | 71 +- .../main/resources/base/element/string.json | 6 +- .../resources/base/profile/main_pages.json | 8 + product/phone/.gitignore | 3 + product/phone/build-profile.json5 | 13 + product/phone/hvigorfile.js | 2 + product/phone/package-lock.json | 38 + product/phone/package.json | 25 + .../src/main/ets/Application/AbilityStage.ts | 7 + .../src/main/ets/ServiceExtAbility/app.ets | 26 - .../common/StyleConfiguration.ts | 4 +- .../common/StyleManager.ts | 4 +- .../common/constants.ts | 0 .../pages/customPassword.ets | 10 +- .../src/main/ets}/pages/customscreenlock.ets | 3 +- .../pages/digitalPassword.ets | 10 +- .../src/main/ets}/pages/index.ets | 39 +- .../pages/journalscreenlock.ets | 3 +- .../pages/mixedPassword.ets | 10 +- .../pages/slidescreenlock.ets | 15 +- .../vm/indexViewModel.ts | 6 +- .../vm/slideScreenLockViewModel.ts | 6 +- .../src/main/{config.json => module.json5} | 71 +- .../main/resources/base/element/string.json | 6 +- .../resources/base/profile/main_pages.json | 8 + settings.gradle | 20 - signature/screenlock.p7b | Bin 3438 -> 3639 bytes 198 files changed, 3124 insertions(+), 1552 deletions(-) delete mode 100644 .gitattributes create mode 100644 AppScope/app.json5 create mode 100644 AppScope/resources/base/element/string.json create mode 100644 AppScope/resources/base/media/app_icon.png create mode 100644 build-profile.json5 delete mode 100644 build.gradle create mode 100644 common/.gitignore create mode 100644 common/build-profile.json5 delete mode 100644 common/build.gradle create mode 100644 common/hvigorfile.js create mode 100644 common/index.ets create mode 100644 common/package-lock.json create mode 100644 common/package.json delete mode 100644 common/src/main/config.json create mode 100644 common/src/main/ets/components/MainPage/MainPage.ets create mode 100644 common/src/main/module.json5 create mode 100644 entry/build-profile.json5 delete mode 100644 entry/build.gradle create mode 100644 entry/hvigorfile.js create mode 100644 entry/package-lock.json create mode 100644 entry/package.json delete mode 100644 entry/proguard-rules.pro delete mode 100644 entry/src/main/config.json delete mode 100644 entry/src/main/ets/AbilityStage.ts create mode 100644 entry/src/main/ets/Application/AbilityStage.ts delete mode 100644 entry/src/main/ets/MainAbility/app.ets delete mode 100644 entry/src/main/ets/MainAbility/pages/index.ets create mode 100644 entry/src/main/ets/pages/index.ets create mode 100644 entry/src/main/module.json5 create mode 100644 entry/src/main/resources/base/profile/main_pages.json create mode 100644 features/batterycomponent/build-profile.json5 delete mode 100644 features/batterycomponent/build.gradle create mode 100644 features/batterycomponent/hvigorfile.js create mode 100644 features/batterycomponent/index.ets create mode 100644 features/batterycomponent/package-lock.json create mode 100644 features/batterycomponent/package.json delete mode 100644 features/batterycomponent/src/main/config.json create mode 100644 features/batterycomponent/src/main/ets/components/MainPage/MainPage.ets delete mode 100644 features/batterycomponent/src/main/ets/default/app.ets create mode 100644 features/batterycomponent/src/main/module.json5 create mode 100644 features/clockcomponent/build-profile.json5 delete mode 100644 features/clockcomponent/build.gradle create mode 100644 features/clockcomponent/hvigorfile.js create mode 100644 features/clockcomponent/index.ets create mode 100644 features/clockcomponent/package-lock.json create mode 100644 features/clockcomponent/package.json delete mode 100644 features/clockcomponent/src/main/config.json create mode 100644 features/clockcomponent/src/main/ets/components/MainPage/MainPage.ets create mode 100644 features/clockcomponent/src/main/module.json5 create mode 100644 features/datetimecomponent/.gitignore create mode 100644 features/datetimecomponent/build-profile.json5 delete mode 100644 features/datetimecomponent/build.gradle create mode 100644 features/datetimecomponent/hvigorfile.js create mode 100644 features/datetimecomponent/index.ets create mode 100644 features/datetimecomponent/package-lock.json create mode 100644 features/datetimecomponent/package.json delete mode 100644 features/datetimecomponent/src/main/config.json create mode 100644 features/datetimecomponent/src/main/ets/components/MainPage/MainPage.ets create mode 100644 features/datetimecomponent/src/main/module.json5 create mode 100644 features/noticeitem/.gitignore create mode 100644 features/noticeitem/build-profile.json5 delete mode 100644 features/noticeitem/build.gradle create mode 100644 features/noticeitem/hvigorfile.js create mode 100644 features/noticeitem/index.ets create mode 100644 features/noticeitem/package-lock.json create mode 100644 features/noticeitem/package.json delete mode 100644 features/noticeitem/src/main/config.json create mode 100644 features/noticeitem/src/main/ets/components/MainPage/MainPage.ets create mode 100644 features/noticeitem/src/main/module.json5 create mode 100644 features/screenlock/.gitignore create mode 100644 features/screenlock/build-profile.json5 delete mode 100644 features/screenlock/build.gradle create mode 100644 features/screenlock/hvigorfile.js create mode 100644 features/screenlock/index.ets create mode 100644 features/screenlock/package-lock.json create mode 100644 features/screenlock/package.json delete mode 100644 features/screenlock/src/main/config.json delete mode 100644 features/screenlock/src/main/ets/com/ohos/common/constants.ets create mode 100644 features/screenlock/src/main/ets/com/ohos/common/constants.ts delete mode 100644 features/screenlock/src/main/ets/com/ohos/vm/dateTimeViewModel.ts create mode 100644 features/screenlock/src/main/ets/components/MainPage/MainPage.ets create mode 100644 features/screenlock/src/main/module.json5 create mode 100644 features/shortcutcomponent/.gitignore create mode 100644 features/shortcutcomponent/build-profile.json5 delete mode 100644 features/shortcutcomponent/build.gradle create mode 100644 features/shortcutcomponent/hvigorfile.js create mode 100644 features/shortcutcomponent/index.ets create mode 100644 features/shortcutcomponent/package-lock.json create mode 100644 features/shortcutcomponent/package.json delete mode 100644 features/shortcutcomponent/src/main/config.json create mode 100644 features/shortcutcomponent/src/main/ets/components/MainPage/MainPage.ets create mode 100644 features/shortcutcomponent/src/main/module.json5 create mode 100644 features/signalcomponent/build-profile.json5 delete mode 100644 features/signalcomponent/build.gradle create mode 100644 features/signalcomponent/hvigorfile.js create mode 100644 features/signalcomponent/index.ets create mode 100644 features/signalcomponent/package-lock.json create mode 100644 features/signalcomponent/package.json delete mode 100644 features/signalcomponent/src/main/config.json create mode 100644 features/signalcomponent/src/main/ets/components/MainPage/MainPage.ets create mode 100644 features/signalcomponent/src/main/module.json5 create mode 100644 features/wallpapercomponent/.gitignore create mode 100644 features/wallpapercomponent/build-profile.json5 delete mode 100644 features/wallpapercomponent/build.gradle create mode 100644 features/wallpapercomponent/hvigorfile.js create mode 100644 features/wallpapercomponent/index.ets create mode 100644 features/wallpapercomponent/package-lock.json create mode 100644 features/wallpapercomponent/package.json delete mode 100644 features/wallpapercomponent/src/main/config.json create mode 100644 features/wallpapercomponent/src/main/ets/components/MainPage/MainPage.ets create mode 100644 features/wallpapercomponent/src/main/module.json5 create mode 100644 features/wallpapercomponent/src/main/resources/base/element/string.json create mode 100644 features/wificomponent/build-profile.json5 delete mode 100644 features/wificomponent/build.gradle create mode 100644 features/wificomponent/hvigorfile.js create mode 100644 features/wificomponent/index.ets create mode 100644 features/wificomponent/package-lock.json create mode 100644 features/wificomponent/package.json delete mode 100644 features/wificomponent/src/main/config.json create mode 100644 features/wificomponent/src/main/ets/components/MainPage/MainPage.ets create mode 100644 features/wificomponent/src/main/module.json5 create mode 100644 features/wificomponent/src/main/resources/base/element/string.json delete mode 100644 figures/screenlock.png delete mode 100644 gradle.properties delete mode 100644 gradlew delete mode 100644 gradlew.bat create mode 100644 hvigorfile.js create mode 100644 package-lock.json create mode 100644 package.json create mode 100644 product/pc/.gitignore create mode 100644 product/pc/build-profile.json5 create mode 100644 product/pc/hvigorfile.js create mode 100644 product/pc/package-lock.json create mode 100644 product/pc/package.json rename product/pc/src/main/ets/{ => Application}/AbilityStage.ts (92%) delete mode 100644 product/pc/src/main/ets/ServiceExtAbility/app.ets rename product/pc/src/main/ets/{ServiceExtAbility => }/common/StyleConfiguration.ts (84%) rename product/pc/src/main/ets/{ServiceExtAbility => }/common/StyleManager.ts (84%) rename product/pc/src/main/ets/{ServiceExtAbility => }/common/constants.ts (100%) rename product/pc/src/main/ets/{ServiceExtAbility => }/pages/customPassword.ets (76%) rename product/{phone/src/main/ets/ServiceExtAbility => pc/src/main/ets}/pages/customscreenlock.ets (92%) rename product/pc/src/main/ets/{ServiceExtAbility => }/pages/digitalPassword.ets (76%) rename product/{phone/src/main/ets/ServiceExtAbility => pc/src/main/ets}/pages/index.ets (77%) rename product/pc/src/main/ets/{ServiceExtAbility => }/pages/journalscreenlock.ets (92%) rename product/pc/src/main/ets/{ServiceExtAbility => }/pages/mixedPassword.ets (76%) rename product/pc/src/main/ets/{ServiceExtAbility => }/pages/slidescreenlock.ets (81%) rename product/pc/src/main/ets/{ServiceExtAbility => }/vm/indexViewModel.ts (83%) rename product/pc/src/main/ets/{ServiceExtAbility => }/vm/slideScreenLockViewModel.ts (91%) rename product/pc/src/main/{config.json => module.json5} (56%) create mode 100644 product/pc/src/main/resources/base/profile/main_pages.json create mode 100644 product/phone/.gitignore create mode 100644 product/phone/build-profile.json5 create mode 100644 product/phone/hvigorfile.js create mode 100644 product/phone/package-lock.json create mode 100644 product/phone/package.json create mode 100644 product/phone/src/main/ets/Application/AbilityStage.ts delete mode 100644 product/phone/src/main/ets/ServiceExtAbility/app.ets rename product/phone/src/main/ets/{ServiceExtAbility => }/common/StyleConfiguration.ts (84%) rename product/phone/src/main/ets/{ServiceExtAbility => }/common/StyleManager.ts (89%) rename product/phone/src/main/ets/{ServiceExtAbility => }/common/constants.ts (100%) rename product/phone/src/main/ets/{ServiceExtAbility => }/pages/customPassword.ets (77%) rename product/{pc/src/main/ets/ServiceExtAbility => phone/src/main/ets}/pages/customscreenlock.ets (92%) rename product/phone/src/main/ets/{ServiceExtAbility => }/pages/digitalPassword.ets (77%) rename product/{pc/src/main/ets/ServiceExtAbility => phone/src/main/ets}/pages/index.ets (65%) rename product/phone/src/main/ets/{ServiceExtAbility => }/pages/journalscreenlock.ets (92%) rename product/phone/src/main/ets/{ServiceExtAbility => }/pages/mixedPassword.ets (77%) rename product/phone/src/main/ets/{ServiceExtAbility => }/pages/slidescreenlock.ets (83%) rename product/phone/src/main/ets/{ServiceExtAbility => }/vm/indexViewModel.ts (84%) rename product/phone/src/main/ets/{ServiceExtAbility => }/vm/slideScreenLockViewModel.ts (90%) rename product/phone/src/main/{config.json => module.json5} (56%) create mode 100644 product/phone/src/main/resources/base/profile/main_pages.json delete mode 100644 settings.gradle diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 51c63e2..0000000 --- a/.gitattributes +++ /dev/null @@ -1,15 +0,0 @@ -*.tgz filter=lfs diff=lfs merge=lfs -text -*.trp filter=lfs diff=lfs merge=lfs -text -*.apk filter=lfs diff=lfs merge=lfs -text -*.jar filter=lfs diff=lfs merge=lfs -text -*.mp4 filter=lfs diff=lfs merge=lfs -text -*.zip filter=lfs diff=lfs merge=lfs -text -*.asm filter=lfs diff=lfs merge=lfs -text -*.8svn filter=lfs diff=lfs merge=lfs -text -*.9svn filter=lfs diff=lfs merge=lfs -text -*.dylib filter=lfs diff=lfs merge=lfs -text -*.exe filter=lfs diff=lfs merge=lfs -text -*.a filter=lfs diff=lfs merge=lfs -text -*.so filter=lfs diff=lfs merge=lfs -text -*.bin filter=lfs diff=lfs merge=lfs -text -*.dll filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index e5948eb..9f6d349 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,5 @@ -/product/phone/build -/product/pc/build -/common/build -/build/ -/features/batterycomponent/build/ -/features/datetimecomponent/build/ -/features/shortcutcomponent/build/ -/features/wallpapercomponent/build/ -/features/noticeitem/build/ -/features/screenlock/build/ +/node_modules +/local.properties /.idea -/.gradle -local.properties -tsconfig.json \ No newline at end of file +**/build +/features/**/build \ No newline at end of file diff --git a/AppScope/app.json5 b/AppScope/app.json5 new file mode 100644 index 0000000..7baec66 --- /dev/null +++ b/AppScope/app.json5 @@ -0,0 +1,15 @@ +{ + "app": { + "bundleName": "com.ohos.screenlock", + "vendor": "example", + "versionCode": 1000000, + "versionName": "1.0.0", + "icon": "$media:app_icon", + "label": "$string:app_name", + "distributedNotificationEnabled": true, + "singleton": true, + "keepAlive":true, + "minAPIVersion": 9, + "targetAPIVersion": 9 + } +} diff --git a/AppScope/resources/base/element/string.json b/AppScope/resources/base/element/string.json new file mode 100644 index 0000000..0b64049 --- /dev/null +++ b/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string": [ + { + "name": "app_name", + "value": "ScreenLock" + } + ] +} diff --git a/AppScope/resources/base/media/app_icon.png b/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c GIT binary patch literal 6790 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 { - if (!this.mSettingsHelper) { - Log.showError(TAG, `Can't get dataAbility helper.`); - return; - } - let timeString = settings.getValueSync(this.mSettingsHelper, TIME_FORMAT_KEY, "24"); - Log.showDebug(TAG, `timeFormat change: ${timeString}`); - this.mUse24hFormat = timeString == "24"; - this.notifyTimeChange(); - }; - try { this.mSettingsHelper.on("dataChange", settings.getUriSync(TIME_FORMAT_KEY), (err) => { if (err.code !== 0) { Log.showError(TAG, `failed to getAbilityWant, code: ${err.code}.`); return; } - handleTimeFormatChange(); }); } catch (e) { Log.showError(TAG, `Can't listen timeformate change.`); } - handleTimeFormatChange(); + this.handleTimeFormatChange(); } + private handleTimeFormatChange() { + Log.showInfo(TAG, "handleTimeFormatChange") + if (!this.mSettingsHelper) { + Log.showError(TAG, `Can't get dataAbility helper.`); + return; + } + let timeString = settings.getValueSync(this.mSettingsHelper, TIME_FORMAT_KEY, "24"); + Log.showDebug(TAG, `timeFormat change: ${timeString}`); + this.mUse24hFormat = timeString == "24"; + this.notifyTimeChange(); + }; + private notifyTimeChange() { Log.showInfo(TAG, "notifyTimeChange"); let args: TimeEventArgs = { diff --git a/common/src/main/module.json5 b/common/src/main/module.json5 new file mode 100644 index 0000000..064cd17 --- /dev/null +++ b/common/src/main/module.json5 @@ -0,0 +1,11 @@ +{ + "module": { + "name": "common", + "type": "har", + "deviceTypes": [ + "phone", + "tablet" + ], + "uiSyntax": "ets" + } +} diff --git a/entry/.gitignore b/entry/.gitignore index 7d5b7a9..4f9a973 100644 --- a/entry/.gitignore +++ b/entry/.gitignore @@ -1,2 +1,3 @@ -/build /node_modules +/.preview +/build \ No newline at end of file diff --git a/entry/build-profile.json5 b/entry/build-profile.json5 new file mode 100644 index 0000000..7dc37bb --- /dev/null +++ b/entry/build-profile.json5 @@ -0,0 +1,13 @@ +{ + "apiType": 'stageMode', + "buildOption": { + }, + "targets": [ + { + "name": "default", + }, + { + "name": "ohosTest", + } + ] +} \ No newline at end of file diff --git a/entry/build.gradle b/entry/build.gradle deleted file mode 100644 index 1b24503..0000000 --- a/entry/build.gradle +++ /dev/null @@ -1,22 +0,0 @@ -apply plugin: 'com.huawei.ohos.hap' -//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510 -ohos { - compileSdkVersion rootProject.ext.version.compileSdk - defaultConfig { - compatibleSdkVersion rootProject.ext.version.compatibleSdk - } - - - buildTypes { - release { - proguardOpt { - proguardEnabled false - rulesFiles 'proguard-rules.pro' - } - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) -} diff --git a/entry/hvigorfile.js b/entry/hvigorfile.js new file mode 100644 index 0000000..d7720ee --- /dev/null +++ b/entry/hvigorfile.js @@ -0,0 +1,2 @@ +// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. +module.exports = require('@ohos/hvigor-ohos-plugin').hapTasks diff --git a/entry/package-lock.json b/entry/package-lock.json new file mode 100644 index 0000000..15bc714 --- /dev/null +++ b/entry/package-lock.json @@ -0,0 +1,5 @@ +{ + "name": "entry", + "version": "1.0.0", + "lockfileVersion": 1 +} diff --git a/entry/package.json b/entry/package.json new file mode 100644 index 0000000..c7685ac --- /dev/null +++ b/entry/package.json @@ -0,0 +1,14 @@ +{ + "license": "ISC", + "devDependencies": {}, + "name": "entry", + "ohos": { + "org": "huawei", + "directoryLevel": "module", + "buildTool": "hvigor" + }, + "description": "example description", + "repository": {}, + "version": "1.0.0", + "dependencies": {} +} diff --git a/entry/proguard-rules.pro b/entry/proguard-rules.pro deleted file mode 100644 index f7666e4..0000000 --- a/entry/proguard-rules.pro +++ /dev/null @@ -1 +0,0 @@ -# config module specific ProGuard rules here. \ No newline at end of file diff --git a/entry/src/main/config.json b/entry/src/main/config.json deleted file mode 100644 index 1a9fe80..0000000 --- a/entry/src/main/config.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "app": { - "bundleName": "com.ohos.screenlock", - "vendor": "ohos", - "version": { - "code": 1000000, - "name": "1.0.0" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.ohos.screenlock", - "name": ".MyApplication", - "deviceType": [ - "phone","tablet" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": false - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "visible": true, - "name": "com.ohos.screenlock.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:entry_MainAbility", - "type": "page", - "launchType": "standard", - "srcPath": "MainAbility", - "srcLanguage": "ets" - } - ], - "js": [ - { - "mode": { - "syntax": "ets", - "type": "pageAbility" - }, - "pages": [ - "pages/index" - ], - "name": "MainAbility", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ], - "srcPath": "MainAbility" - } -} \ No newline at end of file diff --git a/entry/src/main/ets/AbilityStage.ts b/entry/src/main/ets/AbilityStage.ts deleted file mode 100644 index 037862f..0000000 --- a/entry/src/main/ets/AbilityStage.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 AbilityStage from "@ohos.application.AbilityStage" -import Log from '../../../../common/src/main/ets/default/Log' - -const TAG = "MainAbilityStage" - -export default class MainAbilityStage extends AbilityStage { - onCreate() { - Log.showInfo(TAG, "onCreate") - } -} \ No newline at end of file diff --git a/entry/src/main/ets/Application/AbilityStage.ts b/entry/src/main/ets/Application/AbilityStage.ts new file mode 100644 index 0000000..32dfe93 --- /dev/null +++ b/entry/src/main/ets/Application/AbilityStage.ts @@ -0,0 +1,7 @@ +import AbilityStage from "@ohos.application.AbilityStage" + +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.log("[Demo] MyAbilityStage onCreate") + } +} \ No newline at end of file diff --git a/entry/src/main/ets/MainAbility/MainAbility.ts b/entry/src/main/ets/MainAbility/MainAbility.ts index 6033b14..edb9130 100644 --- a/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,43 +1,34 @@ -/* - * 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 Ability from "@ohos.application.Ability" +import Ability from '@ohos.application.Ability' export default class MainAbility extends Ability { onCreate(want, launchParam) { - console.info('API8 A onCreate') - } - - onWindowStageCreate(windowStage) { - console.info('API8 A onWindowStageCreate') - windowStage.setUIContent(this.content, "pages/index", null) - } - - onForeground() { - console.info('API8 A onForeground') - } - - onBackground() { - console.info('API8 A onBackground') - } - - onWindowStageDestroy() { - console.info('API8 A onWindowStageDestroy') + console.log("[Demo] MainAbility onCreate") + globalThis.abilityWant = want; } onDestroy() { - console.info('API8 A onDestroy') + console.log("[Demo] MainAbility onDestroy") } -} \ No newline at end of file + + onWindowStageCreate(windowStage) { + // Main window is created, set main page for this ability + console.log("[Demo] MainAbility onWindowStageCreate") + + windowStage.setUIContent(this.context, "pages/index", null) + } + + onWindowStageDestroy() { + // Main window is destroyed, release UI related resources + console.log("[Demo] MainAbility onWindowStageDestroy") + } + + onForeground() { + // Ability has brought to foreground + console.log("[Demo] MainAbility onForeground") + } + + onBackground() { + // Ability has back to background + console.log("[Demo] MainAbility onBackground") + } +}; diff --git a/entry/src/main/ets/MainAbility/app.ets b/entry/src/main/ets/MainAbility/app.ets deleted file mode 100644 index cebf2a4..0000000 --- a/entry/src/main/ets/MainAbility/app.ets +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - */ - -export default { - onCreate() { - console.info('Application onCreate') - }, - onDestroy() { - console.info('Application onDestroy') - }, -} diff --git a/entry/src/main/ets/MainAbility/pages/index.ets b/entry/src/main/ets/MainAbility/pages/index.ets deleted file mode 100644 index 31a1320..0000000 --- a/entry/src/main/ets/MainAbility/pages/index.ets +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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. - */ - -@Entry -@Component -struct Index { - build() { - Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text('Hello World API8 A') - .fontSize(50) - .fontWeight(FontWeight.Bold) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/entry/src/main/ets/pages/index.ets b/entry/src/main/ets/pages/index.ets new file mode 100644 index 0000000..d6ca48c --- /dev/null +++ b/entry/src/main/ets/pages/index.ets @@ -0,0 +1,17 @@ +@Entry +@Component +struct Index { + @State message: string = 'Hello World' + + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + } + .width('100%') + } + .height('100%') + } +} \ No newline at end of file diff --git a/entry/src/main/module.json5 b/entry/src/main/module.json5 new file mode 100644 index 0000000..035cdc7 --- /dev/null +++ b/entry/src/main/module.json5 @@ -0,0 +1,37 @@ +{ + "module": { + "name": "entry", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:entry_desc", + "mainElement": "MainAbility", + "deviceTypes": [ + "phone", + "tablet" + ], + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:main_pages", + "uiSyntax": "ets", + "abilities": [ + { + "name": "MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:MainAbility_desc", + "icon": "$media:icon", + "label": "$string:MainAbility_label", + "visible": true, + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/entry/src/main/resources/base/element/string.json b/entry/src/main/resources/base/element/string.json index bc3df79..490210a 100644 --- a/entry/src/main/resources/base/element/string.json +++ b/entry/src/main/resources/base/element/string.json @@ -1,12 +1,16 @@ { "string": [ { - "name": "entry_MainAbility", - "value": "entry_MainAbility" + "name": "entry_desc", + "value": "description" }, { - "name": "mainability_description", - "value": "eTS_Empty Ability" + "name": "MainAbility_desc", + "value": "description" + }, + { + "name": "MainAbility_label", + "value": "label" } ] } \ No newline at end of file diff --git a/entry/src/main/resources/base/profile/main_pages.json b/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000..feec276 --- /dev/null +++ b/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,5 @@ +{ + "src": [ + "pages/index" + ] +} diff --git a/features/batterycomponent/.gitignore b/features/batterycomponent/.gitignore index 796b96d..4f9a973 100644 --- a/features/batterycomponent/.gitignore +++ b/features/batterycomponent/.gitignore @@ -1 +1,3 @@ -/build +/node_modules +/.preview +/build \ No newline at end of file diff --git a/features/batterycomponent/build-profile.json5 b/features/batterycomponent/build-profile.json5 new file mode 100644 index 0000000..35dff6d --- /dev/null +++ b/features/batterycomponent/build-profile.json5 @@ -0,0 +1,5 @@ +{ + "apiType": "stageMode", + "buildOption": { + } +} diff --git a/features/batterycomponent/build.gradle b/features/batterycomponent/build.gradle deleted file mode 100644 index e2d5bfb..0000000 --- a/features/batterycomponent/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -apply plugin: 'com.huawei.ohos.library' -ohos { - compileSdkVersion rootProject.ext.version.compileSdk - defaultConfig { - compatibleSdkVersion rootProject.ext.version.compatibleSdk - } - buildTypes { - release { - proguardOpt { - proguardEnabled false - rulesFiles 'proguard-rules.pro' - } - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) -} diff --git a/features/batterycomponent/hvigorfile.js b/features/batterycomponent/hvigorfile.js new file mode 100644 index 0000000..42ed4b4 --- /dev/null +++ b/features/batterycomponent/hvigorfile.js @@ -0,0 +1,3 @@ +// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. +module.exports = require('@ohos/hvigor-ohos-plugin').harTasks + diff --git a/features/batterycomponent/index.ets b/features/batterycomponent/index.ets new file mode 100644 index 0000000..1bb64ac --- /dev/null +++ b/features/batterycomponent/index.ets @@ -0,0 +1 @@ +export { MainPage } from './src/main/ets/components/MainPage/MainPage' diff --git a/features/batterycomponent/package-lock.json b/features/batterycomponent/package-lock.json new file mode 100644 index 0000000..ab0b889 --- /dev/null +++ b/features/batterycomponent/package-lock.json @@ -0,0 +1,5 @@ +{ + "name": "@ohos/batterycomponent", + "version": "1.0.0", + "lockfileVersion": 1 +} diff --git a/features/batterycomponent/package.json b/features/batterycomponent/package.json new file mode 100644 index 0000000..62c24fe --- /dev/null +++ b/features/batterycomponent/package.json @@ -0,0 +1,14 @@ +{ + "license": "ISC", + "types": "", + "devDependencies": {}, + "name": "@ohos/batterycomponent", + "description": "a npm package which contains arkUI2.0 page", + "ohos": { + "org": "" + }, + "main": "index.ets", + "repository": {}, + "version": "1.0.0", + "dependencies": {} +} diff --git a/features/batterycomponent/src/main/config.json b/features/batterycomponent/src/main/config.json deleted file mode 100644 index bf82fe6..0000000 --- a/features/batterycomponent/src/main/config.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "app": { - "bundleName": "com.ohos.systemui", - "vendor": "ohos", - "version": { - "code": 1000000, - "name": "1.0.0" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.ohos.systemui.batterycomponent", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "batterycomponent", - "moduleType": "har" - }, - "srcPath": "default" - } -} \ No newline at end of file diff --git a/features/batterycomponent/src/main/ets/components/MainPage/MainPage.ets b/features/batterycomponent/src/main/ets/components/MainPage/MainPage.ets new file mode 100644 index 0000000..0f54030 --- /dev/null +++ b/features/batterycomponent/src/main/ets/components/MainPage/MainPage.ets @@ -0,0 +1,17 @@ +@Entry +@Component +export struct MainPage { + @State message: string = 'Hello World' + + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + } + .width('100%') + } + .height('100%') + } +} diff --git a/features/batterycomponent/src/main/ets/default/app.ets b/features/batterycomponent/src/main/ets/default/app.ets deleted file mode 100644 index 2a3b623..0000000 --- a/features/batterycomponent/src/main/ets/default/app.ets +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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') - }, -} diff --git a/features/batterycomponent/src/main/module.json5 b/features/batterycomponent/src/main/module.json5 new file mode 100644 index 0000000..50dd6ba --- /dev/null +++ b/features/batterycomponent/src/main/module.json5 @@ -0,0 +1,11 @@ +{ + "module": { + "name": "batterycomponent", + "type": "har", + "deviceTypes": [ + "phone", + "tablet" + ], + "uiSyntax": "ets" + } +} diff --git a/features/clockcomponent/.gitignore b/features/clockcomponent/.gitignore index c795b05..4f9a973 100644 --- a/features/clockcomponent/.gitignore +++ b/features/clockcomponent/.gitignore @@ -1 +1,3 @@ -build \ No newline at end of file +/node_modules +/.preview +/build \ No newline at end of file diff --git a/features/clockcomponent/build-profile.json5 b/features/clockcomponent/build-profile.json5 new file mode 100644 index 0000000..35dff6d --- /dev/null +++ b/features/clockcomponent/build-profile.json5 @@ -0,0 +1,5 @@ +{ + "apiType": "stageMode", + "buildOption": { + } +} diff --git a/features/clockcomponent/build.gradle b/features/clockcomponent/build.gradle deleted file mode 100644 index ae402d9..0000000 --- a/features/clockcomponent/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -apply plugin: 'com.huawei.ohos.library' -ohos { - compileSdkVersion rootProject.ext.version.compileSdk - defaultConfig { - compatibleSdkVersion rootProject.ext.version.compatibleSdk - } - buildTypes { - release { - proguardOpt { - proguardEnabled false - rulesFiles 'proguard-rules.pro' - } - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) -} \ No newline at end of file diff --git a/features/clockcomponent/hvigorfile.js b/features/clockcomponent/hvigorfile.js new file mode 100644 index 0000000..42ed4b4 --- /dev/null +++ b/features/clockcomponent/hvigorfile.js @@ -0,0 +1,3 @@ +// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. +module.exports = require('@ohos/hvigor-ohos-plugin').harTasks + diff --git a/features/clockcomponent/index.ets b/features/clockcomponent/index.ets new file mode 100644 index 0000000..1bb64ac --- /dev/null +++ b/features/clockcomponent/index.ets @@ -0,0 +1 @@ +export { MainPage } from './src/main/ets/components/MainPage/MainPage' diff --git a/features/clockcomponent/package-lock.json b/features/clockcomponent/package-lock.json new file mode 100644 index 0000000..f5ba259 --- /dev/null +++ b/features/clockcomponent/package-lock.json @@ -0,0 +1,5 @@ +{ + "name": "@ohos/clockcomponent", + "version": "1.0.0", + "lockfileVersion": 1 +} diff --git a/features/clockcomponent/package.json b/features/clockcomponent/package.json new file mode 100644 index 0000000..57bd9d7 --- /dev/null +++ b/features/clockcomponent/package.json @@ -0,0 +1,14 @@ +{ + "license": "ISC", + "types": "", + "devDependencies": {}, + "name": "@ohos/clockcomponent", + "description": "a npm package which contains arkUI2.0 page", + "ohos": { + "org": "" + }, + "main": "index.ets", + "repository": {}, + "version": "1.0.0", + "dependencies": {} +} diff --git a/features/clockcomponent/src/main/config.json b/features/clockcomponent/src/main/config.json deleted file mode 100644 index 4d32478..0000000 --- a/features/clockcomponent/src/main/config.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "app": { - "bundleName": "com.ohos.systemui", - "vendor": "ohos", - "version": { - "code": 1000000, - "name": "1.0.0" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.ohos.systemui.clockcomponent", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "clockcomponent", - "moduleType": "har" - }, - "srcPath": "default" - } -} \ No newline at end of file diff --git a/features/clockcomponent/src/main/ets/components/MainPage/MainPage.ets b/features/clockcomponent/src/main/ets/components/MainPage/MainPage.ets new file mode 100644 index 0000000..0f54030 --- /dev/null +++ b/features/clockcomponent/src/main/ets/components/MainPage/MainPage.ets @@ -0,0 +1,17 @@ +@Entry +@Component +export struct MainPage { + @State message: string = 'Hello World' + + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + } + .width('100%') + } + .height('100%') + } +} diff --git a/features/clockcomponent/src/main/ets/default/pages/clockIcon.ets b/features/clockcomponent/src/main/ets/default/pages/clockIcon.ets index b864ea8..b95ad4d 100644 --- a/features/clockcomponent/src/main/ets/default/pages/clockIcon.ets +++ b/features/clockcomponent/src/main/ets/default/pages/clockIcon.ets @@ -14,7 +14,7 @@ */ import Log from '../../../../../../../common/src/main/ets/default/Log' -import StyleConfiguration from '../common/StyleConfiguration' +import StyleConfiguration from '../common/styleconfiguration' import StyleConfigurationCommon from '../../../../../../../common/src/main/ets/default/StyleConfiguration' import {StatusBarGroupComponentData} from '../../../../../../screenlock/src/main/ets/com/ohos/common/Constants' import StatusBarVM from '../../../../../../screenlock/src/main/ets/com/ohos/vm/StatusBarVM' diff --git a/features/clockcomponent/src/main/module.json5 b/features/clockcomponent/src/main/module.json5 new file mode 100644 index 0000000..a68c71e --- /dev/null +++ b/features/clockcomponent/src/main/module.json5 @@ -0,0 +1,11 @@ +{ + "module": { + "name": "clockcomponent", + "type": "har", + "deviceTypes": [ + "phone", + "tablet" + ], + "uiSyntax": "ets" + } +} diff --git a/features/datetimecomponent/.gitignore b/features/datetimecomponent/.gitignore new file mode 100644 index 0000000..4f9a973 --- /dev/null +++ b/features/datetimecomponent/.gitignore @@ -0,0 +1,3 @@ +/node_modules +/.preview +/build \ No newline at end of file diff --git a/features/datetimecomponent/build-profile.json5 b/features/datetimecomponent/build-profile.json5 new file mode 100644 index 0000000..35dff6d --- /dev/null +++ b/features/datetimecomponent/build-profile.json5 @@ -0,0 +1,5 @@ +{ + "apiType": "stageMode", + "buildOption": { + } +} diff --git a/features/datetimecomponent/build.gradle b/features/datetimecomponent/build.gradle deleted file mode 100644 index 390462f..0000000 --- a/features/datetimecomponent/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -apply plugin: 'com.huawei.ohos.library' -//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510 -ohos { - compileSdkVersion rootProject.ext.version.compileSdk - defaultConfig { - compatibleSdkVersion rootProject.ext.version.compatibleSdk - } - buildTypes { - release { - proguardOpt { - proguardEnabled false - rulesFiles 'proguard-rules.pro' - } - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) - implementation project(':common') -} diff --git a/features/datetimecomponent/hvigorfile.js b/features/datetimecomponent/hvigorfile.js new file mode 100644 index 0000000..42ed4b4 --- /dev/null +++ b/features/datetimecomponent/hvigorfile.js @@ -0,0 +1,3 @@ +// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. +module.exports = require('@ohos/hvigor-ohos-plugin').harTasks + diff --git a/features/datetimecomponent/index.ets b/features/datetimecomponent/index.ets new file mode 100644 index 0000000..1bb64ac --- /dev/null +++ b/features/datetimecomponent/index.ets @@ -0,0 +1 @@ +export { MainPage } from './src/main/ets/components/MainPage/MainPage' diff --git a/features/datetimecomponent/package-lock.json b/features/datetimecomponent/package-lock.json new file mode 100644 index 0000000..113177a --- /dev/null +++ b/features/datetimecomponent/package-lock.json @@ -0,0 +1,5 @@ +{ + "name": "@ohos/datetimecomponent", + "version": "1.0.0", + "lockfileVersion": 1 +} diff --git a/features/datetimecomponent/package.json b/features/datetimecomponent/package.json new file mode 100644 index 0000000..7dce3cb --- /dev/null +++ b/features/datetimecomponent/package.json @@ -0,0 +1,14 @@ +{ + "license": "ISC", + "types": "", + "devDependencies": {}, + "name": "@ohos/datetimecomponent", + "description": "a npm package which contains arkUI2.0 page", + "ohos": { + "org": "" + }, + "main": "index.ets", + "repository": {}, + "version": "1.0.0", + "dependencies": {} +} diff --git a/features/datetimecomponent/src/main/config.json b/features/datetimecomponent/src/main/config.json deleted file mode 100644 index 7addd44..0000000 --- a/features/datetimecomponent/src/main/config.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "app": { - "bundleName": "com.ohos.screenlock", - "vendor": "ohos", - "version": { - "code": 1000000, - "name": "1.0.0" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.ohos.screenlock.datetimecomponent", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "datetimecomponent", - "moduleType": "har" - }, - "srcPath": "default" - } -} \ No newline at end of file diff --git a/features/datetimecomponent/src/main/ets/com/ohos/vm/dateTimeViewModel.ts b/features/datetimecomponent/src/main/ets/com/ohos/vm/dateTimeViewModel.ts index e1582d1..f885a79 100644 --- a/features/datetimecomponent/src/main/ets/com/ohos/vm/dateTimeViewModel.ts +++ b/features/datetimecomponent/src/main/ets/com/ohos/vm/dateTimeViewModel.ts @@ -46,17 +46,22 @@ export default class DateTimeViewModel { ViewModelInit(): void{ Log.showInfo(TAG, 'ViewModelInit'); - this.setDateTime.bind(this)() + this.getAndSetDateTime.bind(this)() commonEvent.createSubscriber(mCommonEventSubscribeInfo, this.createSubscriberCallBack.bind(this)); this.unSubscriber = EventManager.subscribe(TIME_CHANGE_EVENT, (args: TimeEventArgs) => { - this.setDateTime() + this.setDateTime(args.date) }); Log.showInfo(TAG, 'ViewModelInit end'); } - private setDateTime() { + private getAndSetDateTime() { + Log.showInfo(TAG, `getAndSetDateTime`) + this.setDateTime(new Date()) + } + + private setDateTime(date: Date) { Log.showInfo(TAG, `setDateTime`) - this.timeVal = sTimeManager.formatTime(new Date()) + this.timeVal = sTimeManager.formatTime(date) this.dateVal = DateTimeCommon.getSystemDate() this.weekVal = DateTimeCommon.getSystemWeek() } @@ -64,7 +69,7 @@ export default class DateTimeViewModel { private createSubscriberCallBack(err, data) { Log.showInfo(TAG, "start createSubscriberCallBack " + JSON.stringify(data)) mEventSubscriber = data - commonEvent.subscribe(data, this.setDateTime.bind(this)); + commonEvent.subscribe(data, this.getAndSetDateTime.bind(this)); Log.showInfo(TAG, "start createSubscriberCallBack finish") } diff --git a/features/datetimecomponent/src/main/ets/components/MainPage/MainPage.ets b/features/datetimecomponent/src/main/ets/components/MainPage/MainPage.ets new file mode 100644 index 0000000..0f54030 --- /dev/null +++ b/features/datetimecomponent/src/main/ets/components/MainPage/MainPage.ets @@ -0,0 +1,17 @@ +@Entry +@Component +export struct MainPage { + @State message: string = 'Hello World' + + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + } + .width('100%') + } + .height('100%') + } +} diff --git a/features/datetimecomponent/src/main/module.json5 b/features/datetimecomponent/src/main/module.json5 new file mode 100644 index 0000000..ae47cb1 --- /dev/null +++ b/features/datetimecomponent/src/main/module.json5 @@ -0,0 +1,11 @@ +{ + "module": { + "name": "datetimecomponent", + "type": "har", + "deviceTypes": [ + "phone", + "tablet" + ], + "uiSyntax": "ets" + } +} diff --git a/features/noticeitem/.gitignore b/features/noticeitem/.gitignore new file mode 100644 index 0000000..4f9a973 --- /dev/null +++ b/features/noticeitem/.gitignore @@ -0,0 +1,3 @@ +/node_modules +/.preview +/build \ No newline at end of file diff --git a/features/noticeitem/build-profile.json5 b/features/noticeitem/build-profile.json5 new file mode 100644 index 0000000..35dff6d --- /dev/null +++ b/features/noticeitem/build-profile.json5 @@ -0,0 +1,5 @@ +{ + "apiType": "stageMode", + "buildOption": { + } +} diff --git a/features/noticeitem/build.gradle b/features/noticeitem/build.gradle deleted file mode 100644 index ae402d9..0000000 --- a/features/noticeitem/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -apply plugin: 'com.huawei.ohos.library' -ohos { - compileSdkVersion rootProject.ext.version.compileSdk - defaultConfig { - compatibleSdkVersion rootProject.ext.version.compatibleSdk - } - buildTypes { - release { - proguardOpt { - proguardEnabled false - rulesFiles 'proguard-rules.pro' - } - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) -} \ No newline at end of file diff --git a/features/noticeitem/hvigorfile.js b/features/noticeitem/hvigorfile.js new file mode 100644 index 0000000..42ed4b4 --- /dev/null +++ b/features/noticeitem/hvigorfile.js @@ -0,0 +1,3 @@ +// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. +module.exports = require('@ohos/hvigor-ohos-plugin').harTasks + diff --git a/features/noticeitem/index.ets b/features/noticeitem/index.ets new file mode 100644 index 0000000..1bb64ac --- /dev/null +++ b/features/noticeitem/index.ets @@ -0,0 +1 @@ +export { MainPage } from './src/main/ets/components/MainPage/MainPage' diff --git a/features/noticeitem/package-lock.json b/features/noticeitem/package-lock.json new file mode 100644 index 0000000..331b59a --- /dev/null +++ b/features/noticeitem/package-lock.json @@ -0,0 +1,5 @@ +{ + "name": "@ohos/noticeitem", + "version": "1.0.0", + "lockfileVersion": 1 +} diff --git a/features/noticeitem/package.json b/features/noticeitem/package.json new file mode 100644 index 0000000..01d0d82 --- /dev/null +++ b/features/noticeitem/package.json @@ -0,0 +1,14 @@ +{ + "license": "ISC", + "types": "", + "devDependencies": {}, + "name": "@ohos/noticeitem", + "description": "a npm package which contains arkUI2.0 page", + "ohos": { + "org": "" + }, + "main": "index.ets", + "repository": {}, + "version": "1.0.0", + "dependencies": {} +} diff --git a/features/noticeitem/src/main/config.json b/features/noticeitem/src/main/config.json deleted file mode 100644 index 9d4eb9e..0000000 --- a/features/noticeitem/src/main/config.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "app": { - "bundleName": "com.ohos.systemui", - "vendor": "ohos", - "version": { - "code": 1000000, - "name": "1.0.0" - } - }, - "deviceConfig": { - }, - "module": { - "package": "com.ohos.noticeItem", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "noticeitem", - "moduleType": "har" - }, - "srcPath": "default" - } -} \ No newline at end of file diff --git a/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/confirmDialog.ets b/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/confirmDialog.ets index 782d3fe..3b64ac3 100644 --- a/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/confirmDialog.ets +++ b/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/confirmDialog.ets @@ -23,7 +23,7 @@ const TAG = 'NoticeItem-Confirm'; */ @CustomDialog export default struct ConfirmDialog { - private title: string + private title: string | Resource private bundleName: string public controller: CustomDialogController public action: () => void diff --git a/features/noticeitem/src/main/ets/components/MainPage/MainPage.ets b/features/noticeitem/src/main/ets/components/MainPage/MainPage.ets new file mode 100644 index 0000000..0f54030 --- /dev/null +++ b/features/noticeitem/src/main/ets/components/MainPage/MainPage.ets @@ -0,0 +1,17 @@ +@Entry +@Component +export struct MainPage { + @State message: string = 'Hello World' + + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + } + .width('100%') + } + .height('100%') + } +} diff --git a/features/noticeitem/src/main/module.json5 b/features/noticeitem/src/main/module.json5 new file mode 100644 index 0000000..3a02970 --- /dev/null +++ b/features/noticeitem/src/main/module.json5 @@ -0,0 +1,11 @@ +{ + "module": { + "name": "noticeitem", + "type": "har", + "deviceTypes": [ + "phone", + "tablet" + ], + "uiSyntax": "ets" + } +} diff --git a/features/screenlock/.gitignore b/features/screenlock/.gitignore new file mode 100644 index 0000000..4f9a973 --- /dev/null +++ b/features/screenlock/.gitignore @@ -0,0 +1,3 @@ +/node_modules +/.preview +/build \ No newline at end of file diff --git a/features/screenlock/build-profile.json5 b/features/screenlock/build-profile.json5 new file mode 100644 index 0000000..35dff6d --- /dev/null +++ b/features/screenlock/build-profile.json5 @@ -0,0 +1,5 @@ +{ + "apiType": "stageMode", + "buildOption": { + } +} diff --git a/features/screenlock/build.gradle b/features/screenlock/build.gradle deleted file mode 100644 index 21f9ef7..0000000 --- a/features/screenlock/build.gradle +++ /dev/null @@ -1,26 +0,0 @@ -apply plugin: 'com.huawei.ohos.library' -//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510 -ohos { - compileSdkVersion rootProject.ext.version.compileSdk - defaultConfig { - compatibleSdkVersion rootProject.ext.version.compatibleSdk - } - buildTypes { - release { - proguardOpt { - proguardEnabled false - rulesFiles 'proguard-rules.pro' - } - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) - implementation project(':common') - implementation project(':features:batterycomponent') - implementation project(':features:clockcomponent') - implementation project(':features:wificomponent') - implementation project(':features:signalcomponent') - -} diff --git a/features/screenlock/hvigorfile.js b/features/screenlock/hvigorfile.js new file mode 100644 index 0000000..42ed4b4 --- /dev/null +++ b/features/screenlock/hvigorfile.js @@ -0,0 +1,3 @@ +// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. +module.exports = require('@ohos/hvigor-ohos-plugin').harTasks + diff --git a/features/screenlock/index.ets b/features/screenlock/index.ets new file mode 100644 index 0000000..1bb64ac --- /dev/null +++ b/features/screenlock/index.ets @@ -0,0 +1 @@ +export { MainPage } from './src/main/ets/components/MainPage/MainPage' diff --git a/features/screenlock/package-lock.json b/features/screenlock/package-lock.json new file mode 100644 index 0000000..f026727 --- /dev/null +++ b/features/screenlock/package-lock.json @@ -0,0 +1,5 @@ +{ + "name": "@ohos/screenlock", + "version": "1.0.0", + "lockfileVersion": 1 +} diff --git a/features/screenlock/package.json b/features/screenlock/package.json new file mode 100644 index 0000000..9374c48 --- /dev/null +++ b/features/screenlock/package.json @@ -0,0 +1,14 @@ +{ + "license": "ISC", + "types": "", + "devDependencies": {}, + "name": "@ohos/screenlock", + "description": "a npm package which contains arkUI2.0 page", + "ohos": { + "org": "" + }, + "main": "index.ets", + "repository": {}, + "version": "1.0.0", + "dependencies": {} +} diff --git a/features/screenlock/src/main/config.json b/features/screenlock/src/main/config.json deleted file mode 100644 index 22f124f..0000000 --- a/features/screenlock/src/main/config.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "app": { - "bundleName": "com.ohos.screenlock", - "vendor": "ohos", - "version": { - "code": 1000000, - "name": "1.0.0" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.ohos.screenlock", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "screenlock", - "moduleType": "har" - }, - "srcPath": "default" - } -} \ No newline at end of file diff --git a/features/screenlock/src/main/ets/com/ohos/common/constants.ets b/features/screenlock/src/main/ets/com/ohos/common/constants.ets deleted file mode 100644 index 540a56c..0000000 --- a/features/screenlock/src/main/ets/com/ohos/common/constants.ets +++ /dev/null @@ -1,70 +0,0 @@ -/* - * 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 class Constants { - static WIN_NAME = "ScreenLockWindow" - - //Shortcut params - static SHORTCUT_CIRCLE_WIDTH = '80px' - static SHORTCUT_CIRCLE_HEIGHT = '80px' - static SHORTCUT_TEXT_SIZE = '24px' - static SHORTCUT_TEXT_WIDTH = '48px' - static SHORTCUT_TEXT_HEIGHT = '34px' - static SHORTCUT_BLOCK_HEIGHT = '10px' - static SHORTCUT_HEIGHT = '150px' - - //layout params - Pic - static FULL_CONTAINER_WIDTH = '100%' - static FULL_CONTAINER_HEIGHT = '100%' - static HALF_CONTAINER_WIDTH = '50%' - - //The refresh interval - static INTERVAL = 1000 - - //digitalpssword mask diameter - static DIGITALPSD_IC_DIAMETER = 12 - - //digitalpssword keybord background diameter - static DIGITALPSD_BUTTON_DIAMETER = 60 - - //digitalpssword keybord background diameter - static DIGITALPSD_BUTTON_RECT_WH = 100 - static DIGITALPSD_BUTTON_RECT_HH = 50 - - //digital keybord - static CALL_PHONE = -1 - static DEL_PWD = -2 - static GO_BACK = -3 - static NUMKEY_BOARD = [{index: 0, row1: '1', row2: ' ', value: 1, bkg: false}, - {index: 1, row1: '2', row2: 'ABC', value: 2, bkg: false}, - {index: 2, row1: '3', row2: 'DEF', value: 3, bkg: false}, - {index: 3, row1: '4', row2: 'GHI', value: 4, bkg: false}, - {index: 4, row1: '5', row2: 'JKL', value: 5, bkg: false}, - {index: 5, row1: '6', row2: 'MNO', value: 6, bkg: false}, - {index: 6, row1: '7', row2: 'PQRS', value: 7, bkg: false}, - {index: 7, row1: '8', row2: 'TUV', value: 8, bkg: false}, - {index: 8, row1: '9', row2: 'WXYZ', value: 9, bkg: false}, - {index: 9, row1: $r('app.string.emergency_call'), row2: '', value: Constants.CALL_PHONE, bkg: false}, - {index: 10,row1: '0', row2: '+', value: 0, bkg: false}, - {index: 11,row1: $r('app.string.back'), row2: '', value: Constants.GO_BACK, bkg: false}]; - //max password length - static PASSWORD_MAX_LEN = 32 - - static ACCOUNT_SPACE = 24 -} -export class StatusBarGroupComponentData { - backgroundColor: string = "#00000000"; - contentColor: string = "#FFFFFFFF"; -} \ No newline at end of file diff --git a/features/screenlock/src/main/ets/com/ohos/common/constants.ts b/features/screenlock/src/main/ets/com/ohos/common/constants.ts new file mode 100644 index 0000000..2d9e687 --- /dev/null +++ b/features/screenlock/src/main/ets/com/ohos/common/constants.ts @@ -0,0 +1,142 @@ +/* + * 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 class Constants { + static WIN_NAME = "ScreenLockWindow" + + //Shortcut params + static SHORTCUT_CIRCLE_WIDTH = '80px' + static SHORTCUT_CIRCLE_HEIGHT = '80px' + static SHORTCUT_TEXT_SIZE = '24px' + static SHORTCUT_TEXT_WIDTH = '48px' + static SHORTCUT_TEXT_HEIGHT = '34px' + static SHORTCUT_BLOCK_HEIGHT = '10px' + static SHORTCUT_HEIGHT = '150px' + + //layout params - Pic + static FULL_CONTAINER_WIDTH = '100%' + static FULL_CONTAINER_HEIGHT = '100%' + static HALF_CONTAINER_WIDTH = '50%' + + //The refresh interval + static INTERVAL = 1000 + + //digitalpssword mask diameter + static DIGITALPSD_IC_DIAMETER = 12 + + //digitalpssword keybord background diameter + static DIGITALPSD_BUTTON_DIAMETER = 60 + + //digitalpssword keybord background diameter + static DIGITALPSD_BUTTON_RECT_WH = 100 + static DIGITALPSD_BUTTON_RECT_HH = 50 + + //digital keybord + static CALL_PHONE = -1 + static DEL_PWD = -2 + static GO_BACK = -3 + static NUMKEY_BOARD = [{ + index: 0, + row1: '1', + row2: ' ', + value: 1, + bkg: false + }, + { + index: 1, + row1: '2', + row2: 'ABC', + value: 2, + bkg: false + }, + { + index: 2, + row1: '3', + row2: 'DEF', + value: 3, + bkg: false + }, + { + index: 3, + row1: '4', + row2: 'GHI', + value: 4, + bkg: false + }, + { + index: 4, + row1: '5', + row2: 'JKL', + value: 5, + bkg: false + }, + { + index: 5, + row1: '6', + row2: 'MNO', + value: 6, + bkg: false + }, + { + index: 6, + row1: '7', + row2: 'PQRS', + value: 7, + bkg: false + }, + { + index: 7, + row1: '8', + row2: 'TUV', + value: 8, + bkg: false + }, + { + index: 8, + row1: '9', + row2: 'WXYZ', + value: 9, + bkg: false + }, + { + index: 9, + row1: $r('app.string.emergency_call'), + row2: '', + value: Constants.CALL_PHONE, + bkg: false + }, + { + index: 10, + row1: '0', + row2: '+', + value: 0, + bkg: false + }, + { + index: 11, + row1: $r('app.string.back'), + row2: '', + value: Constants.GO_BACK, + bkg: false + }]; + //max password length + static PASSWORD_MAX_LEN = 32 + static ACCOUNT_SPACE = 24 +} + +export class StatusBarGroupComponentData { + backgroundColor: string = "#00000000"; + contentColor: string = "#FFFFFFFF"; +} \ No newline at end of file diff --git a/features/screenlock/src/main/ets/com/ohos/model/screenLockModel.ts b/features/screenlock/src/main/ets/com/ohos/model/screenLockModel.ts index 940f906..a64f314 100644 --- a/features/screenlock/src/main/ets/com/ohos/model/screenLockModel.ts +++ b/features/screenlock/src/main/ets/com/ohos/model/screenLockModel.ts @@ -21,20 +21,32 @@ import { Callback } from 'basic'; const TAG = 'ScreenLock-ScreenLockModel'; export default class ScreenLockModel { - eventListener(typeName: string, callback:Callback) { + eventListener(typeName: string, callback: Callback) { Log.showInfo(TAG, `eventListener:typeName ${typeName}`); - ScreenLockMar.on(typeName, (err, data) => { - Log.showInfo(TAG, `eventListener:callback err:${JSON.stringify(err)} data:${JSON.stringify(data)}`); - callback(); - }) + switch (typeName) { + case "endScreenOn": + case "unlockScreen": + ScreenLockMar.on(typeName, () => { + Log.showInfo(TAG, `eventListener:callback`); + callback(); + }) + break; + case "beginSleep": + ScreenLockMar.on(typeName, (userId: number) => { + Log.showInfo(TAG, `eventListener:callback userId:${userId}`); + callback(); + }) + break; + default: + Log.showError(TAG, `eventListener:typeName ${typeName}`) + } + Log.showInfo(TAG, `eventListener:typeName ${typeName} finish`); } eventCancelListener(typeName: string) { Log.showInfo(TAG, `eventCancleListener:typeName ${typeName}`); - ScreenLockMar.off(typeName, (err, data) => { - Log.showInfo(TAG, `eventCancleListener:callback err:${JSON.stringify(err)} data:${JSON.stringify(data)}`); - }) + // As off has some problem and there is no case to cancel, do nothing } sendScreenLockEvent(typeName: string, typeNo: number, callback) { @@ -45,7 +57,7 @@ export default class ScreenLockModel { }) } - showScreenLockWindow(callback:Callback) { + showScreenLockWindow(callback: Callback) { Log.showInfo(TAG, 'showScreenLockWindow'); windowManager.find(Constants.WIN_NAME).then((win) => { Log.showInfo(TAG, 'find window finish'); @@ -56,7 +68,7 @@ export default class ScreenLockModel { }) } - hiddenScreenLockWindow(callback:Callback) { + hiddenScreenLockWindow(callback: Callback) { Log.showInfo(TAG, 'hiddenScreenLockWindow'); windowManager.find(Constants.WIN_NAME).then((win) => { Log.showInfo(TAG, 'find window finish'); diff --git a/features/screenlock/src/main/ets/com/ohos/model/screenLockService.ts b/features/screenlock/src/main/ets/com/ohos/model/screenLockService.ts index cde1069..8cb3a5b 100644 --- a/features/screenlock/src/main/ets/com/ohos/model/screenLockService.ts +++ b/features/screenlock/src/main/ets/com/ohos/model/screenLockService.ts @@ -294,7 +294,6 @@ export class ScreenLockService { destroy() { this.screenLockModel.eventCancelListener(EVENT_END_SCREEN_ON); this.screenLockModel.eventCancelListener(EVENT_BEGIN_SLEEP); - this.screenLockModel.eventCancelListener(EVENT_CHANGE_USER); this.screenLockModel.eventCancelListener(EVENT_UNLOCK_SCREEN); this.accountModel.eventCancelListener(ACTIVATING_TYPE, ACTIVATING_EVENT); this.accountModel.eventCancelListener(ACTIVATE_TYPE, ACTIVATE_EVENT) diff --git a/features/screenlock/src/main/ets/com/ohos/view/component/customPSD.ets b/features/screenlock/src/main/ets/com/ohos/view/component/customPSD.ets index 92d6d4a..104f9e3 100644 --- a/features/screenlock/src/main/ets/com/ohos/view/component/customPSD.ets +++ b/features/screenlock/src/main/ets/com/ohos/view/component/customPSD.ets @@ -15,8 +15,8 @@ import Log from '../../../../../../../../../common/src/main/ets/default/Log' import Constants from '../../common/constants' -import NumkeyBoard from './numkeyBoard.ets' -import ViewModel , {AuthType} from '../../vm/customPSDViewModel' +import NumkeyBoard from './numkeyBoard' +import ViewModel from '../../vm/customPSDViewModel' const TAG = 'ScreenLock-CustomPSD' @@ -27,7 +27,7 @@ export default struct CustomPSD { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear`) - this.mViewModel.checkFreezingTime(AuthType.PIN, (data) => { + this.mViewModel.checkFreezingTime(() => { Log.showInfo(TAG, `onClick callback is called`) }); } diff --git a/features/screenlock/src/main/ets/com/ohos/view/component/digitalPSD.ets b/features/screenlock/src/main/ets/com/ohos/view/component/digitalPSD.ets index 1bf5b53..3ad9389 100644 --- a/features/screenlock/src/main/ets/com/ohos/view/component/digitalPSD.ets +++ b/features/screenlock/src/main/ets/com/ohos/view/component/digitalPSD.ets @@ -15,8 +15,8 @@ import Log from '../../../../../../../../../common/src/main/ets/default/Log' import Constants from '../../common/constants' -import NumkeyBoard from './numkeyBoard.ets' -import ViewModel, {AuthType} from '../../vm/digitalPSDViewModel' +import NumkeyBoard from './numkeyBoard' +import ViewModel from '../../vm/digitalPSDViewModel' const TAG = 'ScreenLock-DigitalPSD' @@ -27,7 +27,7 @@ export default struct DigitalPSD { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear`) - this.mViewModel.checkFreezingTime(AuthType.PIN, (data) => { + this.mViewModel.checkFreezingTime(() => { Log.showInfo(TAG, `onClick callback is called`) }); } diff --git a/features/screenlock/src/main/ets/com/ohos/view/component/mixedPSD.ets b/features/screenlock/src/main/ets/com/ohos/view/component/mixedPSD.ets index 82c77c5..82bd579 100644 --- a/features/screenlock/src/main/ets/com/ohos/view/component/mixedPSD.ets +++ b/features/screenlock/src/main/ets/com/ohos/view/component/mixedPSD.ets @@ -15,7 +15,7 @@ import Log from '../../../../../../../../../common/src/main/ets/default/Log' import Constants from '../../common/constants' -import ViewModel, {AuthType}from '../../vm/mixedPSDViewModel' +import ViewModel from '../../vm/mixedPSDViewModel' const TAG = 'ScreenLock-MixedPSD' @@ -25,7 +25,7 @@ export default struct MixedPSD { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear`) - this.mViewModel.checkFreezingTime(AuthType.PIN, (data) => { + this.mViewModel.checkFreezingTime(() => { Log.showInfo(TAG, `onClick callback is called`) }); } diff --git a/features/screenlock/src/main/ets/com/ohos/view/component/numkeyBoard.ets b/features/screenlock/src/main/ets/com/ohos/view/component/numkeyBoard.ets index 0d87aa7..d94dbd1 100644 --- a/features/screenlock/src/main/ets/com/ohos/view/component/numkeyBoard.ets +++ b/features/screenlock/src/main/ets/com/ohos/view/component/numkeyBoard.ets @@ -100,7 +100,7 @@ export default struct NumkeyBoard { } .onClick(() => { Log.showInfo(TAG, `onClick:${item.index}`) - setTimeout(this.onKeypress.bind(this), 0, item.index, (data) => { + setTimeout(this.onKeypress.bind(this), 0, item.index, () => { Log.showInfo(TAG, `onClick callback is called`) }); }) diff --git a/features/screenlock/src/main/ets/com/ohos/vm/baseViewModel.ts b/features/screenlock/src/main/ets/com/ohos/vm/baseViewModel.ts index 3018195..5cc35b7 100644 --- a/features/screenlock/src/main/ets/com/ohos/vm/baseViewModel.ts +++ b/features/screenlock/src/main/ets/com/ohos/vm/baseViewModel.ts @@ -16,6 +16,7 @@ import Log from '../../../../../../../../common/src/main/ets/default/Log' import Constants from '../common/constants' import service, {UnlockResult, AuthType, AuthSubType} from '../model/screenLockService' +import {Callback} from 'basic'; const TAG = 'ScreenLock-BaseViewModel' const MINUTE_NM = '分钟' @@ -27,8 +28,6 @@ export {service, UnlockResult, AuthType, AuthSubType} export default class BaseViewModel { prompt: Resource | string; inhibitInput: boolean = false; - countdownHandle: number = -1; - freezingMillisecond: number = 0; constructor() { this.ViewModelInit() @@ -39,42 +38,42 @@ export default class BaseViewModel { this.prompt = $r('app.string.input'); } - countdown(callback) { + countdown() { Log.showInfo(TAG, `countdown`) - let promptText: Resource | string = ''; - this.freezingMillisecond -= Constants.INTERVAL; - Log.showInfo(TAG, `countdown freezingMillisecond:${this.freezingMillisecond}`) - if (this.freezingMillisecond > 0) { - promptText = this.getFreezingTimeNm(); - promptText += TRY_AGAIN; - } else { - Log.showInfo(TAG, `countdown clearInterval`) - clearInterval(this.countdownHandle) - this.countdownHandle = -1 - this.inhibitInput = false - promptText = $r('app.string.input'); - } - Log.showInfo(TAG, `countdown promptText:${promptText}`) - this.prompt = promptText; - this.updateStorage(callback) + service.getAuthProperty(AuthType.PIN, (properties) => { + let promptText: Resource | string = ''; + let freezingMillisecond = properties.freezingTime; + Log.showInfo(TAG, `countdown freezingMillisecond:${freezingMillisecond}`) + if (freezingMillisecond > 0) { + promptText = this.getFreezingTimeNm(freezingMillisecond); + promptText += TRY_AGAIN; + setTimeout(this.countdown.bind(this), Constants.INTERVAL) + } else { + Log.showInfo(TAG, `countdown clearInterval`) + this.inhibitInput = false + promptText = $r('app.string.input'); + } + Log.showInfo(TAG, `countdown promptText:${promptText}`) + this.prompt = promptText; + }) } - changePrompt(remainTimes, freezingTime, callback) { + changePrompt(remainTimes, freezingTime, callback: Callback) { Log.showInfo(TAG, `changePrompt remainTimes:${remainTimes} freezingTime:${freezingTime}`) let promptText: Resource | string = $r('app.string.incorrect'); - this.freezingMillisecond = freezingTime if (0 < remainTimes && remainTimes <= 2) { - if (!!this.freezingMillisecond && this.freezingMillisecond != 0) { - promptText = $r('app.string.incorrect_promp_freezing', remainTimes, this.getFreezingTimeNm()); + if (freezingTime > 0) { + let freezingTimeNm = this.getFreezingTimeNm(freezingTime) + promptText = $r('app.string.incorrect_promp_freezing', remainTimes, freezingTimeNm); } else { promptText = $r('app.string.incorrect_promp_times', remainTimes); } } else if (0 == remainTimes) { - if (!!this.freezingMillisecond && this.freezingMillisecond != 0) { + if (freezingTime > 0) { this.inhibitInput = true - promptText = $r('app.string.input_promp', this.getFreezingTimeNm()); - this.countdownHandle = setInterval(this.countdown.bind(this), Constants.INTERVAL, callback); + promptText = $r('app.string.input_promp', this.getFreezingTimeNm(freezingTime)); + setTimeout(this.countdown.bind(this), Constants.INTERVAL) } } this.prompt = promptText; @@ -84,11 +83,11 @@ export default class BaseViewModel { Log.showInfo(TAG, `changePrompt end`) } - getFreezingTimeNm(): string { + getFreezingTimeNm(freezingMillisecond: number): string { Log.showInfo(TAG, `getFreezingTimeNm start`) - let minute = Math.floor(this.freezingMillisecond / (60 * 1000)); + let minute = Math.floor(freezingMillisecond / (60 * 1000)); Log.showInfo(TAG, `getFreezingTimeNm minute:${minute}`) - let second = Math.round((this.freezingMillisecond % (60 * 1000)) / 1000); + let second = Math.round((freezingMillisecond % (60 * 1000)) / 1000); Log.showInfo(TAG, `getFreezingTimeNm second:${second}`) let timeName = ''; if (minute != 0) { @@ -106,14 +105,12 @@ export default class BaseViewModel { callback() } - checkFreezingTime(authType, callback?) { - let callBackFun = Function; - if (callback) callBackFun = callback; - service.getAuthProperty(authType, (properties) => { + checkFreezingTime(callback: Callback) { + service.getAuthProperty(AuthType.PIN, (properties) => { if (properties.freezingTime > 0) { this.inhibitInput = true //Clear the entered password - this.changePrompt(properties.remainTimes, properties.freezingTime, callBackFun) + this.changePrompt(properties.remainTimes, properties.freezingTime, callback) } }) } diff --git a/features/screenlock/src/main/ets/com/ohos/vm/customPSDViewModel.ts b/features/screenlock/src/main/ets/com/ohos/vm/customPSDViewModel.ts index d2248d6..3ff0295 100644 --- a/features/screenlock/src/main/ets/com/ohos/vm/customPSDViewModel.ts +++ b/features/screenlock/src/main/ets/com/ohos/vm/customPSDViewModel.ts @@ -15,10 +15,10 @@ import Log from '../../../../../../../../common/src/main/ets/default/Log' import Constants from '../common/constants' -import BaseViewModel, {service, UnlockResult,AuthType, AuthSubType} from './baseViewModel' +import BaseViewModel, {service, AuthType, AuthSubType} from './baseViewModel' +import {Callback} from 'basic'; const TAG = 'ScreenLock-CustomPSDViewModel' -export {AuthType} export default class CustomPSDViewModel extends BaseViewModel { passwordArr: any[] = []; @@ -61,7 +61,7 @@ export default class CustomPSDViewModel extends BaseViewModel { Log.showInfo(TAG, 'onCallPhone'); } - onAuthPassword(callback) { + onAuthPassword(callback: Callback) { Log.showInfo(TAG, `onAuthPassword`); if (this.passwordArr.length == 0 || this.inhibitInput) { this.updateStorage(callback); diff --git a/features/screenlock/src/main/ets/com/ohos/vm/dateTimeViewModel.ts b/features/screenlock/src/main/ets/com/ohos/vm/dateTimeViewModel.ts deleted file mode 100644 index 714a126..0000000 --- a/features/screenlock/src/main/ets/com/ohos/vm/dateTimeViewModel.ts +++ /dev/null @@ -1,72 +0,0 @@ -/** - * Copyright (c) 2021-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 Log from '../../../../../../../../common/src/main/ets/default/Log' -import DateTimeCommon from '../../../../../../../../common/src/main/ets/default/DateTimeCommon' -import Constants from '../common/constants' -import {ScreenLockStatus} from '../../../../../../../../common/src/main/ets/default/ScreenLockCommon' -import ScreenLockModel from '../model/screenLockModel' - -const TAG = 'ScreenLock-DateTimeViewModel' - -/** - * DateTimeViewModel class - */ -export default class DateTimeViewModel { - timeVal: string = '' - dateVal: any = {} - weekVal: any = {} - setDateTimeHandle: number = -1 - isUsing24hFormat: boolean= false - - ViewModelInit(): void{ - Log.showInfo(TAG, 'ViewModelInit'); - - this.setDateTime.bind(this)() - this.setDateTimeHandle = setInterval(this.setDateTime.bind(this), Constants.INTERVAL); - Log.showInfo(TAG, 'ViewModelInit end'); - } - - setDateTime() { - Log.showInfo(TAG, `setDateTime`) - this.timeVal = DateTimeCommon.getSystemTime(this.isUsing24hFormat) - this.dateVal = DateTimeCommon.getSystemDate() - this.weekVal = DateTimeCommon.getSystemWeek() - } - - stopPolling() { - Log.showInfo(TAG, `stopPolling start`) - Log.showInfo(TAG, `stopPolling setDateTimeHandle:${this.setDateTimeHandle}`); - if (this.setDateTimeHandle > 0) { - clearInterval(this.setDateTimeHandle) - this.setDateTimeHandle = -1 - Log.showInfo(TAG, `stopPolling setDateTimeHandle new :${this.setDateTimeHandle}`); - } - Log.showInfo(TAG, `stopPolling end`) - } - - onStatusChange(lockStatus: ScreenLockStatus): void { - Log.showInfo(TAG, `onStatusChange lockStatus:${lockStatus}`); - Log.showInfo(TAG, `onStatusChange setDateTimeHandle:${this.setDateTimeHandle}`); - if (lockStatus == ScreenLockStatus.Locking) { - if (this.setDateTimeHandle <= 0) { - this.setDateTimeHandle = setInterval(this.setDateTime.bind(this), Constants.INTERVAL); - Log.showInfo(TAG, `onStatusChange setDateTimeHandle new:${this.setDateTimeHandle}`); - } - } else { - this.stopPolling(); - } - } -} diff --git a/features/screenlock/src/main/ets/com/ohos/vm/digitalPSDViewModel.ts b/features/screenlock/src/main/ets/com/ohos/vm/digitalPSDViewModel.ts index 4ad5e7e..e83bf67 100644 --- a/features/screenlock/src/main/ets/com/ohos/vm/digitalPSDViewModel.ts +++ b/features/screenlock/src/main/ets/com/ohos/vm/digitalPSDViewModel.ts @@ -15,15 +15,13 @@ import Log from '../../../../../../../../common/src/main/ets/default/Log' import Constants from '../common/constants' -import BaseViewModel, {service, UnlockResult, AuthType, AuthSubType} from './baseViewModel' +import BaseViewModel, {service, AuthType, AuthSubType} from './baseViewModel' +import {Callback} from 'basic'; const TAG = 'ScreenLock-DigitalPSDViewModel' const PW_LEN = 6 - -export {AuthType} - export default class DigitalPSDViewModel extends BaseViewModel { password: number[]= [] passwdMaskArr: any[]; @@ -39,7 +37,7 @@ export default class DigitalPSDViewModel extends BaseViewModel { super.ViewModelInit(); } - onKeyPress(index, callback) { + onKeyPress(index, callback: Callback) { Log.showInfo(TAG, `onKeyPress start param: ${index}`) let keyValue = this.numKeyboard[index].value; if (keyValue >= 0 && !this.inhibitInput) { diff --git a/features/screenlock/src/main/ets/com/ohos/vm/mixedPSDViewModel.ts b/features/screenlock/src/main/ets/com/ohos/vm/mixedPSDViewModel.ts index 33ac3c6..215cdb7 100644 --- a/features/screenlock/src/main/ets/com/ohos/vm/mixedPSDViewModel.ts +++ b/features/screenlock/src/main/ets/com/ohos/vm/mixedPSDViewModel.ts @@ -14,10 +14,10 @@ */ import Log from '../../../../../../../../common/src/main/ets/default/Log' -import BaseViewModel, {service, UnlockResult,AuthType, AuthSubType} from './baseViewModel' +import BaseViewModel, {service, AuthType, AuthSubType} from './baseViewModel' +import {Callback} from 'basic'; const TAG = 'ScreenLock-MixedPSDViewModel' -export {AuthType} export default class MixedPSDViewModel extends BaseViewModel { password: string= ''; @@ -40,7 +40,7 @@ export default class MixedPSDViewModel extends BaseViewModel { Log.showInfo(TAG, 'onCallPhone'); } - onAuthPassword(callback) { + onAuthPassword(callback: Callback) { Log.showInfo(TAG, `onAuthPassword`); if (!this.password || this.inhibitInput) { callback(); diff --git a/features/screenlock/src/main/ets/components/MainPage/MainPage.ets b/features/screenlock/src/main/ets/components/MainPage/MainPage.ets new file mode 100644 index 0000000..0f54030 --- /dev/null +++ b/features/screenlock/src/main/ets/components/MainPage/MainPage.ets @@ -0,0 +1,17 @@ +@Entry +@Component +export struct MainPage { + @State message: string = 'Hello World' + + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + } + .width('100%') + } + .height('100%') + } +} diff --git a/features/screenlock/src/main/module.json5 b/features/screenlock/src/main/module.json5 new file mode 100644 index 0000000..21e2f16 --- /dev/null +++ b/features/screenlock/src/main/module.json5 @@ -0,0 +1,11 @@ +{ + "module": { + "name": "screenlock", + "type": "har", + "deviceTypes": [ + "phone", + "tablet" + ], + "uiSyntax": "ets" + } +} diff --git a/features/shortcutcomponent/.gitignore b/features/shortcutcomponent/.gitignore new file mode 100644 index 0000000..4f9a973 --- /dev/null +++ b/features/shortcutcomponent/.gitignore @@ -0,0 +1,3 @@ +/node_modules +/.preview +/build \ No newline at end of file diff --git a/features/shortcutcomponent/build-profile.json5 b/features/shortcutcomponent/build-profile.json5 new file mode 100644 index 0000000..35dff6d --- /dev/null +++ b/features/shortcutcomponent/build-profile.json5 @@ -0,0 +1,5 @@ +{ + "apiType": "stageMode", + "buildOption": { + } +} diff --git a/features/shortcutcomponent/build.gradle b/features/shortcutcomponent/build.gradle deleted file mode 100644 index 390462f..0000000 --- a/features/shortcutcomponent/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -apply plugin: 'com.huawei.ohos.library' -//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510 -ohos { - compileSdkVersion rootProject.ext.version.compileSdk - defaultConfig { - compatibleSdkVersion rootProject.ext.version.compatibleSdk - } - buildTypes { - release { - proguardOpt { - proguardEnabled false - rulesFiles 'proguard-rules.pro' - } - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) - implementation project(':common') -} diff --git a/features/shortcutcomponent/hvigorfile.js b/features/shortcutcomponent/hvigorfile.js new file mode 100644 index 0000000..42ed4b4 --- /dev/null +++ b/features/shortcutcomponent/hvigorfile.js @@ -0,0 +1,3 @@ +// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. +module.exports = require('@ohos/hvigor-ohos-plugin').harTasks + diff --git a/features/shortcutcomponent/index.ets b/features/shortcutcomponent/index.ets new file mode 100644 index 0000000..1bb64ac --- /dev/null +++ b/features/shortcutcomponent/index.ets @@ -0,0 +1 @@ +export { MainPage } from './src/main/ets/components/MainPage/MainPage' diff --git a/features/shortcutcomponent/package-lock.json b/features/shortcutcomponent/package-lock.json new file mode 100644 index 0000000..fef5628 --- /dev/null +++ b/features/shortcutcomponent/package-lock.json @@ -0,0 +1,5 @@ +{ + "name": "@ohos/shortcutcomponent", + "version": "1.0.0", + "lockfileVersion": 1 +} diff --git a/features/shortcutcomponent/package.json b/features/shortcutcomponent/package.json new file mode 100644 index 0000000..3c45ae0 --- /dev/null +++ b/features/shortcutcomponent/package.json @@ -0,0 +1,14 @@ +{ + "license": "ISC", + "types": "", + "devDependencies": {}, + "name": "@ohos/shortcutcomponent", + "description": "a npm package which contains arkUI2.0 page", + "ohos": { + "org": "" + }, + "main": "index.ets", + "repository": {}, + "version": "1.0.0", + "dependencies": {} +} diff --git a/features/shortcutcomponent/src/main/config.json b/features/shortcutcomponent/src/main/config.json deleted file mode 100644 index 7c44dd3..0000000 --- a/features/shortcutcomponent/src/main/config.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "app": { - "bundleName": "com.ohos.screenlock", - "vendor": "ohos", - "version": { - "code": 1000000, - "name": "1.0.0" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.ohos.screenlock.shortcutcomponent", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "shortcutcomponent", - "moduleType": "har" - }, - "srcPath": "default" - } -} \ No newline at end of file diff --git a/features/shortcutcomponent/src/main/ets/components/MainPage/MainPage.ets b/features/shortcutcomponent/src/main/ets/components/MainPage/MainPage.ets new file mode 100644 index 0000000..0f54030 --- /dev/null +++ b/features/shortcutcomponent/src/main/ets/components/MainPage/MainPage.ets @@ -0,0 +1,17 @@ +@Entry +@Component +export struct MainPage { + @State message: string = 'Hello World' + + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + } + .width('100%') + } + .height('100%') + } +} diff --git a/features/shortcutcomponent/src/main/module.json5 b/features/shortcutcomponent/src/main/module.json5 new file mode 100644 index 0000000..08e7795 --- /dev/null +++ b/features/shortcutcomponent/src/main/module.json5 @@ -0,0 +1,11 @@ +{ + "module": { + "name": "shortcutcomponent", + "type": "har", + "deviceTypes": [ + "phone", + "tablet" + ], + "uiSyntax": "ets" + } +} diff --git a/features/signalcomponent/.gitignore b/features/signalcomponent/.gitignore index c795b05..4f9a973 100644 --- a/features/signalcomponent/.gitignore +++ b/features/signalcomponent/.gitignore @@ -1 +1,3 @@ -build \ No newline at end of file +/node_modules +/.preview +/build \ No newline at end of file diff --git a/features/signalcomponent/build-profile.json5 b/features/signalcomponent/build-profile.json5 new file mode 100644 index 0000000..35dff6d --- /dev/null +++ b/features/signalcomponent/build-profile.json5 @@ -0,0 +1,5 @@ +{ + "apiType": "stageMode", + "buildOption": { + } +} diff --git a/features/signalcomponent/build.gradle b/features/signalcomponent/build.gradle deleted file mode 100644 index ae402d9..0000000 --- a/features/signalcomponent/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -apply plugin: 'com.huawei.ohos.library' -ohos { - compileSdkVersion rootProject.ext.version.compileSdk - defaultConfig { - compatibleSdkVersion rootProject.ext.version.compatibleSdk - } - buildTypes { - release { - proguardOpt { - proguardEnabled false - rulesFiles 'proguard-rules.pro' - } - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) -} \ No newline at end of file diff --git a/features/signalcomponent/hvigorfile.js b/features/signalcomponent/hvigorfile.js new file mode 100644 index 0000000..42ed4b4 --- /dev/null +++ b/features/signalcomponent/hvigorfile.js @@ -0,0 +1,3 @@ +// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. +module.exports = require('@ohos/hvigor-ohos-plugin').harTasks + diff --git a/features/signalcomponent/index.ets b/features/signalcomponent/index.ets new file mode 100644 index 0000000..1bb64ac --- /dev/null +++ b/features/signalcomponent/index.ets @@ -0,0 +1 @@ +export { MainPage } from './src/main/ets/components/MainPage/MainPage' diff --git a/features/signalcomponent/package-lock.json b/features/signalcomponent/package-lock.json new file mode 100644 index 0000000..8782c09 --- /dev/null +++ b/features/signalcomponent/package-lock.json @@ -0,0 +1,5 @@ +{ + "name": "@ohos/signalcomponent", + "version": "1.0.0", + "lockfileVersion": 1 +} diff --git a/features/signalcomponent/package.json b/features/signalcomponent/package.json new file mode 100644 index 0000000..321952a --- /dev/null +++ b/features/signalcomponent/package.json @@ -0,0 +1,14 @@ +{ + "license": "ISC", + "types": "", + "devDependencies": {}, + "name": "@ohos/signalcomponent", + "description": "a npm package which contains arkUI2.0 page", + "ohos": { + "org": "" + }, + "main": "index.ets", + "repository": {}, + "version": "1.0.0", + "dependencies": {} +} diff --git a/features/signalcomponent/src/main/config.json b/features/signalcomponent/src/main/config.json deleted file mode 100644 index 051c1f4..0000000 --- a/features/signalcomponent/src/main/config.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "app": { - "bundleName": "com.ohos.systemui", - "vendor": "ohos", - "version": { - "code": 1000000, - "name": "1.0.0" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.ohos.systemui.signalcomponent", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "signalcomponent", - "moduleType": "har" - }, - "srcPath": "default" - } -} \ No newline at end of file diff --git a/features/signalcomponent/src/main/ets/components/MainPage/MainPage.ets b/features/signalcomponent/src/main/ets/components/MainPage/MainPage.ets new file mode 100644 index 0000000..0f54030 --- /dev/null +++ b/features/signalcomponent/src/main/ets/components/MainPage/MainPage.ets @@ -0,0 +1,17 @@ +@Entry +@Component +export struct MainPage { + @State message: string = 'Hello World' + + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + } + .width('100%') + } + .height('100%') + } +} diff --git a/features/signalcomponent/src/main/module.json5 b/features/signalcomponent/src/main/module.json5 new file mode 100644 index 0000000..6552c5d --- /dev/null +++ b/features/signalcomponent/src/main/module.json5 @@ -0,0 +1,11 @@ +{ + "module": { + "name": "signalcomponent", + "type": "har", + "deviceTypes": [ + "phone", + "tablet" + ], + "uiSyntax": "ets" + } +} diff --git a/features/wallpapercomponent/.gitignore b/features/wallpapercomponent/.gitignore new file mode 100644 index 0000000..4f9a973 --- /dev/null +++ b/features/wallpapercomponent/.gitignore @@ -0,0 +1,3 @@ +/node_modules +/.preview +/build \ No newline at end of file diff --git a/features/wallpapercomponent/build-profile.json5 b/features/wallpapercomponent/build-profile.json5 new file mode 100644 index 0000000..35dff6d --- /dev/null +++ b/features/wallpapercomponent/build-profile.json5 @@ -0,0 +1,5 @@ +{ + "apiType": "stageMode", + "buildOption": { + } +} diff --git a/features/wallpapercomponent/build.gradle b/features/wallpapercomponent/build.gradle deleted file mode 100644 index 390462f..0000000 --- a/features/wallpapercomponent/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -apply plugin: 'com.huawei.ohos.library' -//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510 -ohos { - compileSdkVersion rootProject.ext.version.compileSdk - defaultConfig { - compatibleSdkVersion rootProject.ext.version.compatibleSdk - } - buildTypes { - release { - proguardOpt { - proguardEnabled false - rulesFiles 'proguard-rules.pro' - } - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) - implementation project(':common') -} diff --git a/features/wallpapercomponent/hvigorfile.js b/features/wallpapercomponent/hvigorfile.js new file mode 100644 index 0000000..42ed4b4 --- /dev/null +++ b/features/wallpapercomponent/hvigorfile.js @@ -0,0 +1,3 @@ +// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. +module.exports = require('@ohos/hvigor-ohos-plugin').harTasks + diff --git a/features/wallpapercomponent/index.ets b/features/wallpapercomponent/index.ets new file mode 100644 index 0000000..1bb64ac --- /dev/null +++ b/features/wallpapercomponent/index.ets @@ -0,0 +1 @@ +export { MainPage } from './src/main/ets/components/MainPage/MainPage' diff --git a/features/wallpapercomponent/package-lock.json b/features/wallpapercomponent/package-lock.json new file mode 100644 index 0000000..0556d06 --- /dev/null +++ b/features/wallpapercomponent/package-lock.json @@ -0,0 +1,5 @@ +{ + "name": "@ohos/wallpapercomponent", + "version": "1.0.0", + "lockfileVersion": 1 +} diff --git a/features/wallpapercomponent/package.json b/features/wallpapercomponent/package.json new file mode 100644 index 0000000..a9b279f --- /dev/null +++ b/features/wallpapercomponent/package.json @@ -0,0 +1,14 @@ +{ + "license": "ISC", + "types": "", + "devDependencies": {}, + "name": "@ohos/wallpapercomponent", + "description": "a npm package which contains arkUI2.0 page", + "ohos": { + "org": "" + }, + "main": "index.ets", + "repository": {}, + "version": "1.0.0", + "dependencies": {} +} diff --git a/features/wallpapercomponent/src/main/config.json b/features/wallpapercomponent/src/main/config.json deleted file mode 100644 index 8183c58..0000000 --- a/features/wallpapercomponent/src/main/config.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "app": { - "bundleName": "com.ohos.screenlock", - "vendor": "ohos", - "version": { - "code": 1000000, - "name": "1.0.0" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.ohos.screenlock.wallpapercomponent", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "wallpapercomponent", - "moduleType": "har" - }, - "srcPath": "default" - } -} \ No newline at end of file diff --git a/features/wallpapercomponent/src/main/ets/components/MainPage/MainPage.ets b/features/wallpapercomponent/src/main/ets/components/MainPage/MainPage.ets new file mode 100644 index 0000000..0f54030 --- /dev/null +++ b/features/wallpapercomponent/src/main/ets/components/MainPage/MainPage.ets @@ -0,0 +1,17 @@ +@Entry +@Component +export struct MainPage { + @State message: string = 'Hello World' + + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + } + .width('100%') + } + .height('100%') + } +} diff --git a/features/wallpapercomponent/src/main/module.json5 b/features/wallpapercomponent/src/main/module.json5 new file mode 100644 index 0000000..6c741cd --- /dev/null +++ b/features/wallpapercomponent/src/main/module.json5 @@ -0,0 +1,11 @@ +{ + "module": { + "name": "wallpapercomponent", + "type": "har", + "deviceTypes": [ + "phone", + "tablet" + ], + "uiSyntax": "ets" + } +} diff --git a/features/wallpapercomponent/src/main/resources/base/element/string.json b/features/wallpapercomponent/src/main/resources/base/element/string.json new file mode 100644 index 0000000..1e76de0 --- /dev/null +++ b/features/wallpapercomponent/src/main/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string": [ + { + "name": "page_show", + "value": "page from npm package" + } + ] +} diff --git a/features/wificomponent/.gitignore b/features/wificomponent/.gitignore index c795b05..4f9a973 100644 --- a/features/wificomponent/.gitignore +++ b/features/wificomponent/.gitignore @@ -1 +1,3 @@ -build \ No newline at end of file +/node_modules +/.preview +/build \ No newline at end of file diff --git a/features/wificomponent/build-profile.json5 b/features/wificomponent/build-profile.json5 new file mode 100644 index 0000000..35dff6d --- /dev/null +++ b/features/wificomponent/build-profile.json5 @@ -0,0 +1,5 @@ +{ + "apiType": "stageMode", + "buildOption": { + } +} diff --git a/features/wificomponent/build.gradle b/features/wificomponent/build.gradle deleted file mode 100644 index ae402d9..0000000 --- a/features/wificomponent/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -apply plugin: 'com.huawei.ohos.library' -ohos { - compileSdkVersion rootProject.ext.version.compileSdk - defaultConfig { - compatibleSdkVersion rootProject.ext.version.compatibleSdk - } - buildTypes { - release { - proguardOpt { - proguardEnabled false - rulesFiles 'proguard-rules.pro' - } - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) -} \ No newline at end of file diff --git a/features/wificomponent/hvigorfile.js b/features/wificomponent/hvigorfile.js new file mode 100644 index 0000000..42ed4b4 --- /dev/null +++ b/features/wificomponent/hvigorfile.js @@ -0,0 +1,3 @@ +// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. +module.exports = require('@ohos/hvigor-ohos-plugin').harTasks + diff --git a/features/wificomponent/index.ets b/features/wificomponent/index.ets new file mode 100644 index 0000000..1bb64ac --- /dev/null +++ b/features/wificomponent/index.ets @@ -0,0 +1 @@ +export { MainPage } from './src/main/ets/components/MainPage/MainPage' diff --git a/features/wificomponent/package-lock.json b/features/wificomponent/package-lock.json new file mode 100644 index 0000000..a2feca7 --- /dev/null +++ b/features/wificomponent/package-lock.json @@ -0,0 +1,5 @@ +{ + "name": "@ohos/wificomponent", + "version": "1.0.0", + "lockfileVersion": 1 +} diff --git a/features/wificomponent/package.json b/features/wificomponent/package.json new file mode 100644 index 0000000..884c8bd --- /dev/null +++ b/features/wificomponent/package.json @@ -0,0 +1,14 @@ +{ + "license": "ISC", + "types": "", + "devDependencies": {}, + "name": "@ohos/wificomponent", + "description": "a npm package which contains arkUI2.0 page", + "ohos": { + "org": "" + }, + "main": "index.ets", + "repository": {}, + "version": "1.0.0", + "dependencies": {} +} diff --git a/features/wificomponent/src/main/config.json b/features/wificomponent/src/main/config.json deleted file mode 100644 index 29c6cce..0000000 --- a/features/wificomponent/src/main/config.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "app": { - "bundleName": "com.ohos.systemui", - "vendor": "ohos", - "version": { - "code": 1000000, - "name": "1.0.0" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.ohos.systemui.wificomponent", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "wificomponent", - "moduleType": "har" - }, - "srcPath": "default" - } -} \ No newline at end of file diff --git a/features/wificomponent/src/main/ets/components/MainPage/MainPage.ets b/features/wificomponent/src/main/ets/components/MainPage/MainPage.ets new file mode 100644 index 0000000..0f54030 --- /dev/null +++ b/features/wificomponent/src/main/ets/components/MainPage/MainPage.ets @@ -0,0 +1,17 @@ +@Entry +@Component +export struct MainPage { + @State message: string = 'Hello World' + + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + } + .width('100%') + } + .height('100%') + } +} diff --git a/features/wificomponent/src/main/module.json5 b/features/wificomponent/src/main/module.json5 new file mode 100644 index 0000000..ead4df0 --- /dev/null +++ b/features/wificomponent/src/main/module.json5 @@ -0,0 +1,11 @@ +{ + "module": { + "name": "wificomponent", + "type": "har", + "deviceTypes": [ + "phone", + "tablet" + ], + "uiSyntax": "ets" + } +} diff --git a/features/wificomponent/src/main/resources/base/element/string.json b/features/wificomponent/src/main/resources/base/element/string.json new file mode 100644 index 0000000..1e76de0 --- /dev/null +++ b/features/wificomponent/src/main/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string": [ + { + "name": "page_show", + "value": "page from npm package" + } + ] +} diff --git a/figures/screenlock.png b/figures/screenlock.png deleted file mode 100644 index 0ee29b696ec2ce14e9179ffd5595618c7ac7004a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27998 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 \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 62bd9b9..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,103 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/hvigorfile.js b/hvigorfile.js new file mode 100644 index 0000000..5f2735e --- /dev/null +++ b/hvigorfile.js @@ -0,0 +1,2 @@ +// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. +module.exports = require('@ohos/hvigor-ohos-plugin').appTasks \ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..4b3e412 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,1657 @@ +{ + "name": "screenlock", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@ohos/hvigor": { + "version": "1.0.6", + "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor/-/@ohos/hvigor-1.0.6.tgz", + "integrity": "sha512-jjp7vpvUOMW1Nf7TdyhOtonwWHoSyBJLUiZTQqIx/GJV4UJyIqsiURUOqFwncQ4L7PDdeHuWly4uEelknYeWhg==", + "requires": { + "@ohos/hvigor-base": "1.0.6", + "interpret": "1.4.0", + "liftoff": "4.0.0", + "mute-stdout": "1.0.0", + "pretty-hrtime": "1.0.0", + "v8flags": "3.2.0", + "yargs": "7.1.0" + } + }, + "@ohos/hvigor-base": { + "version": "1.0.6", + "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor-base/-/@ohos/hvigor-base-1.0.6.tgz", + "integrity": "sha512-cRDnWICTxmpNiFb9clIioqP5Oik1seLCICztXVhZqultrHuxwTheCRUZrHwlpyWdkSB2Al+FFBqmSwzIgZX4IQ==", + "requires": { + "json5": "2.2.0", + "log4js": "6.4.1", + "undertaker": "1.2.1" + } + }, + "@ohos/hvigor-ohos-plugin": { + "version": "1.0.6", + "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor-ohos-plugin/-/@ohos/hvigor-ohos-plugin-1.0.6.tgz", + "integrity": "sha512-MAAi8uJxMzODUoSSNfBr+fU4HQ20dfQtkje9I+X4asc7qY2kAplW/q9f5XS8IOvv8zhC8OcSgsAXOAJuLMstOQ==", + "requires": { + "@ohos/hvigor-base": "1.0.6", + "@ohos/sdkmanager-common": "1.1.3", + "ajv": "8.10.0", + "archiver": "5.3.0", + "execa": "5.1.1", + "fs-extra": "10.0.0", + "glob": "7.2.0", + "iconv-lite": "0.6.3", + "json5": "2.2.0", + "lodash": "4.17.21", + "pretty-hrtime": "1.0.3", + "resolve-package-path": "4.0.3" + }, + "dependencies": { + "fs-extra": { + "version": "10.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/fs-extra/-/fs-extra-10.0.0.tgz", + "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, + "pretty-hrtime": { + "version": "1.0.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", + "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=" + } + } + }, + "@ohos/sdkmanager-common": { + "version": "1.1.3", + "resolved": "https://repo.harmonyos.com/npm/@ohos/sdkmanager-common/-/@ohos/sdkmanager-common-1.1.3.tgz", + "integrity": "sha512-d2uhVauDDJZIUvyyaWWoavG4N/jLyfF5IH5kEXKV6R8HNf3606H1zDQzA+UZtOfwwJFXhD9djRjnVFNB8xc7aw==" + }, + "ajv": { + "version": "8.10.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/ajv/-/ajv-8.10.0.tgz", + "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==", + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "archiver": { + "version": "5.3.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/archiver/-/archiver-5.3.0.tgz", + "integrity": "sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg==", + "requires": { + "archiver-utils": "^2.1.0", + "async": "^3.2.0", + "buffer-crc32": "^0.2.1", + "readable-stream": "^3.6.0", + "readdir-glob": "^1.0.0", + "tar-stream": "^2.2.0", + "zip-stream": "^4.1.0" + } + }, + "archiver-utils": { + "version": "2.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/archiver-utils/-/archiver-utils-2.1.0.tgz", + "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", + "requires": { + "glob": "^7.1.4", + "graceful-fs": "^4.2.0", + "lazystream": "^1.0.0", + "lodash.defaults": "^4.2.0", + "lodash.difference": "^4.5.0", + "lodash.flatten": "^4.4.0", + "lodash.isplainobject": "^4.0.6", + "lodash.union": "^4.6.0", + "normalize-path": "^3.0.0", + "readable-stream": "^2.0.0" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://repo.huaweicloud.com/repository/npm/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + } + } + }, + "arr-filter": { + "version": "1.1.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/arr-filter/-/arr-filter-1.1.2.tgz", + "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=", + "requires": { + "make-iterator": "^1.0.0" + } + }, + "arr-flatten": { + "version": "1.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" + }, + "arr-map": { + "version": "2.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/arr-map/-/arr-map-2.0.2.tgz", + "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=", + "requires": { + "make-iterator": "^1.0.0" + } + }, + "array-each": { + "version": "1.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/array-each/-/array-each-1.0.1.tgz", + "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=" + }, + "array-initial": { + "version": "1.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/array-initial/-/array-initial-1.1.0.tgz", + "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=", + "requires": { + "array-slice": "^1.0.0", + "is-number": "^4.0.0" + } + }, + "array-last": { + "version": "1.3.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/array-last/-/array-last-1.3.0.tgz", + "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==", + "requires": { + "is-number": "^4.0.0" + } + }, + "array-slice": { + "version": "1.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/array-slice/-/array-slice-1.1.0.tgz", + "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==" + }, + "async": { + "version": "3.2.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/async/-/async-3.2.3.tgz", + "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" + }, + "async-done": { + "version": "1.3.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/async-done/-/async-done-1.3.2.tgz", + "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==", + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.2", + "process-nextick-args": "^2.0.0", + "stream-exhaust": "^1.0.1" + } + }, + "async-settle": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/async-settle/-/async-settle-1.0.0.tgz", + "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=", + "requires": { + "async-done": "^1.2.2" + } + }, + "bach": { + "version": "1.2.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/bach/-/bach-1.2.0.tgz", + "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=", + "requires": { + "arr-filter": "^1.1.1", + "arr-flatten": "^1.0.1", + "arr-map": "^2.0.0", + "array-each": "^1.0.0", + "array-initial": "^1.0.0", + "array-last": "^1.1.1", + "async-done": "^1.2.2", + "async-settle": "^1.0.0", + "now-and-later": "^2.0.0" + } + }, + "balanced-match": { + "version": "1.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "base64-js": { + "version": "1.5.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + }, + "bl": { + "version": "4.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "requires": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://repo.huaweicloud.com/repository/npm/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "3.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "buffer": { + "version": "5.7.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "buffer-crc32": { + "version": "0.2.13", + "resolved": "https://repo.huaweicloud.com/repository/npm/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" + }, + "call-bind": { + "version": "1.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + }, + "camelcase": { + "version": "3.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" + } + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + }, + "collection-map": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/collection-map/-/collection-map-1.0.0.tgz", + "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=", + "requires": { + "arr-map": "^2.0.2", + "for-own": "^1.0.0", + "make-iterator": "^1.0.0" + } + }, + "compress-commons": { + "version": "4.1.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/compress-commons/-/compress-commons-4.1.1.tgz", + "integrity": "sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==", + "requires": { + "buffer-crc32": "^0.2.13", + "crc32-stream": "^4.0.2", + "normalize-path": "^3.0.0", + "readable-stream": "^3.6.0" + } + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "core-util-is": { + "version": "1.0.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" + }, + "crc-32": { + "version": "1.2.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/crc-32/-/crc-32-1.2.1.tgz", + "integrity": "sha512-Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w==", + "requires": { + "exit-on-epipe": "~1.0.1", + "printj": "~1.3.1" + } + }, + "crc32-stream": { + "version": "4.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/crc32-stream/-/crc32-stream-4.0.2.tgz", + "integrity": "sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==", + "requires": { + "crc-32": "^1.2.0", + "readable-stream": "^3.4.0" + } + }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "dependencies": { + "which": { + "version": "2.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } + } + } + }, + "d": { + "version": "1.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/d/-/d-1.0.1.tgz", + "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", + "requires": { + "es5-ext": "^0.10.50", + "type": "^1.0.1" + } + }, + "date-format": { + "version": "4.0.6", + "resolved": "https://repo.huaweicloud.com/repository/npm/date-format/-/date-format-4.0.6.tgz", + "integrity": "sha512-B9vvg5rHuQ8cbUXE/RMWMyX2YA5TecT3jKF5fLtGNlzPlU7zblSPmAm2OImDbWL+LDOQ6pUm+4LOFz+ywS41Zw==" + }, + "debug": { + "version": "4.3.4", + "resolved": "https://repo.huaweicloud.com/repository/npm/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "requires": { + "ms": "2.1.2" + } + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + }, + "default-resolution": { + "version": "2.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/default-resolution/-/default-resolution-2.0.0.tgz", + "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=" + }, + "define-properties": { + "version": "1.1.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "requires": { + "object-keys": "^1.0.12" + } + }, + "detect-file": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/detect-file/-/detect-file-1.0.0.tgz", + "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=" + }, + "end-of-stream": { + "version": "1.4.4", + "resolved": "https://repo.huaweicloud.com/repository/npm/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "requires": { + "once": "^1.4.0" + } + }, + "error-ex": { + "version": "1.3.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "requires": { + "is-arrayish": "^0.2.1" + } + }, + "es5-ext": { + "version": "0.10.59", + "resolved": "https://repo.huaweicloud.com/repository/npm/es5-ext/-/es5-ext-0.10.59.tgz", + "integrity": "sha512-cOgyhW0tIJyQY1Kfw6Kr0viu9ZlUctVchRMZ7R0HiH3dxTSp5zJDLecwxUqPUrGKMsgBI1wd1FL+d9Jxfi4cLw==", + "requires": { + "es6-iterator": "^2.0.3", + "es6-symbol": "^3.1.3", + "next-tick": "^1.1.0" + } + }, + "es6-iterator": { + "version": "2.0.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", + "requires": { + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" + } + }, + "es6-symbol": { + "version": "3.1.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/es6-symbol/-/es6-symbol-3.1.3.tgz", + "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", + "requires": { + "d": "^1.0.1", + "ext": "^1.1.2" + } + }, + "es6-weak-map": { + "version": "2.0.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/es6-weak-map/-/es6-weak-map-2.0.3.tgz", + "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==", + "requires": { + "d": "1", + "es5-ext": "^0.10.46", + "es6-iterator": "^2.0.3", + "es6-symbol": "^3.1.1" + } + }, + "execa": { + "version": "5.1.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "requires": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + } + }, + "exit-on-epipe": { + "version": "1.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz", + "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==" + }, + "expand-tilde": { + "version": "2.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", + "requires": { + "homedir-polyfill": "^1.0.1" + } + }, + "ext": { + "version": "1.6.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/ext/-/ext-1.6.0.tgz", + "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==", + "requires": { + "type": "^2.5.0" + }, + "dependencies": { + "type": { + "version": "2.6.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/type/-/type-2.6.0.tgz", + "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==" + } + } + }, + "extend": { + "version": "3.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "find-up": { + "version": "1.1.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "requires": { + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, + "findup-sync": { + "version": "5.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/findup-sync/-/findup-sync-5.0.0.tgz", + "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==", + "requires": { + "detect-file": "^1.0.0", + "is-glob": "^4.0.3", + "micromatch": "^4.0.4", + "resolve-dir": "^1.0.1" + } + }, + "fined": { + "version": "2.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/fined/-/fined-2.0.0.tgz", + "integrity": "sha512-OFRzsL6ZMHz5s0JrsEr+TpdGNCtrVtnuG3x1yzGNiQHT0yaDnXAj8V/lWcpJVrnoDpcwXcASxAZYbuXda2Y82A==", + "requires": { + "expand-tilde": "^2.0.2", + "is-plain-object": "^5.0.0", + "object.defaults": "^1.1.0", + "object.pick": "^1.3.0", + "parse-filepath": "^1.0.2" + } + }, + "flagged-respawn": { + "version": "2.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/flagged-respawn/-/flagged-respawn-2.0.0.tgz", + "integrity": "sha512-Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==" + }, + "flatted": { + "version": "3.2.5", + "resolved": "https://repo.huaweicloud.com/repository/npm/flatted/-/flatted-3.2.5.tgz", + "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==" + }, + "for-in": { + "version": "1.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" + }, + "for-own": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/for-own/-/for-own-1.0.0.tgz", + "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", + "requires": { + "for-in": "^1.0.1" + } + }, + "fs-constants": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + }, + "fs-extra": { + "version": "10.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/fs-extra/-/fs-extra-10.0.1.tgz", + "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==", + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "get-caller-file": { + "version": "1.0.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" + }, + "get-intrinsic": { + "version": "1.1.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } + }, + "get-stream": { + "version": "6.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==" + }, + "glob": { + "version": "7.2.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "global-modules": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "requires": { + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" + } + }, + "global-prefix": { + "version": "1.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/global-prefix/-/global-prefix-1.0.2.tgz", + "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", + "requires": { + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" + } + }, + "graceful-fs": { + "version": "4.2.9", + "resolved": "https://repo.huaweicloud.com/repository/npm/graceful-fs/-/graceful-fs-4.2.9.tgz", + "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==" + }, + "has": { + "version": "1.0.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "requires": { + "function-bind": "^1.1.1" + } + }, + "has-symbols": { + "version": "1.0.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + }, + "homedir-polyfill": { + "version": "1.0.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", + "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", + "requires": { + "parse-passwd": "^1.0.0" + } + }, + "hosted-git-info": { + "version": "2.8.9", + "resolved": "https://repo.huaweicloud.com/repository/npm/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" + }, + "human-signals": { + "version": "2.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==" + }, + "hypium": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/hypium/-/hypium-1.0.0.tgz", + "integrity": "sha512-nl+RQVv2AU/5FvFRhsXyWO5wh+2huhdqRZ3bszBWZzW+kpNI3AT4ydvVRYIfaQbYwV4UlX/rSc7BtFjLAezhow==" + }, + "iconv-lite": { + "version": "0.6.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + } + }, + "ieee754": { + "version": "1.2.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://repo.huaweicloud.com/repository/npm/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://repo.huaweicloud.com/repository/npm/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "ini": { + "version": "1.3.8", + "resolved": "https://repo.huaweicloud.com/repository/npm/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" + }, + "interpret": { + "version": "1.4.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/interpret/-/interpret-1.4.0.tgz", + "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==" + }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + }, + "is-absolute": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/is-absolute/-/is-absolute-1.0.0.tgz", + "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", + "requires": { + "is-relative": "^1.0.0", + "is-windows": "^1.0.1" + } + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + }, + "is-core-module": { + "version": "2.8.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/is-core-module/-/is-core-module-2.8.1.tgz", + "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", + "requires": { + "has": "^1.0.3" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "is-glob": { + "version": "4.0.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-number": { + "version": "4.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/is-number/-/is-number-4.0.0.tgz", + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==" + }, + "is-plain-object": { + "version": "5.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==" + }, + "is-relative": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/is-relative/-/is-relative-1.0.0.tgz", + "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", + "requires": { + "is-unc-path": "^1.0.0" + } + }, + "is-stream": { + "version": "2.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" + }, + "is-unc-path": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/is-unc-path/-/is-unc-path-1.0.0.tgz", + "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", + "requires": { + "unc-path-regex": "^0.1.2" + } + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" + }, + "is-windows": { + "version": "1.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + }, + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + }, + "json5": { + "version": "2.2.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", + "requires": { + "minimist": "^1.2.5" + } + }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, + "kind-of": { + "version": "6.0.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" + }, + "last-run": { + "version": "1.1.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/last-run/-/last-run-1.1.1.tgz", + "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=", + "requires": { + "default-resolution": "^2.0.0", + "es6-weak-map": "^2.0.1" + } + }, + "lazystream": { + "version": "1.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/lazystream/-/lazystream-1.0.1.tgz", + "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", + "requires": { + "readable-stream": "^2.0.5" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://repo.huaweicloud.com/repository/npm/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + } + } + }, + "lcid": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "requires": { + "invert-kv": "^1.0.0" + } + }, + "liftoff": { + "version": "4.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/liftoff/-/liftoff-4.0.0.tgz", + "integrity": "sha512-rMGwYF8q7g2XhG2ulBmmJgWv25qBsqRbDn5gH0+wnuyeFt7QBJlHJmtg5qEdn4pN6WVAUMgXnIxytMFRX9c1aA==", + "requires": { + "extend": "^3.0.2", + "findup-sync": "^5.0.0", + "fined": "^2.0.0", + "flagged-respawn": "^2.0.0", + "is-plain-object": "^5.0.0", + "object.map": "^1.0.1", + "rechoir": "^0.8.0", + "resolve": "^1.20.0" + } + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" + } + }, + "lodash": { + "version": "4.17.21", + "resolved": "https://repo.huaweicloud.com/repository/npm/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "lodash.defaults": { + "version": "4.2.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=" + }, + "lodash.difference": { + "version": "4.5.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/lodash.difference/-/lodash.difference-4.5.0.tgz", + "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=" + }, + "lodash.flatten": { + "version": "4.4.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=" + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://repo.huaweicloud.com/repository/npm/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" + }, + "lodash.union": { + "version": "4.6.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/lodash.union/-/lodash.union-4.6.0.tgz", + "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=" + }, + "log4js": { + "version": "6.4.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/log4js/-/log4js-6.4.1.tgz", + "integrity": "sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==", + "requires": { + "date-format": "^4.0.3", + "debug": "^4.3.3", + "flatted": "^3.2.4", + "rfdc": "^1.3.0", + "streamroller": "^3.0.2" + } + }, + "make-iterator": { + "version": "1.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/make-iterator/-/make-iterator-1.0.1.tgz", + "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", + "requires": { + "kind-of": "^6.0.2" + } + }, + "map-cache": { + "version": "0.2.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" + }, + "merge-stream": { + "version": "2.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + }, + "micromatch": { + "version": "4.0.5", + "resolved": "https://repo.huaweicloud.com/repository/npm/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "requires": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + } + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "1.2.6", + "resolved": "https://repo.huaweicloud.com/repository/npm/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" + }, + "ms": { + "version": "2.1.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "mute-stdout": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/mute-stdout/-/mute-stdout-1.0.0.tgz", + "integrity": "sha1-WzLqB+tDyd7WEwQ0z5JvRrKn/U0=" + }, + "next-tick": { + "version": "1.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/next-tick/-/next-tick-1.1.0.tgz", + "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==" + }, + "normalize-package-data": { + "version": "2.5.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "requires": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + }, + "now-and-later": { + "version": "2.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/now-and-later/-/now-and-later-2.0.1.tgz", + "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==", + "requires": { + "once": "^1.3.2" + } + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "requires": { + "path-key": "^3.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, + "object-keys": { + "version": "1.1.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" + }, + "object.assign": { + "version": "4.1.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + } + }, + "object.defaults": { + "version": "1.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/object.defaults/-/object.defaults-1.1.0.tgz", + "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", + "requires": { + "array-each": "^1.0.1", + "array-slice": "^1.0.0", + "for-own": "^1.0.0", + "isobject": "^3.0.0" + } + }, + "object.map": { + "version": "1.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/object.map/-/object.map-1.0.1.tgz", + "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=", + "requires": { + "for-own": "^1.0.0", + "make-iterator": "^1.0.0" + } + }, + "object.pick": { + "version": "1.3.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/object.pick/-/object.pick-1.3.0.tgz", + "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", + "requires": { + "isobject": "^3.0.1" + } + }, + "object.reduce": { + "version": "1.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/object.reduce/-/object.reduce-1.0.1.tgz", + "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=", + "requires": { + "for-own": "^1.0.0", + "make-iterator": "^1.0.0" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1" + } + }, + "onetime": { + "version": "5.1.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "os-locale": { + "version": "1.4.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "requires": { + "lcid": "^1.0.0" + } + }, + "parse-filepath": { + "version": "1.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/parse-filepath/-/parse-filepath-1.0.2.tgz", + "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=", + "requires": { + "is-absolute": "^1.0.0", + "map-cache": "^0.2.0", + "path-root": "^0.1.1" + } + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "requires": { + "error-ex": "^1.2.0" + } + }, + "parse-passwd": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/parse-passwd/-/parse-passwd-1.0.0.tgz", + "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=" + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "requires": { + "pinkie-promise": "^2.0.0" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "path-parse": { + "version": "1.0.7", + "resolved": "https://repo.huaweicloud.com/repository/npm/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + }, + "path-root": { + "version": "0.1.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/path-root/-/path-root-0.1.1.tgz", + "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", + "requires": { + "path-root-regex": "^0.1.0" + } + }, + "path-root-regex": { + "version": "0.1.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/path-root-regex/-/path-root-regex-0.1.2.tgz", + "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=" + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "requires": { + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, + "picomatch": { + "version": "2.3.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" + }, + "pify": { + "version": "2.3.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://repo.huaweicloud.com/repository/npm/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "requires": { + "pinkie": "^2.0.0" + } + }, + "pretty-hrtime": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/pretty-hrtime/-/pretty-hrtime-1.0.0.tgz", + "integrity": "sha1-9ualItPmBwRSK/Db5oVu0g515Nw=" + }, + "printj": { + "version": "1.3.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/printj/-/printj-1.3.1.tgz", + "integrity": "sha512-GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==" + }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, + "punycode": { + "version": "2.1.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "requires": { + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "requires": { + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" + } + }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "readdir-glob": { + "version": "1.1.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/readdir-glob/-/readdir-glob-1.1.1.tgz", + "integrity": "sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA==", + "requires": { + "minimatch": "^3.0.4" + } + }, + "rechoir": { + "version": "0.8.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/rechoir/-/rechoir-0.8.0.tgz", + "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", + "requires": { + "resolve": "^1.20.0" + } + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + }, + "require-from-string": { + "version": "2.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + }, + "resolve": { + "version": "1.22.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", + "requires": { + "is-core-module": "^2.8.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + } + }, + "resolve-dir": { + "version": "1.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/resolve-dir/-/resolve-dir-1.0.1.tgz", + "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", + "requires": { + "expand-tilde": "^2.0.0", + "global-modules": "^1.0.0" + } + }, + "resolve-package-path": { + "version": "4.0.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/resolve-package-path/-/resolve-package-path-4.0.3.tgz", + "integrity": "sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==", + "requires": { + "path-root": "^0.1.1" + } + }, + "rfdc": { + "version": "1.3.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/rfdc/-/rfdc-1.3.0.tgz", + "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==" + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "semver": { + "version": "5.7.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, + "signal-exit": { + "version": "3.0.7", + "resolved": "https://repo.huaweicloud.com/repository/npm/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + }, + "spdx-correct": { + "version": "3.1.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/spdx-correct/-/spdx-correct-3.1.1.tgz", + "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", + "requires": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-exceptions": { + "version": "2.3.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" + }, + "spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.11", + "resolved": "https://repo.huaweicloud.com/repository/npm/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", + "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==" + }, + "stream-exhaust": { + "version": "1.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/stream-exhaust/-/stream-exhaust-1.0.2.tgz", + "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==" + }, + "streamroller": { + "version": "3.0.6", + "resolved": "https://repo.huaweicloud.com/repository/npm/streamroller/-/streamroller-3.0.6.tgz", + "integrity": "sha512-Qz32plKq/MZywYyhEatxyYc8vs994Gz0Hu2MSYXXLD233UyPeIeRBZARIIGwFer4Mdb8r3Y2UqKkgyDghM6QCg==", + "requires": { + "date-format": "^4.0.6", + "debug": "^4.3.4", + "fs-extra": "^10.0.1" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "requires": { + "is-utf8": "^0.2.0" + } + }, + "strip-final-newline": { + "version": "2.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" + }, + "supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" + }, + "tar-stream": { + "version": "2.2.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "requires": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + }, + "dependencies": { + "is-number": { + "version": "7.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + } + } + }, + "type": { + "version": "1.2.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/type/-/type-1.2.0.tgz", + "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" + }, + "unc-path-regex": { + "version": "0.1.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/unc-path-regex/-/unc-path-regex-0.1.2.tgz", + "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=" + }, + "undertaker": { + "version": "1.2.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/undertaker/-/undertaker-1.2.1.tgz", + "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==", + "requires": { + "arr-flatten": "^1.0.1", + "arr-map": "^2.0.0", + "bach": "^1.0.0", + "collection-map": "^1.0.0", + "es6-weak-map": "^2.0.1", + "last-run": "^1.1.0", + "object.defaults": "^1.0.0", + "object.reduce": "^1.0.0", + "undertaker-registry": "^1.0.0" + } + }, + "undertaker-registry": { + "version": "1.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/undertaker-registry/-/undertaker-registry-1.0.1.tgz", + "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=" + }, + "universalify": { + "version": "2.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" + }, + "uri-js": { + "version": "4.4.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "requires": { + "punycode": "^2.1.0" + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "v8flags": { + "version": "3.2.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/v8flags/-/v8flags-3.2.0.tgz", + "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==", + "requires": { + "homedir-polyfill": "^1.0.1" + } + }, + "validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://repo.huaweicloud.com/repository/npm/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "requires": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, + "which": { + "version": "1.3.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "requires": { + "isexe": "^2.0.0" + } + }, + "which-module": { + "version": "1.0.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/which-module/-/which-module-1.0.0.tgz", + "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "y18n": { + "version": "3.2.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/y18n/-/y18n-3.2.2.tgz", + "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==" + }, + "yargs": { + "version": "7.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/yargs/-/yargs-7.1.0.tgz", + "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", + "requires": { + "camelcase": "^3.0.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^1.4.0", + "read-pkg-up": "^1.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^1.0.2", + "which-module": "^1.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^5.0.0" + } + }, + "yargs-parser": { + "version": "5.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/yargs-parser/-/yargs-parser-5.0.1.tgz", + "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==", + "requires": { + "camelcase": "^3.0.0", + "object.assign": "^4.1.0" + } + }, + "zip-stream": { + "version": "4.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/zip-stream/-/zip-stream-4.1.0.tgz", + "integrity": "sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==", + "requires": { + "archiver-utils": "^2.1.0", + "compress-commons": "^4.1.0", + "readable-stream": "^3.6.0" + } + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..774d59b --- /dev/null +++ b/package.json @@ -0,0 +1,18 @@ +{ + "license":"ISC", + "devDependencies":{}, + "name":"screenlock", + "ohos":{ + "org":"huawei", + "directoryLevel":"project", + "buildTool":"hvigor" + }, + "description":"example description", + "repository":{}, + "version":"1.0.0", + "dependencies":{ + "@ohos/hvigor-ohos-plugin":"1.0.6", + "hypium":"^1.0.0", + "@ohos/hvigor":"1.0.6" + } +} \ No newline at end of file diff --git a/product/pc/.gitignore b/product/pc/.gitignore new file mode 100644 index 0000000..4f9a973 --- /dev/null +++ b/product/pc/.gitignore @@ -0,0 +1,3 @@ +/node_modules +/.preview +/build \ No newline at end of file diff --git a/product/pc/build-profile.json5 b/product/pc/build-profile.json5 new file mode 100644 index 0000000..7dc37bb --- /dev/null +++ b/product/pc/build-profile.json5 @@ -0,0 +1,13 @@ +{ + "apiType": 'stageMode', + "buildOption": { + }, + "targets": [ + { + "name": "default", + }, + { + "name": "ohosTest", + } + ] +} \ No newline at end of file diff --git a/product/pc/hvigorfile.js b/product/pc/hvigorfile.js new file mode 100644 index 0000000..d7720ee --- /dev/null +++ b/product/pc/hvigorfile.js @@ -0,0 +1,2 @@ +// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. +module.exports = require('@ohos/hvigor-ohos-plugin').hapTasks diff --git a/product/pc/package-lock.json b/product/pc/package-lock.json new file mode 100644 index 0000000..5293cb9 --- /dev/null +++ b/product/pc/package-lock.json @@ -0,0 +1,38 @@ +{ + "name": "pc", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@ohos/batterycomponent": { + "version": "file:../../features/batterycomponent" + }, + "@ohos/clockcomponent": { + "version": "file:../../features/clockcomponent" + }, + "@ohos/common": { + "version": "file:../../common" + }, + "@ohos/datetimecomponent": { + "version": "file:../../features/datetimecomponent" + }, + "@ohos/noticeitem": { + "version": "file:../../features/noticeitem" + }, + "@ohos/screenlock": { + "version": "file:../../features/screenlock" + }, + "@ohos/shortcutcomponent": { + "version": "file:../../features/shortcutcomponent" + }, + "@ohos/signalcomponent": { + "version": "file:../../features/signalcomponent" + }, + "@ohos/wallpapercomponent": { + "version": "file:../../features/wallpapercomponent" + }, + "@ohos/wificomponent": { + "version": "file:../../features/wificomponent" + } + } +} diff --git a/product/pc/package.json b/product/pc/package.json new file mode 100644 index 0000000..1bb1ae6 --- /dev/null +++ b/product/pc/package.json @@ -0,0 +1,25 @@ +{ + "license": "ISC", + "devDependencies": {}, + "name": "pc", + "ohos": { + "org": "huawei", + "directoryLevel": "module", + "buildTool": "hvigor" + }, + "description": "example description", + "repository": {}, + "version": "1.0.0", + "dependencies": { + "@ohos/wificomponent": "file:../../features/wificomponent", + "@ohos/screenlock": "file:../../features/screenlock", + "@ohos/signalcomponent": "file:../../features/signalcomponent", + "@ohos/clockcomponent": "file:../../features/clockcomponent", + "@ohos/datetimecomponent": "file:../../features/datetimecomponent", + "@ohos/batterycomponent": "file:../../features/batterycomponent", + "@ohos/common": "file:../../common", + "@ohos/noticeitem": "file:../../features/noticeitem", + "@ohos/shortcutcomponent": "file:../../features/shortcutcomponent", + "@ohos/wallpapercomponent": "file:../../features/wallpapercomponent" + } +} diff --git a/product/pc/src/main/ets/AbilityStage.ts b/product/pc/src/main/ets/Application/AbilityStage.ts similarity index 92% rename from product/pc/src/main/ets/AbilityStage.ts rename to product/pc/src/main/ets/Application/AbilityStage.ts index f9b1f6e..7df13e6 100644 --- a/product/pc/src/main/ets/AbilityStage.ts +++ b/product/pc/src/main/ets/Application/AbilityStage.ts @@ -14,7 +14,7 @@ */ import AbilityStage from "@ohos.application.AbilityStage" -import Log from '../../../../../common/src/main/ets/default/Log' +import Log from '../../../../../../common/src/main/ets/default/Log' const TAG = "ScreenLock-MainAbilityStage" diff --git a/product/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/product/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index 06d27e8..0f08194 100644 --- a/product/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/product/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -50,10 +50,11 @@ class ServiceExtAbility extends ServiceExtension { } private async statusBarWindow() { + Log.showInfo(TAG, `statusBarWindow`); let dis = await display.getDefaultDisplay(); - Log.showInfo(TAG, `api8New onCreate, dis: ${JSON.stringify(dis)}`); + Log.showInfo(TAG, `getDefaultDisplay, dis: ${JSON.stringify(dis)}`); let rect; - if (dis.width > dis.height) { // Pad、PC horizontalScreen Mode + if (dis.width > dis.height) { // PadPC horizontalScreen Mode rect = { left: 0, top: 0, diff --git a/product/pc/src/main/ets/ServiceExtAbility/app.ets b/product/pc/src/main/ets/ServiceExtAbility/app.ets deleted file mode 100644 index 1eb4676..0000000 --- a/product/pc/src/main/ets/ServiceExtAbility/app.ets +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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 Log from '../../../../../../common/src/main/ets/default/Log'; - -const TAG = 'ScreenLock-App' - -export default { - onCreate() { - Log.showInfo(TAG, 'Application onCreate'); - }, - onDestroy() { - Log.showInfo(TAG, 'Application onDestroy'); - }, -} diff --git a/product/pc/src/main/ets/ServiceExtAbility/common/StyleConfiguration.ts b/product/pc/src/main/ets/common/StyleConfiguration.ts similarity index 84% rename from product/pc/src/main/ets/ServiceExtAbility/common/StyleConfiguration.ts rename to product/pc/src/main/ets/common/StyleConfiguration.ts index d4ba7d6..3fa9a07 100644 --- a/product/pc/src/main/ets/ServiceExtAbility/common/StyleConfiguration.ts +++ b/product/pc/src/main/ets/common/StyleConfiguration.ts @@ -13,8 +13,8 @@ * limitations under the License. */ -import StyleManager from '../../../../../../../common/src/main/ets/default/StyleManager'; -import Log from '../../../../../../../common/src/main/ets/default/Log'; +import StyleManager from '../../../../../../common/src/main/ets/default/StyleManager'; +import Log from '../../../../../../common/src/main/ets/default/Log'; const TAG = 'Lock_StatusBar-StyleConfiguration'; diff --git a/product/pc/src/main/ets/ServiceExtAbility/common/StyleManager.ts b/product/pc/src/main/ets/common/StyleManager.ts similarity index 84% rename from product/pc/src/main/ets/ServiceExtAbility/common/StyleManager.ts rename to product/pc/src/main/ets/common/StyleManager.ts index b42a951..0918bfe 100644 --- a/product/pc/src/main/ets/ServiceExtAbility/common/StyleManager.ts +++ b/product/pc/src/main/ets/common/StyleManager.ts @@ -13,13 +13,13 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log'; -import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; -import CommonStyleConfiguration from '../../../../../../../common/src/main/ets/default/StyleConfiguration'; -import BatteryStyleConfiguration from '../../../../../../../features/batterycomponent/src/main/ets/default/common/StyleConfiguration' -import WifiStyleConfiguration from '../../../../../../../features/wificomponent/src/main/ets/default/common/StyleConfiguration' -import SignalStyleConfiguration from '../../../../../../../features/signalcomponent/src/main/ets/default/common/StyleConfiguration' -import ClockStyleConfiguration from '../../../../../../../features/clockComponent/src/main/ets/default/common/StyleConfiguration'; +import Log from '../../../../../../common/src/main/ets/default/Log'; +import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; +import CommonStyleConfiguration from '../../../../../../common/src/main/ets/default/StyleConfiguration'; +import BatteryStyleConfiguration from '../../../../../../features/batterycomponent/src/main/ets/default/common/StyleConfiguration' +import WifiStyleConfiguration from '../../../../../../features/wificomponent/src/main/ets/default/common/StyleConfiguration' +import SignalStyleConfiguration from '../../../../../../features/signalcomponent/src/main/ets/default/common/StyleConfiguration' +import ClockStyleConfiguration from '../../../../../../features/clockcomponent/src/main/ets/default/common/StyleConfiguration'; import IndexStyleConfiguration from './StyleConfiguration' const TAG = 'Lock-StatusBar-StyleManager'; diff --git a/product/pc/src/main/ets/ServiceExtAbility/common/constants.ts b/product/pc/src/main/ets/common/constants.ts similarity index 100% rename from product/pc/src/main/ets/ServiceExtAbility/common/constants.ts rename to product/pc/src/main/ets/common/constants.ts diff --git a/product/pc/src/main/ets/ServiceExtAbility/pages/customPassword.ets b/product/pc/src/main/ets/pages/customPassword.ets similarity index 76% rename from product/pc/src/main/ets/ServiceExtAbility/pages/customPassword.ets rename to product/pc/src/main/ets/pages/customPassword.ets index 3f71052..961b8f9 100644 --- a/product/pc/src/main/ets/ServiceExtAbility/pages/customPassword.ets +++ b/product/pc/src/main/ets/pages/customPassword.ets @@ -13,11 +13,11 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log' -import CommonStyleManager from '../../../../../../../common/src/main/ets/default/StyleManager' -import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' -import StatusBar from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar.ets' -import CustomPSD from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/customPSD.ets' +import Log from '../../../../../../common/src/main/ets/default/Log' +import CommonStyleManager from '../../../../../../common/src/main/ets/default/StyleManager' +import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' +import StatusBar from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar' +import CustomPSD from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/customPSD' import Constants from '../common/constants' import StyleManager from '../common/StyleManager' diff --git a/product/phone/src/main/ets/ServiceExtAbility/pages/customscreenlock.ets b/product/pc/src/main/ets/pages/customscreenlock.ets similarity index 92% rename from product/phone/src/main/ets/ServiceExtAbility/pages/customscreenlock.ets rename to product/pc/src/main/ets/pages/customscreenlock.ets index 0f95847..514cb35 100644 --- a/product/phone/src/main/ets/ServiceExtAbility/pages/customscreenlock.ets +++ b/product/pc/src/main/ets/pages/customscreenlock.ets @@ -13,11 +13,10 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log' +import Log from '../../../../../../common/src/main/ets/default/Log' const TAG = 'ScreenLock-CustomScreenlock' -@Entry @Component export default struct CustomScreenlock { build() { diff --git a/product/pc/src/main/ets/ServiceExtAbility/pages/digitalPassword.ets b/product/pc/src/main/ets/pages/digitalPassword.ets similarity index 76% rename from product/pc/src/main/ets/ServiceExtAbility/pages/digitalPassword.ets rename to product/pc/src/main/ets/pages/digitalPassword.ets index 94eb455..97751fc 100644 --- a/product/pc/src/main/ets/ServiceExtAbility/pages/digitalPassword.ets +++ b/product/pc/src/main/ets/pages/digitalPassword.ets @@ -13,11 +13,11 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log' -import CommonStyleManager from '../../../../../../../common/src/main/ets/default/StyleManager' -import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' -import StatusBar from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar.ets' -import DigitalPSD from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/digitalPSD.ets' +import Log from '../../../../../../common/src/main/ets/default/Log' +import CommonStyleManager from '../../../../../../common/src/main/ets/default/StyleManager' +import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' +import StatusBar from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar' +import DigitalPSD from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/digitalPSD' import Constants from '../common/constants' import StyleManager from '../common/StyleManager' diff --git a/product/phone/src/main/ets/ServiceExtAbility/pages/index.ets b/product/pc/src/main/ets/pages/index.ets similarity index 77% rename from product/phone/src/main/ets/ServiceExtAbility/pages/index.ets rename to product/pc/src/main/ets/pages/index.ets index 844ec65..af48245 100644 --- a/product/phone/src/main/ets/ServiceExtAbility/pages/index.ets +++ b/product/pc/src/main/ets/pages/index.ets @@ -13,14 +13,14 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log' -import CommonStyleManager from '../../../../../../../common/src/main/ets/default/StyleManager' -import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' -import {LockStyleMode} from '../../../../../../../features/screenlock/src/main/ets/com/ohos/model/screenlockStyle' +import Log from '../../../../../../common/src/main/ets/default/Log' +import CommonStyleManager from '../../../../../../common/src/main/ets/default/StyleManager' +import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' +import {LockStyleMode} from '../../../../../../features/screenlock/src/main/ets/com/ohos/model/screenlockStyle' import ViewModel from '../vm/indexViewModel' -import SlideScreenLock from './slidescreenlock.ets' -import CustomScreenLock from './customscreenlock.ets' -import JournalScreenLock from './journalscreenlock.ets' +import SlideScreenLock from './slidescreenlock' +import CustomScreenLock from './customscreenlock' +import JournalScreenLock from './journalscreenlock' import Constants from '../common/constants' import StyleManager from '../common/StyleManager' import Router from '@system.router'; @@ -32,17 +32,22 @@ const TAG = 'ScreenLock-Entry'; struct Index { @State mViewModel: ViewModel = new ViewModel() @State pageStatus: number = Constants.STATUS_ABOUT_TO_APPEAR - @State mHeightPx: number = 48 + @State mHeightPx: number = 0 + aboutToAppear() { Log.showInfo(TAG, `aboutToAppear`) - this.pageStatus = Constants.STATUS_ABOUT_TO_APPEAR - this.mViewModel.ViewModelInit() - setAppBgColor('#00000000') + try { + setAppBgColor('#00000000') + } catch (error) { + Log.showInfo(TAG, `setAppBgColor error:` + JSON.stringify(error)); + } CommonStyleManager.setAbilityPageName(TAG) let configInfo = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_STATUS_BAR, 'rect') Log.showInfo(TAG, `configMaxWidth${JSON.stringify(configInfo.height)}`) this.mHeightPx = configInfo.height StyleManager.setStyle() + this.pageStatus = Constants.STATUS_ABOUT_TO_APPEAR + this.mViewModel.ViewModelInit() } aboutToDisappear() { @@ -62,7 +67,7 @@ struct Index { this.pageStatus = Constants.STATUS_ON_PAGE_HIDE } - onBackPress():boolean { + onBackPress(): boolean { let length = Router.getLength() Log.showInfo(TAG, `onBackPress length: ${length}`) if (length > 1) { diff --git a/product/pc/src/main/ets/ServiceExtAbility/pages/journalscreenlock.ets b/product/pc/src/main/ets/pages/journalscreenlock.ets similarity index 92% rename from product/pc/src/main/ets/ServiceExtAbility/pages/journalscreenlock.ets rename to product/pc/src/main/ets/pages/journalscreenlock.ets index 8622e40..e435965 100644 --- a/product/pc/src/main/ets/ServiceExtAbility/pages/journalscreenlock.ets +++ b/product/pc/src/main/ets/pages/journalscreenlock.ets @@ -13,11 +13,10 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log' +import Log from '../../../../../../common/src/main/ets/default/Log' const TAG = 'ScreenLock-JournalScreenlock' -@Entry @Component export default struct JournalScreenlock { build() { diff --git a/product/pc/src/main/ets/ServiceExtAbility/pages/mixedPassword.ets b/product/pc/src/main/ets/pages/mixedPassword.ets similarity index 76% rename from product/pc/src/main/ets/ServiceExtAbility/pages/mixedPassword.ets rename to product/pc/src/main/ets/pages/mixedPassword.ets index 2f2f73f..77e25de 100644 --- a/product/pc/src/main/ets/ServiceExtAbility/pages/mixedPassword.ets +++ b/product/pc/src/main/ets/pages/mixedPassword.ets @@ -13,11 +13,11 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log' -import CommonStyleManager from '../../../../../../../common/src/main/ets/default/StyleManager' -import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' -import StatusBar from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar.ets' -import MixedPSD from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/MixedPSD.ets' +import Log from '../../../../../../common/src/main/ets/default/Log' +import CommonStyleManager from '../../../../../../common/src/main/ets/default/StyleManager' +import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' +import StatusBar from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar' +import MixedPSD from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/MixedPSD' import Constants from '../common/constants' import StyleManager from '../common/StyleManager' diff --git a/product/pc/src/main/ets/ServiceExtAbility/pages/slidescreenlock.ets b/product/pc/src/main/ets/pages/slidescreenlock.ets similarity index 81% rename from product/pc/src/main/ets/ServiceExtAbility/pages/slidescreenlock.ets rename to product/pc/src/main/ets/pages/slidescreenlock.ets index 94c89bc..086df03 100644 --- a/product/pc/src/main/ets/ServiceExtAbility/pages/slidescreenlock.ets +++ b/product/pc/src/main/ets/pages/slidescreenlock.ets @@ -13,21 +13,20 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log' -import Accounts from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/accounts.ets' -import DateTime from '../../../../../../../features/datetimecomponent/src/main/ets/com/ohos/view/component/dateTime.ets' -import BatterySoc from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/batterySoc.ets' -import LockIcon from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/lockIcon.ets' -import Wallpaper from '../../../../../../../features/wallpapercomponent/src/main/ets/com/ohos/view/component/wallpaper.ets' -import NotificationListComponent from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeItem/view/NotificationListComponent.ets' -import StatusBar from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar.ets' -import Shortcut from '../../../../../../../features/shortcutcomponent/src/main/ets/com/ohos/view/component/shortcut.ets' +import Log from '../../../../../../common/src/main/ets/default/Log' +import Accounts from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/accounts' +import DateTime from '../../../../../../features/datetimecomponent/src/main/ets/com/ohos/view/component/dateTime' +import BatterySoc from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/batterySoc' +import LockIcon from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/lockIcon' +import Wallpaper from '../../../../../../features/wallpapercomponent/src/main/ets/com/ohos/view/component/wallpaper' +import NotificationListComponent from '../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeItem/view/NotificationListComponent' +import StatusBar from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar' +import Shortcut from '../../../../../../features/shortcutcomponent/src/main/ets/com/ohos/view/component/shortcut' import Constants from '../common/constants' import ViewModel from '../vm/slideScreenLockViewModel' const TAG = 'ScreenLock-SlideScreenlock' -@Entry @Component export default struct SlideScreenlock { @State mViewModel: ViewModel = new ViewModel() diff --git a/product/pc/src/main/ets/ServiceExtAbility/vm/indexViewModel.ts b/product/pc/src/main/ets/vm/indexViewModel.ts similarity index 83% rename from product/pc/src/main/ets/ServiceExtAbility/vm/indexViewModel.ts rename to product/pc/src/main/ets/vm/indexViewModel.ts index c9d44db..9dd21fc 100644 --- a/product/pc/src/main/ets/ServiceExtAbility/vm/indexViewModel.ts +++ b/product/pc/src/main/ets/vm/indexViewModel.ts @@ -13,10 +13,10 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log'; +import Log from '../../../../../../common/src/main/ets/default/Log'; import ScreenlockStyle, {LockStyleMode -} from '../../../../../../../features/screenlock/src/main/ets/com/ohos/model/screenlockStyle' -import ScreenLockService from '../../../../../../../features/screenlock/src/main/ets/com/ohos/model/screenLockService' +} from '../../../../../../features/screenlock/src/main/ets/com/ohos/model/screenlockStyle' +import ScreenLockService from '../../../../../../features/screenlock/src/main/ets/com/ohos/model/screenLockService' const TAG = 'ScreenLock-IndexViewModel' diff --git a/product/pc/src/main/ets/ServiceExtAbility/vm/slideScreenLockViewModel.ts b/product/pc/src/main/ets/vm/slideScreenLockViewModel.ts similarity index 91% rename from product/pc/src/main/ets/ServiceExtAbility/vm/slideScreenLockViewModel.ts rename to product/pc/src/main/ets/vm/slideScreenLockViewModel.ts index 93f1aa9..9786ea2 100644 --- a/product/pc/src/main/ets/ServiceExtAbility/vm/slideScreenLockViewModel.ts +++ b/product/pc/src/main/ets/vm/slideScreenLockViewModel.ts @@ -13,9 +13,9 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log'; -import {ReadConfigFile} from '../../../../../../../common/src/main/ets/default/ScreenLockCommon' -import ScreenLockService from '../../../../../../../features/screenlock/src/main/ets/com/ohos/model/screenLockService' +import Log from '../../../../../../common/src/main/ets/default/Log'; +import {ReadConfigFile} from '../../../../../../common/src/main/ets/default/ScreenLockCommon' +import ScreenLockService from '../../../../../../features/screenlock/src/main/ets/com/ohos/model/screenLockService' import Constants from '../common/constants' import {Callback} from 'basic'; diff --git a/product/pc/src/main/config.json b/product/pc/src/main/module.json5 similarity index 56% rename from product/pc/src/main/config.json rename to product/pc/src/main/module.json5 index 08a446d..aeae5a3 100644 --- a/product/pc/src/main/config.json +++ b/product/pc/src/main/module.json5 @@ -1,32 +1,18 @@ { - "app": { - "bundleName": "com.ohos.screenlock", - "vendor": "ohos", - "singleton": true, - "version": { - "code": 2, - "name": "1.1" - } - }, - "deviceConfig": { - "default": { - "keepAlive": true - } - }, "module": { - "package": "com.ohos.screenlock", - "name": ".MyApplication", - "mainAbility": ".ServiceExtAbility", - "deviceType": [ + "name": "pc", + "type": "feature", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:pc_desc", + "mainElement": "ServiceExtAbility", + "deviceTypes": [ "tablet" ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "pc", - "moduleType": "feature", - "installationFree": false - }, - "reqPermissions": [ + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:main_pages", + "uiSyntax": "ets", + "requestPermissions": [ { "name": "ohos.permission.MANAGE_LOCAL_ACCOUNTS" }, @@ -85,36 +71,15 @@ "name": "ohos.permission.SET_WALLPAPER" } ], - "abilities": [ + "extensionAbilities": [ { - "label": "$string:app_name", - "launchType": "singleton", - "srcPath": "ServiceExtAbility", - "name": ".ServiceExtAbility", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:description_mainability", - "type": "service", - "visible": true - } - ], - "js": [ - { - "mode": { - "syntax": "ets", - "type": "pageAbility" - }, - "pages": [ - "pages/index", - "pages/digitalPassword", - "pages/mixedPassword", - "pages/customPassword" - ], "name": "ServiceExtAbility", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } + "srcEntrance": "./ets/ServiceExtAbility/ServiceExtAbility.ts", + "description": "$string:MainAbility_desc", + "icon": "$media:icon", + "label": "$string:app_name", + "visible": true, + "type": "service" } ] } diff --git a/product/pc/src/main/resources/base/element/string.json b/product/pc/src/main/resources/base/element/string.json index baf627c..f97e581 100644 --- a/product/pc/src/main/resources/base/element/string.json +++ b/product/pc/src/main/resources/base/element/string.json @@ -1,11 +1,15 @@ { "string": [ + { + "name": "pc_desc", + "value": "description" + }, { "name": "app_name", "value": "ScreenLock" }, { - "name": "mainability_description", + "name": "MainAbility_desc", "value": "JS_Phone_Empty Feature Ability" }, { diff --git a/product/pc/src/main/resources/base/profile/main_pages.json b/product/pc/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000..37cf701 --- /dev/null +++ b/product/pc/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,8 @@ +{ + "src": [ + "pages/index", + "pages/digitalPassword", + "pages/mixedPassword", + "pages/customPassword" + ] +} diff --git a/product/phone/.gitignore b/product/phone/.gitignore new file mode 100644 index 0000000..4f9a973 --- /dev/null +++ b/product/phone/.gitignore @@ -0,0 +1,3 @@ +/node_modules +/.preview +/build \ No newline at end of file diff --git a/product/phone/build-profile.json5 b/product/phone/build-profile.json5 new file mode 100644 index 0000000..7dc37bb --- /dev/null +++ b/product/phone/build-profile.json5 @@ -0,0 +1,13 @@ +{ + "apiType": 'stageMode', + "buildOption": { + }, + "targets": [ + { + "name": "default", + }, + { + "name": "ohosTest", + } + ] +} \ No newline at end of file diff --git a/product/phone/hvigorfile.js b/product/phone/hvigorfile.js new file mode 100644 index 0000000..d7720ee --- /dev/null +++ b/product/phone/hvigorfile.js @@ -0,0 +1,2 @@ +// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. +module.exports = require('@ohos/hvigor-ohos-plugin').hapTasks diff --git a/product/phone/package-lock.json b/product/phone/package-lock.json new file mode 100644 index 0000000..0c8c849 --- /dev/null +++ b/product/phone/package-lock.json @@ -0,0 +1,38 @@ +{ + "name": "phone", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@ohos/batterycomponent": { + "version": "file:../../features/batterycomponent" + }, + "@ohos/clockcomponent": { + "version": "file:../../features/clockcomponent" + }, + "@ohos/common": { + "version": "file:../../common" + }, + "@ohos/datetimecomponent": { + "version": "file:../../features/datetimecomponent" + }, + "@ohos/noticeitem": { + "version": "file:../../features/noticeitem" + }, + "@ohos/screenlock": { + "version": "file:../../features/screenlock" + }, + "@ohos/shortcutcomponent": { + "version": "file:../../features/shortcutcomponent" + }, + "@ohos/signalcomponent": { + "version": "file:../../features/signalcomponent" + }, + "@ohos/wallpapercomponent": { + "version": "file:../../features/wallpapercomponent" + }, + "@ohos/wificomponent": { + "version": "file:../../features/wificomponent" + } + } +} diff --git a/product/phone/package.json b/product/phone/package.json new file mode 100644 index 0000000..0e97cee --- /dev/null +++ b/product/phone/package.json @@ -0,0 +1,25 @@ +{ + "license": "ISC", + "devDependencies": {}, + "name": "phone", + "ohos": { + "org": "huawei", + "directoryLevel": "module", + "buildTool": "hvigor" + }, + "description": "example description", + "repository": {}, + "version": "1.0.0", + "dependencies": { + "@ohos/wificomponent": "file:../../features/wificomponent", + "@ohos/screenlock": "file:../../features/screenlock", + "@ohos/signalcomponent": "file:../../features/signalcomponent", + "@ohos/clockcomponent": "file:../../features/clockcomponent", + "@ohos/datetimecomponent": "file:../../features/datetimecomponent", + "@ohos/batterycomponent": "file:../../features/batterycomponent", + "@ohos/common": "file:../../common", + "@ohos/noticeitem": "file:../../features/noticeitem", + "@ohos/shortcutcomponent": "file:../../features/shortcutcomponent", + "@ohos/wallpapercomponent": "file:../../features/wallpapercomponent" + } +} diff --git a/product/phone/src/main/ets/Application/AbilityStage.ts b/product/phone/src/main/ets/Application/AbilityStage.ts new file mode 100644 index 0000000..32dfe93 --- /dev/null +++ b/product/phone/src/main/ets/Application/AbilityStage.ts @@ -0,0 +1,7 @@ +import AbilityStage from "@ohos.application.AbilityStage" + +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.log("[Demo] MyAbilityStage onCreate") + } +} \ No newline at end of file diff --git a/product/phone/src/main/ets/ServiceExtAbility/app.ets b/product/phone/src/main/ets/ServiceExtAbility/app.ets deleted file mode 100644 index 1eb4676..0000000 --- a/product/phone/src/main/ets/ServiceExtAbility/app.ets +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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 Log from '../../../../../../common/src/main/ets/default/Log'; - -const TAG = 'ScreenLock-App' - -export default { - onCreate() { - Log.showInfo(TAG, 'Application onCreate'); - }, - onDestroy() { - Log.showInfo(TAG, 'Application onDestroy'); - }, -} diff --git a/product/phone/src/main/ets/ServiceExtAbility/common/StyleConfiguration.ts b/product/phone/src/main/ets/common/StyleConfiguration.ts similarity index 84% rename from product/phone/src/main/ets/ServiceExtAbility/common/StyleConfiguration.ts rename to product/phone/src/main/ets/common/StyleConfiguration.ts index d4ba7d6..3fa9a07 100644 --- a/product/phone/src/main/ets/ServiceExtAbility/common/StyleConfiguration.ts +++ b/product/phone/src/main/ets/common/StyleConfiguration.ts @@ -13,8 +13,8 @@ * limitations under the License. */ -import StyleManager from '../../../../../../../common/src/main/ets/default/StyleManager'; -import Log from '../../../../../../../common/src/main/ets/default/Log'; +import StyleManager from '../../../../../../common/src/main/ets/default/StyleManager'; +import Log from '../../../../../../common/src/main/ets/default/Log'; const TAG = 'Lock_StatusBar-StyleConfiguration'; diff --git a/product/phone/src/main/ets/ServiceExtAbility/common/StyleManager.ts b/product/phone/src/main/ets/common/StyleManager.ts similarity index 89% rename from product/phone/src/main/ets/ServiceExtAbility/common/StyleManager.ts rename to product/phone/src/main/ets/common/StyleManager.ts index aa97f7a..5a6c851 100644 --- a/product/phone/src/main/ets/ServiceExtAbility/common/StyleManager.ts +++ b/product/phone/src/main/ets/common/StyleManager.ts @@ -13,8 +13,8 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log'; -import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; +import Log from '../../../../../../common/src/main/ets/default/Log'; +import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; import IndexStyleConfiguration from './StyleConfiguration' const TAG = 'StatusBar-StyleManager'; diff --git a/product/phone/src/main/ets/ServiceExtAbility/common/constants.ts b/product/phone/src/main/ets/common/constants.ts similarity index 100% rename from product/phone/src/main/ets/ServiceExtAbility/common/constants.ts rename to product/phone/src/main/ets/common/constants.ts diff --git a/product/phone/src/main/ets/ServiceExtAbility/pages/customPassword.ets b/product/phone/src/main/ets/pages/customPassword.ets similarity index 77% rename from product/phone/src/main/ets/ServiceExtAbility/pages/customPassword.ets rename to product/phone/src/main/ets/pages/customPassword.ets index 7ad20cc..b5e4d77 100644 --- a/product/phone/src/main/ets/ServiceExtAbility/pages/customPassword.ets +++ b/product/phone/src/main/ets/pages/customPassword.ets @@ -13,11 +13,11 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log' -import CommonStyleManager from '../../../../../../../common/src/main/ets/default/StyleManager' -import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' -import StatusBar from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar.ets' -import CustomPSD from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/customPSD.ets' +import Log from '../../../../../../common/src/main/ets/default/Log' +import CommonStyleManager from '../../../../../../common/src/main/ets/default/StyleManager' +import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' +import StatusBar from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar' +import CustomPSD from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/customPSD' import Constants from '../common/constants' import StyleManager from '../common/StyleManager' diff --git a/product/pc/src/main/ets/ServiceExtAbility/pages/customscreenlock.ets b/product/phone/src/main/ets/pages/customscreenlock.ets similarity index 92% rename from product/pc/src/main/ets/ServiceExtAbility/pages/customscreenlock.ets rename to product/phone/src/main/ets/pages/customscreenlock.ets index 0f95847..514cb35 100644 --- a/product/pc/src/main/ets/ServiceExtAbility/pages/customscreenlock.ets +++ b/product/phone/src/main/ets/pages/customscreenlock.ets @@ -13,11 +13,10 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log' +import Log from '../../../../../../common/src/main/ets/default/Log' const TAG = 'ScreenLock-CustomScreenlock' -@Entry @Component export default struct CustomScreenlock { build() { diff --git a/product/phone/src/main/ets/ServiceExtAbility/pages/digitalPassword.ets b/product/phone/src/main/ets/pages/digitalPassword.ets similarity index 77% rename from product/phone/src/main/ets/ServiceExtAbility/pages/digitalPassword.ets rename to product/phone/src/main/ets/pages/digitalPassword.ets index 42c1474..264e025 100644 --- a/product/phone/src/main/ets/ServiceExtAbility/pages/digitalPassword.ets +++ b/product/phone/src/main/ets/pages/digitalPassword.ets @@ -13,11 +13,11 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log' -import CommonStyleManager from '../../../../../../../common/src/main/ets/default/StyleManager' -import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' -import StatusBar from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar.ets' -import DigitalPSD from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/digitalPSD.ets' +import Log from '../../../../../../common/src/main/ets/default/Log' +import CommonStyleManager from '../../../../../../common/src/main/ets/default/StyleManager' +import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' +import StatusBar from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar' +import DigitalPSD from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/digitalPSD' import Constants from '../common/constants' import StyleManager from '../common/StyleManager' diff --git a/product/pc/src/main/ets/ServiceExtAbility/pages/index.ets b/product/phone/src/main/ets/pages/index.ets similarity index 65% rename from product/pc/src/main/ets/ServiceExtAbility/pages/index.ets rename to product/phone/src/main/ets/pages/index.ets index 70a7712..51cfbef 100644 --- a/product/pc/src/main/ets/ServiceExtAbility/pages/index.ets +++ b/product/phone/src/main/ets/pages/index.ets @@ -13,14 +13,14 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log' -import CommonStyleManager from '../../../../../../../common/src/main/ets/default/StyleManager' -import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' -import {LockStyleMode} from '../../../../../../../features/screenlock/src/main/ets/com/ohos/model/screenlockStyle' +import Log from '../../../../../../common/src/main/ets/default/Log' +import CommonStyleManager from '../../../../../../common/src/main/ets/default/StyleManager' +import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' +import {LockStyleMode} from '../../../../../../features/screenlock/src/main/ets/com/ohos/model/screenlockStyle' import ViewModel from '../vm/indexViewModel' -import SlideScreenLock from './slidescreenlock.ets' -import CustomScreenLock from './customscreenlock.ets' -import JournalScreenLock from './journalscreenlock.ets' +import SlideScreenLock from './slidescreenlock' +import CustomScreenLock from './customscreenlock' +import JournalScreenLock from './journalscreenlock' import Constants from '../common/constants' import StyleManager from '../common/StyleManager' import Router from '@system.router'; @@ -32,18 +32,23 @@ const TAG = 'ScreenLock-Entry'; struct Index { @State mViewModel: ViewModel = new ViewModel() @State pageStatus: number = Constants.STATUS_ABOUT_TO_APPEAR - @State mHeightPx: number = 0 + @State mHeightPx: number = 48 aboutToAppear() { Log.showInfo(TAG, `aboutToAppear`) - setAppBgColor('#00000000') - CommonStyleManager.setAbilityPageName(TAG) - let configInfo = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_STATUS_BAR, 'rect') - Log.showInfo(TAG, `configMaxWidth${JSON.stringify(configInfo.height)}`) - this.mHeightPx = configInfo.height - StyleManager.setStyle() - this.pageStatus = Constants.STATUS_ABOUT_TO_APPEAR this.mViewModel.ViewModelInit() + this.pageStatus = Constants.STATUS_ABOUT_TO_APPEAR + try { + setAppBgColor('#00000000') + CommonStyleManager.setAbilityPageName(TAG) + let configInfo = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_STATUS_BAR, 'rect') + Log.showInfo(TAG, `configMaxWidth${JSON.stringify(configInfo.height)}`) + this.mHeightPx = configInfo.height + StyleManager.setStyle() + this.pageStatus = Constants.STATUS_ABOUT_TO_APPEAR + } catch (error) { + Log.showInfo(TAG, `set status error:` + JSON.stringify(error)); + } } aboutToDisappear() { @@ -63,7 +68,7 @@ struct Index { this.pageStatus = Constants.STATUS_ON_PAGE_HIDE } - onBackPress():boolean { + onBackPress(): boolean { let length = Router.getLength() Log.showInfo(TAG, `onBackPress length: ${length}`) if (length > 1) { @@ -77,7 +82,7 @@ struct Index { Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { if (this.mViewModel.mode == LockStyleMode.SlideScreenLock) { // Slide of lock screen - SlideScreenLock({ pageStatus: this.pageStatus , mHeightPx:this.mHeightPx}) + SlideScreenLock({ pageStatus: this.pageStatus, mHeightPx: this.mHeightPx }) } else if (this.mViewModel.mode == LockStyleMode.JournalScreenLock) { JournalScreenLock() } else if (this.mViewModel.mode == LockStyleMode.CustomScreenLock) { diff --git a/product/phone/src/main/ets/ServiceExtAbility/pages/journalscreenlock.ets b/product/phone/src/main/ets/pages/journalscreenlock.ets similarity index 92% rename from product/phone/src/main/ets/ServiceExtAbility/pages/journalscreenlock.ets rename to product/phone/src/main/ets/pages/journalscreenlock.ets index 8622e40..e435965 100644 --- a/product/phone/src/main/ets/ServiceExtAbility/pages/journalscreenlock.ets +++ b/product/phone/src/main/ets/pages/journalscreenlock.ets @@ -13,11 +13,10 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log' +import Log from '../../../../../../common/src/main/ets/default/Log' const TAG = 'ScreenLock-JournalScreenlock' -@Entry @Component export default struct JournalScreenlock { build() { diff --git a/product/phone/src/main/ets/ServiceExtAbility/pages/mixedPassword.ets b/product/phone/src/main/ets/pages/mixedPassword.ets similarity index 77% rename from product/phone/src/main/ets/ServiceExtAbility/pages/mixedPassword.ets rename to product/phone/src/main/ets/pages/mixedPassword.ets index 85b8d97..611d4d8 100644 --- a/product/phone/src/main/ets/ServiceExtAbility/pages/mixedPassword.ets +++ b/product/phone/src/main/ets/pages/mixedPassword.ets @@ -13,11 +13,11 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log' -import CommonStyleManager from '../../../../../../../common/src/main/ets/default/StyleManager' -import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' -import StatusBar from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar.ets' -import MixedPSD from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/MixedPSD.ets' +import Log from '../../../../../../common/src/main/ets/default/Log' +import CommonStyleManager from '../../../../../../common/src/main/ets/default/StyleManager' +import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' +import StatusBar from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar' +import MixedPSD from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/MixedPSD' import Constants from '../common/constants' import StyleManager from '../common/StyleManager' diff --git a/product/phone/src/main/ets/ServiceExtAbility/pages/slidescreenlock.ets b/product/phone/src/main/ets/pages/slidescreenlock.ets similarity index 83% rename from product/phone/src/main/ets/ServiceExtAbility/pages/slidescreenlock.ets rename to product/phone/src/main/ets/pages/slidescreenlock.ets index b69d2a0..2151567 100644 --- a/product/phone/src/main/ets/ServiceExtAbility/pages/slidescreenlock.ets +++ b/product/phone/src/main/ets/pages/slidescreenlock.ets @@ -13,19 +13,18 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log' -import Accounts from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/accounts.ets' -import DateTime from '../../../../../../../features/datetimecomponent/src/main/ets/com/ohos/view/component/dateTime.ets' -import LockIcon from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/lockIcon.ets' -import Wallpaper from '../../../../../../../features/wallpapercomponent/src/main/ets/com/ohos/view/component/wallpaper.ets' -import NotificationListComponent from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeItem/view/NotificationListComponent.ets' -import StatusBar from '../../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar.ets' +import Log from '../../../../../../common/src/main/ets/default/Log' +import Accounts from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/accounts' +import DateTime from '../../../../../../features/datetimecomponent/src/main/ets/com/ohos/view/component/dateTime' +import LockIcon from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/lockIcon' +import Wallpaper from '../../../../../../features/wallpapercomponent/src/main/ets/com/ohos/view/component/wallpaper' +import NotificationListComponent from '../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeItem/view/NotificationListComponent' +import StatusBar from '../../../../../../features/screenlock/src/main/ets/com/ohos/view/component/statusBar' import Constants from '../common/constants' import ViewModel from '../vm/slideScreenLockViewModel' const TAG = 'ScreenLock-SlideScreenlock' -@Entry @Component export default struct SlideScreenlock { @State mViewModel: ViewModel = new ViewModel() diff --git a/product/phone/src/main/ets/ServiceExtAbility/vm/indexViewModel.ts b/product/phone/src/main/ets/vm/indexViewModel.ts similarity index 84% rename from product/phone/src/main/ets/ServiceExtAbility/vm/indexViewModel.ts rename to product/phone/src/main/ets/vm/indexViewModel.ts index 8fc9c3e..8e766de 100644 --- a/product/phone/src/main/ets/ServiceExtAbility/vm/indexViewModel.ts +++ b/product/phone/src/main/ets/vm/indexViewModel.ts @@ -13,9 +13,9 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log'; -import ScreenlockStyle, {LockStyleMode} from '../../../../../../../features/screenlock/src/main/ets/com/ohos/model/screenlockStyle' -import ScreenLockService from '../../../../../../../features/screenlock/src/main/ets/com/ohos/model/screenLockService' +import Log from '../../../../../../common/src/main/ets/default/Log'; +import ScreenlockStyle, {LockStyleMode} from '../../../../../../features/screenlock/src/main/ets/com/ohos/model/screenlockStyle' +import ScreenLockService from '../../../../../../features/screenlock/src/main/ets/com/ohos/model/screenLockService' const TAG = 'ScreenLock-IndexViewModel' diff --git a/product/phone/src/main/ets/ServiceExtAbility/vm/slideScreenLockViewModel.ts b/product/phone/src/main/ets/vm/slideScreenLockViewModel.ts similarity index 90% rename from product/phone/src/main/ets/ServiceExtAbility/vm/slideScreenLockViewModel.ts rename to product/phone/src/main/ets/vm/slideScreenLockViewModel.ts index a4cfed3..87d1cc9 100644 --- a/product/phone/src/main/ets/ServiceExtAbility/vm/slideScreenLockViewModel.ts +++ b/product/phone/src/main/ets/vm/slideScreenLockViewModel.ts @@ -13,9 +13,9 @@ * limitations under the License. */ -import Log from '../../../../../../../common/src/main/ets/default/Log'; -import {ReadConfigFile} from '../../../../../../../common/src/main/ets/default/ScreenLockCommon' -import ScreenLockService from '../../../../../../../features/screenlock/src/main/ets/com/ohos/model/screenLockService' +import Log from '../../../../../../common/src/main/ets/default/Log'; +import {ReadConfigFile} from '../../../../../../common/src/main/ets/default/ScreenLockCommon' +import ScreenLockService from '../../../../../../features/screenlock/src/main/ets/com/ohos/model/screenLockService' import Constants from '../common/constants' import {Callback} from 'basic'; diff --git a/product/phone/src/main/config.json b/product/phone/src/main/module.json5 similarity index 56% rename from product/phone/src/main/config.json rename to product/phone/src/main/module.json5 index e427f5f..f97d9d3 100644 --- a/product/phone/src/main/config.json +++ b/product/phone/src/main/module.json5 @@ -1,32 +1,18 @@ { - "app": { - "bundleName": "com.ohos.screenlock", - "vendor": "ohos", - "singleton": true, - "version": { - "code": 2, - "name": "1.1" - } - }, - "deviceConfig": { - "default": { - "keepAlive": true - } - }, "module": { - "package": "com.ohos.screenlock", - "name": ".MyApplication", - "mainAbility": ".ServiceExtAbility", - "deviceType": [ + "name": "phone", + "type": "feature", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_desc", + "mainElement": "ServiceExtAbility", + "deviceTypes": [ "phone" ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "phone", - "moduleType": "feature", - "installationFree": false - }, - "reqPermissions": [ + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:main_pages", + "uiSyntax": "ets", + "requestPermissions": [ { "name": "ohos.permission.MANAGE_LOCAL_ACCOUNTS" }, @@ -85,36 +71,15 @@ "name": "ohos.permission.SET_WALLPAPER" } ], - "abilities": [ + "extensionAbilities": [ { - "label": "$string:app_name", - "launchType": "singleton", - "srcPath": "ServiceExtAbility", - "name": ".ServiceExtAbility", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:description_mainability", - "type": "service", - "visible": true - } - ], - "js": [ - { - "mode": { - "syntax": "ets", - "type": "pageAbility" - }, - "pages": [ - "pages/index", - "pages/digitalPassword", - "pages/mixedPassword", - "pages/customPassword" - ], "name": "ServiceExtAbility", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } + "srcEntrance": "./ets/ServiceExtAbility/ServiceExtAbility.ts", + "description": "$string:MainAbility_desc", + "icon": "$media:icon", + "label": "$string:app_name", + "visible": true, + "type": "service" } ] } diff --git a/product/phone/src/main/resources/base/element/string.json b/product/phone/src/main/resources/base/element/string.json index ba1906b..154373d 100644 --- a/product/phone/src/main/resources/base/element/string.json +++ b/product/phone/src/main/resources/base/element/string.json @@ -1,11 +1,15 @@ { "string": [ + { + "name": "phone_desc", + "value": "description" + }, { "name": "app_name", "value": "ScreenLock" }, { - "name": "mainability_description", + "name": "MainAbility_desc", "value": "JS_Phone_Empty Feature Ability" }, { diff --git a/product/phone/src/main/resources/base/profile/main_pages.json b/product/phone/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000..37cf701 --- /dev/null +++ b/product/phone/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,8 @@ +{ + "src": [ + "pages/index", + "pages/digitalPassword", + "pages/mixedPassword", + "pages/customPassword" + ] +} diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 68cb770..0000000 --- a/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * 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. - */ -include ':entry', ':phone', ':pc', ':common', ':features:screenlock', - ':features:noticeitem', ':features:batterycomponent', - ':features:datetimecomponent', ':features:wallpapercomponent', ':features:shortcutcomponent', - ':features:clockcomponent', ':features:wificomponent', ':features:signalcomponent' -project(':phone').projectDir = new File('./product/phone') -project(':pc').projectDir = new File('./product/pc') \ No newline at end of file diff --git a/signature/screenlock.p7b b/signature/screenlock.p7b index 78b2f15abe87b6d4dec897ba496f8d9e8341a67b..6596e1b905e027b66c42dad68135d6a271eb47f3 100644 GIT binary patch delta 424 zcmaDSwOz)+po!0zjZ>@5qwPB{BRkWACO#FQkOC7Uqam*WHydX{n+IbmGYb==K@;m0 zghIvzO{_;*nph8RblA#LpO~CetYlTKl$eu~U!Izx3*kpAlLIHUU?}kP3vmr{bPkDkbPn^3G(;xaSc+6 z-TaB=4ST(bp_zfDfuV^>lz~3n!<;OJN-PQmUq8%XJvb%Iq2@*Sm#ZJ1+1JeSuhNse z@F}tQy7VFSasw_l4q#B8vt?msVsSTcWm0hc^VgwFY}Uew#?6y&8qS+G`IlYRp{X-$ zS^C1CsAUB|W>RGMaidwl;yugv-RYIVS1OtXH!Hn7XS$5}_=&Z@o0Sy=o;U&kmQ0iB delta 224 zcmdlk^G?dapouq&jZ>@5qwPB{BRkWACf;bEP&gAKqam*WHydX{n+IbmGYb==K@%&G z3scCrpo!%VOB2hFjSgE`Ht%D7$zE?{Xlh_=VrpO-WuOmN$jM@;#G)V+HDg*sdu9Bo z;(1dGV_F}tuUPc)>3{b->(73-d!s2n$AF8C18DL&TNY*}7Iy