From: Caisking <3449750381@qq.com>
Date: Tue, 12 Mar 2024 03:22:21 +0000 (+0800)
Subject: Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 
X-Git-Tag: release_V1.2.70_20241020_135402~1274^2~23
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=e834e09d15180ba9d25424b0fa698d1ea6a3b8e3;p=mirrors%2FFD230.git

Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin
---

e834e09d15180ba9d25424b0fa698d1ea6a3b8e3
diff --cc code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
index 7cd771ab7,73d2f934c..f9982ea96
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
@@@ -340,9 -340,11 +340,10 @@@ namespace OHO
          }
  #endif
          // DialUpdateModel::GetInstance()->LoadDialConfigFromJson();
-         //uint8_t fileid = DialUpdateModel::GetInstance()->GetDialConfigPath();
-         //std::string filePath = dialInfo[fileid].dialPath;
+         //read_dial();
+         uint8_t fileid = DialUpdateModel::GetInstance()->GetDialConfigPath();
+         std::string filePath = dialInfo_1[fileid].dialPath;
          mainClockView->SetDial(filePath);
 -
  #else
          mainClockView = new MainClockView();
  #endif