增加下载上报

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 e31ea47..61d301a 100644 (file)
--- a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_emoji.c
+++ b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_emoji.c
@@ -437,7 +437,7 @@ static void ln_emoji_download(void *arg)
     g_emoji_download_cancelled = 0;
 
     // 上报下载开始状态
-    //ln_ws_send_emoji_download_status_report(pkg->characterId, pkg->eyesColor, pkg->eyesShape,  "downloading", 0, "开始下载表情包");
+    ln_ws_send_emoji_download_status_report(pkg->characterId, pkg->eyesColor, pkg->eyesShape,  "downloading", 0, "开始下载表情包");
 
     int all_success = 1;
     int downloaded_count = 0; /* 包含已缓存与成功下载的 */
@@ -468,7 +468,7 @@ static void ln_emoji_download(void *arg)
             ln_safe_strcpy(mail.description, sizeof(mail.description), "没有足够的空间,跳过下载");
             do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_EMOJI_REPORT, (char *)&mail, (uint32_t)sizeof(mail));
             // 上报下载失败状态
-            //ln_ws_send_emoji_download_status_report(g_emoji_package.characterId, g_emoji_package.eyesColor, g_emoji_package.eyesShape, "download_fail", -1, "没有足够的空间,跳过下载");
+            ln_ws_send_emoji_download_status_report(g_emoji_package.characterId, g_emoji_package.eyesColor, g_emoji_package.eyesShape, "download_fail", -1, "没有足够的空间,跳过下载");
             push_download_fail_notification(DOWNLOAD_FILE_TYPE_EMOJI);
             ln_free_emoji_list();
             return;
@@ -563,7 +563,7 @@ static void ln_emoji_download(void *arg)
             // 上报下载失败状态
             char fail_msg[128];
             snprintf(fail_msg, sizeof(fail_msg), "表情 %s 下载失败", pkg->emojis[i].emotion);
-            //ln_ws_send_emoji_download_status_report(pkg->characterId, pkg->eyesColor, pkg->eyesShape, "download_fail", -1, fail_msg);
+            ln_ws_send_emoji_download_status_report(pkg->characterId, pkg->eyesColor, pkg->eyesShape, "download_fail", -1, fail_msg);
             /* 单个文件三次重试仍失败，终止后续下载并尽快上报失败 */
             break;
         }
@@ -578,7 +578,7 @@ static void ln_emoji_download(void *arg)
             // 每次进度更新都同步发送协议给服务器更新进度
             char progress_msg[64];
             snprintf(progress_msg, sizeof(progress_msg), "下载进度%d%%", progress);
-            //ln_ws_send_emoji_download_status_report(pkg->characterId, pkg->eyesColor, pkg->eyesShape,  "downloading", progress, progress_msg);
+            ln_ws_send_emoji_download_status_report(pkg->characterId, pkg->eyesColor, pkg->eyesShape,  "downloading", progress, progress_msg);
 
             /* 粗略版 ETA（平滑版）：在单个文件完成后估算一次 */
             if (total_bytes_all > 0)
@@ -692,27 +692,27 @@ static void ln_emoji_download(void *arg)
         /* 通知ui下载失败 */
         push_download_fail_notification(DOWNLOAD_FILE_TYPE_EMOJI);
         // 上报取消状态
-        // ln_ws_send_emoji_download_status_report(mail.characterId, mail.eyesColor, mail.eyesShape, "cancelled", -1, "表情包下载已取消");
+        ln_ws_send_emoji_download_status_report(mail.characterId, mail.eyesColor, mail.eyesShape, "cancelled", -1, "表情包下载已取消");
         
         // 删除已下载的表情文件
-        // if (pkg && pkg->eyesShape && pkg->eyesColor)
-        // {
-        //     char del_dir[MAX_PATH_LEN] = {0};
-        //     snprintf(del_dir, sizeof(del_dir),
-        //              "%s%s/%s",
-        //              EMOJI_CACHE_BASE_PATH,
-        //              pkg->eyesShape,
-        //              pkg->eyesColor);
-        //     int ret = uapi_delete_folder(del_dir);
-        //     if (ret == 0)
-        //     {
-        //         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[DOWNLOAD] 取消下载，已删除已下载的表情文件: %s", del_dir);
-        //     }
-        //     else
-        //     {
-        //         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[DOWNLOAD] 取消下载，删除已下载的表情文件失败: %s", del_dir);
-        //     }
-        // }
+        if (pkg && pkg->eyesShape && pkg->eyesColor)
+        {
+            char del_dir[MAX_PATH_LEN] = {0};
+            snprintf(del_dir, sizeof(del_dir),
+                     "%s%s/%s",
+                     EMOJI_CACHE_BASE_PATH,
+                     pkg->eyesShape,
+                     pkg->eyesColor);
+            int ret = uapi_delete_folder(del_dir);
+            if (ret == 0)
+            {
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[DOWNLOAD] 取消下载，已删除已下载的表情文件: %s", del_dir);
+            }
+            else
+            {
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[DOWNLOAD] 取消下载，删除已下载的表情文件失败: %s", del_dir);
+            }
+        }
     }
     /* 持久化：仅在整个表情组下载成功时记录该表情组 */
     else if (all_success)
@@ -721,14 +721,14 @@ static void ln_emoji_download(void *arg)
         push_download_success_notification(DOWNLOAD_FILE_TYPE_EMOJI);
         ln_persist_add_emoji_group(mail.characterId, mail.eyesColor, mail.eyesShape);
         // 上报下载成功状态
-        //ln_ws_send_emoji_download_status_report(mail.characterId, mail.eyesColor, mail.eyesShape, "download_success", 100, "表情包下载成功");
+        ln_ws_send_emoji_download_status_report(mail.characterId, mail.eyesColor, mail.eyesShape, "download_success", 100, "表情包下载成功");
     }
     else
     {
         /* 通知ui下载失败 */
         push_download_fail_notification(DOWNLOAD_FILE_TYPE_EMOJI);
         // 上报下载失败状态（如果之前没有上报过）
-        //ln_ws_send_emoji_download_status_report(mail.characterId, mail.eyesColor, mail.eyesShape, "download_fail", -1, "表情包下载失败");
+        ln_ws_send_emoji_download_status_report(mail.characterId, mail.eyesColor, mail.eyesShape, "download_fail", -1, "表情包下载失败");
     }
 }
 
@@ -1076,13 +1076,13 @@ void ln_parse_delete_emoji(const char *json_buf, int json_len)
     {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[DELETE_EMOJI] cached files in %s deleted", del_dir);
         // 删除成功，发送 delete_success 状态上报
-        //ln_ws_send_emoji_download_status_report(del_characterId, del_eyesColor, del_eyesShape, "delete_success", -1, "表情包删除成功");
+        ln_ws_send_emoji_download_status_report(del_characterId, del_eyesColor, del_eyesShape, "delete_success", -1, "表情包删除成功");
     }
     else
     {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[DELETE_EMOJI] failed to delete cached files in %s", del_dir);
         // 删除失败，发送 delete_fail 状态上报
-        //ln_ws_send_emoji_download_status_report(del_characterId, del_eyesColor, del_eyesShape, "delete_fail", -1, "表情包删除失败");
+        ln_ws_send_emoji_download_status_report(del_characterId, del_eyesColor, del_eyesShape, "delete_fail", -1, "表情包删除失败");
     }
 
     // [WEARABLE E/] [DELETE_EMOJI] parsed successfully: