合并冲突bleEvent.c

diff --cc code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index 74db90b,2f88f67..71d2c97
--- 1/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
--- 2/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@@ -787,10 -751,9 +787,10 @@@ void cleanUnbindInfor(void)//å\92\8cæ\97§æ\89\8bæ
      if(0!=remove(PHONE_WATCH_CONFIG_PATH))\r
      {\r
          printf("json remove fail\r\n");\r
-     } \r
+     }\r
+     set_ble_falg(0);\r
 +    uapi_reboot_device();\r
  \r
- \r
  }\r
  void sendBindInfor(uint8_t *crcnum)\r
  {\r