优化OTA与下载的冲突bug

diff --git a/code/sdk/zhihui/leiniao/imsl_ln/ln_api.c b/code/sdk/zhihui/leiniao/imsl_ln/ln_api.c
index 1d06353..b8c4664 100644 (file)
--- a/code/sdk/zhihui/leiniao/imsl_ln/ln_api.c
+++ b/code/sdk/zhihui/leiniao/imsl_ln/ln_api.c
@@ -196,6 +196,7 @@ char *uapi_ln_get_device_model(void)
 /* 获取设备固件版本version */
 char *uapi_ln_get_device_version(void)
 {
+    //return "V1.0.0_20251015";
     char version_buf[128] = {0};
     uint32_t version_len = sizeof(version_buf) - 1; // 预留1字节给字符串结束符
     uapi_get_buildversion((uint8_t *)version_buf, version_len);
@@ -920,7 +921,12 @@ void ln_ws_process_message(const ws_data_msg_t *data_msg, ws_command_t type)
     case WS_CMD_AUDIO_PLAYBACK_END:
     {
         uapi_ln_set_audio_play_status(0);
-        //push_audio_playback_end_notification();
+        push_audio_playback_end_notification();
+        break;
+    }
+    case WS_CMD_SENTENCE_PLAYBACK_COMPLETE:
+    {
+        push_audio_playback_start_notification();
         break;
     }
     default:

diff --git a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_device_info.c b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_device_info.c
index 3cc5779..a5ff2c8 100644 (file)
--- a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_device_info.c
+++ b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_device_info.c
@@ -270,7 +270,7 @@ void ln_parse_character_config(const char *json_buf, int json_len)
         ln_set_pending_screen_image(g_ln_character_config.avatar_screen_image);
         push_download_file_notification(DOWNLOAD_FILE_TYPE_SCREEN_IMAGE);
         // 改为无参发送：由接收线程读取全局配置并下载
-        do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_DOWNLOAD_SCREEN_IMAGE, NULL, 0);
+        //do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_DOWNLOAD_SCREEN_IMAGE, NULL, 0);
     }
 
     /* 推送角色配置更改通知 */

diff --git a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_emoji.c b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_emoji.c
index 6b63916..7f4f791 100644 (file)
--- a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_emoji.c
+++ b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_emoji.c
@@ -626,7 +626,7 @@ void ln_parse_download_emoji(const char *json_buf, int json_len)
     // 说明：下载所需信息已填充到全局 g_emoji_package，触发命令无需携带负载
     //通知ui切换slice下载表情
     push_download_file_notification(DOWNLOAD_FILE_TYPE_EMOJI);
-    do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_DOWNLOAD_EMOJI, NULL, 0);
+    //do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_DOWNLOAD_EMOJI, NULL, 0);
     // 清理资源
     cJSON_Delete(root);
     free(text);

diff --git a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c
index 442de0f..94a3716 100644 (file)
--- a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c
+++ b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c
@@ -2550,7 +2550,6 @@ static bool check_playback_completion_by_duration(void)
         
         // 触发单句语音播放完成事件
         if (g_ws_message_callback != NULL) {
-            push_audio_playback_start_notification();
             g_ws_message_callback(NULL, WS_CMD_SENTENCE_PLAYBACK_COMPLETE);
         }
         
@@ -2578,7 +2577,6 @@ static bool check_playback_completion_by_timeout(void)
         
         // 触发播放结束事件
         if (g_ws_message_callback != NULL) {
-            push_audio_playback_end_notification();
             g_ws_message_callback(NULL, WS_CMD_AUDIO_PLAYBACK_END);
         }