From: hcj <1224667075@qq.com> Date: Fri, 12 Jul 2024 10:43:13 +0000 (+0800) Subject: 增加ai数据字符长度 X-Git-Tag: release_V1.2.70_20241020_135402~792^2~25 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F514%2F1;p=mirrors%2FFD230.git 增加ai数据字符长度 --- 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 879b667db..94cb1612b 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c @@ -2014,9 +2014,9 @@ uint8_t binCheck_AI(uint8_t *buf,uint8_t *check,uint16_t len)//json 格式解析 memcpy_s(&txt_len,2,&buf[offset],2); offset+=2; - char txt_buf[128]={0}; - memcpy_s(txt_buf,128,&buf[offset],txt_len); - printf("binCheck_AI txtbuf:%s %d\r\n",txt_buf,txt_len); + char txt_buf[256]={0}; + memcpy_s(txt_buf,256,&buf[offset],txt_len); + printf("binCheck_AI Question txtbuf:%s %d\r\n",txt_buf,txt_len); ble_set_ai_Question_str(txt_buf); offset+=txt_len; //offset+=1; @@ -2029,24 +2029,38 @@ uint8_t binCheck_AI(uint8_t *buf,uint8_t *check,uint16_t len)//json 格式解析 offset+=2; - char txt_buf[128]={0}; - memcpy_s(txt_buf,128,&buf[offset],txt_len); - printf("binCheck_AI txtbuf %s %d\r\n",txt_buf,txt_len); + if(txt_len>=1024*3) + txt_len=1024*3; + + char *txt_buf=(char*)malloc(txt_len+1); + if(txt_buf==NULL) + { + printf("binCheck_AI txtbuf malloc fail\r\n"); + ble_set_ai_Answer_str("手表缓存不足"); + return 0; + } + + txt_buf[txt_len]=0; + memcpy_s((char *)txt_buf,1024*3,&buf[offset],txt_len); + + printf("binCheck_AI txtbuf Answer %s %d\r\n",txt_buf,txt_len); ble_set_ai_Answer_str(txt_buf); + free(txt_buf); + offset+=txt_len; //offset+=1; - } - if(offset>=len) - { - break; } if(buf[offset]==0) { printf("AI 解析失败\r\n"); - offset++; - break; } - offset++; + + if(offset>=len) + { + break; + } + offset++; + } *check = 1; @@ -6045,6 +6059,7 @@ errcode_t cancel_recv_file(ble_read_data *buffer_handle) static uint8_t timer_flie_type=0; static uint32_t timer_flie_flag=0; +ble_read_data* ble_read_timer_p=NULL; static void ble_transfer_Timer_CallBack(int data) { timer_flie_flag--; @@ -6063,6 +6078,23 @@ static void ble_transfer_Timer_CallBack(int data) { TRANSMIT_DATA=TRANS_FREE; } + // if (ble_read_timer_p->file_recv_stat.recv_file_stat != 2) //已经下载完毕的文件,没有必要cancel了。 + // { + + // if (ble_read_timer_p->file_recv_stat.file!=NULL) + // { + // fclose(ble_read_timer_p->file_recv_stat.file); + // ble_read_timer_p->file_recv_stat.file = NULL; + // } + // if (ble_read_timer_p->file_recv_stat.file_name != NULL) + // { + // free(ble_read_timer_p->file_recv_stat.file_name); + // ble_read_timer_p->file_recv_stat.file_name=NULL; + // } + // ble_read_timer_p->file_recv_stat.recv_file_stat = -1; + + // ble_reply_cmd(FILE_RECV_REPLY_STAT_CMD,0);//接收失败 + // } CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1); if(BR_TRANSFER_timer) { @@ -6183,7 +6215,8 @@ errcode_t handle_recv_file(ble_read_data *buffer_handle,uint8_t *data, uint16_t BR_TRANSFER_timer = NULL; } timer_flie_type=buffer_handle->file_recv_stat.file_type; - timer_flie_flag=3; + ble_read_timer_p=buffer_handle; + timer_flie_flag=10; BR_TRANSFER_timer = osTimerNew((osTimerFunc_t)ble_transfer_Timer_CallBack, osTimerPeriodic, NULL, NULL); tick =1000;// osMs2Tick(1000); @@ -6195,10 +6228,7 @@ errcode_t handle_recv_file(ble_read_data *buffer_handle,uint8_t *data, uint16_t return ERRCODE_FAIL; } /////////////////////////////////////////////////////////// - - } - if (buffer_handle->file_recv_stat.file == NULL) { printf("6194 buffer_handle->file_recv_stat.file \n");