增加绑定跳过逻辑

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 6bcddc8..9752273 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 464360f..2432359 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
@@ -116,18 +116,23 @@ namespace OHOS
         // 分发按键事件到对应的处理函数
         switch (keyID) {
             case static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER):
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandlePowerKey: KEY_TYPE_POWER");
                 return HandlePowerKey(keyState, currentView, currentSubView, screenState);
                 
             case static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_FUNC):
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandleFuncKey: KEY_TYPE_FUNC");
                 return HandleFuncKey(keyState, currentView, currentSubView, screenState);
                 
             case static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_VENDOR_UP):
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandleVendorUpKey: KEY_TYPE_VENDOR_UP");
                 return HandleVendorUpKey(keyState, currentView, currentSubView, screenState);
                 
             case static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_VENDOR_DOWN):
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandleVendorDownKey: KEY_TYPE_VENDOR_DOWN");
                 return HandleVendorDownKey(keyState, currentView, currentSubView, screenState);
                 
             default:
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandleDefaultKey: KEY_TYPE_DEFAULT");
                 return true;
         }
     }
@@ -232,13 +237,13 @@ namespace OHOS
         
         // 短按FUNC键（息屏状态下）
         if (keyState == InputDevice::STATE_PRESS && screenState == 0) {
-            // 检查绑定状态
-            if (ThunderBirdModel::GetInstance()->getbind_status() != true) {
-                if (currentSubView != ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3) {
-                    ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_GUIDEVIEW, ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3);
-                }
-                return true;
-            }
+            // // 检查绑定状态
+            // if (ThunderBirdModel::GetInstance()->getbind_status() != true) {
+            //     if (currentSubView != ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3) {
+            //         ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_GUIDEVIEW, ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3);
+            //     }
+            //     return true;
+            // }
             if(currentView == THUNDERBIRD_LULLABYVIEW && currentSubView == ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_3)
             {
                 HandleLullabyFunction(currentView, currentSubView);              
@@ -258,14 +263,15 @@ namespace OHOS
      */
     bool ThunderBirdPresenter::HandleVendorUpKey(uint16_t keyState, int16_t currentView, int16_t currentSubView, int screenState)
     {
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandleVendorUpKey: KEY_TYPE_VENDOR_UP");
         if (keyState == InputDevice::STATE_PRESS && screenState == 0) {
-            // 检查绑定状态
-            if (ThunderBirdModel::GetInstance()->getbind_status() != true) {
-                if (currentSubView != ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3) {
-                    ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_GUIDEVIEW, ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3);
-                }
-                return true;
-            }
+        //     // 检查绑定状态
+        //     if (ThunderBirdModel::GetInstance()->getbind_status() != true) {
+        //         if (currentSubView != ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3) {
+        //             ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_GUIDEVIEW, ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3);
+        //         }
+        //         return true;
+        //     }
 
             // 音量调节功能
             if (IsVolumeAdjustmentAvailable(currentView, currentSubView)) {
@@ -292,14 +298,14 @@ namespace OHOS
             return true;
         }
         
-        if (keyState == InputDevice::STATE_PRESS && screenState == 0) {
-            // 检查绑定状态
-            if (ThunderBirdModel::GetInstance()->getbind_status() != true) {
-                if (currentSubView != ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3) {
-                    ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_GUIDEVIEW, ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3);
-                }
-                return true;
-            }
+         if (keyState == InputDevice::STATE_PRESS && screenState == 0) {
+        //     // 检查绑定状态
+        //     if (ThunderBirdModel::GetInstance()->getbind_status() != true) {
+        //         if (currentSubView != ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3) {
+        //             ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_GUIDEVIEW, ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3);
+        //         }
+        //         return true;
+        //     }
 
             // 音量调节功能
             if (IsVolumeAdjustmentAvailable(currentView, currentSubView)) {
@@ -434,6 +440,7 @@ namespace OHOS
     {
         if(keyType == KEY_TYPE_VENDOR_UP)
         {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandleGuideViewNavigation: KEY_TYPE_VENDOR_UP");
         switch (currentSubView) 
             {
                 case ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_1: