From: hcj <1224667075@qq.com> Date: Mon, 19 May 2025 06:41:38 +0000 (+0800) Subject: 增加应用市场协议部分 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~298^2~1^2~7 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=026d92b6baeff67975cc10f8ebf40721b7a92285;p=mirrors%2FFD230.git 增加应用市场协议部分 --- diff --git a/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.cpp b/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.cpp index 2c8566872..ecbebe9b1 100644 --- a/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.cpp +++ b/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.cpp @@ -1235,7 +1235,7 @@ void ble_bin_install(void) } -void ble_app_delete(char *data) +bool ble_app_delete(char *data) { return bleInstruct_t.ble_app_delete(data); } @@ -1246,6 +1246,11 @@ cJSON* ble_app_list(void) return bleInstruct_t.ble_app_list(); } +cJSON* ble_get_watch_msg(void) +{ + return bleInstruct_t.ble_get_watch_msg(); +} + #endif diff --git a/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.h b/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.h index 986520236..2ae025a8f 100644 --- a/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.h +++ b/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.h @@ -633,10 +633,12 @@ typedef struct bleInstruct void (*ble_bin_install)(void); - void (*ble_app_delete)(char * data); + bool (*ble_app_delete)(char * data); cJSON* (*ble_app_list)(void); + cJSON* (*ble_get_watch_msg)(void); + } bleInstruct_t_; extern bleInstruct_t_ bleInstruct_t; @@ -647,6 +649,10 @@ void ble_instruct_init(void); void ble_mp3_init(void); +bool ble_app_delete(char *data); + +cJSON* ble_app_list(void); + #ifdef __cplusplus #if __cplusplus } diff --git a/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c b/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c index d745430a0..dd706a85e 100644 --- a/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c +++ b/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c @@ -483,6 +483,47 @@ void send_big_data(ble_data_type type,char *data, uint16 datalen) ym_free(buf); // 释放内存空间 } +void send_long_data(char *buf, uint32_t pack_size,uint8_t type,uint8_t id) +{ + uint32_t data_len = strlen(buf); + uint32_t surplus_len=data_len; + uint32_t pack; + if(data_len%pack_size==0) + { + pack=data_len/pack_size; + } + else + { + pack=data_len/pack_size+1; + } + uint32_t pack_id=1; + uint32_t offset=0; + while (surplus_len!=0) + { + if(surplus_len>=pack_size) + { + surplus_len=surplus_len-pack_size; + + ble_data_type type_={type,id,data_len,pack,pack_id}; + send_big_data(type_,buf+offset,pack_size); + + //send_big_data(1,json_format+offset,pack_size,data_len,pack_id,pack,id,1); + offset+=pack_size; + } + else + { + + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%d %d %d %d\r\n",data_len,surplus_len,pack_id,pack); + ble_data_type type_={type,id,data_len,pack,pack_id}; + send_big_data(type_,buf+offset,surplus_len); + //send_big_data(1,json_format+offset,surplus_len,data_len,pack_id,pack,id,1); + break; + } + pack_id++; + } +} + + bool is_free_ota_update(uint32_t size) { @@ -7713,6 +7754,113 @@ bool Read_tar_file_buf_send_Data(uint16_t pack_size,uint8_t id) } +void delete_app(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t crcvalue) +{ + + if(Check_CRC(data,len,crcvalue)) + { + if(ble_app_delete(data)) + { + ble_reply_cmd(cmd,1); + } + else + { + ble_reply_cmd(cmd,2); + } + + } + else + { + ble_reply_cmd(cmd,0); + } + +} + +void get_app_list(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t crcvalue) +{ + + if(Check_CRC(data,len,crcvalue)) + { + cJSON *jdata=ble_app_list(); + + if(jdata) + { + + char *jsonString = cJSON_PrintUnformatted(jdata); + + if (jsonString == NULL) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"Error printing JSON to string\n"); + cJSON_Delete(jdata); + return; + } + + uint32_t data_len = strlen(jsonString); + cJSON_Delete(jdata); + + if (data_len == 0) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"Error: JSON string length is 0\n"); + return; + } + int num=(ble_nus_max_data_len-18); + if(num>482)num=482; + + send_long_data(jsonString,num,0x06,0x0E); + + cJSON_free(jsonString); + } + + + } + else + { + ble_reply_cmd(cmd,0); + } + +} + +void get_watch_msg(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t crcvalue) +{ + + if(Check_CRC(data,len,crcvalue)) + { + cJSON *jdata=ble_get_watch_msg(); + + if(jdata) + { + + char *jsonString = cJSON_PrintUnformatted(jdata); + + if (jsonString == NULL) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"Error printing JSON to string\n"); + cJSON_Delete(jdata); + return; + } + + uint32_t data_len = strlen(jsonString); + cJSON_Delete(jdata); + + if (data_len == 0) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"Error: JSON string length is 0\n"); + return; + } + int num=(ble_nus_max_data_len-18); + if(num>482)num=482; + + send_long_data(jsonString,num,0x06,0x0E); + + cJSON_free(jsonString); + } + + + } + else + { + ble_reply_cmd(cmd,0); + } + +} + + bool read_dir_send_json() { @@ -8195,7 +8343,21 @@ void type2AE6Data(ble_read_data *buffer_handle,uint8_t *cmd_buf ,uint8_t *data,u break; case OTA_FILE_FAIL_CMD : + break; + + case APP_DELETE_CMD : + delete_app( cmd, *data,datalen,crcvalue); + break; + case GET_LIST_CMD : + + get_app_list( cmd, *data,datalen,crcvalue); + + break; + case GET_APP_MSG_CMD: + get_watch_msg( cmd, *data,datalen,crcvalue); + + break; default: break; } diff --git a/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.h b/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.h index 52652927d..c0038997a 100644 --- a/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.h +++ b/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.h @@ -869,6 +869,10 @@ uint8_t Calculate_CRC_Big(uint8_t *data,uint16_t len);//计算20byte #define FILE_CANCEL_TRANSFER 0x060B #define BIN_FILE_CMD 0x060C +#define APP_DELETE_CMD 0x060D +#define GET_LIST_CMD 0x060E +#define GET_APP_MSG_CMD 0x060F + #ifdef __cplusplus } #endif