From: Caisking <3449750381@qq.com>
Date: Tue, 30 Jul 2024 11:52:33 +0000 (+0800)
Subject: 同步cmake与configmodel更新
X-Git-Tag: release_V1.2.70_20241020_135402~730^2~2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=3bd8af4af41fe37abdabaaf3fcf1cff4eaddd0e2;p=mirrors%2FFD230.git

同步cmake与configmodel更新
---

diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt
index 0877e51d8..16620d759 100644
--- a/code/sdk/application/wearable/fd230app/CMakeLists.txt
+++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt
@@ -158,12 +158,20 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelPowerStandby.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelCharge.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelSPO2.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodOxygenView.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodBandoffView.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodOxygenPresenter.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodCheckView.cpp
+
+    #exception handling
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heart_blood/CheckAbnormalView.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heart_blood/CheckAbnormalPresenter.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heart_blood/CheckInvalidView.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heart_blood/CheckInvalidPresenter.cpp
+
+    #BloodCheck
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodResultView.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodResultPresenter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodOxygenModel.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodDetectionView.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp
+
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bluetooth/src/BluetoothDeviceCaseListAdapter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bluetooth/src/BluetoothDeviceListView.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bluetooth/src/BluetoothPresenter.cpp
diff --git a/code/sdk/drivers/peripheral/config/include/ConfigModel.h b/code/sdk/drivers/peripheral/config/include/ConfigModel.h
index 4210bec20..cc7a89ab4 100644
--- a/code/sdk/drivers/peripheral/config/include/ConfigModel.h
+++ b/code/sdk/drivers/peripheral/config/include/ConfigModel.h
@@ -336,7 +336,7 @@ namespace OHOS
 
             {ConfigDataType::DATATYPE_INT,     "oxygen_freq",        "0"     },// CONFIGMODEL_ITEM_OXYGEN_DETECTED,//频率
             {ConfigDataType::DATATYPE_INT,     "oxygen_remind",        "0"     },//CONFIGMODEL_ITEM_OXYGEN_REMIND,//开关
-            {ConfigDataType::DATATYPE_INT,     "oxygen_threshold_value",        "0"     },//CONFIGMODEL_ITEM_OXYGEN_THRESHOLD_VALUE,//阈值
+            {ConfigDataType::DATATYPE_INT,     "oxygen_threshold_value",        "95"     },//CONFIGMODEL_ITEM_OXYGEN_THRESHOLD_VALUE,//阈值
 
             {ConfigDataType::DATATYPE_INT,    "notify",                   "0"     },// CONFIGMODEL_ITEM_NOTIFY//消息通知开关
             {ConfigDataType::DATATYPE_INT,     "quick_auxil_parameter",      "0"     },// CONFIGMODEL_ITEM_QUICK_AUXILIARY_PARAMETERS//快捷辅助功能参数