修改解绑提示界面

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp
index 201ce33..8a5ef02 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp
@@ -1502,22 +1502,21 @@
                     // 检查是否是绑定成功界面，需要跳转到对话界面
                     else if (currentView == THUNDERBIRD_ADJUSTVIEW && 
                              currentSubView == ThunderBirdAdjustView::THUNDERBIRD_ADJUSTVIEW_BIND_SUCCESS) {
-                        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "绑定成功界面超时，跳转到对话界面");
-                        ThunderBirdModel::GetInstance()->ota_update_boot(); // 绑定成功后获取ota升级任务
-                        view->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW);
+                            if (bind_status == false) {
+                                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "解绑警告界面超时，恢复出厂设置");
+                                restore_factory_settings();
+                            } 
+                            else {
+                            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "绑定成功界面超时，跳转到对话界面");
+                            ThunderBirdModel::GetInstance()->ota_update_boot(); // 绑定成功后获取ota升级任务
+                            view->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW);
+                            }
                     }
                     // 检查是否是警告界面，需要返回原任务
                     else if (currentView == THUNDERBIRD_ADJUSTVIEW && 
                              currentSubView == ThunderBirdAdjustView::THUNDERBIRD_ADJUSTVIEW_WARNING) {
-                        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "警告界面超时，检查是否为解绑警告");
-                        // 检查是否为解绑警告，如果是则恢复出厂设置
-                        if (bind_status == false) {
-                            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "解绑警告界面超时，恢复出厂设置");
-                            restore_factory_settings();
-                        } else {
                             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "普通警告界面超时，返回原任务");
                             ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW);
-                        }
                     }
                     // 检查是否是任务提醒界面，需要返回原任务
                     else if (currentView == THUNDERBIRD_REMINDERVIEW && 
@@ -2259,7 +2258,7 @@
                 int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView(); //获取当前视图
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleBindAndUnbind: 设备已解绑，显示解绑警告");
                 bind_status = false;//解绑标志值位，用于界面跳转真正解绑放到出厂设置里面
-                ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_ADJUSTVIEW, ThunderBirdAdjustView::THUNDERBIRD_ADJUSTVIEW_WARNING);
+                ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_ADJUSTVIEW, ThunderBirdAdjustView::THUNDERBIRD_ADJUSTVIEW_BIND_SUCCESS);
                 if(ThunderBirdAdjustView::GetInstance())
                 {
                     ThunderBirdAdjustView::GetInstance()->ShowUnbindWarning();