1.优化在使用ScreenAlwaysOnCtr函数设置是否屏幕常亮时，

（1）使用宏 OPEN_SCREEN_ALWAYS_ON 代替常量值 1 ，表示开启屏幕常亮功能。
（2）使用宏 CANCEL_SCREEN_ALWAYS_ON 代替常量值 0，表示取消屏幕常亮功能
2.优化呼吸训练：训练过程中开启心率检测，训练完成获取心率值展示在完成视图上。

diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassPresenter.cpp
index 516365c..c4ecc37 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassPresenter.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-03-14 15:02:03
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-06-07 20:23:18
+ * @LastEditTime: 2024-06-13 15:22:10
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassPresenter.cpp
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -31,7 +31,7 @@ namespace OHOS
     void MainCompassPresenter::OnStart()
     {
         Presenter<CompassView>::OnStart();
-        ScreenAlwaysOnCtr(1);
+        ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);
     }
 
     void MainCompassPresenter::OnPause(void) {}
@@ -40,7 +40,7 @@ namespace OHOS
 
     void MainCompassPresenter::OnStop(void)
     {
-        ScreenAlwaysOnCtr(0);
+        ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON);
     }
 
     MainCompassPresenter *MainCompassPresenter::GetInstance()

diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp
index 40ea1b5..ba676b5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp
@@ -39,7 +39,7 @@ namespace OHOS
     void MainCountDownPresenter::OnStart()\r
     {\r
         Presenter<MainCountDownView>::OnStart();\r
-        ScreenAlwaysOnCtr(1); // 长亮屏\r
+        ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON); // 长亮屏\r
     }\r
 \r
     void MainCountDownPresenter::OnPause(void)\r
@@ -57,7 +57,7 @@ namespace OHOS
     void MainCountDownPresenter::OnStop(void)\r
     {\r
         Presenter<MainCountDownView>::OnStop();\r
-        ScreenAlwaysOnCtr(0); // 取消长亮屏\r
+        ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON); // 取消长亮屏\r
     }\r
 \r
     bool MainCountDownPresenter::OnDrag(UIView &view, const DragEvent &event)\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp
index dc6954c..de4d495 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com\r
  * @Date: 2024-03-30 09:14:38\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-06-13 11:46:34\r
+ * @LastEditTime: 2024-06-13 15:22:59\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp\r
  */\r
 \r
@@ -49,7 +49,7 @@ namespace OHOS
         p_RecordingModel->InitRecordingListItem();\r
         p_RecordingModel->AudioInit();\r
         Presenter<RecordingView>::OnStart();\r
-        //ScreenAlwaysOnCtr(1);\r
+        //ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);\r
     }\r
 \r
     void RecordingPresenter::OnPause(void)\r
@@ -67,7 +67,7 @@ namespace OHOS
     {\r
         Presenter<RecordingView>::OnStop();\r
         p_RecordingModel->ClearRecordingPlayer();\r
-        //ScreenAlwaysOnCtr(0);\r
+        //ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON);\r
     }\r
 \r
     bool RecordingPresenter::OnDrag(UIView &view, const DragEvent &event)\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingModel.cpp
index 65e03b6..6d67e86 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingModel.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-06-11 16:26:20
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-06-12 11:00:29
+ * @LastEditTime: 2024-06-13 15:10:37
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingModel.cpp
  */
 #include "respiratorytraining/include/RespiratoryTrainingModel.h"
@@ -13,6 +13,7 @@
 #include <service/graphic_service.h>
 #include <iostream>
 #include "respiratorytraining/include/RespiratoryTrainingView.h"
+#include "heartrate/include/HeartModel.h"
 namespace OHOS
 {
     // 声明定时器变量
@@ -47,7 +48,8 @@ namespace OHOS
     // 获取心率值
     std::string RespiratoryTrainingModel::GetHeartRateValue(void)
     {
-        HeartRateValue = "144";
+        uint16_t value = HeartModel::GetInstance()->GetHeartdata();
+        HeartRateValue = std::to_string(value);
         return HeartRateValue;
     }
 
@@ -55,6 +57,7 @@ namespace OHOS
     {
         Time = 5;
         START_FLAG = false;
+        HeartModel::GetInstance()->Heart_Control(HeartState::End); // 关闭心率检测
     }
     /* -------------------------------------------------------------------------- */
     /*定时器到期时的处理*/
@@ -72,16 +75,18 @@ namespace OHOS
         {
             if (START_FLAG == true)
             {
-                RespiratoryTrainingModel::GetInstance().RT_StopTimer(); // 停止定时器
-                RespiratoryTrainingModel::GetInstance().AddRespiratoryTrainingTimes();
-                p_RespiratoryTrainingView->GetRespiratoryTrainingAnimator_()->Stop();
+                RespiratoryTrainingModel::GetInstance().RT_StopTimer();                // 停止定时器
+                RespiratoryTrainingModel::GetInstance().AddRespiratoryTrainingTimes(); // 呼吸训练次数加1
+                p_RespiratoryTrainingView->GetRespiratoryTrainingAnimator_()->Stop();  // 关闭呼吸动画
+                HeartModel::GetInstance()->Heart_Control(HeartState::End);             // 关闭心率检测
                 p_RespiratoryTrainingView->ChangeView(RESPIRATORYTRAINING, RESPIRATORYTRAININGCOMPLETED);
             }
             else
             {
                 Time = ONE_MINUTE;
-                p_RespiratoryTrainingView->StartRespiratoryTraining();
+                p_RespiratoryTrainingView->StartRespiratoryTraining(); // 开始呼吸训练
                 START_FLAG = true;
+                HeartModel::GetInstance()->Heart_Control(HeartState::Start); // 开启心率检测
             }
         }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp
index 68bc55d..0a3412b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-05-07 11:26:06
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-06-12 11:13:13
+ * @LastEditTime: 2024-06-13 15:17:08
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/RespiratoryTraining/src/RespiratoryTrainingPresenter.cpp
  */
 
@@ -40,7 +40,7 @@ namespace OHOS
     void RespiratoryTrainingPresenter::OnStart()
     {
         Presenter<RespiratoryTrainingView>::OnStart();
-        ScreenAlwaysOnCtr(1);
+        ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);
     }
 
     void RespiratoryTrainingPresenter::OnPause(void)
@@ -56,7 +56,7 @@ namespace OHOS
     void RespiratoryTrainingPresenter::OnStop(void)
     {
         Presenter<RespiratoryTrainingView>::OnStop();
-        ScreenAlwaysOnCtr(0);
+        ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON);
         RespiratoryTrainingModel::GetInstance().RT_StopTimer();
         RespiratoryTrainingModel::GetInstance().ResumeStatus();
     }
@@ -65,7 +65,7 @@ namespace OHOS
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingPresenter::OnClick");
         std::string viewId = view.GetViewId();
-        if(viewId == RTCLABELBUTTON)
+        if (viewId == RTCLABELBUTTON)
         {
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchPresenter.cpp
index 1c58e32..db22636 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchPresenter.cpp
@@ -33,7 +33,7 @@ namespace OHOS
     void MainStopWatchPresenter::OnStart()\r
     {\r
         Presenter<MainStopWatchView>::OnStart();\r
-        ScreenAlwaysOnCtr(1); // 长亮屏\r
+        ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON); // 长亮屏\r
     }\r
 \r
     void MainStopWatchPresenter::OnPause(void)\r
@@ -51,7 +51,7 @@ namespace OHOS
     void MainStopWatchPresenter::OnStop(void)\r
     {\r
         Presenter<MainStopWatchView>::OnStop();\r
-        ScreenAlwaysOnCtr(0); // 取消长亮屏\r
+        ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON); // 取消长亮屏\r
     }\r
 \r
     /// @brief 设置复选框和按钮\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
index d14517d..373e3e6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
@@ -62,7 +62,7 @@ namespace OHOS
     void TraingCardPresenter::OnStart()\r
     {\r
         Presenter<TraingCardView>::OnStart();\r
-        // ScreenAlwaysOnCtr(1); // 长亮屏\r
+        // ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON); // 长亮屏\r
     }\r
 \r
     void TraingCardPresenter::OnPause(void)\r
@@ -81,7 +81,7 @@ namespace OHOS
     {\r
 \r
         Presenter<TraingCardView>::OnStop();\r
-        ScreenAlwaysOnCtr(0); // 长亮屏\r
+        //ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON); // 长亮屏\r
     }\r
 \r
     bool TraingCardPresenter::OnDrag(UIView &view, const DragEvent &event)\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
index 851f5aa..1bf455a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
@@ -32,7 +32,7 @@ namespace OHOS
     void WatchQRCodePresenter::OnStart()
     {
         Presenter<WatchQRCodeView>::OnStart();
-        ScreenAlwaysOnCtr(1);
+        ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);
     }
 
     void WatchQRCodePresenter::OnResume(void)
@@ -43,7 +43,7 @@ namespace OHOS
     void WatchQRCodePresenter::OnStop(void)
     {
         Presenter<WatchQRCodeView>::OnStop();
-        ScreenAlwaysOnCtr(0);
+        ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON);
         return;
     }
 

diff --git a/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c b/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
index de9e3e3..0a1cb4e 100644 (file)
--- a/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
+++ b/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
@@ -1014,7 +1014,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 //LCD显示颜色\r
                 uint8_t send_data = 0x00;\r
                 char *color_buf[5] ={"0Xffff0000","0xff00ff00","0xff0000ff","0xffffffff","0xff000000"};\r
-                ScreenAlwaysOnCtr(1);\r
+                ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);\r
                 switch (*data)\r
                 {\r
                     case 1:\r

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.h b/code/sdk/drivers/peripheral/utils/custom_utils.h
index 1b654cb..80537d6 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.h
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.h
@@ -27,6 +27,9 @@ extern "C" {
 #define TASK_PRIORITY_DFX_MSG       (osPriority_t)(18)
 #define TASK_PRIORITY_TRANSMIT      (osPriority_t)(20)
 
+#define OPEN_SCREEN_ALWAYS_ON 1   //屏幕常亮
+#define CANCEL_SCREEN_ALWAYS_ON 0 //取消屏幕常亮
+
 uint32_t zh_get_sn(uint8_t *buf_sn, uint32_t *len_sn);
 uint32_t zh_set_sn(uint8_t *buf_sn, uint32_t len_sn);