增加 连接状态改变(补)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothModel.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothModel.h
index e02a1ec..679b451 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothModel.h
@@ -132,7 +132,7 @@ void bluetooth_init(void);
 void InitBluetoothInfo(void);\r
 void bluetooth_enable_all(void);\r
 void bluetooth_close_all(void);\r
-void bluetooth_set_auto_reconnect(uint8_t flag);\r
+void bluetooth_set_auto_reconnect_closed(uint8_t flag);\r
 \r
 int uapi_a2dp_snk_get_device_connect_state(void);\r
 int uapi_a2dp_snk_connect(void);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
index f7935fd..7916973 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
@@ -120,7 +120,7 @@ void InitBluetoothInfo(void)
     }    \r
 }\r
 //1关 0开\r
-void bluetooth_set_auto_reconnect(uint8_t flag)\r
+void bluetooth_set_auto_reconnect_closed(uint8_t flag)\r
 {\r
     bts_feature_t bts_feature = { 0 };\r
     bts_feature.bt_auto_reconnect_closed = flag;\r
@@ -137,7 +137,7 @@ static int bluetooth_init_all(void)
     errcode_t ret;\r
     // 设置自动回连，ios一键双连依赖此配置\r
    \r
-    bluetooth_set_auto_reconnect(1);\r
+    bluetooth_set_auto_reconnect_closed(1);\r
 \r
     ret = enable_bt_stack();\r
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "bt enable_bt_stack ret = %u", ret);\r
@@ -198,12 +198,11 @@ void bluetooth_enable_all(void)
 \r
         errcode_t ret;\r
         // 设置自动回连，ios一键双连依赖此配置\r
-        // bts_feature_t bts_feature = { 0 };\r
-        // bts_feature.bt_auto_reconnect_closed = 1;\r
-        // ret = bts_set_features(&bts_feature);\r
-\r
-        //WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "bt bts_set_features ret = %u", ret);\r
-        gap_ble_sec_params_t sec_param = { 1, GAP_BLE_IO_CAPABILITY_NOINPUTNOOUTPUT, 1, GAP_BLE_GAP_SECURITY_MODE1_LEVEL3 };\r
+        bts_feature_t bts_feature = { 0 };\r
+        bts_feature.bt_auto_reconnect_closed = 0;\r
+        ret = bts_set_features(&bts_feature);\r
+        WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "bt bts_set_features ret = %u", ret);\r
+    // gap_ble_sec_params_t sec_param = { 1, GAP_BLE_IO_CAPABILITY_NOINPUTNOOUTPUT, 1, GAP_BLE_GAP_SECURITY_MODE1_LEVEL3 };\r
         gap_ble_sec_params_t sec_param = { 1, GAP_BLE_IO_CAPABILITY_NOINPUTNOOUTPUT, 0, GAP_BLE_GAP_SECURITY_MODE1_LEVEL2 };\r
         ret = gap_ble_set_sec_param(&sec_param);\r
         WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "bt gap_ble_set_sec_param ret = %u", ret);\r

diff --git a/code/sdk/drivers/peripheral/config/include/ConfigModel.h b/code/sdk/drivers/peripheral/config/include/ConfigModel.h
index 7d71a52..11cf5c5 100644 (file)
--- a/code/sdk/drivers/peripheral/config/include/ConfigModel.h
+++ b/code/sdk/drivers/peripheral/config/include/ConfigModel.h
@@ -323,7 +323,7 @@ namespace OHOS
             {ConfigDataType::DATATYPE_INT,     "heartrate_remind",             "0"},// CONFIGMODEL_ITEM_HEARTRATE_REMIND//提醒开关
 
             {ConfigDataType::DATATYPE_INT,     "heartrate_threshold_value",  "0"},// CONFIGMODEL_ITEM_HEARTRATE_THRESHOLD_VALUE//
-            {ConfigDataType::DATATYPE_BOOL,     "heart_max_min",               "0"},// CONFIGMODEL_ITEM_HEARTRATE_MAX_MIN//最大值还是最小值
+            {ConfigDataType::DATATYPE_INT,     "heart_max_min",               "0"},// CONFIGMODEL_ITEM_HEARTRATE_MAX_MIN//最大值或者最小值
   
 
             {ConfigDataType::DATATYPE_INT,     "oxygen_freq",        "0"     },// CONFIGMODEL_ITEM_OXYGEN_DETECTED,//频率