From da0a7b4e256f7d901e3b6b33b85e16afa70b2e80 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Fri, 29 Nov 2024 21:06:09 +0800
Subject: [PATCH] =?utf8?q?=E7=B3=BB=E7=BB=9F=EF=BC=9A=E4=BC=98=E5=8C=96?=
 =?utf8?q?=E9=83=A8=E5=88=86UI=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../fd230app/nativeui/takephotos/src/TakephotosModel.cpp        | 2 ++
 .../gui/uikit/ui/frameworks/components/ui_image_animator.cpp    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosModel.cpp
index c89e73b1d..46281f457 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosModel.cpp
@@ -111,6 +111,8 @@ static void Notify(void *args, const Topic topic, Request *request) {
     int16_t curviewid = OHOS::NativeAbility::GetInstance().GetCurSliceId();
     //已经处于遥控拍照界面
     if (curviewid == VIEW_TAKEPHOTOS) {
+      // 点亮屏幕
+      uapi_set_screen_on_api();
       NativeAbility::GetInstance().Back(
           TransitionType::TRANSITION_BACK_TO_HEXAGONS);
       cameraSend(3);
diff --git a/code/sdk/middleware/services/gui/uikit/ui/frameworks/components/ui_image_animator.cpp b/code/sdk/middleware/services/gui/uikit/ui/frameworks/components/ui_image_animator.cpp
index 621ff5d88..90ee583c6 100755
--- a/code/sdk/middleware/services/gui/uikit/ui/frameworks/components/ui_image_animator.cpp
+++ b/code/sdk/middleware/services/gui/uikit/ui/frameworks/components/ui_image_animator.cpp
@@ -113,7 +113,7 @@ void UIImageAnimatorView::SetImageAnimatorSrc(const ImageAnimatorInfo imageAnima
 
 void UIImageAnimatorView::ClearImagesCache()
 {
-    if (imageSrc_ != nullptr) {
+    if (imageSrc_ == nullptr) {             ///11.29海思修改
         return;
     }
 
-- 
2.17.1