From: Caisking <3449750381@qq.com> Date: Tue, 7 May 2024 08:58:10 +0000 (+0800) Subject: 适配心率Slice多国语言 X-Git-Tag: release_V1.2.70_20241020_135402~1025^2~31 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=7eaf00505dad8b48526bc1dfe264bae32bb2e1e9;p=mirrors%2FFD230.git 适配心率Slice多国语言 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartBandoffView.h b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartBandoffView.h index 762b5bb8c..5b78ccecb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartBandoffView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartBandoffView.h @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-04-15 10:55:58 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-05-07 14:53:32 + * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartBandoffView.h + */ #ifndef Heart_BANDOFF_VIEW_H @@ -27,7 +33,7 @@ namespace OHOS UIImageAnimatorView *GetImageAnimator(); private: - UILabel *label; + UILabelExt *label; UILabelButton *testButton; UIScrollView *HeartBandoffScrollView; UIViewGroup *group; diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartCheckView.h b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartCheckView.h index fb9941e55..2adb7aff5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartCheckView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartCheckView.h @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-04-15 10:55:58 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-05-07 14:55:13 + * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartCheckView.h + */ /* * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. * Description: bloodCheck view @@ -21,6 +27,7 @@ #include "components/ui_view_group.h" #include "HeartPresenter.h" #include "components/ui_scroll_view.h" +#include "components/ui_label_button_ext.h" namespace OHOS { class HeartPresenter; @@ -34,15 +41,15 @@ namespace OHOS static HeartCheckView *GetInstance(void); UIScrollView *HeartCheckViewInit(); UIImageAnimatorView *GetImageAnimator(); - UILabelButton *CreateAndSetUIButton(const char *title); + UILabelButtonExt *CreateAndSetUIButton(const char *title); void UpShowHeartText(); private: UIImageAnimatorView *imageAnimator; - UILabel *titleLabel; - UILabel *HeartText; + UILabelExt *titleLabel; + UILabelExt *HeartText; UIScrollView *HeartCheckScrollView; - UILabelButton *testButton; + UILabelButtonExt *testButton; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartResultView.h b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartResultView.h index b3d30dd22..d31466e6d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartResultView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartResultView.h @@ -21,6 +21,7 @@ #include "components/ui_view_group.h" #include "HeartPresenter.h" #include "components/ui_scroll_view.h" +#include "components/ui_label_button_ext.h" namespace OHOS { class HeartPresenter; @@ -40,14 +41,14 @@ namespace OHOS bool InitLabel(void); HeartResultView *bloodresult{nullptr}; UIImageView *imageerror; // 图片 - UILabel *titlelabel; - UILabel *label1; - UILabel *label2; - UILabel *label3; + UILabelExt *titlelabel; + UILabelExt *label1; + UILabelExt *label2; + UILabelExt *label3; UIScrollView *HeartResultScrollView; - UILabelButton *ReButton; - UILabelButton *StButton; + UILabelButtonExt *ReButton; + UILabelButtonExt *StButton; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartView.h b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartView.h index 889e565b0..e6749a056 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartView.h @@ -24,6 +24,8 @@ #include "HeartCheckView.h" #include "HeartResultView.h" #include "power_display_service.h" +#include "components/ui_label_button_ext.h" + namespace OHOS { class HeartPresenter; @@ -52,10 +54,10 @@ namespace OHOS void UpHeartText(); // 更新心率结果文本 private: - bool InitImageDisplay(void); // 初始化背景图片 - bool InitLabel(void); // 初始化标签 - UILabelButton *CreateAndSetUIButton(const char *title); // 添加label按键 - bool InitHeartView(void); // 初始化界面 + bool InitImageDisplay(void); // 初始化背景图片 + bool InitLabel(void); // 初始化标签 + UILabelButtonExt *CreateAndSetUIButton(const char *title); // 添加label按键 + bool InitHeartView(void); // 初始化界面 bool SetOnDragListener(void); HeartBandoffView *heartbandoff{nullptr}; @@ -64,11 +66,11 @@ namespace OHOS UIScrollView *HeartScrollView[4]{nullptr}; UIViewGroup *group; - UIImageView *imageViewMain; // 背景图片 - UILabel *percent; // 心率值 - UILabel *timeLabel; // 检测时间 - UILabel *titleLabel; // 页面title - UILabelButton *testButton; // 检测按键 + UIImageView *imageViewMain; // 背景图片 + UILabelExt *percent; // 心率值 + UILabelExt *timeLabel; // 检测时间 + UILabelExt *titleLabel; // 页面title + UILabelButtonExt *testButton; // 检测按键 const power_display_svr_api_t *display_api = power_display_svr_get_api(); uint32_t display_time; // 获取系统亮屏时间暂存 diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartBandoffView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartBandoffView.cpp index 59af17ed0..fd71a52a4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartBandoffView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartBandoffView.cpp @@ -9,6 +9,7 @@ #include "wearable_log.h" #include "HeartBandoffView.h" #include "HeartModel.h" +#include "language/font/ui_resource_string.h" namespace OHOS { @@ -116,14 +117,15 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartBandoffView::CreateUIViewGroup"); // 佩戴title - label = new UILabel(); + label = new UILabelExt(); if (label == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartBandoffView::new Label fail"); // return nullptr; } label->SetPosition(LABEL_POSITION_X, LABEL_POSITION_Y, LABEL_POSITION_WIDTH, LABEL_POSITION_HEIGHT); - label->SetText("偏紧佩戴,保持静止"); + // label->SetText("偏紧佩戴,保持静止"); + label->SetTextId(STR_CHECKNOTE); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); HeartBandoffScrollView->Add(label); diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartCheckView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartCheckView.cpp index eaabed248..1c58fc954 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartCheckView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartCheckView.cpp @@ -6,6 +6,7 @@ #include "HeartModel.h" #include "ui_image_animator.h" #include "HeartCheckView.h" +#include "language/font/ui_resource_string.h" namespace OHOS { // 动态刷新设置 @@ -94,7 +95,7 @@ namespace OHOS HeartCheckScrollView->SetPosition(0, 0); HeartCheckScrollView->Resize(VERTICAL_RESOLUTION, HORIZONTAL_RESOLUTION); /* -------------------------------------------------------------------------- */ - titleLabel = new UILabel(); + titleLabel = new UILabelExt(); if (titleLabel == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartView::new titleLabel fail"); @@ -104,7 +105,8 @@ namespace OHOS titleLabel->Resize(200, 90); // widget's width and height titleLabel->SetViewId("label3"); // Set style titleLabel->SetStyle(STYLE_TEXT_FONT, 28); - titleLabel->SetText("正在检测"); + // titleLabel->SetText("正在检测"); + titleLabel->SetTextId(STR_CHECKON); titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); titleLabel->SetRollSpeed(0); @@ -119,14 +121,14 @@ namespace OHOS return nullptr; } imageAnimator->SetImageAnimatorSrc(g_imageAnimatorInfo_Time, CHECKIMAGEANIMATORVIEW_SIZE, CHECKIMAGEANIMATORVIEW_SPEED); - //imageAnimator->SetRepeatTimes(30); + // imageAnimator->SetRepeatTimes(30); imageAnimator->SetRepeat(true); imageAnimator->Start(); HeartCheckScrollView->Add(imageAnimator); /* -------------------------------------------------------------------------- */ if (testButton == nullptr) { - testButton = new UILabelButton(); + testButton = new UILabelButtonExt(); } testButton->SetPosition(118, 336); // widget's left position and top position testButton->Resize(230, 80); // widget's width and height @@ -134,7 +136,8 @@ namespace OHOS testButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); // Set additional property - testButton->SetText("停止检测"); + // testButton->SetText("停止检测"); + testButton->SetTextId(STR_CHECKSTOP); testButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); testButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); testButton->SetViewId("checkstop"); @@ -147,15 +150,15 @@ namespace OHOS testButton->SetOnClickListener(clickLeftListener); HeartCheckScrollView->Add(testButton); /* -------------------------------------------------------------------------- */ - HeartText = new UILabel(); + HeartText = new UILabelExt(); if (HeartText == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartView::new HeartText fail"); return nullptr; } HeartText->SetPosition(83, 110); // widget's left position and top position - HeartText->Resize(300, 250); // widget's width and height - HeartText->SetViewId("label"); // Set style + HeartText->Resize(300, 250); // widget's width and height + HeartText->SetViewId("label"); // Set style HeartText->SetStyle(STYLE_TEXT_FONT, 140); uint16_t heart_ = HeartModel::GetInstance()->GetHeartdata(); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetHeartData %d", heart_); diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp index 20078aeab..6c05a52ba 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp @@ -6,6 +6,7 @@ #include "HeartModel.h" #include "ui_image_animator.h" #include "HeartResultView.h" +#include "language/font/ui_resource_string.h" namespace OHOS { // 图片设置 @@ -71,7 +72,7 @@ namespace OHOS // 初始化标签 bool HeartResultView::InitLabel() { - titlelabel = new UILabel(); + titlelabel = new UILabelExt(); if (titlelabel == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabel fail"); @@ -83,13 +84,14 @@ namespace OHOS titlelabel->SetStyle(STYLE_TEXT_FONT, 28); // Set additional property - titlelabel->SetText("检测不到结果"); + // titlelabel->SetText("检测不到结果"); + titlelabel->SetTextId(STR_CHECKERROR); titlelabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); titlelabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); titlelabel->SetRollSpeed(0); titlelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 28); /* -------------------------------------------------------------------------- */ - label1 = new UILabel(); + label1 = new UILabelExt(); if (label1 == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabel fail"); @@ -100,13 +102,13 @@ namespace OHOS label1->SetViewId("label4"); // Set style label1->SetStyle(STYLE_TEXT_FONT, 30); - label1->SetText("请确认已带上手表,并保持"); + label1->SetText("请确认已带上手表,并保持静止"); label1->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); label1->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label1->SetRollSpeed(0); label1->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ - label2 = new UILabel(); + label2 = new UILabelExt(); if (label2 == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabel fail"); @@ -116,14 +118,14 @@ namespace OHOS label2->Resize(200, 60); // widget's width and height label2->SetViewId("label5"); // Set style label2->SetStyle(STYLE_TEXT_FONT, 30); - label2->SetText("静止,准备好后点击下方按钮"); + label2->SetText("准备好后点击下方按钮"); label2->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); label2->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label2->SetRollSpeed(0); label2->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ - label3 = new UILabel(); + label3 = new UILabelExt(); if (label3 == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabel fail"); @@ -194,15 +196,16 @@ namespace OHOS return nullptr; } /* -------------------------------------------------------------------------- */ - ReButton = new UILabelButton(); + ReButton = new UILabelButtonExt(); if (ReButton == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UILabelButton fail"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UILabelButtonExt fail"); return nullptr; } ReButton->SetPosition(118, 334); ReButton->Resize(230, 80); - ReButton->SetText("重新检测"); + // ReButton->SetText("重新检测"); + ReButton->SetTextId(STR_RECHECK); ReButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffFF8A36); ReButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); ReButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); @@ -215,15 +218,16 @@ namespace OHOS } ReButton->SetOnClickListener(clickLeft1Listener); /* -------------------------------------------------------------------------- */ - StButton = new UILabelButton(); + StButton = new UILabelButtonExt(); if (StButton == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UILabelButton fail"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UILabelButtonExt fail"); return nullptr; } StButton->SetPosition(118, 434); // widget's left position and top position StButton->Resize(230, 80); // widget's width and height - StButton->SetText("停止检测"); + // StButton->SetText("停止检测"); + StButton->SetTextId(STR_CHECKSTOP); StButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); StButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); StButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartView.cpp index ba9f44b5b..198d342e8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartView.cpp @@ -13,6 +13,7 @@ #include "heartrate/include/HeartBandoffView.h" #include "heartrate/include/HeartCheckView.h" #include "heartrate/include/HeartRateView.h" +#include "language/font/ui_resource_string.h" namespace OHOS { @@ -91,21 +92,22 @@ namespace OHOS uint64_t time = HeartPresenter::GetInstance()->GetCurrentTime(); uint64_t check_time = HeartModel::GetInstance()->GetCheckTime(); TimeStr = HeartPresenter::GetInstance()->GetTDOA(time, check_time) + "检测"; + timeLabel->SetText(TimeStr.c_str()); } else { heartStr = "--"; - TimeStr = "暂无检测记录"; + // TimeStr = "暂无检测记录"; + timeLabel->SetTextId(STR_CHECKNO); } percent->SetText(heartStr.c_str()); - timeLabel->SetText(TimeStr.c_str()); } // 初始化标签 bool HeartView::InitLabel() { /* -------------------------------------------------------------------------- */ - percent = new UILabel(); + percent = new UILabelExt(); if (percent == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartView::new percent fail"); @@ -120,7 +122,7 @@ namespace OHOS percent->SetRollSpeed(0); percent->SetFont(DEFAULT_VECTOR_FONT_FILENAME, PERCENT_FONT_SIZE); /* -------------------------------------------------------------------------- */ - timeLabel = new UILabel(); + timeLabel = new UILabelExt(); if (timeLabel == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartView::new timeLabel fail"); @@ -136,7 +138,7 @@ namespace OHOS timeLabel->SetRollSpeed(0); timeLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TIMELABEL_FONT_SIZE); /* -------------------------------------------------------------------------- */ - titleLabel = new UILabel(); + titleLabel = new UILabelExt(); if (titleLabel == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartView::new titleLabel fail"); @@ -146,8 +148,9 @@ namespace OHOS titleLabel->Resize(200, 90); // widget's width and height titleLabel->SetViewId("label3"); // Set style titleLabel->SetStyle(STYLE_TEXT_FONT, TITLE_FONT_SIZE); - titleLabel->SetText("心率检测结果"); - titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + // titleLabel->SetText("心率检测结果"); + titleLabel->SetTextId(STR_HEARTDATA); + titleLabel->SetLineBreakMode(UILabelExt::LINE_BREAK_ADAPT); titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); titleLabel->SetRollSpeed(0); titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TITLE_FONT_SIZE); @@ -162,32 +165,32 @@ namespace OHOS uint64_t time = HeartPresenter::GetInstance()->GetCurrentTime(); uint64_t check_time = HeartModel::GetInstance()->GetCheckTime(); TimeStr = HeartPresenter::GetInstance()->GetTDOA(time, check_time) + "检测"; + timeLabel->SetText(TimeStr.c_str()); } else { heartStr = "--"; - TimeStr = "暂无检测记录"; + // TimeStr = "暂无检测记录"; + timeLabel->SetTextId(STR_CHECKNO); } percent->SetText(heartStr.c_str()); - - timeLabel->SetText(TimeStr.c_str()); - /* -------------------------------------------------------------------------- */ return true; } // 创建标签按键 - UILabelButton *HeartView::CreateAndSetUIButton(const char *title) + UILabelButtonExt *HeartView::CreateAndSetUIButton(const char *title) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartView::CreateAndSetUIButton"); - UILabelButton *btn = new UILabelButton(); + UILabelButtonExt *btn = new UILabelButtonExt(); if (btn == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartView::new UILabelButton fail"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartView::new UILabelButtonExt fail"); return nullptr; } btn->SetPosition(TESTBUTTON_X, TESTBUTTON_Y, BUTTON_WIDHT2, BUTTON_HEIGHT2); btn->SetStyle(STYLE_BACKGROUND_COLOR, 0xffcd492c); - btn->SetText(title); + // btn->SetText(title); + btn->SetTextId(STR_CHECK); // btn->SetTextColor(Color::Red()); btn->SetFont(DEFAULT_VECTOR_FONT_FILENAME, BUTTON_LABEL_SIZE); btn->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);