From: xue <2144439972@qq.com>
Date: Tue, 26 Aug 2025 12:56:27 +0000 (+0800)
Subject: 修复蓝牙绑定流程
X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~150
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=150d7d49a79dc24c62213dc90bc7da46c0aa5cc6;p=mirrors%2FFD230.git

修复蓝牙绑定流程
---

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialModel.h
index 9e993c3e7..3df08cfc7 100644
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialModel.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialModel.h
@@ -4,6 +4,19 @@
 #include "AppViewIDs.h"
 #include "SetDialInfo.h"
 
+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+void ble_dial_init(void);
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
 namespace OHOS
 {
     // 表盘类型
diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index 5739b17ed..904f1f793 100644
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -785,7 +785,7 @@ target = {
                         "bp_sensor",
                            ],
 		'image_analysis': False,
-		'fs_image_path':'evb',
+		'fs_image_path':'w9',
 		'fs_image': True
     },
     'brandy-native-js-w9-r': {
@@ -1032,7 +1032,7 @@ target = {
                             "gyro",
                            ],
 		'image_analysis': False,
-		'fs_image_path':'fd230',
+		'fs_image_path':'n9',
         'ssb_version': 'brandy-native-js-n9-ssb',
 		# 'fs_image_path':'evb',
 		'fs_image': True
diff --git a/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp b/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp
index aa27fd9bd..690c28bec 100644
--- a/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp
+++ b/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp
@@ -15,7 +15,7 @@
 
 void ble_instruct_init(void)
 {
-    //ble_dial_init();
+    ble_dial_init();
 
     ble_alarm_init();
 
diff --git a/code/sdk/zhihui/services/ble_service/bleservice/bleService.c b/code/sdk/zhihui/services/ble_service/bleservice/bleService.c
index a88bda4e0..929be5c29 100644
--- a/code/sdk/zhihui/services/ble_service/bleservice/bleService.c
+++ b/code/sdk/zhihui/services/ble_service/bleservice/bleService.c
@@ -1354,7 +1354,7 @@ static void svr_ble_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid,
         srv_ble_add_chart_decr_andriod(server_id,srv_handle);//对18e0这个服务进行添加andiod特征值和描述符
           WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "srv_ble_add_chart_decr_andriod \r\n");
 
-        // srv_ble_add_chart_decr_battery(server_id,srv_handle);//电池电量特征值
+         srv_ble_add_chart_decr_battery(server_id,srv_handle);//电池电量特征值
          WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "srv_ble_add_chart_decr_battery \r\n");
         srv_ble_add_chart_decr_short_cmd(server_id,srv_handle);
          WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "srv_ble_add_chart_decr_short_cmd \r\n");