#986 手表在点击拍照界面,APP端退出相机界面时手表端不会同步退出
authorCaisking <3449750381@qq.com>
Sat, 12 Oct 2024 08:37:53 +0000 (16:37 +0800)
committerCaisking <3449750381@qq.com>
Sat, 12 Oct 2024 08:37:53 +0000 (16:37 +0800)
code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosModel.cpp

index a999520..3837db0 100644 (file)
@@ -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)