From: hcj <1224667075@qq.com>
Date: Fri, 27 Sep 2024 01:50:46 +0000 (+0800)
Subject: 修复ios配对问题
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=39c6e79d4630019dfc13fb69f9f20f7634f7374e;p=mirrors%2FFD230.git

修复ios配对问题
---

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 4e55dca60..e7ddd7b69 100644
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -712,10 +712,11 @@ void getPhoneNameLen(uint8_t *data,uint8_t *datalen,uint8_t *type)//获取手机
             printf("设备名称: %s len:%d\n", pn->valuestring,len);
         }
         cJSON* tp = cJSON_GetObjectItem(root, "tp");
-        if(tp && cJSON_IsNumber(pn))
+        if(tp && cJSON_IsNumber(tp))
         {
             *type=tp->valueint;
         }
+        printf("%d\r\n",type);
        
         cJSON* bond=cJSON_GetObjectItem(root, "bond");
         if(bond)
@@ -2800,18 +2801,15 @@ bool bin_Check_schedule(uint8_t *data,uint16_t len)
 {
     uint16 offset=0;
     uint16 buf_len=0;
-    // for(int i=0;i<len;i++)
-    // {
-    //     printf(" %02X",data[i]);
-    // }
-    // printf("\r\n");
     while (offset<len)
     {
-        uint8_t id;
-        id=data[offset]+data[offset+1];
+        uint16_t id;
+        memcpy_s(&id,2,&data[offset],2);
         offset+=2;
         if(offset>=len)
-        break;
+        {
+            break;
+        }
 
         memcpy_s(&buf_len,2,&data[offset],2);
         offset+=2;
@@ -2821,9 +2819,10 @@ bool bin_Check_schedule(uint8_t *data,uint16_t len)
         char *title=(char*)malloc(buf_len+1);
         memset_s(title,512,0,buf_len+1);
         memcpy_s(title,512,&data[offset],buf_len);
-        //printf("len:%d str %s\r\n",buf_len,title);
+        printf("len:%d str %s\r\n",buf_len,title);
 
         offset+=buf_len;
+
         if(offset>=len)
         {
             if(title)
@@ -2862,6 +2861,10 @@ bool bin_Check_schedule(uint8_t *data,uint16_t len)
         }
         if(offset>=len)
         {
+            if(title)
+            {
+                free(title);
+            }
             break;
         }