diff --git a/AppScope/app.json5 b/AppScope/app.json5 index 19ac7cf8558c4839ece1203868709e270974a295..d83b0ce7bce053e0f9e68362a113ef75c12f6a58 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/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 c8e876e6624cf7c9783f63482b9bb6a3adff7832..6327e3fd8940d82b0af836cbef1b49422b776aac 100644 --- a/README.en.md +++ b/README.en.md @@ -10,7 +10,7 @@ The figure shows the effect on the mobile phone: The figure shows the effect on the foldable phone: -![](screenshots/device/foldable_EN.JPG) +![](screenshots/device/foldable_EN.jpg) The figure shows the effect on the tablet and PC/2-in-1 device: diff --git a/README.md b/README.md index 7f2d9f378102e5fa84259b033d45c043ec2e1a23..609ab1ca2c8453039b2165eb5d5e060ae7c7ef6e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 优秀实践-一多开发实例-长视频 +# 一多开发实例-长视频 ### 简介 diff --git a/features/videoDetail/src/main/resources/base/media/comment_2.jpg b/features/videoDetail/src/main/resources/base/media/comment_2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..93b3910bd6a7a550236334c9b0070869fe9bc9d8 Binary files /dev/null and b/features/videoDetail/src/main/resources/base/media/comment_2.jpg differ diff --git a/features/videoDetail/src/main/resources/base/media/comment_2.png b/features/videoDetail/src/main/resources/base/media/comment_2.png deleted file mode 100644 index 167d9633c67f8f20b1e25447771bd35abf587427..0000000000000000000000000000000000000000 Binary files a/features/videoDetail/src/main/resources/base/media/comment_2.png and /dev/null differ diff --git a/features/videoDetail/src/main/resources/base/media/comment_3.jpg b/features/videoDetail/src/main/resources/base/media/comment_3.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3fb7f979741586252fbe1a45e92a938ecc308b43 Binary files /dev/null and b/features/videoDetail/src/main/resources/base/media/comment_3.jpg differ diff --git a/features/videoDetail/src/main/resources/base/media/comment_3.png b/features/videoDetail/src/main/resources/base/media/comment_3.png deleted file mode 100644 index e91d207cf2d962240214585f1196fed0308249fa..0000000000000000000000000000000000000000 Binary files a/features/videoDetail/src/main/resources/base/media/comment_3.png and /dev/null differ diff --git a/features/videoDetail/src/main/resources/base/media/user_profile_2.png b/features/videoDetail/src/main/resources/base/media/user_profile_2.png index 882e10ec219f33ad3adb47f7caefa23d7209e55e..ad1cfe89abe7d00f3f27d29d12a53a2caba1c2ea 100644 Binary files a/features/videoDetail/src/main/resources/base/media/user_profile_2.png and b/features/videoDetail/src/main/resources/base/media/user_profile_2.png differ diff --git a/features/videoDetail/src/main/resources/base/media/user_profile_4.png b/features/videoDetail/src/main/resources/base/media/user_profile_4.png index 5697207c290d99bc1935f9e25e209228f5611b03..d4efeec7ddba67910883e49a950c1a846427beac 100644 Binary files a/features/videoDetail/src/main/resources/base/media/user_profile_4.png and b/features/videoDetail/src/main/resources/base/media/user_profile_4.png differ diff --git a/products/phone/src/main/module.json5 b/products/phone/src/main/module.json5 index 5fa72f113ccb1835e0d7887eb1ef9b87d389ec77..761638d999d537f3bcf9267851cee8568ae86eab 100644 --- a/products/phone/src/main/module.json5 +++ b/products/phone/src/main/module.json5 @@ -17,9 +17,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, "minWindowWidth": 331, diff --git a/products/phone/src/main/resources/base/media/background.png b/products/phone/src/main/resources/base/media/background.png new file mode 100644 index 0000000000000000000000000000000000000000..923f2b3f27e915d6871871deea0420eb45ce102f Binary files /dev/null and b/products/phone/src/main/resources/base/media/background.png differ diff --git a/products/phone/src/main/resources/base/media/foreground.png b/products/phone/src/main/resources/base/media/foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..97014d3e10e5ff511409c378cd4255713aecd85f Binary files /dev/null and b/products/phone/src/main/resources/base/media/foreground.png differ diff --git a/products/phone/src/main/resources/base/media/icon.png b/products/phone/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/products/phone/src/main/resources/base/media/icon.png and /dev/null differ diff --git a/products/phone/src/main/resources/base/media/layered_image.json b/products/phone/src/main/resources/base/media/layered_image.json new file mode 100644 index 0000000000000000000000000000000000000000..fb49920440fb4d246c82f9ada275e26123a2136a --- /dev/null +++ b/products/phone/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/products/phone/src/main/resources/base/media/startIcon.png b/products/phone/src/main/resources/base/media/startIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..205ad8b5a8a42e8762fbe4899b8e5e31ce822b8b Binary files /dev/null and b/products/phone/src/main/resources/base/media/startIcon.png differ