fix: improve timeout prompt randomization

build_rel.bat

@@ -1,6 +1,8 @@
 @echo off
 set CURDIR=%~dp0
-for /f %%i in ('powershell -NoProfile -Command "Get-Date -Format yyyyMMddHHmmss"') do set appbuildtime=%%i
+set time0=%time: =0%
+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 appbuildmodel=EG800AKCN_11LG
 set appbuildver=beta1

ql-application/threadx/interface/custom_app/hal_key.c

@@ -29,7 +29,6 @@ extern int fota_start;
 #define KEY_LONG_PRESS_1S 1000/5
 #define KEY_LONG_PRESS_1_5S 1500/5
 #define KEY_LONG_PRESS_3S  3000/5
-#define PWRKEY_SOFT_SHUTDOWN_TEST  8000/5
 #define KEY_LONG_PRESS_5S  5000/5
 #define KEY_LONG_PRESS_10S  10000/5
 
@@ -115,7 +114,7 @@ static void key_thread_entry(void *parameter)
 				if(level!=0){		//up
 					key_press_mic_status = 0;
 
-					if(ql_rtos_get_systicks() - key_press_mic_time > PWRKEY_SOFT_SHUTDOWN_TEST){
+					if(ql_rtos_get_systicks() - key_press_mic_time > KEY_LONG_PRESS_3S){
 						//app_play_tips_file(10);
 					//	power_down_status = 1;
 						ql_rtos_task_sleep_s(3);
@@ -149,7 +148,7 @@ static void key_thread_entry(void *parameter)
 							key_press_mic_status = 1;//表示已经按下了
 						}
 
-					if(ql_rtos_get_systicks() - key_press_mic_time > PWRKEY_SOFT_SHUTDOWN_TEST && power_down_status==0){
+					if(ql_rtos_get_systicks() - key_press_mic_time > KEY_LONG_PRESS_3S && power_down_status==0){
 						power_down_status = 1;
 						app_play_tips_file(10);
 						power_down_status = 2;

ql-application/threadx/interface/custom_app/mqtt.c

@@ -368,7 +368,7 @@ int parse_event_response(const char *json_str, response_t *resp)
         }
         else {
             // ===== 原有逻辑: NFC事件 - 动态查找 url_x 字段 =====
-            for (int i = 1; i <= 10; i++) {
+            for (int i = 1; i <= 5; i++) {
                 char key[16];
                 snprintf(key, sizeof(key), "url_%d", i);
                 cJSON *url = cJSON_GetObjectItem(params, key);

ql-application/threadx/interface/custom_app/ws_talkingq.c

@@ -21,6 +21,7 @@
 #include "ql_ping.h"
 #include "ql_nw.h"
 #include "ql_atcmd.h"
+#include "ql_platform.h"
 #include "layer3.h"
 #include "ql_uart.h"
 #include "hal_api.h"
@@ -29,6 +30,8 @@
 
 
 #define PCM_FRAME_LENGTH    1152
+#define CLOUD_TTS_ERROR_URL_FORMAT \
+    "http://101.35.224.118:8080/assets/roles/banban/tts_error/tts_error%02u.mp3"
 
 static int g_sim_ready = 0;
 
@@ -187,6 +190,56 @@ static void remove_underscores(char *str) {
     *dst = '\0'; // 添加字符串结束符
 }
 
+/*
+ * 将后台下发的任意角色对话超时音频 URL 改为 banban 角色的 HTTP 地址，
+ * 并在 tts_error00~tts_error09 中随机选择一条。
+ */
+static int randomize_tts_error_url(char *url, size_t url_size)
+{
+    static uint32_t random_sequence = 0;
+    static unsigned int last_random_index = 10;
+    char *file_name;
+    uint32_t random_value;
+    unsigned int random_index;
+    int written;
+
+    if(url == NULL || url_size == 0){
+        return 0;
+    }
+
+    file_name = strrchr(url, '/');
+    file_name = (file_name == NULL) ? url : file_name + 1;
+
+    if(strncmp(file_name, "tts_error", strlen("tts_error")) != 0 &&
+       strncmp(file_name, "tts_err", strlen("tts_err")) != 0){
+        return 0;
+    }
+
+    /*
+     * 某些设备上硬件随机接口可能持续返回 0，因此混合伪随机数、系统 tick
+     * 和递增序列；若仍与上一次相同，则向后偏移，避免连续重复播放。
+     */
+    random_sequence++;
+    random_value = hal_os_get_rand();
+    random_value ^= ql_pseudo_random_number();
+    random_value ^= ql_rtos_get_systicks();
+    random_value ^= random_sequence * 0x9E3779B9U;
+    random_index = random_value % 10;
+    if(random_index == last_random_index){
+        random_index = (random_index + 1 + (random_sequence % 9)) % 10;
+    }
+    last_random_index = random_index;
+
+    written = snprintf(url, url_size, CLOUD_TTS_ERROR_URL_FORMAT, random_index);
+    if(written < 0 || (size_t)written >= url_size){
+        printf("random tts error url buffer too small\n");
+        return -1;
+    }
+
+    printf("random cloud tts error index:%02u, url:%s\n", random_index, url);
+    return 1;
+}
+
 void add_file_to_play_player_queue(char *path, int type)
 {
 	ice_work_item *item = NULL;
@@ -256,14 +309,32 @@ static void onmessage_text(rws_socket socket, const char *text, const unsigned i
 			
 		}else{//TTS_URL:audio_url
 			wss_connect_start = 0;
-			char *ret_str1= strstr(text, "http:");
-			char *ret_str2= strstr(text, ".mp3");
-			int len = 0;
+			char *ret_str1 = strstr(text, "https://");
+			char *ret_str2 = NULL;
+			size_t url_len = 0;
+			int is_tts_error_url = 0;
+			if(ret_str1 == NULL){
+				ret_str1 = strstr(text, "http://");
+			}
+			if(ret_str1 != NULL){
+				ret_str2 = strstr(ret_str1, ".mp3");
+			}
 			if(ret_str1!=NULL && ret_str2!=NULL){
-	
-				len = strlen(ret_str1)-strlen(ret_str2);
-				strncpy(url_buff, ret_str1, len);
-				sprintf(url_buff+len, "%s", ".mp3");
+
+				/* 提取完整的 HTTP/HTTPS MP3 URL，结尾额外包含“.mp3”四个字符 */
+				url_len = (size_t)(ret_str2 - ret_str1) + strlen(".mp3");
+				if(url_len >= sizeof(url_buff)){
+					printf("audio url too long:%d\n", (int)url_len);
+					return;
+				}
+				memcpy(url_buff, ret_str1, url_len);
+				url_buff[url_len] = '\0';
+
+				/* 两个角色统一使用 banban 的 HTTP 随机超时提示音 */
+				is_tts_error_url = randomize_tts_error_url(url_buff, sizeof(url_buff));
+				if(is_tts_error_url < 0){
+					return;
+				}
 
 				memcpy(url_buff_bak, url_buff, strlen(url_buff)+1);
 				
@@ -282,7 +353,7 @@ static void onmessage_text(rws_socket socket, const char *text, const unsigned i
 					tts_play_status = 2;
 				}
 
-				if(strstr(url_buff, "tts_error")!=NULL || strstr(url_buff, "message_ok")!=NULL){
+				if(is_tts_error_url == 1 || strstr(url_buff, "message_ok")!=NULL){
 					printf("tts_error or message_ok\n");
 					vad_set_speech_timeout_flag(1);
 				}

ql-kernel/threadx/pmic/pmic.c

@@ -3741,10 +3741,6 @@ extern void chargeManagePhase2Init(void);
 void PMIC_Phase2Init(void)
 {
     INTC_ReturnCode intcStatus;
-	#if !defined(NOT_SUPPORT_PM807)
-	UINT8 longkey_e3;
-	UINT8 longkey_e4;
-	#endif
 
 	PMIC_UART_DEBUG("PMIC_Phase2Init");
 
@@ -3784,30 +3780,6 @@ void PMIC_Phase2Init(void)
         #if !defined(NOT_SUPPORT_PM807)
         case PMIC_807:
             GuilinLite3ClkInit();
-			longkey_e3 = PMIC_READ_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG);
-			longkey_e4 = PMIC_READ_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG);
-			RTI_LOG("PM807 LONGKEY before: E3=0x%x time=%ds E4=0x%x en1=%d en2=%d",
-				longkey_e3, (((longkey_e3 >> 4) & 0x0f) + 1), longkey_e4,
-				!!(longkey_e4 & GUILIN_LITE3_LONGKEY_EN1),
-				!!(longkey_e4 & GUILIN_LITE3_LONGKEY_EN2));
-
-			PM812_SET_LONKEY_PRESS_TIME(2);
-			PM812_LONKEY_ENABLE_SET(GUILIN_LITE3_LONGKEY_1, TRUE);
-			PM812_LONKEY_ENABLE_SET(GUILIN_LITE3_LONGKEY_2, TRUE);
-
-			longkey_e3 = PMIC_READ_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG);
-			longkey_e4 = PMIC_READ_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG);
-			RTI_LOG("PM807 LONGKEY after: E3=0x%x time=%ds E4=0x%x en1=%d en2=%d",
-				longkey_e3, (((longkey_e3 >> 4) & 0x0f) + 1), longkey_e4,
-				!!(longkey_e4 & GUILIN_LITE3_LONGKEY_EN1),
-				!!(longkey_e4 & GUILIN_LITE3_LONGKEY_EN2));
-			if ((((longkey_e3 >> 4) & 0x0f) != 1) ||
-				((longkey_e4 & (GUILIN_LITE3_LONGKEY_EN1 | GUILIN_LITE3_LONGKEY_EN2)) !=
-				 (GUILIN_LITE3_LONGKEY_EN1 | GUILIN_LITE3_LONGKEY_EN2)))
-			{
-				RTI_LOG("PM807 LONGKEY configure failed: E3=0x%x E4=0x%x",
-					longkey_e3, longkey_e4);
-			}
     //        GuilinLite3_VBUCK1_Set_FPWM();
             break;
         #endif
@@ -4259,13 +4231,6 @@ UINT8 PM812_GET_LONKEY_PRESS_TIME(void)
     	return (((tmp >> 4) & 0x0f) + 1);
 	}
 	#endif
-	#if !defined(NOT_SUPPORT_PM807)
-	else if(PMIC_IS_PM807())
-	{
-		tmp = PMIC_READ_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG);
-		return (((tmp >> 4) & 0x0f) + 1);
-	}
-	#endif
 	else
 	{
 		return tmp;
@@ -4276,10 +4241,6 @@ UINT8 PM812_GET_LONKEY_PRESS_TIME(void)
 void PM812_SET_LONKEY_PRESS_TIME(UINT8 sec)
 {
     UINT8 tmp;
-	#if !defined(NOT_SUPPORT_PM807)
-	UINT8 target;
-	UINT8 bit;
-	#endif
 
     #if !defined(NOT_SUPPORT_PM802)
 	if (PMIC_IS_PM802()||PMIC_IS_PM802S())
@@ -4307,30 +4268,6 @@ void PM812_SET_LONKEY_PRESS_TIME(UINT8 sec)
     	PMIC_WRITE_REG_BASE(NINGBO_RTC_MISC_3_REG,(tmp|sec));
 	}
 	#endif
-	#if !defined(NOT_SUPPORT_PM807)
-	else if(PMIC_IS_PM807())
-	{
-		if ((sec < 1) || (sec > 16))
-		{
-			RTI_LOG("PM807 invalid LONGKEY time: %d", sec);
-			return;
-		}
-
-		tmp = PMIC_READ_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG);
-		target = (tmp & 0x0f) | ((sec - 1) << 4);
-
-		/* RTC_MISC_3 may only accept one changed bit per write. */
-		for (bit = 4; bit < 8; bit++)
-		{
-			if ((tmp ^ target) & (1 << bit))
-			{
-				tmp = (tmp & ~(1 << bit)) | (target & (1 << bit));
-				PMIC_WRITE_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG, tmp);
-				tmp = PMIC_READ_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG);
-			}
-		}
-	}
-	#endif
 }
 
 void PM812_LONKEY_ENABLE_SET(UINT8 LONGKEY_NUM,BOOL enable)
@@ -4387,22 +4324,6 @@ void PM812_LONKEY_ENABLE_SET(UINT8 LONGKEY_NUM,BOOL enable)
         }
 	}
 	#endif
-	#if !defined(NOT_SUPPORT_PM807)
-	else if(PMIC_IS_PM807())
-	{
-		tmp = PMIC_READ_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG);
-		if(LONGKEY_NUM == GUILIN_LITE3_LONGKEY_1)
-		{
-			enable ? (tmp |= GUILIN_LITE3_LONGKEY_EN1) : (tmp &= (~GUILIN_LITE3_LONGKEY_EN1));
-			PMIC_WRITE_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG, tmp);
-		}
-		else if(LONGKEY_NUM == GUILIN_LITE3_LONGKEY_2)
-		{
-			enable ? (tmp |= GUILIN_LITE3_LONGKEY_EN2) : (tmp &= (~GUILIN_LITE3_LONGKEY_EN2));
-			PMIC_WRITE_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG, tmp);
-		}
-	}
-	#endif
 }
 
 //LONGKEY_NUM: 1/2
@@ -4431,13 +4352,6 @@ BOOL PM812_LONKEY_ENABLE_GET(UINT8 LONGKEY_NUM)
             ((LONGKEY_NUM==NINGBO_LONGKEY_1)?NINGBO_LONGKEY_EN1:NINGBO_LONGKEY_EN2));
 	}
 	#endif
-	#if !defined(NOT_SUPPORT_PM807)
-	else if(PMIC_IS_PM807())
-	{
-		return (PMIC_READ_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG) &
-			((LONGKEY_NUM == GUILIN_LITE3_LONGKEY_1) ? GUILIN_LITE3_LONGKEY_EN1 : GUILIN_LITE3_LONGKEY_EN2));
-	}
-	#endif
 	else
 	{
 		PMIC_UART_DEBUG("PM812_LONKEY_ENABLE_GET: it shouldn't reach here, NUM=%d",LONGKEY_NUM);