Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 30/1 30/head
authorCaisking <3449750381@qq.com>
Wed, 17 Apr 2024 07:51:06 +0000 (15:51 +0800)
committerCaisking <3449750381@qq.com>
Wed, 17 Apr 2024 07:51:06 +0000 (15:51 +0800)
1  2 
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();