#1087,解决连接状态界面，点击大退，再次下滑，进入的是连接状态界面，不是下拉栏界面bug

diff --git a/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp b/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
index 8a3f4ff..822eb8c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
@@ -160,6 +160,10 @@ namespace OHOS
                 HandleAlarmNotify();
                 if (!MainViewSample::GetInstance()->IsMainClockPage())
                 {
+                    if(MainViewSample::GetInstance()->IsPullUpViewPage())
+                    {
+                        MainViewSample::GetInstance()->HandOnKeyEventSwitchMainPullDownView();
+                    }
                     MainViewSample::GetInstance()->SwitchToClockPage();
                 }
                 else

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h
index 904ec7d..219dbad 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h
@@ -98,6 +98,7 @@ namespace OHOS
         bool GetDragFg(void);
         void SetPage(int16_t page);
         void UpdateStateShow();
+        void HandOnKeyEventSwitchMainPullDownView(void);
 
     private:
         PullUpDownView *dropDownView{nullptr};

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h
index dd1cc95..9f330a3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-04-17 15:26:49
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-10-08 11:12:47
+ * @LastEditTime: 2024-10-30 18:27:12
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h
  */
 
@@ -57,6 +57,7 @@ namespace OHOS
         bool ClickFunc(int16_t interface);
         void ChangeView(int16_t hideView, int16_t showView);
         ConnectedStatusView *GetConnectedStatusView(void);
+        void HandOnKeyEventSwitchMainPullDownView(void);
 
     private:
         void OnSwipe(UISwipeView &view) override;
@@ -65,6 +66,7 @@ namespace OHOS
         UIViewGroup *group[MAX_DROPDOWNVIEWID]{nullptr};
         ConnectedStatusView *connectedStatusView{nullptr};
         bool viewiInitStatus{false};
+        uint8_t curView{0};
 
         /* ---------------------------------- 1.连接状态 ---------------------------------- */
     public:

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
index b43e7ed..cabf75e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
@@ -661,4 +661,11 @@ namespace OHOS
         }
     }
 
+    void MainViewSample::HandOnKeyEventSwitchMainPullDownView(void)
+    {
+        if(dropDownView)
+        {
+            dropDownView->HandOnKeyEventSwitchMainPullDownView();
+        }
+    }
 }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
index b2eeced..5a158c8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-06-26 18:14:24
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-10-08 15:14:16
+ * @LastEditTime: 2024-10-30 18:32:51
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
  */
 
@@ -1169,6 +1169,7 @@ namespace OHOS
         group[hideView]->SetVisible(false);
         ClickFunc(showView);
         group[showView]->SetVisible(true);
+        curView = showView;
         Invalidate();
     }
 
@@ -1177,5 +1178,20 @@ namespace OHOS
     {
         return connectedStatusView;
     }
+
+    // 处理按键事件回到下拉主页面
+    void PullUpDownView::HandOnKeyEventSwitchMainPullDownView(void)
+    {
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::HandOnKeyEventSwitchMainPullDownView");
+        if (curView == CONNECTEDSTATUSVIEW) /*当前是连接状态视图*/
+        {
+            ChangeView(curView, DROPDOWNVIEW); /*切换到下拉主页面*/
+        }
+        if (nullptr != dropDownswipeViewList && dropDownswipeViewList->GetCurrentPage() != 0)
+        {
+            dropDownswipeViewList->SetCurrentPage(0);
+        }
+        Invalidate();
+    }
     /* -------------------------------------------------------------------------- */
 }