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

Code review from 袁清梦

* refs/changes/752/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/752

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp
index 6bbe95e..1f01f9a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp
@@ -120,7 +120,9 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Update_data_Chart fail %d", serialIndex);
             return;
         }
-        
+        /*清除原数据*/
+        heartSerial->ClearData();
+
         /*设置单个项*/
         heartdata[serialIndex].x = serialIndex;
         heartdata[serialIndex].y = HealthService::GetInstance()->GetHourlyHeartRate(serialIndex);
@@ -217,7 +219,8 @@ namespace OHOS
         heartYAxis.SetDataRange(0, 220);
         heartYAxis.SetLineColor(Color::GetColorFromRGBA(0, 0, 0, 0));
 
-        heartchart->SetGradientOpacity(0, 0);
+        heartchart->SetGradientOpacity(25, 180);
+        // heartchart->SetGradientOpacity(255, 0);
 
         container_->Add(heartchart);
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateView.cpp
index c87e5f9..57b2767 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateView.cpp
@@ -388,14 +388,12 @@ namespace OHOS
         heartXAxis.SetMarkNum(1);\r
         heartXAxis.SetDataRange(0, 24);\r
         heartXAxis.SetLineColor(Color::GetColorFromRGBA(0, 0, 0, 0));\r
-        // heartXAxis.SetLineColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff));\r
         heartYAxis.SetMarkNum(1);\r
         heartYAxis.SetDataRange(0, 220);\r
         heartYAxis.SetLineColor(Color::GetColorFromRGBA(0, 0, 0, 0));\r
-        // heartYAxis.SetLineColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff));\r
-\r
-        heartchart->SetGradientOpacity(0, 0);\r
 \r
+        //heartchart->SetGradientOpacity(60, 0);\r
+        heartchart->SetGradientOpacity(COORDINATE_GRAD_MIN_OPA, COORDINATE_GRAD_MAX_OPA);\r
         Add(heartchart);\r
     }\r
     void HeartRateView::Init_data_Chart()\r
@@ -419,6 +417,11 @@ namespace OHOS
         }\r
 #endif\r
         heartSerial->AddPoints(heartdata, 24);\r
+\r
+        // heartSerial->SetFillColor(Color::GetColorFromRGBA(0xea, 0x53, 0x15, 0xff));\r
+        // heartSerial->SetLineColor(Color::GetColorFromRGBA(0xd8, 0x14, 0x14, 0xff));\r
+        // heartSerial->EnableGradient(true);\r
+\r
         heartSerial->SetLineColor(Color::Red());\r
         heartSerial->SetFillColor(Color::Red());\r
         heartSerial->EnableGradient(true);\r
@@ -435,18 +438,25 @@ namespace OHOS
         }\r
 \r
         /*清空原数据*/\r
-        heartchart->DeleteDataSerial(heartSerial);\r
+        // heartchart->DeleteDataSerial(heartSerial);\r
+        heartSerial->ClearData();\r
 \r
         heartdata[serialIndex].x = serialIndex;\r
         heartdata[serialIndex].y = HealthService::GetInstance()->GetHourlyHeartRate(serialIndex);\r
 \r
+        for (int i = 0; i < 24; i++)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Update_data_Chart fail %d %d", i, heartdata[i].y);\r
+        }\r
+\r
         heartSerial->AddPoints(heartdata, 24);\r
         heartSerial->SetLineColor(Color::Red());\r
         heartSerial->SetFillColor(Color::Red());\r
         heartSerial->EnableGradient(true);\r
 \r
         heartchart->AddDataSerial(heartSerial);\r
-        heartchart->Invalidate();\r
+        // heartchart->Invalidate();\r
+        heartchart->RefreshChart();\r
     }\r
     void HeartRateView::InsertTopAndBottomRateImage(void)\r
     {\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
index bba4ab8..824961d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
@@ -198,20 +198,25 @@ namespace OHOS
         scrollView_->Add(labelfreq);
         scrollView_->Add(labelstride);
 #else
-        InitLabelExt(labelumile, 146, startY_Unit + labelInterval * 2, 240, 40, "label10", STR_RANGE_MILE, DEFAULT_VECTOR_FONT_FILENAME, 30);
-        InitLabelExt(labelusteps, 146, startY_Unit + labelInterval * 4, 240, 40, "label12", STR_STEP_NUMBER, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(labelumile, 146, startY_Unit + labelInterval * 4, 240, 40, "label10", STR_RANGE_MILE, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(labelusteps, 146, startY_Unit + labelInterval * 5, 240, 40, "label12", STR_STEP_NUMBER, DEFAULT_VECTOR_FONT_FILENAME, 30);
         labelumile->SetTextColor(textColor);
         labelusteps->SetTextColor(textColor);
 
-        InitLabel(labelsteps, 146, startY_Value + 4 * labelInterval, 240, 60, "label16", "5000", DEFAULT_VECTOR_FONT_FILENAME, 40);
-        labelsteps->SetTextColor(Color::Green());
-        InitLabel(labelmile, 146, startY_Value + 5 * labelInterval, 240, 60, "label15", "8,301", DEFAULT_VECTOR_FONT_FILENAME, 40);
+        InitLabel(labelmile, 146, startY_Value + 4 * labelInterval, 240, 60, "label15", "8,301", DEFAULT_VECTOR_FONT_FILENAME, 40);
         labelmile->SetTextColor(Color::Blue());
+        InitLabel(labelsteps, 146, startY_Value + 5 * labelInterval, 240, 60, "label16", "5000", DEFAULT_VECTOR_FONT_FILENAME, 40);
+        labelsteps->SetTextColor(Color::Green());
 
         scrollView_->Add(labelumile);
         scrollView_->Add(labelusteps);
         scrollView_->Add(labelmile);
         scrollView_->Add(labelsteps);
+
+        InitImageView(imageLine6, 97, baseY + 4 * lineHeight, 80, 20, "image6", LINE_IMAGE); // imageLine6
+        InitImageView(imageLine7, 97, baseY + 5 * lineHeight, 80, 20, "image7", LINE_IMAGE); // imageLine7
+        scrollView_->Add(imageLine6);
+        scrollView_->Add(imageLine7);
 #endif
     }
     // 配置退出相关位置