From 8be4cc2bb5d3efae0b5fabbebc0d4db627f4f21f Mon Sep 17 00:00:00 2001 From: adslk Date: Wed, 13 Oct 2021 10:09:18 +0800 Subject: [PATCH 1/4] modify the config.json file Signed-off-by: adslk --- UI/AtomicLayout/README_zh.md | 2 +- UI/AtomicLayout/build.gradle | 8 +++----- UI/AtomicLayout/entry/build.gradle | 5 ++--- UI/AtomicLayout/entry/src/main/config.json | 14 ++++++------- UI/Badge/README_zh.md | 2 +- UI/Badge/build.gradle | 8 +++----- UI/Badge/entry/build.gradle | 5 ++--- UI/Badge/entry/src/main/config.json | 14 ++++++------- UI/International/build.gradle | 17 ++++++++++++---- UI/International/entry/build.gradle | 5 ++--- UI/International/entry/src/main/config.json | 12 +++++------ UI/JSMenu/build.gradle | 8 +++----- UI/JSMenu/entry/build.gradle | 5 ++--- UI/JSMenu/entry/src/main/config.json | 12 +++++------ UI/JSUICustomComponent/build.gradle | 8 +++----- UI/JSUICustomComponent/entry/build.gradle | 5 ++--- .../entry/src/main/config.json | 12 +++++------ UI/JsAnimationStyle/README_zh.md | 2 +- UI/JsAnimationStyle/build.gradle | 8 +++----- UI/JsAnimationStyle/entry/build.gradle | 5 ++--- .../entry/src/main/config.json | 14 ++++++------- UI/JsBasicComponents/build.gradle | 17 ++++++++++++---- UI/JsBasicComponents/entry/build.gradle | 5 ++--- .../entry/src/main/config.json | 12 +++++------ UI/JsBrightness/build.gradle | 8 +++----- UI/JsBrightness/entry/build.gradle | 5 ++--- UI/JsBrightness/entry/src/main/config.json | 8 +++++--- UI/JsCanvas/build.gradle | 10 ++++------ UI/JsCanvas/entry/build.gradle | 5 ++--- UI/JsCanvas/entry/src/main/config.json | 8 +++++--- UI/JsDevice/build.gradle | 10 ++++------ UI/JsDevice/entry/build.gradle | 5 ++--- UI/JsDevice/entry/src/main/config.json | 12 +++++------ UI/JsDialog/build.gradle | 9 +++------ UI/JsDialog/entry/build.gradle | 11 ++-------- UI/JsDialog/entry/src/main/config.json | 12 +++++------ UI/JsGrid/build.gradle | 8 +++----- UI/JsGrid/entry/build.gradle | 5 ++--- UI/JsGrid/entry/src/main/config.json | 14 ++++++------- UI/JsRouter/build.gradle | 10 ++++------ UI/JsRouter/entry/build.gradle | 5 ++--- UI/JsRouter/entry/src/main/config.json | 12 +++++------ UI/JsTimer/build.gradle | 20 +++++++++++++------ UI/JsTimer/entry/build.gradle | 6 ++---- UI/JsTimer/entry/src/main/config.json | 14 ++++++------- .../src/main/js/default/pages/index/index.js | 4 ++-- .../main/resources/base/element/string.json | 4 ++-- UI/Picker/build.gradle | 8 +++----- UI/Picker/entry/build.gradle | 5 ++--- UI/Picker/entry/src/main/config.json | 12 +++++------ .../src/main/js/default/pages/index/index.css | 4 +++- UI/Popup/build.gradle | 8 +++----- UI/Popup/entry/build.gradle | 5 ++--- UI/Popup/entry/src/main/config.json | 12 +++++------ UI/RefreshContainer/build.gradle | 8 +++----- UI/RefreshContainer/entry/build.gradle | 5 ++--- .../entry/src/main/config.json | 14 ++++++------- UI/Slider/build.gradle | 10 ++++------ UI/Slider/entry/build.gradle | 8 +++----- UI/Slider/entry/src/main/config.json | 12 +++++------ UI/Stack/build.gradle | 17 ++++++++++++---- UI/Stack/entry/build.gradle | 5 ++--- UI/Stack/entry/src/main/config.json | 12 +++++------ UI/StepNavigator/build.gradle | 13 +++++------- UI/StepNavigator/entry/build.gradle | 5 ++--- UI/StepNavigator/entry/src/main/config.json | 12 +++++------ UI/Swiper/build.gradle | 10 ++++------ UI/Swiper/entry/build.gradle | 5 ++--- UI/Swiper/entry/src/main/config.json | 12 +++++------ UI/Tabs/build.gradle | 8 +++----- UI/Tabs/entry/build.gradle | 5 ++--- UI/Tabs/entry/src/main/config.json | 14 ++++++------- UI/Toolbar/build.gradle | 8 +++----- UI/Toolbar/entry/build.gradle | 5 ++--- UI/Toolbar/entry/src/main/config.json | 14 ++++++------- UI/chart/build.gradle | 17 ++++++++++++---- UI/chart/entry/build.gradle | 5 ++--- UI/chart/entry/src/main/config.json | 14 ++++++------- .../main/resources/base/element/string.json | 2 +- common/Clock/build.gradle | 8 +++----- common/Clock/entry/build.gradle | 5 ++--- common/Clock/entry/src/main/config.json | 14 ++++++------- .../DistributeCalc/entry/src/main/config.json | 9 +++------ common/ECG/build.gradle | 8 +++----- common/ECG/entry/build.gradle | 5 ++--- common/ECG/entry/src/main/config.json | 12 +++++------ common/Flashlight/build.gradle | 8 +++----- common/Flashlight/entry/build.gradle | 5 ++--- common/Flashlight/entry/src/main/config.json | 12 +++++------ common/JsHelloWorld/build.gradle | 8 +++----- common/JsHelloWorld/entry/build.gradle | 5 ++--- .../JsHelloWorld/entry/src/main/config.json | 12 +++++------ 92 files changed, 364 insertions(+), 451 deletions(-) diff --git a/UI/AtomicLayout/README_zh.md b/UI/AtomicLayout/README_zh.md index fb0a13b04d..537c546936 100644 --- a/UI/AtomicLayout/README_zh.md +++ b/UI/AtomicLayout/README_zh.md @@ -19,5 +19,5 @@ ### 约束与限制 - 隐藏能力与占比能力需在非折行的flex布局中使用。 -- 本示例支持在轻量系统使用。 +- 本示例支持在标准系统使用。 diff --git a/UI/AtomicLayout/build.gradle b/UI/AtomicLayout/build.gradle index ad33f7c014..e7c160891c 100644 --- a/UI/AtomicLayout/build.gradle +++ b/UI/AtomicLayout/build.gradle @@ -2,10 +2,8 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -19,7 +17,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/AtomicLayout/entry/build.gradle b/UI/AtomicLayout/entry/build.gradle index 88e1fd7d4a..eba043e2e0 100644 --- a/UI/AtomicLayout/entry/build.gradle +++ b/UI/AtomicLayout/entry/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -12,5 +12,4 @@ ohos { } } } - supportSystem "standard" } \ No newline at end of file diff --git a/UI/AtomicLayout/entry/src/main/config.json b/UI/AtomicLayout/entry/src/main/config.json index 70845dc3a3..e245734e15 100644 --- a/UI/AtomicLayout/entry/src/main/config.json +++ b/UI/AtomicLayout/entry/src/main/config.json @@ -9,8 +9,8 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.atomiclayout", - "name": ".MainAbility", - "mainAbility": "ohos.samples.atomiclayout.MainAbility", + "name": ".MyApplication", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": ".MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -48,11 +50,7 @@ "pages/percentage/index", "pages/fixed/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } + "name": ".default" } ] } diff --git a/UI/Badge/README_zh.md b/UI/Badge/README_zh.md index ba456c6cc5..7d0c881aa6 100644 --- a/UI/Badge/README_zh.md +++ b/UI/Badge/README_zh.md @@ -12,5 +12,5 @@ ### 约束和限制 -本示例仅支持在轻量系统上运行。 +本示例仅支持在标准系统上运行。 diff --git a/UI/Badge/build.gradle b/UI/Badge/build.gradle index ad33f7c014..e7c160891c 100644 --- a/UI/Badge/build.gradle +++ b/UI/Badge/build.gradle @@ -2,10 +2,8 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -19,7 +17,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/Badge/entry/build.gradle b/UI/Badge/entry/build.gradle index 88e1fd7d4a..eba043e2e0 100644 --- a/UI/Badge/entry/build.gradle +++ b/UI/Badge/entry/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -12,5 +12,4 @@ ohos { } } } - supportSystem "standard" } \ No newline at end of file diff --git a/UI/Badge/entry/src/main/config.json b/UI/Badge/entry/src/main/config.json index 4bc57d7087..a6d6985472 100644 --- a/UI/Badge/entry/src/main/config.json +++ b/UI/Badge/entry/src/main/config.json @@ -9,8 +9,8 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.badge", - "name": ".MainAbility", - "mainAbility": "ohos.samples.badge.MainAbility", + "name": ".MyApplication", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": ".MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -45,11 +47,7 @@ "pages": [ "pages/index/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } + "name": ".default" } ] } diff --git a/UI/International/build.gradle b/UI/International/build.gradle index 708d0f3df6..b27db03840 100644 --- a/UI/International/build.gradle +++ b/UI/International/build.gradle @@ -2,10 +2,19 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 + signingConfigs { + release { + storeFile file('D:\\HAP_Sign\\app.p12') + storePassword '0000001B982A609EAAF5208607CAFC6A763E2AF0F261A326E06DD8E64F8241B1B40C0EC8E4C3833EB1C211' + keyAlias = 'app' + keyPassword '0000001B52101FAB8AE33B3735348D8C5A4AD83682DB083186CDF9BBE51EE7C008E31DBA3D098D593A47CF' + signAlg = 'SHA256withECDSA' + profile file('D:\\HAP_Sign\\Profile\\international.p7b') + certpath file('D:\\HAP_Sign\\app.cer') + } } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -18,7 +27,7 @@ buildscript { } } dependencies { - classpath 'com.huawei.ohos:hap:2.4.5.0' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/International/entry/build.gradle b/UI/International/entry/build.gradle index 6b6a606b1b..963bb68bd2 100644 --- a/UI/International/entry/build.gradle +++ b/UI/International/entry/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -13,5 +13,4 @@ ohos { } } } - supportSystem "standard" } diff --git a/UI/International/entry/src/main/config.json b/UI/International/entry/src/main/config.json index 44e647ba84..f278593bba 100644 --- a/UI/International/entry/src/main/config.json +++ b/UI/International/entry/src/main/config.json @@ -10,7 +10,7 @@ "module": { "package": "ohos.samples.international", "name": ".MyApplication", - "mainAbility": "ohos.samples.international.MainAbility", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -33,7 +33,9 @@ } ], "orientation": "unspecified", - "name": "ohos.samples.international.MainAbility", + "name": ".default", + "srcPath": "default", + "srcLanguage": "js", "icon": "$media:icon", "description": "$string:mainability_description", "formsEnabled": false, @@ -47,11 +49,7 @@ "pages": [ "pages/index/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } + "name": ".default" } ] } diff --git a/UI/JSMenu/build.gradle b/UI/JSMenu/build.gradle index e993f18a48..46b60f6716 100644 --- a/UI/JSMenu/build.gradle +++ b/UI/JSMenu/build.gradle @@ -3,10 +3,8 @@ apply plugin: 'com.huawei.ohos.app' //For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510 ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -19,7 +17,7 @@ buildscript { } } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/JSMenu/entry/build.gradle b/UI/JSMenu/entry/build.gradle index 138dc6a7f9..8243c3b322 100644 --- a/UI/JSMenu/entry/build.gradle +++ b/UI/JSMenu/entry/build.gradle @@ -1,9 +1,9 @@ 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 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -13,5 +13,4 @@ ohos { } } } - supportSystem "standard" } diff --git a/UI/JSMenu/entry/src/main/config.json b/UI/JSMenu/entry/src/main/config.json index e39d2db4ec..3bb4cc8c1c 100644 --- a/UI/JSMenu/entry/src/main/config.json +++ b/UI/JSMenu/entry/src/main/config.json @@ -11,7 +11,7 @@ "module": { "package": "ohos.samples.jsmenu", "name": ".MyApplication", - "mainAbility": "ohos.samples.jsmenu.MainAbility", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -33,8 +33,10 @@ ] } ], - "name": "ohos.samples.jsmenu.MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -48,11 +50,7 @@ "pages/menu/index", "pages/select/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } + "name": ".default" } ] } diff --git a/UI/JSUICustomComponent/build.gradle b/UI/JSUICustomComponent/build.gradle index e993f18a48..46b60f6716 100644 --- a/UI/JSUICustomComponent/build.gradle +++ b/UI/JSUICustomComponent/build.gradle @@ -3,10 +3,8 @@ apply plugin: 'com.huawei.ohos.app' //For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510 ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -19,7 +17,7 @@ buildscript { } } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/JSUICustomComponent/entry/build.gradle b/UI/JSUICustomComponent/entry/build.gradle index 138dc6a7f9..8243c3b322 100644 --- a/UI/JSUICustomComponent/entry/build.gradle +++ b/UI/JSUICustomComponent/entry/build.gradle @@ -1,9 +1,9 @@ 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 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -13,5 +13,4 @@ ohos { } } } - supportSystem "standard" } diff --git a/UI/JSUICustomComponent/entry/src/main/config.json b/UI/JSUICustomComponent/entry/src/main/config.json index 4973c96382..ccdef555df 100644 --- a/UI/JSUICustomComponent/entry/src/main/config.json +++ b/UI/JSUICustomComponent/entry/src/main/config.json @@ -10,7 +10,7 @@ "module": { "package": "ohos.samples.jsuicustomcomponent", "name": ".MyApplication", - "mainAbility": "ohos.samples.jsuicustomcomponent.MainAbility", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": "ohos.samples.jsuicustomcomponent.MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -46,11 +48,7 @@ "pages/index/index", "pages/collect/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } + "name": ".default" } ] } diff --git a/UI/JsAnimationStyle/README_zh.md b/UI/JsAnimationStyle/README_zh.md index a4bb0ba08f..3ea548b6cd 100644 --- a/UI/JsAnimationStyle/README_zh.md +++ b/UI/JsAnimationStyle/README_zh.md @@ -20,5 +20,5 @@ ### 约束与限制 -本示例仅支持在轻量系统上运行。 +本示例仅支持在标准系统上运行。 diff --git a/UI/JsAnimationStyle/build.gradle b/UI/JsAnimationStyle/build.gradle index 1f5c317ac2..1993c17412 100644 --- a/UI/JsAnimationStyle/build.gradle +++ b/UI/JsAnimationStyle/build.gradle @@ -2,10 +2,8 @@ apply plugin: 'com.huawei.ohos.app' //For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#ZH-CN_TOPIC_0000001154985555__section1112183053510 ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -19,7 +17,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/JsAnimationStyle/entry/build.gradle b/UI/JsAnimationStyle/entry/build.gradle index 5ec24517d9..4ea3fceddc 100644 --- a/UI/JsAnimationStyle/entry/build.gradle +++ b/UI/JsAnimationStyle/entry/build.gradle @@ -1,9 +1,9 @@ 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#ZH-CN_TOPIC_0000001154985555__section1112183053510 ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -13,5 +13,4 @@ ohos { } } } - supportSystem "standard" } diff --git a/UI/JsAnimationStyle/entry/src/main/config.json b/UI/JsAnimationStyle/entry/src/main/config.json index b346f373e3..11ef08f565 100644 --- a/UI/JsAnimationStyle/entry/src/main/config.json +++ b/UI/JsAnimationStyle/entry/src/main/config.json @@ -9,8 +9,8 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.jsanimationstyle", - "name": ".MainAbility", - "mainAbility": "ohos.samples.jsanimationstyle.MainAbility", + "name": ".MyApplication", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": ".MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -59,11 +61,7 @@ "pages/transitions/customtransition/customtransition", "pages/transitions/customtarget/customtarget" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } + "name": ".default" } ] } diff --git a/UI/JsBasicComponents/build.gradle b/UI/JsBasicComponents/build.gradle index 06f5171899..11eb4cfa8a 100644 --- a/UI/JsBasicComponents/build.gradle +++ b/UI/JsBasicComponents/build.gradle @@ -2,10 +2,19 @@ apply plugin: 'com.huawei.ohos.app' //For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510 ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 + signingConfigs { + release { + storeFile file('D:\\HAP_Sign\\app.p12') + storePassword '0000001B7677EEAB011BD9E8B263D7270C7D95385D998A60BBB1970AAE70247B49A351DCA733CAECDFA605' + keyAlias = 'app' + keyPassword '0000001B47399FE2776C3726BC3D6DFFD5B288E48111F48122B7CF51678CFBE4514628CF39354683E084DD' + signAlg = 'SHA256withECDSA' + profile file('D:\\HAP_Sign\\Profile\\jsbasiccomponent.p7b') + certpath file('D:\\HAP_Sign\\app.cer') + } } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -18,7 +27,7 @@ buildscript { } } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/JsBasicComponents/entry/build.gradle b/UI/JsBasicComponents/entry/build.gradle index f8b8f590c9..cb1b043b0a 100644 --- a/UI/JsBasicComponents/entry/build.gradle +++ b/UI/JsBasicComponents/entry/build.gradle @@ -1,9 +1,9 @@ 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 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -13,5 +13,4 @@ ohos { } } } - supportSystem "standard" } \ No newline at end of file diff --git a/UI/JsBasicComponents/entry/src/main/config.json b/UI/JsBasicComponents/entry/src/main/config.json index 1f9bc1319c..168c018222 100644 --- a/UI/JsBasicComponents/entry/src/main/config.json +++ b/UI/JsBasicComponents/entry/src/main/config.json @@ -10,7 +10,7 @@ "module": { "package": "ohos.samples.jsbasiccomponent", "name": ".MyApplication", - "mainAbility": "ohos.samples.jsbasiccomponent.MainAbility", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": "ohos.samples.jsbasiccomponent.MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -45,11 +47,7 @@ "pages": [ "pages/index/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } + "name": ".default" } ] } diff --git a/UI/JsBrightness/build.gradle b/UI/JsBrightness/build.gradle index 708d0f3df6..9107e58b0a 100644 --- a/UI/JsBrightness/build.gradle +++ b/UI/JsBrightness/build.gradle @@ -2,10 +2,8 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -18,7 +16,7 @@ buildscript { } } dependencies { - classpath 'com.huawei.ohos:hap:2.4.5.0' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/JsBrightness/entry/build.gradle b/UI/JsBrightness/entry/build.gradle index 6b6a606b1b..963bb68bd2 100644 --- a/UI/JsBrightness/entry/build.gradle +++ b/UI/JsBrightness/entry/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -13,5 +13,4 @@ ohos { } } } - supportSystem "standard" } diff --git a/UI/JsBrightness/entry/src/main/config.json b/UI/JsBrightness/entry/src/main/config.json index 57ea335800..586656dc5d 100644 --- a/UI/JsBrightness/entry/src/main/config.json +++ b/UI/JsBrightness/entry/src/main/config.json @@ -10,7 +10,7 @@ "module": { "package": "ohos.samples.jsbrightness", "name": ".MyApplication", - "mainAbility": "ohos.samples.jsbrightness.MainAbility", + "mainAbility": "default", "deviceType": [ "phone" ], @@ -33,8 +33,10 @@ } ], "orientation": "unspecified", - "name": "ohos.samples.jsbrightness.MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "formsEnabled": false, "label": "$string:entry_MainAbility", @@ -47,7 +49,7 @@ "pages": [ "pages/index/index" ], - "name": "default", + "name": ".default", "window": { "designWidth": 720, "autoDesignWidth": false diff --git a/UI/JsCanvas/build.gradle b/UI/JsCanvas/build.gradle index bbe463c74d..9107e58b0a 100644 --- a/UI/JsCanvas/build.gradle +++ b/UI/JsCanvas/build.gradle @@ -2,12 +2,10 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } - + buildscript { repositories { maven { @@ -18,7 +16,7 @@ buildscript { } } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/JsCanvas/entry/build.gradle b/UI/JsCanvas/entry/build.gradle index 6b6a606b1b..963bb68bd2 100644 --- a/UI/JsCanvas/entry/build.gradle +++ b/UI/JsCanvas/entry/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -13,5 +13,4 @@ ohos { } } } - supportSystem "standard" } diff --git a/UI/JsCanvas/entry/src/main/config.json b/UI/JsCanvas/entry/src/main/config.json index ea990b3d1c..f05d3ed51a 100644 --- a/UI/JsCanvas/entry/src/main/config.json +++ b/UI/JsCanvas/entry/src/main/config.json @@ -10,7 +10,7 @@ "module": { "package": "ohos.samples.canvas", "name": ".MyApplication", - "mainAbility": "ohos.samples.canvas.MainAbility", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": "ohos.samples.canvas.MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -45,7 +47,7 @@ "pages": [ "pages/index/index" ], - "name": "default", + "name": ".default", "window": { "designWidth": 720, "autoDesignWidth": true diff --git a/UI/JsDevice/build.gradle b/UI/JsDevice/build.gradle index 6fac162cbb..9107e58b0a 100644 --- a/UI/JsDevice/build.gradle +++ b/UI/JsDevice/build.gradle @@ -2,12 +2,10 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } - + buildscript { repositories { maven { @@ -18,7 +16,7 @@ buildscript { } } dependencies { - classpath 'com.huawei.ohos:hap:2.4.5.0' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/JsDevice/entry/build.gradle b/UI/JsDevice/entry/build.gradle index 6b6a606b1b..963bb68bd2 100644 --- a/UI/JsDevice/entry/build.gradle +++ b/UI/JsDevice/entry/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -13,5 +13,4 @@ ohos { } } } - supportSystem "standard" } diff --git a/UI/JsDevice/entry/src/main/config.json b/UI/JsDevice/entry/src/main/config.json index d9dcda8624..0debbe5a2a 100644 --- a/UI/JsDevice/entry/src/main/config.json +++ b/UI/JsDevice/entry/src/main/config.json @@ -10,7 +10,7 @@ "module": { "package": "ohos.samples.jsdevice", "name": ".MyApplication", - "mainAbility": "ohos.samples.jsdevice.MainAbility", + "mainAbility": "default", "deviceType": [ "phone" ], @@ -33,8 +33,10 @@ } ], "orientation": "unspecified", - "name": "ohos.samples.jsdevice.MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "formsEnabled": false, "label": "$string:entry_MainAbility", @@ -50,11 +52,7 @@ "pages/systemProperties/systemProperties", "pages/batteryProperties/batteryProperties" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } + "name": ".default" } ] } diff --git a/UI/JsDialog/build.gradle b/UI/JsDialog/build.gradle index 5241ed1fdf..a504db11a4 100644 --- a/UI/JsDialog/build.gradle +++ b/UI/JsDialog/build.gradle @@ -3,10 +3,8 @@ apply plugin: 'com.huawei.ohos.app' // For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510 ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -19,8 +17,7 @@ buildscript { } } dependencies { - classpath 'com.huawei.ohos:hap:2.4.5.0' - classpath 'com.huawei.ohos:decctest:1.2.4.1' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/JsDialog/entry/build.gradle b/UI/JsDialog/entry/build.gradle index 8043324df3..eeb7e12589 100644 --- a/UI/JsDialog/entry/build.gradle +++ b/UI/JsDialog/entry/build.gradle @@ -1,9 +1,9 @@ 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 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -13,11 +13,4 @@ ohos { } } } - - supportSystem "standard" -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) - testImplementation 'junit:junit:4.13' } diff --git a/UI/JsDialog/entry/src/main/config.json b/UI/JsDialog/entry/src/main/config.json index 2a7bdf2f9f..7e461d423b 100644 --- a/UI/JsDialog/entry/src/main/config.json +++ b/UI/JsDialog/entry/src/main/config.json @@ -11,7 +11,7 @@ "module": { "package": "ohos.samples.jsdialog", "name": ".MyApplication", - "mainAbility": ".MainAbility", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -34,7 +34,9 @@ } ], "orientation": "unspecified", - "name": ".MainAbility", + "name": ".default", + "srcPath": "default", + "srcLanguage": "js", "icon": "$media:icon", "description": "$string:mainability_description", "formsEnabled": false, @@ -48,11 +50,7 @@ "pages": [ "pages/index/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } + "name": ".default" } ] } diff --git a/UI/JsGrid/build.gradle b/UI/JsGrid/build.gradle index ad33f7c014..e7c160891c 100644 --- a/UI/JsGrid/build.gradle +++ b/UI/JsGrid/build.gradle @@ -2,10 +2,8 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -19,7 +17,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/JsGrid/entry/build.gradle b/UI/JsGrid/entry/build.gradle index 88e1fd7d4a..eba043e2e0 100644 --- a/UI/JsGrid/entry/build.gradle +++ b/UI/JsGrid/entry/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -12,5 +12,4 @@ ohos { } } } - supportSystem "standard" } \ No newline at end of file diff --git a/UI/JsGrid/entry/src/main/config.json b/UI/JsGrid/entry/src/main/config.json index 4d7b7c2e8a..3a55eed815 100644 --- a/UI/JsGrid/entry/src/main/config.json +++ b/UI/JsGrid/entry/src/main/config.json @@ -9,8 +9,8 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.grid", - "name": ".MainAbility", - "mainAbility": "ohos.samples.grid.MainAbility", + "name": ".Myapplication", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": "ohos.samples.grid.MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:entry_MainAbility", "type": "page", @@ -45,11 +47,7 @@ "pages": [ "pages/index/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } + "name": ".default" } ] } diff --git a/UI/JsRouter/build.gradle b/UI/JsRouter/build.gradle index bbe463c74d..9107e58b0a 100644 --- a/UI/JsRouter/build.gradle +++ b/UI/JsRouter/build.gradle @@ -2,12 +2,10 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } - + buildscript { repositories { maven { @@ -18,7 +16,7 @@ buildscript { } } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/JsRouter/entry/build.gradle b/UI/JsRouter/entry/build.gradle index bdd062a756..a44756ac89 100644 --- a/UI/JsRouter/entry/build.gradle +++ b/UI/JsRouter/entry/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -13,5 +13,4 @@ ohos { } } } - supportSystem "standard" } \ No newline at end of file diff --git a/UI/JsRouter/entry/src/main/config.json b/UI/JsRouter/entry/src/main/config.json index d419a29f90..1130b32207 100644 --- a/UI/JsRouter/entry/src/main/config.json +++ b/UI/JsRouter/entry/src/main/config.json @@ -10,7 +10,7 @@ "module": { "package": "ohos.samples.router", "name": ".MyApplication", - "mainAbility": "ohos.samples.router.MainAbility", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": "ohos.samples.router.MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -47,11 +49,7 @@ "pages/pushPage/index", "pages/replacePage/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } + "name": ".default" } ] } diff --git a/UI/JsTimer/build.gradle b/UI/JsTimer/build.gradle index f0fa523156..ae44c4866a 100644 --- a/UI/JsTimer/build.gradle +++ b/UI/JsTimer/build.gradle @@ -1,12 +1,21 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 + signingConfigs { + release { + storeFile file('D:\\HAP_Sign\\app.p12') + storePassword '0000001B32648A327AE97650F134C2CF12ADAAAA90678F8D4A7090C2D8DCDF2BAF01FE7CE77979AE0184B6' + keyAlias = 'app' + keyPassword '0000001B738D0B273F4CB356154ACA393023C07E80B77ACED6D94571C38222FBB943F03C63B0C7D7133FBA' + signAlg = 'SHA256withECDSA' + profile file('D:\\HAP_Sign\\Profile\\jstimer.p7b') + certpath file('D:\\HAP_Sign\\app.cer') + } } + compileSdkVersion 7 + supportSystem "standard" } - + buildscript { repositories { maven { @@ -17,8 +26,7 @@ buildscript { } } dependencies { - classpath 'com.huawei.ohos:hap:2.4.5.0' - classpath 'com.huawei.ohos:decctest:1.2.4.1' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/JsTimer/entry/build.gradle b/UI/JsTimer/entry/build.gradle index ac1075fb53..963bb68bd2 100644 --- a/UI/JsTimer/entry/build.gradle +++ b/UI/JsTimer/entry/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -13,6 +13,4 @@ ohos { } } } - - supportSystem "standard" } diff --git a/UI/JsTimer/entry/src/main/config.json b/UI/JsTimer/entry/src/main/config.json index 7f7c9265ff..c25640be4f 100644 --- a/UI/JsTimer/entry/src/main/config.json +++ b/UI/JsTimer/entry/src/main/config.json @@ -11,7 +11,7 @@ "module": { "package": "ohos.samples.jstimer", "name": ".MyApplication", - "mainAbility": "ohos.samples.jstimer.MainAbility", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -33,10 +33,12 @@ ] } ], - "name": "ohos.samples.jstimer.MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", - "label": "$string:entry_MainAbility", + "label": "$string:app_name", "type": "page", "launchType": "standard" } @@ -46,11 +48,7 @@ "pages": [ "pages/index/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } + "name": ".default" } ] } diff --git a/UI/JsTimer/entry/src/main/js/default/pages/index/index.js b/UI/JsTimer/entry/src/main/js/default/pages/index/index.js index 7bc159fd95..ec4fdd504e 100644 --- a/UI/JsTimer/entry/src/main/js/default/pages/index/index.js +++ b/UI/JsTimer/entry/src/main/js/default/pages/index/index.js @@ -26,12 +26,12 @@ export default { time: 0 }, dateTimeChange(e) { - this.dataDateTime = 'e.year + "-" + e.month + "-" + e.day + "-" + e.hour + "-" + e.minute'; + this.dataDateTime = e.year + "-" + e.month + "-" + e.day + "-" + e.hour + "-" + e.minute; var date = new Date(this.dataDateTime); this.time = date.getTime(); }, timeChange(e) { - this.dataTime = 'e.hour + ":" + e.minute + ":" + e.second'; + this.dataTime = e.hour + ":" + e.minute + ":" + e.second; this.milliSecond = Number(e.hour) * 3600 * 1000 + Number(e.minute) * 60 * 1000 + Number(e.second) * 1000; }, setTimer() { diff --git a/UI/JsTimer/entry/src/main/resources/base/element/string.json b/UI/JsTimer/entry/src/main/resources/base/element/string.json index 0bae6bd40f..a139738ec1 100644 --- a/UI/JsTimer/entry/src/main/resources/base/element/string.json +++ b/UI/JsTimer/entry/src/main/resources/base/element/string.json @@ -1,8 +1,8 @@ { "string": [ { - "name": "entry_MainAbility", - "value": "entry_MainAbility" + "name": "app_name", + "value": "JsTimer" }, { "name": "mainability_description", diff --git a/UI/Picker/build.gradle b/UI/Picker/build.gradle index c3f3ef69e8..9b1921168a 100644 --- a/UI/Picker/build.gradle +++ b/UI/Picker/build.gradle @@ -3,10 +3,8 @@ apply plugin: 'com.huawei.ohos.app' //For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#ZH-CN_TOPIC_0000001154985555__section1112183053510 ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -20,7 +18,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/Picker/entry/build.gradle b/UI/Picker/entry/build.gradle index 8181d84eae..663f9f4807 100644 --- a/UI/Picker/entry/build.gradle +++ b/UI/Picker/entry/build.gradle @@ -2,9 +2,9 @@ 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#ZH-CN_TOPIC_0000001154985555__section1112183053510 ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -14,5 +14,4 @@ ohos { } } } - supportSystem "standard" } \ No newline at end of file diff --git a/UI/Picker/entry/src/main/config.json b/UI/Picker/entry/src/main/config.json index a22272e6bb..f99da4c649 100644 --- a/UI/Picker/entry/src/main/config.json +++ b/UI/Picker/entry/src/main/config.json @@ -10,7 +10,7 @@ "module": { "package": "ohos.samples.picker", "name": ".MyApplication", - "mainAbility": "ohos.samples.picker.MainAbility", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": "ohos.samples.picker.MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -45,11 +47,7 @@ "pages": [ "pages/index/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } + "name": ".default" } ] } diff --git a/UI/Picker/entry/src/main/js/default/pages/index/index.css b/UI/Picker/entry/src/main/js/default/pages/index/index.css index a0c56aee87..4a35e1f97d 100644 --- a/UI/Picker/entry/src/main/js/default/pages/index/index.css +++ b/UI/Picker/entry/src/main/js/default/pages/index/index.css @@ -25,7 +25,9 @@ font-size: 16px; margin-left: 20px; text-align: center; - border: 1px, solid, black; + border-width: 1px; + border-style: solid; + border-color: black; } .text { diff --git a/UI/Popup/build.gradle b/UI/Popup/build.gradle index c3f3ef69e8..9b1921168a 100644 --- a/UI/Popup/build.gradle +++ b/UI/Popup/build.gradle @@ -3,10 +3,8 @@ apply plugin: 'com.huawei.ohos.app' //For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#ZH-CN_TOPIC_0000001154985555__section1112183053510 ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -20,7 +18,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/Popup/entry/build.gradle b/UI/Popup/entry/build.gradle index 921386f38e..6d55628ae8 100644 --- a/UI/Popup/entry/build.gradle +++ b/UI/Popup/entry/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -12,5 +12,4 @@ ohos { } } } - supportSystem "standard" } diff --git a/UI/Popup/entry/src/main/config.json b/UI/Popup/entry/src/main/config.json index fd74fab107..8bd10b0b49 100644 --- a/UI/Popup/entry/src/main/config.json +++ b/UI/Popup/entry/src/main/config.json @@ -10,7 +10,7 @@ "module": { "package": "ohos.samples.popup", "name": ".MyApplication", - "mainAbility": "ohos.samples.popup.MainAbility", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": "ohos.samples.popup.MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -45,11 +47,7 @@ "pages": [ "pages/index/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } + "name": ".default" } ] } diff --git a/UI/RefreshContainer/build.gradle b/UI/RefreshContainer/build.gradle index d45348af34..e3b3b4bc3f 100644 --- a/UI/RefreshContainer/build.gradle +++ b/UI/RefreshContainer/build.gradle @@ -2,10 +2,8 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -19,7 +17,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/RefreshContainer/entry/build.gradle b/UI/RefreshContainer/entry/build.gradle index 41fab73805..65848f3173 100644 --- a/UI/RefreshContainer/entry/build.gradle +++ b/UI/RefreshContainer/entry/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -13,6 +13,5 @@ ohos { } } } - supportSystem "standard" } diff --git a/UI/RefreshContainer/entry/src/main/config.json b/UI/RefreshContainer/entry/src/main/config.json index b57dad4b54..bb48c1d1ee 100644 --- a/UI/RefreshContainer/entry/src/main/config.json +++ b/UI/RefreshContainer/entry/src/main/config.json @@ -9,8 +9,8 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.refreshcontainer", - "name": ".MainAbility", - "mainAbility": "ohos.samples.refreshcontainer.MainAbility", + "name": ".MyApplication", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": ".MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -45,11 +47,7 @@ "pages": [ "pages/index/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } + "name": ".default" } ] } diff --git a/UI/Slider/build.gradle b/UI/Slider/build.gradle index d45348af34..e7c160891c 100644 --- a/UI/Slider/build.gradle +++ b/UI/Slider/build.gradle @@ -2,10 +2,8 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -19,7 +17,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } @@ -33,4 +31,4 @@ allprojects { } jcenter() } -} +} \ No newline at end of file diff --git a/UI/Slider/entry/build.gradle b/UI/Slider/entry/build.gradle index 6b6a606b1b..eba043e2e0 100644 --- a/UI/Slider/entry/build.gradle +++ b/UI/Slider/entry/build.gradle @@ -1,9 +1,8 @@ apply plugin: 'com.huawei.ohos.hap' - ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -13,5 +12,4 @@ ohos { } } } - supportSystem "standard" -} +} \ No newline at end of file diff --git a/UI/Slider/entry/src/main/config.json b/UI/Slider/entry/src/main/config.json index ebecf76f85..ff761c18f0 100644 --- a/UI/Slider/entry/src/main/config.json +++ b/UI/Slider/entry/src/main/config.json @@ -10,7 +10,7 @@ "module": { "package": "ohos.samples.slider", "name": ".MyApplication", - "mainAbility": "ohos.samples.slider.MainAbility", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": "ohos.samples.slider.MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -45,11 +47,7 @@ "pages": [ "pages/index/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } + "name": ".default" } ] } diff --git a/UI/Stack/build.gradle b/UI/Stack/build.gradle index d45348af34..732a86d2de 100644 --- a/UI/Stack/build.gradle +++ b/UI/Stack/build.gradle @@ -2,10 +2,19 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 + signingConfigs { + release { + storeFile file('D:\\HAP_Sign\\app.p12') + storePassword '0000001B02F6A8AF52109B8F36CABC1ACB01015A13EB8CC5F477DE121639DC5E5F692DC3BC9757758AC0F2' + keyAlias = 'app' + keyPassword '0000001BC900A7911D3A0B4A30CC98BE569F7C13880620BCD29720838EA87612B760CBAA8ADE671E7D4C9F' + signAlg = 'SHA256withECDSA' + profile file('D:\\HAP_Sign\\Profile\\stack.p7b') + certpath file('D:\\HAP_Sign\\app.cer') + } } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -19,7 +28,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/Stack/entry/build.gradle b/UI/Stack/entry/build.gradle index 41fab73805..65848f3173 100644 --- a/UI/Stack/entry/build.gradle +++ b/UI/Stack/entry/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -13,6 +13,5 @@ ohos { } } } - supportSystem "standard" } diff --git a/UI/Stack/entry/src/main/config.json b/UI/Stack/entry/src/main/config.json index c8605e69fc..1f6f97e3fe 100644 --- a/UI/Stack/entry/src/main/config.json +++ b/UI/Stack/entry/src/main/config.json @@ -9,6 +9,8 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.stack", + "name": ".MyApplication", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -30,8 +32,10 @@ ] } ], - "name": "ohos.samples.stack.MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -43,11 +47,7 @@ "pages": [ "pages/index/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } + "name": ".default" } ] } diff --git a/UI/StepNavigator/build.gradle b/UI/StepNavigator/build.gradle index 5e558c6ac6..8a5b70a97f 100644 --- a/UI/StepNavigator/build.gradle +++ b/UI/StepNavigator/build.gradle @@ -3,12 +3,9 @@ apply plugin: 'com.huawei.ohos.app' //For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#ZH-CN_TOPIC_0000001154985555__section1112183053510 ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } - buildscript { repositories { maven { @@ -17,10 +14,10 @@ buildscript { maven { url 'https://developer.huawei.com/repo/' } - jcenter() + jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } @@ -32,6 +29,6 @@ allprojects { maven { url 'https://developer.huawei.com/repo/' } - jcenter() + jcenter() } } diff --git a/UI/StepNavigator/entry/build.gradle b/UI/StepNavigator/entry/build.gradle index 1ee2912960..a1d9a9dac3 100644 --- a/UI/StepNavigator/entry/build.gradle +++ b/UI/StepNavigator/entry/build.gradle @@ -2,9 +2,9 @@ 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#ZH-CN_TOPIC_0000001154985555__section1112183053510 ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -14,5 +14,4 @@ ohos { } } } - supportSystem "standard" } diff --git a/UI/StepNavigator/entry/src/main/config.json b/UI/StepNavigator/entry/src/main/config.json index 39e4dbe927..9966e15e4f 100644 --- a/UI/StepNavigator/entry/src/main/config.json +++ b/UI/StepNavigator/entry/src/main/config.json @@ -10,7 +10,7 @@ "module": { "package": "ohos.samples.stepnavigator", "name": ".MyApplication", - "mainAbility": "ohos.samples.stepnavigator.MainAbility", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": "ohos.samples.stepnavigator.MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -46,11 +48,7 @@ "pages/index/index", "pages/homepage/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } + "name": ".default" } ] } diff --git a/UI/Swiper/build.gradle b/UI/Swiper/build.gradle index cec93fd717..e3b3b4bc3f 100644 --- a/UI/Swiper/build.gradle +++ b/UI/Swiper/build.gradle @@ -2,12 +2,10 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } - + buildscript { repositories { maven { @@ -19,7 +17,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/Swiper/entry/build.gradle b/UI/Swiper/entry/build.gradle index 1ee2912960..a1d9a9dac3 100644 --- a/UI/Swiper/entry/build.gradle +++ b/UI/Swiper/entry/build.gradle @@ -2,9 +2,9 @@ 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#ZH-CN_TOPIC_0000001154985555__section1112183053510 ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -14,5 +14,4 @@ ohos { } } } - supportSystem "standard" } diff --git a/UI/Swiper/entry/src/main/config.json b/UI/Swiper/entry/src/main/config.json index b714a311aa..485183cf64 100644 --- a/UI/Swiper/entry/src/main/config.json +++ b/UI/Swiper/entry/src/main/config.json @@ -10,7 +10,7 @@ "module": { "package": "ohos.samples.swiper", "name": ".MyApplication", - "mainAbility": "ohos.samples.swiper.MainAbility", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": "ohos.samples.swiper.MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -45,11 +47,7 @@ "pages": [ "pages/index/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } + "name": ".default" } ] } diff --git a/UI/Tabs/build.gradle b/UI/Tabs/build.gradle index ad33f7c014..e7c160891c 100644 --- a/UI/Tabs/build.gradle +++ b/UI/Tabs/build.gradle @@ -2,10 +2,8 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -19,7 +17,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/Tabs/entry/build.gradle b/UI/Tabs/entry/build.gradle index 6b6a606b1b..963bb68bd2 100644 --- a/UI/Tabs/entry/build.gradle +++ b/UI/Tabs/entry/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -13,5 +13,4 @@ ohos { } } } - supportSystem "standard" } diff --git a/UI/Tabs/entry/src/main/config.json b/UI/Tabs/entry/src/main/config.json index 0f1751fe32..f60128d699 100644 --- a/UI/Tabs/entry/src/main/config.json +++ b/UI/Tabs/entry/src/main/config.json @@ -9,8 +9,8 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.tabs", - "name": ".MainAbility", - "mainAbility": "ohos.samples.tabs.MainAbility", + "name": ".MyApplication", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": ".MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -45,11 +47,7 @@ "pages": [ "pages/index/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } + "name": ".default" } ] } diff --git a/UI/Toolbar/build.gradle b/UI/Toolbar/build.gradle index ad33f7c014..e7c160891c 100644 --- a/UI/Toolbar/build.gradle +++ b/UI/Toolbar/build.gradle @@ -2,10 +2,8 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -19,7 +17,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/Toolbar/entry/build.gradle b/UI/Toolbar/entry/build.gradle index 6b6a606b1b..963bb68bd2 100644 --- a/UI/Toolbar/entry/build.gradle +++ b/UI/Toolbar/entry/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -13,5 +13,4 @@ ohos { } } } - supportSystem "standard" } diff --git a/UI/Toolbar/entry/src/main/config.json b/UI/Toolbar/entry/src/main/config.json index a256150b8b..39aa9d7b2e 100644 --- a/UI/Toolbar/entry/src/main/config.json +++ b/UI/Toolbar/entry/src/main/config.json @@ -9,8 +9,8 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.toolbar", - "name": ".MainAbility", - "mainAbility": "ohos.samples.toolbar.MainAbility", + "name": ".MyApplication", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": "ohos.samples.toolbar.MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -46,11 +48,7 @@ "pages/index/index", "pages/toolbar/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } + "name": ".default" } ] } diff --git a/UI/chart/build.gradle b/UI/chart/build.gradle index cbe2b79644..c464f7a3f4 100644 --- a/UI/chart/build.gradle +++ b/UI/chart/build.gradle @@ -1,10 +1,19 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 + signingConfigs { + release { + storeFile file('D:\\HAP_Sign\\app.p12') + storePassword '0000001B220F29811F61782B01CDFA9986B6364DDE083BCB50BDC1857F823CDD09BA95835B6B5EC0A3FBFA' + keyAlias = 'app' + keyPassword '0000001BCB01A8BBF90EA527496BBF3DEC36D67C5AEE9C297A3FD397000F048D48D68CE5DEC2CBE6EFBC0C' + signAlg = 'SHA256withECDSA' + profile file('D:\\HAP_Sign\\Profile\\chart.p7b') + certpath file('D:\\HAP_Sign\\app.cer') + } } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -18,7 +27,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/UI/chart/entry/build.gradle b/UI/chart/entry/build.gradle index 88e1fd7d4a..eba043e2e0 100644 --- a/UI/chart/entry/build.gradle +++ b/UI/chart/entry/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -12,5 +12,4 @@ ohos { } } } - supportSystem "standard" } \ No newline at end of file diff --git a/UI/chart/entry/src/main/config.json b/UI/chart/entry/src/main/config.json index 4fa885a498..0158f5cb01 100644 --- a/UI/chart/entry/src/main/config.json +++ b/UI/chart/entry/src/main/config.json @@ -9,8 +9,8 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.chart", - "name": ".MainAbility", - "mainAbility": "ohos.samples.chart.MainAbility", + "name": ".MyApplication", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": ".MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -51,11 +53,7 @@ "pages/loading/index", "pages/rainbow/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } + "name": ".default" } ] } diff --git a/UI/chart/entry/src/main/resources/base/element/string.json b/UI/chart/entry/src/main/resources/base/element/string.json index a8cf9a542e..09b7b8ca06 100644 --- a/UI/chart/entry/src/main/resources/base/element/string.json +++ b/UI/chart/entry/src/main/resources/base/element/string.json @@ -1,7 +1,7 @@ { "string": [ { - "name": "entry_MainAbility", + "name": "app_name", "value": "chart" }, { diff --git a/common/Clock/build.gradle b/common/Clock/build.gradle index 56f2b22c1b..d3417efbce 100644 --- a/common/Clock/build.gradle +++ b/common/Clock/build.gradle @@ -15,10 +15,8 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -32,7 +30,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } diff --git a/common/Clock/entry/build.gradle b/common/Clock/entry/build.gradle index 921386f38e..6d55628ae8 100644 --- a/common/Clock/entry/build.gradle +++ b/common/Clock/entry/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -12,5 +12,4 @@ ohos { } } } - supportSystem "standard" } diff --git a/common/Clock/entry/src/main/config.json b/common/Clock/entry/src/main/config.json index 706b642916..68c69b5d24 100644 --- a/common/Clock/entry/src/main/config.json +++ b/common/Clock/entry/src/main/config.json @@ -10,7 +10,7 @@ "module": { "package": "ohos.samples.clock", "name": ".MyApplication", - "mainAbility": "ohos.samples.clock.MainAbility", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,8 +32,10 @@ ] } ], - "name": ".MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -42,14 +44,10 @@ ], "js": [ { - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - }, "pages": [ "pages/index/index" - ] + ], + "name": ".default" } ] } diff --git a/common/DistributeCalc/entry/src/main/config.json b/common/DistributeCalc/entry/src/main/config.json index 1d85085a13..f076675b69 100644 --- a/common/DistributeCalc/entry/src/main/config.json +++ b/common/DistributeCalc/entry/src/main/config.json @@ -11,6 +11,7 @@ "module": { "package": "com.example.distributedcalc", "name": ".MyApplication", + "mainAbility": ".default", "deviceType": [ "phone" ], @@ -32,7 +33,7 @@ ] } ], - "name": "com.example.distributedcalc.MainAbility", + "name": ".default", "icon": "$media:icon", "srcPath": "default", "srcLanguage": "js", @@ -48,11 +49,7 @@ "pages/index/index", "pages/calc/calc" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } + "name": ".default" } ] } diff --git a/common/ECG/build.gradle b/common/ECG/build.gradle index 729c646b74..9b9e8fdbc3 100644 --- a/common/ECG/build.gradle +++ b/common/ECG/build.gradle @@ -16,10 +16,8 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { repositories { @@ -32,7 +30,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } allprojects { diff --git a/common/ECG/entry/build.gradle b/common/ECG/entry/build.gradle index 921386f38e..6d55628ae8 100644 --- a/common/ECG/entry/build.gradle +++ b/common/ECG/entry/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -12,5 +12,4 @@ ohos { } } } - supportSystem "standard" } diff --git a/common/ECG/entry/src/main/config.json b/common/ECG/entry/src/main/config.json index d2eac8a201..27ad96cfca 100644 --- a/common/ECG/entry/src/main/config.json +++ b/common/ECG/entry/src/main/config.json @@ -10,7 +10,7 @@ "module": { "package": "ohos.samples.ecg", "name": ".MyApplication", - "mainAbility": "ohos.samples.ecg.MainAbility", + "mainAbility": ".default", "reqCapabilities": [ "video_support" ], @@ -38,8 +38,10 @@ "orientation": "unspecified", "visible": false, "formsEnabled": false, - "name": ".MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -51,11 +53,7 @@ "pages": [ "pages/index/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } + "name": ".default" } ] } diff --git a/common/Flashlight/build.gradle b/common/Flashlight/build.gradle index 729c646b74..9b9e8fdbc3 100644 --- a/common/Flashlight/build.gradle +++ b/common/Flashlight/build.gradle @@ -16,10 +16,8 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { repositories { @@ -32,7 +30,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } allprojects { diff --git a/common/Flashlight/entry/build.gradle b/common/Flashlight/entry/build.gradle index 921386f38e..6d55628ae8 100644 --- a/common/Flashlight/entry/build.gradle +++ b/common/Flashlight/entry/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -12,5 +12,4 @@ ohos { } } } - supportSystem "standard" } diff --git a/common/Flashlight/entry/src/main/config.json b/common/Flashlight/entry/src/main/config.json index c1b773498e..829e80e73c 100644 --- a/common/Flashlight/entry/src/main/config.json +++ b/common/Flashlight/entry/src/main/config.json @@ -10,7 +10,7 @@ "module": { "package": "ohos.samples.flashlight", "name": ".MyApplication", - "mainAbility": "ohos.samples.flashlight.MainAbility", + "mainAbility": ".default", "reqCapabilities": [ "video_support" ], @@ -38,8 +38,10 @@ "orientation": "unspecified", "visible": true, "formsEnabled": false, - "name": ".MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -51,11 +53,7 @@ "pages": [ "pages/index/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } + "name": ".default" } ] } diff --git a/common/JsHelloWorld/build.gradle b/common/JsHelloWorld/build.gradle index 729c646b74..9b9e8fdbc3 100644 --- a/common/JsHelloWorld/build.gradle +++ b/common/JsHelloWorld/build.gradle @@ -16,10 +16,8 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { repositories { @@ -32,7 +30,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.3-RC' + classpath 'com.huawei.ohos:hap:3.0.3.2' } } allprojects { diff --git a/common/JsHelloWorld/entry/build.gradle b/common/JsHelloWorld/entry/build.gradle index 921386f38e..6d55628ae8 100644 --- a/common/JsHelloWorld/entry/build.gradle +++ b/common/JsHelloWorld/entry/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.huawei.ohos.hap' ohos { - compileSdkVersion 6 + compileSdkVersion 7 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 7 } buildTypes { release { @@ -12,5 +12,4 @@ ohos { } } } - supportSystem "standard" } diff --git a/common/JsHelloWorld/entry/src/main/config.json b/common/JsHelloWorld/entry/src/main/config.json index 38f32fb69f..051b129718 100644 --- a/common/JsHelloWorld/entry/src/main/config.json +++ b/common/JsHelloWorld/entry/src/main/config.json @@ -10,7 +10,7 @@ "module": { "package": "ohos.samples.jshelloworld", "name": ".MyApplication", - "mainAbility": "ohos.samples.jshelloworld.MainAbility", + "mainAbility": ".default", "reqCapabilities": [ "video_support" ], @@ -38,8 +38,10 @@ "orientation": "unspecified", "visible": true, "formsEnabled": false, - "name": ".MainAbility", + "name": ".default", "icon": "$media:icon", + "srcPath": "default", + "srcLanguage": "js", "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", @@ -52,11 +54,7 @@ "pages/index/index", "pages/second/second" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } + "name": ".default" } ] } -- Gitee From 642c7d62ab18cfdcab1256e42fdb0d1daff70cba Mon Sep 17 00:00:00 2001 From: adslk Date: Wed, 13 Oct 2021 10:42:42 +0800 Subject: [PATCH 2/4] modify the build.gradle file Signed-off-by: adslk --- UI/JsTimer/build.gradle | 11 ----------- UI/chart/build.gradle | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/UI/JsTimer/build.gradle b/UI/JsTimer/build.gradle index ae44c4866a..0d74727e9f 100644 --- a/UI/JsTimer/build.gradle +++ b/UI/JsTimer/build.gradle @@ -1,17 +1,6 @@ apply plugin: 'com.huawei.ohos.app' ohos { - signingConfigs { - release { - storeFile file('D:\\HAP_Sign\\app.p12') - storePassword '0000001B32648A327AE97650F134C2CF12ADAAAA90678F8D4A7090C2D8DCDF2BAF01FE7CE77979AE0184B6' - keyAlias = 'app' - keyPassword '0000001B738D0B273F4CB356154ACA393023C07E80B77ACED6D94571C38222FBB943F03C63B0C7D7133FBA' - signAlg = 'SHA256withECDSA' - profile file('D:\\HAP_Sign\\Profile\\jstimer.p7b') - certpath file('D:\\HAP_Sign\\app.cer') - } - } compileSdkVersion 7 supportSystem "standard" } diff --git a/UI/chart/build.gradle b/UI/chart/build.gradle index c464f7a3f4..89fe311660 100644 --- a/UI/chart/build.gradle +++ b/UI/chart/build.gradle @@ -1,17 +1,6 @@ apply plugin: 'com.huawei.ohos.app' ohos { - signingConfigs { - release { - storeFile file('D:\\HAP_Sign\\app.p12') - storePassword '0000001B220F29811F61782B01CDFA9986B6364DDE083BCB50BDC1857F823CDD09BA95835B6B5EC0A3FBFA' - keyAlias = 'app' - keyPassword '0000001BCB01A8BBF90EA527496BBF3DEC36D67C5AEE9C297A3FD397000F048D48D68CE5DEC2CBE6EFBC0C' - signAlg = 'SHA256withECDSA' - profile file('D:\\HAP_Sign\\Profile\\chart.p7b') - certpath file('D:\\HAP_Sign\\app.cer') - } - } compileSdkVersion 7 supportSystem "standard" } -- Gitee From eeeeb57d931ffeb37726716f8bd820c995417f51 Mon Sep 17 00:00:00 2001 From: adslk Date: Wed, 13 Oct 2021 11:02:34 +0800 Subject: [PATCH 3/4] modify the build.gradle file Signed-off-by: adslk --- UI/International/build.gradle | 11 ----------- UI/JsBasicComponents/build.gradle | 11 ----------- UI/Stack/build.gradle | 11 ----------- 3 files changed, 33 deletions(-) diff --git a/UI/International/build.gradle b/UI/International/build.gradle index b27db03840..9107e58b0a 100644 --- a/UI/International/build.gradle +++ b/UI/International/build.gradle @@ -2,17 +2,6 @@ apply plugin: 'com.huawei.ohos.app' ohos { - signingConfigs { - release { - storeFile file('D:\\HAP_Sign\\app.p12') - storePassword '0000001B982A609EAAF5208607CAFC6A763E2AF0F261A326E06DD8E64F8241B1B40C0EC8E4C3833EB1C211' - keyAlias = 'app' - keyPassword '0000001B52101FAB8AE33B3735348D8C5A4AD83682DB083186CDF9BBE51EE7C008E31DBA3D098D593A47CF' - signAlg = 'SHA256withECDSA' - profile file('D:\\HAP_Sign\\Profile\\international.p7b') - certpath file('D:\\HAP_Sign\\app.cer') - } - } compileSdkVersion 7 supportSystem "standard" } diff --git a/UI/JsBasicComponents/build.gradle b/UI/JsBasicComponents/build.gradle index 11eb4cfa8a..b2d91b2309 100644 --- a/UI/JsBasicComponents/build.gradle +++ b/UI/JsBasicComponents/build.gradle @@ -2,17 +2,6 @@ apply plugin: 'com.huawei.ohos.app' //For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510 ohos { - signingConfigs { - release { - storeFile file('D:\\HAP_Sign\\app.p12') - storePassword '0000001B7677EEAB011BD9E8B263D7270C7D95385D998A60BBB1970AAE70247B49A351DCA733CAECDFA605' - keyAlias = 'app' - keyPassword '0000001B47399FE2776C3726BC3D6DFFD5B288E48111F48122B7CF51678CFBE4514628CF39354683E084DD' - signAlg = 'SHA256withECDSA' - profile file('D:\\HAP_Sign\\Profile\\jsbasiccomponent.p7b') - certpath file('D:\\HAP_Sign\\app.cer') - } - } compileSdkVersion 7 supportSystem "standard" } diff --git a/UI/Stack/build.gradle b/UI/Stack/build.gradle index 732a86d2de..e3b3b4bc3f 100644 --- a/UI/Stack/build.gradle +++ b/UI/Stack/build.gradle @@ -2,17 +2,6 @@ apply plugin: 'com.huawei.ohos.app' ohos { - signingConfigs { - release { - storeFile file('D:\\HAP_Sign\\app.p12') - storePassword '0000001B02F6A8AF52109B8F36CABC1ACB01015A13EB8CC5F477DE121639DC5E5F692DC3BC9757758AC0F2' - keyAlias = 'app' - keyPassword '0000001BC900A7911D3A0B4A30CC98BE569F7C13880620BCD29720838EA87612B760CBAA8ADE671E7D4C9F' - signAlg = 'SHA256withECDSA' - profile file('D:\\HAP_Sign\\Profile\\stack.p7b') - certpath file('D:\\HAP_Sign\\app.cer') - } - } compileSdkVersion 7 supportSystem "standard" } -- Gitee From 147aa9c32f0ab50b029e5335c6136483e9e648a5 Mon Sep 17 00:00:00 2001 From: adslk Date: Wed, 13 Oct 2021 12:06:30 +0800 Subject: [PATCH 4/4] modify the config.json file Signed-off-by: adslk --- UI/JsBrightness/entry/src/main/config.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/UI/JsBrightness/entry/src/main/config.json b/UI/JsBrightness/entry/src/main/config.json index 586656dc5d..c691cc2a8f 100644 --- a/UI/JsBrightness/entry/src/main/config.json +++ b/UI/JsBrightness/entry/src/main/config.json @@ -49,11 +49,7 @@ "pages": [ "pages/index/index" ], - "name": ".default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } + "name": ".default" } ] } -- Gitee