From: hcj <1224667075@qq.com> Date: Tue, 10 Sep 2024 11:27:43 +0000 (+0800) Subject: 增加2ae6兼容原协议内容 X-Git-Tag: release_V1.2.70_20241020_135402~505^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F933%2Fhead;p=mirrors%2FFD230.git 增加2ae6兼容原协议内容 --- 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 70270312d..4c527aded 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c @@ -90,8 +90,6 @@ static ble_read_data handle_l[MAX_HANDLE_NUM]={0}; errcode_t cancel_recv_file(ble_read_data *buffer_handle); - - uint8_t ble_dial_file_count=0; uint8_t ble_dial_file_index=0; uint8_t *bigDataBuf = NULL;//大数据buf @@ -707,7 +705,11 @@ void getPhoneNameLen(uint8_t *data,uint8_t *datalen,uint8_t *type)//获取手机 } cJSON* tp = cJSON_GetObjectItem(root, "tp"); *type=tp->valueint; + cJSON* bond=cJSON_GetObjectItem(root, "bond"); + if(bond) + { + } *datalen = len; cJSON_Delete(root); } else{ @@ -7024,6 +7026,18 @@ void type2AE6Data(ble_read_data *buffer_handle,uint8_t *cmd_buf ,uint8_t *data,u } break; + case OTA_FILE_RECV_CMD:// + { + if (decode_ota_json( buffer_handle) == ERRCODE_SUCC) + { + ble_reply_cmd(OTA_FILE_RECV_CMD,1); + }else{ + ble_reply_cmd(OTA_FILE_RECV_CMD,2); + } + } + break; + + case DIAL_COLLECT_FILE_CMD : { if (decode_dial_info( buffer_handle) == ERRCODE_SUCC) @@ -7057,6 +7071,9 @@ void type2AE6Data(ble_read_data *buffer_handle,uint8_t *cmd_buf ,uint8_t *data,u } } break; + case FILE_CHECKSUM_RECV_CMD: + decode_file_checksum(buffer_handle); + break; // case OTA_FILE_DATA_CMD : // { // if (decode_ota_data( buffer_handle,data,datalen, crcvalue) == ERRCODE_SUCC)