修复蓝牙绑定流程

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 9e993c3..3df08cf 100644 (file)
--- 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 5739b17..904f1f7 100644 (file)
--- 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 aa27fd9..690c28b 100644 (file)
--- 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 a88bda4..929be5c 100644 (file)
--- 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特征值和描述符\r
           WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "srv_ble_add_chart_decr_andriod \r\n");\r
 \r
-        // srv_ble_add_chart_decr_battery(server_id,srv_handle);//电池电量特征值\r
+         srv_ble_add_chart_decr_battery(server_id,srv_handle);//电池电量特征值\r
          WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "srv_ble_add_chart_decr_battery \r\n");\r
         srv_ble_add_chart_decr_short_cmd(server_id,srv_handle);\r
          WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "srv_ble_add_chart_decr_short_cmd \r\n");\r