From: xue <2144439972@qq.com>
Date: Mon, 20 Oct 2025 04:06:49 +0000 (+0800)
Subject: 修复编译Bug
X-Git-Tag: V1.0.9_20251128_194606_LN~202
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=4fb23feb096309f110538bca057fca5d9aa96102;p=mirrors%2FFD230.git

修复编译Bug
---

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaPresenter.cpp
index f45b09699..e0537d080 100644
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaPresenter.cpp
@@ -46,12 +46,16 @@ namespace OHOS
     void OtaPresenter::OnStart()
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OtaPresenter::OnStart");
+        // 确保进入OTA界面时屏幕常亮，避免下载过程中息屏
+        ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);
         Presenter<OtaView, OtaModel>::OnStart();
     }
 
     void OtaPresenter::OnResume()
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OtaPresenter::OnResume");
+        // 确保恢复时屏幕常亮，避免下载过程中息屏
+        ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);
         Presenter<OtaView, OtaModel>::OnResume();
         // 设置按键监听器
         RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)this;
@@ -62,6 +66,8 @@ namespace OHOS
     void OtaPresenter::OnStop()
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OtaPresenter::OnStop");
+        // 退出OTA界面时关闭屏幕常亮
+        ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON);
         // StopOtaCountdown(); // 这个函数需要实现
         Presenter<OtaView, OtaModel>::OnStop();
     }
diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdModel.h b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdModel.h
index c98c0eaef..351dee71d 100644
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdModel.h
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdModel.h
@@ -229,6 +229,9 @@ namespace OHOS
         // NPC表情变化处理函数
         void HandleNpcEmotionChange(const char* emotion);
         
+        // 将英文表情映射到英文文件名
+        std::string MapEmotionToFileName(const char* emotion);
+        
         // 时间线状态变化处理函数
         void HandleTimelineStatusChange(const char* description, const char* emotion);