修改fd272的开关机动画配置

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/include/ShutDownImageAnimatorView.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/include/ShutDownImageAnimatorView.h
index c57f524..dc96417 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/include/ShutDownImageAnimatorView.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/include/ShutDownImageAnimatorView.h
@@ -18,7 +18,7 @@ namespace OHOS
     static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_Y = 0;
     static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_W = 466;
     static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_H = 466;
-    static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 30;                // 图片帧数
+    static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 25;                // 图片帧数
     static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_TIME = 150;                          // 图片更新间隔
     static constexpr const char *ShutDownPaths = "/user/res/RebootAndShutDown/ShutDown/"; // 关机图片路径
 

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp
index 35bd798..4d9cdbc 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp
@@ -310,7 +310,7 @@ namespace OHOS
             .fontSize = LABEL_FONTSIZE,\r
             .lineHeigh = LABEL_LINEHEIGHT,\r
             #if defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_TELECOM_DMP) //移动、电信入库软件要求 版本号固定\r
-            .text =  "Watch Soar V1.0",\r
+            .text =  "N9 V1.0",\r
             #else\r
             .text = (char *)version_buf,\r
             #endif\r

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 d927b39..62959ac 100644 (file)
--- 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
@@ -63,34 +63,38 @@ extern "C"
     static constexpr const char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; // 开机图片路径
     static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 30;              // 图片帧数
 #elif (defined(BOARD_W9) || defined(BOARD_N9)) && !defined(LEINIAO)
-static constexpr const char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; // 开机图片路径
-static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 30;              // 图片帧数
+    static constexpr const char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; // 开机图片路径
+    static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 30;              // 图片帧数
+#elif defined(BOARD_FD272)
+    static constexpr const char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; // 开机图片路径
+    static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 30;              // 图片帧数
 #elif defined(LEINIAO)
-static constexpr const char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; // 开机图片路径
-static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 57;              // 图片帧数
-static const char *TB_REBOOT_PATHS[REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES] = {
-    OHOS::TB_REBOOT_IMAGE_1,  OHOS::TB_REBOOT_IMAGE_2,  OHOS::TB_REBOOT_IMAGE_3,  OHOS::TB_REBOOT_IMAGE_4,  OHOS::TB_REBOOT_IMAGE_5,
-    OHOS::TB_REBOOT_IMAGE_6,  OHOS::TB_REBOOT_IMAGE_7,  OHOS::TB_REBOOT_IMAGE_8,  OHOS::TB_REBOOT_IMAGE_9,  OHOS::TB_REBOOT_IMAGE_10,
-    OHOS::TB_REBOOT_IMAGE_11, OHOS::TB_REBOOT_IMAGE_12, OHOS::TB_REBOOT_IMAGE_13, OHOS::TB_REBOOT_IMAGE_14, OHOS::TB_REBOOT_IMAGE_15,
-    OHOS::TB_REBOOT_IMAGE_16, OHOS::TB_REBOOT_IMAGE_17, OHOS::TB_REBOOT_IMAGE_18, OHOS::TB_REBOOT_IMAGE_19, OHOS::TB_REBOOT_IMAGE_20,
-    OHOS::TB_REBOOT_IMAGE_21, OHOS::TB_REBOOT_IMAGE_22, OHOS::TB_REBOOT_IMAGE_23, OHOS::TB_REBOOT_IMAGE_24, OHOS::TB_REBOOT_IMAGE_25,
-    OHOS::TB_REBOOT_IMAGE_26, OHOS::TB_REBOOT_IMAGE_27, OHOS::TB_REBOOT_IMAGE_28, OHOS::TB_REBOOT_IMAGE_29, OHOS::TB_REBOOT_IMAGE_30,
-    OHOS::TB_REBOOT_IMAGE_31, OHOS::TB_REBOOT_IMAGE_32, OHOS::TB_REBOOT_IMAGE_33, OHOS::TB_REBOOT_IMAGE_34, OHOS::TB_REBOOT_IMAGE_35,
-    OHOS::TB_REBOOT_IMAGE_36, OHOS::TB_REBOOT_IMAGE_37, OHOS::TB_REBOOT_IMAGE_38, OHOS::TB_REBOOT_IMAGE_39, OHOS::TB_REBOOT_IMAGE_40,
-    OHOS::TB_REBOOT_IMAGE_41, OHOS::TB_REBOOT_IMAGE_42, OHOS::TB_REBOOT_IMAGE_43, OHOS::TB_REBOOT_IMAGE_44, OHOS::TB_REBOOT_IMAGE_45,
-    OHOS::TB_REBOOT_IMAGE_46, OHOS::TB_REBOOT_IMAGE_47, OHOS::TB_REBOOT_IMAGE_48, OHOS::TB_REBOOT_IMAGE_49, OHOS::TB_REBOOT_IMAGE_50,
-    OHOS::TB_REBOOT_IMAGE_51, OHOS::TB_REBOOT_IMAGE_52, OHOS::TB_REBOOT_IMAGE_53, OHOS::TB_REBOOT_IMAGE_54, OHOS::TB_REBOOT_IMAGE_55,
-    OHOS::TB_REBOOT_IMAGE_56, OHOS::TB_REBOOT_IMAGE_57,
-};
-
+    static constexpr const char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; // 开机图片路径
+    static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 57;              // 图片帧数
+    static const char *TB_REBOOT_PATHS[REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES] = {
+        OHOS::TB_REBOOT_IMAGE_1,  OHOS::TB_REBOOT_IMAGE_2,  OHOS::TB_REBOOT_IMAGE_3,  OHOS::TB_REBOOT_IMAGE_4,  OHOS::TB_REBOOT_IMAGE_5,
+        OHOS::TB_REBOOT_IMAGE_6,  OHOS::TB_REBOOT_IMAGE_7,  OHOS::TB_REBOOT_IMAGE_8,  OHOS::TB_REBOOT_IMAGE_9,  OHOS::TB_REBOOT_IMAGE_10,
+        OHOS::TB_REBOOT_IMAGE_11, OHOS::TB_REBOOT_IMAGE_12, OHOS::TB_REBOOT_IMAGE_13, OHOS::TB_REBOOT_IMAGE_14, OHOS::TB_REBOOT_IMAGE_15,
+        OHOS::TB_REBOOT_IMAGE_16, OHOS::TB_REBOOT_IMAGE_17, OHOS::TB_REBOOT_IMAGE_18, OHOS::TB_REBOOT_IMAGE_19, OHOS::TB_REBOOT_IMAGE_20,
+        OHOS::TB_REBOOT_IMAGE_21, OHOS::TB_REBOOT_IMAGE_22, OHOS::TB_REBOOT_IMAGE_23, OHOS::TB_REBOOT_IMAGE_24, OHOS::TB_REBOOT_IMAGE_25,
+        OHOS::TB_REBOOT_IMAGE_26, OHOS::TB_REBOOT_IMAGE_27, OHOS::TB_REBOOT_IMAGE_28, OHOS::TB_REBOOT_IMAGE_29, OHOS::TB_REBOOT_IMAGE_30,
+        OHOS::TB_REBOOT_IMAGE_31, OHOS::TB_REBOOT_IMAGE_32, OHOS::TB_REBOOT_IMAGE_33, OHOS::TB_REBOOT_IMAGE_34, OHOS::TB_REBOOT_IMAGE_35,
+        OHOS::TB_REBOOT_IMAGE_36, OHOS::TB_REBOOT_IMAGE_37, OHOS::TB_REBOOT_IMAGE_38, OHOS::TB_REBOOT_IMAGE_39, OHOS::TB_REBOOT_IMAGE_40,
+        OHOS::TB_REBOOT_IMAGE_41, OHOS::TB_REBOOT_IMAGE_42, OHOS::TB_REBOOT_IMAGE_43, OHOS::TB_REBOOT_IMAGE_44, OHOS::TB_REBOOT_IMAGE_45,
+        OHOS::TB_REBOOT_IMAGE_46, OHOS::TB_REBOOT_IMAGE_47, OHOS::TB_REBOOT_IMAGE_48, OHOS::TB_REBOOT_IMAGE_49, OHOS::TB_REBOOT_IMAGE_50,
+        OHOS::TB_REBOOT_IMAGE_51, OHOS::TB_REBOOT_IMAGE_52, OHOS::TB_REBOOT_IMAGE_53, OHOS::TB_REBOOT_IMAGE_54, OHOS::TB_REBOOT_IMAGE_55,
+        OHOS::TB_REBOOT_IMAGE_56, OHOS::TB_REBOOT_IMAGE_57,
+    };
 #else
-static constexpr const char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; // 开机图片路径
-static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 36;              // 图片帧数
+    static constexpr const char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; // 开机图片路径
+    static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 36;              // 图片帧数
 #endif
+
     static constexpr int16_t REBOOT_IMAGE_ANIMATOR_TIME = 150;                             // 图片更新间隔
     static OHOS::ImageAnimatorInfo ReBootImageInfo[REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES]; // 开机图像的信息
     static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_X = 0;
     static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_Y = 0;
+
 #ifdef LEINIAO
     static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_W = 360;
     static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_H = 360;
@@ -98,45 +102,58 @@ static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 36;
     static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_W = 466;
     static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_H = 466;
 #endif
+
     const OHOS::ImageInfo **ReBootPathsArray{nullptr}; // 开机图片路径数组
     static OHOS::UIImageAnimatorView::AnimatorStopListener *bootStoplistener{nullptr};
     static bool boot_animation_flag = false;
     static app_task_definition_t taskcfg = {0};
 
+// 根据不同平台和分区配置定义开机Logo路径
 #ifdef QSPI_DISPLAY
-#define IMAGE_OPEN_LOGO_PATH "/user/res/OPEN_LOGO_QSPI.bin"
+    // QSPI显示屏专用Logo
+    #define IMAGE_OPEN_LOGO_PATH "/user/res/OPEN_LOGO_QSPI.bin"
+    
+#elif defined(CUSTOM_Z1)
+    // Z1产品专用Logo
+    #ifdef SINGLE_USER_PARTITION
+        #define IMAGE_OPEN_LOGO_PATH "/user/system/z1bootlogo.bin"
+    #else
+        #define IMAGE_OPEN_LOGO_PATH "/system/z1bootlogo.bin"
+    #endif
+    
+#elif defined(BOARD_W9) || defined(BOARD_N9) || defined(BOARD_LEINIAO)
+    // W9/N9/雷鸟产品 专用Logo
+    #ifdef SINGLE_USER_PARTITION
+        #define IMAGE_OPEN_LOGO_PATH "/user/system/N9_TEST_LOGO.bin"
+    #else
+        #define IMAGE_OPEN_LOGO_PATH "/system/N9_TEST_LOGO.bin"
+    #endif
+    
+#elif defined(BOARD_FD272)
+    // FD272产品专用Logo
+    #ifdef SINGLE_USER_PARTITION
+        #define IMAGE_OPEN_LOGO_PATH "/user/system/FOOING_LOGO.bin"
+    #else
+        #define IMAGE_OPEN_LOGO_PATH "/system/FOOING_LOGO.bin"
+    #endif
+    
 #else
-#ifdef SINGLE_USER_PARTITION
-#define IMAGE_OPEN_LOGO_PATH "/user/system/KUMI_LOGO.bin"
-#define IMAGE_OTA_LOGO_PATH "/user/system/OTAUpdata.bin"
-#else
-#define IMAGE_OPEN_LOGO_PATH "/system/KUMI_LOGO.bin"
-#define IMAGE_OTA_LOGO_PATH "/system/OTAUpdata.bin"
-#endif
-#endif
-
-#ifdef CUSTOM_Z1
-#ifdef IMAGE_OPEN_LOGO_PATH
-#undef IMAGE_OPEN_LOGO_PATH
-#endif
-#ifdef SINGLE_USER_PARTITION
-#define IMAGE_OPEN_LOGO_PATH "/user/system/z1bootlogo.bin"
-#else
-#define IMAGE_OPEN_LOGO_PATH "/system/z1bootlogo.bin"
-#endif
+    // 默认通用Logo
+    #ifdef SINGLE_USER_PARTITION
+        #define IMAGE_OPEN_LOGO_PATH "/user/system/KUMI_LOGO.bin"
+    #else
+        #define IMAGE_OPEN_LOGO_PATH "/system/KUMI_LOGO.bin"
+    #endif
 #endif
 
-#if defined(BOARD_W9) || defined(BOARD_N9) || defined(BOARD_LEINIAO)
-#ifdef IMAGE_OPEN_LOGO_PATH
-#undef IMAGE_OPEN_LOGO_PATH
-#endif
+// 默认通用OTALogo
 #ifdef SINGLE_USER_PARTITION
-#define IMAGE_OPEN_LOGO_PATH "/user/system/N9_TEST_LOGO.bin"
+    #define IMAGE_OTA_LOGO_PATH "/user/system/OTAUpdata.bin"
 #else
-#define IMAGE_OPEN_LOGO_PATH "/system/N9_TEST_LOGO.bin"
-#endif
+    #define IMAGE_OTA_LOGO_PATH "/system/OTAUpdata.bin"
 #endif
 
+    
     static void FreeImagePathsArray(const char **imagePaths, const int numImages)
     {
         for (int i = 0; i < numImages; i++)
@@ -551,6 +568,7 @@ static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 36;
         LOS_Msleep(500);
     }
 
+    //开机动画初始化
     void boot_animation_init_deinit(void)
     {
         errcode_t ret = uapi_terminate_thread(taskcfg.task_handle);