diff --git a/custom/custom_main/src/custom_main.c b/custom/custom_main/src/custom_main.c index dd6418c..b2e9d95 100644 --- a/custom/custom_main/src/custom_main.c +++ b/custom/custom_main/src/custom_main.c @@ -155,7 +155,7 @@ void my_appimg_enter(char *param){ } local_tts_init(); local_tts_mute(0);// 取消静音 - local_tts_volume(40); // 设置音量为55 + local_tts_volume(100); // 设置音量为55 // local_tts_set(7, 7, CM_LOCAL_TTS_DIGIT_AUTO); local_tts_text_play("已开机",0,0); diff --git a/custom/jt808/src/jt808_msg_parse.c b/custom/jt808/src/jt808_msg_parse.c index c75cf09..20fa984 100644 --- a/custom/jt808/src/jt808_msg_parse.c +++ b/custom/jt808/src/jt808_msg_parse.c @@ -168,6 +168,8 @@ static int jt808_BodyParse(void *Prsmsg_body, PrsResult_t *Result){ // 启动升级处理流程(同步执行) // start_upgrade_process(&Result->big_upgrade_info); + local_tts_text_play("软件升级流程开始,请勿断电",0,0); + local_tts_text_play("升级完成后会自动重启",0,0); const char *url = Result->term_param_item->big_upgrade_info.file_path; if(!is_valid_url(url)) { JT808_DEBUG("Invalid URL: %s\n", url); @@ -216,7 +218,7 @@ static int jt808_BodyParse(void *Prsmsg_body, PrsResult_t *Result){ break; } - osDelay(200/5); + osDelay(2000/5); cm_fota_exec_upgrade(); } @@ -248,13 +250,13 @@ static int jt808_BodyParse(void *Prsmsg_body, PrsResult_t *Result){ local_tts_set(speed, volume, mode); }else{ JT808_DEBUG("error speed or volume or mode\r\n"); - local_tts_volume(50); // 设置音量大小 + local_tts_volume(100); // 设置音量大小 local_tts_set(6, 7, CM_LOCAL_TTS_DIGIT_AUTO); Result->Rsp_result = Msg_invalid;//消息有误 } }else{ JT808_DEBUG("error speed or volume or mode\r\n"); - local_tts_volume(80); // 设置音量大小 + local_tts_volume(100); // 设置音量大小 local_tts_set(7, 15, CM_LOCAL_TTS_DIGIT_AUTO); Result->Rsp_result = Msg_invalid;//消息有误 } diff --git a/tools/adiff/system_new.img b/tools/adiff/system_new.img index c80c46c..376377d 100644 Binary files a/tools/adiff/system_new.img and b/tools/adiff/system_new.img differ diff --git a/tools/adiff/system_old.img b/tools/adiff/system_old.img index c80c46c..376377d 100644 Binary files a/tools/adiff/system_old.img and b/tools/adiff/system_old.img differ diff --git a/tools/adiff/system_patch.bin b/tools/adiff/system_patch.bin index 3c00d03..481fffe 100644 Binary files a/tools/adiff/system_patch.bin and b/tools/adiff/system_patch.bin differ diff --git a/tools/adiff/user_app.bin b/tools/adiff/user_app.bin index 1e7fa67..e89713b 100644 Binary files a/tools/adiff/user_app.bin and b/tools/adiff/user_app.bin differ diff --git a/tools/adiff/1.2.3/ML307A_DSLN_APP.zip b/tools/adiff/原始1.2.3/ML307A_DSLN_APP.zip similarity index 99% rename from tools/adiff/1.2.3/ML307A_DSLN_APP.zip rename to tools/adiff/原始1.2.3/ML307A_DSLN_APP.zip index 4179fbc..1c2374d 100644 Binary files a/tools/adiff/1.2.3/ML307A_DSLN_APP.zip and b/tools/adiff/原始1.2.3/ML307A_DSLN_APP.zip differ