关闭测试串口打印，优化json

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 8e62ef2..d311713 100644 (file)
--- a/code/sdk/application/wearable/nativeapp/nativeui/dial/src/Digital_clockView.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/dial/src/Digital_clockView.cpp
@@ -80,7 +80,7 @@ namespace OHOS
         {
             snprintf(buffer, sizeof(buffer), "%s%d.%s", basePath, i + 1, fileExtension);
             imagePaths[i] = strdup(buffer);
-            printf("imagePaths[%d]:%s\n", i, imagePaths[i]);
+            //printf("imagePaths[%d]:%s\n", i, imagePaths[i]);
         }
         return imagePaths;
     }
@@ -93,7 +93,7 @@ namespace OHOS
         }
         return false; // 其他情况
     }
-    
+
     void Digital_clockView::Initbackground()
     {
         // 初始化背景
@@ -491,6 +491,7 @@ namespace OHOS
             delete sweepClock1animator_;
             sweepClock1animator_ = nullptr;
         }
+        backgroundAnimator->Stop();
         delete container_;
         container_ = nullptr;
     }

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/KUMI.json
index b4fdc0d..a6b43f9 100644 (file)
--- 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/KUMI.json
@@ -4,7 +4,7 @@
     "digits": {\r
         "timeformat": "24format",\r
         "digitsize": 60,\r
-        "playformat":"textdisplay",\r
+        "playformat": "textdisplay",\r
         "fontsize": 50,\r
         "textdisplay": {\r
             "coordinates": {\r
@@ -65,5 +65,7 @@
     },\r
     "heartrate": {},\r
     "step": {},\r
-    "backgroundimagesPath": "/user/res/clocks/KUMI/background.bin"\r
+    "background": {\r
+        "backgroundimagesPath": "/user/res/clocks/KUMI/background.bin"\r
+    }\r
 }
\ No newline at end of file

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/flowerbud.json
index 427d80a..2cfe282 100644 (file)
--- 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/flowerbud.json
@@ -2,7 +2,7 @@
     "Dialtype": "digits",
     "digitspath": "/user/res/clocks/flowerbud/",
     "digits": {
-        "playformat":"picturesdisplay",
+        "playformat": "picturesdisplay",
         "timeformat": "24format",
         "digitsize": 60,
         "picturesdisplay": {
@@ -64,5 +64,7 @@
     },
     "heartrate": {},
     "step": {},
-    "backgroundimagesPath": "/user/res/clocks/flowerbud/background.bin"
+    "background": {
+        "backgroundimagesPath": "/user/res/clocks/flowerbud/background.bin"
+    }
 }
\ No newline at end of file

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/maliao.json
index 5b5e465..052f437 100644 (file)
--- 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/maliao.json
@@ -3,7 +3,7 @@
     "digitspath": "/user/res/clocks/maliao/",\r
     "digits": {\r
         "timeformat": "24format",\r
-        "playformat":"picturesdisplay",\r
+        "playformat": "picturesdisplay",\r
         "digitspath": "/user/res/clocks/maliao/",\r
         "digitsize": 40,\r
         "picturesdisplay": {\r
@@ -65,5 +65,7 @@
     },\r
     "heartrate": {},\r
     "step": {},\r
-    "backgroundimagesPath": "/user/res/clocks/maliao/background.bin"\r
+    "background": {\r
+        "backgroundimagesPath": "/user/res/clocks/maliao/background.bin"\r
+    }\r
 }
\ No newline at end of file

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/maomao.json
index 72ee39c..eee3102 100644 (file)
--- 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/maomao.json
@@ -5,7 +5,7 @@
         "timeformat": "24format",\r
         "playformat": "picturesdisplay",\r
         "digitspath": "/user/res/clocks/maomao/",\r
-        "digitsize": 56,\r
+        "digitsize": 52,\r
         "picturesdisplay": {\r
             "coordinates": {\r
                 "left": 112,\r

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/momo.json
index dd7fdf9..b68eb54 100644 (file)
--- 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/momo.json
@@ -79,5 +79,7 @@
     },\r
     "heartrate": {},\r
     "step": {},\r
-    "backgroundimagesPath": "/user/res/clocks/momo/background.bin"\r
+    "background": {\r
+        "backgroundimagesPath": "/user/res/clocks/momo/background.bin"\r
+    }\r
 }
\ No newline at end of file