N9资源文件变更增加宏控制

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
index ec11e9c..9ebc861 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
@@ -101,9 +101,12 @@ namespace OHOS
 #ifdef CUSTOM_Z1
     static constexpr const char *DEFAULT_DIALBACK_PATH = APP_RES_PATH "/dial_soures/z1background.bin";
     static constexpr const char *DEFAULT_DIALPER_PATH = APP_RES_PATH "/dial_soures/Z1VIEW.bin";
-#else
+#elseif BOARD_N9
     static constexpr const char *DEFAULT_DIALBACK_PATH = APP_RES_PATH "/dial_soures/main_bg.bin";
     static constexpr const char *DEFAULT_DIALPER_PATH = APP_RES_PATH "/dial_soures/thumbnail.bin";
+#else
+    static constexpr const char *DEFAULT_DIALBACK_PATH = APP_RES_PATH "/dial_soures/MAIN_FACE_IMAGE.bin";
+    static constexpr const char *DEFAULT_DIALPER_PATH = APP_RES_PATH "/dial_soures/KUMIVIEW.bin";
 #endif
     static constexpr const char *CUSTOM_CLOCK1_DIALBACK_PATH = APP_CUSTOM_DIAL_PATH "/1/main_bg.bin";
     static constexpr const char *CUSTOM_CLOCK1_DIALPER_PATH = APP_CUSTOM_DIAL_PATH "/1/thumbnail.bin";

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
index 215bf8f..724a403 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
@@ -53,8 +53,10 @@ namespace OHOS
     const DialInfo dialInfoMap[] = {\r
 #ifdef CUSTOM_Z1\r
         {DIAL_CLOCK, "Z1", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD},\r
+#elseif BOARD_N9\r
+        {DIAL_CLOCK, "N9", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD}, \r
 #else\r
-        {DIAL_CLOCK, "N9", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD}, // 默认表盘 Id 0\r
+        {DIAL_CLOCK, "KUMI", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD},\r
 #endif\r
         {DIAL_CLOCK_1, "Custom_1", CUSTOM_CLOCK1_DIALPER_PATH, DEFAULT_TASK_PERIOD}, // 表盘 Id 1\r
         {DIAL_CLOCK_2, "Custom_2", CUSTOM_CLOCK2_DIALPER_PATH, DEFAULT_TASK_PERIOD}, // 表盘 Id 2\r
@@ -436,15 +438,19 @@ namespace OHOS
         if (len < 0)\r
         {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Failed to retrieve dial settings. Initializing to default settings.\r\n");\r
-            // //判断黑耀表盘是否存在\r
-            // if(SetDialModel::GetInstance().IsDialInstalled(DEFAULT_DIAL_ID))\r
-            // {\r
-            //     InitDialSettingDefault(DEFAULT_DIAL_ID);\r
-            // }\r
-            // else\r
-            // {\r
+        #ifdef BOARD_N9\r
+            InitDialSettingDefault(DIAL_CLOCK);//N9使用默认静态表盘\r
+        #else\r
+            //判断黑耀表盘是否存在\r
+            if(SetDialModel::GetInstance().IsDialInstalled(DEFAULT_DIAL_ID))\r
+            {\r
+                InitDialSettingDefault(DEFAULT_DIAL_ID);\r
+            }\r
+            else\r
+            {\r
                 InitDialSettingDefault(DIAL_CLOCK);\r
-            // }\r
+            }\r
+        #endif\r
             return;\r
         }\r
 \r
@@ -462,15 +468,19 @@ namespace OHOS
         else\r
         {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: First value is empty. Initializing to default settings.\r\n");\r
-            //  //判断黑耀表盘是否存在\r
-            // if(SetDialModel::GetInstance().IsDialInstalled(DEFAULT_DIAL_ID))\r
-            // {\r
-            //     InitDialSettingDefault(DEFAULT_DIAL_ID);\r
-            // }\r
-            // else\r
-            // {\r
+        #ifdef BOARD_N9\r
+            InitDialSettingDefault(DIAL_CLOCK);//N9使用默认静态表盘\r
+        #else\r
+            //判断黑耀表盘是否存在\r
+            if(SetDialModel::GetInstance().IsDialInstalled(DEFAULT_DIAL_ID))\r
+            {\r
+                InitDialSettingDefault(DEFAULT_DIAL_ID);\r
+            }\r
+            else\r
+            {\r
                 InitDialSettingDefault(DIAL_CLOCK);\r
-            // }\r
+            }\r
+        #endif\r
             return;\r
         }\r
 \r
@@ -484,15 +494,19 @@ namespace OHOS
         else\r
         {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Second value is empty. Initializing to default settings.\r\n");\r
+        #ifdef BOARD_N9\r
+            InitDialSettingDefault(DIAL_CLOCK);//N9使用默认静态表盘\r
+        #else\r
             //判断黑耀表盘是否存在\r
-            // if(SetDialModel::GetInstance().IsDialInstalled(DEFAULT_DIAL_ID))\r
-            // {\r
-            //     InitDialSettingDefault(DEFAULT_DIAL_ID);\r
-            // }\r
-            // else\r
-            // {\r
+            if(SetDialModel::GetInstance().IsDialInstalled(DEFAULT_DIAL_ID))\r
+            {\r
+                InitDialSettingDefault(DEFAULT_DIAL_ID);\r
+            }\r
+            else\r
+            {\r
                 InitDialSettingDefault(DIAL_CLOCK);\r
-            // }\r
+            }\r
+        #endif\r
             return;\r
         }\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp
index 4481b9f..314260d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp
@@ -34,8 +34,10 @@ namespace OHOS {
 std::unordered_map<uint16_t, std::string> registeredDials{
 #ifdef CUSTOM_Z1
     {DEFAULT_DIAL_ID_0, "Z1"},
+#elseif BOARD_N9
+    {DEFAULT_DIAL_ID_0, "N9"},        
 #else
-    {DEFAULT_DIAL_ID_0, "N9"},         // 为了预防显示
+    {DEFAULT_DIAL_ID_0, "KUMI"}, 
     {DEFAULT_DIAL_ID, "obsidianrhythm"}, // 默认表盘修改为 黑耀律动
 #endif
     {DEFAULT_DIAL_ID_1, "satellite"},       // 卫星表盘

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.h b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.h
index cee4646..b55b0e4 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.h
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.h
@@ -34,10 +34,13 @@ extern uint16_t g_ble_conn_id;
 extern uint16_t g_ble_server_handle;
 
 #ifdef CUSTOM_Z1
-#define BLE_DEFAULT_NAME  "Z1"//"KUMI U6"
+#define BLE_DEFAULT_NAME  "Z1"//"
+#elseif BOARD_N9
+#define BLE_DEFAULT_NAME  "WATCH"//"N9
 #else
-#define BLE_DEFAULT_NAME  "WATCH"//"KUMI U6"
+#define BLE_DEFAULT_NAME  "WATCH Soar"//"FD230
 #endif
+
 void svr_ble_bluetooth_init(void);//蓝牙服务初始化
 void custom_ble_service_stop(void);//主动关闭蓝牙
 void custom_ble_service_start(void);//主动开启蓝牙

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/system/cat1ota/china_mobile_dmp.py b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/system/cat1ota/china_mobile_dmp.py
index 45962cc..0ae967c 100755 (executable)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/system/cat1ota/china_mobile_dmp.py
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/system/cat1ota/china_mobile_dmp.py
@@ -282,7 +282,7 @@ class chinamobile:
         #密钥
         key = "f74c005251dc40c4b64a283827da3812"
 
-        brand = "{}".format("XXX")#品牌
+        brand = "{}".format("Watch")#品牌
 
         model = "Watch"#型号
         appKey = "M100001131"#不需要就填***appKey 厂商标识
@@ -316,10 +316,10 @@ class chinamobile:
         sysVersion = "OpenHarmony 3.2"
         # base64_sysVersion = sha256_encode(key,sysVersion)
         if (len(self.software_version) == 0):#获取失败了
-            self.software_version = "Watch V1.0"
+            self.software_version = "Watch Soar V1.0"
         softwareVer = self.software_version
         # base64_softwareVer = sha256_encode(key,softwareVer)
-        softwareName ="Watch"
+        softwareName ="FD230"
         # base64_softwareName = sha256_encode(key,softwareName)
         volte="0" #0:开;1:关;-1:不支持
         # base64_volte = sha256_encode(key,volte)

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 24876a1..f736298 100755 (executable)
--- 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
@@ -58,6 +58,9 @@ static OHOS::UIImageAnimatorView* ReBootImageAnimatorView=nullptr;
 #ifdef CUSTOM_Z1
 static constexpr char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; //开机图片路径
 static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 30; // 图片帧数
+#elseif
+static constexpr char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; //开机图片路径
+static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 30; // 图片帧数
 #else
 static constexpr char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; //开机图片路径
 static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 36; // 图片帧数
@@ -96,6 +99,17 @@ static app_task_definition_t taskcfg={0};
 #endif
 #endif
 
+#ifdef BOARD_N9
+#ifdef IMAGE_OPEN_LOGO_PATH
+#undef IMAGE_OPEN_LOGO_PATH
+#endif
+#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
+#endif
+
 
 static void FreeImagePathsArray(const char **imagePaths, const int numImages)
 {
@@ -184,6 +198,7 @@ bool ShowReBootAnimatorView()
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "new ReBootImageAnimatorView fail");
             return false;
         }
+#ifdef BOARD_N9
         for (int j = 0, i = REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES - 1; 
             i > 0 && j < REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES; 
             i--, j++) 
@@ -195,6 +210,17 @@ bool ShowReBootAnimatorView()
             ReBootImageInfo[j].width = REBOOT_IMAGE_ANIMATOR_VIEW_W;
             ReBootImageInfo[j].height = REBOOT_IMAGE_ANIMATOR_VIEW_H;
         }
+#else
+        for (uint8_t i = REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES -1; i > 0 ; i--)
+        {
+            ReBootImageInfo[i].imageInfo = (ReBootPathsArray[i]);
+            ReBootImageInfo[i].imageType = OHOS::IMG_SRC_IMAGE_INFO;
+            ReBootImageInfo[i].pos.x = REBOOT_IMAGE_ANIMATOR_VIEW_X;
+            ReBootImageInfo[i].pos.y = REBOOT_IMAGE_ANIMATOR_VIEW_Y;
+            ReBootImageInfo[i].width = REBOOT_IMAGE_ANIMATOR_VIEW_W;
+            ReBootImageInfo[i].height = REBOOT_IMAGE_ANIMATOR_VIEW_H;
+        }
+#endif
         ReBootImageAnimatorView->SetPosition(REBOOT_IMAGE_ANIMATOR_VIEW_X, REBOOT_IMAGE_ANIMATOR_VIEW_Y, REBOOT_IMAGE_ANIMATOR_VIEW_W, REBOOT_IMAGE_ANIMATOR_VIEW_H);
         ReBootImageAnimatorView->SetStyle(OHOS::STYLE_BACKGROUND_COLOR, 0xffffffff);
         ReBootImageAnimatorView->SetStyle(OHOS::STYLE_BACKGROUND_OPA, 0xff);