From 411c033c8a6fd2cbc9933aceeaf1c4c7159fb640 Mon Sep 17 00:00:00 2001 From: Caisking <3449750381@qq.com> Date: Mon, 1 Apr 2024 20:44:23 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E8=AE=AD=E7=BB=83=E5=BC=80?= =?utf8?q?=E5=A7=8B=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../language/Language_xml/input_list_en.txt | 13 +- .../language/Language_xml/input_list_zh.txt | 7 +- .../language/Language_xml/language_en.xml | 13 +- .../language/Language_xml/language_zh.xml | 7 +- .../fd230app/nativeui/language/font/en.lang | Bin 4125 -> 4293 bytes .../language/font/ui_resource_string.h | 304 +++++++++--------- .../fd230app/nativeui/language/font/zh.lang | Bin 3961 -> 3965 bytes .../language/src/LanguageSwitchPresenter.cpp | 2 +- .../language/src/LanguageSwitchView.cpp | 2 +- .../nativeui/traing/include/TraingModel.h | 1 + .../nativeui/traing/include/TraingNomalView.h | 9 +- .../nativeui/traing/src/TraingModel.cpp | 25 ++ .../nativeui/traing/src/TraingNomalView.cpp | 50 ++- .../src/Training_CardPresenter.cpp | 5 +- .../training_card/src/Training_CardView.cpp | 44 +-- .../fd230/fs/user/res/font/en.lang | Bin 4125 -> 4293 bytes .../fs/user/res/font/ui_resource_string.h | 304 +++++++++--------- .../fd230/fs/user/res/font/zh.lang | Bin 3961 -> 3965 bytes 18 files changed, 404 insertions(+), 382 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt index 193221731..53d9d994b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt @@ -19,7 +19,7 @@ STR_EXERCISE_OUTDOORWALKING$Walk STR_EXERCISE_OUTDOORRUNNING$Run STR_EXERCISE_INDOORWALKING$Indoor walking STR_EXERCISE_INDOORRUNNING$Indoor running -STR_EXERCISE_OUTDOORBIKING$Biking +STR_EXERCISE_OUTDOORBIKING$ Biking STR_EXERCISE_JUMPINGROPE$Jumping rope STR_EXERCISE_PILATES$Pilates STR_EXERCISE_CROSS_FIT$Cross fit @@ -35,7 +35,7 @@ STR_EXERCISE_BODYCOMBAT$Body Combat STR_EXERCISE_KENDO$Kendo STR_EXERCISE_HORIZONTALBAR$Horizontal bar STR_EXERCISE_PARALLELBARS$Parallel bars -STR_EXERCISE_CROSSFIT$Circuit training +STR_EXERCISE_CIRCUIT$Circuit training STR_EXERCISE_AEROBICS$Aerobics STR_EXERCISE_CALISTHENICE$Calisthenice STR_EXERCISE_P90X$P90X @@ -187,9 +187,8 @@ STR_BALL_LIST_TITLE$Ball Sport STR_OTHER_TITLE$Other Sport STR_EXERCISE_TITLE$Exercise Sport STR_TRAINING$Training -STR_LANGUAGE$Language STR_RAPID_TRAINING$Rapid training -STR_SET_GOALS$Set goals +STR_SET_GOALS$Set goals > STR_DURATION$duration STR_DURATION_SETTING$Duration setting STR_MINUTES$minutes @@ -213,14 +212,14 @@ STR_MEDIUM_STRENGTH$Medium strength STR_HIGH_STRENGTH$High strength STR_ULTRA_HIGH_STRENGTH$Ultra-high strength STR_TRAINING_INTENSITY$Training intensity -STR_TRAINING_INTENSITY_DESCRIPTION$Training intensity is used to determine whether the training is insufficient or too much training$ and how much exercise intensity is appropriate to increase the heart rate. -STR_INTENSITY_INTERVAL_DESCRIPTION$The intensity interval is a real-time state display of the strength of the corresponding bullseye rate (calculated from personal basic data)$ which is helpful to improve the quality of training +STR_TRAINING_INTENSITY_DESCRIPTION$Training intensity is used to determine whether the training is insufficient or too much training, and how much exercise intensity is appropriate to increase the heart rate. +STR_INTENSITY_INTERVAL_DESCRIPTION$The intensity interval is a real-time state display of the strength of the corresponding bullseye rate (calculated from personal basic data), which is helpful to improve the quality of training STR_TRAINING_STATE_MEANING$The meaning of the training state STR_WARM_UP_EXERCISE$Warm-up exercise STR_FAT_BURNING_ZONE$Fat-burning zone STR_IMPROVE_CARDIOPULMONARY_FUNCTION$Improve cardiopulmonary function STR_PROFESSIONAL_ATHLETE$Professional athlete -STR_TRAINING_INTENSITY_NOTE$Note: This training intensity is not a professional sports assessment$ and the data is for reference only +STR_TRAINING_INTENSITY_NOTE$Note: This training intensity is not a professional sports assessment, and the data is for reference only STR_TRAINING_IN_PROGRESS$Training in progress STR_BREAK_TRAINING$Break training STR_FINISH$finish diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt index 7e7a8451a..d51ffc1bd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt @@ -35,7 +35,7 @@ STR_EXERCISE_BODYCOMBAT$拳击有氧 STR_EXERCISE_KENDO$剑道 STR_EXERCISE_HORIZONTALBAR$单杠 STR_EXERCISE_PARALLELBARS$双杠 -STR_EXERCISE_CROSSFIT$循环训练 +STR_EXERCISE_CIRCUIT$循环训练 STR_EXERCISE_AEROBICS$有氧运动 STR_EXERCISE_CALISTHENICE$健美操 STR_EXERCISE_P90X$P90X @@ -187,9 +187,8 @@ STR_BALL_LIST_TITLE$球类运动 STR_OTHER_TITLE$其他运动 STR_EXERCISE_TITLE$健身运动 STR_TRAINING$训练 -STR_LANGUAGE$语言 STR_RAPID_TRAINING$快速训练 -STR_SET_GOALS$设置目标 +STR_SET_GOALS$设置目标 > STR_DURATION$时长 STR_DURATION_SETTING$时长设定 STR_MINUTES$分钟 @@ -230,7 +229,7 @@ STR_GOAL_ACHIEVED$目标已达成 STR_ACCOMPLISH_GOAL$完成目标 STR_OK$确定 STR_LOOK_OUT$注意 -STR_INSUFFICIENT_EXERCISE_AMOUNT$当前运动量太小，无法记录.是否结束运动 +STR_INSUFFICIENT_EXERCISE_AMOUNT$当前运动量太小，无法记录。是否结束运动 STR_END_MOVEMENT$结束运动 STR_END_THIS_MOVEMENT$是否结束本次运动 STR_GOAL_ACCOMPLISHMENT_DEGREE$目标完成度 diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml index e10e23d03..38a089019 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml @@ -20,7 +20,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -188,9 +188,8 @@ - - + @@ -214,14 +213,14 @@ - - + + - + diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml index e677336a2..d8aff3e0c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml @@ -36,7 +36,7 @@ - + @@ -188,9 +188,8 @@ - - + @@ -231,7 +230,7 @@ - + diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang index a61b10894eb65f4986d490168b816f0dc1df1d6a..bd25ae2c51881f5570896018f4e96f4ab993e66a 100644 GIT binary patch delta 1194 zcmX}pdq`7Z7{~EqC1u# zgQBD?2@8uPCS5=)rMnOmMs(4NO0vkJA`ub#n&2OwhllgN&yV-;oRRmFEzKr9sot_U zSR;g}#|bpz62iER$LPTa^y4drVKoU6k0hib1Gy+hDIBOoHTI$or*RIg=)hCFG>M@2 zL^FU<#7`1pE;6wUYp@X|aKgYoG~z05;UQjQ0KOeLlz29h*D_SgJU>l4hnIe z<}$9M9ry4Iz4(IP7>3m%#0<>F9Ash@)?q8kU?6}4s6zvqa0P9+gKqSo7yUuXAckOx z5Mnx#kb?PGid?KmF}9!-J5Y&TIEXql;v!nng>LlV4L)N4e=&;aNPY&vWXb|$ArBi+ zg6#;P2K#XYAvB-~Ex3seJisfw$9D|F5+%emBqIYk$VV~C;DRrT{nyYOMm-wPjB98| z7oOk+`tT70_<`BcefWl-7(r|_ zE5Sl6K|VIYj%w5*JBGVRiWMRqE3gfIyu%-uJ(`|mukcO^kZp~dDu8-IqnNX;BHT%RjQKTBO+@rXB zGAEoKchppnCKb0`Iz3gg!f$g*wOZ9}nopIQ+fdy;%?L=%Cl#+(_jq+pF;r=IIJ4=h z!X?A0N~fymhSWJq58ar2JTpyJIW>|PbE+<{!|(b(QbEGb@rg>m;u;I~I40f|%A0aG iW&9~)nRdlc#sVB3UFxbs)m67ml^(Y%5VlO6W%>vBSl>Ya delta 1022 zcmX}rTWAe%90&0KvEvvPLdh*#$b(Unh(sZ@d2pF1!f`v!ViRXEi&MxYNvC5WCPb$s zv>~}gx#iM`2+JN&$Sk}F;q&C-^XvQYuiw9Zzu)bm`od^#)zXKV=!o?85W+!@kmDRz zxWf~g`N$W(5s8G*jb03*m{F9nfEBD}18H_p$1!qTzP{l^Jk>LQxImHETa-XL(^DeEl@{`W(L+C*tiWtrqCR4@?<`5^r z8fw`_9rc{#5;wWe6JFE8XTI~7f|wDK9;g&EmZ_Apm?~1#u$f(CIKWZP(8yJqc+Oke z_({hO8ZelVjH8TsEFnp%gZXa~c97vPIU2ac4Ic1}m$dMnR=)CwXugG{FGCo`1g0^U zI2F{gmE9a7$GLp-zb@RSiPwCfl^^7Hv`h?RB$Jp;oN9LRiS?aa5vRC9GhZ3qIfUuV zX9+8*ViOtm^;7C;<2StvG-3*+*#~(wU6X5?1Ih3NRFkf=8zSeD5o28NIu(4tVJ_c3m1Gy zvmv9&sg{LWjwx1Bj{CGilX6=8T>Sq1pPToo_xYLKmz{K`tGll*X=-$P2%&-l9OE?C zxW^0Pd?zs>gbcD6M?QrtpoDd7rJ7nAiP1zG9dz=HE(C8y!62C2#q}SALNY2_cQa z)5>k`^PD%t`OY6Ql0q29XvQ;znG~^zrL16eRIFzQ)f}Ob7?)|Iod-PT74P^;NDd)| zK@4Xi(o7m1Cs;T7!=V;*u9X#bVJ@oRI^!~n`940V> z`7B`-8`XSl$1ZgH0z{3Sir5^~7n3eyHy!YbCWiy9vCg7@^$ z%TH3%LKwn`EHQ>sHn5MQoZ@_aXJl(~#o73c3#|*1$`aB)+-d4QbSZwZrTb=8Yjg6v Ze)Yf8h9!=i70XPIMBeSKtRI|F{tt8jnE?O* delta 984 zcmWmBTWAho00!W1+rRDK=9C;VYcg_*EixB2xiFS8IhEQ_*l>Xmk<-5{S=46caIvAB zGMW7~Tuc*JG>3BG(2%xP+oDBsPI+8BZ|`^Wef7P6vwvkr?$iw{sf)~t9SR{FqlN~q zbC0LIXMjIM6G9kC4tW%^fMu*@8~ZuIDK64PoOU{R!5cpCiSG#^7XB#FM32Axl_EDeGfmCx@aP8$z-%uC+U&o4r9 z2;Ud>)rJW95)5Ax8k{tEzjAIfr zm`gEBDPsd$IY<@9qxL_iG;oO~?$X9Xp7V-NeC99dX(5beA~T6IE8QcMQNcc{dBRJ& z>E|;)NX;-CW3xmKrEI2>lbq*D{gb5K8TW7W*0l89YVN&P)mjwUn9zDVxi}@Iucf)~ VdS(6ZjLgfU1|=or){hxl{txpPlc4|r diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp index 50a757f37..ba1114321 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp @@ -114,7 +114,7 @@ namespace OHOS else { g_planguage->ChangeLanguage(p_LanguageSwitchModel->GetCurLanguageCode()); - m_labelext->SetTextId(STR_LANGUAGE); + //m_labelext->SetTextId(STR_LANGUAGE); m_labelext->ForceResetText(); // 强制刷新 p_UILabelButtonExt->SetImageSrc(SelectedImg, SelectedImg); diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchView.cpp index 55dcc12fc..6c0b5116a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchView.cpp @@ -94,7 +94,7 @@ namespace OHOS LanguageSwitchViewTitleLabel->SetStyle(STYLE_TEXT_FONT, TITLE_LABEL_TEXT_FONT); LanguageSwitchViewTitleLabel->SetStyle(STYLE_LINE_HEIGHT, TITLE_LABEL_LINE_HEIGHT); // LanguageSwitchViewTitleLabel->SetText("语言"); - LanguageSwitchViewTitleLabel->SetTextId(STR_LANGUAGE); + // LanguageSwitchViewTitleLabel->SetTextId(STR_LANGUAGE); LanguageSwitchViewTitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); LanguageSwitchViewTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); LanguageSwitchViewTitleLabel->SetRollSpeed(TITLE_LABEL_TEXT_ROLLSPEED); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h index 21590c0a7..eb86b43d6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h @@ -67,6 +67,7 @@ namespace OHOS bool InitLabel(UILabelExt *&label, int left, int top, int width, int height, const char *viewId, const char *text, const char *fontName, int fontSize); bool InitLabelExt(UILabelExt *&label, int left, int top, int width, int height, const char *viewId, UIResourceTextId id, const char *fontName, int fontSize); bool InitButton(UIButton *&button, int left, int top, int width, int height, const char *viewId); + bool InitButtonExt(UILabelButtonExt *&button, int left, int top, int width, int height, const char *viewId, UIResourceTextId id, int fontSize); bool InitImageView(UIImageView *&imageView, int left, int top, int width, int height, const char *viewId, const char *imagePath); void InitList(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h index 07c0fb79a..ae995acea 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h @@ -41,7 +41,7 @@ namespace OHOS void OnStop() override; void InitView(); void DeInit(); - + void InitList(); void PreLoad(void); @@ -51,10 +51,9 @@ namespace OHOS TraingNomalView &operator=(TraingNomalView &&) = delete; UIViewGroup *container_ = nullptr; - UILabelExt *label1_ = nullptr; - UILabelExt *label2_ = nullptr; - UIButton *button1_ = nullptr; - UIButton *button2_ = nullptr; + UILabelExt *sporttitle_ = nullptr; + UIButton *buttonGo_ = nullptr; + UILabelButtonExt *buttonSet_ = nullptr; bool viewiInitStatus{false}; }; } // namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp index 07496416b..584fde2a6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -189,7 +189,32 @@ namespace OHOS // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::InitButton is succeed"); return true; } + bool TraingModel::InitButtonExt(UILabelButtonExt *&button, int left, int top, int width, int height, const char *viewId, UIResourceTextId id, int fontSize) + { + // 创建新按钮（如果当前按钮为空） + if (button == nullptr) + { + button = new UILabelButtonExt(); + } + if (button == nullptr) + { + return false; // 内存分配失败，返回false + } + button->SetPosition(left, top); + button->Resize(width, height); + button->SetViewId(viewId); + button->SetTextId(id); + + button->SetStyle(STYLE_TEXT_FONT, fontSize); + button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, fontSize); + button->SetStyle(STYLE_BACKGROUND_COLOR, DEFAULT_BACKGROUND_COLOR); + button->SetStyleForState(STYLE_BACKGROUND_COLOR, DEFAULT_BACKGROUND_COLOR, UIButton::PRESSED); + button->SetStyleForState(STYLE_BORDER_COLOR, PRESSED_BORDER_COLOR, UIButton::PRESSED); + button->SetVisible(true); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::InitButton is succeed"); + return true; + } /*** * @description: * @param {UIImageView} * diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp index 131c57e61..95f635b88 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp @@ -3,7 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" -#include"language/font/ui_resource_string.h" +#include "language/font/ui_resource_string.h" #include "UiConfig.h" #include "ui_resource_image.h" #include @@ -32,7 +32,7 @@ namespace OHOS return g_pTraingNomalView; } - + /* InitView:初始化界面*/ void TraingNomalView ::InitView() { @@ -43,44 +43,42 @@ namespace OHOS container_->SetStyle(STYLE_BACKGROUND_OPA, 0); } - UIResourceTextId sport_id = TraingModel::GetInstance()->GetSportEvent(); + UIResourceTextId sport_id = TraingModel::GetInstance()->GetSportEvent(); // 初始化Lable - TraingModel::GetInstance()->InitLabelExt(label1_, 137, 52, 195, 35, "label1", sport_id, DEFAULT_VECTOR_FONT_FILENAME, 30); - container_->Add(label1_); - TraingModel::GetInstance()->InitLabel(label2_, 160, 370, 146, 35, "label2", "设定目标 >", DEFAULT_VECTOR_FONT_FILENAME, 30); - container_->Add(label2_); + TraingModel::GetInstance()->InitLabelExt(sporttitle_, 137, 52, 200, 200, "label1", sport_id, DEFAULT_VECTOR_FONT_FILENAME, 30); + container_->Add(sporttitle_); // 初始化Button - TraingModel::GetInstance()->InitButton(button1_, 133, 133, 200, 200, BUTTONGO); + TraingModel::GetInstance()->InitButton(buttonGo_, 133, 133, 200, 200, BUTTONGO); // Set additional property - button1_->SetImageSrc(GO_1_IMAGE, nullptr); + buttonGo_->SetImageSrc(GO_1_IMAGE, nullptr); - TraingModel::GetInstance()->InitButton(button2_, 160, 370, 146, 35, BUTTONSET); - button2_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000);//设置为透明按键 - button2_->SetStyle(STYLE_BACKGROUND_OPA, 0x00); - button2_->SetStyleForState(STYLE_BACKGROUND_OPA, 0x80, UIButton::PRESSED); // 设置按下时的透明度为半透明 + TraingModel::GetInstance()->InitButtonExt(buttonSet_, 160, 370, 150, 50, BUTTONSET, STR_SET_GOALS, 30); + buttonSet_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000); // 设置为透明按键 + buttonSet_->SetStyle(STYLE_BACKGROUND_OPA, 0x00); + buttonSet_->SetStyleForState(STYLE_BACKGROUND_OPA, 0x80, UIButton::PRESSED); // 设置按下时的透明度为半透明 - button1_->SetOnClickListener(static_cast(TraingNomalPresenter::GetInstance())); - button2_->SetOnClickListener(static_cast(TraingNomalPresenter::GetInstance())); - container_->Add(button1_); - container_->Add(button2_); + buttonGo_->SetOnClickListener(static_cast(TraingNomalPresenter::GetInstance())); + buttonSet_->SetOnClickListener(static_cast(TraingNomalPresenter::GetInstance())); + container_->Add(buttonGo_); + container_->Add(buttonSet_); } /* DeInit：删除组件*/ void TraingNomalView::DeInit() { - if (label1_ != nullptr) + if (sporttitle_ != nullptr) { - delete label1_; - label1_ = nullptr; + delete sporttitle_; + sporttitle_ = nullptr; } - if (button1_ != nullptr) + if (buttonGo_ != nullptr) { - delete button1_; - button1_ = nullptr; + delete buttonGo_; + buttonGo_ = nullptr; } - if (button2_ != nullptr) + if (buttonSet_ != nullptr) { - delete button2_; - button2_ = nullptr; + delete buttonSet_; + buttonSet_ = nullptr; } if (container_ != nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp index c39389a68..544ca6141 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp @@ -14,7 +14,7 @@ namespace OHOS { - + static QuickTraining *data = new QuickTraining; bool TraingOnClickListener::OnClick(UIView &view, const ClickEvent &event) { UNUSED(event); @@ -28,14 +28,17 @@ namespace OHOS if (strcmp(view.GetViewId(), BUTTON1) == 0) { NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); + TraingModel::GetInstance()->SetSportEvent(data->training1_Text); } if (strcmp(view.GetViewId(), BUTTON2) == 0) { NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); + TraingModel::GetInstance()->SetSportEvent(data->training2_Text); } if (strcmp(view.GetViewId(), BUTTON3) == 0) { NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); + TraingModel::GetInstance()->SetSportEvent(data->training3_Text); } if (strcmp(view.GetViewId(), BUTTONMORE) == 0) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp index e9f0264a9..d25d5e15c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp @@ -17,16 +17,16 @@ namespace OHOS { - static Training_CardView *g_pTraining_CardView{nullptr}; - static QuickTraining *data = new QuickTraining; + static Training_CardView *g_pTraining_CardView{nullptr}; + QuickTraining *data = new QuickTraining; Training_CardView::Training_CardView() { -WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::Training_CardView"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::Training_CardView"); SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); g_pTraining_CardView = this; data = TraingModel::GetInstance()->GetQuickTraining(); - } + } Training_CardView::~Training_CardView() { @@ -41,9 +41,9 @@ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::Training_CardView"); { return g_pTraining_CardView; } -bool Training_CardView::InitLable() + bool Training_CardView::InitLable() { - // 初始化标签 + // 初始化标签 TraingModel::GetInstance()->InitLabelExt(titleLabel, 130, 52, 200, 60, "title_label", STR_RAPID_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, 30); Add(titleLabel); return true; @@ -132,16 +132,16 @@ bool Training_CardView::InitLable() return true; } - + bool Training_CardView::InitImage() { struct ImageInfo { UIImageView *image; - const int imagePath; + const int imagePath; uint16_t posX; uint16_t posY; - const char *viewId; + const char *viewId; }; ImageInfo images[] = { @@ -168,7 +168,7 @@ bool Training_CardView::InitLable() return true; } -/* -------------------------------------------------------------------------- */ + /* -------------------------------------------------------------------------- */ bool Training_CardView::InitView() { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::InitView()"); @@ -187,30 +187,30 @@ bool Training_CardView::InitLable() // SetCoverable(true); return true; } - + void Training_CardView::DeInit() - { - UIImageView *imageViews[] = {image1, image2, image3}; + { + UIImageView *imageViews[] = {image1, image2, image3}; UIButton *buttons[] = {ButtonMore, Button1, Button3, Button2}; for (auto &imageView : imageViews) { if (imageView != nullptr) - { - delete imageView; + { + delete imageView; imageView = nullptr; - } + } } for (auto &button : buttons) { if (button != nullptr) - { - delete button; + { + delete button; button = nullptr; -} + } } - + if (titleLabel != nullptr) { delete titleLabel; @@ -225,7 +225,7 @@ bool Training_CardView::InitLable() InitView(); viewiInitStatus = true; } - // if (!resLoadStatus) + // if (!resLoadStatus) // { // resLoadStatus = true; // } @@ -233,7 +233,7 @@ bool Training_CardView::InitLable() void Training_CardView::UnLoad(void) { -// if (resLoadStatus) + // if (resLoadStatus) // { // //ImageCacheManager::GetInstance().UnloadAllInMultiRes(TRAINING_IAMGES); // resLoadStatus = false; diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang index a61b10894eb65f4986d490168b816f0dc1df1d6a..bd25ae2c51881f5570896018f4e96f4ab993e66a 100644 GIT binary patch delta 1194 zcmX}pdq`7Z7{~EqC1u# zgQBD?2@8uPCS5=)rMnOmMs(4NO0vkJA`ub#n&2OwhllgN&yV-;oRRmFEzKr9sot_U zSR;g}#|bpz62iER$LPTa^y4drVKoU6k0hib1Gy+hDIBOoHTI$or*RIg=)hCFG>M@2 zL^FU<#7`1pE;6wUYp@X|aKgYoG~z05;UQjQ0KOeLlz29h*D_SgJU>l4hnIe z<}$9M9ry4Iz4(IP7>3m%#0<>F9Ash@)?q8kU?6}4s6zvqa0P9+gKqSo7yUuXAckOx z5Mnx#kb?PGid?KmF}9!-J5Y&TIEXql;v!nng>LlV4L)N4e=&;aNPY&vWXb|$ArBi+ zg6#;P2K#XYAvB-~Ex3seJisfw$9D|F5+%emBqIYk$VV~C;DRrT{nyYOMm-wPjB98| z7oOk+`tT70_<`BcefWl-7(r|_ zE5Sl6K|VIYj%w5*JBGVRiWMRqE3gfIyu%-uJ(`|mukcO^kZp~dDu8-IqnNX;BHT%RjQKTBO+@rXB zGAEoKchppnCKb0`Iz3gg!f$g*wOZ9}nopIQ+fdy;%?L=%Cl#+(_jq+pF;r=IIJ4=h z!X?A0N~fymhSWJq58ar2JTpyJIW>|PbE+<{!|(b(QbEGb@rg>m;u;I~I40f|%A0aG iW&9~)nRdlc#sVB3UFxbs)m67ml^(Y%5VlO6W%>vBSl>Ya delta 1022 zcmX}rTWAe%90&0KvEvvPLdh*#$b(Unh(sZ@d2pF1!f`v!ViRXEi&MxYNvC5WCPb$s zv>~}gx#iM`2+JN&$Sk}F;q&C-^XvQYuiw9Zzu)bm`od^#)zXKV=!o?85W+!@kmDRz zxWf~g`N$W(5s8G*jb03*m{F9nfEBD}18H_p$1!qTzP{l^Jk>LQxImHETa-XL(^DeEl@{`W(L+C*tiWtrqCR4@?<`5^r z8fw`_9rc{#5;wWe6JFE8XTI~7f|wDK9;g&EmZ_Apm?~1#u$f(CIKWZP(8yJqc+Oke z_({hO8ZelVjH8TsEFnp%gZXa~c97vPIU2ac4Ic1}m$dMnR=)CwXugG{FGCo`1g0^U zI2F{gmE9a7$GLp-zb@RSiPwCfl^^7Hv`h?RB$Jp;oN9LRiS?aa5vRC9GhZ3qIfUuV zX9+8*ViOtm^;7C;<2StvG-3*+*#~(wU6X5?1Ih3NRFkf=8zSeD5o28NIu(4tVJ_c3m1Gy zvmv9&sg{LWjwx1Bj{CGilX6=8T>Sq1pPToo_xYLKmz{K`tGll*X=-$P2%&-l9OE?C zxW^0Pd?zs>gbcD6M?QrtpoDd7rJ7nAiP1zG9dz=HE(C8y!62C2#q}SALNY2_cQa z)5>k`^PD%t`OY6Ql0q29XvQ;znG~^zrL16eRIFzQ)f}Ob7?)|Iod-PT74P^;NDd)| zK@4Xi(o7m1Cs;T7!=V;*u9X#bVJ@oRI^!~n`940V> z`7B`-8`XSl$1ZgH0z{3Sir5^~7n3eyHy!YbCWiy9vCg7@^$ z%TH3%LKwn`EHQ>sHn5MQoZ@_aXJl(~#o73c3#|*1$`aB)+-d4QbSZwZrTb=8Yjg6v Ze)Yf8h9!=i70XPIMBeSKtRI|F{tt8jnE?O* delta 984 zcmWmBTWAho00!W1+rRDK=9C;VYcg_*EixB2xiFS8IhEQ_*l>Xmk<-5{S=46caIvAB zGMW7~Tuc*JG>3BG(2%xP+oDBsPI+8BZ|`^Wef7P6vwvkr?$iw{sf)~t9SR{FqlN~q zbC0LIXMjIM6G9kC4tW%^fMu*@8~ZuIDK64PoOU{R!5cpCiSG#^7XB#FM32Axl_EDeGfmCx@aP8$z-%uC+U&o4r9 z2;Ud>)rJW95)5Ax8k{tEzjAIfr zm`gEBDPsd$IY<@9qxL_iG;oO~?$X9Xp7V-NeC99dX(5beA~T6IE8QcMQNcc{dBRJ& z>E|;)NX;-CW3xmKrEI2>lbq*D{gb5K8TW7W*0l89YVN&P)mjwUn9zDVxi}@Iucf)~ VdS(6ZjLgfU1|=or){hxl{txpPlc4|r -- 2.17.1