From: SnickerSun <snickersun@163.com>
Date: Sat, 15 Jun 2024 08:54:28 +0000 (+0800)
Subject: 兼容z1bootlogo显示
X-Git-Tag: release_V1.2.70_20241020_135402~994^2~4^2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F293%2F2;p=mirrors%2FFD230.git

兼容z1bootlogo显示
---

diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp
index 513c80adc..0c16ee228 100755
--- a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp
+++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp
@@ -46,6 +46,7 @@ static OHOS::ImageInfo* g_ota_imgInfo = nullptr;
 #define IMAGE_OPEN_LOGO_PATH "/user/res/OPEN_LOGO_QSPI.bin"
 #else
 #define IMAGE_OPEN_LOGO_PATH "/system/KUMI_LOGO.bin"
+#define Z1_IMAGE_OPEN_LOGO_PATH "/system/z1bootlogo.bin"
 #define IMAGE_OTA_LOGO_PATH "/system/OTAUpdata.bin"
 
 #endif
@@ -194,7 +195,9 @@ void ShowGraphicLogo(void)
     g_logo->SetPosition(0, 0, OHOS::Screen::GetInstance().GetWidth(), OHOS::Screen::GetInstance().GetHeight());
     g_logo->SetAutoEnable(false);
     g_logo->SetResizeMode(OHOS::UIImageView::CENTER);
-    g_imgInfo = OHOS::ImageCacheManager::GetInstance().LoadSingleRes(IMAGE_OPEN_LOGO_PATH);
+    g_imgInfo = OHOS::ImageCacheManager::GetInstance().LoadSingleRes(Z1_IMAGE_OPEN_LOGO_PATH);
+    if (g_imgInfo == nullptr)
+        g_imgInfo = OHOS::ImageCacheManager::GetInstance().LoadSingleRes(IMAGE_OPEN_LOGO_PATH);
     g_logo->SetSrc(g_imgInfo);
     OHOS::GraphicEventHandler::GetInstance()->PostGraphicEvent(
         [] {