From 5d38e42a984b4e20e1ace69d34c0adff30d98f3f Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Tue, 22 Oct 2024 14:42:41 +0800
Subject: [PATCH] =?utf8?q?=E8=A1=A8=E7=9B=98=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?utf8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E7=9B=98=E6=9B=B4=E6=96=B0?=
 =?utf8?q?=E5=88=B7=E6=96=B0=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../fd230app/nativeui/clock/src/MainClockView.cpp      | 10 +++++++---
 .../fd230app/nativeui/set_dial/src/SetDialModel.cpp    |  7 ++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp b/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp
index e19938cf1..39c387a49 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp
@@ -176,8 +176,12 @@ namespace OHOS
         return true;
     }
     /*初始化表盘背景*/
-    bool MainClockView::InitBackground(const char *filename)
-    {
+    bool MainClockView::InitBackground(const char *filename) {
+
+        if (filename == nullptr) {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "filename is null");
+            return false;
+        }
         curFace = new UIImageView();
         if (curFace == nullptr)
         {
@@ -191,7 +195,7 @@ namespace OHOS
         if (image == nullptr)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadAllDialFromRam loadimage %s fail",
-                          filename);
+                            filename);
             curFace->SetSrc(DEFAULT_DIALBACK_PATH);
             Add(curFace);
             return false;
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 825b1086a..67656e250 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
@@ -408,8 +408,8 @@ void SetDialModel::UpdateDialSetting(uint16_t ID) {
   if (ID <= 4) {
     ID++;
   }
-  /*判断是否为当前表盘*/
-  if (currentDialID == ID) {
+  /*判断是否为当前表盘 如果是自定义表盘 需要更新*/
+  if (currentDialID == ID && ID >=5) {
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
                   "UpdateDialSetting: Current dial cannot be updated");
     return;
@@ -690,7 +690,8 @@ void SetDialModel::LoadAllDialFromRam() {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Processing Dial ID %u: Name: %s", i,
                   dialInfo.dialName.c_str());
 
-    // 加载图像资源
+    // 加载图像资源 (因为自定义表盘可能更新。需要先对其进行卸载)
+    ImageCacheManager::GetInstance().UnloadSingleRes(info->dialImg);
     ImageInfo *imageInfo =
         ImageCacheManager::GetInstance().LoadSingleRes(info->dialImg, false);
     if (imageInfo == nullptr) {
-- 
2.17.1