Merge #3119 into fd272 from refs/changes/3119/head

Code review from 袁清梦

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

  - 回退3508定时器频率

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

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

  - Merge branch 'fd272' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into fd272

Signed-off-by: Caisking <3449750381@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/3119

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 e5d11d0..f44a4a7 100644 (file)
--- 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 48bcec3..e229ca6 100644 (file)
--- 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);\r
         // 在拖拽结束时判断是否满足退出条件\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingNomalPresenter::OnDragEnd");\r
-        NavigateBack();\r
-        \r
+        if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)\r
+        {\r
+            NavigateBack();\r
+        }\r
         return true;\r
     }\r
 \r

diff --git a/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c b/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c
index 958e9f5..e8b5f6a 100644 (file)
--- 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;
     }