Merge #1862 into sdk602patch0911 from refs/changes/1862/head

Code review from 袁清梦

* refs/changes/1862/head: (2 commits squashed)

  - 修复血压测量结束界面的icon显示

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

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: 薛文强 <accounts_67aaf52ad497cd558d73ac32@mail.teambition.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1862

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectBeginView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectBeginView.h
index 426a913..5c130bf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectBeginView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectBeginView.h
@@ -29,6 +29,8 @@ namespace OHOS
 
     private:
         UIImageView *background = nullptr;
+        UIImageView *lineground = nullptr;
+
         UILabelExt *calibrationLabel = nullptr;
         UILabelExt *remindLabel = nullptr;
         UILabelExt *timeLabel = nullptr;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectBeginView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectBeginView.cpp
index d89cef4..f5368f2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectBeginView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectBeginView.cpp
@@ -16,7 +16,9 @@
 namespace OHOS
 {
     static BPDetectBeginView *g_pBPDetectBeginView{nullptr};
-    static const char *BPBACKPATH = "/user/res/BPCalibration/calibration_background.bin";
+    static const char *BPBACKPATH = "/user/res/BPCalibration/W.bin";
+    static const char *BPLINEPATH = "/user/res/BPCalibration/Q.bin";
+
     BPDetectBeginView::BPDetectBeginView()
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPDetectBeginView::BPDetectBeginView");
@@ -42,6 +44,11 @@ namespace OHOS
                 delete background;
                 background = nullptr;
             }
+            if (lineground != nullptr)
+            {
+                delete lineground;
+                lineground = nullptr;
+            }
             if (calibrationLabel != nullptr)
             {
                 delete calibrationLabel;
@@ -106,10 +113,15 @@ namespace OHOS
     bool BPDetectBeginView::Initbackground()
     {
         background = new UIImageView();
-        background->SetPosition(0, 0, 466, 466);
+        background->SetPosition(0, 62, 466, 342);
         background->SetSrc(BPBACKPATH);
 
+        lineground = new UIImageView();
+        lineground->SetPosition(49, 95, 356, 161);
+        lineground->SetSrc(BPLINEPATH);
+
         group->Add(background);
+        group->Add(lineground);
         return true;
     }
     /***

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectEndView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectEndView.cpp
index 7e601e2..6374ef2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectEndView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectEndView.cpp
@@ -172,6 +172,8 @@ namespace OHOS
         group->Add(BPImageView);
         group->Add(BgWImageView);
         group->Add(BgUImageView);
+        group->Add(IconImageView);
+        
         group->Add(ReCheckButton);
 
         UpdateText();