优化绑定逻辑

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp
index fb2db2f..552090b 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp
@@ -292,7 +292,7 @@ namespace OHOS
             //ChangeView(MAXVIEW, THUNDERBIRD_GUIDEVIEW, 0); // 文字显示图层
              if(ThunderBirdModel::GetInstance()->StartBootOperation() == 0)
              {
-                ChangeView(MAXVIEW, THUNDERBIRD_GUIDEVIEW, ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3); // 文字显示图层
+                ChangeView(MAXVIEW, THUNDERBIRD_GUIDEVIEW, ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_1); // 文字显示图层
              }
              else if(ThunderBirdModel::GetInstance()->StartBootOperation() == 1)
              {

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp
index b75e9ad..8ea8c38 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp
@@ -450,7 +450,7 @@ namespace OHOS
                     ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_GUIDEVIEW, THUNDERBIRD_GUIDEVIEW, ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3);
                     break;
                 case ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3:
-                    ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_GUIDEVIEW, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_SPEAKING);
+                    ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_GUIDEVIEW, THUNDERBIRD_GUIDEVIEW, ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_1);
                     break;
             }
         }
@@ -478,53 +478,10 @@ namespace OHOS
     }
 
     /**
-     * @brief 处理OTA界面导航
+     * @brief 处理OTA界面导航 //切换slice
      */
     bool ThunderBirdPresenter::HandleOtaViewNavigation(int16_t currentSubView, KeyType keyType)
     {
-        // if(keyType == KEY_TYPE_VENDOR_UP)//VENDOR_UP键
-        // {
-        //     switch (currentSubView) {
-        //         case ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_UPDATE_NOW:
-        //         case ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_NORMAL:
-        //         case ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_OBVIOUS:
-        //             // 确认升级，检查条件
-        //             return CheckOtaConditionsAndProceed();
-                    
-        //         case ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_COUNTDOWN:
-        //             // 进入更新中,手动确认，不等待
-        //             ThunderBirdModel::GetInstance()->StopOtaCountdown();//取消倒计时界面整个定时器
-        //             ThunderBirdModel::GetInstance()->StartOtaCountdown(0);//直接进入更新中，定时器会自己跳转与执行指令
-        //             break;
-
-        //         case ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_NIGHT_UPDATE:
-        //         ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_OTAVIEW, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_SPEAKING);
-        //         break;
-                    
-        //         // VENDOR_DOWN键的特殊处理
-                
-        //     }
-        //     return true;
-        // }
-        // else if(keyType == KEY_TYPE_VENDOR_DOWN)//VENDOR_DOWN键
-        // {
-        //     switch (currentSubView) {
-        //         case ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_UPDATE_NOW:
-        //         case ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_NORMAL:
-        //         case ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_OBVIOUS:
-        //         ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_OTAVIEW, THUNDERBIRD_OTAVIEW, ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_NIGHT_UPDATE);
-        //         break;
-
-        //         case ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_NIGHT_UPDATE:
-        //         case ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_UPDATE_FAILED:
-        //         case ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_LOW_BATTERY:
-        //         case ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_NETWORK_ERROR:
-        //         case ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_MEMORY_ERROR:
-        //         ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_OTAVIEW, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_SPEAKING);
-        //         break;
-        //     }
-        //     return true;
-        // }
         return true;
     }
 
@@ -533,20 +490,6 @@ namespace OHOS
      */
     bool ThunderBirdPresenter::CheckOtaConditionsAndProceed()
     {
-        // if (ThunderBirdMainView::GetInstance()->Batteryvalue <= 50) {
-        //     // 低电量
-        //     ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_OTAVIEW, THUNDERBIRD_OTAVIEW, ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_LOW_BATTERY);
-        // } else if (uapi_dev_runtime_get_cat1_signal() == 99) {
-        //     // 无网络
-        //     ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_OTAVIEW, THUNDERBIRD_OTAVIEW, ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_NETWORK_ERROR);
-        // } else if (0) { // 获取内存状态
-        //     // 内存不足
-        //     ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_OTAVIEW, THUNDERBIRD_OTAVIEW, ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_MEMORY_ERROR);
-        // } else {
-        //     // 条件满足，开始倒计时
-        //     ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_OTAVIEW, THUNDERBIRD_OTAVIEW, ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_COUNTDOWN);
-
-        // }
         return true;
     }
 
@@ -558,9 +501,6 @@ namespace OHOS
         if(keyType == KEY_TYPE_VENDOR_UP)
         {
         switch (currentSubView) {
-            case ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_1:
-                ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_LULLABYVIEW, THUNDERBIRD_LULLABYVIEW, ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_2);
-                break;
             case ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_2:
                 ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_LULLABYVIEW, THUNDERBIRD_LULLABYVIEW, ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_3);
                 break;
@@ -591,28 +531,29 @@ namespace OHOS
     /**
      * @brief 处理提醒界面导航
      */
+     //
     bool ThunderBirdPresenter::HandleReminderViewNavigation(int16_t currentSubView, KeyType keyType)
     {
+        int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView();
+        if(keyType == KEY_TYPE_VENDOR_UP)
+        {
         switch (currentSubView) {
-            case ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_VOLUME:
-                ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_REMINDERVIEW, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_TASK_REMINDER);
-                break;
-            case ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_TASK_REMINDER:
-                ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_REMINDERVIEW, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_NETWORK_DISCONNECT);
+            case ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_TASK_REMINDER://事项提醒界面-关闭通知
+                ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW);
                 break;
-            case ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_NETWORK_DISCONNECT:
-                ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_REMINDERVIEW, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_LOW_BATTERY);
+            case ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_DIALOGUE_NOT_ENOUGH://提醒界面-对话不足
+                ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW);
                 break;
-            case ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_LOW_BATTERY:
-                ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_REMINDERVIEW, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_CHARGING);
+            case ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_DIALOGUE_USE_UP://提醒界面-对话用尽
+                ThunderBirdMainView::GetInstance()->ChangeView(currentView,THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW);
                 break;
-            case ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_CHARGING:
-                ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_REMINDERVIEW, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_CHARGE_COMPLETE);
-                break;
-            case ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_CHARGE_COMPLETE:
-                // 返回主界面
-                ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_REMINDERVIEW, THUNDERBIRD_ADJUSTVIEW, ThunderBirdAdjustView::THUNDERBIRD_ADJUSTVIEW_BIND_SUCCESS);
+            case ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_FLOW_NOT_ENOUGH://提醒界面-流量不足
+                ThunderBirdMainView::GetInstance()->ChangeView(currentView,THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW);
                 break;
+            // case ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_FLOW_USE_UP://提醒界面-流量用尽
+            //     ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_FLOW_USE_UP);
+            //     break;
+        }
         }
         return true;
     }