From 16f6d423a3557876ac354ea083beeeedd20ba5e3 Mon Sep 17 00:00:00 2001 From: chenjiayin Date: Sun, 27 Jun 2021 18:16:07 +0800 Subject: [PATCH 1/2] fix build error for samples Signed-off-by: chenjiayin --- ability/DataAbility/entry/src/main/config.json | 2 +- .../DistributedScheduler/entry/src/main/config.json | 10 +++++----- .../entry/src/main/resources/base/element/string.json | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ability/DataAbility/entry/src/main/config.json b/ability/DataAbility/entry/src/main/config.json index 796484b772..07fe98f6b9 100644 --- a/ability/DataAbility/entry/src/main/config.json +++ b/ability/DataAbility/entry/src/main/config.json @@ -9,7 +9,7 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.dataability", - "name": ".DataAbility", + "name": ".UserDataAbility", "reqCapabilities": [ "video_support" ], diff --git a/ability/DistributedScheduler/entry/src/main/config.json b/ability/DistributedScheduler/entry/src/main/config.json index c74b007779..677ec2ad0b 100644 --- a/ability/DistributedScheduler/entry/src/main/config.json +++ b/ability/DistributedScheduler/entry/src/main/config.json @@ -9,7 +9,7 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.distributedscheduler", - "name": ".DistributedScheduler", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], @@ -45,15 +45,15 @@ "launchType": "standard" }, { - "name": "ohos.sample.distributedscheduler.RemoteAbility", + "name": "ohos.samples.distributedscheduler.RemoteAbility", "type": "service", "visible": true }, { - "name": "ohos.sample.distributedscheduler.PageAbility", + "name": "ohos.samples.distributedscheduler.PageAbility", "icon": "$media:icon", - "description": "$string:pageability_description", - "label": "PageAbility", + "description": "$string:mainability_description", + "label": "$string:PageAbility", "type": "page" } ], 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 f06570d389..e8f1cce09c 100644 --- a/ability/DistributedScheduler/entry/src/main/resources/base/element/string.json +++ b/ability/DistributedScheduler/entry/src/main/resources/base/element/string.json @@ -7,6 +7,10 @@ { "name": "mainability_description", "value": "hap sample empty page" + }, + { + "name": "PageAbility", + "value": "PageAbility" } ] } \ No newline at end of file -- Gitee From d89f873be1a5e1ab9ccfd2a6263747ee8e858687 Mon Sep 17 00:00:00 2001 From: chenjiayin Date: Sun, 27 Jun 2021 18:16:07 +0800 Subject: [PATCH 2/2] fix build error for samples Signed-off-by: chenjiayin --- ability/DataAbility/entry/src/main/config.json | 6 +++--- .../DistributedScheduler/entry/src/main/config.json | 12 ++++++------ .../src/main/resources/base/element/string.json | 4 ++++ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ability/DataAbility/entry/src/main/config.json b/ability/DataAbility/entry/src/main/config.json index 796484b772..ceb6fa673e 100644 --- a/ability/DataAbility/entry/src/main/config.json +++ b/ability/DataAbility/entry/src/main/config.json @@ -9,7 +9,7 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.dataability", - "name": ".DataAbility", + "name": ".UserDataAbility", "reqCapabilities": [ "video_support" ], @@ -37,7 +37,7 @@ "orientation": "unspecified", "visible": true, "formsEnabled": false, - "name": "ohos.samples.dataability.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", @@ -45,7 +45,7 @@ "launchType": "standard" }, { - "name": "ohos.samples.dataability.UserDataAbility", + "name": ".UserDataAbility", "type": "data", "visible": true, "uri": "dataability://ohos.samples.userdata", diff --git a/ability/DistributedScheduler/entry/src/main/config.json b/ability/DistributedScheduler/entry/src/main/config.json index c74b007779..1eb519e1d7 100644 --- a/ability/DistributedScheduler/entry/src/main/config.json +++ b/ability/DistributedScheduler/entry/src/main/config.json @@ -9,7 +9,7 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.distributedscheduler", - "name": ".DistributedScheduler", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], @@ -37,7 +37,7 @@ "orientation": "unspecified", "visible": true, "formsEnabled": false, - "name": "ohos.samples.distributedscheduler.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", @@ -45,15 +45,15 @@ "launchType": "standard" }, { - "name": "ohos.sample.distributedscheduler.RemoteAbility", + "name": ".RemoteAbility", "type": "service", "visible": true }, { - "name": "ohos.sample.distributedscheduler.PageAbility", + "name": ".PageAbility", "icon": "$media:icon", - "description": "$string:pageability_description", - "label": "PageAbility", + "description": "$string:mainability_description", + "label": "$string:PageAbility", "type": "page" } ], 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 f06570d389..e8f1cce09c 100644 --- a/ability/DistributedScheduler/entry/src/main/resources/base/element/string.json +++ b/ability/DistributedScheduler/entry/src/main/resources/base/element/string.json @@ -7,6 +7,10 @@ { "name": "mainability_description", "value": "hap sample empty page" + }, + { + "name": "PageAbility", + "value": "PageAbility" } ] } \ No newline at end of file -- Gitee