From 94e6b1766fc02a0cf49b31c5d7ac57df17ce2945 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=83=A1=E4=BC=A0=E5=86=9B?= <1224667075@qq.com> Date: Thu, 22 Aug 2024 03:53:53 +0000 Subject: [PATCH] Merge #757 into sdk602patch0626 from refs/changes/757/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 胡传军 * refs/changes/757/head: (3 commits squashed) - 日程bug修复 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626 - 日程bug修复 Signed-off-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/757 --- .../service/ble_service/blemoder/bletest.cpp | 4 ++ .../service/ble_service/bleservice/bleEvent.c | 52 ++++++++++++------- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp index b145f9ae0..b9ff6eafd 100644 --- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp +++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp @@ -102,6 +102,8 @@ bool Ble_Set_ScheduleInfo(uint8_t id,uint32_t timetamp_begin,uint32_t timetamp_e info.id=id; info.timetamp_begin=timetamp_begin; info.timetamp_end=timetamp_end; + info.titel.clear(); + info.content.clear(); info.titel.append(title,strlen(title)+1); info.content.append(data,strlen(data)+1); @@ -113,6 +115,8 @@ bool Ble_Set_ScheduleInfo(uint8_t id,uint32_t timetamp_begin,uint32_t timetamp_e printf("content:%s\r\n",info.content.c_str()); printf("//////////////////////////////////////////////\r\n"); + return true; + } 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 fb0ecb8b1..561d3995a 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c @@ -919,6 +919,7 @@ void cleanUnbindInfor(uint8_t flag)//和旧手机解绑清除配对信息 gap_ble_disconnect_remote_device(&disconect_addr);//与固定的mac设置地址进行断开连接 if (flag == 1){ errcode_t ret= gap_ble_remove_pair(&disconect_addr);//清除配对信息 + gap_ble_remove_all_pairs(); bool ret_flag = gap_remove_all_pairs(); printf("ret_flag:%d ret:%x\r\n",ret_flag,ret); @@ -2492,11 +2493,16 @@ bool bin_Check_schedule(uint8_t *data,uint16_t len) { uint16 offset=0; uint16 buf_len=0; + // for(int i=0;i=len) break; @@ -2508,6 +2514,7 @@ 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); offset+=buf_len; if(offset>=len) @@ -2523,6 +2530,7 @@ bool bin_Check_schedule(uint8_t *data,uint16_t len) offset+=4; if(offset>=len) break; + uint32_t timetemp_end=0; memcpy_s(&timetemp_end,4,&data[offset],4); offset+=4; @@ -2531,34 +2539,42 @@ bool bin_Check_schedule(uint8_t *data,uint16_t len) memcpy_s(&buf_len,2,&data[offset],2); offset+=2; - if(offset>=len) - break; - - char *data=(char*)malloc(buf_len+1); - memset_s(data,512,0,buf_len+1); - memcpy_s(data,512,&data[offset],buf_len); - - offset+=buf_len; - if(offset>=len) + if(buf_len==0) { + printf("%d %d\r\n",offset,len); + Ble_Set_ScheduleInfo(id,timetemp_begin,timetemp_end,title,"0"); if(title) { free(title); } - if(data) - { - free(data); - } + continue; + } + if(offset>=len) + { break; } - Ble_Set_ScheduleInfo(id,timetemp_begin,timetemp_end,title,data); + + + char *str_=(char*)malloc(buf_len+1); + memset_s(str_,512,0,buf_len+1); + memcpy_s(str_,512,&data[offset],buf_len); + + + Ble_Set_ScheduleInfo(id,timetemp_begin,timetemp_end,title,str_); + + offset+=buf_len; + if(title) { free(title); } - if(data) + if(str_) { - free(data); + free(str_); + } + if(offset>=len) + { + break; } } -- 2.17.1