修改n9主界面表盘配置

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp
index dbec4cd..56776b4 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp
@@ -112,11 +112,6 @@ void NativeLauncher::InitNativeLauncher(LaunchMode mode)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLangues error");
         }
-        // 如果是雷鸟项目
-        #ifdef BOARD_LEINIAO
-            NativeRegisterManager::GetInstance().SetDefaultSliceId(VIEW_THUNDER_BIRD);
-            return;
-        #endif
         
         // 初始化所有预加载slice
         NativeRegisterManager::GetInstance().InitAllNativesSlices();
@@ -140,7 +135,7 @@ void NativeLauncher::InitNativeLauncher(LaunchMode mode)
 
         // 初始化默认首页
         ScreenModels::GetInstance()->PreLoadAppimages();
-        // NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN);
+
         //  注册按键事件
         RebootAndShutdownModel::GetInstance().RegisterAllKeyEvents();
 
@@ -178,6 +173,12 @@ void NativeLauncher::InitNativeLauncher(LaunchMode mode)
 
         // 开机增加震动 页面启动震动一次
         // custom_VibratorFunc_int(0);
+
+        // 如果是雷鸟项目
+        #ifdef BOARD_LEINIAO
+            NativeAbility::GetInstance().SetDefaultSliceId(VIEW_THUNDER_BIRD);
+            return;
+        #endif
     }
     // 注册开机时间  
     SystemLogData systemlog;  

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialModel.cpp
index 3f8b169..0c23170 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialModel.cpp
@@ -37,15 +37,20 @@ namespace OHOS {
 std::unordered_map<uint16_t, std::string> registeredDials{
 #ifdef CUSTOM_Z1
     {DEFAULT_DIAL_ID_0, "Z1"},
+#elif BOARD_N9
+    {DEFAULT_DIAL_ID_0, "N9"},         {DEFAULT_DIAL_ID, "lake"},
+    {DEFAULT_DIAL_ID_1, "eagle"},      {DEFAULT_DIAL_ID_2, "vibrantnumber"},
+    {DEFAULT_DIAL_ID_3, "distortion"}, {MAX_DEFAULT_DIAL_ID, "science"},
+#elif BOARD_W9
+    {DEFAULT_DIAL_ID_0, "W9"},
 #else
-    {DEFAULT_DIAL_ID_0, "KUMI"},         // 为了预防显示
+    {DEFAULT_DIAL_ID_0, "KUMI"},
     {DEFAULT_DIAL_ID, "obsidianrhythm"}, // 默认表盘修改为 黑耀律动
-#endif
-    {DEFAULT_DIAL_ID_1, "satellite"},       // 卫星表盘
-    {DEFAULT_DIAL_ID_2, "birdie"},          // 飞鸟表盘
-    {DEFAULT_DIAL_ID_3, "dawninsight"},     // 晨曦智影
+    {DEFAULT_DIAL_ID_1, "satellite"},    // 卫星表盘
+    {DEFAULT_DIAL_ID_2, "birdie"},       // 飞鸟表盘
+    {DEFAULT_DIAL_ID_3, "dawninsight"},  // 晨曦智影
     {MAX_DEFAULT_DIAL_ID, "mirrorvoyager"}, // 镜影行者
-
+#endif
 };
 // 表盘市场UID 对应表盘name
 // 存储表盘到文件
@@ -490,9 +495,9 @@ void SetDialModel::UpdateDialSetting(uint16_t ID) {
         MainModel::GetInstance().AddDialSetting(diagSetting,
                                                 currentDialID); // 更新表盘设置
         //运动状态下不进行页面切换
-        // if (uapi_dev_runtime_get_train_status() != 1) {
-        //   NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
-        // }
+        if (uapi_dev_runtime_get_train_status() != 1) {
+          NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
+        }
         // svr_ble_read_data_value_updata_noyify(); // app切换表盘增加id更新
         // reply_app_send_switchDialCmd(true);
         return; // 更新成功后直接返回
@@ -550,7 +555,7 @@ void SetDialModel::LoadAllDialFromFs() {
       int ret = ParseDialHeader(DOWNLOADDIAL, direntp->d_name, dialInfo);
       if (ret == 0) {
         if (dialInfo.capability == DIAL_DISPLAY_CAPABILITY_NORMAL_ONLY) {
-          dialInfoList.push_back(dialInfo);
+        dialInfoList.push_back(dialInfo);
         } else if (dialInfo.capability ==
                     DIAL_DISPLAY_CAPABILITY_AMBITIENT_ONLY) {
           aodDialInfoList.push_back(dialInfo);
@@ -570,9 +575,19 @@ void SetDialModel::LoadAllDialFromFs() {
   加载默认表盘
 */
 const std::vector<std::string> defaultDials = {
-    "obsidianrhythm", "mirrorvoyager", "satellite", "dawninsight", "birdie"};
+#ifdef BOARD_N9
+    "lake", "eagle", "vibrantnumber", "distortion", "science",
+#else
+    "obsidianrhythm", "mirrorvoyager", "satellite", "dawninsight", "birdie",
+#endif
+};
 
 void SetDialModel::LoadAllDialFromDefult(void) {
+
+#ifdef BOARD_W9
+  return; // w9暂时没有默认表盘
+#endif
+
   DIR *dirp = opendir(APP_DEFAULT_DIAL_PATH);
   if (dirp == nullptr) {
     perror("Failed to open directory");
@@ -606,7 +621,7 @@ void SetDialModel::LoadAllDialFromDefult(void) {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Adding dial %s",
                       fullDialName.c_str());
         if (dialInfo.capability == DIAL_DISPLAY_CAPABILITY_NORMAL_ONLY) {
-          dialInfoList.push_back(dialInfo);
+        dialInfoList.push_back(dialInfo);
         } else if (dialInfo.capability ==
                    DIAL_DISPLAY_CAPABILITY_AMBITIENT_ONLY) {
           aodDialInfoList.push_back(dialInfo);
@@ -652,17 +667,16 @@ int32_t SetDialModel::ParseDialHeader(int type, const std::string &dialFileName,
     fclose(fp);
     return -1;
   }
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ParseDialHeader dialFullName: %s",
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ParseDialHeader dialFullName: %s",
                 dialFullName.c_str());
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ParseDialHeader dialName: %s",
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ParseDialHeader dialName: %s",
                 preInfo.dialName);
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ParseDialHeader description: %s",
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ParseDialHeader description: %s",
                 preInfo.description);
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ParseDialHeader previewImgId: %u",
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ParseDialHeader previewImgId: %u",
                 preInfo.imgId);
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ParseDialHeader imageOffset: %u",
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ParseDialHeader imageOffset: %u",
                 preInfo.offset);
-                
   ImageInfo *info = ImageCacheManager::GetInstance().LoadOneInMultiRes(
       preInfo.imgId, dialFullName, fp, false, preInfo.offset);
   if (info == nullptr) {
@@ -813,6 +827,7 @@ void SetDialModel::LoadAllDialFromRam() {
     // 设置图像信息
     dialInfo.preImageInfo = imageInfo;
 
+    // 添加到表盘列表
     dialInfoList.push_back(dialInfo);
 
     // 注册到map