From 38030446b7d61464bf6ce18a60c5727dfbee7916 Mon Sep 17 00:00:00 2001 From: guojin26 Date: Tue, 29 Jun 2021 17:11:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E5=88=AB=E7=BC=96=E8=AF=91=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98=EF=BC=8Clabel=E6=95=B4=E6=94=B9?= =?UTF-8?q?=EF=BC=8CToastDialog.setText=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: guojin26 --- UI/Dialog/entry/src/main/config.json | 3 +-- .../main/resources/base/element/string.json | 2 +- .../entry/src/main/config.json | 1 - .../main/resources/base/element/string.json | 2 +- ability/Idl/rpcclient/src/main/config.json | 3 +-- .../rpcclient/slice/MainAbilitySlice.java | 2 +- ability/Idl/rpcserver/src/main/config.json | 6 ++--- common/Resources/entry/src/main/config.json | 24 +------------------ common/Timer/entry/src/main/config.json | 3 +-- .../ohos/timer/slice/MainAbilitySlice.java | 2 +- device/Location/entry/src/main/config.json | 3 +-- .../location/slice/MainAbilitySlice.java | 2 +- .../main/resources/base/element/string.json | 4 ++++ media/Camera/entry/src/main/config.json | 1 - .../main/resources/base/element/string.json | 2 +- media/PixelMap/entry/src/main/config.json | 1 - .../main/resources/base/element/string.json | 2 +- network/Bluetooth/entry/src/main/config.json | 8 +++---- .../main/resources/base/element/string.json | 4 ++++ .../entry/src/main/config.json | 1 - .../main/resources/base/element/string.json | 2 +- network/WLAN/entry/src/main/config.json | 1 - .../wlan/slice/WlanNotificationSlice.java | 2 +- .../Permission/entry/src/main/config.json | 1 - .../samples/permissionapp/MainAbility.java | 2 +- .../permissionapp/slice/MainAbilitySlice.java | 2 +- .../EventHandler/entry/src/main/config.json | 1 - .../main/resources/base/element/string.json | 2 +- .../TaskDispatcher/entry/src/main/config.json | 1 - .../main/resources/base/element/string.json | 2 +- 30 files changed, 32 insertions(+), 60 deletions(-) diff --git a/UI/Dialog/entry/src/main/config.json b/UI/Dialog/entry/src/main/config.json index 70f253c258..a9a8a3b058 100644 --- a/UI/Dialog/entry/src/main/config.json +++ b/UI/Dialog/entry/src/main/config.json @@ -9,7 +9,7 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.dialog", - "name": ".Dialog", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], @@ -35,7 +35,6 @@ } ], "orientation": "portrait", - "visible": true, "formsEnabled": false, "name": "ohos.samples.dialog.MainAbility", "icon": "$media:icon", diff --git a/UI/Dialog/entry/src/main/resources/base/element/string.json b/UI/Dialog/entry/src/main/resources/base/element/string.json index 8d59154008..e03e55b291 100644 --- a/UI/Dialog/entry/src/main/resources/base/element/string.json +++ b/UI/Dialog/entry/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "Prompt" + "value": "Dailog" }, { "name": "mainability_description", diff --git a/ability/DistributedScheduler/entry/src/main/config.json b/ability/DistributedScheduler/entry/src/main/config.json index 41e31a543d..560cf9f025 100644 --- a/ability/DistributedScheduler/entry/src/main/config.json +++ b/ability/DistributedScheduler/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "unspecified", - "visible": true, "formsEnabled": false, "name": ".MainAbility", "icon": "$media:icon", diff --git a/ability/DistributedScheduler/entry/src/main/resources/base/element/string.json b/ability/DistributedScheduler/entry/src/main/resources/base/element/string.json index e8f1cce09c..af4e4f7d40 100644 --- a/ability/DistributedScheduler/entry/src/main/resources/base/element/string.json +++ b/ability/DistributedScheduler/entry/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "DistributedDevices" + "value": "DistributedScheduler" }, { "name": "mainability_description", diff --git a/ability/Idl/rpcclient/src/main/config.json b/ability/Idl/rpcclient/src/main/config.json index ef9a0a0451..357800e497 100644 --- a/ability/Idl/rpcclient/src/main/config.json +++ b/ability/Idl/rpcclient/src/main/config.json @@ -9,7 +9,7 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.rpcclient", - "name": ".RpcClient", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], @@ -35,7 +35,6 @@ } ], "orientation": "portrait", - "visible": true, "formsEnabled": false, "name": "ohos.samples.rpcclient.MainAbility", "icon": "$media:icon", diff --git a/ability/Idl/rpcclient/src/main/java/ohos/samples/rpcclient/slice/MainAbilitySlice.java b/ability/Idl/rpcclient/src/main/java/ohos/samples/rpcclient/slice/MainAbilitySlice.java index 1490d2f71d..e1ee664bea 100644 --- a/ability/Idl/rpcclient/src/main/java/ohos/samples/rpcclient/slice/MainAbilitySlice.java +++ b/ability/Idl/rpcclient/src/main/java/ohos/samples/rpcclient/slice/MainAbilitySlice.java @@ -130,7 +130,7 @@ public class MainAbilitySlice extends AbilitySlice { private void showTip(String msg) { toastDialog = new ToastDialog(getApplicationContext()); - toastDialog.setContentText(msg); + toastDialog.setText(msg); toastDialog.setAutoClosable(false); toastDialog.setDuration(TOAST_DURATION); toastDialog.show(); diff --git a/ability/Idl/rpcserver/src/main/config.json b/ability/Idl/rpcserver/src/main/config.json index b09d260056..f83a081296 100644 --- a/ability/Idl/rpcserver/src/main/config.json +++ b/ability/Idl/rpcserver/src/main/config.json @@ -9,7 +9,7 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.rpcserver", - "name": ".RpcServer", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], @@ -35,7 +35,6 @@ } ], "orientation": "portrait", - "visible": true, "formsEnabled": false, "name": "ohos.samples.rpcserver.MainAbility", "icon": "$media:icon", @@ -47,8 +46,7 @@ { "name": "ohos.samples.rpcserver.ServiceAbility", "type": "service", - "visible": true, - "module-name": "entry" + "visible": true } ] } diff --git a/common/Resources/entry/src/main/config.json b/common/Resources/entry/src/main/config.json index bc261456f7..8dd10712bf 100644 --- a/common/Resources/entry/src/main/config.json +++ b/common/Resources/entry/src/main/config.json @@ -9,7 +9,7 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.resource", - "name": ".Resource", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], @@ -35,7 +35,6 @@ } ], "permissions": [], - "visible": true, "formsEnabled": false, "name": "ohos.samples.resource.MainAbility", "icon": "$media:icon", @@ -43,27 +42,6 @@ "label": "$string:app_name", "type": "page", "launchType": "standard" - }, - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "orientation": "portrait", - "visible": true, - "formsEnabled": false, - "name": "ohos.samples.resource.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "Resources", - "type": "page", - "launchType": "standard" } ] } diff --git a/common/Timer/entry/src/main/config.json b/common/Timer/entry/src/main/config.json index 4a8154b574..425626850a 100644 --- a/common/Timer/entry/src/main/config.json +++ b/common/Timer/entry/src/main/config.json @@ -10,7 +10,7 @@ "deviceConfig": {}, "module": { "package": "ohos.timer", - "name": ".Timer", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], @@ -36,7 +36,6 @@ } ], "orientation": "unspecified", - "visible": true, "formsEnabled": false, "name": "ohos.timer.MainAbility", "icon": "$media:icon", diff --git a/common/Timer/entry/src/main/java/ohos/timer/slice/MainAbilitySlice.java b/common/Timer/entry/src/main/java/ohos/timer/slice/MainAbilitySlice.java index 48971028bf..5912a426b5 100644 --- a/common/Timer/entry/src/main/java/ohos/timer/slice/MainAbilitySlice.java +++ b/common/Timer/entry/src/main/java/ohos/timer/slice/MainAbilitySlice.java @@ -232,7 +232,7 @@ public class MainAbilitySlice extends AbilitySlice implements Component.ClickedL } private void showToast(String message) { - new ToastDialog(this).setContentText(message).show(); + new ToastDialog(this).setText(message).show(); } @Override diff --git a/device/Location/entry/src/main/config.json b/device/Location/entry/src/main/config.json index 430005b166..3926aa2ace 100644 --- a/device/Location/entry/src/main/config.json +++ b/device/Location/entry/src/main/config.json @@ -9,7 +9,7 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.location", - "name": ".Location", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], @@ -35,7 +35,6 @@ } ], "orientation": "unspecified", - "visible": true, "formsEnabled": false, "name": "ohos.samples.location.MainAbility", "icon": "$media:icon", diff --git a/device/Location/entry/src/main/java/ohos/samples/location/slice/MainAbilitySlice.java b/device/Location/entry/src/main/java/ohos/samples/location/slice/MainAbilitySlice.java index a4e9936603..2fcc5ae557 100644 --- a/device/Location/entry/src/main/java/ohos/samples/location/slice/MainAbilitySlice.java +++ b/device/Location/entry/src/main/java/ohos/samples/location/slice/MainAbilitySlice.java @@ -184,7 +184,7 @@ public class MainAbilitySlice extends AbilitySlice { gaList.clear(); } else { HiLog.info(LABEL_LOG, "%{public}s", "EventNotifier or Location response is null"); - new ToastDialog(context).setTitleText("EventNotifier or Location response is null").show(); + new ToastDialog(context).setText("EventNotifier or Location response is null").show(); } } diff --git a/device/Location/entry/src/main/resources/base/element/string.json b/device/Location/entry/src/main/resources/base/element/string.json index 131702d90f..6d7e386baa 100644 --- a/device/Location/entry/src/main/resources/base/element/string.json +++ b/device/Location/entry/src/main/resources/base/element/string.json @@ -7,6 +7,10 @@ { "name": "mainability_description", "value": "hap sample empty page" + }, + { + "name": "reason_description", + "value": "location sample get permisssion" } ] } \ No newline at end of file diff --git a/media/Camera/entry/src/main/config.json b/media/Camera/entry/src/main/config.json index 896130b6fb..1945f3c9bb 100644 --- a/media/Camera/entry/src/main/config.json +++ b/media/Camera/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "unspecified", - "visible": true, "formsEnabled": false, "name": "ohos.samples.camera.MainAbility", "icon": "$media:icon", diff --git a/media/Camera/entry/src/main/resources/base/element/string.json b/media/Camera/entry/src/main/resources/base/element/string.json index d4275350e2..1b00860953 100644 --- a/media/Camera/entry/src/main/resources/base/element/string.json +++ b/media/Camera/entry/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "TaskManager" + "value": "Camera" }, { "name": "mainability_description", diff --git a/media/PixelMap/entry/src/main/config.json b/media/PixelMap/entry/src/main/config.json index fb9e6ba979..88414247ec 100644 --- a/media/PixelMap/entry/src/main/config.json +++ b/media/PixelMap/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "unspecified", - "visible": true, "formsEnabled": false, "name": "ohos.samples.pixelmap.MainAbility", "icon": "$media:icon", diff --git a/media/PixelMap/entry/src/main/resources/base/element/string.json b/media/PixelMap/entry/src/main/resources/base/element/string.json index d4275350e2..ee4a562d8d 100644 --- a/media/PixelMap/entry/src/main/resources/base/element/string.json +++ b/media/PixelMap/entry/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "TaskManager" + "value": "PixelMap" }, { "name": "mainability_description", diff --git a/network/Bluetooth/entry/src/main/config.json b/network/Bluetooth/entry/src/main/config.json index 0d41861a0e..3e427851c5 100644 --- a/network/Bluetooth/entry/src/main/config.json +++ b/network/Bluetooth/entry/src/main/config.json @@ -49,7 +49,7 @@ { "reason": "get right", "name": "ohos.permission.LOCATION", - "used-scene": { + "usedScene": { "ability": [ "ohos.samples.bluetooth.MainAbility" ], @@ -59,7 +59,7 @@ { "reason": "get right", "name": "ohos.permission.DISCOVER_BLUETOOTH", - "used-scene": { + "usedScene": { "ability": [ "ohos.samples.bluetooth.MainAbility" ], @@ -69,7 +69,7 @@ { "reason": "get right", "name": "ohos.permission.USE_BLUETOOTH", - "used-scene": { + "usedScene": { "ability": [ "ohos.samples.bluetooth.MainAbility" ], @@ -79,7 +79,7 @@ { "reason": "get right", "name": "ohos.permission.MANAGE_BLUETOOTH", - "used-scene": { + "usedScene": { "ability": [ "ohos.samples.bluetooth.MainAbility" ], diff --git a/network/Bluetooth/entry/src/main/resources/base/element/string.json b/network/Bluetooth/entry/src/main/resources/base/element/string.json index b6bca7eceb..12f4f5976b 100644 --- a/network/Bluetooth/entry/src/main/resources/base/element/string.json +++ b/network/Bluetooth/entry/src/main/resources/base/element/string.json @@ -12,6 +12,10 @@ "name": "title_available_devices", "value": "Available Devices" }, + { + "name": "app_name", + "value": "Bluetooth" + }, { "name": "mainability_description", "value": "hap sample empty page" diff --git a/network/NetworkManagement/entry/src/main/config.json b/network/NetworkManagement/entry/src/main/config.json index 16ffac1a18..9e179ac8e7 100644 --- a/network/NetworkManagement/entry/src/main/config.json +++ b/network/NetworkManagement/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "portrait", - "visible": true, "formsEnabled": false, "name": "ohos.samples.networkmanagement.MainAbility", "icon": "$media:icon", diff --git a/network/NetworkManagement/entry/src/main/resources/base/element/string.json b/network/NetworkManagement/entry/src/main/resources/base/element/string.json index f9d50354b2..5f0cc16dbb 100644 --- a/network/NetworkManagement/entry/src/main/resources/base/element/string.json +++ b/network/NetworkManagement/entry/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "IntentAgent" + "value": "NetworkManagement" }, { "name": "mainability_description", diff --git a/network/WLAN/entry/src/main/config.json b/network/WLAN/entry/src/main/config.json index bd04349f81..14a5ac05df 100644 --- a/network/WLAN/entry/src/main/config.json +++ b/network/WLAN/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "unspecified", - "visible": true, "formsEnabled": false, "name": "ohos.samples.wlan.MainAbility", "icon": "$media:icon", diff --git a/network/WLAN/entry/src/main/java/ohos/samples/wlan/slice/WlanNotificationSlice.java b/network/WLAN/entry/src/main/java/ohos/samples/wlan/slice/WlanNotificationSlice.java index 51072851d9..f975d9cec9 100644 --- a/network/WLAN/entry/src/main/java/ohos/samples/wlan/slice/WlanNotificationSlice.java +++ b/network/WLAN/entry/src/main/java/ohos/samples/wlan/slice/WlanNotificationSlice.java @@ -98,7 +98,7 @@ public class WlanNotificationSlice extends AbilitySlice { return; } IntentParams params = commonEventData.getIntent().getParams(); - if (params == null) { + if (params == null || params.getParam(WifiEvents.PARAM_ACTIVE_STATE) == null) { return; } diff --git a/security/Permission/entry/src/main/config.json b/security/Permission/entry/src/main/config.json index 0f6fa32a31..2b2851c921 100644 --- a/security/Permission/entry/src/main/config.json +++ b/security/Permission/entry/src/main/config.json @@ -28,7 +28,6 @@ "icon": "$media:icon", "label": "$string:app_name", "orientation": "portrait", - "visible": true, "formsEnabled": false, "description": "$string:mainability_description", "type": "page", diff --git a/security/Permission/entry/src/main/java/ohos/samples/permissionapp/MainAbility.java b/security/Permission/entry/src/main/java/ohos/samples/permissionapp/MainAbility.java index a4c266e3c3..b0c8c82b2b 100644 --- a/security/Permission/entry/src/main/java/ohos/samples/permissionapp/MainAbility.java +++ b/security/Permission/entry/src/main/java/ohos/samples/permissionapp/MainAbility.java @@ -55,6 +55,6 @@ public class MainAbility extends Ability { } private void showTips(Context context, String message) { - new ToastDialog(context).setContentText(message).show(); + new ToastDialog(context).setText(message).show(); } } diff --git a/security/Permission/entry/src/main/java/ohos/samples/permissionapp/slice/MainAbilitySlice.java b/security/Permission/entry/src/main/java/ohos/samples/permissionapp/slice/MainAbilitySlice.java index f0d83527fb..f6aea28487 100644 --- a/security/Permission/entry/src/main/java/ohos/samples/permissionapp/slice/MainAbilitySlice.java +++ b/security/Permission/entry/src/main/java/ohos/samples/permissionapp/slice/MainAbilitySlice.java @@ -158,6 +158,6 @@ public class MainAbilitySlice extends AbilitySlice implements Component.ClickedL } private void showTips(Context context, String message) { - new ToastDialog(context).setContentText(message).show(); + new ToastDialog(context).setText(message).show(); } } diff --git a/thread/EventHandler/entry/src/main/config.json b/thread/EventHandler/entry/src/main/config.json index dd6922cc8e..e656a59534 100644 --- a/thread/EventHandler/entry/src/main/config.json +++ b/thread/EventHandler/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "unspecified", - "visible": true, "formsEnabled": false, "name": "ohos.samples.eventhandler.MainAbility", "icon": "$media:icon", diff --git a/thread/EventHandler/entry/src/main/resources/base/element/string.json b/thread/EventHandler/entry/src/main/resources/base/element/string.json index d4275350e2..9945c5050e 100644 --- a/thread/EventHandler/entry/src/main/resources/base/element/string.json +++ b/thread/EventHandler/entry/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "TaskManager" + "value": "EventHandler" }, { "name": "mainability_description", diff --git a/thread/TaskDispatcher/entry/src/main/config.json b/thread/TaskDispatcher/entry/src/main/config.json index 93cfd2a3a5..a48f51731a 100644 --- a/thread/TaskDispatcher/entry/src/main/config.json +++ b/thread/TaskDispatcher/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "unspecified", - "visible": true, "formsEnabled": false, "name": "ohos.samples.taskmanager.MainAbility", "icon": "$media:icon", diff --git a/thread/TaskDispatcher/entry/src/main/resources/base/element/string.json b/thread/TaskDispatcher/entry/src/main/resources/base/element/string.json index d4275350e2..b70430f0f9 100644 --- a/thread/TaskDispatcher/entry/src/main/resources/base/element/string.json +++ b/thread/TaskDispatcher/entry/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "TaskManager" + "value": "TaskDispatcher" }, { "name": "mainability_description", -- Gitee