From: hcj <1224667075@qq.com> Date: Wed, 26 Jun 2024 11:04:51 +0000 (+0800) Subject: 修改数据64为32 X-Git-Tag: release_V1.2.70_20241020_135402~948^2~2^2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F382%2Fhead;p=mirrors%2FFD230.git 修改数据64为32 --- 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 f05200931..0381dc7b2 100644 --- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp +++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp @@ -577,7 +577,7 @@ uint32_t tar_rmove(char *tar_path) return 0; } -char * tar_dir_to_json_buf_malloc_(char* file_name,uint64_t *file_size) +char * tar_dir_to_json_buf_malloc_(char* file_name,uint32_t *file_size) { char dir_path[128]={0}; sprintf_s(dir_path,128,"%s",TAR_PATH); diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h index 8869e106a..3a4749d7b 100644 --- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h +++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h @@ -240,7 +240,7 @@ void ble_set_password(uint8_t falg, char * data); uint8_t ble_get_password(void); ///////////////////////文件传输////////////////////////// -char * tar_dir_to_json_buf_malloc_(char* file_name,uint64_t *file_size); +char * tar_dir_to_json_buf_malloc_(char* file_name,uint32_t *file_size); void get_tar_dir_file_count(void); 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 82d312436..49edcb441 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c @@ -3931,7 +3931,7 @@ static void GetPasswordCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *tota #define AI_RECORD_PATH "/user/userdata/AiRecording/AIAudio.pcm" -bool get_AI_PATH_and_size(char *path,uint64_t *size) +bool get_AI_PATH_and_size(char *path,uint32_t *size) { memcpy((void*)path,AI_RECORD_PATH,strlen(AI_RECORD_PATH)); FILE *fp= fopen(path,"r+"); @@ -3965,7 +3965,7 @@ static void GetAiRecordCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *tota memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); char file_name[64]={0}; - uint64_t file_size=0; + uint32_t file_size=0; if(get_AI_PATH_and_size(file_name,&file_size)) { int num=(ble_nus_max_data_len-18); @@ -5821,7 +5821,7 @@ static errcode_t install_dial(void) } static char file_name[128]={0}; -static uint64_t file_size=0; +static uint32_t file_size=0; bool Read_tar_file_buf_send_Data(uint16_t pack_size,uint8_t id) {