修复编译错误 3427/2 3427/head 3429/target/1
authorxue <2144439972@qq.com>
Wed, 27 May 2026 10:33:42 +0000 (18:33 +0800)
committerxue <2144439972@qq.com>
Wed, 27 May 2026 10:33:42 +0000 (18:33 +0800)
code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp

index e35075a..032e697 100644 (file)
@@ -576,20 +576,14 @@ namespace OHOS
                 int16_t savedSubView = ThunderBirdModel::GetInstance()->GetCurrentSubView();
                 if (savedView >= 0 && savedView < MAXVIEW && savedSubView != -1) {
                     ChangeView(MAXVIEW, savedView, savedSubView);
+                    ThunderBirdModel::GetInstance()->SetCurrentView(-1);
+                    ThunderBirdModel::GetInstance()->SetCurrentSubView(-1);
+                } else if (ThunderBirdModel::GetInstance()->StartBootOperation() == 0) {
+                    ChangeView(MAXVIEW, THUNDERBIRD_GUIDEVIEW, ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_1);
+                } else if (ThunderBirdModel::GetInstance()->StartBootOperation() == 1) {
+                    ChangeView(MAXVIEW, THUNDERBIRD_DIALOGUEVIEW,
+                        ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW);
                 }
-                ThunderBirdModel::GetInstance()->SetCurrentView(-1);
-                ThunderBirdModel::GetInstance()->SetCurrentSubView(-1);
-            }
-            else
-            {
-             if(ThunderBirdModel::GetInstance()->StartBootOperation() == 0)
-             {
-                ChangeView(MAXVIEW, THUNDERBIRD_GUIDEVIEW, ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_1); // 文字显示图层
-             }
-             else if(ThunderBirdModel::GetInstance()->StartBootOperation() == 1)
-             {
-                    ChangeView(MAXVIEW, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW);
-             }
             }
 
             ScrollView_->Add(InitBaseData()); // 最上面状态栏