From 8eb58bf3c00a09c46f664097d1dd16a2919fde03 Mon Sep 17 00:00:00 2001
From: Caisking <Casiking@zhihuishixun.com>
Date: Fri, 18 Apr 2025 11:54:18 +0800
Subject: [PATCH] =?utf8?q?=E3=80=90=E8=A1=80=E6=B0=A7=E3=80=91UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../bloodoxygen/src/BloodDetectionView.cpp         |  2 --
 .../nativeui/bloodoxygen/src/BloodOxygenModel.cpp  | 10 ++++++++--
 .../bloodoxygen/src/BloodResultPresenter.cpp       | 14 +++++++++++---
 .../nativeui/bloodoxygen/src/BloodResultView.cpp   |  4 ++--
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionView.cpp
index f9a031ce4..a3a038609 100644
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionView.cpp
@@ -145,8 +145,6 @@ namespace OHOS
     }
     void BloodDetectionView::OnStart()
     {
-        // SetContainerView(new UIViewGroup());
-        // container_->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
 
         if (!BloodDetectionViewInit())
         {
diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp
index 406b849c2..6442fe84d 100644
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp
@@ -3,13 +3,19 @@
 
 // #include "DialModelSPO2.h"
 #include "wearable_log.h"
-// #include "heart_blood/health_service/health_service.h"
+
+#include "heart_blood/health_service/health_service.h"
+
 #include "custom_utils.h"
 
 extern "C" errcode_t uapi_get_timestamp_ms(uint32_t *tm);
 
 #include "custom_utils.h"
-// #include "ppg_service.h"
+
+#ifdef PPG_HX3695
+#include "ppg_service.h"
+#endif
+
 #include "ConfigModel.h"
 #include "AppViewIDs.h"
 #include "NativeAbility.h"
diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp
index 4970572ea..1ad4b494c 100644
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp
@@ -32,14 +32,22 @@
 #include <thread>
 #include <sys/time.h>
 
-// #include "ppg_service.h"
+#ifdef PPG_HX3695
+#include "ppg_service.h"
+#endif
+
 // #include "displaybrightness/include/DisplayBrightnessModel.h"
 #include "power_display_service.h"
 #include "custom_utils.h"
-// #include "cywee_service.h"
+
+#ifdef ENABLE_CYWEE
+#include "cywee_service.h"
+#endif
+
 // #include "battery_hal.h"
 
-// #include "heart_blood/health_service/health_service.h"
+#include "heart_blood/health_service/health_service.h"
+
 #include "gfx_utils/mem_check.h"
 #include "NativeRegisterManager.h"
 
diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp
index 78e133426..19e2735d4 100644
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp
@@ -207,8 +207,8 @@ namespace OHOS
         GetRootContainer()->SetOnDragListener(presenter_);
 
         // 增加按键监听
-        RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::BloodResultPresenter::GetInstance();
-        RootView::GetInstance()->SetOnKeyActListener(keyactListener);
+        // RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::BloodResultPresenter::GetInstance();
+        // RootView::GetInstance()->SetOnKeyActListener(keyactListener);
     }
 
 }
-- 
2.17.1