From ce771f8ea3e246f8df783136920183ec6e54131d Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Mon, 2 Sep 2024 16:58:50 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?utf8?q?=E8=A1=A8=E7=9B=98=E8=AF=BB=E5=8F=96=E9=85=8D=E7=BD=AE=E5=BC=82?=
 =?utf8?q?=E5=B8=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/set_dial/src/SetDialModel.cpp        | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 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 0367f9a36..0f9c7301d 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
@@ -13,6 +13,7 @@
 #include <iomanip>
 #include <iostream>
 #include <fstream>
+#include <array>   
 #include <stdio.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -579,8 +580,7 @@ namespace OHOS
     */
     bool SetDialModel::loadDialConfig(int Id, DialLayout &layout)
     {
-        std::string filename = std::string(APP_CUSTOM_DIAL_PATH) + "/" + std::to_string(Id) + ".bin";
-
+        std::string filename = GetSaveDir(Id) + "/" + std::to_string(Id) + ".bin";
         // 打开文件
         std::ifstream configFile(filename, std::ios::binary);
         if (!configFile.is_open())
@@ -590,12 +590,12 @@ namespace OHOS
         }
 
         // 读取配置
-        char settings[3]; // 读取3个字节
-        configFile.read(settings, sizeof(settings));
-        if (configFile.gcount() != sizeof(settings))
+        std::array<char, 3> settings;
+        configFile.read(settings.data(), settings.size());
+
+        if (configFile.gcount() != settings.size())
         {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to read config file or insufficient file content!");
-            configFile.close();
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to read configuration: %s", filename.c_str());
             return false; // 读取失败
         }
 
@@ -605,7 +605,6 @@ namespace OHOS
         layout.colorTypeSet = static_cast<ColorTypeSet>(settings[2]);         // 字体颜色
 
         // 关闭文件
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to read config file or insufficient file content!");
         configFile.close();
         return true; // 成功读取配置
     }
-- 
2.17.1