diff --git a/AppScope/app.json5 b/AppScope/app.json5 index e2858b00de411e8205a1502422e1dee8acb11ad5..25717ac2593f9dbb18a3e64b98ebff7d71e2deb1 100644 --- a/AppScope/app.json5 +++ b/AppScope/app.json5 @@ -4,7 +4,7 @@ "vendor": "example", "versionCode": 1000000, "versionName": "1.0.0", - "icon": "$media:app_icon", + "icon": "$media:layered_image", "label": "$string:app_name" } } diff --git a/AppScope/resources/base/media/app_icon.png b/AppScope/resources/base/media/app_icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/AppScope/resources/base/media/app_icon.png and /dev/null differ diff --git a/AppScope/resources/base/media/background.png b/AppScope/resources/base/media/background.png new file mode 100644 index 0000000000000000000000000000000000000000..923f2b3f27e915d6871871deea0420eb45ce102f Binary files /dev/null and b/AppScope/resources/base/media/background.png differ diff --git a/AppScope/resources/base/media/foreground.png b/AppScope/resources/base/media/foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..97014d3e10e5ff511409c378cd4255713aecd85f Binary files /dev/null and b/AppScope/resources/base/media/foreground.png differ diff --git a/AppScope/resources/base/media/layered_image.json b/AppScope/resources/base/media/layered_image.json new file mode 100644 index 0000000000000000000000000000000000000000..fb49920440fb4d246c82f9ada275e26123a2136a --- /dev/null +++ b/AppScope/resources/base/media/layered_image.json @@ -0,0 +1,7 @@ +{ + "layered-image": + { + "background" : "$media:background", + "foreground" : "$media:foreground" + } +} \ No newline at end of file diff --git a/README.en.md b/README.en.md index d432ade62d501faf2cafdd17d1b68fd78a258a07..917a43e46fc144d455edc4c55d6d7b04898f2410 100644 --- a/README.en.md +++ b/README.en.md @@ -25,6 +25,6 @@ N/A ### Constraints 1. The sample is only supported on Huawei phones with standard systems. -2. HarmonyOS: HarmonyOS NEXT Developer Beta1 or later. -3. DevEco Studio: DevEco Studio NEXT Developer Beta1 or later. -4. HarmonyOS SDK: HarmonyOS NEXT Developer Beta1 SDK or later. +2. HarmonyOS: HarmonyOS 5.0.0 Release or later. +3. DevEco Studio: DevEco Studio 5.0.0 Release or later. +4. HarmonyOS SDK: HarmonyOS 5.0.0 Release SDK or later. diff --git a/README.md b/README.md index c812fc9130ba46dac9cc62bcac8018c4456779b7..c92e151729a052a5fb19a5b013617a916620d3c5 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,6 @@ ### 约束与限制 1. 本示例仅支持标准系统上运行,支持设备:华为手机。 -2. HarmonyOS系统:HarmonyOS NEXT Developer Beta1及以上。 -3. DevEco Studio版本:DevEco Studio NEXT Developer Beta1及以上。 -4. HarmonyOS SDK版本:HarmonyOS NEXT Developer Beta1 SDK及以上。 +2. HarmonyOS系统:HarmonyOS 5.0.0 Release及以上。 +3. DevEco Studio版本:DevEco Studio 5.0.0 Release及以上。 +4. HarmonyOS SDK版本:HarmonyOS 5.0.0 Release SDK及以上。 diff --git a/entry/src/main/ets/model/WindowModel.ets b/entry/src/main/ets/model/WindowModel.ets index fd3505f708b5501b927502d56b2e6b7b6251f20e..6afa0819a1982cc628fa7af63e612eb9c4301fe1 100644 --- a/entry/src/main/ets/model/WindowModel.ets +++ b/entry/src/main/ets/model/WindowModel.ets @@ -17,6 +17,7 @@ import { window, display } from '@kit.ArkUI'; import CommonConstants from '../common/constants/CommonConstants'; import Logger from '../common/utils/Logger'; import { GlobalContext } from '../common/utils/GlobalContext'; +import { BusinessError } from '@kit.BasicServicesKit'; /** * Window controller model. @@ -117,17 +118,15 @@ export default class WindowModel { Logger.error(`Failed to obtain the main window. Code:${err.code}, message:${err.message}`); return; } - windowClass.setWindowLayoutFullScreen(true, (err) => { - if (err.code) { - Logger.error(`Failed to set full-screen mode. Code:${err.code}, message:${err.message}`); - return; - } + windowClass.setWindowLayoutFullScreen(true).then(() => { + Logger.info('Succeeded in setting the window layout to full-screen mode.'); + }).catch((error: BusinessError) => { + Logger.error('Failed to set the window layout to full-screen mode. Cause:' + JSON.stringify(error)); }); - windowClass.setWindowSystemBarEnable([], (err) => { - if (err.code) { - Logger.error(`Failed to set the system bar to be invisible. Code:${err.code}, message:${err.message}`); - return; - } + windowClass.setWindowSystemBarEnable([]).then(() => { + Logger.info('Succeeded in setting the system bar to be invisible.'); + }).catch((error: BusinessError) => { + Logger.error(`Failed to set the system bar to be invisible. Code:${error.code}, message:${error.message}`); }); }); } diff --git a/entry/src/main/module.json5 b/entry/src/main/module.json5 index d20b6d2d74915682d233726daa5c0c8ba770877f..bb43aea75a657f0cbcbbea77ecce7be837834aad 100644 --- a/entry/src/main/module.json5 +++ b/entry/src/main/module.json5 @@ -5,8 +5,7 @@ "description": "$string:module_desc", "mainElement": "EntryAbility", "deviceTypes": [ - "phone", - "tablet" + "phone" ], "deliveryWithInstall": true, "installationFree": false, @@ -16,9 +15,9 @@ "name": "EntryAbility", "srcEntry": "./ets/entryability/EntryAbility.ets", "description": "$string:EntryAbility_desc", - "icon": "$media:icon", + "icon": "$media:layered_image", "label": "$string:EntryAbility_label", - "startWindowIcon": "$media:icon", + "startWindowIcon": "$media:startIcon", "startWindowBackground": "$color:start_window_background", "exported": true, "skills": [ diff --git a/entry/src/main/resources/base/media/background.png b/entry/src/main/resources/base/media/background.png new file mode 100644 index 0000000000000000000000000000000000000000..923f2b3f27e915d6871871deea0420eb45ce102f Binary files /dev/null and b/entry/src/main/resources/base/media/background.png differ diff --git a/entry/src/main/resources/base/media/foreground.png b/entry/src/main/resources/base/media/foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..97014d3e10e5ff511409c378cd4255713aecd85f Binary files /dev/null and b/entry/src/main/resources/base/media/foreground.png differ diff --git a/entry/src/main/resources/base/media/icon.png b/entry/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/entry/src/main/resources/base/media/icon.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/layered_image.json b/entry/src/main/resources/base/media/layered_image.json new file mode 100644 index 0000000000000000000000000000000000000000..fb49920440fb4d246c82f9ada275e26123a2136a --- /dev/null +++ b/entry/src/main/resources/base/media/layered_image.json @@ -0,0 +1,7 @@ +{ + "layered-image": + { + "background" : "$media:background", + "foreground" : "$media:foreground" + } +} \ No newline at end of file diff --git a/entry/src/main/resources/base/media/startIcon.png b/entry/src/main/resources/base/media/startIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..205ad8b5a8a42e8762fbe4899b8e5e31ce822b8b Binary files /dev/null and b/entry/src/main/resources/base/media/startIcon.png differ