From 28670c84abccd55ac5938ea88b9adb01569a1a32 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Mon, 11 Nov 2024 20:46:53 +0800
Subject: [PATCH] =?utf8?q?=E8=A1=A8=E7=9B=98=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?utf8?q?=E5=AE=89=E8=A3=85=E5=A4=B1=E8=B4=A5=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/set_dial/src/SetDialModel.cpp    | 22 +++++++++----------
 .../service/ble_service/blemoder/bletest.cpp  | 12 +++++-----
 .../msg_center/src/notify/transmitting.cpp    |  4 ++--
 3 files changed, 20 insertions(+), 18 deletions(-)

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 7916642dd..d3cad1c09 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp
@@ -413,15 +413,17 @@ void SetDialModel::UpdateDialSetting(uint16_t ID) {
   /*判断是否为当前表盘 如果是自定义表盘 需要更新*/
   if (currentDialID == ID && ID >= 5) {
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
-                  "UpdateDialSetting: Current dial cannot be updated");
-    reply_app_send_switchDialCmd(true);              
+                  "UpdateDialSetting: Current dial %d cannot be updated %d",currentDialID,ID);
+    reply_app_send_switchDialCmd(false);              
     return;
   }
-
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UpdateDialSetting: ID %d",ID);
   if (registeredDials.find(ID) != registeredDials.end()) {
     std::string dialname = registeredDials[ID]; // 根据ID找到对应的表盘名称
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UpdateDialSetting: Dial %s is already registered", dialname.c_str());
     // 在dialInfoList中查找同名表盘
     for (size_t i = 0; i < dialInfoList.size(); i++) {
+      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "dialInfoList name %s is already registered", (dialInfoList[i].dialName).c_str());
       if (dialInfoList[i].dialName == dialname) {
         DialSetting diagSetting;
         SetDialInfo &info = dialInfoList[i];
@@ -433,18 +435,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());
         reply_app_send_switchDialCmd(true);  
         return; // 更新成功后直接返回
       }
     }
+    //没有在列表找到名称
+    reply_app_send_switchDialCmd(false);
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "dialInfoList name %s is already registered", dialname.c_str());
   } else {
     reply_app_send_switchDialCmd(false);  
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
-                  "UpdateDialSetting: dial ID %d is offline dial", ID);
+    WEARABLE_LOGE( WEARABLE_LOG_MODULE_APP,"SetDialModel UpdateDialSetting: Cannot find dial %d", ID);
   }
 }
 
@@ -613,7 +613,7 @@ std::string SetDialModel::GetDialDescription(const std::string &dialName) {
 /*设置当前表盘*/
 void SetDialModel::SaveDialSetting(uint8_t pageIndex) {
   if (pageIndex >= dialInfoList.size()) {
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
                   "SetDialModel SaveDialSetting [%u %u]", pageIndex,
                   dialInfoList.size());
     return;
@@ -625,7 +625,7 @@ void SetDialModel::SaveDialSetting(uint8_t pageIndex) {
   diagSetting.dialFullName = info.dialFullName;
   currentDialID = GetDialIdFromName(info.dialName); // 更新表盘Id
 
-  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "info.dialName %s info.id %d ",
+  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "info.dialName %s info.id %d ",
                 info.dialName.c_str(), info.id);
   MainModel::GetInstance().AddDialSetting(diagSetting, currentDialID);
 }
diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
index afa8a5ce0..3485ff066 100644
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
@@ -975,15 +975,17 @@ void ble_save_dial_custom(msg_recv_custom_dial_info_t *data)
 
 void ble_set_dial_by_id_(uint16_t id)
 {
-    #ifdef FD230
-     OHOS::SetDialModel::GetInstance().UpdateDialSetting(id);
-    #endif
+#ifdef FD230
+    // printf("ble_set_dial_by_id_ %d\n",id);
+    OHOS::SetDialModel::GetInstance().UpdateDialSetting(id);
+#endif
    
 }
 void ble_set_dial_by_id(uint16_t id)
 {
- #ifdef FD230
-     GraphicService::GetInstance()->PostGraphicEvent(
+#ifdef FD230
+    // printf("ble_set_dial_by_id %d\n",id);
+    GraphicService::GetInstance()->PostGraphicEvent(
                 std::bind(ble_set_dial_by_id_ ,id));
 #endif
 }
diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp
index 31a1e5485..8d6196b81 100644
--- a/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp
@@ -773,8 +773,8 @@ namespace OHOS
         label_->SetStyle(STYLE_TEXT_FONT, 30);
 
         // Set additional property
-        label_->SetText("表盘安装失败，请退出或重新安装");
-        label_->SetTextId(STR_DIAL_FAIL_LABEL);
+        label_->SetText("离线表盘个数已经超过最大 请到app删除部分表盘再进行下载");//TODO:多国语言
+        // label_->SetTextId(STR_DIAL_FAIL_LABEL);
         label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
         label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff));
         label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-- 
2.17.1