diff --git a/AppScope/resources/base/media/background.png b/AppScope/resources/base/media/background.png deleted file mode 100644 index 923f2b3f..00000000 Binary files a/AppScope/resources/base/media/background.png and /dev/null differ diff --git a/AppScope/resources/base/media/base_background.png b/AppScope/resources/base/media/base_background.png new file mode 100644 index 00000000..a76bfcff Binary files /dev/null and b/AppScope/resources/base/media/base_background.png differ diff --git a/entry/src/main/resources/base/media/base_opencax_logo.png b/AppScope/resources/base/media/base_foreground_logo.png similarity index 100% rename from entry/src/main/resources/base/media/base_opencax_logo.png rename to AppScope/resources/base/media/base_foreground_logo.png diff --git a/AppScope/resources/base/media/foreground_bak.png b/AppScope/resources/base/media/foreground_bak.png deleted file mode 100644 index eb942758..00000000 Binary files a/AppScope/resources/base/media/foreground_bak.png and /dev/null differ diff --git a/AppScope/resources/base/media/layered_image.json b/AppScope/resources/base/media/layered_image.json index fb499204..406c1a96 100644 --- a/AppScope/resources/base/media/layered_image.json +++ b/AppScope/resources/base/media/layered_image.json @@ -1,7 +1,7 @@ { "layered-image": { - "background" : "$media:background", - "foreground" : "$media:foreground" + "background" : "$media:base_background", + "foreground" : "$media:base_foreground_logo" } } \ No newline at end of file diff --git a/build-profile.json5 b/build-profile.json5 index 71d38fbc..632ee02b 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -7,11 +7,11 @@ "material": { "certpath": "C:\\Users\\JackLee\\.ohos\\config\\default_NXEA_0s33e8rF_-eDfV9W_2q2am8R5niF3V4xhQxkUtRtaC0=.cer", "keyAlias": "debugKey", - "keyPassword": "0000001AA30759760D9D5D17A91BFB7147D9F271378B6316F13E50379FF23A4CF9A209064CA81F434E86", + "keyPassword": "0000001BCF995E3FAF305FF3F4206AAC898840FBB6E3C5B6E10F3C59DC1E8B464FF77E340C30980D6A0DE3", "profile": "C:\\Users\\JackLee\\.ohos\\config\\default_NXEA_0s33e8rF_-eDfV9W_2q2am8R5niF3V4xhQxkUtRtaC0=.p7b", "signAlg": "SHA256withECDSA", "storeFile": "C:\\Users\\JackLee\\.ohos\\config\\default_NXEA_0s33e8rF_-eDfV9W_2q2am8R5niF3V4xhQxkUtRtaC0=.p12", - "storePassword": "0000001A54288F3ED33A493359C0F43F9FDBB746AC483C30B3CCC3CDCD726910AFD3190EDD7ABC9D16BE" + "storePassword": "0000001B433EEA1A681F00BA0E4D26AD2BCBFC0C5AEFB4F0E0DED1F499268888BDA749571AD4118CAB4576" } } ], diff --git a/entry/src/main/ets/pages/subpages/info/SWEnv.ets b/entry/src/main/ets/pages/subpages/info/SWEnv.ets index ed323667..910381b9 100644 --- a/entry/src/main/ets/pages/subpages/info/SWEnv.ets +++ b/entry/src/main/ets/pages/subpages/info/SWEnv.ets @@ -67,7 +67,7 @@ export struct SWEnv { build(){ Column(){ Row(){ - Image($r('app.media.base_opencax_logo')) + Image($r('app.media.base_logo')) .width(mdwInfo.winWidth*0.1) .height(mdwInfo.winWidth*0.08) .backgroundImageSize({ diff --git a/entry/src/main/ets/pages/subpages/info/SWInfo.ets b/entry/src/main/ets/pages/subpages/info/SWInfo.ets index 4e03b1c6..f1646f08 100644 --- a/entry/src/main/ets/pages/subpages/info/SWInfo.ets +++ b/entry/src/main/ets/pages/subpages/info/SWInfo.ets @@ -9,7 +9,7 @@ export struct SWInfo { build(){ Column(){ Row(){ - Image($r('app.media.base_opencax_logo')) + Image($r('app.media.base_logo')) .width(mdwInfo.winWidth*0.1) .height(mdwInfo.winWidth*0.08) .backgroundImageSize({ diff --git a/entry/src/main/ets/pages/subpages/info/SWSrc.ets b/entry/src/main/ets/pages/subpages/info/SWSrc.ets index 8f308b5b..36bdd6d5 100644 --- a/entry/src/main/ets/pages/subpages/info/SWSrc.ets +++ b/entry/src/main/ets/pages/subpages/info/SWSrc.ets @@ -9,7 +9,7 @@ export struct SWSrc { build(){ Column(){ Row(){ - Image($r('app.media.base_opencax_logo')) + Image($r('app.media.base_logo')) .width(mdwInfo.winWidth*0.1) .height(mdwInfo.winWidth*0.08) .backgroundImageSize({ diff --git a/entry/src/main/ets/pages/view/View.ets b/entry/src/main/ets/pages/view/View.ets index 1e250c78..0812c09a 100644 --- a/entry/src/main/ets/pages/view/View.ets +++ b/entry/src/main/ets/pages/view/View.ets @@ -65,7 +65,7 @@ export struct View { .barMode(BarMode.Scrollable) .divider({ strokeWidth: '1px', color: $r('sys.color.comp_divider') }) }else{ - Image($r('app.media.base_background')) + Image($r('app.media.base_logo')) .width('100%') .height('100%') } diff --git a/entry/src/main/module.json5 b/entry/src/main/module.json5 index eb4f2e1f..08777102 100644 --- a/entry/src/main/module.json5 +++ b/entry/src/main/module.json5 @@ -27,7 +27,7 @@ "description": "$string:EntryAbility_desc", "icon": "$media:layered_image", "label": "$string:EntryAbility_label", - "startWindowIcon": "$media:base_start_background", + "startWindowIcon": "$media:base_logo", "startWindowBackground": "$color:start_window_background", "minWindowWidth": 1200, // 设置最小宽度 "minWindowHeight": 800, // 设置最小高度 @@ -51,7 +51,7 @@ "description": "$string:EntryAbility_desc", "icon": "$media:layered_image", "label": "$string:EntryAbility_label", - "startWindowIcon": "$media:base_sub_background", + "startWindowIcon": "$media:base_logo", "startWindowBackground": "$color:start_window_background", "exported": true, "launchType":"specified", diff --git a/entry/src/main/resources/base/media/background.png b/entry/src/main/resources/base/media/background.png deleted file mode 100644 index 0953a09d..00000000 Binary files a/entry/src/main/resources/base/media/background.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/base_background.png b/entry/src/main/resources/base/media/base_background.png index 933b5e93..a76bfcff 100644 Binary files a/entry/src/main/resources/base/media/base_background.png and b/entry/src/main/resources/base/media/base_background.png differ diff --git a/entry/src/main/resources/base/media/foreground.png b/entry/src/main/resources/base/media/base_foreground_logo.png similarity index 100% rename from entry/src/main/resources/base/media/foreground.png rename to entry/src/main/resources/base/media/base_foreground_logo.png diff --git a/entry/src/main/resources/base/media/base_logo.png b/entry/src/main/resources/base/media/base_logo.png new file mode 100644 index 00000000..3278faff Binary files /dev/null and b/entry/src/main/resources/base/media/base_logo.png differ diff --git a/entry/src/main/resources/base/media/base_sub_background.png b/entry/src/main/resources/base/media/base_sub_background.png deleted file mode 100644 index 7ff5ae51..00000000 Binary files a/entry/src/main/resources/base/media/base_sub_background.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/foreground_bak.png b/entry/src/main/resources/base/media/foreground_bak.png deleted file mode 100644 index 97014d3e..00000000 Binary files a/entry/src/main/resources/base/media/foreground_bak.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 index fb499204..406c1a96 100644 --- a/entry/src/main/resources/base/media/layered_image.json +++ b/entry/src/main/resources/base/media/layered_image.json @@ -1,7 +1,7 @@ { "layered-image": { - "background" : "$media:background", - "foreground" : "$media:foreground" + "background" : "$media:base_background", + "foreground" : "$media:base_foreground_logo" } } \ No newline at end of file diff --git a/entry/src/main/resources/base/profile/start_sub_window.json b/entry/src/main/resources/base/profile/start_sub_window.json index f97a9809..b56c3b81 100644 --- a/entry/src/main/resources/base/profile/start_sub_window.json +++ b/entry/src/main/resources/base/profile/start_sub_window.json @@ -1,7 +1,5 @@ { "startWindowType": "REQUIRED_HIDE", "startWindowColorModeType": "FOLLOW_SYSTEM", - "startWindowAppIcon": "$media:base_sub_background", - "startWindowBrandingImage": "$media:base_sub_background", "startWindowBackgroundColor": "$color:start_window_background" } \ No newline at end of file diff --git a/image/background.xcf b/image/background.xcf index 738941ef..0a1fe3d7 100644 Binary files a/image/background.xcf and b/image/background.xcf differ diff --git a/image/logo.xcf b/image/logo.xcf new file mode 100644 index 00000000..738941ef Binary files /dev/null and b/image/logo.xcf differ