From: Caisking <3449750381@qq.com> Date: Mon, 8 Jan 2024 03:14:43 +0000 (+0800) Subject: 关闭测试串口打印,优化json X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=1832792a64769911509decd27c4cfd270c095f84;p=mirrors%2FFD230.git 关闭测试串口打印,优化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 8e62ef262..d31171352 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 @@ -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 b4fdc0d1e..a6b43f922 100644 --- 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": { "timeformat": "24format", "digitsize": 60, - "playformat":"textdisplay", + "playformat": "textdisplay", "fontsize": 50, "textdisplay": { "coordinates": { @@ -65,5 +65,7 @@ }, "heartrate": {}, "step": {}, - "backgroundimagesPath": "/user/res/clocks/KUMI/background.bin" + "background": { + "backgroundimagesPath": "/user/res/clocks/KUMI/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/flowerbud.json b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/flowerbud.json index 427d80a09..2cfe28232 100644 --- 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 5b5e46584..052f43782 100644 --- 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/", "digits": { "timeformat": "24format", - "playformat":"picturesdisplay", + "playformat": "picturesdisplay", "digitspath": "/user/res/clocks/maliao/", "digitsize": 40, "picturesdisplay": { @@ -65,5 +65,7 @@ }, "heartrate": {}, "step": {}, - "backgroundimagesPath": "/user/res/clocks/maliao/background.bin" + "background": { + "backgroundimagesPath": "/user/res/clocks/maliao/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/maomao.json b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/clocks/maomao.json index 72ee39cb4..eee310295 100644 --- 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", "playformat": "picturesdisplay", "digitspath": "/user/res/clocks/maomao/", - "digitsize": 56, + "digitsize": 52, "picturesdisplay": { "coordinates": { "left": 112, 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 dd7fdf999..b68eb54ff 100644 --- 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 @@ }, "heartrate": {}, "step": {}, - "backgroundimagesPath": "/user/res/clocks/momo/background.bin" + "background": { + "backgroundimagesPath": "/user/res/clocks/momo/background.bin" + } } \ No newline at end of file