From 4593cb511566ef0cdf146c572b1c09873a4c531b Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=A2=81=E6=B8=85=E6=A2=A6?= <3449750381@qq.com> Date: Wed, 21 Aug 2024 07:48:02 +0000 Subject: [PATCH] Merge #752 into sdk602patch0626 from refs/changes/752/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/752 --- .../nativeui/heartrate/src/HeartChartView.cpp | 7 ++++-- .../nativeui/heartrate/src/HeartRateView.cpp | 22 ++++++++++++++----- .../nativeui/traing/src/TraingEnddataView.cpp | 15 ++++++++----- 3 files changed, 31 insertions(+), 13 deletions(-) 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 6bbe95e55..1f01f9aa5 100644 --- 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 c87e5f9ae..57b2767ea 100644 --- 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); heartXAxis.SetDataRange(0, 24); heartXAxis.SetLineColor(Color::GetColorFromRGBA(0, 0, 0, 0)); - // heartXAxis.SetLineColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff)); heartYAxis.SetMarkNum(1); heartYAxis.SetDataRange(0, 220); heartYAxis.SetLineColor(Color::GetColorFromRGBA(0, 0, 0, 0)); - // heartYAxis.SetLineColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff)); - - heartchart->SetGradientOpacity(0, 0); + //heartchart->SetGradientOpacity(60, 0); + heartchart->SetGradientOpacity(COORDINATE_GRAD_MIN_OPA, COORDINATE_GRAD_MAX_OPA); Add(heartchart); } void HeartRateView::Init_data_Chart() @@ -419,6 +417,11 @@ namespace OHOS } #endif heartSerial->AddPoints(heartdata, 24); + + // heartSerial->SetFillColor(Color::GetColorFromRGBA(0xea, 0x53, 0x15, 0xff)); + // heartSerial->SetLineColor(Color::GetColorFromRGBA(0xd8, 0x14, 0x14, 0xff)); + // heartSerial->EnableGradient(true); + heartSerial->SetLineColor(Color::Red()); heartSerial->SetFillColor(Color::Red()); heartSerial->EnableGradient(true); @@ -435,18 +438,25 @@ namespace OHOS } /*清空原数据*/ - heartchart->DeleteDataSerial(heartSerial); + // heartchart->DeleteDataSerial(heartSerial); + heartSerial->ClearData(); heartdata[serialIndex].x = serialIndex; heartdata[serialIndex].y = HealthService::GetInstance()->GetHourlyHeartRate(serialIndex); + for (int i = 0; i < 24; i++) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Update_data_Chart fail %d %d", i, heartdata[i].y); + } + heartSerial->AddPoints(heartdata, 24); heartSerial->SetLineColor(Color::Red()); heartSerial->SetFillColor(Color::Red()); heartSerial->EnableGradient(true); heartchart->AddDataSerial(heartSerial); - heartchart->Invalidate(); + // heartchart->Invalidate(); + heartchart->RefreshChart(); } void HeartRateView::InsertTopAndBottomRateImage(void) { 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 bba4ab8e1..824961db6 100644 --- 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 } // 配置退出相关位置 -- 2.17.1