diff --git a/UI/AtomicLayout/README_zh.md b/UI/AtomicLayout/README_zh.md index fb0a13b04ddbb13a8d1a3c8d190581be3c81e2f9..537c5469367713463129149759fb79a8d370dd0f 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 ad33f7c014a76f9b635c1e497c19e278f2aef9da..e7c160891cbc282210fc10618810cdd3b692f261 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 88e1fd7d4aad2df8c0b60bc3fd818690ace968bf..eba043e2e0a4c38a5758ad9efcabcf505f6a3311 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 70845dc3a3cab615f844358b19fd31a36bc82b8b..e245734e15f137487499969665f301bd116de4a2 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 ba456c6cc57de8df72b8f0695ad44a2ac7c2bafe..7d0c881aa6c646320d11751008ebbc6a627de1f6 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 ad33f7c014a76f9b635c1e497c19e278f2aef9da..e7c160891cbc282210fc10618810cdd3b692f261 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 88e1fd7d4aad2df8c0b60bc3fd818690ace968bf..eba043e2e0a4c38a5758ad9efcabcf505f6a3311 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 4bc57d708714201fc3dc801ec3001277c0db5edf..a6d6985472a3f9e7746403a0b4bbec0102ae38e0 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 708d0f3df6dab533b167c46366653f960c48cac0..9107e58b0abb8462634a1cfaf1b2a92f0b251580 100644 --- a/UI/International/build.gradle +++ b/UI/International/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/International/entry/build.gradle b/UI/International/entry/build.gradle index 6b6a606b1b3e2af76d27a6fa8ad069e92ddbed68..963bb68bd2d888edca2e70b2f56dc4c402fd9291 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 44e647ba844567d42cd0d1971dbd4cb180dfdf2e..f278593bba6a0db2a25d5dfc9a5dd76e25ecf9b9 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 e993f18a48c3684613500e007cd5ea1990d2c459..46b60f671636e773ed178e73685210c630acf439 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 138dc6a7f91cc18d280d3c29414b7e59eb96c9dc..8243c3b322a99d4203fb603bab0cafd024091fb7 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 e39d2db4ecb673fea10dcc7f9b869f3da07e3e84..3bb4cc8c1cb1c7f1d17f44df0963ad7a5709fd33 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 e993f18a48c3684613500e007cd5ea1990d2c459..46b60f671636e773ed178e73685210c630acf439 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 138dc6a7f91cc18d280d3c29414b7e59eb96c9dc..8243c3b322a99d4203fb603bab0cafd024091fb7 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 4973c96382377c1b80790d25913bd1b9d327e307..ccdef555df232879a895cd0acafd4f85b411e0e0 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 a4bb0ba08ffcb8471e1e0fffdd133fecc2ea4a06..3ea548b6cd4c21476333189017cea597b1eb0d4f 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 1f5c317ac2ab17535902bb104e9a07145de7d7d8..1993c174127da33e6814b9cbff0f6eb490a34769 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 5ec24517d9185b38548572f8e552ecc0ad95eeca..4ea3fceddc3cde1b3aa836998206644045a4cab6 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 b346f373e3b0418d32939f241c5b9846d0c2c21a..11ef08f565493b3b2e919805c44e20873e2b803a 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 06f51718990e9204beb9f6468046ea2fb75ad670..b2d91b2309022766cd1f638545369a910c9265fc 100644 --- a/UI/JsBasicComponents/build.gradle +++ b/UI/JsBasicComponents/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#section1112183053510 ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -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/JsBasicComponents/entry/build.gradle b/UI/JsBasicComponents/entry/build.gradle index f8b8f590c9fdb52c732425541c431c4d2d5a8835..cb1b043b0ac22c936d09041dc7bfecd617931472 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 1f9bc1319c8ed0cfb0583142ae9ae0a61539ac4c..168c0182227742171f70f4223463a727ada258d3 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 708d0f3df6dab533b167c46366653f960c48cac0..9107e58b0abb8462634a1cfaf1b2a92f0b251580 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 6b6a606b1b3e2af76d27a6fa8ad069e92ddbed68..963bb68bd2d888edca2e70b2f56dc4c402fd9291 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 57ea335800736e724b97b2267f32b8884748b731..c691cc2a8fe327af212117ec610bc608b50d0488 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,11 +49,7 @@ "pages": [ "pages/index/index" ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } + "name": ".default" } ] } diff --git a/UI/JsCanvas/build.gradle b/UI/JsCanvas/build.gradle index bbe463c74d9fc7d2ffb0e2d94e3204426a0015ad..9107e58b0abb8462634a1cfaf1b2a92f0b251580 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 6b6a606b1b3e2af76d27a6fa8ad069e92ddbed68..963bb68bd2d888edca2e70b2f56dc4c402fd9291 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 ea990b3d1cbb842398d05b08433b3151b2d933bb..f05d3ed51a14ff2329a6e352d74fbf31b5a1cb0b 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 6fac162cbb623b3b1d97cad7247172dc41cf91b9..9107e58b0abb8462634a1cfaf1b2a92f0b251580 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 6b6a606b1b3e2af76d27a6fa8ad069e92ddbed68..963bb68bd2d888edca2e70b2f56dc4c402fd9291 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 d9dcda86241ca0afa1c9515f97131a3ad4da141d..0debbe5a2a56a0c683868f5d76a33ffd3d8736b2 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 5241ed1fdfd558b276e5bf1471cf37f96e7f7d93..a504db11a42c8f99114e351b7247b317807049ad 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 8043324df3c5c95cf5cbf23cdbed124b6840a69d..eeb7e1258930dbfd3af9f86f229a811de106a92b 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 2a7bdf2f9f05f863861239a149a129c224dfbf69..7e461d423be1b49b4ee89e41773235f57993f55d 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 ad33f7c014a76f9b635c1e497c19e278f2aef9da..e7c160891cbc282210fc10618810cdd3b692f261 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 88e1fd7d4aad2df8c0b60bc3fd818690ace968bf..eba043e2e0a4c38a5758ad9efcabcf505f6a3311 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 4d7b7c2e8a6f4557feffa0a9b0eac94cbcd0bdb4..3a55eed8150164b11088adece41fed93902646f6 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 bbe463c74d9fc7d2ffb0e2d94e3204426a0015ad..9107e58b0abb8462634a1cfaf1b2a92f0b251580 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 bdd062a7561aa5eb7aff41d19322ee21d13a72a5..a44756ac899a64df0633e99ca527c6411ca032ea 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 d419a29f909e7bfc646c76d6d6f3143902d97476..1130b32207fb3302cd7768ffc38d1b6cae43e8c9 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 f0fa523156e96c11cd22cb2823ab8c2a41347f53..0d74727e9f6d132b8d5afacd2113fb8e4ea415f0 100644 --- a/UI/JsTimer/build.gradle +++ b/UI/JsTimer/build.gradle @@ -1,12 +1,10 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } - + buildscript { repositories { maven { @@ -17,8 +15,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 ac1075fb539137792060abec0538002ab3aa408d..963bb68bd2d888edca2e70b2f56dc4c402fd9291 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 7f7c9265ff98ada04e38fef5e0dcb69282351bed..c25640be4f52b9fca191ec229d9ad814d77c1708 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 7bc159fd957a474afb3a57f19842e0588c415cbf..ec4fdd504e58128ef8f84e0df280e7b2e06b3234 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 0bae6bd40f7360d5d818998221b199d3ec0f69c0..a139738ec1d96c5914717beb5367b54d633dc50c 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 c3f3ef69e87fa254198e144c7a94775654584c77..9b1921168a55316fe2172e9486aa654e4d289615 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 8181d84eae83f6e584f524893fff06d2e0d4f750..663f9f480786daf8540dc96919025d84ae22013b 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 a22272e6bb4b4327451d54a4228ed08e71509ab8..f99da4c6493aa983b8d144168962e0a29b7dc135 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 a0c56aee870fe6ab5850a5dbf903a84653f093cc..4a35e1f97db7b01a591e52489ad73795e6f0f2e7 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 c3f3ef69e87fa254198e144c7a94775654584c77..9b1921168a55316fe2172e9486aa654e4d289615 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 921386f38e8d5e8e0272b5326c80b80bcf5a067d..6d55628ae8a558478538622000807d0bd55d0cee 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 fd74fab10747f46f8cbb44146480352bd6336864..8bd10b0b4951236f9eb26cbd5d4b9b49001cb627 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 d45348af3401adb65bea584cb8e04da996b29edd..e3b3b4bc3f2ead00ee36e2aab8695b7a8d7bb8fd 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 41fab7380560292547ee899fd231951bb37fad92..65848f31731b0aa35f9b4831aa9718d4830aba2b 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 b57dad4b54fc0d171085f32c83db7049d4144090..bb48c1d1ee5b21e6d7ead0bbafb1126995ec374a 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 d45348af3401adb65bea584cb8e04da996b29edd..e7c160891cbc282210fc10618810cdd3b692f261 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 6b6a606b1b3e2af76d27a6fa8ad069e92ddbed68..eba043e2e0a4c38a5758ad9efcabcf505f6a3311 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 ebecf76f85e9c09b43d39910b22f1e21f8d8f6d0..ff761c18f00527dcb21ab344c52c2ee99b48c8f2 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 d45348af3401adb65bea584cb8e04da996b29edd..e3b3b4bc3f2ead00ee36e2aab8695b7a8d7bb8fd 100644 --- a/UI/Stack/build.gradle +++ b/UI/Stack/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/Stack/entry/build.gradle b/UI/Stack/entry/build.gradle index 41fab7380560292547ee899fd231951bb37fad92..65848f31731b0aa35f9b4831aa9718d4830aba2b 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 c8605e69fc7291963791f602d9b25c69cb0be9c0..1f6f97e3fea70d925208634ccad1b9ace3e1476f 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 5e558c6ac6ec34cf94d1d20976cb59bb3ef9ca6f..8a5b70a97f4e2c38314f1a4f8e4e50bc4d734229 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 1ee2912960d74e6dfa19c49ae1742ab62da51ace..a1d9a9dac3a1d4882b99e126273f8ed197589dda 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 39e4dbe927f7266919c300757470804d6fcf833e..9966e15e4fbe9ba0e90c6c841e90427d897a7fe6 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 cec93fd7172f7a65b0bd0999799b6f57215588f1..e3b3b4bc3f2ead00ee36e2aab8695b7a8d7bb8fd 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 1ee2912960d74e6dfa19c49ae1742ab62da51ace..a1d9a9dac3a1d4882b99e126273f8ed197589dda 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 b714a311aa03452af68c1d42292f02def0f690eb..485183cf64baed965ab71c2581d29b7d0d0f377b 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 ad33f7c014a76f9b635c1e497c19e278f2aef9da..e7c160891cbc282210fc10618810cdd3b692f261 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 6b6a606b1b3e2af76d27a6fa8ad069e92ddbed68..963bb68bd2d888edca2e70b2f56dc4c402fd9291 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 0f1751fe325b707eb34bd9d2a192b42adae07bcf..f60128d6992d7b8618dc58dc5376f33518fa4beb 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 ad33f7c014a76f9b635c1e497c19e278f2aef9da..e7c160891cbc282210fc10618810cdd3b692f261 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 6b6a606b1b3e2af76d27a6fa8ad069e92ddbed68..963bb68bd2d888edca2e70b2f56dc4c402fd9291 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 a256150b8b83ec3332a4e0d043076d1bc144e63b..39aa9d7b2e9f4d50c3b899b46271f1d6d89524a7 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 cbe2b796448ef7864c61a5a9aaf7e3d4feb21061..89fe311660bb7971743f670ef033616f2404d933 100644 --- a/UI/chart/build.gradle +++ b/UI/chart/build.gradle @@ -1,10 +1,8 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 6 - defaultConfig { - compatibleSdkVersion 6 - } + compileSdkVersion 7 + supportSystem "standard" } buildscript { @@ -18,7 +16,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 88e1fd7d4aad2df8c0b60bc3fd818690ace968bf..eba043e2e0a4c38a5758ad9efcabcf505f6a3311 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 4fa885a49853af4793d28365edee5a67e1e7450d..0158f5cb01302edb3164b9e5a7b59e3350bfeff1 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 a8cf9a542e177a0f858e3a0eae965bf96f822628..09b7b8ca067c70a316e7d9f0cf74a3f363770813 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 56f2b22c1bf97c88aa603a46e52f59ec9094f74b..d3417efbced990a202726e6555f53c045e065a48 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 921386f38e8d5e8e0272b5326c80b80bcf5a067d..6d55628ae8a558478538622000807d0bd55d0cee 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 706b642916462806e84608ffdfe0bcaad89baae7..68c69b5d2411456b2bc87c435f456de6a1561ae5 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 1d85085a13669389cdb2e822aeb5a13cf3d88184..f076675b69069fc4d4a621a53310038124615c41 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 729c646b74ca801b1d77eab87d6dd53e00fa9779..9b9e8fdbc3e98ab78a615e61f664a1ec47a4bfbe 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 921386f38e8d5e8e0272b5326c80b80bcf5a067d..6d55628ae8a558478538622000807d0bd55d0cee 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 d2eac8a20187ec57d770cd8937fa0209c3afb9b8..27ad96cfca172faa268c93f1b02414fd733639f7 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 729c646b74ca801b1d77eab87d6dd53e00fa9779..9b9e8fdbc3e98ab78a615e61f664a1ec47a4bfbe 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 921386f38e8d5e8e0272b5326c80b80bcf5a067d..6d55628ae8a558478538622000807d0bd55d0cee 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 c1b773498e71f29509e7e52ae95e5ee4a955824a..829e80e73cc5dda7cbb996fd5875a99c1efdfd45 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 729c646b74ca801b1d77eab87d6dd53e00fa9779..9b9e8fdbc3e98ab78a615e61f664a1ec47a4bfbe 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 921386f38e8d5e8e0272b5326c80b80bcf5a067d..6d55628ae8a558478538622000807d0bd55d0cee 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 38f32fb69fe953997864a2d0049365c85ddbfd17..051b12971821d9c3fada46713e2eae12ae851cf2 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" } ] }