From: Caisking <3449750381@qq.com>
Date: Wed, 17 Apr 2024 07:51:06 +0000 (+0800)
Subject: Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 
X-Git-Tag: release_V1.2.70_20241020_135402~1174^2~11
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=0bb6fe1b75479165513d72c96cb0b4e31d6046ae;p=mirrors%2FFD230.git

Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin
---

0bb6fe1b75479165513d72c96cb0b4e31d6046ae
diff --cc code/sdk/application/wearable/nativeabilityfwk/include/Ability.h
index 2f2c045e7,7f7e851fc..ab848fca7
--- a/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h
+++ b/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h
@@@ -80,12 -81,8 +81,13 @@@ public
      }
  
      // 处理后退操作
-     bool Back() {
 -    bool Back(const uint16_t transitionId = TRANSITION_INVALID,
 -        const uint16_t priority = gSliceDefaultPriority) {
++     bool Back(const uint16_t transitionId = TRANSITION_INVALID,
++        const uint16_t priority = gSliceDefaultPriority) { 
 +        /*
 +        if (backStack_.empty()) {
 +        backStack_.push(defaultSliceId_); // 将默认主界面的 ID 推入栈中
 +        }
 +        */
          if (!backStack_.empty()) {
              uint16_t preSlice = backStack_.top();
              backStack_.pop();