From: Caisking <3449750381@qq.com> Date: Sat, 12 Oct 2024 08:37:53 +0000 (+0800) Subject: #986 手表在点击拍照界面,APP端退出相机界面时手表端不会同步退出 X-Git-Tag: release_V1.2.70_20241020_135402~60^2~1^2~10 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=6f2cfdad51a63328361b1bb9adbfc8c3809bea17;p=mirrors%2FFD230.git #986 手表在点击拍照界面,APP端退出相机界面时手表端不会同步退出 --- 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 a99952098..3837db09b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosModel.cpp @@ -93,7 +93,15 @@ extern "C" WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " 遥控拍照 \r\n"); uapi_set_screen_on_api(); // 亮屏 TakephotosModel::GetInstance()->SetPopStaust(PopupPhoto::TakePopup); - NativeAbility::GetInstance().EnterSlice(VIEW_TAKEPHOTOS); + //获取当前界面Id + int16_t curviewid = OHOS::NativeAbility::GetInstance().GetCurSliceId(); + //已经处于遥控拍照界面 + if (curviewid == VIEW_TAKEPHOTOS) { + NativeAbility::GetInstance().ChangeSlice(VIEW_TAKEPHOTOS); + } + else { + NativeAbility::GetInstance().EnterSlice(VIEW_TAKEPHOTOS); + } } // 退出拍照 if (request->msgId == TOPIC_EVENT_CANCEL_CMAERA)