Merge #774 into sdk602patch0626 from refs/changes/774/head

Code review from 袁清梦

* refs/changes/774/head: (3 commits squashed)

  - 修复省电模式表盘界面按键退出的异常

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

  - 修复心率检测界面刷新异常

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/774

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
index e2b36e2..09528ef 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
@@ -163,7 +163,9 @@ extern "C"
             GraphicService::GetInstance()->PostGraphicEvent(\r
                 std::bind(&OHOS::HeartModel::Heart_Update_View, OHOS::HeartModel::GetInstance()));\r
         }\r
-        if (request->msgId == TOPIC_EVENT_WEARSTATE_UPDATE){}\r
+        if (request->msgId == TOPIC_EVENT_WEARSTATE_UPDATE)\r
+        {\r
+        }\r
     }\r
 \r
 #ifdef __cplusplus\r
@@ -626,10 +628,10 @@ namespace OHOS
     void HeartModel::Heart_Result()\r
     {\r
         // 心率提醒（0开 1关）\r
-        uint8_t HeartState = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_REMIND);\r
+        uint8_t HeartRemindState = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_REMIND);\r
         uint16_t ThresholdValue = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_THRESHOLD_VALUE);\r
 \r
-        if (HeartState)\r
+        if (HeartRemindState)\r
         {\r
             // 检查当前心率是否高于或低于阈值\r
             uint16_t ThresholdState = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_MAX_MIN);\r
@@ -654,8 +656,8 @@ namespace OHOS
         case HeartResult::SUCCESS:\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果: 成功");\r
             Heart_Save();\r
-            // NativeAbility::GetInstance().ChangeSlice(VIEW_HEART_CHART);\r
-            // NativeAbility::GetInstance().Back(); // 成功 心率界面检测成功 不回退\r
+            /*通知进行UI更新*/\r
+            SendMsgToUIService(UI_UPDATE_HEARTRATE_DATA, 0, nullptr, 0);\r
             break;\r
 \r
         case HeartResult::NOT_WORN:     // 未佩戴状态\r
@@ -766,6 +768,7 @@ namespace OHOS
 \r
     void HeartModel::Heart_Update_View(void)\r
     {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "更新心率界面");\r
         int hour = HealthService::GetInstance()->GetCurrentHour();\r
         if (HeartRateView::GetInstance() != nullptr)\r
         {\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveBatPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveBatPresenter.h
index a162ded..2c7743d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveBatPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveBatPresenter.h
@@ -18,7 +18,8 @@ namespace OHOS
                              public UIView::OnDragListener,\r
                              public UIView::OnLongPressListener,\r
                              public ModelListenerSample,\r
-                             public UIView::OnTouchListener\r
+                             public UIView::OnTouchListener,\r
+                             public RootView::OnKeyActListener\r
     {\r
     public:\r
         SaveBatPresenter();\r
@@ -45,6 +46,7 @@ namespace OHOS
         bool OnLongPress(UIView &view, const LongPressEvent &event);\r
         bool OnPress(UIView &view, const PressEvent &event);\r
         bool OnRelease(UIView &view, const ReleaseEvent &event);\r
+        bool OnKeyAct(UIView &view, const KeyEvent &event) override; // 增加按键事件\r
 \r
         uint64_t startTime{0};\r
         int count = 3;         // 初始计数\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp
index 9cb78e5..abb3848 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp
@@ -203,4 +203,9 @@ namespace OHOS
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Refresh_Back_View: 当前计数: %d, 当前进度值: %d", count, progressValue);\r
         }\r
     }\r
+    bool SaveBatPresenter::OnKeyAct(UIView &view, const KeyEvent &event)\r
+    {\r
+        /*消耗按键事件*/\r
+        return true;\r
+    }\r
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatView.cpp b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatView.cpp
index 4874809..579f7de 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatView.cpp
@@ -399,6 +399,7 @@ namespace OHOS
         InitShowBackView();\r
 \r
         SetContainerView(container_);\r
+        RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
     }\r
 \r
     void SaveBatView::OnSetUpView()\r