Author SHA1 Message Date
Your Name e49bb9888f fix: use locale-independent OTA build timestamp 2026-09-21 18:10:03 +08:00
chenjintao 91e9b2e66b chore: messages increase from 5 to 10 2026-09-21 11:09:18 +08:00
6 changed files with 12 additions and 91 deletions
+1 -3
View File
@@ -1,8 +1,6 @@
@echo off @echo off
set CURDIR=%~dp0 set CURDIR=%~dp0
set time0=%time: =0% for /f %%i in ('powershell -NoProfile -Command "Get-Date -Format yyyyMMddHHmmss"') do set appbuildtime=%%i
set hour=%time0:~0,2%
set appbuildtime=%date:~0,4%%date:~5,2%%date:~8,2%%hour%%time:~3,2%%time:~6,2%
set appbuildrev=NULL set appbuildrev=NULL
set appbuildmodel=EG800AKCN_11LG set appbuildmodel=EG800AKCN_11LG
set appbuildver=beta1 set appbuildver=beta1
@@ -5,7 +5,6 @@
#include "ql_iic.h" #include "ql_iic.h"
#include "ql_gpio.h" #include "ql_gpio.h"
#include "app_inc.h" #include "app_inc.h"
#include "audio_prompt.h"
#include "ql_fs.h" #include "ql_fs.h"
#define DEFAULT_VOLUME 6 #define DEFAULT_VOLUME 6
@@ -15,6 +14,7 @@
u8 g_cur_volume = 0; u8 g_cur_volume = 0;
u8 g_pre_volume = 0; u8 g_pre_volume = 0;
extern const char *mp3_file[];
extern int g_file_valid; extern int g_file_valid;
@@ -14,9 +14,7 @@
#include "sockets.h" #include "sockets.h"
#include "layer3.h" #include "layer3.h"
#include "ql_uart.h" #include "ql_uart.h"
#include "audio_prompt.h" const char *mp3_file[] ={
const char *mp3_file[AUDIO_PROMPT_FILE_COUNT] ={
"test.mp3",// 0 "test.mp3",// 0
"network_connect_zh.mp3",//1 系统启动中,正在等待网络连接 "network_connect_zh.mp3",//1 系统启动中,正在等待网络连接
"network_check.mp3",//2 网络不好 请检查网络 "network_check.mp3",//2 网络不好 请检查网络
@@ -33,16 +31,9 @@ const char *mp3_file[AUDIO_PROMPT_FILE_COUNT] ={
"device_wake_up_zh.mp3",//13 设备已唤醒 "device_wake_up_zh.mp3",//13 设备已唤醒
"low_power_zh.mp3",//14 电量低 "low_power_zh.mp3",//14 电量低
"low_power_off_zh.mp3",//15 电量严重不足,马上关机 "low_power_off_zh.mp3",//15 电量严重不足,马上关机
"volume_up_zh.mp3",//16 "volume_up_zh.mp3",//16
"volume_down_zh.mp3",//17 "volume_down_zh.mp3",//17
"ai_active_zh.mp3",//18 "ai_active_zh.mp3",//18
/* 19~24:对话响应超时随机提示音,文件名与资源服务器保持一致 */
"tts_error01.mp3",//19
"tts_error02.mp3",//20
"tts_error03.mp3",//21
"tts_error04.mp3",//22
"tts_error05.mp3",//23
"tts_error06.mp3",//24
}; };
//http://banban.api.talkingq.com:8080/assets/roles/banban/tts_error.mp3 //http://banban.api.talkingq.com:8080/assets/roles/banban/tts_error.mp3
@@ -192,8 +183,7 @@ void app_file_check_download(void)
char filename_buff[64]={0x00}; char filename_buff[64]={0x00};
int ret = 0, cnt = 0; int ret = 0, cnt = 0;
/* 遍历完整资源表,新增提示音不存在时会在联网后自动补下载 */ for(index=1;index<19;index++){
for(index=1;index<AUDIO_PROMPT_FILE_COUNT;index++){
if(index==4||index==5||index==6||index==7||index==8){ if(index==4||index==5||index==6||index==7||index==8){
continue; continue;
@@ -218,7 +208,7 @@ void app_file_check_del(void)
int index = 1; int index = 1;
char filename_buff[64]={0x00}; char filename_buff[64]={0x00};
for(index=1;index<AUDIO_PROMPT_FILE_COUNT;index++){ for(index=1;index<19;index++){
if(index==4||index==5||index==6||index==7||index==8){ if(index==4||index==5||index==6||index==7||index==8){
continue; continue;
@@ -1,19 +0,0 @@
#ifndef _AUDIO_PROMPT_H_
#define _AUDIO_PROMPT_H_
/*
* 本地提示音索引约定。
* 现有索引保持不变,新增的 6 条对话响应超时音频从 19 开始追加,
* 避免影响项目中已经使用的其他提示音索引。
*/
#define AUDIO_PROMPT_TTS_ERROR_INDEX 9
#define AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX 19
#define AUDIO_PROMPT_TTS_ERROR_LAST_INDEX 24
#define AUDIO_PROMPT_FILE_COUNT 25
extern const char *mp3_file[AUDIO_PROMPT_FILE_COUNT];
int app_play_tips_file(int index);
int app_play_random_tts_error(void);
#endif
@@ -368,7 +368,7 @@ int parse_event_response(const char *json_str, response_t *resp)
} }
else { else {
// ===== 原有逻辑: NFC事件 - 动态查找 url_x 字段 ===== // ===== 原有逻辑: NFC事件 - 动态查找 url_x 字段 =====
for (int i = 1; i <= 5; i++) { for (int i = 1; i <= 10; i++) {
char key[16]; char key[16];
snprintf(key, sizeof(key), "url_%d", i); snprintf(key, sizeof(key), "url_%d", i);
cJSON *url = cJSON_GetObjectItem(params, key); cJSON *url = cJSON_GetObjectItem(params, key);
@@ -25,7 +25,6 @@
#include "ql_uart.h" #include "ql_uart.h"
#include "hal_api.h" #include "hal_api.h"
#include "fvad.h" #include "fvad.h"
#include "audio_prompt.h"
@@ -780,16 +779,12 @@ void sendRecordingAudioPacket(AudioPacket *packet) {
} }
#endif #endif
extern const char *mp3_file[];
int app_play_tips_file(int index) int app_play_tips_file(int index)
{ {
int file_valid_check = 0; int file_valid_check = 0;
/* 防止提示音索引越界访问文件名数组 */
if(index < 0 || index >= AUDIO_PROMPT_FILE_COUNT){
printf("invalid prompt index:%d\n", index);
return -3;
}
printf("xiaoice_play_index:%d\n", index); printf("xiaoice_play_index:%d\n", index);
//正在录音过程中不允许播放 //正在录音过程中不允许播放
@@ -825,48 +820,6 @@ int app_play_tips_file(int index)
return 0; return 0;
} }
/*
* 随机播放一条对话响应超时提示音。
* 只把 LittleFS 中实际存在的文件加入候选列表,新增音频尚未下载完成时,
* 仍可回退播放原来的 tts_error.mp3,不会随机到不存在的文件。
*/
int app_play_random_tts_error(void)
{
static const int timeout_prompt_indices[] = {
AUDIO_PROMPT_TTS_ERROR_INDEX,
AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX,
AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX + 1,
AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX + 2,
AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX + 3,
AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX + 4,
AUDIO_PROMPT_TTS_ERROR_LAST_INDEX
};
int valid_indices[sizeof(timeout_prompt_indices) / sizeof(timeout_prompt_indices[0])];
int valid_count = 0;
int selected_index;
int i;
char filename_buff[64] = {0x00};
for(i = 0; i < (int)(sizeof(timeout_prompt_indices) / sizeof(timeout_prompt_indices[0])); i++){
int prompt_index = timeout_prompt_indices[i];
sprintf(filename_buff, "U:/%s", mp3_file[prompt_index]);
if(ql_access(filename_buff, 0) == 0){ //检查filename_buff指向的文件是否存在
valid_indices[valid_count++] = prompt_index;
}
}
if(valid_count == 0){
printf("no local tts error prompt file\n");
return -2;
}
selected_index = valid_indices[hal_os_get_rand() % valid_count];
printf("random tts_error prompt index:%d, file:%s\n",
selected_index, mp3_file[selected_index]);
return app_play_tips_file(selected_index);
}
void app_player_thread(void *arvg) void app_player_thread(void *arvg)
{ {
ice_work_item *player_item=NULL; ice_work_item *player_item=NULL;
@@ -1070,8 +1023,7 @@ static void check_connect_thread_entry(void *parameter)
printf("tts_error_set_speech1\n"); printf("tts_error_set_speech1\n");
vad_set_speech_timeout_flag(1); vad_set_speech_timeout_flag(1);
/* 对话响应超时后,从本地已有的 7 条提示音中随机播放一条 */ app_play_tips_file(9);
app_play_random_tts_error();
//talkingq_ws_send_text("REQUEST_PROMPT_SOUND:tts_error"); //talkingq_ws_send_text("REQUEST_PROMPT_SOUND:tts_error");
//改为播放本地音频 听不清 请再说一遍 //改为播放本地音频 听不清 请再说一遍
} }