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

diff --cc code/sdk/application/wearable/nativeapp/nativeui/dial/src/DialPresenter.cpp
index ebf098d,f125fa5..8956199
--- 1/code/sdk/application/wearable/nativeapp/nativeui/dial/src/DialPresenter.cpp
--- 2/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)\r
          {\r
              // printf("join click\n");\r
-             const std::string jsonPath = "/user/res/clocks/KUMI.json";\r
+             const std::string jsonPath = "/user/res/clocks/dialconfig/KUMI.json";\r
              g_pDigital_clockView->setJsonFilePath(jsonPath);\r
 -            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE);\r
 +            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);\r
          }\r
          if (strcmp(view.GetViewId(), "flowerbudbutton") == 0)\r
          {\r
              // printf("join click\n");\r
-             const std::string jsonPath = "/user/res/clocks/flowerbud.json";\r
+             const std::string jsonPath = "/user/res/clocks/dialconfig/flowerbud.json";\r
              g_pDigital_clockView->setJsonFilePath(jsonPath);\r
 -            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE);\r
 +            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);\r
          }\r
          if (strcmp(view.GetViewId(), "maomaobutton") == 0)\r
          {\r
              // printf("join click\n");\r
-             const std::string jsonPath = "/user/res/clocks/maomao.json";\r
+             const std::string jsonPath = "/user/res/clocks/dialconfig/maomao.json";\r
              g_pDigital_clockView->setJsonFilePath(jsonPath);\r
 -            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE);\r
 +            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);\r
          }\r
          if (strcmp(view.GetViewId(), "momobutton") == 0)\r
          {\r
              // printf("join click\n");\r
-             const std::string jsonPath = "/user/res/clocks/momo.json";\r
+             const std::string jsonPath = "/user/res/clocks/dialconfig/momo.json";\r
              g_pDigital_clockView->setJsonFilePath(jsonPath);\r
 -            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE);\r
 +            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);\r
          }\r
          if (strcmp(view.GetViewId(), "maliaobutton") == 0)\r
          {\r
              // printf("join click\n");\r
-             const std::string jsonPath = "/user/res/clocks/maliao.json";\r
+             const std::string jsonPath = "/user/res/clocks/dialconfig/maliao.json";\r
              g_pDigital_clockView->setJsonFilePath(jsonPath);\r
 -            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE);\r
 +            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);\r
          }\r
  #endif\r
          return true;\r