From 570d0dbb5ead4533ae63ea28db06a773e7632f4f Mon Sep 17 00:00:00 2001 From: Caisking <3449750381@qq.com> Date: Wed, 2 Oct 2024 16:34:49 +0800 Subject: [PATCH] =?utf8?q?=E7=B3=BB=E7=BB=9F=EF=BC=9A=E4=BF=AE=E6=94=B9Sli?= =?utf8?q?ce=E6=A0=88=EF=BC=9B=E4=BF=9D=E8=AF=81=E9=87=8C=E9=9D=A2?= =?utf8?q?=E4=BF=9D=E7=95=99=E9=BB=98=E8=AE=A4SliceId?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../wearable/nativeabilityfwk/include/Ability.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h b/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h index 56cea10b6..5db5bcd6c 100755 --- a/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h +++ b/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h @@ -92,11 +92,7 @@ public: /// @param priority 切换优先级 bool Back(const TransitionType transitionId = TransitionType::TRANSITION_INVALID, const uint16_t priority = gSliceDefaultPriority) { - /* - if (backStack_.empty()) { - backStack_.push(defaultSliceId_); // 将默认主界面的 ID 推入栈中 - } - */ + if (!backStack_.empty()) { uint16_t preSlice = backStack_.top(); backStack_.pop(); @@ -105,7 +101,8 @@ public: } else { - // 当backStack为空时,退回到defaultSliceId_ + backStack_.push(defaultSliceId_); // 将默认主界面的 ID 推入栈中 + // 退回到defaultSliceId_ ChangeSlice(defaultSliceId_, transitionId, priority); return false; // 返回false表示无前一个slice,退回到默认slice } @@ -182,6 +179,9 @@ public: { backStack_.pop(); } + if (backStack_.empty()) { + backStack_.push(defaultSliceId_); // 将默认主界面的 ID 推入栈中 + } } /*打印栈中元素*/ -- 2.17.1