diff --git a/UI/Animation/entry/src/main/config.json b/UI/Animation/entry/src/main/config.json index a27ef9b733de7aa9431538fe177a7df918fae39f..a811e25610a404aadc45d0bc4db01d2a27815922 100644 --- a/UI/Animation/entry/src/main/config.json +++ b/UI/Animation/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.animation", - "name": ".Animation", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.animation.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/AtomicLayout/entry/src/main/config.json b/UI/AtomicLayout/entry/src/main/config.json index bfffc253b1768d7f1117c3e705fc5adfc8567e44..0817c68f97ba72962131cf0dec5d9b81c6aeeb79 100644 --- a/UI/AtomicLayout/entry/src/main/config.json +++ b/UI/AtomicLayout/entry/src/main/config.json @@ -9,12 +9,10 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.atomiclayout", - "name": ".MyApplication", + "name": ".MainAbility", "mainAbility": "ohos.samples.atomiclayout.MainAbility", "deviceType": [ - "phone", - "tv", - "wearable" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.css b/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.css index 917c89243b1494182262267f2b68b94f2fb80a23..4d546d78c3e11aa06a4602625895c0d1ea19538f 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.css +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.css @@ -29,8 +29,8 @@ } .btn { width: 60%; - height: 50px; - font-size: 20px; + height: 100px; + font-size: 40px; margin-top: 20px; color: #ff00ff7f; } diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.css b/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.css index f52d61b775f819dc152fd22ed09b851fd0849c56..b2570de7d95c04bfe319ff439b6353a5022d9a2a 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.css +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.css @@ -28,8 +28,8 @@ } .btn { width: 60%; - height: 50px; - font-size: 20px; + height: 100px; + font-size: 40px; margin-top: 20px; color: #ff00ff7f; } diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.css b/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.css index 917d3393f55176d4d30ef10f20450a04c48f057f..46472a3f6aa8bda7c3194b11a31eb25f64088af5 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.css +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.css @@ -21,8 +21,8 @@ .btn { width: 60%; - height: 50px; - font-size: 20px; + height: 100px; + font-size: 40px; margin-top: 20px; color: #ff00ff7f; } diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.css b/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.css index ba53e8f9746f310702e7ca94f03e77813fc55a34..6f94aa17987b6a7bd15a3b72bc49a82b7f804aaa 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.css +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.css @@ -28,8 +28,8 @@ } .btn { width: 60%; - height: 50px; - font-size: 20px; + height: 100px; + font-size: 40px; margin-top: 20px; color: #ff00ff7f; } diff --git a/UI/Badge/entry/src/main/config.json b/UI/Badge/entry/src/main/config.json index 483c4f758a8f60afe1dc6866f74d86277a00b181..f42da2fc32e97fab6f5e175b23d413890b8d74b9 100644 --- a/UI/Badge/entry/src/main/config.json +++ b/UI/Badge/entry/src/main/config.json @@ -9,10 +9,10 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.badge", - "name": ".MyApplication", + "name": ".MainAbility", "mainAbility": "ohos.samples.badge.MainAbility", "deviceType": [ - "phone" + "default" ], "distro": { "deliveryWithInstall": true, @@ -32,7 +32,7 @@ ] } ], - "name": "ohos.samples.badge.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/Badge/entry/src/main/js/default/pages/index/index.css b/UI/Badge/entry/src/main/js/default/pages/index/index.css index 4a6f83740c507cdd98742e52fe160dc34081c18f..3c45d11f3d8cdc3ae58d84082ebe41a9100c0930 100644 --- a/UI/Badge/entry/src/main/js/default/pages/index/index.css +++ b/UI/Badge/entry/src/main/js/default/pages/index/index.css @@ -40,7 +40,6 @@ display: flex; flex-direction: column; flex-shrink: 3; - display: flex; justify-content: space-between; align-content: flex-start; } diff --git a/UI/CommonLayout/entry/src/main/config.json b/UI/CommonLayout/entry/src/main/config.json index 31c134f1718a3ef96635603b054168e55e252a6f..a008f60b543b3be221b232829a36b578c543a1f6 100644 --- a/UI/CommonLayout/entry/src/main/config.json +++ b/UI/CommonLayout/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.commonlayout", - "name": ".CommonLayout", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "unspecified", "visible": true, "formsEnabled": false, - "name": "ohos.samples.commonlayout.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/Components/entry/src/main/config.json b/UI/Components/entry/src/main/config.json index 0d35071bd09898c0311da45c4a89f7fa11488dbd..d0b0a5ba4f31584b916d4d355cf2b474a51eaaa6 100644 --- a/UI/Components/entry/src/main/config.json +++ b/UI/Components/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.components", - "name": ".Components", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "unspecified", "visible": true, "formsEnabled": false, - "name": "ohos.samples.components.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/CustomLayout/entry/src/main/config.json b/UI/CustomLayout/entry/src/main/config.json index c01cd6bc55a3585d5d1b20be0b19e763846253b6..82afc18221d554fc2fe708c498fcd3b6237686af 100644 --- a/UI/CustomLayout/entry/src/main/config.json +++ b/UI/CustomLayout/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.customlayout", - "name": ".MyApplication", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -34,7 +34,7 @@ ] } ], - "name": "ohos.samples.customlayout.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:entry_MainAbility", diff --git a/UI/Dialog/entry/src/main/config.json b/UI/Dialog/entry/src/main/config.json index a9a8a3b058ea634bd0d6efe5fe89fa00060219bd..fb3f13ba3547ce5efdd9d4c6f889810355c7f17d 100644 --- a/UI/Dialog/entry/src/main/config.json +++ b/UI/Dialog/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "orientation": "portrait", "formsEnabled": false, - "name": "ohos.samples.dialog.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/Image/entry/src/main/config.json b/UI/Image/entry/src/main/config.json index 435bed8d4b4434cc7a06dc1235e5030df795c583..9c5f88961ae90dbb4f930a3cc52be57dbab2cf0e 100644 --- a/UI/Image/entry/src/main/config.json +++ b/UI/Image/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.image", - "name": ".Image", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "visible": true, "formsEnabled": false, - "name": "ohos.samples.image.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/JsAnimation/entry/src/main/config.json b/UI/JsAnimation/entry/src/main/config.json index f5d6d20586beb13d2cce3b246e7018251b703096..33bb0c0e03c1770213beeedf9c7352aa6c6529bc 100644 --- a/UI/JsAnimation/entry/src/main/config.json +++ b/UI/JsAnimation/entry/src/main/config.json @@ -10,9 +10,9 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.animation", - "name": ".MyApplication", + "name": ".MainAbility", "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -32,7 +32,7 @@ ] } ], - "name": "ohos.samples.animation.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/JsAnimationStyle/entry/src/main/config.json b/UI/JsAnimationStyle/entry/src/main/config.json index 2bbbb24d7dc12e968506327dfe595670589bedef..b93fc7217bebdc39b6b9bcc89ad00309d8b5b14e 100644 --- a/UI/JsAnimationStyle/entry/src/main/config.json +++ b/UI/JsAnimationStyle/entry/src/main/config.json @@ -9,10 +9,10 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.jsanimationstyle", - "name": ".MyApplication", + "name": ".MainAbility", "mainAbility": "ohos.samples.jsanimationstyle.MainAbility", "deviceType": [ - "phone" + "default" ], "distro": { "deliveryWithInstall": true, @@ -32,7 +32,7 @@ ] } ], - "name": "ohos.samples.jsanimationstyle.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/JsApp/entry/src/main/config.json b/UI/JsApp/entry/src/main/config.json index bbb911fda3c5f688efc5e4c7b2ab6f4a84c7e069..5468e9138333d20df48d997529436c4f1c41c43f 100644 --- a/UI/JsApp/entry/src/main/config.json +++ b/UI/JsApp/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.jsapplication", - "name": ".JsApplication", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "formsEnabled": false, "visible": true, - "name": "ohos.samples.jsapplication.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/JsCallJava/entry/src/main/config.json b/UI/JsCallJava/entry/src/main/config.json index a4bd7a5db952c974310d95f0dfbe4f024c931184..70cd1bc680db3c355e6577c8faac33db5fdd093c 100644 --- a/UI/JsCallJava/entry/src/main/config.json +++ b/UI/JsCallJava/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.jscalljava", - "name": ".JsCallJava", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "formsEnabled": false, "visible": true, - "name": "ohos.samples.jscalljava.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/JsComponents/entry/src/main/config.json b/UI/JsComponents/entry/src/main/config.json index b3dfb3be31d2c7b1d375456067f7a78e697d1e9d..79ef852359ac367033a1f4b3f01d186eb07098bd 100644 --- a/UI/JsComponents/entry/src/main/config.json +++ b/UI/JsComponents/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.jscomponents", - "name": ".JsComponents", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.jscomponents.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/JsFACard/entry/src/main/config.json b/UI/JsFACard/entry/src/main/config.json index d4649ebc8cb4e20a97f14f2d64c4b356079c2873..f6163e9afae65a1c22c1191cdad206fb8aa3a0de 100644 --- a/UI/JsFACard/entry/src/main/config.json +++ b/UI/JsFACard/entry/src/main/config.json @@ -9,10 +9,10 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.jsfacard", - "name": ".MyApplication", + "name": ".MainAbility", "mainAbility": "ohos.samples.jsfacard.MainAbility", "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -32,7 +32,7 @@ ] } ], - "name": "ohos.samples.jsfacard.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "formsEnabled": true, diff --git a/UI/JsGallery/entry/src/main/config.json b/UI/JsGallery/entry/src/main/config.json index 6dfad8797a8b955071e33cb82e73fb35ea192469..65faa20e39f118c1de17fbcc1bf66deb31a0f4c6 100644 --- a/UI/JsGallery/entry/src/main/config.json +++ b/UI/JsGallery/entry/src/main/config.json @@ -10,9 +10,9 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.gallery", - "name": ".MyApplication", + "name": ".MainAbility", "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -32,7 +32,7 @@ ] } ], - "name": "ohos.samples.gallery.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/JsShopping/entry/src/main/config.json b/UI/JsShopping/entry/src/main/config.json index bfa030e5315d831d4dbe9cb12ec81ffbae2fa9d6..c09132696234c22bec60c7554b9409112ef4a83b 100644 --- a/UI/JsShopping/entry/src/main/config.json +++ b/UI/JsShopping/entry/src/main/config.json @@ -10,9 +10,9 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.shopping", - "name": ".MyApplication", + "name": ".MainAbility", "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -32,7 +32,7 @@ ] } ], - "name": "ohos.samples.shopping.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/JsStartMode/entry/src/main/config.json b/UI/JsStartMode/entry/src/main/config.json index 31fa8c0d438ccdd69f2925b68adbb43d5170dbdb..1a293bf94fff410c1dee1a05b009d2af714e3863 100644 --- a/UI/JsStartMode/entry/src/main/config.json +++ b/UI/JsStartMode/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.jstransparent", - "name": ".JsTransparent", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "formsEnabled": false, "visible": true, - "name": "ohos.samples.jstransparent.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", @@ -44,28 +44,28 @@ "launchType": "standard" }, { - "name": "ohos.samples.jstransparent.ModalNormalAbility", + "name": ".ModalNormalAbility", "icon": "$media:icon", "description": "$string:mainability_description", "type": "page", "launchType": "standard" }, { - "name": "ohos.samples.jstransparent.ModalSemimodeAbility", + "name": ".ModalSemimodeAbility", "icon": "$media:icon", "description": "$string:mainability_description", "type": "page", "launchType": "standard" }, { - "name": "ohos.samples.jstransparent.ModalHalfAbility", + "name": ".ModalHalfAbility", "icon": "$media:icon", "description": "$string:mainability_description", "type": "page", "launchType": "standard" }, { - "name": "ohos.samples.jstransparent.ModalPopupAbility", + "name": ".ModalPopupAbility", "icon": "$media:icon", "description": "$string:mainability_description", "type": "page", diff --git a/UI/List/entry/src/main/config.json b/UI/List/entry/src/main/config.json index 3ad10eed123c2f34c0a4bbb74aadd8738f8db756..49db63ec41a533218855db5ab241d3bfae08c401 100644 --- a/UI/List/entry/src/main/config.json +++ b/UI/List/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.listcontainer", - "name": ".ListContainerSample", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.listcontainer.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/Localization/entry/src/main/config.json b/UI/Localization/entry/src/main/config.json index 52f24d92a3c390f1f24ab56202342b6401a26d8f..0ebe5785c1cf49383839c29e3d4b7875580fef28 100644 --- a/UI/Localization/entry/src/main/config.json +++ b/UI/Localization/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.timezone", - "name": ".TimeZone", + "name": ".TimeZoneAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.timezone.TimeZoneAbility", + "name": ".TimeZoneAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/MultiModeInput/entry/src/main/config.json b/UI/MultiModeInput/entry/src/main/config.json index 4745d739415ac6f4521efca17e9d9d8ca2162629..c4420557f188bbb51850c5d1b6401937609750d1 100644 --- a/UI/MultiModeInput/entry/src/main/config.json +++ b/UI/MultiModeInput/entry/src/main/config.json @@ -9,14 +9,15 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.multimodeinput", - "name": ".MyApplication", + "name": ".MainAbility", "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, "moduleName": "entry", - "moduleType": "entry" + "moduleType": "entry", + "installationFree": false }, "abilities": [ { @@ -31,7 +32,7 @@ } ], "orientation": "unspecified", - "name": "ohos.samples.multimodeinput.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/MultimodalEvent/entry/src/main/config.json b/UI/MultimodalEvent/entry/src/main/config.json index f5d1a51b26a5adfd3251b2887e80f177435e9e0b..edd99c2c4bad57363973593770beb3d5647914c8 100644 --- a/UI/MultimodalEvent/entry/src/main/config.json +++ b/UI/MultimodalEvent/entry/src/main/config.json @@ -9,14 +9,15 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.multimodalevent", - "name": ".MyApplication", + "name": ".MainAbility", "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, "moduleName": "entry", - "moduleType": "entry" + "moduleType": "entry", + "installationFree": false }, "abilities": [ { @@ -31,7 +32,7 @@ } ], "orientation": "unspecified", - "name": "ohos.samples.multimodalevent.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/PositionLayout/entry/src/main/config.json b/UI/PositionLayout/entry/src/main/config.json index a0076a8336f1bcd5997ffbe58ac70a3e4402a63e..d2bcd708fd6df27a56763a1171d1e211908ef511 100644 --- a/UI/PositionLayout/entry/src/main/config.json +++ b/UI/PositionLayout/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.positionlayout", - "name": ".PositionLayout", + "name": ".PositionLayoutAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "unspecified", "visible": true, "formsEnabled": false, - "name": "ohos.samples.positionlayout.PositionLayoutAbility", + "name": ".PositionLayoutAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/ProgressBar/entry/src/main/config.json b/UI/ProgressBar/entry/src/main/config.json index 2452a34a233d3a3c4d5bdef1b7696c5b1fc6c02d..6f930f8df1c0e0ac318a8245f1da69e57597a134 100644 --- a/UI/ProgressBar/entry/src/main/config.json +++ b/UI/ProgressBar/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.progress", - "name": ".Progress", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.progress.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/RefreshContainer/entry/src/main/config.json b/UI/RefreshContainer/entry/src/main/config.json index b06a733a86863b2539e91139c758ad1553754042..b57dad4b54fc0d171085f32c83db7049d4144090 100644 --- a/UI/RefreshContainer/entry/src/main/config.json +++ b/UI/RefreshContainer/entry/src/main/config.json @@ -9,7 +9,7 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.refreshcontainer", - "name": ".MyApplication", + "name": ".MainAbility", "mainAbility": "ohos.samples.refreshcontainer.MainAbility", "deviceType": [ "phone" @@ -32,7 +32,7 @@ ] } ], - "name": "ohos.samples.refreshcontainer.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/UiComponents/entry/src/main/config.json b/UI/UiComponents/entry/src/main/config.json index 0be069a2fc7de2169c5245c338f0443c1f4ab770..4feb6c45dd133acb9cabae09e1c622b39d31eff4 100644 --- a/UI/UiComponents/entry/src/main/config.json +++ b/UI/UiComponents/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.uicomponents", - "name": ".UiComponents", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "visible": true, "formsEnabled": false, - "name": "ohos.samples.uicomponents.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/UI/UserRegistration/entry/src/main/config.json b/UI/UserRegistration/entry/src/main/config.json index 945c56145fe28502dfa5c5cf9b6fc0854564f2ee..6cd7aaeabd69c92c1ad15cdb18e05fd2c9b598e2 100644 --- a/UI/UserRegistration/entry/src/main/config.json +++ b/UI/UserRegistration/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.userregistration", - "name": ".UserRegistration", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "visible": true, "formsEnabled": false, - "name": "ohos.samples.userregistration.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/common/JsHelloWorld/entry/src/main/js/default/pages/index/index.hml b/common/JsHelloWorld/entry/src/main/js/default/pages/index/index.hml index 6069a046a35c4409ab85e4595a079a1670a9c7fe..2a90650073159e170e3883d4ac12e1d65896a7f7 100644 --- a/common/JsHelloWorld/entry/src/main/js/default/pages/index/index.hml +++ b/common/JsHelloWorld/entry/src/main/js/default/pages/index/index.hml @@ -13,7 +13,7 @@ limitations under the License. --> -
+
{{ $t('strings.hello') }} {{title}} diff --git a/common/JsHelloWorld/entry/src/main/js/default/pages/index/index.js b/common/JsHelloWorld/entry/src/main/js/default/pages/index/index.js index 69d560b1af84784973b769134c9d13244a2261ac..e25efc776371bb1d0cabf65b59dfef81e9e7fa4a 100644 --- a/common/JsHelloWorld/entry/src/main/js/default/pages/index/index.js +++ b/common/JsHelloWorld/entry/src/main/js/default/pages/index/index.js @@ -14,7 +14,6 @@ */ import router from '@system.router' -import app from '@system.app' export default { data: { @@ -27,14 +26,6 @@ export default { router.replace({ uri: "pages/second/second" }) - }, - touchMove(e) { - if (e.direction == "right") { - this.appExit(); - } - }, - appExit() { - app.terminate() } } diff --git a/thread/EventHandler/entry/src/main/config.json b/thread/EventHandler/entry/src/main/config.json index e656a595346ba790556f679a896b3488bca9c341..8e6ce4107bcdc487020408b758665e3fa75cd487 100644 --- a/thread/EventHandler/entry/src/main/config.json +++ b/thread/EventHandler/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "orientation": "unspecified", "formsEnabled": false, - "name": "ohos.samples.eventhandler.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/thread/TaskDispatcher/entry/src/main/config.json b/thread/TaskDispatcher/entry/src/main/config.json index a48f51731a138ec66a4150788ef93f89827e5bcc..dd81af80c49a99cabba129e58d34ff61f5e638ef 100644 --- a/thread/TaskDispatcher/entry/src/main/config.json +++ b/thread/TaskDispatcher/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "orientation": "unspecified", "formsEnabled": false, - "name": "ohos.samples.taskmanager.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name",