From: dxy <1731678236@qq.com>
Date: Fri, 12 Apr 2024 03:50:08 +0000 (+0800)
Subject: 合并冲突bleEvent.c
X-Git-Tag: release_V1.2.70_20241020_135402~1200^2~1
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=0163fa2b4519aa405d96444d661097c04b775d14;p=mirrors%2FFD230.git

合并冲突bleEvent.c
---

0163fa2b4519aa405d96444d661097c04b775d14
diff --cc code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index 74db90b9b,2f88f6760..71d2c97dd
--- a/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)//和旧手æ
      if(0!=remove(PHONE_WATCH_CONFIG_PATH))
      {
          printf("json remove fail\r\n");
-     } 
+     }
+     set_ble_falg(0);
 +    uapi_reboot_device();
  
- 
  }
  void sendBindInfor(uint8_t *crcnum)
  {