From: Caisking <3449750381@qq.com>
Date: Sat, 20 Jan 2024 07:45:10 +0000 (+0800)
Subject: 优化json目录，更加方便json文件更新与配置:烧录目录：/user/res/clocks/dialconfig/
X-Git-Tag: release_V1.2.70_20241020_135402~1351^2~4
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=3b59059cfed58592bb21083c4032a4c6724f30c9;p=mirrors%2FFD230.git

优化json目录，更加方便json文件更新与配置:烧录目录：/user/res/clocks/dialconfig/
---

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/dial/include/Digital_clockView.h b/code/sdk/application/wearable/nativeapp/nativeui/dial/include/Digital_clockView.h
index 880bd356c..d5b4d55b1 100644
--- a/code/sdk/application/wearable/nativeapp/nativeui/dial/include/Digital_clockView.h
+++ b/code/sdk/application/wearable/nativeapp/nativeui/dial/include/Digital_clockView.h
@@ -297,7 +297,7 @@ namespace OHOS
         const char **imagePaths;
         std::string digitspath;
         std::string stringtime;
-        std::string JosnfilePath = "/user/res/clocks/default.json";
+        std::string JosnfilePath = "/user/res/clocks/dialconfig/default.json";
     };
 } // namespace OHOS
 #endif // Digital_clock_PRESENTER_H
diff --git a/code/sdk/application/wearable/nativeapp/nativeui/dial/src/DialPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/dial/src/DialPresenter.cpp
index 5ffd7f6d6..f125fa5b6 100644
--- a/code/sdk/application/wearable/nativeapp/nativeui/dial/src/DialPresenter.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/dial/src/DialPresenter.cpp
@@ -97,35 +97,35 @@ namespace OHOS
         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);
         }
         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);
         }
         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);
         }
         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);
         }
         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);
         }
diff --git a/code/sdk/application/wearable/nativeapp/nativeui/dial/src/Digital_clockView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/dial/src/Digital_clockView.cpp
index 7f35ff5fd..528659b42 100644
--- a/code/sdk/application/wearable/nativeapp/nativeui/dial/src/Digital_clockView.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/dial/src/Digital_clockView.cpp
@@ -46,7 +46,7 @@ namespace OHOS
      */
     void Digital_clockView::setJsonFilePath(const std::string &filePath)
     {
-        std::string defaultFile = "/user/res/clocks/default.json";
+        std::string defaultFile = "/user/res/clocks/dialconfig/default.json";
         std::ifstream sourceFile(filePath, std::ios::binary);                      // 打开源文件
         std::ofstream targetFile(defaultFile, std::ios::binary | std::ios::trunc); // 打开目标文件，使用trunc标志来覆盖目标文件
         //("%s|%s\n", defaultFile.c_str(), filePath.c_str());                  // 使用c_str()将std::string转换为C风格字符串
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/KUMI.json b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/dialconfig/KUMI.json
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/KUMI.json
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/dialconfig/KUMI.json
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/default.json b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/dialconfig/default.json
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/default.json
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/dialconfig/default.json
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/flowerbud.json b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/dialconfig/flowerbud.json
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/flowerbud.json
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/dialconfig/flowerbud.json
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/maliao.json b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/dialconfig/maliao.json
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/maliao.json
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/dialconfig/maliao.json
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/maomao.json b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/dialconfig/maomao.json
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/maomao.json
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/dialconfig/maomao.json
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/momo.json b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/dialconfig/momo.json
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/momo.json
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/dialconfig/momo.json