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

diff --cc code/sdk/application/wearable/fd230app/CMakeLists.txt
Simple merge

diff --cc code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
index 7cd771a,73d2f93..f9982ea
--- 1/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
--- 2/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

diff --cc code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
Simple merge

diff --cc code/sdk/drivers/peripheral/utils/custom_utils.c
Simple merge