From: 袁清梦 <3449750381@qq.com>
Date: Sat, 16 Nov 2024 03:10:54 +0000 (+0000)
Subject: Merge #1409 into sdk602patch0911 from refs/changes/1409/head
X-Git-Tag: fd230_release_V1.3.102~73^2~1
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=12ddd605b5a3864c530182e0b71cbd532ccb3745;p=mirrors%2FFD230.git

Merge #1409 into sdk602patch0911 from refs/changes/1409/head

Code review from 袁清梦

* refs/changes/1409/head: (8 commits squashed)

  - 训练：优化最后的训练强度数据

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

  - release V1.3.87

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

  - 表盘：修复表盘离线之后再次同步不更新的bug

  - 表盘：修复活力表盘

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1409
---

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
index ab0a71d0c..df453288a 100644
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
@@ -1435,8 +1435,8 @@ errcode_t svr_ble_read_data_value_updata_noyify(void)//2ae2
     data_info.value = battery_point_val;
     data_info.value_len = 20;
 
-    if (g_ble_conn_id == 0)
-    return 0;
+    // if (g_ble_conn_id == 0)
+    // return 0;
      
      ret = gatts_notify_indicate(g_ble_server_id, g_ble_conn_id, &data_info);
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "gatts_notify_indicate ret:0x%x. serverid:%u,conn_id:%u,handle:%u.data_len:%d", ret, g_ble_server_id,
diff --git a/tools/dial_converter_tool/dial_lzma/128/vibrantnumber.lzma b/tools/dial_converter_tool/dial_lzma/128/vibrantnumber.lzma
index c003d38ff..ee0899400 100644
Binary files a/tools/dial_converter_tool/dial_lzma/128/vibrantnumber.lzma and b/tools/dial_converter_tool/dial_lzma/128/vibrantnumber.lzma differ
diff --git a/tools/dial_converter_tool/instance/128/vibrantnumber.xml b/tools/dial_converter_tool/instance/128/vibrantnumber.xml
index 6b3d37180..68af9f872 100644
--- a/tools/dial_converter_tool/instance/128/vibrantnumber.xml
+++ b/tools/dial_converter_tool/instance/128/vibrantnumber.xml
@@ -1,10 +1,19 @@
-<dial title="vibrantnumber" description="活力数字" size="466 466" version="1.0" preview_img="./instance/128/vibrantnumber.png">
+<dial title="vibrantnumber" description="活力数字" size="466 466" version="1.0"
+    preview_img="./instance/128/vibrantnumber.png">
 
 
-    <option_img position="66 209" img_names="./instance/128/nums/g_0.png,./instance/128/nums/g_1.png,./instance/128/nums/g_2.png,./instance/128/nums/g_3.png,./instance/128/nums/g_4.png,./instance/128/nums/g_5.png,./instance/128/nums/g_6.png,./instance/128/nums/g_7.png,./instance/128/nums/g_8.png,./instance/128/nums/g_9.png" bind_data="28" ></option_img>
-    <option_img position="233 209" img_names="./instance/128/nums/g_0.png,./instance/128/nums/g_1.png,./instance/128/nums/g_2.png,./instance/128/nums/g_3.png,./instance/128/nums/g_4.png,./instance/128/nums/g_5.png,./instance/128/nums/g_6.png,./instance/128/nums/g_7.png,./instance/128/nums/g_8.png,./instance/128/nums/g_9.png" bind_data="29" ></option_img>
+    <option_img position="66 209"
+        img_names="./instance/128/nums/g_0.png,./instance/128/nums/g_1.png,./instance/128/nums/g_2.png,./instance/128/nums/g_3.png,./instance/128/nums/g_4.png,./instance/128/nums/g_5.png,./instance/128/nums/g_6.png,./instance/128/nums/g_7.png,./instance/128/nums/g_8.png,./instance/128/nums/g_9.png"
+        bind_data="28" period="10"></option_img>
+    <option_img position="233 209"
+        img_names="./instance/128/nums/g_0.png,./instance/128/nums/g_1.png,./instance/128/nums/g_2.png,./instance/128/nums/g_3.png,./instance/128/nums/g_4.png,./instance/128/nums/g_5.png,./instance/128/nums/g_6.png,./instance/128/nums/g_7.png,./instance/128/nums/g_8.png,./instance/128/nums/g_9.png"
+        bind_data="29" period="10"></option_img>
 
-    <option_img position="66 43" img_names="./instance/128/nums/w_0.png,./instance/128/nums/w_1.png,./instance/128/nums/w_2.png,./instance/128/nums/w_3.png,./instance/128/nums/w_4.png,./instance/128/nums/w_5.png,./instance/128/nums/w_6.png,./instance/128/nums/w_7.png,./instance/128/nums/w_8.png,./instance/128/nums/w_9.png" bind_data="26" ></option_img>
-    <option_img position="233 43" img_names="./instance/128/nums/w_0.png,./instance/128/nums/w_1.png,./instance/128/nums/w_2.png,./instance/128/nums/w_3.png,./instance/128/nums/w_4.png,./instance/128/nums/w_5.png,./instance/128/nums/w_6.png,./instance/128/nums/w_7.png,./instance/128/nums/w_8.png,./instance/128/nums/w_9.png" bind_data="27" ></option_img>
+    <option_img position="66 43"
+        img_names="./instance/128/nums/w_0.png,./instance/128/nums/w_1.png,./instance/128/nums/w_2.png,./instance/128/nums/w_3.png,./instance/128/nums/w_4.png,./instance/128/nums/w_5.png,./instance/128/nums/w_6.png,./instance/128/nums/w_7.png,./instance/128/nums/w_8.png,./instance/128/nums/w_9.png"
+        bind_data="26" period="10"></option_img>
+    <option_img position="233 43"
+        img_names="./instance/128/nums/w_0.png,./instance/128/nums/w_1.png,./instance/128/nums/w_2.png,./instance/128/nums/w_3.png,./instance/128/nums/w_4.png,./instance/128/nums/w_5.png,./instance/128/nums/w_6.png,./instance/128/nums/w_7.png,./instance/128/nums/w_8.png,./instance/128/nums/w_9.png"
+        bind_data="27" period="10"></option_img>
 
 </dial>
\ No newline at end of file