From 4c05bd0e0cefbe76308f2f38d956579a3f5596c7 Mon Sep 17 00:00:00 2001 From: hcj <1224667075@qq.com> Date: Sun, 20 Oct 2024 11:06:53 +0800 Subject: [PATCH] =?utf8?q?=E5=A2=9E=E5=8A=A0=E6=9C=80=E5=A4=A7=E6=95=B0?= =?utf8?q?=E9=87=8F=E8=A1=A8=E7=9B=98=E9=99=90=E5=88=B6=EF=BC=8C=E5=BE=85?= =?utf8?q?=E6=B5=8B=E8=AF=95=20=EF=BC=8C=E4=BF=AE=E6=94=B9BLE=E6=89=93?= =?utf8?q?=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../service/ble_service/blemoder/bletest.cpp | 207 +++--- .../service/ble_service/bleservice/bleEvent.c | 593 +++++++++--------- .../service/ble_service/bleservice/bleEvent.h | 4 +- 3 files changed, 412 insertions(+), 392 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 02935e1c1..3b6f5a53c 100644 --- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp +++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp @@ -91,6 +91,12 @@ extern "C" { #include "transmitting.h" #include "AlipayC.h" + +uint8_t get_dial_num() +{ + return OHOS::SetDialModel::GetInstance().GetDialCount(); +} + bool ble_is_Alipay_bind(void) { return is_Alipay_bind(); @@ -187,7 +193,7 @@ uint8_t * ble_get_sos_all_data_malloc(uint32_t *len) memcpy_s((void *)&data[offset],NUMBER_LEN,number,osal_strlen(number)); offset+=osal_strlen(number); - printf("sex:%d,name:%d,%s,number:%d,%s\r\n",sex,osal_strlen(name),name,osal_strlen(number),number); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"sex:%d,name:%d,%s,number:%d,%s\r\n",sex,osal_strlen(name),name,osal_strlen(number),number); } *len=offset; @@ -262,19 +268,19 @@ bool Ble_Set_ScheduleInfo(uint8_t id,uint32_t timetamp_begin,uint32_t timetamp_e info_.time.clear(); info_.time.append(time_buf,strlen(time_buf)); - printf("///////////////////日程数据////////////////////\r\n"); - printf("date:%s\r\n",info_.date.c_str()); - printf("time:%s\r\n",info_.time.c_str()); - printf("titel:%s\r\n",info_.topic.c_str()); - printf("content:%s\r\n",info_.content.c_str()); - printf("//////////////////////////////////////////////\r\n"); - //printf("delete_before_file now day%d %d %d\r\n ",y,m,d); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"///////////////////日程数据////////////////////\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"date:%s\r\n",info_.date.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"time:%s\r\n",info_.time.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"titel:%s\r\n",info_.topic.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"content:%s\r\n",info_.content.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"//////////////////////////////////////////////\r\n"); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"delete_before_file now day%d %d %d\r\n ",y,m,d); // OHOS::C_ScheduleSetByApp(&info_, id - 1, is_end); C_ScheduleSetByApp(&info_, id-1, is_end); if(is_end) - printf("////////////////////结束///////////////////\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"////////////////////结束///////////////////\r\n"); return true; } @@ -396,7 +402,7 @@ cJSON* ble_get_recs_data() //char file_path[128] = {0}; char timeday[12] = {0}; uapi_get_YYMMDD_Time_extend(timeday, '_',0); - printf("%s\r\n",timeday); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%s\r\n",timeday); //sprintf(file_path, "%s%s.bin", TRAINING_PATH_BLE, timeday); while(data=read_Trainingdata_data(timeday, i)) @@ -454,13 +460,13 @@ cJSON* ble_get_Trainingdata_by_timetamp(uint32_t timetamp) char timeday[24]={0}; sprintf_s(timeday,24,"%d_%02d_%02d",y,m,d); - printf("%s\r\n",timeday); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%s\r\n",timeday); while(data=read_Trainingdata_data(timeday, i)) { if(data!=NULL) { - printf("%d,%d\r\n",timetamp,data->st); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%d,%d\r\n",timetamp,data->st); int time_error= timetamp>data->st ? timetamp-data->st:data->st-timetamp; if(time_error<=2) { @@ -506,7 +512,7 @@ void Tag_read_ID3V2( FILE *fp) { // Get Header fseek(fp,10,SEEK_CUR); - printf("Tag_read_ID2V3\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"Tag_read_ID2V3\r\n"); for(int i=7;i>0;i--) { @@ -514,14 +520,14 @@ void Tag_read_ID3V2( FILE *fp) uint32_t size =fread(TAG_T.ID,4,1,fp); if(strcmp("TPE1",TAG_T.ID)==0) - printf("Header :%d %s\r\n",size,TAG_T.ID); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"Header :%d %s\r\n",size,TAG_T.ID); fread(TAG_T.Size,4,1,fp); size = TAG_T.Size[0]*0x100000000 + TAG_T.Size[1]*0x10000+ TAG_T.Size[2]*0x100 +TAG_T.Size[3]; if(strcmp("TPE1",TAG_T.ID)==0) - printf("Size :%d\r\n",size); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"Size :%d\r\n",size); fread(TAG_T.Flags,2,1,fp); @@ -531,7 +537,7 @@ void Tag_read_ID3V2( FILE *fp) { fread(Mp3Trailer.Artist,1,size,fp); - printf("data : %s\r\n",Mp3Trailer.Artist); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"data : %s\r\n",Mp3Trailer.Artist); } else { @@ -542,7 +548,7 @@ void Tag_read_ID3V2( FILE *fp) else { fread(buf,1,size,fp); - //printf("data : %s\r\n",buf); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"data : %s\r\n",buf); } } } @@ -597,11 +603,11 @@ char * dir_to_json_buf_malloc_(uint8_t type) int file_size; std::string realname =OHOS::MusicPlayerModel::GetInstance().getRealMusicNameById(i); sprintf_s(file_path,512,"%s/%s",dir_path,realname.c_str()); - printf("%s\r\n",file_path); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%s\r\n",file_path); FILE * fp = fopen(file_path,"rb+"); if(fp==NULL) { - printf(" fopen fail %s\r\n",file_path); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," fopen fail %s\r\n",file_path); return NULL; } if (fp != NULL) @@ -624,7 +630,7 @@ char * dir_to_json_buf_malloc_(uint8_t type) char *json_format = cJSON_PrintUnformatted(dataJSON); int pSize = cJSON_GetArraySize(dataJSON); cJSON_Delete(dataJSON); - printf("mp3 :%s\r\n",json_format); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"mp3 :%s\r\n",json_format); return json_format; } @@ -660,7 +666,7 @@ uint8_t ble_get_sleep_data(uint32_t file_size,uint8_t day_,uint8_t *data) FILE * fp = fopen(file_path,"rb+"); if(fp==NULL) { - printf(" fopen fail %s\r\n",file_path); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," fopen fail %s\r\n",file_path); } else { @@ -702,7 +708,7 @@ uint8_t ble_get_sleep_data(uint32_t file_size,uint8_t day_,uint8_t *data) if((read_size+1)!=sleep_file_size) { - printf(" fread fail read_size:%d!= sleep_file_size:%d \r\n",read_size,sleep_file_size); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," fread fail read_size:%d!= sleep_file_size:%d \r\n",read_size,sleep_file_size); } fclose(fp); @@ -764,7 +770,7 @@ uint8_t ble_get_sleep_data_dir(uint32_t *file_size,uint8_t day_) FILE * fp = fopen(file_path,"rb+"); if(fp==NULL) { - printf(" fopen fail %s\r\n",file_path); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," fopen fail %s\r\n",file_path); return file_count; } @@ -784,7 +790,7 @@ uint8_t ble_get_sleep_data_dir(uint32_t *file_size,uint8_t day_) FILE * fp = fopen(file_path,"rb+"); if(fp==NULL) { - printf(" fopen fail %s\r\n",file_path); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," fopen fail %s\r\n",file_path); return file_count; } if (fp != NULL) @@ -803,7 +809,7 @@ uint8_t ble_get_sleep_data_dir(uint32_t *file_size,uint8_t day_) FILE * fp = fopen(file_path,"rb+"); if(fp==NULL) { - printf(" fopen fail %s\r\n",file_path); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," fopen fail %s\r\n",file_path); return file_count; } uint32_t size=0; @@ -836,7 +842,7 @@ uint8_t ble_get_sleep_data_dir(uint32_t *file_size,uint8_t day_) } else { - printf(" opendir fail %s\r\n",dir_path); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," opendir fail %s\r\n",dir_path); return file_count; } closedir(dir); @@ -851,7 +857,7 @@ void ble_set_password(uint8_t falg, char * data) p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD_SWITCH,falg); p_ConfigModel->set_condigData_String(OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD,data); - printf("设置手表密码 %d %s \r\n",falg, data); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"设置手表密码 %d %s \r\n",falg, data); /*更新model密码配置*/ if(falg == 0) @@ -872,7 +878,7 @@ uint8_t ble_get_password(void) std::string str =p_ConfigModel->get_configData_string(OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD); uint8_t falg =p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD_SWITCH); - printf("获取手表密码 %d %s \r\n",falg,str.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"获取手表密码 %d %s \r\n",falg,str.c_str()); return falg; @@ -887,9 +893,9 @@ void set_sedent_param( msg_sedent_set_param_info_t * data) p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SEDENTARY_REMINDERTIME,data->sedent_time ); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SEDENTARY_INTERVAL,data->frequenc); - printf("开关:%d\r\n",data->sedent_on); - printf("久坐提醒时间段:%d\r\n",data->sedent_time); - printf("久坐提醒时间间隔(单位小时):%d\r\n",data->frequenc); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"开关:%d\r\n",data->sedent_on); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"久坐提醒时间段:%d\r\n",data->sedent_time); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"久坐提醒时间间隔(单位小时):%d\r\n",data->frequenc); set_sedentary_data(); return; @@ -1046,7 +1052,7 @@ void delete_before_file(uint8_t type) int m=timeinfo->tm_mon+1; int d=timeinfo->tm_mday; - printf("delete_before_file now day%d %d %d\r\n ",y,m,d); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"delete_before_file now day%d %d %d\r\n ",y,m,d); char path_[64]={0}; @@ -1087,7 +1093,7 @@ void delete_before_file(uint8_t type) if (ent->d_type == DT_REG || ent->d_type == DT_UNKNOWN ) // 普通文件 { int flag=0; - printf("%s\r\n",fileName.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%s\r\n",fileName.c_str()); int y_; int m_; int d_; @@ -1103,21 +1109,21 @@ void delete_before_file(uint8_t type) if(flag==0) { i=i+4; - printf("data %d\r\n",data); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"data %d\r\n",data); y_=y-data; flag++; } else if (flag==1) { i=i+2; - printf("data %d\r\n",data); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"data %d\r\n",data); m_=m-data; flag++; } else if (flag==2) { i=i+2; - printf("data %d\r\n",data); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"data %d\r\n",data); d_=d-data; flag++; } @@ -1131,11 +1137,11 @@ void delete_before_file(uint8_t type) char path_remove[64]={0}; sprintf_s(path_remove,64,"%s/%s",path_,fileName.c_str()); remove(path_remove); - printf("succ remove %s\r\n ",path_remove); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"succ remove %s\r\n ",path_remove); } else { - printf("is 30d %d\r\n ",(y_*24+m_)*30+d_); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"is 30d %d\r\n ",(y_*24+m_)*30+d_); } } @@ -1197,12 +1203,13 @@ char * ble_sywee_history(uint8_t day,uint16_t *len ,uint8_t type) uint32_t size=0; if(fp==NULL) { - printf(" fopen type %d %s fail\r\n",type,path_); + + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," fopen type %d %s fail\r\n",type,path_); if(day==0) { goto DAY_IS_0; } - //printf(" fopen type %d %s fail\r\n",type,path_); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," fopen type %d %s fail\r\n",type,path_); return NULL; } @@ -1216,11 +1223,11 @@ char * ble_sywee_history(uint8_t day,uint16_t *len ,uint8_t type) DAY_IS_0: - printf("size %d \r\n",size); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"size %d \r\n",size); char * buf=(char *)malloc(size+day_now_data_size); if(buf==NULL) { - printf("malloc fail\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"malloc fail\r\n"); return buf; } if(fp) @@ -1242,7 +1249,7 @@ char * ble_sywee_history(uint8_t day,uint16_t *len ,uint8_t type) struct tm *timeinfo; time(&currtime); timeinfo = localtime(&currtime); - printf("localtime %d",timeinfo->tm_min); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"localtime %d",timeinfo->tm_min); creationTime=creationTime-(timeinfo->tm_min*60)-(timeinfo->tm_sec); switch (type) @@ -1316,10 +1323,10 @@ char * ble_sywee_history(uint8_t day,uint16_t *len ,uint8_t type) } - // printf("fread %d \r\n",ret); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"fread %d \r\n",ret); for(int i=0;iset_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP,data.schedule); if(data.schedule) { - printf("开始时间:%d\r\n",data.bedtime_hour); - printf("开始时间:%d\r\n",data.bedtime_min); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"开始时间:%d\r\n",data.bedtime_hour); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"开始时间:%d\r\n",data.bedtime_min); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_BEDTIME,data.bedtime_hour<<16|data.bedtime_min); - printf("结束时间:%d\r\n",data.waketime_hour); - printf("结束时间:%d\r\n",data.waketime_min); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"结束时间:%d\r\n",data.waketime_hour); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"结束时间:%d\r\n",data.waketime_min); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_GET_UP,data.waketime_hour<<16|data.waketime_min); - printf("睡前提醒 %d\r\n",data.bedtime_alarm); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"睡前提醒 %d\r\n",data.bedtime_alarm); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_REMIND,data.bedtime_alarm); //更新睡眠配置 @@ -1368,23 +1375,23 @@ void ble_get_sleep_remind(msg_get_sleep_param_info_t *data) OHOS::ConfigModel *p_ConfigModel = OHOS::ConfigModel::GetInstance(); data->schedule = p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP); - printf("开关:%d\r\n",data->schedule); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"开关:%d\r\n",data->schedule); uint32_t bedtime= p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_BEDTIME); data->bedtime_hour=bedtime>>16; data->bedtime_min=bedtime&0x00ff; - printf("开始时间:%d\r\n",data->bedtime_hour); - printf("开始时间:%d\r\n",data->bedtime_min); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"开始时间:%d\r\n",data->bedtime_hour); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"开始时间:%d\r\n",data->bedtime_min); uint32_t wakettime= p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_GET_UP); data->waketime_hour=wakettime>>16; data->waketime_min=wakettime&0x00ff; - printf("结束时间:%d\r\n",data->waketime_hour); - printf("结束时间:%d\r\n",data->waketime_min); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"结束时间:%d\r\n",data->waketime_hour); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"结束时间:%d\r\n",data->waketime_min); data->bedtime_alarm= p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_REMIND); - printf("睡前提醒 %d\r\n",data->bedtime_alarm); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"睡前提醒 %d\r\n",data->bedtime_alarm); return; } @@ -1396,19 +1403,19 @@ void ble_get_sleep_remind(msg_get_sleep_param_info_t *data) void ble_set_drink_remind(msg_drink_info_t data) { OHOS::ConfigModel *p_ConfigModel = OHOS::ConfigModel::GetInstance(); - printf("开关:%d\r\n",data.drink_on); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"开关:%d\r\n",data.drink_on); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_DRINK,data.drink_on); if(data.drink_on) { - printf("目标:%d\r\n",data.goal); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"目标:%d\r\n",data.goal); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_DRINK_GOAL,data.goal); - printf("开始时间:%d\r\n",data.time_start); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"开始时间:%d\r\n",data.time_start); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_DRINK_START,data.time_start); if(data.drink_on==2) { - printf("结束时间:%d\r\n",data.time_end); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"结束时间:%d\r\n",data.time_end); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_DRINK_END,data.time_end); - printf("频率:%d\r\n",data.freq); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"频率:%d\r\n",data.freq); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_DRINK_FREQ,data.freq); } } @@ -1423,7 +1430,7 @@ void ble_get_drink_remind(msg_drink_info_t *data) if(data->drink_on) data->drink_on=1; - printf("开关:%d\r\n",data->drink_on); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"开关:%d\r\n",data->drink_on); return; } @@ -1508,13 +1515,13 @@ char * struct_to_json_buf_malloc_Alarm(void) for(int i=0;isrc); } - // printf("闹钟数据:%d\r\n",data.alarmTime); - // printf("闹钟数据:%d\r\n",data.repeatPeriod); - // printf("闹钟数据:%d\r\n",data.alarmClockEnable); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"闹钟数据:%d\r\n",data.alarmTime); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"闹钟数据:%d\r\n",data.repeatPeriod); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"闹钟数据:%d\r\n",data.alarmClockEnable); // i++; } else { - printf("获取闹钟失败\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"获取闹钟失败\r\n"); } cJSON_AddItemToObject(dataJSON,"alarms",data_arryJSON); @@ -1573,7 +1580,7 @@ char * struct_to_json_buf_malloc_Alarm(void) int pSize = cJSON_GetArraySize(dataJSON); cJSON_Delete(dataJSON); - printf("闹钟数据 :%s\r\n",json_format); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"闹钟数据 :%s\r\n",json_format); return json_format; } @@ -1587,7 +1594,7 @@ char * struct_to_json_buf_malloc_(uint8_t day) //char file_path[128] = {0}; char timeday[12] = {0}; uapi_get_YYMMDD_Time_extend(timeday, '_',day); - printf("%s\r\n",timeday); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%s\r\n",timeday); //sprintf(file_path, "%s%s.bin", TRAINING_PATH_BLE, timeday); while(data=read_Trainingdata_data(timeday, i)) @@ -1631,7 +1638,7 @@ char * struct_to_json_buf_malloc_(uint8_t day) char *json_format = cJSON_PrintUnformatted(dataJSON); int pSize = cJSON_GetArraySize(dataJSON); - printf("训练历史数据:%s\r\n",json_format); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"训练历史数据:%s\r\n",json_format); cJSON_Delete(dataJSON); return json_format; #else @@ -1694,7 +1701,7 @@ void get_tar_dir_file_count(void) uint32_t tar_rmove(char *tar_path) { - printf("remove %s\r\n",tar_path); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"remove %s\r\n",tar_path); if(0==remove(tar_path)) return 1; else @@ -1733,7 +1740,7 @@ char * tar_dir_to_json_buf_malloc_(char* file_name,uint32_t *file_size) FILE * fp = fopen(file_path,"rb+"); if(fp==NULL) { - printf(" fopen fail %s\r\n",file_path); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," fopen fail %s\r\n",file_path); return NULL; } if (fp != NULL) @@ -1761,7 +1768,7 @@ char * tar_dir_to_json_buf_malloc_(char* file_name,uint32_t *file_size) char *json_format = cJSON_PrintUnformatted(itemJSON); int pSize = cJSON_GetArraySize(dataJSON); - printf("文件数据:%s\r\n",json_format); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"文件数据:%s\r\n",json_format); cJSON_Delete(dataJSON); file_index++; @@ -1782,7 +1789,7 @@ char * tar_dir_to_json_buf_malloc_(char* file_name,uint32_t *file_size) } else { - printf("opendir fail\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"opendir fail\r\n"); } return NULL; } @@ -1796,7 +1803,7 @@ void add_addressbookToRead(char *data) { if(data == NULL) { - printf("Error: data is NULL\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"Error: data is NULL\n"); return; } @@ -1806,7 +1813,7 @@ void add_addressbookToRead(char *data) if(name == NULL) { - printf("Error: Unable to get name\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"Error: Unable to get name\n"); return; } @@ -1814,7 +1821,7 @@ void add_addressbookToRead(char *data) if(phone == NULL) { - printf("Error: Unable to get phone number\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"Error: Unable to get phone number\n"); return; } @@ -1870,26 +1877,26 @@ uint8_t ble_falg=0; void set_user_data(msg_user_info_t *data) { OHOS::ConfigModel *p_ConfigModel = OHOS::ConfigModel::GetInstance(); - printf("高:%d\r\n",data->height); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"高:%d\r\n",data->height); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_CUSTOM_DATA_HEIGHT,data->height); - printf("重:%d\r\n",data->weight); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"重:%d\r\n",data->weight); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_CUSTOM_DATA_WEIGHT,data->weight); - printf("性别:%d\r\n",data->gender); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"性别:%d\r\n",data->gender); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_CUSTOM_DATA_SEX,data->gender); - printf("年纪:%d\r\n",data->age); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"年纪:%d\r\n",data->age); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_CUSTOM_DATA_AGE,data->age); - printf("目标步数:%d\r\n",data->target_step); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"目标步数:%d\r\n",data->target_step); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_STEPCOUNT,data->target_step); //目标站立 - printf("目标站立 %d\r\n",data->target_stand); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"目标站立 %d\r\n",data->target_stand); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_STANDUP_TIMES,data->target_stand); //目标燃脂 - printf("目标燃脂 %d\r\n",data->fat_time); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"目标燃脂 %d\r\n",data->fat_time); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_DURATION,data->fat_time); - printf("目标卡路里 %d\r\n",data->fat_time); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"目标卡路里 %d\r\n",data->fat_time); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_CALORIES,data->calorie); - printf("目标距离 %d\r\n",data->fat_time); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"目标距离 %d\r\n",data->fat_time); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_DISTANCE,data->distance); do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SET_USER_INFO, NULL); @@ -2125,7 +2132,7 @@ void Set_heart_cmd(msg_get_heart_set_param_info_t *data) p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_REMIND,data->remind_on); if(data->remind_on) { - printf("set_condigData_Int data->max_min %d\r\n",data->max_min); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"set_condigData_Int data->max_min %d\r\n",data->max_min); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_MAX_MIN,data->max_min); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_THRESHOLD_VALUE,data->heart); @@ -2141,7 +2148,7 @@ void Get_heart_cmd(msg_get_heart_set_param_info_t *data) data->frequence = p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_DETECTED); data->remind_on = p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_REMIND); data->max_min= p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_MAX_MIN); - printf("Get_heart_cmd data->max_min %d\r\n",data->max_min); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"Get_heart_cmd data->max_min %d\r\n",data->max_min); data->heart = p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_THRESHOLD_VALUE); } @@ -2271,7 +2278,7 @@ void get_health_HEART_data_path(char *path, uint8_t day,uint16_t max_size) char timeday[12] = {0}; uapi_get_YYMMDD_Time_extend(timeday,'\0',day); - printf("%s\r\n",timeday); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%s\r\n",timeday); sprintf_s(path,max_size,"%s%s.bin",OHOS::GET_HEALTH_JSON_PATH_C_STR_HEART(),timeday); @@ -2286,7 +2293,7 @@ void get_health_OXYGEN_data_path(char *path, uint8_t day,uint16_t max_size) char timeday[12] = {0}; uapi_get_YYMMDD_Time_extend(timeday,'\0',day); - printf("%s\r\n",timeday); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%s\r\n",timeday); sprintf_s(path,max_size,"%s%s.bin",OHOS::GET_HEALTH_JSON_PATH_C_STR_OXYGEN(),timeday); #endif @@ -2327,7 +2334,7 @@ void set_weather_one_data(int tempMin, int iconDay,int fxDate, int tempMax, char data_t.tempMax=tempMax; memset((void*)data_t.textDay,0,weather_short_len); strcpy_s(data_t.textDay,weather_short_len,textDay); - printf("set_weather_one_data %d\n",count); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"set_weather_one_data %d\n",count); return UI_set_weather_seven_day_data(data_t ,count); } #else @@ -2354,7 +2361,7 @@ void read_message_data(void) FILE *jsfile = fopen(ANCS_DATA_CJSON_PATH, "r"); cJSON *data_root; if (jsfile != NULL) { - printf("succes opening file\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"succes opening file\n"); fseek(jsfile, 0, SEEK_END); long fileSize = ftell(jsfile); fseek(jsfile, 0, SEEK_SET); @@ -2365,7 +2372,7 @@ void read_message_data(void) fclose(jsfile); // 解析JSON数据 - // printf("jsonData %s",jsonData); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"jsonData %s",jsonData); data_len = strlen(jsonData); data_root= cJSON_Parse(jsonData); free(jsonData); @@ -2404,7 +2411,7 @@ void read_message_data(void) memset(message_infor_s.message_t[i].title,0,TITLE_BUF_LEN); } - // printf("message_infor_s.message_t[i].title:%s",message_infor_s.message_t[i].title); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"message_infor_s.message_t[i].title:%s",message_infor_s.message_t[i].title); if(strlen(msg_buf->valuestring) != 0) { @@ -2412,7 +2419,7 @@ void read_message_data(void) }else{ memset(message_infor_s.message_t[i].msg,0,MSG_BUF_LEN); } - // printf("message_infor_s.message_t[count - 1- i].msg:%s",message_infor_s.message_t[i].msg); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"message_infor_s.message_t[count - 1- i].msg:%s",message_infor_s.message_t[i].msg); message_infor_s.message_t[i].time = time->valueint; message_infor_s.message_t[i].hasCode = hasCode->valueint; message_infor_s.message_t[i].read = read_t->valueint; @@ -2421,10 +2428,10 @@ void read_message_data(void) } cJSON_Delete(data_root); } - // printf("message_infor_s.num%d\r\n",message_infor_s.num); //2 1 0 + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"message_infor_s.num%d\r\n",message_infor_s.num); //2 1 0 // for(uint8_t i = message_infor_s.num-1;i > 0 ;i--) // { - // // printf("message_infor_s:title %s msg :%s\r\n",message_infor_s.message_t[i].title,message_infor_s.message_t[i].msg); + // // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"message_infor_s:title %s msg :%s\r\n",message_infor_s.message_t[i].title,message_infor_s.message_t[i].msg); // } } message_infor_t *get_message_info(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 b36d32b93..ac4332324 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c @@ -53,7 +53,7 @@ extern "C" { #define AI_TXT_BUF_MAX_LEN 1024*3 //json解析失败 - +#define MAX_BLE_EVENT_DIAL_NUM (20) //表盘最大数量 uint32_t packdataLen = 0; uint32_t totalDataLen = 0; @@ -120,7 +120,7 @@ static errcode_t create_mp3_name(char* path,char*dir_path ,char* file_name) if(strstr(file_name,".mp3")) { //"光-陈粒.128.mp3" - printf("%s\r\n",file_name); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%s\r\n",file_name); int len=strlen(file_name)-strlen(".mp3"); for(int i=0;i=2) @@ -449,15 +449,15 @@ void send_big_data(ble_data_type type,char *data, uint16 datalen) memcpy(buf + 17, data, datalen); // 复制数据到缓冲区 buf[17 + datalen] = Calculate_CRC_Big((uint8_t *)data, datalen); // 计算CRC } - - printf("data:\r\n"); + #ifdef BLE_LOG + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"data:\r\n"); for(int i=0;i<17 + datalen + 1;i++) { - printf("%x ",buf[i]); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%x ",buf[i]); } - printf("end\r\n"); - + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"end\r\n"); + #endif // 根据标志位选择发送数据的方式 if(type.type==6) { @@ -481,7 +481,7 @@ void sendtraningstatedata(uint8_t state ,uint16_t time) uint32_t data_len=3; data[0]=state; memcpy(&data[1],&time,2); - printf("发送训练状态数据%d %d\r\n",data[0],time); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"发送训练状态数据%d %d\r\n",data[0],time); ble_data_type type={0x05,0x50,data_len,1,1}; send_big_data(type,data,data_len); @@ -493,7 +493,7 @@ void sendtraningstateend(void) char data[1]={0}; uint32_t data_len=1; data[0]=0; //[0 结束] - printf("发送训练状态结束%d\r\n",data[0]); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"发送训练状态结束%d\r\n",data[0]); ble_data_type type={0x05,0x51,data_len,1,1}; send_big_data(type,data,data_len); @@ -505,7 +505,7 @@ void sendtraningdata(msg_get_train_data_info_t *data) cJSON* dataJSON = cJSON_CreateObject(); if (dataJSON == NULL) { - printf("Error creating JSON object\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"Error creating JSON object\n"); return; } @@ -520,7 +520,7 @@ void sendtraningdata(msg_get_train_data_info_t *data) char *jsonString = cJSON_PrintUnformatted(dataJSON); if (jsonString == NULL) { - printf("Error printing JSON to string\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"Error printing JSON to string\n"); cJSON_Delete(dataJSON); return; } @@ -529,11 +529,11 @@ void sendtraningdata(msg_get_train_data_info_t *data) cJSON_Delete(dataJSON); if (data_len == 0) { - printf("Error: JSON string length is 0\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"Error: JSON string length is 0\n"); return; } - printf("发送训练实时数据 %d %s\n", data_len, jsonString); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"发送训练实时数据 %d %s\n", data_len, jsonString); ble_data_type type={0x01,0x0f,data_len,1,1}; send_big_data(type,jsonString,data_len); @@ -551,7 +551,7 @@ static uint8_t AI_is_end_state=0; void inquire_AI_is_ready(uint8_t type) { - printf("查询AI模型,是否准备就绪\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"查询AI模型,是否准备就绪\r\n"); ble_data_type type_={0x05,0x06,1,1,1}; send_big_data(type_,(char *)&type,1); //send_big_data(0, (char *)&type, 1, 1, 1, 1, 0x06, 5); @@ -616,7 +616,7 @@ errcode_t UnbindSucessCmd(uint8_t flag)//发送解绑指令,解绑界面调用 { if(0!=remove(PHONE_WATCH_CONFIG_PATH)) { - printf("json remove fail\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"json remove fail\r\n"); } gap_ble_remove_all_pairs(); gap_remove_all_pairs(); @@ -631,7 +631,7 @@ void watch_clean_pairs(void) { if(0!=remove(PHONE_WATCH_CONFIG_PATH)) { - printf("json remove fail\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"json remove fail\r\n"); } gap_ble_remove_all_pairs(); gap_remove_all_pairs(); @@ -644,7 +644,7 @@ void getDeviceState(void)//获取设备状态 get_phone_addr(&addr,g_ble_conn_id); bool ret = bt_is_acl_connected(&addr); - printf("getDeviceState ret:%d\r\n",ret); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"getDeviceState ret:%d\r\n",ret); } void clearPaireFlag(uint8_t flag) @@ -702,11 +702,11 @@ void comfirmPaire(uint8_t flag) if(flag == 1) { first_bond = 1; - printf(" gap_ble_pair \r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," gap_ble_pair \r\n"); if(get_ble_pair()) { - printf(" gap_ble_pair \r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," gap_ble_pair \r\n"); bd_addr_t addr={0}; get_phone_addr(&addr,g_ble_conn_id); @@ -714,7 +714,7 @@ void comfirmPaire(uint8_t flag) errcode_t code = gap_ble_pair_remote_device(&addr); if(code!=ERRCODE_SUCC) { - printf("gap_ble_pair_remote_device fail %X\r\n",code); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"gap_ble_pair_remote_device fail %X\r\n",code); } } @@ -726,10 +726,10 @@ void comfirmPaire(uint8_t flag) get_phone_addr(&addr,g_ble_conn_id); ret = gap_ble_disconnect_remote_device(&addr);//与固定的mac设置地址进行断开连接 - // printf("gap_ble_disconnect_remote_device %x\r\n",ret); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"gap_ble_disconnect_remote_device %x\r\n",ret); ret = gap_ble_remove_all_pairs(); bool ret_ok = gap_remove_all_pairs(); - // printf("gap_remove_all_pairs %x %x\r\n",ret,ret_ok); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"gap_remove_all_pairs %x %x\r\n",ret,ret_ok); if(savephonename != NULL) { ym_free(savephonename); @@ -756,14 +756,14 @@ void getPhoneNameLen(uint8_t *data,uint8_t *datalen,uint8_t *type)//获取手机 cJSON* pn = cJSON_GetObjectItem(root, "pn"); if (pn && cJSON_IsString(pn)) { len = strlen(pn->valuestring)+1; - printf("设备名称: %s len:%d\n", pn->valuestring,len); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"设备名称: %s len:%d\n", pn->valuestring,len); } cJSON* tp = cJSON_GetObjectItem(root, "tp"); if(tp && cJSON_IsNumber(tp)) { *type=tp->valueint; } - printf("%d\r\n",type); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%d\r\n",type); cJSON* bond=cJSON_GetObjectItem(root, "bond"); if(bond) @@ -804,7 +804,7 @@ static uint8_t *getPhoneName(uint8_t *data)//获取手机设备名称 memcpy(savephonename,(uint8_t *)pn->valuestring,datalen+1); } } - printf("设备名称: %s\n", pn->valuestring); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"设备名称: %s\n", pn->valuestring); } cJSON_Delete(root); } @@ -828,18 +828,18 @@ void getPhoneMac(uint8_t *data,uint8_t *phoneMac)//获取手机设备mac这个 { cJSON* mac = cJSON_GetObjectItem(root, "mac"); if (mac && cJSON_IsArray(mac)) { - printf("MAC地址: "); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"MAC地址: "); cJSON* macElement = NULL; cJSON_ArrayForEach(macElement, mac) { if (cJSON_IsNumber(macElement)) { - printf("%d", macElement->valueint); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%d", macElement->valueint); if (macElement->prev != NULL) { phone_tmp[count++] = macElement->valueint; - printf(", "); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,", "); } } } - printf("\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"\n"); } memcpy(phoneMac,phone_tmp,6); @@ -858,7 +858,7 @@ void GetwatchSaveMac(uint8_t *mac,uint8_t *mactype)//获取手表本地保存的 uint8_t type= 0; FILE *jsfile = fopen(PHONE_WATCH_CONFIG_PATH, "r"); if (jsfile != NULL) { - printf("succes opening file\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"succes opening file\n"); fseek(jsfile, 0, SEEK_END); long fileSize = ftell(jsfile); fseek(jsfile, 0, SEEK_SET); @@ -874,19 +874,19 @@ void GetwatchSaveMac(uint8_t *mac,uint8_t *mactype)//获取手表本地保存的 if (root != NULL) { cJSON *modifiedJson = cJSON_GetObjectItem(root,"mac"); if (cJSON_IsArray(modifiedJson)) { - printf("watch MAC地址: "); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"watch MAC地址: "); cJSON* macElement = NULL; cJSON_ArrayForEach(macElement, modifiedJson) { if (cJSON_IsNumber(macElement)) { - printf("%d", macElement->valueint); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%d", macElement->valueint); if ((macElement->prev != NULL)) { mac_tmp[count] = macElement->valueint; count++; - printf(", "); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,", "); } } } - printf("\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"\n"); } cJSON *mac_type = cJSON_GetObjectItem(root,"mac_type"); if(cJSON_IsNumber(mac_type)) @@ -913,7 +913,7 @@ static void GetwatchSaveNameLen(uint8_t *datalen)//获取手表本地保存的 uint8_t len = 0; FILE *jsfile = fopen(PHONE_WATCH_CONFIG_PATH, "r"); if (jsfile != NULL) { - printf("GetwatchSaveNameLen opening file\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"GetwatchSaveNameLen opening file\n"); fseek(jsfile, 0, SEEK_END); long fileSize = ftell(jsfile); fseek(jsfile, 0, SEEK_SET); @@ -931,7 +931,7 @@ static void GetwatchSaveNameLen(uint8_t *datalen)//获取手表本地保存的 if(cJSON_IsString(pn)) { len = strlen(pn->valuestring)+1;//多加一个加上字符串的结束符\0 - printf("GetwatchSaveNameLen;%d",len); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"GetwatchSaveNameLen;%d",len); } }; *datalen = len; @@ -949,7 +949,7 @@ static uint8_t *GetwatchSaveName(void)//获取手表本地保存的手机设备 uint8_t *str = NULL; FILE *jsfile = fopen(PHONE_WATCH_CONFIG_PATH, "r"); if (jsfile != NULL) { - printf("succes opening file\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"succes opening file\n"); fseek(jsfile, 0, SEEK_END); long fileSize = ftell(jsfile); fseek(jsfile, 0, SEEK_SET); @@ -980,7 +980,7 @@ static uint8_t *GetwatchSaveName(void)//获取手表本地保存的手机设备 memcpy(str,(uint8_t *)pn->valuestring,showname_len+1); } - printf("GetwatchSaveName:%s",pn->valuestring); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"GetwatchSaveName:%s",pn->valuestring); } } } @@ -1029,10 +1029,10 @@ void cleanUnbindInfor(uint8_t flag)//和旧手机解绑清除配对信息 gap_ble_remove_all_pairs(); bool ret_flag = gap_remove_all_pairs(); - printf("ret_flag:%d ret:%x\r\n",ret_flag,ret); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"ret_flag:%d ret:%x\r\n",ret_flag,ret); if(0!=remove(PHONE_WATCH_CONFIG_PATH)) { - printf("json remove fail\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"json remove fail\r\n"); } set_ble_falg(0); do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_RESTORE_FACTORY_SETTING, NULL, 0);//恢复出厂 @@ -1108,16 +1108,16 @@ void sendBindInfor(uint8_t *data) bool gap_get_paired =gap_get_paired_devices_num(&paired_devices_num); if(gap_get_paired!=true ||paired_devices_num!=0 ) { - printf("sendBindInfor!!!!!!!!!:gap_remove_all_pairs \r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"sendBindInfor!!!!!!!!!:gap_remove_all_pairs \r\n"); gap_remove_all_pairs(); } } devname = getPhoneName(data); - printf("devname!!!!!!!!!:%s devnamelen:%d",devname,devnamelen); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"devname!!!!!!!!!:%s devnamelen:%d",devname,devnamelen); if (devname != NULL){ - printf("phone devname is name!!!!!!!!!\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"phone devname is name!!!!!!!!!\r\n"); uint8_t buf[devnamelen+2]; memset(buf,0,devnamelen+2); buf[0] = DEVICEBIND ; @@ -1126,7 +1126,7 @@ void sendBindInfor(uint8_t *data) if(phone_type==1) { - printf("IOS\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"IOS\r\n"); ble_set_pair(1); errcode_t ret = gap_ble_set_ctkd_enable(true); @@ -1148,7 +1148,7 @@ void sendBindInfor(uint8_t *data) devname = NULL; } }else{ - printf("phone devname is no name11111!!!!!!!!!:"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"phone devname is no name11111!!!!!!!!!:"); uint8_t buf[2]; memset(buf,0,2); buf[0] = DEVICEBIND; @@ -1161,7 +1161,7 @@ void sendBindInfor(uint8_t *data) memset(buf,0,2); buf[0] = DEVICEBIND; buf[1] = 0 ; - printf("phone devname is no name!!!!!!!!!:"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"phone devname is no name!!!!!!!!!:"); CustomEventPublish(TOPIC_EVENT_DEVICE_BIND,buf,2); } #endif @@ -1200,7 +1200,7 @@ void sendBindInfor(uint8_t *data) errcode_t code = gap_ble_pair_remote_device(&addr); if(code!=ERRCODE_SUCC) { - printf("gap_ble_pair_remote_device fail %X\r\n",code); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"gap_ble_pair_remote_device fail %X\r\n",code); } } @@ -1214,7 +1214,7 @@ void sendBindInfor(uint8_t *data) } } } - printf("bond flag:%d first_bond:%d\r\n",bond,first_bond); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"bond flag:%d first_bond:%d\r\n",bond,first_bond); if(bond == 0x03) { @@ -1229,7 +1229,7 @@ void sendBindInfor(uint8_t *data) buf[0] = DEVICEUNBIND ; buf[1] = devnamelen; memcpy(buf+2,devname,devnamelen); - printf("devname:is no null!!!!!%s\r\n",devname); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"devname:is no null!!!!!%s\r\n",devname); CustomEventPublish(TOPIC_EVENT_DEVICE_BIND,(uint8_t *)buf,devnamelen+2); if(devname) { @@ -1241,7 +1241,7 @@ void sendBindInfor(uint8_t *data) memset(buf,0,2); buf[0] = DEVICEUNBIND; buf[1] = 0; - printf("devname:is null!!!!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"devname:is null!!!!!"); CustomEventPublish(TOPIC_EVENT_DEVICE_BIND,buf,2); } }else{ @@ -1336,7 +1336,7 @@ void sendParieSuccess(uint8_t flag,bd_addr_t *addr)//发送配对成功指令to cJSON_AddItemToObject(dataJSON,"mac",arrayJSON); char *jsonString = cJSON_PrintUnformatted(dataJSON); - printf("phone %s",jsonString); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"phone %s",jsonString); FILE *file = fopen(PHONE_WATCH_CONFIG_PATH, "wb"); if (file) { @@ -1421,7 +1421,7 @@ static uint8_t jsonCheck_time(uint8_t *buf)//json 格式解析 json = buf; cJSON* root = cJSON_Parse((const char *)json); if (root == NULL) { - printf("时间 JSON解析错误\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"时间 JSON解析错误\n"); return 2; } char *locations; @@ -1435,48 +1435,48 @@ static uint8_t jsonCheck_time(uint8_t *buf)//json 格式解析 uint32_t timestamp; cJSON* time = cJSON_GetObjectItem(root, "time"); if (time && cJSON_IsNumber(time)) { - printf("time: %d\n", time->valueint); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"time: %d\n", time->valueint); timestamp = time->valueint; - // printf("time: %d\n", time->valueint); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"time: %d\n", time->valueint); } cJSON* jsweek = cJSON_GetObjectItem(root, "week"); if (jsweek && cJSON_IsNumber(jsweek)) { - printf("week: %d\n", jsweek->valueint); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"week: %d\n", jsweek->valueint); week = jsweek->valueint; } cJSON* jsyear = cJSON_GetObjectItem(root, "year"); if (jsyear && cJSON_IsNumber(jsyear)) { - printf("year: %d\n", jsyear->valueint); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"year: %d\n", jsyear->valueint); year = jsyear->valueint; } cJSON* jsmonth = cJSON_GetObjectItem(root, "month"); if (jsmonth && cJSON_IsNumber(jsmonth)) { - printf("month: %d\n", jsmonth->valueint); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"month: %d\n", jsmonth->valueint); month = jsmonth->valueint; } cJSON* jsday = cJSON_GetObjectItem(root, "day"); if (jsday && cJSON_IsNumber(jsday)) { - printf("day: %d\n", jsday->valueint); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"day: %d\n", jsday->valueint); day = jsday->valueint; } cJSON* jshour = cJSON_GetObjectItem(root, "hour"); if (jshour && cJSON_IsNumber(jshour)) { - printf("hour: %d\n", jshour->valueint); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"hour: %d\n", jshour->valueint); hour = jshour->valueint; } cJSON* jsminute = cJSON_GetObjectItem(root, "minute"); if (jsminute && cJSON_IsNumber(jsminute)) { - printf("minute: %d\n", jsminute->valueint); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"minute: %d\n", jsminute->valueint); minute = jsminute->valueint; } cJSON* jssecond = cJSON_GetObjectItem(root, "second"); if (jssecond && cJSON_IsNumber(jssecond)) { - printf("second: %d\n", jssecond->valueint); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"second: %d\n", jssecond->valueint); second = jssecond->valueint; } cJSON* location = cJSON_GetObjectItem(root, "location"); if (location && cJSON_IsString(location)) { - printf("location: %s\n", location->valuestring); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"location: %s\n", location->valuestring); locations = location->valuestring; } // sprintf((char *)time_data,"%d-%d-%d %d:%d:%d",year+2000,month,day,hour,minute,second); @@ -1493,10 +1493,10 @@ static uint8_t jsonCheck_time(uint8_t *buf)//json 格式解析 tmp.tm_sec = second; time_t timestamp2 = __tm_to_secs(&tmp); int16_t timezone = (timestamp2-timestamp)/60/15; - printf("timezone in quarters %d\n",timezone); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"timezone in quarters %d\n",timezone); uapi_set_timezone(timezone); //要在uaip_sntp_set_time_utc 之前执行才有效 /********/ - printf("time: %d\n",timestamp ); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"time: %d\n",timestamp ); uaip_sntp_set_time_utc(timestamp); @@ -1547,7 +1547,7 @@ static uint8_t jsonCheck_targetparam(uint8_t *buf) json = buf; cJSON* root = cJSON_Parse((const char *)json); if (root == NULL) { - printf("时间 JSON解析错误\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"时间 JSON解析错误\n"); return 2; } @@ -1555,7 +1555,7 @@ static uint8_t jsonCheck_targetparam(uint8_t *buf) cJSON* ty = cJSON_GetObjectItem(root, "ty");//目标类型 if (cJSON_IsNumber(ty)) { - printf("ty: %d\n", ty->valueint); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"ty: %d\n", ty->valueint); training_ble_data.sportTagType = ty->valueint; training_ble_data.controlmd = SETGOAL; @@ -1579,7 +1579,7 @@ static uint8_t jsonCheck_targetparam(uint8_t *buf) } if (targetItem && cJSON_IsNumber(targetItem)) { - printf("%s: %d\n", targetItem->string, targetItem->valueint); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%s: %d\n", targetItem->string, targetItem->valueint); training_ble_data.sportTag = targetItem->valueint; cJSON_Delete(root); CustomEventPublish(TOPIC_EVENT_BLE_TRAINING, (uint8_t*)&training_ble_data, sizeof(training_ble)); @@ -1685,12 +1685,12 @@ static void jsonCheck_alarm(uint8_t *buf)//json 解析闹钟数据 cJSON* root = cJSON_Parse((const char *)json); if (root == NULL) { - printf("闹钟 JSON解析错误\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"闹钟 JSON解析错误\n"); return; } else { - printf("闹钟 %s\r\n",json); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"闹钟 %s\r\n",json); } ble_delet_all_AlarmInfo(); @@ -1758,7 +1758,7 @@ static void jsonCheck_alarm(uint8_t *buf)//json 解析闹钟数据 } cJSON_Delete(root); ble_AlarmClock_refresh(); - printf("alarmCount %d\n",alarmCount); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"alarmCount %d\n",alarmCount); } @@ -1814,7 +1814,7 @@ void SetpasswordCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,u sprintf_s(buf,7,"%d%d%d%d%d%d",data[1],data[2],data[3],data[4],data[5],data[6]); ble_set_password(data[0],buf); - printf("%s\r\n",buf); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%s\r\n",buf); sendBuf[17] = 1; sendBuf[18] = Calculate_CRC(sendBuf,18); @@ -2179,7 +2179,7 @@ void SetmsgfiltrationCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalD if(Check_CRC(data,len,crcvalue)) { - printf("总长%d\r\n",len); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"总长%d\r\n",len); uint32_t offset=0; while (offset=len)break; @@ -2965,17 +2965,17 @@ uint8_t binCheck_AI(uint8_t *buf,uint8_t *check,uint16_t len)//json 格式解析 char error_buf[256]={0}; memcpy_s(error_buf,256,&buf[offset],txt_len); - printf("binCheck_AI Question txtbuf:%s %d\r\n",error_buf,txt_len); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"binCheck_AI Question txtbuf:%s %d\r\n",error_buf,txt_len); ble_set_ai_Answer_str(error_buf,3); offset+=txt_len; - printf("AI 回应错误\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"AI 回应错误\r\n"); } if(offset>=len)break; if(buf[offset]==4) { - printf("AI 结束\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"AI 结束\r\n"); if(AI_is_end_state) { AI_is_end_state=0; @@ -2995,11 +2995,11 @@ uint8_t binCheck_AI(uint8_t *buf,uint8_t *check,uint16_t len)//json 格式解析 char error_buf[256]={0}; memcpy_s(error_buf,256,&buf[offset],txt_len); - printf("binCheck_AI Question txtbuf:%s %d\r\n",error_buf,txt_len); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"binCheck_AI Question txtbuf:%s %d\r\n",error_buf,txt_len); ble_set_ai_Answer_str(error_buf,4); offset+=txt_len; - //printf("AI 解析失败\r\n"); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"AI 解析失败\r\n"); } if(offset>=len)break; @@ -3024,12 +3024,12 @@ void SetWeatherCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,ui memcpy(sendBuf+7,&tmp,4); memcpy(sendBuf+11,&tmp,4); memcpy(sendBuf+15,&tmp_data,2); - // printf("GetWeatherCmd:len:%d data:%s\r\n",len,data); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"GetWeatherCmd:len:%d data:%s\r\n",len,data); if(Check_CRC(data,len,crcvalue)) { // uint32_t y=(0xff00); // uint32_t x =(0xff00& 0Xff00)>>16; - // printf("GetWeatherCmd %u\r\n",x); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"GetWeatherCmd %u\r\n",x); uint8_t check = 1; jsonCheck_weather(data,&check); sendBuf[17] = check; @@ -3058,7 +3058,7 @@ void SetAiResultCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,u memcpy(sendBuf+7,&tmp,4); memcpy(sendBuf+11,&tmp,4); memcpy(sendBuf+15,&tmp_data,2); - // printf("GetWeatherCmd:len:%d data:%s\r\n",len,data); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"GetWeatherCmd:len:%d data:%s\r\n",len,data); if(Check_CRC(data,len,crcvalue)) { uint8_t check = 1; @@ -3106,7 +3106,7 @@ void SaveChatGPTCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,u memcpy(sendBuf+7,&tmp,4); memcpy(sendBuf+11,&tmp,4); memcpy(sendBuf+15,&tmp_data,2); - // printf("GetWeatherCmd:len:%d data:%s\r\n",len,data); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"GetWeatherCmd:len:%d data:%s\r\n",len,data); //"sk-proj-04ogvrZQqyaiv1OWw8OZT3BlbkFJG9Gyr8oFvRdmr3oXQNbX" if(Check_CRC(data,len,crcvalue)) { @@ -3139,12 +3139,12 @@ bool bin_Check_schedule(uint8_t *data,uint16_t len) uint16 offset=0; uint16 buf_len=0; uint16 id_=1; - // printf("len %d\r\n",len); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"len %d\r\n",len); // for(int i=0;icalorie; msg_userinfo.distance=p_userinfo->distance; - printf("getUserInfo:!!age %d, fat %d, sex %d, height %d, stand %d, step %d , timeformat %d , weight %d !!!!!!\r\n", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"getUserInfo:!!age %d, fat %d, sex %d, height %d, stand %d, step %d , timeformat %d , weight %d !!!!!!\r\n", p_userinfo->age, p_userinfo->fat_time, p_userinfo->gender, @@ -3564,25 +3564,25 @@ void Parse_addressbook_bin(uint8_t *data,uint16_t len) while (num) { uint8 sex = data[offset]; - printf("性别: %d\r\n",sex); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"性别: %d\r\n",sex); offset=offset+1; uint8 name_len=data[offset]; - printf("name_len %d\r\n",name_len); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"name_len %d\r\n",name_len); char name[32]={0}; if(name_len==0) { name_len=strlen("未知"); - printf("未知\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"未知\r\n"); } else { memcpy(name,&data[offset+1],name_len); - printf("姓名: %s\r\n",name); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"姓名: %s\r\n",name); // for(int i=0;i=num) { surplus_len=surplus_len-num; - printf("%d %d %d %d\r\n",num,file_size,pack_id,pack); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%d %d %d %d\r\n",num,file_size,pack_id,pack); ble_data_type type_={0x01,0x4b,file_size,pack,pack_id}; send_big_data(type_,data+offset,num); @@ -5963,16 +5963,16 @@ void Send_Sleep_Bin_Data(uint8_t day, uint16_t num) else { //#ifdef BLE_LOG - printf("%d %d %d %d\r\n",surplus_len,file_size,pack_id,pack); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%d %d %d %d\r\n",surplus_len,file_size,pack_id,pack); //#endif ble_data_type type_={0x01,0x4b,file_size,pack,pack_id}; send_big_data(type_,data+offset,surplus_len); - printf("开始\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"开始\r\n"); for(int i=0;i482)num=482; #ifdef BLE_LOG - printf("同步心率数据,每包最多:%d 数据 data:%d %d\r\n",num,data[0],len); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"同步心率数据,每包最多:%d 数据 data:%d %d\r\n",num,data[0],len); #endif uapi_dev_runtime_set_heartrate_storage_status(1); if(!Read_Health_BIN_file_buf_send_bin_Data(data[0],num,0x40)) @@ -6365,9 +6365,9 @@ void getPhoneInfo_test(void) cJSON_AddItemToObject(dataJSON,"alarm",data_arryJSON); char *json_format = cJSON_PrintUnformatted(dataJSON); - printf("%d\n",strlen(json_format)); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%d\n",strlen(json_format)); cJSON_Delete(dataJSON); - printf("%s\n",json_format); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%s\n",json_format); uint32_t data_len = strlen(json_format); uint8_t value[data_len+18]; uint32_t tmp = 1; @@ -6381,7 +6381,7 @@ void getPhoneInfo_test(void) memcpy(value+15,&tmp_data,2); memcpy(value+17,(uint8_t *)json_format,data_len); unsigned char lrc = Calculate_CRC(value,data_len+17); - printf("lrc:%d",lrc); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"lrc:%d",lrc); value[data_len+18] = lrc; sendBleData(value,data_len+18); */ @@ -6447,7 +6447,7 @@ void message_data(int uid,int appid,char *title,char *msg,int hasCode) data.time=timestampe; data.read=0; data.hasCode=hasCode; - printf("message_data\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"message_data\r\n"); CustomEventPublish_TOPIC_EVENT_MESSAGENOTE(&data); return ; @@ -6459,7 +6459,7 @@ int uft8_check(char *chinese_string,int length) for (i = 0; i < length;) { // 判断是否为ASCII字符 if ((unsigned char)chinese_string[i] < 0x80) { - // printf("ASCII character: %d\n", (int)(unsigned char)chinese_string[i]); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"ASCII character: %d\n", (int)(unsigned char)chinese_string[i]); i++; } else { // 假设这里我们只处理3字节的UTF-8字符 @@ -6492,7 +6492,7 @@ uint8_t jscheck_ancs(uint8_t *data) json = data; cJSON* root = cJSON_Parse((const char *)json); if (root == NULL) { - printf("信息解析 JSON解析 失败\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"信息解析 JSON解析 失败\n"); return 2; } @@ -6511,17 +6511,17 @@ uint8_t jscheck_ancs(uint8_t *data) memset(msgBuf,0,MSG_BUF_LEN+1); cJSON* uid = cJSON_GetObjectItem(root, "uid"); if (uid && cJSON_IsNumber(uid)) { - printf("uid_t: %d\n", uid->valueint); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"uid_t: %d\n", uid->valueint); uid_t = uid->valueint; } cJSON* appid = cJSON_GetObjectItem(root, "appid"); if (appid && cJSON_IsNumber(appid)) { - printf("appid_t: %d\n", appid->valueint); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"appid_t: %d\n", appid->valueint); appid_t = appid->valueint; } cJSON* title_c = cJSON_GetObjectItem(root, "title"); if (title_c && cJSON_IsString(title_c)) { - printf("titleBuf: %s\n", title_c->valuestring); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"titleBuf: %s\n", title_c->valuestring); int len = strlen(title_c->valuestring); if(len >= TITLE_BUF_LEN){ len = uft8_check(title_c->valuestring,TITLE_BUF_LEN-4); @@ -6543,16 +6543,16 @@ uint8_t jscheck_ancs(uint8_t *data) msg->valuestring[len++] = 0; } memcpy_s(msgBuf,MSG_BUF_LEN,(uint8_t *)msg->valuestring,len); - printf("msgBuf: %s\n",msgBuf); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"msgBuf: %s\n",msgBuf); } cJSON* time = cJSON_GetObjectItem(root, "time"); if (time && cJSON_IsString(time)) { - printf("time: %s\n", time->valuestring); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"time: %s\n", time->valuestring); // timeBuf = time->valueint; } cJSON* hasCode = cJSON_GetObjectItem(root, "hasCode"); if (hasCode && cJSON_IsNumber(hasCode)) { - printf("hasCode_t: %d\n", hasCode->valueint); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"hasCode_t: %d\n", hasCode->valueint); hasCode_t = hasCode->valueint; } cJSON_Delete(root); @@ -6563,9 +6563,9 @@ uint8_t jscheck_ancs(uint8_t *data) // ancs_msg_data=NULL; // } - printf("send message\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"send message\r\n"); message_data(uid_t,appid_t,titleBuf,msgBuf,hasCode_t); - printf("send message ok\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"send message ok\r\n"); if(titleBuf != NULL){ ym_free(titleBuf); @@ -6615,7 +6615,7 @@ void type2AE1Data(uint8_t *buf_cmd,uint8_t *data,uint16_t datalen,uint8_t *total { uint16_t typeID = buf_cmd[1]*256+buf_cmd[2]; #ifdef BLE_LOG - printf("type2AE1Data typeID:0x%4X\r\n",typeID); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"type2AE1Data typeID:0x%4X\r\n",typeID); #endif switch (typeID) //ID { @@ -6628,7 +6628,7 @@ void type2AE1Data(uint8_t *buf_cmd,uint8_t *data,uint16_t datalen,uint8_t *total void bleRecvANCSData(uint8_t *data, uint16_t data_size,uint8_t *buf_cmd,uint8_t *totalData,uint8_t crcvalue)//buf_cmd 指令前17个字节数据 { uint8_t type = buf_cmd[1]; - printf("type:%d %d data_size:%d data:%d crcvalue:%x\r\n",buf_cmd[0],type,data_size,data[0],crcvalue); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"type:%d %d data_size:%d data:%d crcvalue:%x\r\n",buf_cmd[0],type,data_size,data[0],crcvalue); switch (type) { case 0x03:// @@ -6649,7 +6649,7 @@ errcode_t ble_reply_msgarr(uint8_t msg_cmdtype,uint8_t msg_cmdid,uint8_t *replyd if (replydata_len > 20) { - printf("datalen is larger than 20, please send with other api !\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"datalen is larger than 20, please send with other api !\n"); return ERRCODE_FAIL; } uint16_t replybuflen=sizeof(msg_header_t)+replydata_len+1; @@ -6678,7 +6678,7 @@ errcode_t ble_reply_msgarr(uint8_t msg_cmdtype,uint8_t msg_cmdid,uint8_t *replyd } - printf("ble_reply_msgarr cmdtype %02X cmdid %02X package %d/%d , len %d,total len %d , data[0] %02X crc %02X\n", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"ble_reply_msgarr cmdtype %02X cmdid %02X package %d/%d , len %d,total len %d , data[0] %02X crc %02X\n", reply_cmd_header->cmdtype, reply_cmd_header->cmdid, reply_cmd_header->package_index, @@ -6708,7 +6708,7 @@ errcode_t ble_reply_cmd(uint16_t msg_cmd,uint8_t replydata) { uint8_t cmdtype = (uint8_t)((msg_cmd&0xFF00)>>8); uint8_t cmdid = (uint8_t)(msg_cmd&0x00FF); - printf("msg_cmd %04X cmdtype %02X cmdid %02X\n",msg_cmd,cmdtype,cmdid); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"msg_cmd %04X cmdtype %02X cmdid %02X\n",msg_cmd,cmdtype,cmdid); return ble_reply_msg(cmdtype,cmdid,replydata); } errcode_t ble_reply_msg(uint8_t msg_cmdtype,uint8_t msg_cmdid,uint8_t replydata) @@ -6808,7 +6808,7 @@ errcode_t decode_ota_data(ble_read_data *buffer_handle,uint8_t *data,uint16_t da { uint32_t package_id=header->package_index; - printf("package_id: %d \r\n",package_id); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"package_id: %d \r\n",package_id); if(Check_CRC(data_,datalen,crcvalue)) { @@ -6821,7 +6821,7 @@ errcode_t decode_ota_data(ble_read_data *buffer_handle,uint8_t *data,uint16_t da if (buffer_handle->file_recv_stat.file_type == 1) { buffer_handle->file_recv_stat.file = fopen("/update/update.fwpkg","w+"); - printf("create file /update/update.fwpkg %X\n",buffer_handle->file_recv_stat.file); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"create file /update/update.fwpkg %X\n",buffer_handle->file_recv_stat.file); } else if (buffer_handle->file_recv_stat.file_type == 2) @@ -6833,7 +6833,7 @@ errcode_t decode_ota_data(ble_read_data *buffer_handle,uint8_t *data,uint16_t da create_mp3_name(filepath,musicpath,buffer_handle->file_recv_stat.file_name); buffer_handle->file_recv_stat.file = fopen(filepath,"w+"); - printf("filepath %s\r\n",filepath); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"filepath %s\r\n",filepath); } else { @@ -6841,9 +6841,9 @@ errcode_t decode_ota_data(ble_read_data *buffer_handle,uint8_t *data,uint16_t da if (get_file_recv_file_path(buffer_handle->file_recv_stat.file_name,strlen(buffer_handle->file_recv_stat.file_name),filepath,sizeof(filepath)) == ERRCODE_SUCC) { buffer_handle->file_recv_stat.file = fopen(filepath,"w+"); - printf("create file %s %X\n",filepath,buffer_handle->file_recv_stat.file); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"create file %s %X\n",filepath,buffer_handle->file_recv_stat.file); }else{ - printf("create file %s error %X\n",buffer_handle->file_recv_stat.file_name,buffer_handle->file_recv_stat.file); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"create file %s error %X\n",buffer_handle->file_recv_stat.file_name,buffer_handle->file_recv_stat.file); } } @@ -6851,7 +6851,7 @@ errcode_t decode_ota_data(ble_read_data *buffer_handle,uint8_t *data,uint16_t da if (buffer_handle->file_recv_stat.file == NULL) { - printf("6185 buffer_handle->file_recv_stat.file \n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"6185 buffer_handle->file_recv_stat.file \n"); return ERRCODE_FAIL; } size_t writtensize = fwrite(data_,1,datalen,buffer_handle->file_recv_stat.file); @@ -6861,12 +6861,12 @@ errcode_t decode_ota_data(ble_read_data *buffer_handle,uint8_t *data,uint16_t da buffer_handle->file_recv_stat.lrcvalue = calculate_lrc(data_,datalen,buffer_handle->file_recv_stat.lrcvalue); buffer_handle->file_recv_stat.received_size += datalen; - printf("handle_recv_file received_size %d\n",buffer_handle->file_recv_stat.received_size); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"handle_recv_file received_size %d\n",buffer_handle->file_recv_stat.received_size); OTA_FILE_value= ((float) buffer_handle->file_recv_stat.received_size / (float)buffer_handle->file_recv_stat.file_size) *100; }else{ - printf("handle_recv_file write file failed! ret %d != %d\n",writtensize,datalen); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"handle_recv_file write file failed! ret %d != %d\n",writtensize,datalen); return ERRCODE_FAIL; } @@ -6901,7 +6901,7 @@ errcode_t decode_ota_data(ble_read_data *buffer_handle,uint8_t *data,uint16_t da last_package_id=package_id; if (buffer_handle->file_recv_stat.file == NULL) { - printf("6194 buffer_handle->file_recv_stat.file \n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"6194 buffer_handle->file_recv_stat.file \n"); return ERRCODE_FAIL; } //写入文件 @@ -6912,13 +6912,13 @@ errcode_t decode_ota_data(ble_read_data *buffer_handle,uint8_t *data,uint16_t da buffer_handle->file_recv_stat.lrcvalue = calculate_lrc(data_,datalen,buffer_handle->file_recv_stat.lrcvalue); buffer_handle->file_recv_stat.received_size += datalen; - printf("handle_recv_file received_size %d\n",buffer_handle->file_recv_stat.received_size); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"handle_recv_file received_size %d\n",buffer_handle->file_recv_stat.received_size); OTA_FILE_value= ((float) buffer_handle->file_recv_stat.received_size / (float)buffer_handle->file_recv_stat.file_size) *100; }else{ - printf("handle_recv_file write file failed! ret %d != %d\n",writtensize,datalen); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"handle_recv_file write file failed! ret %d != %d\n",writtensize,datalen); return ERRCODE_FAIL; } @@ -6937,7 +6937,7 @@ errcode_t decode_ota_data(ble_read_data *buffer_handle,uint8_t *data,uint16_t da } buffer_handle->file_recv_stat.recv_file_stat = 2; buffer_handle->receive_file_flag = 0; - printf("handle_recv_file received success \n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"handle_recv_file received success \n"); if(BR_TRANSFER_timer) { @@ -6953,7 +6953,7 @@ errcode_t decode_ota_data(ble_read_data *buffer_handle,uint8_t *data,uint16_t da else if (last_package_id==package_id) { uint32_t replydata=0xffffffff; - printf("包重复\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"包重复\r\n"); //ble_reply_msgarr(6,4,&replydata,4); } else if (last_package_id!=package_id) @@ -6979,7 +6979,7 @@ errcode_t decode_ota_json(ble_read_data *buffer_handle) uint8_t *data = buffer_handle->data+sizeof(msg_header_t); uint16_t datalen = buffer_handle->totalDataLen; - printf("ota_json_file_save %s\n",data); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"ota_json_file_save %s\n",data); /** * * OTA文件信息格式 @@ -7047,7 +7047,7 @@ errcode_t decode_ota_json(ble_read_data *buffer_handle) } cJSON_Delete(root); - printf(" ota_type= %d, ota_name=%s, ota_size=%d, ota_major=%d, ota_mid=%d, ota_minor=%d, ota_isforced=%d \n", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," ota_type= %d, ota_name=%s, ota_size=%d, ota_major=%d, ota_mid=%d, ota_minor=%d, ota_isforced=%d \n", buffer_handle->file_recv_stat.file_type, buffer_handle->file_recv_stat.file_name, buffer_handle->file_recv_stat.file_size, @@ -7076,7 +7076,7 @@ errcode_t decode_mp3_json(ble_read_data *buffer_handle) { uint8_t *data = buffer_handle->data+sizeof(msg_header_t); uint16_t datalen = buffer_handle->totalDataLen; - printf("MP3_file_save %s\n",data); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"MP3_file_save %s\n",data); /** MP3文件信息格式 @@ -7123,7 +7123,7 @@ errcode_t decode_mp3_json(ble_read_data *buffer_handle) } cJSON_Delete(root); - printf(" MP3_type= %d, MP3_name=%s, MP3_size=%d \n", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," MP3_type= %d, MP3_name=%s, MP3_size=%d \n", buffer_handle->file_recv_stat.file_type, buffer_handle->file_recv_stat.file_name, buffer_handle->file_recv_stat.file_size @@ -7142,17 +7142,17 @@ errcode_t decode_mp3_json(ble_read_data *buffer_handle) return ERRCODE_FAIL; } } - +static uint16_t ble_dial_uid=0; errcode_t decode_dial_info(ble_read_data *buffer_handle) { - printf("decode_dial_info \n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"decode_dial_info \n"); for(uint8_t i = 0;idata_len;i++) { - printf("%x ",buffer_handle->data[i]); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%x ",buffer_handle->data[i]); } - printf("\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"\n"); if (buffer_handle->data_len == 6) { @@ -7171,7 +7171,7 @@ errcode_t decode_dial_info(ble_read_data *buffer_handle) msg_recv_custom_dial_info_t *custom_dial_info=(msg_recv_custom_dial_info_t*)data; custom_dial_info->dial_uid+=1; - printf("custom_dial_info %d %d %d %d", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"custom_dial_info %d %d %d %d", custom_dial_info->dial_uid, custom_dial_info->battery, custom_dial_info->time, @@ -7181,7 +7181,7 @@ errcode_t decode_dial_info(ble_read_data *buffer_handle) ble_dial_file_count=*(data+sizeof(msg_recv_custom_dial_info_t)); - printf(" custom_dial file_count %d\r\n",ble_dial_file_count); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," custom_dial file_count %d\r\n",ble_dial_file_count); } else @@ -7191,49 +7191,49 @@ errcode_t decode_dial_info(ble_read_data *buffer_handle) if (dialinfo.file_name_len < 0 || dialinfo.file_name_len >255) { - printf("file name len should in [0,255] \n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"file name len should in [0,255] \n"); return ERRCODE_FAIL; } char * filename = malloc(dialinfo.file_name_len); ble_dial_file_count= data[sizeof(msg_recv_dial_info_t)+dialinfo.file_name_len]; if (filename == NULL) { - printf("file name malloc failed filename_len %d\n",dialinfo.file_name_len); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"file name malloc failed filename_len %d\n",dialinfo.file_name_len); return ERRCODE_FAIL; } memcpy_s(filename,dialinfo.file_name_len,data+sizeof(msg_recv_dial_info_t),dialinfo.file_name_len); buffer_handle->file_recv_stat.file_name = filename; - printf(" dial name = %s, dial file count = %d \n", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," dial name = %s, dial file count = %d \n", filename, ble_dial_file_count ); free(filename); } + ble_dial_uid = dialinfo.dial_uid; buffer_handle->file_recv_stat.received_size = 0; buffer_handle->file_recv_stat.lrcvalue = 0; buffer_handle->receive_file_flag = 0; //进入特殊UI - TRANSMIT_DATA=TRANS_DIAL_TRANSMITTING; - CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1); + return ERRCODE_SUCC; } -static uint16_t ble_dial_uid=0; + errcode_t decode_single_dial_info(ble_read_data *buffer_handle) { - printf("decode_single_dial_info \n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"decode_single_dial_info \n"); for(uint8_t i = 0;idata_len;i++) { - printf("%x ",buffer_handle->data[i]); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%x ",buffer_handle->data[i]); } - printf("\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"\n"); if (buffer_handle->data_len == 6) { @@ -7255,7 +7255,7 @@ errcode_t decode_single_dial_info(ble_read_data *buffer_handle) if (dialinfo.file_name_len < 6 || dialinfo.file_name_len >255) { - printf("file name len should in [6,255] \n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"file name len should in [6,255] \n"); return ERRCODE_FAIL; } @@ -7268,7 +7268,7 @@ errcode_t decode_single_dial_info(ble_read_data *buffer_handle) memcpy_s((void*)&file_size,sizeof(uint32_t),(void*)&data[sizeof(msg_recv_single_dial_info_t)+dialinfo.file_name_len],sizeof(uint32_t)); if (filename == NULL) { - printf("file name malloc failed filename_len %d\n",dialinfo.file_name_len); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"file name malloc failed filename_len %d\n",dialinfo.file_name_len); return ERRCODE_FAIL; } memcpy_s(filename,dialinfo.file_name_len,data+sizeof(msg_recv_single_dial_info_t),dialinfo.file_name_len); @@ -7285,7 +7285,7 @@ errcode_t decode_single_dial_info(ble_read_data *buffer_handle) buffer_handle->file_recv_stat.file_name = filename; buffer_handle->file_recv_stat.file_size = file_size; buffer_handle->file_recv_stat.file_type = 3;//表盘 - printf(" filetype = %d, file_name=%s, file_size=%d , dial_uid %04X ,dial_count %d, dial_filetype %d\n", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," filetype = %d, file_name=%s, file_size=%d , dial_uid %04X ,dial_count %d, dial_filetype %d\n", buffer_handle->file_recv_stat.file_type, buffer_handle->file_recv_stat.file_name, buffer_handle->file_recv_stat.file_size, @@ -7305,7 +7305,7 @@ errcode_t decode_single_dial_info(ble_read_data *buffer_handle) static errcode_t install_dial(void) { char *lzmapkgname =uapi_dev_runtime_get_dialname(); - printf("install %s\n",lzmapkgname); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"install %s\n",lzmapkgname); char *lzmaindex = strstr(lzmapkgname,".lzma"); if (lzmaindex != NULL) { @@ -7320,7 +7320,7 @@ static errcode_t install_dial(void) char dial_basename[64]={0}; int dial_basenamelen = (lzmaindex - lzmapkgname); - printf("dial_basenamelen %d\n",dial_basenamelen); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"dial_basenamelen %d\n",dial_basenamelen); if (dial_basenamelen>0 ) { memcpy_s(dial_basename,sizeof(dial_basename),lzmapkgname,dial_basenamelen); @@ -7328,7 +7328,7 @@ static errcode_t install_dial(void) else{ return ERRCODE_FAIL; } - printf("dial_basename %s\n",dial_basename); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"dial_basename %s\n",dial_basename); char dialbin_filepath[128]={0}; if(ble_dial_uid>5) { @@ -7346,17 +7346,17 @@ static errcode_t install_dial(void) } - printf("dialbin_filepath %s\n",dialbin_filepath); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"dialbin_filepath %s\n",dialbin_filepath); char lzma_filepath[128]={0}; if (get_file_recv_file_path(lzmapkgname,strlen(lzmapkgname),lzma_filepath,sizeof(lzma_filepath)) != ERRCODE_SUCC) { return ERRCODE_FAIL; } - printf("lzma_filepath %s\n",lzma_filepath); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"lzma_filepath %s\n",lzma_filepath); errcode_t ret = uapi_dial_pkg_decompress(lzma_filepath,dialbin_filepath); - printf("decode %s to %s , ret %X \n",lzma_filepath,dialbin_filepath, ret); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"decode %s to %s , ret %X \n",lzma_filepath,dialbin_filepath, ret); char *namebuf= strtok(lzmapkgname,"."); @@ -7371,7 +7371,7 @@ static errcode_t install_dial(void) { if(ble_dial_file_index==ble_dial_file_count) { - printf("自定义表盘安装完毕\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"自定义表盘安装完毕\r\n"); char name_str[32]={0}; ble_get_custom_dial(ble_dial_uid,name_str); install_Register_dial(name_str,ble_dial_uid); @@ -7382,7 +7382,7 @@ static errcode_t install_dial(void) //安装完后删除表盘 - printf("remove %s\r\n",lzma_filepath); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"remove %s\r\n",lzma_filepath); if(0!=remove(lzma_filepath)) return ERRCODE_FAIL; @@ -7392,7 +7392,7 @@ static errcode_t install_dial(void) else return ERRCODE_FAIL; }else{ - printf(".lzma not found\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,".lzma not found\n"); return ERRCODE_FAIL; } } @@ -7407,13 +7407,13 @@ bool Read_tar_file_buf_send_Data(uint16_t pack_size,uint8_t id) uint16_t read_size=0; FILE *fp=fopen(file_name,"rb+"); - printf("Read_tar_file_buf_send_Data size %d\r\n",file_size); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"Read_tar_file_buf_send_Data size %d\r\n",file_size); uint32_t pack=file_size/pack_size+1; uint32_t pack_id=1; if(fp==NULL) { - printf("fopen fail %s\r\n",file_name); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"fopen fail %s\r\n",file_name); free(data); return false; } @@ -7444,7 +7444,7 @@ bool read_dir_send_json() { char *send_buf=NULL; - printf("read_dir_send_json xxxxxxxx\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"read_dir_send_json xxxxxxxx\r\n"); send_buf=tar_dir_to_json_buf_malloc_(file_name,&file_size); if( send_buf!=NULL) { @@ -7697,7 +7697,7 @@ void type2AE0Data(ble_read_data *buffer_handle) { uint16_t typeID = buffer_handle->cmd_header.cmdtype*256 + buffer_handle->cmd_header.cmdid; - printf("type2AE0Data typeID:0x%04X datalen %d\r\n",typeID,buffer_handle->totalDataLen); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"type2AE0Data typeID:0x%04X datalen %d\r\n",typeID,buffer_handle->totalDataLen); bool checkcrc = (get_crc_from_lrc(buffer_handle->lrcvalue) == buffer_handle->crcvalue); @@ -7731,7 +7731,18 @@ void type2AE0Data(ble_read_data *buffer_handle) { if (decode_dial_info( buffer_handle) == ERRCODE_SUCC) { - ble_reply_cmd(DIAL_FILE_RECV_CMD,1); + + if(ble_dial_uid >=5 && get_dial_num()>=MAX_BLE_EVENT_DIAL_NUM) + { + ble_reply_cmd(DIAL_FILE_RECV_CMD,3); + } + else + { + TRANSMIT_DATA=TRANS_DIAL_TRANSMITTING; + CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1); + ble_reply_cmd(DIAL_FILE_RECV_CMD,1); + } + }else{ ble_reply_cmd(DIAL_FILE_RECV_CMD,2); } @@ -7786,7 +7797,7 @@ void type2AE0Data(ble_read_data *buffer_handle) } }else{ - printf("type2AE0Data CRC failed!\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"type2AE0Data CRC failed!\n"); } } @@ -7797,7 +7808,7 @@ void type2AE6Data(ble_read_data *buffer_handle,uint8_t *cmd_buf ,uint8_t *data,u #ifdef BLE_LOG #endif - printf("typeHexOneData:0x%04X\r\n",cmd); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"typeHexOneData:0x%04X\r\n",cmd); // uint8_t typeID = cmd_buf[2]; switch (cmd) { @@ -7887,7 +7898,7 @@ void type2AE6Data(ble_read_data *buffer_handle,uint8_t *cmd_buf ,uint8_t *data,u void dumpHeader(msg_header_t *msgheader) { #ifdef BLE_LOG - printf("dumpHeader(%d) direction %02X, type %02X, id %02X, package_count %d, total_data_len %d,package_index %d , package_len %d\n", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"dumpHeader(%d) direction %02X, type %02X, id %02X, package_count %d, total_data_len %d,package_index %d , package_len %d\n", sizeof(msg_header_t), msgheader->direction, msgheader->cmdtype, @@ -7912,7 +7923,7 @@ errcode_t check_header(msg_header_t *header ) return ERRCODE_SUCC; }else{ //非header - // printf("not first package , no header!\n"); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"not first package , no header!\n"); return ERRCODE_FAIL; } } @@ -8016,7 +8027,7 @@ errcode_t handle_recv_file(ble_read_data *buffer_handle,uint8_t *data, uint16_t { if (check_package_same(buffer_handle->last_data_sample,data,event_size) == ERRCODE_SUCC) { - printf("Error handle_recv_file recve same package header 0x%02X%02X%02X%02X end 0x%02X skip \n" + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"Error handle_recv_file recve same package header 0x%02X%02X%02X%02X end 0x%02X skip \n" ,buffer_handle->last_data_sample[0] ,buffer_handle->last_data_sample[1] ,buffer_handle->last_data_sample[2] @@ -8025,7 +8036,7 @@ errcode_t handle_recv_file(ble_read_data *buffer_handle,uint8_t *data, uint16_t // return ERRCODE_FAIL; } } - printf("handle_recv_file %d\n",event_size); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"handle_recv_file %d\n",event_size); save_package_sample(buffer_handle,data,event_size); @@ -8036,7 +8047,7 @@ errcode_t handle_recv_file(ble_read_data *buffer_handle,uint8_t *data, uint16_t if (buffer_handle->file_recv_stat.file_type == 1) { buffer_handle->file_recv_stat.file = fopen("/update/update.fwpkg","w+"); - printf("create file /update/update.fwpkg %X\n",buffer_handle->file_recv_stat.file); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"create file /update/update.fwpkg %X\n",buffer_handle->file_recv_stat.file); } else if (buffer_handle->file_recv_stat.file_type == 2) @@ -8048,7 +8059,7 @@ errcode_t handle_recv_file(ble_read_data *buffer_handle,uint8_t *data, uint16_t create_mp3_name(filepath,musicpath,buffer_handle->file_recv_stat.file_name); buffer_handle->file_recv_stat.file = fopen(filepath,"w+"); - printf("filepath %s\r\n",filepath); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"filepath %s\r\n",filepath); } else { @@ -8056,14 +8067,14 @@ errcode_t handle_recv_file(ble_read_data *buffer_handle,uint8_t *data, uint16_t if (get_file_recv_file_path(buffer_handle->file_recv_stat.file_name,strlen(buffer_handle->file_recv_stat.file_name),filepath,sizeof(filepath)) == ERRCODE_SUCC) { buffer_handle->file_recv_stat.file = fopen(filepath,"w+"); - printf("create file %s %X\n",filepath,buffer_handle->file_recv_stat.file); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"create file %s %X\n",filepath,buffer_handle->file_recv_stat.file); }else{ - printf("create file %s error %X\n",buffer_handle->file_recv_stat.file_name,buffer_handle->file_recv_stat.file); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"create file %s error %X\n",buffer_handle->file_recv_stat.file_name,buffer_handle->file_recv_stat.file); } } if (buffer_handle->file_recv_stat.file == NULL) { - printf("6185 buffer_handle->file_recv_stat.file NULL\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"6185 buffer_handle->file_recv_stat.file NULL\n"); return ERRCODE_FAIL; } buffer_handle->file_recv_stat.recv_file_stat = 1; @@ -8093,7 +8104,7 @@ errcode_t handle_recv_file(ble_read_data *buffer_handle,uint8_t *data, uint16_t } if (buffer_handle->file_recv_stat.file == NULL) { - printf("6194 buffer_handle->file_recv_stat.file \n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"6194 buffer_handle->file_recv_stat.file \n"); return ERRCODE_FAIL; } //写入文件 @@ -8104,12 +8115,12 @@ errcode_t handle_recv_file(ble_read_data *buffer_handle,uint8_t *data, uint16_t buffer_handle->file_recv_stat.lrcvalue = calculate_lrc(data,event_size,buffer_handle->file_recv_stat.lrcvalue); buffer_handle->file_recv_stat.received_size += event_size; - printf("handle_recv_file received_size %d\n",buffer_handle->file_recv_stat.received_size); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"handle_recv_file received_size %d\n",buffer_handle->file_recv_stat.received_size); OTA_FILE_value= ((float) buffer_handle->file_recv_stat.received_size / (float)buffer_handle->file_recv_stat.file_size) *100; }else{ - printf("handle_recv_file write file failed! ret %d != %d\n",writtensize,event_size); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"handle_recv_file write file failed! ret %d != %d\n",writtensize,event_size); return ERRCODE_FAIL; } @@ -8128,7 +8139,7 @@ errcode_t handle_recv_file(ble_read_data *buffer_handle,uint8_t *data, uint16_t } buffer_handle->file_recv_stat.recv_file_stat = 2; buffer_handle->receive_file_flag = 0; - printf("handle_recv_file received success \n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"handle_recv_file received success \n"); if(BR_TRANSFER_timer) { @@ -8149,7 +8160,7 @@ void bleLongRecvData(ble_read_data *buffer_handle,uint8_t *data, uint16_t data_s { uint8_t type=buf_cmd[1]; #ifdef BLE_LOG - printf("type:%d %d data_size:%d data:%x crcvalue:%x\r\n", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"type:%d %d data_size:%d data:%x crcvalue:%x\r\n", buffer_handle->cmd_header.cmdtype, buffer_handle->cmd_header.cmdid, data_size, @@ -8192,7 +8203,7 @@ static errcode_t handle_ble_msg(ble_read_data *buffer_handle) }else{ //处理缓存成文件的 - printf("handle ble msg file buffer! not implement\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"handle ble msg file buffer! not implement\n"); } return ERRCODE_SUCC; } @@ -8255,7 +8266,7 @@ errcode_t combine_data_internal(ble_read_data *buffer_handle,uint8_t *totalData, buffer_handle->totalDataLen = buffer_handle->cmd_header.total_data_len; if (buffer_handle->totalDataLen > MAX_BLE_MSG_PACKAGE_LEN || buffer_handle->totalDataLen < 0 ) { - printf("package is too lardge (%d) than (%d) or too small !\n",buffer_handle->totalDataLen,MAX_BLE_MSG_PACKAGE_LEN); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"package is too lardge (%d) than (%d) or too small !\n",buffer_handle->totalDataLen,MAX_BLE_MSG_PACKAGE_LEN); return ERRCODE_FAIL; } if(buffer_handle->totalDataLen+sizeof(msg_header_t)+1 > MAX_BLE_MSG_PACKAGE_LEN) @@ -8271,13 +8282,13 @@ errcode_t combine_data_internal(ble_read_data *buffer_handle,uint8_t *totalData, //生成临时文件名 sprintf_s((char*)buffer_handle->data,filelen,BLE_MSG_TMP_FILE_NAME,buffer_handle->handle); buffer_handle->tmpfilehandle = fopen((const char*)buffer_handle->data,"w+"); - printf("create ble protocol tmpfile %s handle %X\n",buffer_handle->data,buffer_handle->tmpfilehandle); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"create ble protocol tmpfile %s handle %X\n",buffer_handle->data,buffer_handle->tmpfilehandle); if (buffer_handle->tmpfilehandle != NULL) { //写buffer到文件 size_t ret =fwrite(totalData,1,event_size,buffer_handle->tmpfilehandle); buffer_handle->lrcvalue = calculate_lrc(totalData+sizeof(msg_header_t),header->package_len,0x00); - printf("write %d to buffer file!\n",ret); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"write %d to buffer file!\n",ret); } buffer_handle->data_len += event_size; @@ -8338,7 +8349,7 @@ errcode_t combine_data_internal(ble_read_data *buffer_handle,uint8_t *totalData, buffer_handle->lrcvalue = calculate_lrc(totalData,event_size,buffer_handle->lrcvalue); buffer_handle->data_len += event_size; }else{ //异常帧 - printf("error event_size %d , should <= %d\n",event_size, (buffer_handle->totalDataLen + sizeof(msg_header_t) + 1 - buffer_handle->data_len) ); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"error event_size %d , should <= %d\n",event_size, (buffer_handle->totalDataLen + sizeof(msg_header_t) + 1 - buffer_handle->data_len) ); } @@ -8393,11 +8404,11 @@ void bleDataRecv(uint8_t *totalData, uint16_t event_size,uint16_t handle) if (event_size < sizeof(msg_header_t)) { - printf("event size (%d) is less than msg_header_t (%d) ",event_size,sizeof(msg_header_t)); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"event size (%d) is less than msg_header_t (%d) ",event_size,sizeof(msg_header_t)); // return ; } #ifdef BLE_LOG - printf("bleDataRecv handle:%d\r\n",handle); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"bleDataRecv handle:%d\r\n",handle); #endif int last_unused_handle_index = -1; int handle_index_found = -1; @@ -8422,12 +8433,12 @@ void bleDataRecv(uint8_t *totalData, uint16_t event_size,uint16_t handle) if(handle_index_found>=0) { - // printf("handle_index_found:index %d addr %X\r\n",handle_index_found,&handle_l[handle_index_found]); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"handle_index_found:index %d addr %X\r\n",handle_index_found,&handle_l[handle_index_found]); handle_l[handle_index_found].handle = handle; combine_data_internal(&handle_l[handle_index_found],totalData,event_size); } else - printf("no empty handle_l found! skip this msg!\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"no empty handle_l found! skip this msg!\n"); } @@ -8485,7 +8496,7 @@ bool send_AI_is_ready_(uint8_t type) if(AI_is_end_state==0) { - printf("发送AI准备就绪\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"发送AI准备就绪\r\n"); ble_data_type type_={0x05,0x05,1,1,1}; send_big_data(type_,(char *)&type,1); AI_is_end_state=1; @@ -8493,7 +8504,7 @@ bool send_AI_is_ready_(uint8_t type) } else { - printf("发送AI准备就绪失败,没有正确回复结束\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"发送AI准备就绪失败,没有正确回复结束\r\n"); return false; } //send_big_data(0, (char *)&type, 1, 1, 1, 1, 0x05, 5); @@ -8512,7 +8523,7 @@ void cancel_AI_cur_chat_(void) { if(AI_is_end_state) { - printf("取消当前AI对话\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"取消当前AI对话\r\n"); uint8_t data=1; ble_data_type type_={0x05,0x07,1,1,1}; send_big_data(type_,(char *)&data,1); @@ -8521,7 +8532,7 @@ void cancel_AI_cur_chat_(void) } else { - printf("已经取消当前AI对话无需再次取消\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"已经取消当前AI对话无需再次取消\r\n"); } @@ -8531,7 +8542,7 @@ void cancel_AI_cur_chat_(void) //接收app下发的原始数据 void revBleOldData(uint8_t *buf, uint16_t event_size,uint16_t handle)//每包的数据大小 { - printf("handle :%d %s event_size %d\r\n",handle,getHandlname(handle),event_size); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"handle :%d %s event_size %d\r\n",handle,getHandlname(handle),event_size); if(handle==0xff) { if(strcmp("AI_cancel_AI",(char *)buf)==0) diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h index 00184e474..8dc3ef44a 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h @@ -9,7 +9,7 @@ extern "C" { #include "stdbool.h" #include "errcode.h" #include "bts_def.h" -//#include "bletest.h" +// #include "bletest.h" #define PHONE_WATCH_CONFIG_PATH "/user/userdata/phone_watch.json" #define ALARM_DATA_CONFIG_PATH "/user/userdata/alarm_test.json" #define ANCS_DATA_CONFIG_DIR "/user/userdata/message" @@ -20,6 +20,8 @@ extern "C" { #define ANCS_DATA_MSG_CJSON_PATH "/user/userdata/message/%d.json" //消息文件可以任意更改 + + #define READ_FLASH_DATA 0x01 //读flash数据 #define WRITE_FLASH_DATA 0x02 //写flash数据 bool creatMessageDir(void);//创建消息文件夹 -- 2.17.1