From 70c91b3861021b9bdb6413d538f7474aa7d2a947 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Tue, 26 Nov 2024 17:20:21 +0800
Subject: [PATCH] =?utf8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=EF=BC=9A=E5=A2=9E?=
 =?utf8?q?=E5=8A=A0=E4=B8=8A=E4=B8=8B=E6=8B=89=E7=95=8C=E9=9D=A2=E7=9A=84?=
 =?utf8?q?=E6=BB=91=E5=8B=95=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativelauncher/include/UiConfig.h         |  8 +++++
 .../nativeui/key/src/KeyInputListener.cpp     |  2 +-
 .../main/include/MainPresenterSample.h        |  2 +-
 .../nativeui/main/include/MainViewSample.h    |  2 +-
 .../nativeui/main/src/MainPresenterSample.cpp | 30 +++++++++----------
 .../nativeui/main/src/MainViewSample.cpp      | 18 ++++++-----
 6 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
index ec0554dd3..a589f69f5 100644
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
@@ -42,6 +42,14 @@ namespace OHOS
         DIAL_MAX,
     } DialId;
 
+    /*主界面上下拉界面*/
+    typedef enum
+    {
+        PULLUP,//主界面下拉
+        DROPDOWN,//主界面上拉
+        UNKOWNPAG,
+    }PULLPAGE;
+
 #ifndef UNUSED
 #define UNUSED(x) ((void)(x))
 #endif
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 2e812bc6a..be019477e 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
@@ -160,7 +160,7 @@ namespace OHOS
                 HandleAlarmNotify();
                 if (!MainViewSample::GetInstance()->IsMainClockPage())
                 {
-                    if(MainViewSample::GetInstance()->IsPullUpViewPage())
+                    if(MainViewSample::GetInstance()->IsPullUpViewPage() == PULLUP)
                     {
                         MainViewSample::GetInstance()->HandOnKeyEventSwitchMainPullDownView();
                     }
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainPresenterSample.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainPresenterSample.h
index a65381038..33e842021 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainPresenterSample.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainPresenterSample.h
@@ -123,7 +123,7 @@ private:
   bool isCompassSensorOpened_{false};
   CardId previousCardId{WATCH_FACE};
 
-  bool isPullDownPageView{false};//是否已经是在下拉界面
+  int isPullDownPageView{false};//是否已经是在下拉界面
 };
 }
 
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 9a9893001..9a1ea1d2f 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h
@@ -93,7 +93,7 @@ namespace OHOS
         }
         void SwitchToCard(uint8_t cardId);
         bool IsMainClockPage(void);
-        bool IsPullUpViewPage(void);
+        int IsPullUpViewPage(void);
         void SetDragFg(bool continFg);
         bool GetDragFg(void);
         void SetPage(int16_t page);
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
index 9ccb035ce..f194ae602 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
@@ -269,21 +269,21 @@ namespace OHOS
          *        然后开启一个每2秒更新数据的定时器。
          *        如果不在下拉界面了停止定时器
          */
-        if (MainViewSample::GetInstance()->IsPullUpViewPage())
-        {
-            if(!isPullDownPageView) 
-            {
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"开始下拉更新");
-                isPullDownPageView = true;
-                UpdataBaseData();
-                PullUpDownView::GetInstance()->UpdateSignalStrengthStatusAndBatteryPosition();
-                PullUpDown_StartTimer(2000);
-            }
-        }
-        else
-        {
-            isPullDownPageView = false;
-            PullUpDown_StopTimer();
+        if (MainViewSample::GetInstance()->IsPullUpViewPage() == PULLUP) {  
+            if (!isPullDownPageView) {   
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "开始下拉更新");  
+                isPullDownPageView = true;  
+                UpdataBaseData();  
+                PullUpDownView::GetInstance()->UpdateSignalStrengthStatusAndBatteryPosition();  
+                PullUpDown_StartTimer(2000);  
+            }  
+        } else if (MainViewSample::GetInstance()->IsPullUpViewPage() == DROPDOWN) {  
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "开始上拉更新");  
+            isPullDownPageView = false;  
+            PullUpDown_StopTimer();  
+        } else {  
+            isPullDownPageView = false;  
+            PullUpDown_StopTimer();  
         }
         /* -------------------------------------------------------------------------- */
 
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 6bdd96b23..2c0ef1787 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
@@ -57,7 +57,7 @@ namespace OHOS
 
     MainViewSample::~MainViewSample()
     {
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::~MainViewSample");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainViewSample::~MainViewSample");
         mainSwipeGroup->RemoveAll();
 
         for (int32_t i = 0; i < MAX_CARD; i++)
@@ -193,7 +193,7 @@ namespace OHOS
 
     void MainViewSample::OnStart()
     {
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::OnStart");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainViewSample::OnStart");
         View<MainPresenterSample>::OnStart();
         BaseView::RootView(Color::Black().full);
 
@@ -603,18 +603,22 @@ namespace OHOS
             return false;
         }
     }
-    bool MainViewSample::IsPullUpViewPage(void)
-    {
+    int MainViewSample::IsPullUpViewPage(void) {
+        //主界面->下拉界面
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::IsPullUpViewPage");
         if (mainSwipeGroup->GetCurrentPageId(0) == mainClockView->GetViewIndex() &&
             mainSwipeGroup->GetCurrentPageId(1) == 0)
         {
-            return true;
+            return PULLUP;
         }
-        else
+        //主界面->上拉界面
+        else if(mainSwipeGroup->GetCurrentPageId(0) == mainClockView->GetViewIndex() &&
+            mainSwipeGroup->GetCurrentPageId(1) == 1)
         {
-            return false;
+            return DROPDOWN;
         }
+        //其他狀態
+        return UNKOWNPAG;
     }
     CardId MainViewSample::GetHorCurrentCard() const
     {
-- 
2.17.1