From e6b458ce5e03d2520ff025f315c5d34702f7b82b Mon Sep 17 00:00:00 2001 From: Mike_lee Date: Tue, 6 Dec 2022 10:06:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=82=E9=85=8DIDE=203.1.0.100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NativeAPI/NativeTemplateDemo/entry/build-profile.json5 | 3 --- NativeAPI/NativeTemplateDemo/entry/src/main/module.json5 | 5 +++-- .../entry/src/main/resources/base/element/color.json | 8 ++++++++ NativeAPI/XComponent/entry/build-profile.json5 | 3 --- NativeAPI/XComponent/entry/src/main/module.json5 | 5 +++-- .../entry/src/main/resources/base/element/color.json | 8 ++++++++ 6 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 NativeAPI/NativeTemplateDemo/entry/src/main/resources/base/element/color.json create mode 100644 NativeAPI/XComponent/entry/src/main/resources/base/element/color.json diff --git a/NativeAPI/NativeTemplateDemo/entry/build-profile.json5 b/NativeAPI/NativeTemplateDemo/entry/build-profile.json5 index c3693359..06d1f642 100644 --- a/NativeAPI/NativeTemplateDemo/entry/build-profile.json5 +++ b/NativeAPI/NativeTemplateDemo/entry/build-profile.json5 @@ -28,9 +28,6 @@ "targets": [ { "name": "default", - }, - { - "name": "ohosTest", } ] } \ No newline at end of file diff --git a/NativeAPI/NativeTemplateDemo/entry/src/main/module.json5 b/NativeAPI/NativeTemplateDemo/entry/src/main/module.json5 index e1f8ca34..99265e3e 100644 --- a/NativeAPI/NativeTemplateDemo/entry/src/main/module.json5 +++ b/NativeAPI/NativeTemplateDemo/entry/src/main/module.json5 @@ -20,19 +20,20 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", - "uiSyntax": "ets", "abilities": [ { "name": "MainAbility", "srcEntrance": "./ets/MainAbility/MainAbility.ts", "description": "$string:MainAbility_desc", "icon": "$media:icon", + "startWindowBackground": "$color:white", + "startWindowIcon": "$media:icon", "label": "$string:MainAbility_label", "visible": true, "skills": [ diff --git a/NativeAPI/NativeTemplateDemo/entry/src/main/resources/base/element/color.json b/NativeAPI/NativeTemplateDemo/entry/src/main/resources/base/element/color.json new file mode 100644 index 00000000..1bbc9aa9 --- /dev/null +++ b/NativeAPI/NativeTemplateDemo/entry/src/main/resources/base/element/color.json @@ -0,0 +1,8 @@ +{ + "color": [ + { + "name": "white", + "value": "#FFFFFF" + } + ] +} \ No newline at end of file diff --git a/NativeAPI/XComponent/entry/build-profile.json5 b/NativeAPI/XComponent/entry/build-profile.json5 index d405a049..34877aad 100644 --- a/NativeAPI/XComponent/entry/build-profile.json5 +++ b/NativeAPI/XComponent/entry/build-profile.json5 @@ -14,9 +14,6 @@ "targets": [ { "name": "default", - }, - { - "name": "ohosTest", } ] } \ No newline at end of file diff --git a/NativeAPI/XComponent/entry/src/main/module.json5 b/NativeAPI/XComponent/entry/src/main/module.json5 index 035cdc75..97c4060f 100644 --- a/NativeAPI/XComponent/entry/src/main/module.json5 +++ b/NativeAPI/XComponent/entry/src/main/module.json5 @@ -6,19 +6,20 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", - "uiSyntax": "ets", "abilities": [ { "name": "MainAbility", "srcEntrance": "./ets/MainAbility/MainAbility.ts", "description": "$string:MainAbility_desc", "icon": "$media:icon", + "startWindowIcon": "$media:icon", + "startWindowBackground": "$color:white", "label": "$string:MainAbility_label", "visible": true, "skills": [ diff --git a/NativeAPI/XComponent/entry/src/main/resources/base/element/color.json b/NativeAPI/XComponent/entry/src/main/resources/base/element/color.json new file mode 100644 index 00000000..1bbc9aa9 --- /dev/null +++ b/NativeAPI/XComponent/entry/src/main/resources/base/element/color.json @@ -0,0 +1,8 @@ +{ + "color": [ + { + "name": "white", + "value": "#FFFFFF" + } + ] +} \ No newline at end of file -- Gitee From 13b8b18660da9bad9dc1c4e2c75776798ac3f9a4 Mon Sep 17 00:00:00 2001 From: Mike_lee Date: Tue, 6 Dec 2022 10:06:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=82=E9=85=8DIDE=203.1.0.100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mike_lee --- NativeAPI/NativeTemplateDemo/entry/build-profile.json5 | 3 --- NativeAPI/NativeTemplateDemo/entry/src/main/module.json5 | 5 +++-- .../entry/src/main/resources/base/element/color.json | 8 ++++++++ NativeAPI/XComponent/entry/build-profile.json5 | 3 --- NativeAPI/XComponent/entry/src/main/module.json5 | 5 +++-- .../entry/src/main/resources/base/element/color.json | 8 ++++++++ 6 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 NativeAPI/NativeTemplateDemo/entry/src/main/resources/base/element/color.json create mode 100644 NativeAPI/XComponent/entry/src/main/resources/base/element/color.json diff --git a/NativeAPI/NativeTemplateDemo/entry/build-profile.json5 b/NativeAPI/NativeTemplateDemo/entry/build-profile.json5 index c3693359..06d1f642 100644 --- a/NativeAPI/NativeTemplateDemo/entry/build-profile.json5 +++ b/NativeAPI/NativeTemplateDemo/entry/build-profile.json5 @@ -28,9 +28,6 @@ "targets": [ { "name": "default", - }, - { - "name": "ohosTest", } ] } \ No newline at end of file diff --git a/NativeAPI/NativeTemplateDemo/entry/src/main/module.json5 b/NativeAPI/NativeTemplateDemo/entry/src/main/module.json5 index e1f8ca34..99265e3e 100644 --- a/NativeAPI/NativeTemplateDemo/entry/src/main/module.json5 +++ b/NativeAPI/NativeTemplateDemo/entry/src/main/module.json5 @@ -20,19 +20,20 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", - "uiSyntax": "ets", "abilities": [ { "name": "MainAbility", "srcEntrance": "./ets/MainAbility/MainAbility.ts", "description": "$string:MainAbility_desc", "icon": "$media:icon", + "startWindowBackground": "$color:white", + "startWindowIcon": "$media:icon", "label": "$string:MainAbility_label", "visible": true, "skills": [ diff --git a/NativeAPI/NativeTemplateDemo/entry/src/main/resources/base/element/color.json b/NativeAPI/NativeTemplateDemo/entry/src/main/resources/base/element/color.json new file mode 100644 index 00000000..1bbc9aa9 --- /dev/null +++ b/NativeAPI/NativeTemplateDemo/entry/src/main/resources/base/element/color.json @@ -0,0 +1,8 @@ +{ + "color": [ + { + "name": "white", + "value": "#FFFFFF" + } + ] +} \ No newline at end of file diff --git a/NativeAPI/XComponent/entry/build-profile.json5 b/NativeAPI/XComponent/entry/build-profile.json5 index d405a049..34877aad 100644 --- a/NativeAPI/XComponent/entry/build-profile.json5 +++ b/NativeAPI/XComponent/entry/build-profile.json5 @@ -14,9 +14,6 @@ "targets": [ { "name": "default", - }, - { - "name": "ohosTest", } ] } \ No newline at end of file diff --git a/NativeAPI/XComponent/entry/src/main/module.json5 b/NativeAPI/XComponent/entry/src/main/module.json5 index 035cdc75..97c4060f 100644 --- a/NativeAPI/XComponent/entry/src/main/module.json5 +++ b/NativeAPI/XComponent/entry/src/main/module.json5 @@ -6,19 +6,20 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", - "uiSyntax": "ets", "abilities": [ { "name": "MainAbility", "srcEntrance": "./ets/MainAbility/MainAbility.ts", "description": "$string:MainAbility_desc", "icon": "$media:icon", + "startWindowIcon": "$media:icon", + "startWindowBackground": "$color:white", "label": "$string:MainAbility_label", "visible": true, "skills": [ diff --git a/NativeAPI/XComponent/entry/src/main/resources/base/element/color.json b/NativeAPI/XComponent/entry/src/main/resources/base/element/color.json new file mode 100644 index 00000000..1bbc9aa9 --- /dev/null +++ b/NativeAPI/XComponent/entry/src/main/resources/base/element/color.json @@ -0,0 +1,8 @@ +{ + "color": [ + { + "name": "white", + "value": "#FFFFFF" + } + ] +} \ No newline at end of file -- Gitee