From fb9c8041e5461cd38b1870d05cc97a88f8ec1a99 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E8=A2=81=E6=B8=85=E6=A2=A6?= <3449750381@qq.com>
Date: Thu, 22 Jan 2026 03:11:40 +0000
Subject: [PATCH] Merge #3119 into fd272 from refs/changes/3119/head
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Code review from 袁清梦

* refs/changes/3119/head: (4 commits squashed)

  - 回退3508定时器频率

  - 修复血氧界面的滑动问题

  - 运动准备界面修复随意滑动

  - Merge branch &#39;fd272&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into fd272

Signed-off-by: Caisking <3449750381@qq.com>
Merged-by: Caisking <3449750381@qq.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/3119
---
 .../nativeui/bloodoxygen/src/BloodResultView.cpp       | 10 ++++------
 .../nativeui/traing/src/TraingNomalPresenter.cpp       |  6 ++++--
 code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp
index e5d11d003..f44a4a736 100644
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp
@@ -183,10 +183,9 @@ void BloodResultView::OnStart() {
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "scrollView_ new fail");
     return;
   }
-  scrollView_->SetScrollBlankSize(35);
-  scrollView_->SetReboundSize(50);
-  scrollView_->SetPosition(0, 0, Screen::GetInstance().GetWidth(),
-                           Screen::GetInstance().GetHeight());
+  // scrollView_->SetScrollBlankSize(35);
+  // scrollView_->SetReboundSize(50);
+  scrollView_->SetPosition(0, 0, 466, 466);
 
   scrollView_->SetDraggable(true);
   scrollView_->SetStyle(STYLE_BACKGROUND_COLOR, BACK_GROUND_COLOR);
@@ -196,8 +195,7 @@ void BloodResultView::OnStart() {
   scrollView_->SetOnDragListener(listener);
 
   if (!BloodResultViewInit()) {
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
-                  "BloodResultView::InitBloodView fail");
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,  "BloodResultView::InitBloodView fail");
   }
 
   AddViewToRootContainer(scrollView_);
diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
index 48bcec316..e229ca6a2 100644
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
@@ -110,8 +110,10 @@ namespace OHOS
         UNUSED(view);
         // 在拖拽结束时判断是否满足退出条件
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingNomalPresenter::OnDragEnd");
-        NavigateBack();
-        
+        if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)
+        {
+            NavigateBack();
+        }
         return true;
     }
 
diff --git a/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c b/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c
index 958e9f59f..e8b5f6a6c 100644
--- a/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c
+++ b/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c
@@ -176,7 +176,7 @@ void ots_timer_start(void)
     if(ots_timer_running == false && g_hx3508_timer)
     {
         // app_timer_start(g_hx3508_timer, APP_TIMER_TICKS(50), NULL);//定义为50ms定时器间隔
-        int ret = osTimerStart(g_hx3508_timer,50);
+        int ret = osTimerStart(g_hx3508_timer,20);
         // printf("ret:%d\n",ret);
         ots_timer_running = true;
     }
-- 
2.17.1