fix: improve timeout prompt randomization

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

@@ -36,7 +36,7 @@ const char *mp3_file[] ={
 	"ai_active_zh.mp3",//18
 };
 
-//http://175.24.73.253/assets/roles/zhuli/zh/tts_error.mp3
+//http://banban.api.talkingq.com:8080/assets/roles/banban/tts_error.mp3
 
 //#define PCM_FILE  "http://47.113.99.138:7050/output_16k.pcm"
 
@@ -194,7 +194,7 @@ void app_file_check_download(void)
 			if(ql_access(filename_buff, 0)!=0){
 				printf("downing mp3 file %d,%s\r\n", index,filename_buff);
 down_loop:
-				sprintf(url_buff, "http://101.35.224.118:8080/assets/roles/banban/%s", mp3_file[index]);
+				sprintf(url_buff, "http://banban.api.talkingq.com:8080/assets/roles/banban/%s", mp3_file[index]);
 				
 				ret = http_file_download(url_buff);
 				if(ret!=0&&cnt++<3)  goto down_loop;	

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

@@ -391,11 +391,12 @@ int parse_event_response(const char *json_str, response_t *resp)
 
 
 /* [FIX] 安全处理 topic 名称，避免越界访问 */
-static void messageArrived(MessageData* data)
+static void messageArrived(MessageData* data)
-{
+{
-    int ret;
+    int ret;
-    uint32 queue_count = 0;
+    int payload_log_len;
-    app_work_item *work_item;
+    uint32 queue_count = 0;
+    app_work_item *work_item;
 
     // 安全获取 topic 字符串（复制到本地缓冲区）
     char topic_buf[128] = {0};
@@ -403,10 +404,16 @@ static void messageArrived(MessageData* data)
     if (topic_len >= sizeof(topic_buf)) {
         topic_len = sizeof(topic_buf) - 1;
     }
-    memcpy(topic_buf, data->topicName->lenstring.data, topic_len);
+    memcpy(topic_buf, data->topicName->lenstring.data, topic_len);
-    topic_buf[topic_len] = '\0';
+    topic_buf[topic_len] = '\0';
-
+
-    // 比较 topic 类型
+    payload_log_len = data->message->payloadlen > 512 ? 512 : (int)data->message->payloadlen;
+    printf("[MQTT-RX] topic=%s len=%d payload=%.*s%s\r\n",
+           topic_buf, (int)data->message->payloadlen, payload_log_len,
+           (const char *)data->message->payload,
+           data->message->payloadlen > (unsigned int)payload_log_len ? "..." : "");
+
+    // 比较 topic 类型
     int is_command = (strstr(topic_buf, "command") != NULL);
     int is_event_resp = (strstr(topic_buf, "event_resp") != NULL) || (strstr(topic_buf, imei_buf) != NULL);
 
@@ -618,15 +625,33 @@ sub_exit:
 //0:代表respone command     
 //1:代表send event
 /* [FIX] 将连接状态检查和发送放在同一锁保护区内，避免竞争 */
-int app_mqtt_publish(char *buf, int len, int type)
+int app_mqtt_publish(char *buf, int len, int type)
-{
+{
-	static uint32_t mqtt_pub_cnt_err=0;
+    static uint32_t mqtt_pub_cnt_err=0;
-	int rc = -1;
+    int rc = -1;
-	MQTTMessage message;
+    int payload_log_len;
-	int cnt = 0;
+    MQTTMessage message;
-	static uint8_t publish_error = 0;
+    int cnt = 0;
-
+    static uint8_t publish_error = 0;
-	// 锁保护：检查连接状态并发送
+    const char *publish_topic = NULL;
+
+    if (type == 0) {
+        publish_topic = respone_topicName;
+    } else if (type == 1) {
+        publish_topic = event_topicName;
+    } else if (type == 2) {
+        publish_topic = event_register;
+    } else {
+        RLOGE("invalid MQTT publish type=%d", type);
+        return -1;
+    }
+
+    payload_log_len = len > 512 ? 512 : len;
+    printf("[MQTT-TX] topic=%s len=%d payload=%.*s%s\r\n",
+           publish_topic, len, payload_log_len, buf,
+           len > payload_log_len ? "..." : "");
+
+    // 锁保护：检查连接状态并发送
 	int lock_ret = ql_rtos_mutex_lock(g_mqtt_public_mutex, 5000);
 	if (lock_ret != 0) {
 		RLOGE("MQTT mutex lock timeout");
@@ -643,18 +668,13 @@ int app_mqtt_publish(char *buf, int len, int type)
 	message.payload = buf;
 	message.payloadlen = len;
 
-	while (cnt++ < 3) {
+    while (cnt++ < 3) {
-		u32 start = ql_rtos_get_systicks();
+        u32 start = ql_rtos_get_systicks();
-		if (type == 0) {
+        rc = MQTTPublish(&client, publish_topic, &message);
-			rc = MQTTPublish(&client, respone_topicName, &message);
+
-		} else if (type == 1) {
+        RLOGD("Pulish time:%d len: %d\n", (ql_rtos_get_systicks()-start)*5, len);
-			rc = MQTTPublish(&client, event_topicName, &message);
+        printf("[MQTT-TX] topic=%s attempt=%d rc=%d\r\n", publish_topic, cnt, rc);
-		} else if (type == 2) {
+        if (rc != 0) {
-			rc = MQTTPublish(&client, event_register, &message);
-		}
-
-		RLOGD("Pulish time:%d len: %d\n", (ql_rtos_get_systicks()-start)*5, len);
-		if (rc != 0) {
 			mqtt_pub_cnt_err++;
 			mqtt_public_error = 1;
 			RLOGE("ERROR Return code from MQTT publish is %d, cnt %d", rc, mqtt_pub_cnt_err);
@@ -1250,23 +1270,34 @@ void handle_nfc_trigger(const char *uuid)
     free(json_str);
 }
 
-void handle_nfc_bind(const char *uuid)
+void handle_nfc_bind(const char *uuid)
-{
+{
-    cJSON *root = cJSON_CreateObject();
+	char iccid[QL_SIM_ICCID_LEN * 2 + 1] = {0};
-	cJSON *data = cJSON_CreateObject();
+	QL_SIM_ERROR_CODE sim_ret;
-    
+	cJSON *root = cJSON_CreateObject();
-    cJSON_AddStringToObject(root, "msg_id", "006");
+	cJSON *data = cJSON_CreateObject();
-    cJSON_AddStringToObject(root, "status", "success");
+
-
+	cJSON_AddStringToObject(root, "msg_id", "006");
-	cJSON_AddStringToObject(data, "uuid", uuid);
+	cJSON_AddStringToObject(root, "status", "success");
-	cJSON_AddItemToObject(root, "data", data);
+
-    
+	cJSON_AddStringToObject(data, "uuid", uuid);
-    char *json_str = cJSON_PrintUnformatted(root);
+
-    cJSON_Delete(root);
+	sim_ret = ql_sim_get_iccid(iccid, sizeof(iccid));
-		
+	if (sim_ret == QL_SIM_SUCCESS && iccid[0] != '\0') {
-    app_mqtt_publish(json_str, strlen(json_str), 0);
+		printf("NFC bind ICCID:%s\r\n", iccid);
-    free(json_str);
+		cJSON_AddStringToObject(data, "iccid", iccid);
-}
+	} else {
+		printf("NFC bind get ICCID failed, ret:%d\r\n", sim_ret);
+	}
+
+	cJSON_AddItemToObject(root, "data", data);
+
+	char *json_str = cJSON_PrintUnformatted(root);
+	cJSON_Delete(root);
+
+	app_mqtt_publish(json_str, strlen(json_str), 0);
+	free(json_str);
+}
 
 
 

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_str1 = strstr(text, "https://");
-			char *ret_str2= strstr(text, ".mp3");
+			char *ret_str2 = NULL;
-			int len = 0;
+			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);
+				/* 提取完整的 HTTP/HTTPS MP3 URL，结尾额外包含“.mp3”四个字符 */
-				strncpy(url_buff, ret_str1, len);
+				url_len = (size_t)(ret_str2 - ret_str1) + strlen(".mp3");
-				sprintf(url_buff+len, "%s", ".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);
 				}