projects
/
mirrors
/
FD230.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4952a8a
)
系统:优化部分UI操作
1474/1
1474/head
author
Caisking
<3449750381@qq.com>
Fri, 29 Nov 2024 13:06:09 +0000
(21:06 +0800)
committer
Caisking
<3449750381@qq.com>
Fri, 29 Nov 2024 13:06:09 +0000
(21:06 +0800)
code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosModel.cpp
patch
|
blob
|
history
code/sdk/middleware/services/gui/uikit/ui/frameworks/components/ui_image_animator.cpp
patch
|
blob
|
history
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
c89e73b
..
46281f4
100644
(file)
--- 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
621ff5d
..
90ee583
100755
(executable)
--- 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;
}