From: @CHENG <2393524978@qq.com> Date: Tue, 18 Feb 2025 08:07:54 +0000 (+0800) Subject: vc demo X-Git-Url: http://git.snicker.com.cn/css/static/script.js?a=commitdiff_plain;h=8d5ce1cd587353c61af838bd1478b95939c2e8c4;p=mirrors%2FASR3603_Z5.git vc demo --- diff --git a/2.sdk/project/Z5_CIRCLE_240_240/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_CIRCLE_240_240/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index 240ee05c..b0b33671 100644 --- a/2.sdk/project/Z5_CIRCLE_240_240/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/Z5_CIRCLE_240_240/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -225,7 +225,7 @@ #define __MMI_CUSTOM_VOICECHAT_SUPPORT__ //#define __MMI_CUSTOM_AIGC_SUPPORT__ -#define __MMI_CUSTOM_AI_AUTHENTICATE_SUPPORT__ +////#define __MMI_CUSTOM_AI_AUTHENTICATE_SUPPORT__ diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_ai_authenticate.h b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_ai_authenticate.h index 91b1e07c..e54cedcb 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_ai_authenticate.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_ai_authenticate.h @@ -20,14 +20,14 @@ extern "C" { #define __MMI_AI_AUTH_DEBUG__ #ifdef __MMI_AI_AUTH_DEBUG__ -#define AI_AUTH_DEBUG_PRINTF(fmt, ...) printf("[AUTH]"fmt, ##__VA_ARGS__) +//#define AI_AUTH_DEBUG_PRINTF(fmt, ...) printf("[AUTH]"fmt, ##__VA_ARGS__) //#define AI_AUTH_DEBUG_PRINTF(fmt, ...) CPUartLogPrintf("[AUTH]"fmt, ##__VA_ARGS__) -//#define AI_AUTH_DEBUG_PRINTF(fmt, ...) cplog_printf("[AUTH]"fmt, ##__VA_ARGS__) +#define AI_AUTH_DEBUG_PRINTF(fmt, ...) cplog_printf("[AUTH]"fmt, ##__VA_ARGS__) #else #define AI_AUTH_DEBUG_PRINTF(fmt, ...) #endif -#define AI_AUTHENTICATE_BASE_URL ("http://dmp.raisound.com/bz-api") // ("https://dmp.raisound.com/bz-api") +#define AI_AUTHENTICATE_BASE_URL ("http://dmp.raisound.com/bz-api") #define AI_AUTHENTICATE_PASSWORD_LEN (64) #define AI_AUTHENTICATE_TOKEN_LEN (64) diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_voicechat_data.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_voicechat_data.c index 4f3ead84..4559a168 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_voicechat_data.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_voicechat_data.c @@ -5,11 +5,15 @@ #ifdef __MMI_CUSTOM_VOICECHAT_SUPPORT__ +static char s_voicechat_dialog_id[MMI_VOICECHAT_MSG_DIALOG_ID_LEN + 1] = {0}; +static char s_voicechat_trace_id[MMI_VOICECHAT_MSG_TRACE_ID_LEN + 1] = {0}; +static char s_voicechat_server_state = -1; +static bool s_voicechat_recv_tts_flag = false; + static void mmi_voicechat_data_send_task_msg_send(MMI_VOICECHAT_DATA_SEND_MSG_ID_E msg_id, void * param, uint32_t param_size); -static char s_voicechat_dialog_id[MMI_VOICECHAT_MSG_DIALOG_ID_LEN + 1] = {0}; void mmi_voicechat_dialog_id_set(char * id) { if(NULL == id) @@ -24,7 +28,6 @@ char * mmi_voicechat_dialog_id_get(void) return s_voicechat_dialog_id; } -static char s_voicechat_trace_id[MMI_VOICECHAT_MSG_TRACE_ID_LEN + 1] = {0}; void mmi_voicechat_trace_id_set(char * id) { if(NULL == id) @@ -39,37 +42,21 @@ char * mmi_voicechat_trace_id_get(void) return s_voicechat_trace_id; } -static char s_voicechat_task_id[MMI_VOICECHAT_MSG_TASK_ID_LEN + 1] = {0}; -void mmi_voicechat_task_id_set(char * id) -{ - if(NULL == id) - return; - - _lv_memset_00(s_voicechat_task_id, (MMI_VOICECHAT_MSG_TASK_ID_LEN + 1)); - _lv_memcpy(s_voicechat_task_id, id, MMI_VOICECHAT_MSG_TASK_ID_LEN); -} - -char * mmi_voicechat_task_id_get(void) -{ - return s_voicechat_task_id; -} - -static char s_voicechat_server_state[32] = {0}; void mmi_voicechat_server_state_set(char * state_str) { - if(0 == strncmp(MMI_VOICECHAT_SERVER_STATE_LISTENING, state_str, strlen(state_str)) - || 0 == strncmp(MMI_VOICECHAT_SERVER_STATE_THINKING, state_str, strlen(state_str)) - || 0 == strncmp(MMI_VOICECHAT_SERVER_STATE_RESPONDING, state_str, strlen(state_str)) - ) - { - _lv_memset_00(s_voicechat_server_state, 32); - _lv_memcpy(s_voicechat_server_state, state_str, strlen(state_str)); - } + if(0 == strncmp(MMI_VOICECHAT_SERVER_STATE_LISTENING, state_str, strlen(state_str))) + s_voicechat_server_state = MMI_VC_SERVER_STATE_LISTENING_FLAG; + else if(0 == strncmp(MMI_VOICECHAT_SERVER_STATE_THINKING, state_str, strlen(state_str))) + s_voicechat_server_state = MMI_VC_SERVER_STATE_THINKING_FLAG; + else if(0 == strncmp(MMI_VOICECHAT_SERVER_STATE_RESPONDING, state_str, strlen(state_str))) + s_voicechat_server_state = MMI_VC_SERVER_STATE_RESPONDING_FLAG; + else + s_voicechat_server_state = -1; } bool mmi_voicechat_server_state_is_listening(void) { - if(0 == strncmp(s_voicechat_server_state, MMI_VOICECHAT_SERVER_STATE_LISTENING, strlen(MMI_VOICECHAT_SERVER_STATE_LISTENING))) + if(MMI_VC_SERVER_STATE_LISTENING_FLAG == s_voicechat_server_state) { return true; } @@ -77,7 +64,6 @@ bool mmi_voicechat_server_state_is_listening(void) return false; } -static bool s_voicechat_recv_tts_flag = false; void mmi_voicechat_recv_tts_flag_set(bool flag) { s_voicechat_recv_tts_flag = flag; @@ -97,10 +83,9 @@ void mmi_random_string_generate(char * str_buf, uint16_t str_size, uint16_t str_ char charset[] = "1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; uint8_t i = 0; + srand(Hal_Timer_Get_Counter()); for(i = 0; i < str_len; i++) { - srand(Hal_Timer_Get_Counter()); - str_buf[i] = charset[rand() % strlen(charset)]; } str_buf[i] = '\0'; @@ -140,7 +125,7 @@ void mmi_random_string_generate(char * str_buf, uint16_t str_size, uint16_t str_ // -void mmi_voicechat_send_start_request_msg(void * param, uint32_t param_size) +void mmi_voicechat_send_start_request_msg(void) { mmi_voicechat_data_send_task_msg_send(VOICECHAT_MSG_ID_START_REQUEST, NULL, 0); } @@ -159,37 +144,46 @@ static void mmi_voicechat_send_start_request_process(void * data_ptr, uint32_t d mmi_random_string_generate(trace_id, MMI_VOICECHAT_MSG_TRACE_ID_LEN + 1, MMI_VOICECHAT_MSG_TRACE_ID_LEN); mmi_voicechat_trace_id_set(trace_id); - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: trace_id=%s\n", __FUNCTION__, __LINE__, trace_id); + //VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: trace_id=%s\n", __FUNCTION__, __LINE__, trace_id); send_len += sprintf(send_ptr, "{"); send_len += sprintf(send_ptr + send_len, "\"header\":{\"event\":\"Start\",\"trace_id\":\"%s\"},", trace_id); - send_len += sprintf(send_ptr + send_len, "\"payload\":{\"user_agent\":\"python\",\"device_id\":\"%s\"," - "\"in_format\":\"%s\",\"out_format\":\"%s\"," - //"\"sample_rate\":%d,\"space_time\":500,\"volume\":\"3\"}", - "\"space_time\":400}", + send_len += sprintf(send_ptr + send_len, "\"payload\":{\"user_agent\":\"python\"," + "\"device_id\":\"%s\"," + "\"in_format\":\"%s\"," + "\"in_sample_rate\":%d," + "\"out_format\":\"%s\"," + "\"sample_rate\":%d," + //"\"voice\":\"aliyun::longzhe\"," + "\"space_time\":300," + "\"volume\":\"1\"," + "\"voice_detection\":\"enabled\"}", // enabled;disable imei, - MMI_VOICECHAT_UL_AUDIO_FORMAT_STR, - MMI_VOICECHAT_DL_AUDIO_FORMAT_STR); + MMI_VC_UL_AUDIO_FORMAT_STR, + MMI_VC_UL_AUDIO_SAMPLE_RATE, + MMI_VC_DL_AUDIO_FORMAT_STR, + MMI_VC_DL_AUDIO_SAMPLE_RATE); send_len += sprintf(send_ptr + send_len, "}"); #ifdef MMI_VOICECHAT_DEBUG_TO_FILE - mmi_debug_info_write_to_file(VOICECHAT_SEND_DATA_FILE, send_ptr, send_len); + //mmi_debug_info_write_to_file(VOICECHAT_SEND_DATA_FILE, send_ptr, send_len); #endif + VC_UART_LOG("[@CHENG_DEBUG][%s][%d]: send=%s\n", __FUNCTION__, __LINE__, send_ptr); int ret = mmi_voicechat_websocket_send_text_data(send_ptr, send_len); if(0 > ret) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); - - //mmi_voicechat_trans_text_start_msg_send_fail(); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + VC_UART_LOG("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + mmi_voicechat_send_data_failed(); } } -void mmi_voicechat_send_send_speech_msg(void * param, uint32_t param_size) +void mmi_voicechat_send_send_speech_msg(void) { mmi_voicechat_data_send_task_msg_send(VOICECHAT_MSG_ID_SEND_SPEECH, NULL, 0); } @@ -197,7 +191,7 @@ void mmi_voicechat_send_send_speech_msg(void * param, uint32_t param_size) //{"header":{"trace_id":"ailaqbo0r6o","event":"SendSpeech"},"payload":{"dialog_id":"b0444aed86774e47a142a967e5668a8b"}} static void mmi_voicechat_send_send_speech_process(void * data_ptr, uint32_t data_len) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); char send_ptr[1024] = {0}; int send_len = 0; @@ -210,38 +204,44 @@ static void mmi_voicechat_send_send_speech_process(void * data_ptr, uint32_t dat send_len += sprintf(send_ptr + send_len, "}"); #ifdef MMI_VOICECHAT_DEBUG_TO_FILE - mmi_debug_info_write_to_file(VOICECHAT_SEND_DATA_FILE, send_ptr, send_len); + //mmi_debug_info_write_to_file(VOICECHAT_SEND_DATA_FILE, send_ptr, send_len); #endif + VC_UART_LOG("[@CHENG_DEBUG][%s][%d]: send=%s\n", __FUNCTION__, __LINE__, send_ptr); int ret = mmi_voicechat_websocket_send_text_data(send_ptr, send_len); if(0 > ret) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + VC_UART_LOG("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + mmi_voicechat_send_data_failed(); } } void mmi_voicechat_send_speech_data_msg(void * param, uint32_t param_size) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: size=%d,data=%s\n", __FUNCTION__, __LINE__, param_size, param); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: size=%d,data=%s\n", __FUNCTION__, __LINE__, param_size, param); mmi_voicechat_data_send_task_msg_send(VOICECHAT_MSG_ID_SPEECH_DATA, param, param_size); } static void mmi_voicechat_send_speech_data_process(void * data_ptr, uint32_t data_len) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: size=%d,data=%s\n", __FUNCTION__, __LINE__, data_len, data_ptr); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: size=%d,data=%s\n", __FUNCTION__, __LINE__, data_len, data_ptr); #ifdef MMI_VOICECHAT_DEBUG_TO_FILE - mmi_debug_info_write_to_file(VOICECHAT_SEND_DATA_FILE, data_ptr, data_len); + //mmi_debug_info_write_to_file(VOICECHAT_SEND_DATA_FILE, data_ptr, data_len); #endif + VC_UART_LOG("[@CHENG_DEBUG][%s][%d]: send=%d\n", __FUNCTION__, __LINE__, data_len); int ret = mmi_voicechat_websocket_send_binary_data(data_ptr, data_len); if(0 > ret) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + VC_UART_LOG("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + mmi_voicechat_send_data_failed(); } } -void mmi_voicechat_send_stop_speech_msg(void * param, uint32_t param_size) +void mmi_voicechat_send_stop_speech_msg(void) { mmi_voicechat_data_send_task_msg_send(VOICECHAT_MSG_ID_STOP_SPEECH, NULL, 0); } @@ -249,7 +249,6 @@ void mmi_voicechat_send_stop_speech_msg(void * param, uint32_t param_size) //{"header":{"trace_id":"ailaqbo0r6o","event":"StopSpeech"},"payload":{"dialog_id":"b0444aed86774e47a142a967e5668a8b"}} static void mmi_voicechat_send_stop_speech_process(void * data_ptr, uint32_t data_len) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); char send_ptr[1024] = {0}; int send_len = 0; @@ -265,14 +264,17 @@ static void mmi_voicechat_send_stop_speech_process(void * data_ptr, uint32_t dat //mmi_debug_info_write_to_file(VOICECHAT_SEND_DATA_FILE, send_ptr, send_len); #endif + VC_UART_LOG("[@CHENG_DEBUG][%s][%d]: send=%s\n", __FUNCTION__, __LINE__, send_ptr); int ret = mmi_voicechat_websocket_send_text_data(send_ptr, send_len); if(0 > ret) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + VC_UART_LOG("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + mmi_voicechat_send_data_failed(); } } -void mmi_voicechat_send_start_play_msg(void * param, uint32_t param_size) +void mmi_voicechat_send_start_play_msg(void) { mmi_voicechat_data_send_task_msg_send(VOICECHAT_MSG_ID_START_PLAY, NULL, 0); } @@ -280,7 +282,6 @@ void mmi_voicechat_send_start_play_msg(void * param, uint32_t param_size) //{"header":{"trace_id":"ailaqbo0r6o","event":"LocalRespondingStarted"},"payload":{"dialog_id":"b0444aed86774e47a142a967e5668a8b"}} static void mmi_voicechat_send_start_play_process(void * data_ptr, uint32_t data_len) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); char send_ptr[1024] = {0}; int send_len = 0; @@ -296,14 +297,17 @@ static void mmi_voicechat_send_start_play_process(void * data_ptr, uint32_t data //mmi_debug_info_write_to_file(VOICECHAT_SEND_DATA_FILE, send_ptr, send_len); #endif + VC_UART_LOG("[@CHENG_DEBUG][%s][%d]: send=%s\n", __FUNCTION__, __LINE__, send_ptr); int ret = mmi_voicechat_websocket_send_text_data(send_ptr, send_len); if(0 > ret) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + VC_UART_LOG("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + mmi_voicechat_send_data_failed(); } } -void mmi_voicechat_send_stop_play_msg(void * param, uint32_t param_size) +void mmi_voicechat_send_stop_play_msg(void) { mmi_voicechat_data_send_task_msg_send(VOICECHAT_MSG_ID_STOP_PLAY, NULL, 0); } @@ -311,7 +315,6 @@ void mmi_voicechat_send_stop_play_msg(void * param, uint32_t param_size) //{"header":{"trace_id":"ailaqbo0r6o","event":"LocalRespondingEnded"},"payload":{"dialog_id":"b0444aed86774e47a142a967e5668a8b"}} static void mmi_voicechat_send_stop_play_process(void * data_ptr, uint32_t data_len) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); char send_ptr[1024] = {0}; int send_len = 0; @@ -327,14 +330,17 @@ static void mmi_voicechat_send_stop_play_process(void * data_ptr, uint32_t data_ //mmi_debug_info_write_to_file(VOICECHAT_SEND_DATA_FILE, send_ptr, send_len); #endif + VC_UART_LOG("[@CHENG_DEBUG][%s][%d]: send=%s\n", __FUNCTION__, __LINE__, send_ptr); int ret = mmi_voicechat_websocket_send_text_data(send_ptr, send_len); if(0 > ret) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + VC_UART_LOG("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + mmi_voicechat_send_data_failed(); } } -void mmi_voicechat_send_speak_request_msg(void * param, uint32_t param_size) +void mmi_voicechat_send_speak_request_msg(void) { mmi_voicechat_data_send_task_msg_send(VOICECHAT_MSG_ID_SPEAK_REQUEST, NULL, 0); } @@ -342,7 +348,6 @@ void mmi_voicechat_send_speak_request_msg(void * param, uint32_t param_size) //{"header":{"trace_id":"ailaqbo0r6o","event":"RequestToSpeak"},"payload":{"dialog_id":"b0444aed86774e47a142a967e5668a8b"}} static void mmi_voicechat_send_speak_request_process(void * data_ptr, uint32_t data_len) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); char send_ptr[1024] = {0}; int send_len = 0; @@ -355,43 +360,45 @@ static void mmi_voicechat_send_speak_request_process(void * data_ptr, uint32_t d send_len += sprintf(send_ptr + send_len, "}"); #ifdef MMI_VOICECHAT_DEBUG_TO_FILE - mmi_debug_info_write_to_file(VOICECHAT_SEND_DATA_FILE, send_ptr, send_len); + //mmi_debug_info_write_to_file(VOICECHAT_SEND_DATA_FILE, send_ptr, send_len); #endif + VC_UART_LOG("[@CHENG_DEBUG][%s][%d]: send=%s\n", __FUNCTION__, __LINE__, send_ptr); int ret = mmi_voicechat_websocket_send_text_data(send_ptr, send_len); if(0 > ret) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + VC_UART_LOG("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + mmi_voicechat_send_data_failed(); } } - -void mmi_voicechat_websocket_recv_data_handler(char * data_ptr, int data_len, int payload_len, int payload_offset) +void mmi_vc_ws_recv_data_handler(char * data_ptr, int data_len) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: size=%d\n", __FUNCTION__, __LINE__, data_len); - //cplog_printf("[@CHENG_DEBUG][%s][%d]: size=%d\n", __FUNCTION__, __LINE__, data_len); + VC_UART_LOG("[@CHENG_DEBUG][%s][%d]: size=%d\n", __FUNCTION__, __LINE__, data_len); + VC_UART_LOG("[@CHENG_DEBUG][%d]: receive=%s\n", __LINE__, data_ptr); if(NULL == data_ptr) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: no data\n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: no data\n", __FUNCTION__, __LINE__); return; } #ifdef MMI_VOICECHAT_DEBUG_TO_FILE - mmi_debug_info_write_to_file(VOICECHAT_RECV_DATA_FILE, data_ptr, data_len); + //mmi_debug_info_write_to_file(VOICECHAT_RECV_DATA_FILE, data_ptr, data_len); #endif cJSON * json_root = cJSON_Parse(data_ptr); if(NULL != json_root) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: json\n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: json\n", __FUNCTION__, __LINE__); cJSON * json_header = cJSON_GetObjectItem(json_root, "header"); if(NULL != json_header) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); // } else @@ -402,24 +409,19 @@ void mmi_voicechat_websocket_recv_data_handler(char * data_ptr, int data_len, in { char * value_dialog_id = cJSON_GetStringValue(cJSON_GetObjectItem(json_payload, "dialog_id")); - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: Started,%s\n", __FUNCTION__, __LINE__, value_dialog_id); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: Started,%s\n", __FUNCTION__, __LINE__, value_dialog_id); mmi_voicechat_dialog_id_set(value_dialog_id); } else if(0 == strncmp(value_event, "DialogStateChanged", strlen("DialogStateChanged"))) { char * value_state = cJSON_GetStringValue(cJSON_GetObjectItem(json_payload, "state")); - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: DialogStateChanged,%s\n", __FUNCTION__, __LINE__, value_state); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: DialogStateChanged,%s\n", __FUNCTION__, __LINE__, value_state); mmi_voicechat_server_state_set(value_state); - - if(true == mmi_voicechat_server_state_is_listening()) - { - mmi_voicechat_send_send_speech_msg(NULL, 0); - } } else if(0 == strncmp(value_event, "SpeechContent", strlen("SpeechContent"))) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: SpeechContent\n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: SpeechContent\n", __FUNCTION__, __LINE__); // update translate text // "finished":true @@ -429,17 +431,15 @@ void mmi_voicechat_websocket_recv_data_handler(char * data_ptr, int data_len, in } else if(0 == strncmp(value_event, "SpeechEnded", strlen("SpeechEnded"))) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: SpeechEnded\n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: SpeechEnded\n", __FUNCTION__, __LINE__); - mmi_voicechat_listening_screen_stop_update(); + // no more record data + mmi_voicechat_listening_stop_update(); // translate text end + mmi_voicechat_trans_text_refresh_stop(); } else if(0 == strncmp(value_event, "RespondingContent", strlen("RespondingContent"))) { - static uint16_t t_count = 0; - t_count++; - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: RespondingContent.times=%d\n", __FUNCTION__, __LINE__, t_count); - // update respone text // "finished":true char * value_text = cJSON_GetStringValue(cJSON_GetObjectItem(json_payload, "text")); @@ -448,13 +448,13 @@ void mmi_voicechat_websocket_recv_data_handler(char * data_ptr, int data_len, in if(cJSON_IsTrue(cJSON_GetObjectItem(json_payload, "finished"))) { - mmi_voicechat_chat_text_refresh_task_cb(NULL); mmi_voicechat_chat_text_refresh_stop(); + mmi_voicechat_chat_text_refresh_task_cb(NULL); } } else if(0 == strncmp(value_event, "RespondingStarted", strlen("RespondingStarted"))) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: RespondingStarted\n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: RespondingStarted\n", __FUNCTION__, __LINE__); // server start send audio prompt mmi_voicechat_recv_tts_flag_set(true); @@ -462,7 +462,7 @@ void mmi_voicechat_websocket_recv_data_handler(char * data_ptr, int data_len, in } else if(0 == strncmp(value_event, "RespondingEnded", strlen("RespondingEnded"))) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: RespondingEnded\n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: RespondingEnded\n", __FUNCTION__, __LINE__); // server stop send audio prompt mmi_voicechat_recv_tts_flag_set(false); @@ -473,7 +473,7 @@ void mmi_voicechat_websocket_recv_data_handler(char * data_ptr, int data_len, in } else { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: data\n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: data\n", __FUNCTION__, __LINE__); //if(true == mmi_voicechat_recv_tts_flag_get()) //{ @@ -484,151 +484,35 @@ void mmi_voicechat_websocket_recv_data_handler(char * data_ptr, int data_len, in if(NULL != json_root) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: free json root\n", __FUNCTION__, __LINE__); - //cplog_printf("[@CHENG_DEBUG][%s][%d]: free json root\n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: free json root\n", __FUNCTION__, __LINE__); cJSON_Delete(json_root); json_root = NULL; } } -#if 0 -// recv task -static TASK_HANDLE * s_voicechat_data_recv_task_id = NULL; - -static void mmi_voicechat_data_recv_task_msg_send(MMI_VOICECHAT_DATA_RECV_MSG_ID_E msg_id, void * param, uint32_t param_size) -{ - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: msg_id=%d\n",__FUNCTION__,__LINE__, msg_id); - - if(NULL != s_voicechat_data_recv_task_id) - { - if((MMI_VOICECHAT_DATA_RECV_TASK_MSG_QUEUE_SIZE - 1) < Hal_Get_Message_Count(s_voicechat_data_recv_task_id)) - { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: msg queue full\n",__FUNCTION__,__LINE__); - return; - } - - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n",__FUNCTION__,__LINE__); - - void * temp_ptr = NULL; - if(NULL != param && 0 != param_size) - { - temp_ptr = lv_mem_alloc(param_size + 1); - if(NULL == temp_ptr) - { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: memory alloc fail\n", __FUNCTION__, __LINE__); - return; - } - _lv_memset_00(temp_ptr, param_size + 1); - _lv_memcpy(temp_ptr, param, param_size); - } - - mmi_voicechat_data_task_msg_t * msg = Hal_Mem_Alloc(sizeof(mmi_voicechat_data_task_msg_t)); - msg->cmd_type = msg_id; - msg->cmd_param = temp_ptr; - msg->param_size = param_size; - - Hal_Send_Message((TASK_ID)s_voicechat_data_recv_task_id, (void *)msg); - } -} - -static void mm_voicechat_data_recv_task_handle(void * param) -{ - mmi_voicechat_data_task_msg_t * msg = (mmi_voicechat_data_task_msg_t *)param; - MMI_VOICECHAT_DATA_RECV_MSG_ID_E msg_id = msg->cmd_type; - void * msg_param = msg->cmd_param; - uint32_t param_size = msg->param_size; - - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: msg_id=%d\n",__FUNCTION__,__LINE__, msg_id); - switch(msg_id) - { - case MMI_VOICECHAT_MSG_TRANS_TEXT_RECV: - mmi_voicechat_recv_trans_text_data_process(msg_param, param_size); - break; - - case MMI_VOICECHAT_MSG_CHAT_TEXT_RECV: - mmi_voicechat_recv_chat_text_data_process(msg_param, param_size); - break; - - case MMI_VOICECHAT_MSG_TTS_AUDIO_RECV: - mmi_voicechat_recv_tts_audio_data_process(msg_param, param_size); - break; - - default: - break; - } -} - -static void mm_voicechat_data_recv_task_entry(void * para) -{ - while(s_voicechat_data_recv_task_id == NULL) - { - uos_sleep(10); - } - - while(1) - { - // receive message - mmi_voicechat_data_task_msg_t * msg = (mmi_voicechat_data_task_msg_t *)Hal_Receive_Message((TASK_ID)s_voicechat_data_recv_task_id, TRUE); - if(!msg) - continue; - - mm_voicechat_data_recv_task_handle(msg); - - Hal_Mem_Free(msg->cmd_param); - Hal_Mem_Free(msg); - } -} - -static void mmi_voicechat_data_recv_task_create(void) -{ - if(NULL != s_voicechat_data_recv_task_id) - return; - - s_voicechat_data_recv_task_id = uos_create_task(mm_voicechat_data_recv_task_entry, - NULL, - MMI_VOICECHAT_DATA_RECV_TASK_MSG_QUEUE_SIZE, - MMI_VOICECHAT_DATA_RECV_TASK_STACK_SIZE, - MMI_VOICECHAT_DATA_RECV_TASK_PRIORITY, - "mm_voicechat_data_recv_task"); - - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: tcp_task_id=0x%x\n",__FUNCTION__,__LINE__, s_voicechat_data_recv_task_id); -} - -static void mmi_voicechat_data_recv_task_delete(void) -{ - if(NULL != s_voicechat_data_recv_task_id) - { - uos_delete_task(s_voicechat_data_recv_task_id); - s_voicechat_data_recv_task_id = NULL; - } -} -#endif - // send task -static TASK_HANDLE * s_voicechat_data_send_task_id = NULL; +static TASK_HANDLE * s_vc_data_send_task_id = NULL; static void mmi_voicechat_data_send_task_msg_send(MMI_VOICECHAT_DATA_SEND_MSG_ID_E msg_id, void * param, uint32_t param_size) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: msg_id=%d\n",__FUNCTION__,__LINE__, msg_id); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: msg_id=%d,task_id=0x%x\n", __FUNCTION__, __LINE__, msg_id, s_vc_data_send_task_id); - if(NULL != s_voicechat_data_send_task_id) + if(NULL != s_vc_data_send_task_id) { - if((MMI_VOICECHAT_DATA_SEND_TASK_MSG_QUEUE_SIZE - 1) < Hal_Get_Message_Count(s_voicechat_data_send_task_id)) + if((MMI_VOICECHAT_DATA_SEND_TASK_MSG_QUEUE_SIZE - 1) < Hal_Get_Message_Count(s_vc_data_send_task_id)) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: msg queue full\n",__FUNCTION__,__LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: msg queue full\n", __FUNCTION__, __LINE__); return; } - - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n",__FUNCTION__,__LINE__); - + void * temp_ptr = NULL; if(NULL != param && 0 != param_size) { temp_ptr = lv_mem_alloc(param_size + 1); if(NULL == temp_ptr) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: memory alloc fail\n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: memory alloc fail\n", __FUNCTION__, __LINE__); return; } _lv_memset_00(temp_ptr, param_size + 1); @@ -640,7 +524,7 @@ static void mmi_voicechat_data_send_task_msg_send(MMI_VOICECHAT_DATA_SEND_MSG_ID msg->cmd_param = temp_ptr; msg->param_size = param_size; - Hal_Send_Message((TASK_ID)s_voicechat_data_send_task_id, (void *)msg); + Hal_Send_Message((TASK_ID)s_vc_data_send_task_id, (void *)msg); } } @@ -651,7 +535,7 @@ static void mm_voicechat_data_send_task_handle(void * param) void * msg_param = msg->cmd_param; uint32_t param_size = msg->param_size; - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: msg_id=%d\n",__FUNCTION__,__LINE__, msg_id); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: msg_id=%d\n", __FUNCTION__, __LINE__, msg_id); switch(msg_id) { case VOICECHAT_MSG_ID_START_REQUEST: @@ -693,7 +577,7 @@ static void mm_voicechat_data_send_task_handle(void * param) static void mm_voicechat_data_send_task_entry(void * para) { - while(s_voicechat_data_send_task_id == NULL) + while(s_vc_data_send_task_id == NULL) { uos_sleep(10); } @@ -701,7 +585,7 @@ static void mm_voicechat_data_send_task_entry(void * para) while(1) { // receive message - mmi_voicechat_data_task_msg_t * msg = (mmi_voicechat_data_task_msg_t *)Hal_Receive_Message((TASK_ID)s_voicechat_data_send_task_id, TRUE); + mmi_voicechat_data_task_msg_t * msg = (mmi_voicechat_data_task_msg_t *)Hal_Receive_Message((TASK_ID)s_vc_data_send_task_id, TRUE); if(!msg) continue; @@ -714,25 +598,25 @@ static void mm_voicechat_data_send_task_entry(void * para) static void mmi_voicechat_data_send_task_create(void) { - if(NULL != s_voicechat_data_send_task_id) + if(NULL != s_vc_data_send_task_id) return; - s_voicechat_data_send_task_id = uos_create_task(mm_voicechat_data_send_task_entry, + s_vc_data_send_task_id = uos_create_task(mm_voicechat_data_send_task_entry, NULL, MMI_VOICECHAT_DATA_SEND_TASK_MSG_QUEUE_SIZE, MMI_VOICECHAT_DATA_SEND_TASK_STACK_SIZE, MMI_VOICECHAT_DATA_SEND_TASK_PRIORITY, "mm_voicechat_data_send_task"); - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: tcp_task_id=0x%x\n",__FUNCTION__,__LINE__, s_voicechat_data_send_task_id); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: task_id=0x%x\n", __FUNCTION__, __LINE__, s_vc_data_send_task_id); } static void mmi_voicechat_data_send_task_delete(void) { - if(NULL != s_voicechat_data_send_task_id) + if(NULL != s_vc_data_send_task_id) { - uos_delete_task(s_voicechat_data_send_task_id); - s_voicechat_data_send_task_id = NULL; + uos_delete_task(s_vc_data_send_task_id); + s_vc_data_send_task_id = NULL; } } diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_voicechat_data.h b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_voicechat_data.h index 12c26f4e..f562dc77 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_voicechat_data.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_voicechat_data.h @@ -32,6 +32,9 @@ extern "C" { #define MMI_VOICECHAT_SERVER_STATE_THINKING ("Thinking") #define MMI_VOICECHAT_SERVER_STATE_RESPONDING ("Responding") +#define MMI_VC_SERVER_STATE_LISTENING_FLAG (0) +#define MMI_VC_SERVER_STATE_THINKING_FLAG (1) +#define MMI_VC_SERVER_STATE_RESPONDING_FLAG (2) #if 0 @@ -91,19 +94,19 @@ typedef struct void mmi_voicechat_data_task_create(void); void mmi_voicechat_data_task_delete(void); -void mmi_voicechat_send_start_request_msg(void * param, uint32_t param_size); +void mmi_voicechat_send_start_request_msg(void); -void mmi_voicechat_send_send_speech_msg(void * param, uint32_t param_size); +void mmi_voicechat_send_send_speech_msg(void); void mmi_voicechat_send_speech_data_msg(void * param, uint32_t param_size); -void mmi_voicechat_send_stop_speech_msg(void * param, uint32_t param_size); +void mmi_voicechat_send_stop_speech_msg(void); -void mmi_voicechat_send_start_play_msg(void * param, uint32_t param_size); +void mmi_voicechat_send_start_play_msg(void); -void mmi_voicechat_send_stop_play_msg(void * param, uint32_t param_size); +void mmi_voicechat_send_stop_play_msg(void); -void mmi_voicechat_send_speak_request_msg(void * param, uint32_t param_size); +void mmi_voicechat_send_speak_request_msg(void); #endif diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_voicechat_ui.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_voicechat_ui.c index c0b0c61e..5fe90404 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_voicechat_ui.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_voicechat_ui.c @@ -10,7 +10,6 @@ static lv_signal_cb_t ancient_scrl_signal; static MMI_VOICECHAT_UI_STATE_E s_voicechat_ui_state = MMI_VOICECHAT_UI_STATE_NONE; static mmi_voicechat_msg_info_t s_voicechat_info_t = {0}; static mmi_voicechat_msg_info_t * s_voicechat_info_p = &s_voicechat_info_t; -static uint8_t s_voicechat_current_chat_index = 0; // 1 chat = 2 msg items static uint32_t s_voicechat_recording_sent_size = 0; static bool s_voicechat_tts_audio_playing = false; @@ -19,8 +18,8 @@ static lv_ll_t s_voicechat_tts_audio_ll = {0}; static mmi_voicechat_tts_audio_ll_t * s_voicechat_tts_audio_play_node = NULL; static bool s_voicechat_ws_open_flag = false; -static bool s_voicechat_start_flag = false; - +static bool s_vc_send_start_flag = false; +static bool s_vc_send_speech_flag = false; static lv_res_t mmi_voicechat_list_scrl_signal(lv_obj_t * scrl, lv_signal_t sign, void * param); static void mmi_voicechat_list_set_slide_enable(lv_watch_obj_ext_t * ext, bool enable); @@ -58,7 +57,7 @@ static void mmi_voicechat_websocket_close(void) static void mmi_voicechat_msg_data_clean(void) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); uint8_t i = 0; for(i = 0; i < s_voicechat_info_p->msg_count; i++) @@ -90,38 +89,47 @@ uint8_t mmi_voicechat_msg_count_get(void) +void mmi_voicechat_send_data_failed(void) +{ + mmi_voicechat_websocket_close(); + mmi_voicechat_websocket_open(); + + mmi_voicechat_send_start_request_msg(); + + s_vc_send_speech_flag = false; +} + bool mmi_voicechat_trans_text_result_update(char * data_buff, uint32_t data_len) { if(NULL == data_buff || 0 == data_len) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); return false; } - mmi_voicechat_msg_item_info_t * t_voicechat_item_info = &(s_voicechat_info_p->msg_item[0]); - if(NULL != t_voicechat_item_info->text_data_ptr) - { - lv_mem_free(t_voicechat_item_info->text_data_ptr); - t_voicechat_item_info->text_data_ptr = NULL; - t_voicechat_item_info->text_data_size = 0; - } - char * temp_ptr = lv_mem_alloc(data_len + 1); if(NULL == temp_ptr) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: alloc memory fail\n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: alloc memory fail\n", __FUNCTION__, __LINE__); return false; } _lv_memset_00(temp_ptr, data_len + 1); _lv_memcpy(temp_ptr, data_buff, data_len); + mmi_voicechat_msg_item_info_t * t_voicechat_item_info = &(s_voicechat_info_p->msg_item[0]); + if(NULL != t_voicechat_item_info->text_data_ptr) + { + lv_mem_free(t_voicechat_item_info->text_data_ptr); + t_voicechat_item_info->text_data_ptr = NULL; + t_voicechat_item_info->text_data_size = 0; + } t_voicechat_item_info->text_data_ptr = temp_ptr; t_voicechat_item_info->text_data_size = data_len; t_voicechat_item_info->msg_from = 0; s_voicechat_info_p->msg_count = 1; - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: size=%d,ptr=0x%x\n", __FUNCTION__, __LINE__, + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: size=%d,ptr=0x%x\n", __FUNCTION__, __LINE__, t_voicechat_item_info->text_data_size, t_voicechat_item_info->text_data_ptr); return true; @@ -134,6 +142,7 @@ void mmi_voicechat_trans_text_refresh_stop(void) if(NULL == ext) return; + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); if(NULL != ext->refresh_task_p) { lv_task_del(ext->refresh_task_p); @@ -145,16 +154,22 @@ void mmi_voicechat_trans_text_refresh_task_cb(lv_task_t * task) { if(MMI_VOICECHAT_UI_STATE_LIST == s_voicechat_ui_state) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); lv_voicechat_ext_t * ext = mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); if(NULL == ext) return; - //mmi_voicechat_list_screen_list_refresh(); + if(NULL == ext->label_item_self) + return; + mmi_voicechat_msg_item_info_t * msg_item = &(s_voicechat_info_p->msg_item[0]); - if(NULL != ext->list_self_label) - lv_label_set_text(ext->list_self_label, msg_item->text_data_ptr); + if(NULL == msg_item) + return; + if(NULL == msg_item->text_data_ptr) + return; + + lv_label_set_text(ext->label_item_self, msg_item->text_data_ptr); } else { @@ -171,51 +186,46 @@ void mmi_voicechat_trans_text_refresh_start(void) if(MMI_VOICECHAT_UI_STATE_LIST != s_voicechat_ui_state) return; + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); if(NULL != ext->refresh_task_p) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - return; + lv_task_del(ext->refresh_task_p); + ext->refresh_task_p = NULL; } ext->refresh_task_p = lv_task_create(mmi_voicechat_trans_text_refresh_task_cb, 100, LV_TASK_PRIO_HIGH, NULL); } static void mmi_voicechat_trans_text_screen_task_cb(void) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: ui_state=%d\n", __FUNCTION__, __LINE__, s_voicechat_ui_state); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: ui_state=%d\n", __FUNCTION__, __LINE__, s_voicechat_ui_state); - if(MMI_VOICECHAT_UI_STATE_LISTENING == s_voicechat_ui_state || MMI_VOICECHAT_UI_STATE_LISTENING_MIDDLE == s_voicechat_ui_state) + if(MMI_VOICECHAT_UI_STATE_LISTENING == s_voicechat_ui_state) { - lv_voicechat_ext_t * ext = mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); - if(NULL == ext) - return; - - mmi_voicechat_list_set_slide_enable(&ext->old_ext, true); - - if(0 == mmi_voicechat_msg_count_get()) - { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - - mmi_voicechat_default_screen_display(); - } - else - { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - - mmi_voicechat_list_screen_display(); - - mmi_voicechat_trans_text_refresh_start(); - } + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + mmi_voicechat_listening_screen_ui_clean(); + mmi_voicechat_list_screen_display(); + mmi_voicechat_trans_text_refresh_start(); + } + else if(MMI_VOICECHAT_UI_STATE_LIST == s_voicechat_ui_state) + { + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + mmi_voicechat_list_screen_item_refresh(); + mmi_voicechat_trans_text_refresh_start(); + } + else + { + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + mmi_voicechat_trans_text_refresh_stop(); } } void mmi_voicechat_trans_text_screen_update(void) -{ - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - +{ if(true == s_trans_text_update_flag) return; s_trans_text_update_flag = true; + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); lv_task_t * task_p = lv_task_create(mmi_voicechat_trans_text_screen_task_cb, 10, LV_TASK_PRIO_HIGH, NULL); lv_task_once(task_p); @@ -226,34 +236,33 @@ bool mmi_voicechat_chat_text_result_update(char * data_buff, uint32_t data_len) { if(NULL == data_buff || 0 == data_len) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); return false; } - mmi_voicechat_msg_item_info_t * t_voicechat_item_info = &(s_voicechat_info_p->msg_item[1]); - if(NULL != t_voicechat_item_info->text_data_ptr) - { - lv_mem_free(t_voicechat_item_info->text_data_ptr); - t_voicechat_item_info->text_data_ptr = NULL; - t_voicechat_item_info->text_data_size = 0; - } - char * temp_ptr = lv_mem_alloc(data_len + 1); if(NULL == temp_ptr) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: alloc memory fail\n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: alloc memory fail\n", __FUNCTION__, __LINE__); return false; } _lv_memset_00(temp_ptr, data_len + 1); _lv_memcpy(temp_ptr, data_buff, data_len); + mmi_voicechat_msg_item_info_t * t_voicechat_item_info = &(s_voicechat_info_p->msg_item[1]); + if(NULL != t_voicechat_item_info->text_data_ptr) + { + lv_mem_free(t_voicechat_item_info->text_data_ptr); + t_voicechat_item_info->text_data_ptr = NULL; + t_voicechat_item_info->text_data_size = 0; + } t_voicechat_item_info->text_data_ptr = temp_ptr; t_voicechat_item_info->text_data_size = data_len; t_voicechat_item_info->msg_from = 1; s_voicechat_info_p->msg_count = 2; - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: size=%d,ptr=0x%x\n", __FUNCTION__, __LINE__, + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: size=%d,ptr=0x%x\n", __FUNCTION__, __LINE__, t_voicechat_item_info->text_data_size, t_voicechat_item_info->text_data_ptr); return true; @@ -277,16 +286,22 @@ void mmi_voicechat_chat_text_refresh_task_cb(lv_task_t * task) { if(MMI_VOICECHAT_UI_STATE_LIST == s_voicechat_ui_state) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); lv_voicechat_ext_t * ext = mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); if(NULL == ext) return; - //mmi_voicechat_list_screen_list_refresh(); + if(NULL == ext->label_item_other) + return; + mmi_voicechat_msg_item_info_t * msg_item = &(s_voicechat_info_p->msg_item[1]); - if(NULL != ext->list_other_label) - lv_label_set_text(ext->list_other_label, msg_item->text_data_ptr); + if(NULL == msg_item) + return; + if(NULL == msg_item->text_data_ptr) + return; + + lv_label_set_text(ext->label_item_other, msg_item->text_data_ptr); } else { @@ -303,53 +318,48 @@ void mmi_voicechat_chat_text_refresh_start(void) if(MMI_VOICECHAT_UI_STATE_LIST != s_voicechat_ui_state) return; + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); if(NULL != ext->refresh_task_p) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - return; + lv_task_del(ext->refresh_task_p); + ext->refresh_task_p = NULL; } - ext->refresh_task_p = lv_task_create(mmi_voicechat_chat_text_refresh_task_cb, 500, LV_TASK_PRIO_HIGH, NULL); + ext->refresh_task_p = lv_task_create(mmi_voicechat_chat_text_refresh_task_cb, 600, LV_TASK_PRIO_HIGH, NULL); } static void mmi_voicechat_chat_text_screen_task_cb(void) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: ui_state=%d\n", __FUNCTION__, __LINE__, s_voicechat_ui_state); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: ui_state=%d\n", __FUNCTION__, __LINE__, s_voicechat_ui_state); - if(MMI_VOICECHAT_UI_STATE_LIST == s_voicechat_ui_state) + if(MMI_VOICECHAT_UI_STATE_LISTENING == s_voicechat_ui_state) { - lv_voicechat_ext_t * ext = mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); - if(NULL == ext) - return; - - mmi_voicechat_list_set_slide_enable(&ext->old_ext, true); - - if(0 == mmi_voicechat_msg_count_get()) - { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - - mmi_voicechat_default_screen_display(); - } - else - { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - - mmi_voicechat_list_screen_display(); - - mmi_voicechat_trans_text_refresh_stop(); - mmi_voicechat_chat_text_refresh_start(); - } + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + mmi_voicechat_listening_screen_ui_clean(); + mmi_voicechat_list_screen_display(); + mmi_voicechat_chat_text_refresh_start(); + } + else if(MMI_VOICECHAT_UI_STATE_LIST == s_voicechat_ui_state) + { + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + mmi_voicechat_list_screen_item_refresh(); + mmi_voicechat_chat_text_refresh_start(); + } + else + { + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + mmi_voicechat_chat_text_refresh_stop(); } } void mmi_voicechat_chat_text_screen_update(void) -{ - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - +{ if(true == s_chat_text_update_flag) return; s_chat_text_update_flag = true; - + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + + mmi_voicechat_trans_text_refresh_stop(); lv_task_t * task_p = lv_task_create(mmi_voicechat_chat_text_screen_task_cb, 10, LV_TASK_PRIO_HIGH, NULL); lv_task_once(task_p); } @@ -380,13 +390,13 @@ uint32_t mmi_voicechat_tts_audio_ll_node_num(void) { uint32_t node_total = _lv_ll_get_len(&s_voicechat_tts_audio_ll); - //VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: node_total=%d\n", __FUNCTION__, __LINE__, node_total); + //VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: node_total=%d\n", __FUNCTION__, __LINE__, node_total); return node_total; } mmi_voicechat_tts_audio_ll_t * mmi_voicechat_tts_audio_ll_new_tail_node(void) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); mmi_voicechat_tts_audio_ll_t * node = _lv_ll_ins_tail(&s_voicechat_tts_audio_ll); @@ -397,21 +407,18 @@ mmi_voicechat_tts_audio_ll_t * mmi_voicechat_tts_audio_ll_new_tail_node(void) } - static bool s_send_start_play = false; static bool s_data_first_frame = false; void mmi_voicechat_tts_audio_update_pre(void) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); s_voicechat_tts_audio_playing = false; mmi_voicechat_tts_audio_ll_clean(); mmi_voicechat_tts_audio_ll_new_tail_node(); - s_send_start_play = false; - s_data_first_frame = false; } @@ -419,21 +426,21 @@ bool mmi_voicechat_tts_audio_result_update(char * data_buff, uint32_t data_len) { if(NULL == data_buff || 0 == data_len) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); return false; } mmi_voicechat_tts_audio_ll_t * node = _lv_ll_get_tail(&s_voicechat_tts_audio_ll); if(NULL == node) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); node = mmi_voicechat_tts_audio_ll_new_tail_node(); } #if 1 else if(NULL != node->audio_data_ptr && (16 * 1024 < node->audio_data_size)) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); node = mmi_voicechat_tts_audio_ll_new_tail_node(); mmi_voicechat_tts_audio_play(); @@ -445,7 +452,7 @@ bool mmi_voicechat_tts_audio_result_update(char * data_buff, uint32_t data_len) { if(16 * 1024 < node->audio_data_size) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); node = mmi_voicechat_tts_audio_ll_new_tail_node(); s_data_first_frame = true; @@ -456,7 +463,7 @@ bool mmi_voicechat_tts_audio_result_update(char * data_buff, uint32_t data_len) { if(8 * 1024 < node->audio_data_size) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); node = mmi_voicechat_tts_audio_ll_new_tail_node(); mmi_voicechat_tts_audio_play(); @@ -467,15 +474,15 @@ bool mmi_voicechat_tts_audio_result_update(char * data_buff, uint32_t data_len) if(NULL == node->audio_data_ptr) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); char * temp_ptr = lv_mem_alloc(data_len + 1); if(NULL == temp_ptr) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: alloc memory fail\n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: alloc memory fail\n", __FUNCTION__, __LINE__); return false; } _lv_memset_00(temp_ptr, data_len + 1); - #if 0 + #if 1 _lv_memcpy(temp_ptr, data_buff, data_len); #else char mp3_haed_info[10] = {'I', 'D', '3', 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x22}; @@ -488,11 +495,11 @@ bool mmi_voicechat_tts_audio_result_update(char * data_buff, uint32_t data_len) } else { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); char * temp_ptr = lv_mem_realloc(node->audio_data_ptr, node->audio_data_size + data_len + 1); if(NULL == temp_ptr) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: realloc memory fail\n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: realloc memory fail\n", __FUNCTION__, __LINE__); return false; } _lv_memset_00(temp_ptr + node->audio_data_size, data_len + 1); @@ -502,14 +509,14 @@ bool mmi_voicechat_tts_audio_result_update(char * data_buff, uint32_t data_len) node->audio_data_size += data_len; } - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: size=%d,ptr=0x%x\n", __FUNCTION__, __LINE__, node->audio_data_size, node->audio_data_ptr); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: size=%d,ptr=0x%x\n", __FUNCTION__, __LINE__, node->audio_data_size, node->audio_data_ptr); return true; } static void mmi_voicechat_tts_audio_ctrl_callback(AUDIO_CTRL_PRIORITY priority) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: priority=%d\n", __FUNCTION__, __LINE__, priority); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: priority=%d\n", __FUNCTION__, __LINE__, priority); if(MMI_VOICECHAT_TTS_AUDIO_PRI == priority) { @@ -527,11 +534,11 @@ static void mmi_voicechat_tts_audio_ctrl_callback(AUDIO_CTRL_PRIORITY priority) static void mmi_voicechat_tts_audio_over_cb(void * para) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); s_voicechat_tts_audio_playing = false; - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: node=%#X,total=%d\n", __FUNCTION__, __LINE__, s_voicechat_tts_audio_play_node, mmi_voicechat_tts_audio_ll_node_num()); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: node=%#X,total=%d\n", __FUNCTION__, __LINE__, s_voicechat_tts_audio_play_node, mmi_voicechat_tts_audio_ll_node_num()); mmi_voicechat_tts_audio_ll_t * node = _lv_ll_get_next((&s_voicechat_tts_audio_ll), s_voicechat_tts_audio_play_node); _lv_ll_remove((&s_voicechat_tts_audio_ll), s_voicechat_tts_audio_play_node); if(NULL != s_voicechat_tts_audio_play_node->audio_data_ptr) @@ -541,16 +548,17 @@ static void mmi_voicechat_tts_audio_over_cb(void * para) } lv_mem_free(s_voicechat_tts_audio_play_node); s_voicechat_tts_audio_play_node = NULL; - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: node=%#X,total=%d\n", __FUNCTION__, __LINE__, node, mmi_voicechat_tts_audio_ll_node_num()); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: node=%#X,total=%d\n", __FUNCTION__, __LINE__, node, mmi_voicechat_tts_audio_ll_node_num()); //if(MMI_VOICECHAT_TTS_AUDIO_PRI == Hal_Audio_Manage_Start_Req(MMI_VOICECHAT_TTS_AUDIO_PRI, mmi_voicechat_tts_audio_ctrl_callback)) { if(NULL == node || NULL == node->audio_data_ptr) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - - - //mmi_voicechat_send_stop_play_msg(NULL, 0); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + if(false == mmi_voicechat_recv_tts_flag_get()) + { + mmi_voicechat_send_stop_play_msg(); + } return ; } @@ -559,7 +567,7 @@ static void mmi_voicechat_tts_audio_over_cb(void * para) Hal_Tone_Play_Onetime((uint32_t *)node->audio_data_ptr, node->audio_data_size, - HAL_AUDIO_SPK_LEVEL_4, // HAL_AUDIO_SPK_LEVEL_MAX, + HAL_AUDIO_SPK_LEVEL_1, // HAL_AUDIO_SPK_LEVEL_MAX, mmi_voicechat_tts_audio_over_cb, NULL); } @@ -569,18 +577,23 @@ bool mmi_voicechat_tts_audio_play(void) { if(true == s_voicechat_tts_audio_playing) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); return false; } if(MMI_VOICECHAT_TTS_AUDIO_PRI == Hal_Audio_Manage_Start_Req(MMI_VOICECHAT_TTS_AUDIO_PRI, mmi_voicechat_tts_audio_ctrl_callback)) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); mmi_voicechat_tts_audio_ll_t * node = _lv_ll_get_head(&s_voicechat_tts_audio_ll); if(NULL == node) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: tt audio ll empty\n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: tt audio ll empty\n", __FUNCTION__, __LINE__); + if(false == mmi_voicechat_recv_tts_flag_get()) + { + mmi_voicechat_send_stop_play_msg(); + } + return false; } else @@ -590,7 +603,7 @@ bool mmi_voicechat_tts_audio_play(void) node = _lv_ll_get_next((&s_voicechat_tts_audio_ll), node); if(NULL == node || NULL == node->audio_data_ptr) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: no data\n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: no data\n", __FUNCTION__, __LINE__); return false; } } @@ -599,7 +612,7 @@ bool mmi_voicechat_tts_audio_play(void) if(false == s_send_start_play) { s_send_start_play = true; - mmi_voicechat_send_start_play_msg(NULL, 0); + mmi_voicechat_send_start_play_msg(); } s_voicechat_tts_audio_play_node = node; @@ -607,7 +620,7 @@ bool mmi_voicechat_tts_audio_play(void) Hal_Tone_Play_Onetime((uint32_t *)node->audio_data_ptr, node->audio_data_size, - HAL_AUDIO_SPK_LEVEL_4, // HAL_AUDIO_SPK_LEVEL_MAX, + HAL_AUDIO_SPK_LEVEL_1, // HAL_AUDIO_SPK_LEVEL_MAX, mmi_voicechat_tts_audio_over_cb, NULL); } @@ -615,68 +628,16 @@ bool mmi_voicechat_tts_audio_play(void) return true; } -bool mmi_voicechat_tts_audio_is_playing(void) -{ - if(true == s_voicechat_tts_audio_playing) - return true; - - if(0 != mmi_voicechat_tts_audio_ll_node_num()) - return true; - - return false; -} - -void mmi_voicechat_listening_screen_stop_update(void) +void mmi_voicechat_listening_stop_update(void) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - //lv_task_t * task_p = lv_task_create(mmi_voicechat_listening_screen_stop_task_cb, 10, LV_TASK_PRIO_HIGH, NULL); - //lv_task_once(task_p); mmi_voicechat_listening_stop(true); } -void mmi_voicechat_list_screen_prompt_clean_task_cb(lv_task_t * task) -{ - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - - lv_voicechat_ext_t * ext = (lv_voicechat_ext_t *)mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); - if(NULL == ext) - return ; - - lv_obj_set_hidden(ext->list_signal_weak_label, true); -} - -void mmi_voicechat_list_screen_prompt_task_cb(lv_task_t * task) -{ - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - - lv_voicechat_ext_t * ext = (lv_voicechat_ext_t *)mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); - if(NULL == ext) - return ; - - lv_obj_set_hidden(ext->list_signal_weak_label, false); - - lv_task_t * task_p = lv_task_create(mmi_voicechat_list_screen_prompt_clean_task_cb, 1500, LV_TASK_PRIO_HIGH, NULL); - lv_task_once(task_p); -} - -void mmi_voicechat_list_screen_signal_weak_prompt(void) -{ - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - - if(MMI_VOICECHAT_UI_STATE_LIST != s_voicechat_ui_state) - { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - return; - } - - lv_task_t * task_p = lv_task_create(mmi_voicechat_list_screen_prompt_task_cb, 10, LV_TASK_PRIO_HIGH, NULL); - lv_task_once(task_p); -} - void * mmi_voicechat_actId_ext_get(lv_watch_Activity_Id_t actId) { lv_obj_t * activity_obj = lv_watch_get_activity_obj(actId); @@ -744,9 +705,7 @@ static void mmi_voicechat_lv_style_set(void) void mmi_voicechat_main_prepare_destory(lv_obj_t * activity_obj) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - - s_voicechat_start_flag = false; + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); // websocket mmi_voicechat_websocket_close(); @@ -811,7 +770,7 @@ void mmi_voicechat_main_screen_clean(void) lv_obj_t * obj = lv_watch_get_activity_obj(ACT_ID_VOICECHAT_MAIN); if(NULL != obj) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); lv_obj_del(obj); } } @@ -830,14 +789,14 @@ static void mmi_voicechat_list_set_slide_enable(lv_watch_obj_ext_t * ext, bool e void mmi_voicechat_timeout_screen_clean(void) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); mmi_voicechat_default_screen_display(); } void mmi_voicechat_timeout_screen_display(void) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); lv_voicechat_ext_t * ext = (lv_voicechat_ext_t *)mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); if(NULL == ext) @@ -897,7 +856,7 @@ void mmi_voicechat_timeout_screen_display(void) void mmi_voicechat_thinking_screen_clean(void) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); //mmi_voicechat_chat_websocket_close(); @@ -916,54 +875,14 @@ void mmi_voicechat_thinking_screen_clean(void) static void mmi_voicechat_thinking_screen_task_cb(lv_task_t * task) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); mmi_voicechat_timeout_screen_display(); } -void mmi_voicechat_listening_remain_data_send(void) -{ -#if 0 - lv_voicechat_ext_t * ext = (lv_voicechat_ext_t *)mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); - if(NULL == ext) - { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - goto EXIT; - } - - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: size=%d, buf=0x%x\n", __FUNCTION__, __LINE__, ext->record_size, ext->record_buffer); - - int file_size = ext->record_size - s_voicechat_recording_sent_size; - if(0 >= file_size) - { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - goto EXIT; - } - char * file_buf = lv_mem_alloc(file_size + 1); - if(NULL == file_buf) - { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - goto EXIT; - } - _lv_memset_00(file_buf, file_size + 1); - _lv_memcpy(file_buf, ext->record_buffer + s_voicechat_recording_sent_size, file_size); - - mmi_voicechat_send_trans_audio_msg(file_buf, file_size); - lv_mem_free(file_buf); - file_buf = NULL; - -EXIT: - lv_mem_free(ext->record_buffer); - ext->record_buffer = NULL; - ext->record_size = 0; - - s_voicechat_recording_sent_size = 0; -#endif -} - void mmi_voicechat_thinking_screen_display(void) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); lv_voicechat_ext_t * ext = (lv_voicechat_ext_t *)mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); if(NULL == ext) @@ -1001,7 +920,7 @@ void mmi_voicechat_thinking_screen_display(void) ext->gif_thinking = gif_open(cont, ANIM_VOICECHAT_THINKING, 0); if(NULL == ext->gif_thinking) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: gif open fail\n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: gif open fail\n", __FUNCTION__, __LINE__); } lv_obj_set_style_local_bg_color(ext->gif_thinking->container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); lv_obj_align(ext->gif_thinking->container, NULL, LV_ALIGN_CENTER, 0, -10); @@ -1030,98 +949,13 @@ void mmi_voicechat_thinking_screen_display(void) lv_obj_set_hidden(ext->cont_list, true); } -void mmi_voicechat_listening_middle_screen_display(void) -{ - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - - lv_voicechat_ext_t * ext = (lv_voicechat_ext_t *)mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); - if(NULL == ext) - return ; - - s_voicechat_ui_state = MMI_VOICECHAT_UI_STATE_LISTENING_MIDDLE; - - // ui - lv_obj_t * cont = ext->cont_listening_middle; - if(NULL != ext->gif_listening) - { - gif_close(ext->gif_listening); - ext->gif_listening = NULL; - } - lv_obj_clean(cont); - - - lv_obj_t * list_page = lv_page_create(cont, NULL); - lv_obj_set_size(list_page, lv_obj_get_width(cont), lv_obj_get_height(cont) / 2); - lv_page_set_scrollbar_mode(list_page, LV_SCROLLBAR_MODE_OFF); - lv_obj_set_style_local_bg_opa(list_page, LV_PAGE_PART_BG, LV_STATE_DEFAULT, LV_OPA_0); - lv_obj_set_style_local_border_opa(list_page, LV_PAGE_PART_BG, LV_STATE_DEFAULT, LV_OPA_0); - lv_obj_set_style_local_outline_width(list_page, LV_PAGE_PART_BG, LV_STATE_DEFAULT, 0); - lv_obj_align(list_page, NULL, LV_ALIGN_IN_TOP_MID, 0, 20); - - lv_page_set_scrl_layout(list_page, LV_LAYOUT_OFF); - lv_page_set_scrollable_fit2(list_page, LV_FIT_NONE, LV_FIT_TIGHT); - - lv_obj_t * scrl = lv_page_get_scrollable(list_page); - ancient_scrl_signal = lv_obj_get_signal_cb(scrl); - lv_obj_set_signal_cb(scrl, mmi_voicechat_list_scrl_signal); - lv_watch_obj_add_element(list_page); - lv_watch_obj_add_element(scrl); - - - mmi_voicechat_msg_item_info_t * t_voicechat_item_info = &(s_voicechat_info_p->msg_item[0]); - char * file_buf = t_voicechat_item_info->text_data_ptr; - - lv_obj_t * obj = lv_cont_create(list_page, NULL); - lv_obj_set_size(obj, LV_HOR_RES - 20, 50); - lv_cont_set_fit4(obj, LV_FIT_NONE, LV_FIT_NONE, LV_FIT_NONE, LV_FIT_TIGHT); - //lv_cont_set_layout(obj, LV_LAYOUT_COLUMN_LEFT); - lv_obj_add_style(obj, LV_CONT_PART_MAIN, &(ext->style_cont_self)); - lv_obj_align(obj, NULL, LV_ALIGN_IN_TOP_MID, 0, 20); - - lv_obj_t * label_text = lv_label_create(obj, NULL); - lv_obj_add_style(label_text, LV_LABEL_PART_MAIN, &(ext->style_label_len_self)); - lv_label_set_align(label_text, LV_LABEL_ALIGN_CENTER); - lv_label_set_long_mode(label_text, LV_LABEL_LONG_BREAK); - lv_obj_set_width(label_text, lv_obj_get_width(obj) - 20); - lv_label_set_text(label_text, file_buf); - lv_obj_align(label_text, NULL, LV_ALIGN_IN_LEFT_MID, 10, 0); - - lv_obj_set_adv_hittest(obj, false); - lv_page_focus(list_page, obj, 0); - lv_page_glue_obj(obj, true); - lv_watch_obj_add_element(obj); - - - ext->gif_listening = gif_open(cont, ANIM_VOICECHAT_LISTENING, 0); - if(NULL == ext->gif_listening) - { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: gif open fail\n", __FUNCTION__, __LINE__); - } - lv_obj_set_style_local_bg_color(ext->gif_listening->container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); - lv_obj_align(ext->gif_listening->container, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -LV_VER_RES / 4); - - //label - //lv_obj_t * label_state = lv_label_create(cont, NULL); - //lv_obj_add_style(label_state, LV_LABEL_PART_MAIN, &lv_watch_font20); - //lv_label_set_text_id(label_state, WATCH_TEXT_ID_AIGC_LISTENING); - //lv_label_set_align(label_state, LV_LABEL_ALIGN_CENTER); - //lv_obj_align(label_state, cont, LV_ALIGN_IN_BOTTOM_MID, 0, -20); - - - lv_obj_set_hidden(ext->cont_default, true); - lv_obj_set_hidden(ext->cont_listening, true); - lv_obj_set_hidden(ext->cont_listening_middle, false); - lv_obj_set_hidden(ext->cont_thinking, true); - lv_obj_set_hidden(ext->cont_timeout, true); - lv_obj_set_hidden(ext->cont_list, true); -} - bool mmi_voicechat_listening_stop(bool is_cancel) { uint32_t duration_ms = 0; uint32_t size = 0; - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: recording stop\n", __FUNCTION__, __LINE__); + VC_UART_LOG("[@CHENG_DEBUG][%s][%d]: recording stop\n", __FUNCTION__, __LINE__); Hal_Record_Buffer_Stop_Req(&size, &duration_ms); Hal_Audio_Manage_End_Ind(MMI_VOICECHAT_TTS_AUDIO_PRI); @@ -1170,7 +1004,7 @@ void mmi_voicechat_listening_task_cb(lv_task_t * task) lv_obj_t * activity_obj; MCI_EVNET_T event = (MCI_EVNET_T) (task->user_data); - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: event=%d\n", __FUNCTION__, __LINE__, event); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: event=%d\n", __FUNCTION__, __LINE__, event); switch(event) { @@ -1194,7 +1028,8 @@ void mmi_voicechat_listening_task_cb(lv_task_t * task) void mmi_voicechat_listening_cb(MCI_EVNET_T event, MCI_INFO_T info_type, int32_t value) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: event=%d,type=%d,value=%d\n", __FUNCTION__, __LINE__, event, info_type, value); + //VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: event=%d,type=%d,value=%d\n", __FUNCTION__, __LINE__, event, info_type, value); + //VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: event=%d,type=%d,value=%d\n", __FUNCTION__, __LINE__, event, info_type, value); if(MCI_EVENT_INFO != event) { @@ -1209,28 +1044,27 @@ void mmi_voicechat_listening_cb(MCI_EVNET_T event, MCI_INFO_T info_type, int32_t lv_voicechat_ext_t * ext = (lv_voicechat_ext_t *)mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); if(NULL == ext) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); return; } uint32_t sending_size = value - s_voicechat_recording_sent_size; if(0 >= sending_size) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); return; } - if(false == mmi_voicechat_server_state_is_listening()) + if(false == s_vc_send_speech_flag) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - mmi_voicechat_send_speak_request_msg(NULL, 0); - return; + s_vc_send_speech_flag = true; + mmi_voicechat_send_send_speech_msg(); } char * sending_buf = lv_mem_alloc(sending_size + 1); if(NULL == sending_buf) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); return; } _lv_memset_00(sending_buf, sending_size + 1); @@ -1245,7 +1079,7 @@ void mmi_voicechat_listening_cb(MCI_EVNET_T event, MCI_INFO_T info_type, int32_t void mmi_voicechat_listening_audio_ctrl_callback(AUDIO_CTRL_PRIORITY priority) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: priority=%d\n", __FUNCTION__, __LINE__, priority); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: priority=%d\n", __FUNCTION__, __LINE__, priority); if(MMI_VOICECHAT_TTS_AUDIO_PRI == priority) { @@ -1263,7 +1097,7 @@ void mmi_voicechat_listening_audio_ctrl_callback(AUDIO_CTRL_PRIORITY priority) void mmi_voicechat_listening_screen_display(void) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); lv_voicechat_ext_t * ext = (lv_voicechat_ext_t *)mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); if(NULL == ext) @@ -1275,19 +1109,23 @@ void mmi_voicechat_listening_screen_display(void) Hal_NFFS_File_Play_End(); Hal_Audio_Manage_End_Ind(MMI_VOICECHAT_TTS_AUDIO_PRI); - if(false == s_voicechat_start_flag) + if(false == s_vc_send_start_flag) { - s_voicechat_start_flag = true; - mmi_voicechat_send_start_request_msg(NULL, 0); + s_vc_send_start_flag = true; + mmi_voicechat_send_start_request_msg(); } - else if(false == mmi_voicechat_tts_audio_is_playing()) + else { - mmi_voicechat_send_stop_play_msg(NULL, 0); + if(false == mmi_voicechat_server_state_is_listening()) + { + mmi_voicechat_send_speak_request_msg(); + } } // reset flag s_trans_text_update_flag = false; s_chat_text_update_flag = false; + s_vc_send_speech_flag = false; // res mmi_voicechat_msg_data_clean(); @@ -1301,20 +1139,21 @@ void mmi_voicechat_listening_screen_display(void) ext->record_buffer = (uint8_t *)lv_mem_alloc(MMI_VOICECHAT_DATA_RECORD_SIZE_MAX); if(NULL != ext->record_buffer) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); _lv_memset_00(ext->record_buffer, MMI_VOICECHAT_DATA_RECORD_SIZE_MAX); if(MMI_VOICECHAT_TTS_AUDIO_PRI == Hal_Audio_Manage_Start_Req(MMI_VOICECHAT_TTS_AUDIO_PRI, mmi_voicechat_listening_audio_ctrl_callback)) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: recording start\n", __FUNCTION__, __LINE__); + VC_UART_LOG("[@CHENG_DEBUG][%s][%d]: recording start\n", __FUNCTION__, __LINE__); s_voicechat_recording_sent_size = 0; Hal_Record_Buffer_With_Format_Req(ext->record_buffer, MMI_VOICECHAT_DATA_RECORD_SIZE_MAX, MMI_VOICECHAT_DATA_RECORD_DURATION_MAX * 1000, mmi_voicechat_listening_cb, - (mci_type_enum)MMI_VOICECHAT_UL_AUDIO_FORMAT); + (mci_type_enum)MMI_VC_UL_AUDIO_FORMAT); } } @@ -1337,35 +1176,49 @@ void mmi_voicechat_listening_screen_display(void) ext->gif_listening = gif_open(cont, ANIM_VOICECHAT_LISTENING, 0); if(NULL == ext->gif_listening) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: gif open fail\n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: gif open fail\n", __FUNCTION__, __LINE__); } lv_obj_set_style_local_bg_color(ext->gif_listening->container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); lv_obj_align(ext->gif_listening->container, NULL, LV_ALIGN_CENTER, 0, 0); - // signal weak - lv_obj_t * label = lv_label_create(cont, NULL); - lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); - lv_label_set_text_id(label, WATCH_TEXT_ID_SIGNAL_WEAK); - lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); - lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, -10); - lv_obj_set_click(label, false); - ext->listening_signal_weak_label = label; lv_obj_set_hidden(ext->cont_default, true); lv_obj_set_hidden(ext->cont_listening, false); - lv_obj_set_hidden(ext->listening_signal_weak_label, true); lv_obj_set_hidden(ext->cont_listening_middle, true); lv_obj_set_hidden(ext->cont_thinking, true); lv_obj_set_hidden(ext->cont_timeout, true); lv_obj_set_hidden(ext->cont_list, true); } +void mmi_voicechat_listening_screen_ui_clean(void) +{ + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + + lv_voicechat_ext_t * ext = (lv_voicechat_ext_t *)mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); + if(NULL == ext) + return ; + + if(MMI_VOICECHAT_UI_STATE_LISTENING != s_voicechat_ui_state) + return; + + // ui + lv_obj_t * cont = ext->cont_listening; + if(NULL != ext->gif_listening) + { + gif_close(ext->gif_listening); + ext->gif_listening = NULL; + } + lv_obj_clean(cont); + + //lv_obj_set_hidden(cont, true); +} + static void mmi_voicechat_cancel_button_event_cb(lv_obj_t * obj, lv_event_t e) { if(LV_EVENT_CLICKED != e) return; - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); mmi_voicechat_main_screen_clean(); } @@ -1375,7 +1228,7 @@ static void mmi_voicechat_record_button_event_cb(lv_obj_t * obj, lv_event_t e) if(LV_EVENT_CLICKED != e) return; - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: ui_state=%d\n", __FUNCTION__, __LINE__, s_voicechat_ui_state); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: ui_state=%d\n", __FUNCTION__, __LINE__, s_voicechat_ui_state); switch(s_voicechat_ui_state) { @@ -1401,6 +1254,7 @@ static void mmi_voicechat_record_button_event_cb(lv_obj_t * obj, lv_event_t e) break; case MMI_VOICECHAT_UI_STATE_LIST: + mmi_voicechat_list_screen_ui_clean(); mmi_voicechat_listening_screen_display(); break; @@ -1411,7 +1265,7 @@ static void mmi_voicechat_record_button_event_cb(lv_obj_t * obj, lv_event_t e) lv_obj_t * mmi_voicechat_list_msg_item_add(lv_obj_t * list_page, mmi_voicechat_msg_item_info_t * msg_item, char * time_str, uint8_t i) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); lv_obj_t * obj = NULL; //lv_wechat_msg_list_item_ext_t * list_item_ext = NULL; @@ -1421,6 +1275,7 @@ lv_obj_t * mmi_voicechat_list_msg_item_add(lv_obj_t * list_page, mmi_voicechat_m lv_obj_t * last_obj = lv_obj_get_child(scrl, NULL); lv_coord_t obj_y = 0; + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); if(NULL != last_obj) { obj_y = lv_obj_get_y(last_obj) + lv_obj_get_height(last_obj) + lv_obj_get_style_pad_inner(scrl, LV_STATE_DEFAULT); @@ -1432,19 +1287,17 @@ lv_obj_t * mmi_voicechat_list_msg_item_add(lv_obj_t * list_page, mmi_voicechat_m uint32_t file_size = msg_item->text_data_size; char * file_buf = msg_item->text_data_ptr; - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: y=%d,size=%d\n", __FUNCTION__, __LINE__, obj_y, file_size); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: y=%d,size=%d\n", __FUNCTION__, __LINE__, obj_y, file_size); if(0 == msg_item->msg_from) // self { obj = lv_cont_create(list_page, NULL); - //list_item_ext = lv_obj_allocate_ext_attr(obj, sizeof(lv_wechat_msg_list_item_ext_t)); - //list_item_ext->item_index = i; - //list_item_ext->unread_img = NULL; lv_obj_set_size(obj, lv_obj_get_width(list_page) - 40, 50); //lv_obj_set_size(obj, LV_HOR_RES * 2 / 3, 50); // same with voice item lv_cont_set_fit4(obj, LV_FIT_NONE, LV_FIT_NONE, LV_FIT_NONE, LV_FIT_TIGHT); //lv_cont_set_layout(obj, LV_LAYOUT_COLUMN_LEFT); lv_obj_add_style(obj, LV_CONT_PART_MAIN, &(ext->style_cont_self)); lv_obj_align(obj, scrl, LV_ALIGN_IN_TOP_RIGHT, -10, obj_y); + ext->cont_item_self = obj; lv_obj_t * label_text = lv_label_create(obj, NULL); lv_obj_add_style(label_text, LV_LABEL_PART_MAIN, &(ext->style_label_len_self)); @@ -1453,19 +1306,17 @@ lv_obj_t * mmi_voicechat_list_msg_item_add(lv_obj_t * list_page, mmi_voicechat_m lv_obj_set_width(label_text, lv_obj_get_width(obj) - 20); lv_label_set_text(label_text, file_buf); lv_obj_align(label_text, obj, LV_ALIGN_IN_LEFT_MID, 10, 0); - ext->list_self_label = label_text; + ext->label_item_self = label_text; } else { obj = lv_cont_create(list_page, NULL); - //list_item_ext = lv_obj_allocate_ext_attr(obj, sizeof(lv_wechat_msg_list_item_ext_t)); - //list_item_ext->item_index = i; - //list_item_ext->unread_img = NULL; lv_obj_set_size(obj, lv_obj_get_width(list_page) - 40, 50); //lv_obj_set_size(obj, LV_HOR_RES * 2 / 3, 50); // same with voice item lv_cont_set_fit4(obj, LV_FIT_NONE, LV_FIT_NONE, LV_FIT_NONE, LV_FIT_TIGHT); //lv_cont_set_layout(obj, LV_LAYOUT_COLUMN_LEFT); lv_obj_add_style(obj, LV_CONT_PART_MAIN, &(ext->style_cont_other)); lv_obj_align(obj, scrl, LV_ALIGN_IN_TOP_LEFT, 10, obj_y); + ext->cont_item_other = obj; lv_obj_t * label_text = lv_label_create(obj, NULL); lv_obj_add_style(label_text, LV_LABEL_PART_MAIN, &(ext->style_label_len_other)); @@ -1474,7 +1325,7 @@ lv_obj_t * mmi_voicechat_list_msg_item_add(lv_obj_t * list_page, mmi_voicechat_m lv_obj_set_width(label_text, lv_obj_get_width(obj) - 20); lv_label_set_text(label_text, file_buf); lv_obj_align(label_text, obj, LV_ALIGN_IN_LEFT_MID, 10, 0); - ext->list_other_label = label_text; + ext->label_item_other = label_text; //if(lv_obj_get_width(list_page) <= (lv_obj_get_y(obj) + lv_obj_get_height(obj))) //{ @@ -1492,6 +1343,45 @@ lv_obj_t * mmi_voicechat_list_msg_item_add(lv_obj_t * list_page, mmi_voicechat_m return obj; } + +void mmi_voicechat_list_screen_item_refresh(void) +{ + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + + lv_voicechat_ext_t * ext = (lv_voicechat_ext_t *)mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); + if(NULL == ext) + return ; + + if(NULL == ext->list) + return; + + uint32_t file_size = 0; + char * file_buf = NULL; + + file_size = s_voicechat_info_p->msg_item[0].text_data_size; + file_buf = s_voicechat_info_p->msg_item[0].text_data_ptr; + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: size=%d\n", __FUNCTION__, __LINE__, file_size); + if(0 != file_size && NULL != file_buf) + { + lv_label_set_text(ext->label_item_self, file_buf); + lv_obj_set_hidden(ext->cont_item_self, false); + } + + file_size = s_voicechat_info_p->msg_item[1].text_data_size; + file_buf = s_voicechat_info_p->msg_item[1].text_data_ptr; + if(0 != file_size && NULL != file_buf) + { + lv_label_set_text(ext->label_item_other, file_buf); + + lv_obj_t * scrl = lv_page_get_scrollable(ext->list); + lv_coord_t obj_y = lv_obj_get_y(ext->cont_item_self) + lv_obj_get_height(ext->cont_item_self) + lv_obj_get_style_pad_inner(scrl, LV_STATE_DEFAULT); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: y=%d,size=%d\n", __FUNCTION__, __LINE__, obj_y, file_size); + + lv_obj_align(ext->cont_item_other, scrl, LV_ALIGN_IN_TOP_LEFT, 10, obj_y); + lv_obj_set_hidden(ext->cont_item_other, false); + } +} + static lv_res_t mmi_voicechat_list_scrl_signal(lv_obj_t * scrl, lv_signal_t sign, void * param) { lv_res_t res; @@ -1519,7 +1409,7 @@ static lv_res_t mmi_voicechat_list_scrl_signal(lv_obj_t * scrl, lv_signal_t sign static lv_obj_t * mmi_voicechat_list_create(lv_obj_t * obj) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); lv_obj_t * list_page = lv_page_create(obj, NULL); lv_voicechat_list_ext_t * list_page_ext = lv_obj_allocate_ext_attr(list_page, sizeof(lv_voicechat_list_ext_t)); @@ -1549,6 +1439,7 @@ static lv_obj_t * mmi_voicechat_list_create(lv_obj_t * obj) //list_page_ext->voice_playing_msg_from = 0; list_page_ext->pressing = false; +#if 0 uint8_t i = 0; uint8_t msg_count = mmi_voicechat_msg_count_get(); @@ -1558,6 +1449,78 @@ static lv_obj_t * mmi_voicechat_list_create(lv_obj_t * obj) mmi_voicechat_list_msg_item_add(list_page, msg_item, NULL, i); } +#endif + + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + lv_voicechat_ext_t * ext = (lv_voicechat_ext_t *)mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); + if(NULL == ext) + return NULL; + + { + uint32_t file_size = s_voicechat_info_p->msg_item[0].text_data_size; + char * file_buf = s_voicechat_info_p->msg_item[0].text_data_ptr; + lv_coord_t obj_y = lv_obj_get_style_pad_top(scrl, LV_STATE_DEFAULT); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: y=%d,size=%d\n", __FUNCTION__, __LINE__, obj_y, file_size); + + lv_obj_t * obj = lv_cont_create(list_page, NULL); + lv_obj_set_size(obj, lv_obj_get_width(list_page) - 40, 50); + lv_cont_set_fit4(obj, LV_FIT_NONE, LV_FIT_NONE, LV_FIT_NONE, LV_FIT_TIGHT); + lv_obj_add_style(obj, LV_CONT_PART_MAIN, &(ext->style_cont_self)); + lv_obj_align(obj, scrl, LV_ALIGN_IN_TOP_RIGHT, -10, obj_y); + ext->cont_item_self = obj; + lv_obj_set_hidden(obj, true); + + lv_obj_t * label_text = lv_label_create(obj, NULL); + lv_obj_add_style(label_text, LV_LABEL_PART_MAIN, &(ext->style_label_len_self)); + lv_label_set_align(label_text, LV_LABEL_ALIGN_LEFT); // LV_LABEL_ALIGN_CENTER); + lv_label_set_long_mode(label_text, LV_LABEL_LONG_BREAK); + lv_obj_set_width(label_text, lv_obj_get_width(obj) - 20); + if(0 != file_size && NULL != file_buf) + { + lv_label_set_text(label_text, file_buf); + lv_obj_set_hidden(obj, false); + } + lv_obj_align(label_text, obj, LV_ALIGN_IN_LEFT_MID, 10, 0); + ext->label_item_self = label_text; + + lv_obj_set_adv_hittest(obj, false); + lv_page_focus(list_page, obj, 0); + lv_page_glue_obj(obj, true); + lv_watch_obj_add_element(obj); + } + + { + uint32_t file_size = s_voicechat_info_p->msg_item[1].text_data_size; + char * file_buf = s_voicechat_info_p->msg_item[1].text_data_ptr; + lv_coord_t obj_y = lv_obj_get_y(ext->cont_item_self) + lv_obj_get_height(ext->cont_item_self) + lv_obj_get_style_pad_inner(scrl, LV_STATE_DEFAULT); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: y=%d,size=%d\n", __FUNCTION__, __LINE__, obj_y, file_size); + + lv_obj_t * obj = lv_cont_create(list_page, NULL); + lv_obj_set_size(obj, lv_obj_get_width(list_page) - 40, 50); + lv_cont_set_fit4(obj, LV_FIT_NONE, LV_FIT_NONE, LV_FIT_NONE, LV_FIT_TIGHT); + lv_obj_add_style(obj, LV_CONT_PART_MAIN, &(ext->style_cont_other)); + lv_obj_align(obj, scrl, LV_ALIGN_IN_TOP_LEFT, 10, obj_y); + ext->cont_item_other = obj; + lv_obj_set_hidden(obj, true); + + lv_obj_t * label_text = lv_label_create(obj, NULL); + lv_obj_add_style(label_text, LV_LABEL_PART_MAIN, &(ext->style_label_len_other)); + lv_label_set_align(label_text, LV_LABEL_ALIGN_LEFT); // LV_LABEL_ALIGN_CENTER); + lv_label_set_long_mode(label_text, LV_LABEL_LONG_BREAK); + lv_obj_set_width(label_text, lv_obj_get_width(obj) - 20); + if(0 != file_size && NULL != file_buf) + { + lv_label_set_text(label_text, file_buf); + lv_obj_set_hidden(obj, false); + } + lv_obj_align(label_text, obj, LV_ALIGN_IN_LEFT_MID, 10, 0); + ext->label_item_other = label_text; + + lv_obj_set_adv_hittest(obj, false); + lv_page_focus(list_page, obj, 0); + lv_page_glue_obj(obj, true); + lv_watch_obj_add_element(obj); + } //if((lv_obj_get_height(list_page) - lv_obj_get_style_pad_top(list_page, LV_LIST_PART_BG) * 2) > lv_obj_get_height(scrl)) //{ @@ -1567,49 +1530,27 @@ static lv_obj_t * mmi_voicechat_list_create(lv_obj_t * obj) return list_page; } -void mmi_voicechat_list_screen_list_refresh(void) -{ - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - - lv_voicechat_ext_t * ext = (lv_voicechat_ext_t *)mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); - if(NULL == ext) - return ; - - if(NULL != ext->list) - { - lv_obj_clean(ext->list); - lv_obj_del(ext->list); - ext->list = NULL; - } - ext->list = mmi_voicechat_list_create(ext->cont_list); -} - void mmi_voicechat_list_screen_display(void) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); lv_voicechat_ext_t * ext = (lv_voicechat_ext_t *)mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); if(NULL == ext) return ; + if(MMI_VOICECHAT_UI_STATE_LIST == s_voicechat_ui_state) + return; + s_voicechat_ui_state = MMI_VOICECHAT_UI_STATE_LIST; + mmi_voicechat_list_set_slide_enable(&ext->old_ext, true); + // ui lv_obj_t * cont = ext->cont_list; - lv_obj_clean(cont); + //lv_obj_clean(cont); - //mmi_voicechat_list_screen_list_refresh(); ext->list = mmi_voicechat_list_create(cont); - // signal weak - lv_obj_t * label = lv_label_create(cont, NULL); - lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); - lv_label_set_text_id(label, WATCH_TEXT_ID_SIGNAL_WEAK); - lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); - lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, -10); - lv_obj_set_click(label, false); - ext->list_signal_weak_label = label; - lv_obj_t * imgbtn_cancel = lv_imgbtn_create(cont, NULL); lv_imgbtn_set_src(imgbtn_cancel, LV_BTN_STATE_RELEASED, ICON_VOICECHAT_CANCEL_BUTTON); lv_imgbtn_set_src(imgbtn_cancel, LV_BTN_STATE_PRESSED, ICON_VOICECHAT_CANCEL_BUTTON); @@ -1638,12 +1579,29 @@ void mmi_voicechat_list_screen_display(void) lv_obj_set_hidden(ext->cont_thinking, true); lv_obj_set_hidden(ext->cont_timeout, true); lv_obj_set_hidden(ext->cont_list, false); - lv_obj_set_hidden(ext->list_signal_weak_label, true); +} + +void mmi_voicechat_list_screen_ui_clean(void) +{ + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + + lv_voicechat_ext_t * ext = (lv_voicechat_ext_t *)mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); + if(NULL == ext) + return ; + + if(MMI_VOICECHAT_UI_STATE_LIST != s_voicechat_ui_state) + return; + + // ui + lv_obj_t * cont = ext->cont_list; + lv_obj_clean(cont); + + //lv_obj_set_hidden(cont, true); } static void mmi_voicechat_default_screen_display(void) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); lv_voicechat_ext_t * ext = (lv_voicechat_ext_t *)mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); if(NULL == ext) @@ -1690,7 +1648,7 @@ static void mmi_voicechat_default_screen_display(void) static void mmi_voicechat_no_network_screen_display(lv_obj_t * obj) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); lv_voicechat_ext_t * ext = (lv_voicechat_ext_t *)mmi_voicechat_actId_ext_get(ACT_ID_VOICECHAT_MAIN); if(NULL == ext) @@ -1736,6 +1694,7 @@ static void mmi_voicechat_no_network_screen_display(lv_obj_t * obj) lv_obj_align(imgbtn_label, NULL, LV_ALIGN_CENTER, 0, 0); } +#if 0 void mmi_voicechat_main_screen_refresh(void) { printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); @@ -1756,21 +1715,22 @@ void mmi_voicechat_main_screen_refresh(void) //mmi_voicechat_list_create(ext->cont, ext); if(0 == msg_count) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); mmi_voicechat_default_screen_display(); } else { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); mmi_voicechat_list_screen_display(); } } +#endif lv_obj_t * mmi_voicechat_main_create(lv_obj_t * activity_obj) { - VOICECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_USB_LOG("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); if(activity_obj == NULL) { @@ -1803,8 +1763,10 @@ lv_obj_t * mmi_voicechat_main_create(lv_obj_t * activity_obj) ext->cont_list = NULL; ext->list = NULL; - ext->list_self_label = NULL; - ext->list_other_label = NULL; + ext->cont_item_self = NULL; + ext->cont_item_other = NULL; + ext->label_item_self = NULL; + ext->label_item_other = NULL; ext->record_buffer = NULL; ext->record_size = 0; ext->thinking_task_p = NULL; @@ -1885,7 +1847,7 @@ lv_obj_t * mmi_voicechat_main_create(lv_obj_t * activity_obj) mmi_voicechat_websocket_close(); mmi_voicechat_websocket_open(); - s_voicechat_start_flag = false; + s_vc_send_start_flag = false; return obj; } diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_voicechat_ui.h b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_voicechat_ui.h index 97486c7a..d99ad93e 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_voicechat_ui.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_voicechat_ui.h @@ -19,15 +19,20 @@ extern "C" { #ifdef __MMI_CUSTOM_VOICECHAT_SUPPORT__ -#define __MMI_VOICECHAT_DEBUG__ +//#define __MMI_VOICECHAT_DEBUG__ #ifdef __MMI_VOICECHAT_DEBUG__ -#define VOICECHAT_DEBUG_PRINTF(fmt, ...) printf("[VOICECHAT]"fmt, ##__VA_ARGS__) -//#define VOICECHAT_DEBUG_PRINTF(fmt, ...) CPUartLogPrintf("[VOICECHAT]"fmt, ##__VA_ARGS__) -//#define VOICECHAT_DEBUG_PRINTF(fmt, ...) cplog_printf("[VOICECHAT]"fmt, ##__VA_ARGS__) +#define VC_USB_LOG(fmt, ...) printf("[VC]"fmt, ##__VA_ARGS__) +//#define VC_USB_LOG(fmt, ...) CPUartLogPrintf("[VC]"fmt, ##__VA_ARGS__) +//#define VC_USB_LOG(fmt, ...) cplog_printf("[VC]"fmt, ##__VA_ARGS__) #else -#define VOICECHAT_DEBUG_PRINTF(fmt, ...) +#define VC_USB_LOG(fmt, ...) #endif +#if 10 +#define VC_UART_LOG(fmt, ...) cplog_printf("[VC]"fmt, ##__VA_ARGS__) +#else +#define VC_UART_LOG(fmt, ...) +#endif //#define MMI_VOICECHAT_DEBUG_TO_FILE #ifdef MMI_VOICECHAT_DEBUG_TO_FILE @@ -37,10 +42,11 @@ extern "C" { -#define MMI_VOICECHAT_UL_AUDIO_FORMAT (3) // 7-pcm8k; 3-amr; 8-pcm16k -#define MMI_VOICECHAT_UL_AUDIO_FORMAT_STR ("amr") // ("amr") // "pcm" -#define MMI_VOICECHAT_DL_AUDIO_FORMAT_STR ("mp3") // ("mp3") // "pcm" // "wav" -//#define MMI_VOICECHAT_UL_AUDIO_SAMPLE_RATE (16000) // (8000) // 16000 +#define MMI_VC_UL_AUDIO_FORMAT (3) // 7-pcm8k; 3-amr; 8-pcm16k +#define MMI_VC_UL_AUDIO_FORMAT_STR ("amr") // ("amr") // "pcm" +#define MMI_VC_UL_AUDIO_SAMPLE_RATE (8000) // 16000 +#define MMI_VC_DL_AUDIO_FORMAT_STR ("mp3") // ("mp3") // "pcm" // "wav" +#define MMI_VC_DL_AUDIO_SAMPLE_RATE (8000) // (8000) // 16000 #if 1 // amr #define MMI_VOICECHAT_DATA_RECORD_HEAD_SIZE (6) @@ -110,15 +116,15 @@ typedef struct //TIMER_ID delete_timer_id; lv_obj_t * cont_default; lv_obj_t * cont_listening; - lv_obj_t * listening_signal_weak_label; lv_obj_t * cont_listening_middle; lv_obj_t * cont_thinking; lv_obj_t * cont_timeout; lv_obj_t * cont_list; lv_obj_t * list; // chat list - lv_obj_t * list_signal_weak_label; - lv_obj_t * list_self_label; - lv_obj_t * list_other_label; + lv_obj_t * cont_item_self; + lv_obj_t * cont_item_other; + lv_obj_t * label_item_self; + lv_obj_t * label_item_other; lv_style_t style_cont_self; lv_style_t style_cont_other; @@ -142,7 +148,6 @@ typedef enum MMI_VOICECHAT_UI_STATE_NONE, MMI_VOICECHAT_UI_STATE_OPEN_FAIL, MMI_VOICECHAT_UI_STATE_LISTENING, - MMI_VOICECHAT_UI_STATE_LISTENING_MIDDLE, MMI_VOICECHAT_UI_STATE_THINKING, MMI_VOICECHAT_UI_STATE_CONNECT_TIMEOUT, MMI_VOICECHAT_UI_STATE_LIST, diff --git a/2.sdk/sdk/product/craneg_modem/framework/hal/media/mci/mci_recorder.cpp b/2.sdk/sdk/product/craneg_modem/framework/hal/media/mci/mci_recorder.cpp index 6b94ca6f..61b02679 100644 --- a/2.sdk/sdk/product/craneg_modem/framework/hal/media/mci/mci_recorder.cpp +++ b/2.sdk/sdk/product/craneg_modem/framework/hal/media/mci/mci_recorder.cpp @@ -34,6 +34,8 @@ public: } virtual int onEvent(AMediaRecorderListener::EventType event, int data1 = 0, int data2=0) { +// raw_uart_log("[@CHENG_DEBUG][%s][%d]: event=%d,data1=%d,data2=%d\n", __FUNCTION__, __LINE__, event, data1, data2); +// uart_printf("[@CHENG_DEBUG][%s][%d]: event=%d,data1=%d,data2=%d\n", __FUNCTION__, __LINE__, event, data1, data2); switch(event) { case AMediaRecorderListener::MEDIARECORDER_EVENT_EOS: diff --git a/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/inc/mmi_voicechat_websocket.h b/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/inc/mmi_voicechat_websocket.h index 349dd848..13cc04fb 100644 --- a/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/inc/mmi_voicechat_websocket.h +++ b/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/inc/mmi_voicechat_websocket.h @@ -13,13 +13,13 @@ extern "C" { #ifdef __MMI_CUSTOM_VOICECHAT_SUPPORT__ -#define __MMI_VOICECHAT_WB_DEBUG__ -#ifdef __MMI_VOICECHAT_WB_DEBUG__ -//#define VOICECHAT_WB_DEBUG_PRINTF(fmt, ...) printf("[VOICECHAT_WB]"fmt, ##__VA_ARGS__) -//#define VOICECHAT_WB_DEBUG_PRINTF(fmt, ...) CPUartLogPrintf("[VOICECHAT_WB]"fmt, ##__VA_ARGS__) -#define VOICECHAT_WB_DEBUG_PRINTF(fmt, ...) cplog_printf("[VOICECHAT_WB]"fmt, ##__VA_ARGS__) +//#define __MMI_VC_WS_DEBUG__ +#ifdef __MMI_VC_WS_DEBUG__ +//#define VC_WS_UART_LOG(fmt, ...) printf("[VC_WS]"fmt, ##__VA_ARGS__) +//#define VC_WS_UART_LOG(fmt, ...) CPUartLogPrintf("[VC_WS]"fmt, ##__VA_ARGS__) +#define VC_WS_UART_LOG(fmt, ...) cplog_printf("[VC_WS]"fmt, ##__VA_ARGS__) #else -#define VOICECHAT_WB_DEBUG_PRINTF(fmt, ...) +#define VC_WS_UART_LOG(fmt, ...) #endif diff --git a/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/src/mmi_voicechat_websocket.c b/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/src/mmi_voicechat_websocket.c index 0334f60f..4e8555fb 100644 --- a/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/src/mmi_voicechat_websocket.c +++ b/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/src/mmi_voicechat_websocket.c @@ -10,22 +10,27 @@ //#define MMI_VOICECHAT_WEBSOCKET_URI "wss://nls-gateway-cn-beijing.aliyuncs.com/ws/v1" //#define MMI_VOICECHAT_WEBSOCKET_URI "ws://118.145.133.67:22080/voice-chat/ws" -#define MMI_VOICECHAT_WEBSOCKET_URI "ws://118.145.158.207:22080/voice-chat/ws" -//#define MMI_VOICECHAT_WEBSOCKET_URI "ws://amp.raisound.com/voice-chat/ws" - -static sim_esp_websocket_client_handle_t s_voicechat_ws_client_p = NULL; -extern void mmi_voicechat_websocket_recv_data_handler(char * data_ptr, int data_len, int payload_len, int payload_offset); #ifdef __MMI_CUSTOM_AI_AUTHENTICATE_SUPPORT__ +#define MMI_VOICECHAT_WEBSOCKET_URI "ws://amp.raisound.com/voice-chat/ws" + extern char * mmi_ai_device_token_get(void); + +#else + +#define MMI_VOICECHAT_WEBSOCKET_URI "ws://118.145.158.207:22080/voice-chat/ws" #endif +static sim_esp_websocket_client_handle_t s_voicechat_ws_client_p = NULL; + +extern void mmi_vc_ws_recv_data_handler(char * data_ptr, int data_len); + int mmi_voicechat_websocket_send_text_data(char * data_ptr, int data_len) { int ret = -1; - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_voicechat_ws_client_p); + VC_WS_UART_LOG("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_voicechat_ws_client_p); if(NULL == s_voicechat_ws_client_p) { return ret; @@ -34,7 +39,7 @@ int mmi_voicechat_websocket_send_text_data(char * data_ptr, int data_len) ret = voicechat_websocket_client_send_text(s_voicechat_ws_client_p, data_ptr, data_len, portMAX_DELAY); if (0 > ret) { - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_WS_UART_LOG("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); } return ret; @@ -44,7 +49,7 @@ int mmi_voicechat_websocket_send_binary_data(char * data_ptr, int data_len) { int ret = -1; - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_voicechat_ws_client_p); + VC_WS_UART_LOG("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_voicechat_ws_client_p); if(NULL == s_voicechat_ws_client_p) { return ret; @@ -53,7 +58,7 @@ int mmi_voicechat_websocket_send_binary_data(char * data_ptr, int data_len) ret = voicechat_websocket_client_send_bin(s_voicechat_ws_client_p, data_ptr, data_len, portMAX_DELAY); if (0 > ret) { - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + VC_WS_UART_LOG("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); } return ret; @@ -63,42 +68,41 @@ static void mmi_voicechat_websocket_event_handler(int32_t event_id, void *event_ { sim_esp_websocket_event_data_t *data = (sim_esp_websocket_event_data_t *)event_data; - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: event_id=%d\n", __FUNCTION__, __LINE__, event_id); switch (event_id) { case WEBSOCKET_EVENT_CONNECTED: - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%d]: WEBSOCKET_EVENT_CONNECTED\n", __LINE__); + VC_WS_UART_LOG("[@CHENG_DEBUG][%d]: WEBSOCKET_EVENT_CONNECTED\n", __LINE__); break; case WEBSOCKET_EVENT_DISCONNECTED: - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%d]: WEBSOCKET_EVENT_DISCONNECTED\n", __LINE__); + VC_WS_UART_LOG("[@CHENG_DEBUG][%d]: WEBSOCKET_EVENT_DISCONNECTED\n", __LINE__); break; case WEBSOCKET_EVENT_DATA: - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%d]: WEBSOCKET_EVENT_DATA\n", __LINE__); - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG]: data opcode=%d,data len=%d", data->op_code, data->data_len); - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG]: Total payload len=%d,current payload offset=%d\r\n", data->payload_len, data->payload_offset); + VC_WS_UART_LOG("[@CHENG_DEBUG][%d]: WEBSOCKET_EVENT_DATA\n", __LINE__); + VC_WS_UART_LOG("[@CHENG_DEBUG]: opcode=%d,data len=%d,Total payload len=%d,current payload offset=%d\n", + data->op_code, data->data_len, data->payload_len, data->payload_offset); if (data->op_code == 0x08 && data->data_len == 2) { - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG]: Received closed message with code=%d", 256*data->data_ptr[0] + data->data_ptr[1]); + VC_WS_UART_LOG("[@CHENG_DEBUG]: Received closed message with code=%d", 256*data->data_ptr[0] + data->data_ptr[1]); } else { - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG]: Received=%.*s", data->data_len, (char *)data->data_ptr); - mmi_voicechat_websocket_recv_data_handler(data->data_ptr, data->data_len, data->payload_len, data->payload_offset); + VC_WS_UART_LOG("[@CHENG_DEBUG]: Received=%.*s\n", data->data_len, (char *)data->data_ptr); + mmi_vc_ws_recv_data_handler(data->data_ptr, data->data_len); } //OSATimerStart(shutdown_signal_timer, portMAX_DELAY, 0, shutdown_signaler, 0); break; case WEBSOCKET_EVENT_ERROR: - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%d]: WEBSOCKET_EVENT_ERROR\n", __LINE__); + VC_WS_UART_LOG("[@CHENG_DEBUG][%d]: WEBSOCKET_EVENT_ERROR\n", __LINE__); break; case WEBSOCKET_EVENT_CLOSED: - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%d]: WEBSOCKET_EVENT_CLOSED\n", __LINE__); + VC_WS_UART_LOG("[@CHENG_DEBUG][%d]: WEBSOCKET_EVENT_CLOSED\n", __LINE__); break; default: - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%d]: default\n", __LINE__); + VC_WS_UART_LOG("[@CHENG_DEBUG][%s][%d]: event_id=%d\n", __FUNCTION__, __LINE__, event_id); break; } @@ -108,12 +112,12 @@ static void mmi_voicechat_websocket_event_handler(int32_t event_id, void *event_ { free(data->data_ptr); data->data_ptr = NULL; - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: free data ptr\n", __FUNCTION__, __LINE__); + //VC_WS_UART_LOG("[@CHENG_DEBUG][%s][%d]: free data ptr\n", __FUNCTION__, __LINE__); } free(data); data = NULL; - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: free data\n", __FUNCTION__, __LINE__); + //VC_WS_UART_LOG("[@CHENG_DEBUG][%s][%d]: free data\n", __FUNCTION__, __LINE__); } } @@ -124,23 +128,23 @@ void mmi_voicechat_websocket_app_start(void) OS_STATUS status = 0; int ret = 0; sim_esp_websocket_client_config_t websocket_cfg = {0}; + char url_str[256] = {0}; #ifdef __MMI_CUSTOM_AI_AUTHENTICATE_SUPPORT__ - char url_str[256] = {0}; sprintf(url_str, "%s?dt=%s", MMI_VOICECHAT_WEBSOCKET_URI, mmi_ai_device_token_get()); - - websocket_cfg.uri = url_str; #else - websocket_cfg.uri = MMI_VOICECHAT_WEBSOCKET_URI; + //sprintf(url_str, "%s?is_auth=0&platform=raisound", MMI_VOICECHAT_WEBSOCKET_URI); // aliyun + sprintf(url_str, "%s?is_auth=0", MMI_VOICECHAT_WEBSOCKET_URI); //websocket_cfg.transport == WEBSOCKET_TRANSPORT_OVER_SSL; #endif + websocket_cfg.uri = url_str; - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: url=%s\n", __FUNCTION__, __LINE__, websocket_cfg.uri); + VC_WS_UART_LOG("[@CHENG_DEBUG][%s][%d]: url=%s\n", __FUNCTION__, __LINE__, websocket_cfg.uri); s_voicechat_ws_client_p = voicechat_websocket_client_init(&websocket_cfg); if(NULL == s_voicechat_ws_client_p) { - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: websocket client init fail\n", __FUNCTION__, __LINE__); + VC_WS_UART_LOG("[@CHENG_DEBUG][%s][%d]: websocket client init fail\n", __FUNCTION__, __LINE__); return; } @@ -149,7 +153,7 @@ void mmi_voicechat_websocket_app_start(void) esp_err_t err_no = voicechat_websocket_client_start(s_voicechat_ws_client_p); if(ESP_OK != err_no) { - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: websocket client start fail,%d\n", __FUNCTION__, __LINE__, err_no); + VC_WS_UART_LOG("[@CHENG_DEBUG][%s][%d]: websocket client start fail,%d\n", __FUNCTION__, __LINE__, err_no); return; } else @@ -157,12 +161,12 @@ void mmi_voicechat_websocket_app_start(void) } - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_voicechat_ws_client_p); + VC_WS_UART_LOG("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_voicechat_ws_client_p); } void mmi_voicechat_websocket_app_stop(void) { - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_voicechat_ws_client_p); + VC_WS_UART_LOG("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_voicechat_ws_client_p); if(NULL != s_voicechat_ws_client_p) { @@ -170,7 +174,7 @@ void mmi_voicechat_websocket_app_stop(void) s_voicechat_ws_client_p = NULL; } - VOICECHAT_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_voicechat_ws_client_p); + VC_WS_UART_LOG("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_voicechat_ws_client_p); } #endif