From 58be4277cec476dfef361dd76cff8f74d85f1c5c Mon Sep 17 00:00:00 2001 From: adslk Date: Thu, 22 Jul 2021 11:58:32 +0800 Subject: [PATCH] modify the config.json Signed-off-by: adslk --- UI/Animation/entry/src/main/config.json | 6 +++--- UI/AtomicLayout/entry/src/main/config.json | 6 ++---- .../src/main/js/default/pages/fixed/index.css | 4 ++-- .../entry/src/main/js/default/pages/hide/index.css | 4 ++-- .../src/main/js/default/pages/index/index.css | 4 ++-- .../src/main/js/default/pages/percentage/index.css | 4 ++-- UI/Badge/entry/src/main/config.json | 6 +++--- .../src/main/js/default/pages/index/index.css | 1 - UI/CommonLayout/entry/src/main/config.json | 6 +++--- UI/Components/entry/src/main/config.json | 6 +++--- UI/CustomLayout/entry/src/main/config.json | 6 +++--- UI/Dialog/entry/src/main/config.json | 4 ++-- UI/Image/entry/src/main/config.json | 6 +++--- UI/JsAnimation/entry/src/main/config.json | 6 +++--- UI/JsAnimationStyle/entry/src/main/config.json | 6 +++--- UI/JsApp/entry/src/main/config.json | 6 +++--- UI/JsCallJava/entry/src/main/config.json | 6 +++--- UI/JsComponents/entry/src/main/config.json | 6 +++--- UI/JsFACard/entry/src/main/config.json | 6 +++--- UI/JsGallery/entry/src/main/config.json | 6 +++--- UI/JsShopping/entry/src/main/config.json | 6 +++--- UI/JsStartMode/entry/src/main/config.json | 14 +++++++------- UI/List/entry/src/main/config.json | 6 +++--- UI/Localization/entry/src/main/config.json | 6 +++--- UI/MultiModeInput/entry/src/main/config.json | 9 +++++---- UI/MultimodalEvent/entry/src/main/config.json | 9 +++++---- UI/PositionLayout/entry/src/main/config.json | 6 +++--- UI/ProgressBar/entry/src/main/config.json | 6 +++--- UI/RefreshContainer/entry/src/main/config.json | 4 ++-- UI/UiComponents/entry/src/main/config.json | 6 +++--- UI/UserRegistration/entry/src/main/config.json | 6 +++--- .../src/main/js/default/pages/index/index.hml | 2 +- .../entry/src/main/js/default/pages/index/index.js | 9 --------- thread/EventHandler/entry/src/main/config.json | 4 ++-- thread/TaskDispatcher/entry/src/main/config.json | 4 ++-- 35 files changed, 96 insertions(+), 106 deletions(-) diff --git a/UI/Animation/entry/src/main/config.json b/UI/Animation/entry/src/main/config.json index a27ef9b733..a811e25610 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 bfffc253b1..0817c68f97 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 917c89243b..4d546d78c3 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 f52d61b775..b2570de7d9 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 917d3393f5..46472a3f6a 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 ba53e8f974..6f94aa1798 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 483c4f758a..f42da2fc32 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 4a6f83740c..3c45d11f3d 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 31c134f171..a008f60b54 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 0d35071bd0..d0b0a5ba4f 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 c01cd6bc55..82afc18221 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 a9a8a3b058..fb3f13ba35 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 435bed8d4b..9c5f88961a 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 f5d6d20586..33bb0c0e03 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 2bbbb24d7d..b93fc7217b 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 bbb911fda3..5468e91383 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 a4bd7a5db9..70cd1bc680 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 b3dfb3be31..79ef852359 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 d4649ebc8c..f6163e9afa 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 6dfad8797a..65faa20e39 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 bfa030e531..c091326962 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 31fa8c0d43..1a293bf94f 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 3ad10eed12..49db63ec41 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 52f24d92a3..0ebe5785c1 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 4745d73941..c4420557f1 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 f5d1a51b26..edd99c2c4b 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 a0076a8336..d2bcd708fd 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 2452a34a23..6f930f8df1 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 b06a733a86..b57dad4b54 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 0be069a2fc..4feb6c45dd 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 945c56145f..6cd7aaeabd 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 6069a046a3..2a90650073 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 69d560b1af..e25efc7763 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 e656a59534..8e6ce4107b 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 a48f51731a..dd81af80c4 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", -- Gitee