From: 罗正yun <1732036298@qq.com>
Date: Sat, 20 Jan 2024 07:56:44 +0000 (+0800)
Subject: Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 
X-Git-Tag: release_V1.2.70_20241020_135402~1351^2~2^2~1
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=4199d40ebde12a6a351602298cc2cd45209c526a;p=mirrors%2FFD230.git

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

4199d40ebde12a6a351602298cc2cd45209c526a
diff --cc code/sdk/application/wearable/nativeapp/nativeui/dial/src/DialPresenter.cpp
index ebf098d88,f125fa5b6..895619923
--- a/code/sdk/application/wearable/nativeapp/nativeui/dial/src/DialPresenter.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/dial/src/DialPresenter.cpp
@@@ -97,37 -97,37 +97,37 @@@ namespace OHO
          if (strcmp(view.GetViewId(), "kumibutton") == 0)
          {
              // printf("join click\n");
-             const std::string jsonPath = "/user/res/clocks/KUMI.json";
+             const std::string jsonPath = "/user/res/clocks/dialconfig/KUMI.json";
              g_pDigital_clockView->setJsonFilePath(jsonPath);
 -            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE);
 +            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
          }
          if (strcmp(view.GetViewId(), "flowerbudbutton") == 0)
          {
              // printf("join click\n");
-             const std::string jsonPath = "/user/res/clocks/flowerbud.json";
+             const std::string jsonPath = "/user/res/clocks/dialconfig/flowerbud.json";
              g_pDigital_clockView->setJsonFilePath(jsonPath);
 -            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE);
 +            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
          }
          if (strcmp(view.GetViewId(), "maomaobutton") == 0)
          {
              // printf("join click\n");
-             const std::string jsonPath = "/user/res/clocks/maomao.json";
+             const std::string jsonPath = "/user/res/clocks/dialconfig/maomao.json";
              g_pDigital_clockView->setJsonFilePath(jsonPath);
 -            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE);
 +            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
          }
          if (strcmp(view.GetViewId(), "momobutton") == 0)
          {
              // printf("join click\n");
-             const std::string jsonPath = "/user/res/clocks/momo.json";
+             const std::string jsonPath = "/user/res/clocks/dialconfig/momo.json";
              g_pDigital_clockView->setJsonFilePath(jsonPath);
 -            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE);
 +            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
          }
          if (strcmp(view.GetViewId(), "maliaobutton") == 0)
          {
              // printf("join click\n");
-             const std::string jsonPath = "/user/res/clocks/maliao.json";
+             const std::string jsonPath = "/user/res/clocks/dialconfig/maliao.json";
              g_pDigital_clockView->setJsonFilePath(jsonPath);
 -            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE);
 +            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
          }
  #endif
          return true;