修改默认表盘配置；具体方案还需要商讨

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 d5df0dc..92d248d 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
@@ -22,11 +22,13 @@
 #include <unistd.h>
 namespace OHOS {
 // 定义特殊Id
-constexpr uint16_t DEFAULT_DIAL_ID_1 = 1028;
-constexpr uint16_t DEFAULT_DIAL_ID_2 = 1052;
-constexpr uint16_t DEFAULT_DIAL_ID_3 = 101;
-constexpr uint16_t DEFAULT_DIAL_ID_4 = 106;
-constexpr uint16_t MAX_DEFAULT_DIAL_ID = 111;
+constexpr uint16_t DEFAULT_DIAL_ID_0 = 1028;
+constexpr uint16_t DEFAULT_DIAL_ID_1 = 111;
+constexpr uint16_t DEFAULT_DIAL_ID_2 = 112;
+constexpr uint16_t DEFAULT_DIAL_ID_3 = 113;
+constexpr uint16_t DEFAULT_DIAL_ID_4 = 114;
+constexpr uint16_t MAX_DEFAULT_DIAL_ID = 115;
+// 定义自定义表盘
 constexpr uint16_t CUSTOM_DIAL_ID_1 = 1;
 constexpr uint16_t CUSTOM_DIAL_ID_2 = 2;
 constexpr uint16_t CUSTOM_DIAL_ID_3 = 3;
@@ -40,14 +42,20 @@ constexpr uint16_t CUSTOM_DIAL_ID_5 = 5;
 // 表盘map[Id--dialname] 前5个ID固定
 std::unordered_map<uint16_t, std::string> registeredDials{
 #ifdef CUSTOM_Z1
-    {DEFAULT_DIAL_ID_1, "Z1"},
+    {DEFAULT_DIAL_ID_0, "Z1"},
 #else
-    {DEFAULT_DIAL_ID_1, "KUMI"},
+    {DEFAULT_DIAL_ID_0, "KUMI"},           //  为了预防显示
+    {DEFAULT_DIAL_ID_4, "obsidianrhythm"}, //默认表盘修改为 黑耀律动 TODO:ID需要更改 DEFAULT_DIAL_ID_3
 #endif
-    {DEFAULT_DIAL_ID_2, "classic"},     // 经典表盘
-    {DEFAULT_DIAL_ID_3, "sport"},       // 运动表盘
-    {DEFAULT_DIAL_ID_4, "galaxy"},      // 星空表盘
-    {MAX_DEFAULT_DIAL_ID, "satellite"}, // 卫星表盘
+    {DEFAULT_DIAL_ID_1, "satellite"}, // 卫星表盘
+    {DEFAULT_DIAL_ID_2, "birdie"},    // 飞鸟表盘
+
+    /*
+      TODO:增加表盘
+      {DEFAULT_DIAL_ID_4, "smart_payment"}, // 智能支付表盘
+      {MAX_DEFAULT_DIAL_ID, "kumi_point"},  // kumi指针表盘
+    */
+
 };
 // 表盘市场UID 对应表盘name
 bool SetDialModel::saveDialfile() {
@@ -142,7 +150,8 @@ void SetDialModel::RegisterDial(uint16_t ID, const char *dialname) {
 }
 
 /* 注册表盘map_ble*/
-void SetDialModel::RegisterDial(uint16_t ID, const char *dialname,uint8_t type) {
+void SetDialModel::RegisterDial(uint16_t ID, const char *dialname,
+                                uint8_t type) {
   // 增加 ID 对应
   if (ID <= 4) {
     ID++;
@@ -351,6 +360,7 @@ bool SetDialModel::UninstallDial(uint16_t ID) {
     case DEFAULT_DIAL_ID_2:
     case DEFAULT_DIAL_ID_3:
     case DEFAULT_DIAL_ID_4:
+    case DEFAULT_DIAL_ID_0: // TODO: 后续修改
       WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
                     "UninstallDial: Default dial %d cannot be uninstalled", ID);
       return false;
@@ -427,14 +437,16 @@ void SetDialModel::UpdateDialSetting(uint16_t ID) {
         MainModel::GetInstance().AddDialSetting(diagSetting,
                                                 currentDialID); // 更新表盘设置
         NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
+        WEARABLE_LOGE(
+            WEARABLE_LOG_MODULE_APP,
+            "SetDialModel UpdateDialSetting: Cannot find dial with name %s",
+            dialname.c_str());
         return; // 更新成功后直接返回
       }
     }
-    NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
-    WEARABLE_LOGD(
-        WEARABLE_LOG_MODULE_APP,
-        "SetDialModel UpdateDialSetting: Cannot find dial with name %s",
-        dialname.c_str());
+  } else {
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
+                  "UpdateDialSetting: dial ID %d is offline dial", ID);
   }
 }
 

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/birdie.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/birdie.bin
new file mode 100644 (file)
index 0000000..f9fdfab
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/birdie.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5509eb40b25f2839bff6dd4496ae740308e17e12c36cd470db502ca0ac8dcbcb
+size 1523772

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/classic.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/classic.bin
deleted file mode 100644 (file)
index 77b4b4c..0000000
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/classic.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65c0d4472d9bb822d678a16f460e53b833f8a1c7e41bbee39c6d6506403a39a0
-size 205120

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/galaxy.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/galaxy.bin
deleted file mode 100644 (file)
index 5aa7299..0000000
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/galaxy.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5e73fb1b366d0ec5c5ba33d1c290fbd94ace6d0f654ea7d411512bd2fe65cef
-size 209925

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/obsidianrhythm.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/obsidianrhythm.bin
new file mode 100644 (file)
index 0000000..48dd46e
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/obsidianrhythm.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53d1a6626429f4ea7d0219f7d9637e2cc59979557f9424221ec95381cd0fea22
+size 1399839

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/sport.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/sport.bin
deleted file mode 100644 (file)
index 739609e..0000000
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/sport.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6ce06332fcd4a61b22a41ae5c64b437b15edbf7dd855b2fab28d09897502186a
-size 344285