Merge #1066 into sdk602patch0626 from refs/changes/1066/head

Code review from 胡传军

* refs/changes/1066/head: (5 commits squashed)

  - 天气数据解析增加安全防护 防止数组越界

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

  - ble解绑恢复出厂修改，仅清除配对，不做多余处理

  - ble 配对修改

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1066

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index fda66f2..882d371 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -606,6 +606,18 @@ errcode_t UnbindSucessCmd(uint8_t flag)//发送解绑指令,解绑界面调用
 \r
     return sendok;\r
 }\r
+\r
+void watch_clean_pairs(void)\r
+{\r
+    if(0!=remove(PHONE_WATCH_CONFIG_PATH))\r
+    {\r
+        printf("json remove fail\r\n");\r
+    }\r
+    gap_ble_remove_all_pairs(); \r
+    gap_remove_all_pairs();\r
+}\r
+ \r
+\r
 void getDeviceState(void)//获取设备状态\r
 {\r
      bd_addr_t addr={0};\r
@@ -633,6 +645,7 @@ void clearPaireFlag(uint8_t flag)
     sendBleData(value,19);\r
     \r
     UnbindSucessCmd(1);//1确认解绑;\r
+    \r
     do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_RESTORE_FACTORY_SETTING, NULL, 0);//恢复出厂\r
     //uapi_reboot_device();\r
 }\r
@@ -2790,7 +2803,7 @@ uint8_t read_jsonHistory_weather(void)
         fclose(fp);\r
         return 0;\r
     }\r
-    \r
+\r
     char *str = fgets((char *)buf,size + 1,fp);\r
     if(str!=NULL)\r
     {\r

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h
index 675d7bb..e46f192 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h
@@ -831,6 +831,8 @@ void reply_APP_SportPasueResetCmd(uint16_t time);
 
 void reply_APP_SportStopModeCmd(uint16_t time);
 
+void watch_clean_pairs(void);
+
 ///////////////////////////自定义文件传输协议/////////////////////////////
 #define OTA_FILE_MSG_CMD  0x0601 
 #define OTA_FILE_DATA_CMD 0x0602

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 a4fb0d0..a5be1cc 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
@@ -462,7 +462,7 @@ void svr_pair_result_cbt_cb(uint16_t conn_id, const bd_addr_t *addr, errcode_t s
                 if(get_br_is_pair())\r
                 {\r
                     bd_addr_t bdaddr={0};\r
-                    uapi_get_br_address(&addr);\r
+                    uapi_get_br_address(&bdaddr);\r
                     if(false==(bt_is_acl_connected(&bdaddr)))\r
                     {\r
                         if(cm_get_A2DP_switch() || cm_get_HFP_switch())\r
@@ -479,8 +479,6 @@ void svr_pair_result_cbt_cb(uint16_t conn_id, const bd_addr_t *addr, errcode_t s
                         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uapi_a2dp_snk_connect!!! \r\n");\r
                     }\r
                 }\r
-                int ret = gap_connect_remote_device(addr);\r
-                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_connect_remote_device!!! %X\r\n",ret);\r
             } \r
         }\r
         hand_watch_first_time_Paired();\r

diff --git a/code/sdk/drivers/peripheral/utils/custom_cmd_service.c b/code/sdk/drivers/peripheral/utils/custom_cmd_service.c
index 854b1a6..23a4bd0 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_cmd_service.c
+++ b/code/sdk/drivers/peripheral/utils/custom_cmd_service.c
@@ -149,7 +149,8 @@ static void custom_cmd_service_check_task(void const *arg)
         case CUSTOM_CMD_MSG_TYPE_RESTORE_FACTORY_SETTING:
             {
                 ble_Alipayunbind();
-                UnbindSucessCmd(1);//1确认解绑
+                // UnbindSucessCmd(1);//1确认解绑
+                watch_clean_pairs();
                 uapi_restore_factory_setting();
             }
             break;