From 9117a7041e5aaa7f232e2d7a28546502446fae17 Mon Sep 17 00:00:00 2001 From: Caisking <3449750381@qq.com> Date: Mon, 22 Apr 2024 15:26:33 +0800 Subject: [PATCH] =?utf8?q?=E8=AE=AD=E7=BB=83=E7=BB=93=E6=9D=9F=E5=90=8C?= =?utf8?q?=E6=AD=A5=E8=AE=AD=E7=BB=83=E7=B1=BB=E5=9E=8BIcon?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/traing/Training_UiConfig.h | 14 +++++++++++++- .../traing/include/TraingEnddataView.h | 2 +- .../nativeui/traing/include/TraingModel.h | 4 ++-- .../traing/src/TraingEnddataPresenter.cpp | 4 ++-- .../nativeui/traing/src/TraingEnddataView.cpp | 15 +++++++++------ .../nativeui/traing/src/TraingModel.cpp | 17 ++++++++++++++--- .../training_card/src/TraingCardPresenter.cpp | 4 +++- .../user/res/Training/icon_54x79/Ball_54.bin | Bin 0 -> 2904 bytes .../user/res/Training/icon_54x79/Dance_54.bin | Bin 0 -> 2904 bytes .../res/Training/icon_54x79/Fitness_54.bin | Bin 0 -> 2904 bytes .../fs/user/res/Training/icon_54x79/Ice_54.bin | Bin 0 -> 2904 bytes .../user/res/Training/icon_54x79/Other_54.bin | Bin 0 -> 2904 bytes .../user/res/Training/icon_54x79/Rest_54.bin | Bin 0 -> 2904 bytes .../res/Training/icon_54x79/Swimming_54.bin | Bin 0 -> 2904 bytes .../res/Training/icon_54x79/Walking_54.bin | Bin 0 -> 2904 bytes .../user/res/Training/modules/Walking_54.bin | Bin 2904 -> 0 bytes 16 files changed, 44 insertions(+), 16 deletions(-) create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Ball_54.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Dance_54.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Fitness_54.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Ice_54.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Other_54.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Rest_54.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Swimming_54.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Walking_54.bin delete mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Walking_54.bin diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h b/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h index d0bbb4259..04d125e90 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h @@ -17,6 +17,7 @@ namespace OHOS #define ICON36 "/user/res/Training/icon_36x36" #define ICON60 "/user/res/Training/icon_60x60" #define ICON80 "/user/res/Training/icon_80x80" +#define ICON54 "user/res/Training/icon_54x79" #define MODULES "/user/res/Training/modules" #define TRAINING_GIF "/user/res/Training/training_GIF" @@ -47,6 +48,17 @@ namespace OHOS static constexpr const char *PINGPONG_80_IMAGE = ICON80 "/Pingpong_80.bin"; static constexpr const char *RIDING_80_IMAGE = ICON80 "/Riding_80.bin"; + // Icon in the icon_54x79 folder + static constexpr const char *BALL_54_IMAGE = ICON54 "/Ball_54.bin"; + static constexpr const char *DANCE_54_IMAGE = ICON54 "/Dance_54.bin"; + static constexpr const char *FITNESS_54_IMAGE = ICON54 "/Fitness_54.bin"; + static constexpr const char *ICE_54_IMAGE = ICON54 "/Ice_54.bin"; + static constexpr const char *LIMIT_54_IMAGE = ICON54 "/Limit_54.bin"; + static constexpr const char *OTHER_54_IMAGE = ICON54 "/Other_54.bin"; + static constexpr const char *REST_54_IMAGE = ICON54 "/Rest_54.bin"; + static constexpr const char *SWIMMING_54_IMAGE = ICON54 "/Swimming_54.bin"; + static constexpr const char *WALKING_54_IMAGE = ICON54 "/Walking_54.bin"; + // Modules icons static constexpr const char *ARROWS_IMAGE = MODULES "/Arrows.bin"; static constexpr const char *BACK_IMAGE = MODULES "/Back.bin"; @@ -95,7 +107,7 @@ namespace OHOS static constexpr const char *STEP_30_IMAGE = MODULES "/Step_30.bin"; static constexpr const char *SPORT_HEARTRATE_IMAGE = MODULES "/sport_heartrate.bin"; static constexpr const char *TIME_IMAGE = MODULES "/Time.bin"; - static constexpr const char *WALKING_54_IMAGE = MODULES "/Walking_54.bin"; + //static constexpr const char *WALKING_54_IMAGE = MODULES "/Walking_54.bin"; static constexpr const char *WARNING_IMAGE = MODULES "/Warning.bin"; static constexpr const char *YES_IMAGE = MODULES "/Yes.bin"; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h index 76b850365..0e30b4b0e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h @@ -79,7 +79,7 @@ namespace OHOS UILabelButtonExt *buttonexit = nullptr; - UIImageView *imageLine1 = nullptr; + UIImageView *imageIcon = nullptr; UIImageView *imageLine2 = nullptr; UIImageView *imageLine3 = nullptr; UIImageView *imageLine4 = nullptr; 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 8d1f6aa92..c413c0cca 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h @@ -230,8 +230,8 @@ namespace OHOS std::string DisplayMotionDuration(); /*设置运动类型*/ void SetSportType(Exercisetype type); - /*获取运动类型*/ - Exercisetype GetSportType(); + /*获取运动类型图片*/ + std::string GetSportType(); /*设置运动项目*/ void SetSportEvent(UIResourceTextId id); /*获取运动项目*/ diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp index 5e076de54..0d92edb5d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp @@ -67,7 +67,7 @@ namespace OHOS { if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { - NativeAbility::GetInstance().EnterSlice(VIEW_TRAINING); + NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE); } UNUSED(view); return true; @@ -78,7 +78,7 @@ namespace OHOS // 根据控件id查找是哪个控件触发了点击回调 if (strcmp(view.GetViewId(), BUTTONBACK) == 0) { - NativeAbility::GetInstance().EnterSlice(VIEW_APPLIST); + NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE); } return true; } 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 50dfab9af..c26c62d01 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp @@ -59,7 +59,7 @@ namespace OHOS scrollView_->SetVisible(true); // 初始化image - TraingModel::GetInstance()->InitImageView(imageLine1, 80, 132, 54, 80, "image5", WALKING_54_IMAGE); + TraingModel::GetInstance()->InitImageView(imageIcon, 80, 132, 54, 80, "image5", WALKING_54_IMAGE); TraingModel::GetInstance()->InitImageView(imageLine2, 97, 214, 80, 20, "image6", LINE_IMAGE); TraingModel::GetInstance()->InitImageView(imageLine3, 97, 344, 80, 20, "image8", LINE_IMAGE); TraingModel::GetInstance()->InitImageView(imageLine4, 97, 474, 80, 20, "image9", LINE_IMAGE); @@ -70,7 +70,7 @@ namespace OHOS scrollView_->Add(imageLine4); scrollView_->Add(imageLine5); scrollView_->Add(imageLine6); - scrollView_->Add(imageLine1); + scrollView_->Add(imageIcon); // 初始化Lable // 初始化标签 @@ -208,10 +208,10 @@ namespace OHOS buttonexit = nullptr; } /*图片*/ - if (imageLine1 != nullptr) + if (imageIcon != nullptr) { - delete imageLine1; - imageLine1 = nullptr; + delete imageIcon; + imageIcon = nullptr; } if (imageLine2 != nullptr) { @@ -259,7 +259,10 @@ namespace OHOS void TraingEnddataView::InitData() { SportData *enddata = TraingModel::GetInstance()->GetSportdata(); - + // 训练图标Icon + std::string imageStr = TraingModel::GetInstance()->GetSportType(); + imageIcon->SetSrc(imageStr.c_str()); + // 运动项目 labelsport->SetTextId(enddata->sportId); 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 280096327..5471fe934 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -432,10 +432,21 @@ namespace OHOS { sportType_ = type; } - /*获取运动类型*/ - Exercisetype TraingModel::GetSportType() + /*结束数据icon*/ + std::string sportImages[8] = { + FITNESS_54_IMAGE, + DANCE_54_IMAGE, + REST_54_IMAGE, + BALL_54_IMAGE, + SWIMMING_54_IMAGE, + ICE_54_IMAGE, + LIMIT_54_IMAGE, + OTHER_54_IMAGE, + }; + /*获取运动类型图片*/ + std::string TraingModel::GetSportType() { - return sportType_; + return sportImages[static_cast(sportType_)]; } /*设置运动Id*/ void TraingModel::SetSportEvent(UIResourceTextId id) diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp index fd78117d9..1c37781cd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp @@ -9,6 +9,7 @@ #include #include #include "traing/training_card/include/TraingCardPresenter.h" +#include "traing/training_card/include/TrainingControlView.h" #include "traing/include/TraingModel.h" #include "custom_utils.h" #include "vibrator_service.h" @@ -286,7 +287,8 @@ namespace OHOS } uapi_set_screen_on_api(); // 亮屏检测 NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCRAD); // 切换Slice - + // 增加打印 + PRINT("cmd->sportType[%d],cmd->controlmd[%d],cmd->sportTagType[%d],cmd->sportType[%d]\r\n", cmd->sportType, cmd->controlmd, cmd->sportTagType, cmd->sportType); switch (cmd->sportType) { // 室外走路 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Ball_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Ball_54.bin new file mode 100644 index 0000000000000000000000000000000000000000..b93746ad7805fb405a64905e98def348a930d534 GIT binary patch literal 2904 zcmeHIZA?>F7=CYC>1_dRu_AuVe$Yx#$E=NYZjQFMok1o_L3CRpcFvd)e$1(uxlFkI zg7TphK_&xfyMZDz(J?h@mQjQlXU4RCBr1`rgX!FuiXwhM&(6KoM1NKPEc>zZ@7$An z-sgRu=Y0+s0JN|a5SP?0FstC%8W}~;Er9>`&(VSY`+RKMD!j)_86{{Wh0H6bDwa5X zUl%&7YO%ihE3Kd~?nmUJ=H_*`E?NMxsOC53EBSg;3t9Dh>XDfplqxs~e$tx= z$uJxAV&^U|?X22~|8I-mbmDO&N{lD_@hjj--72gOx%n*q6L(G>OSF2tHtUuqfa&&;+TI?8@lZ*e09v*nSb!km zNrxkh=Wk?qbnA9|tJ+@B-;gkd15IRg3deOMKpo;wBNScHZsKDOL_szwtj-uKqCo%a zr=t|#9f=>T*LaooE~}S5H84KW>T94&iW&goF1b6dcTiM7x0s+!m@kNdQlM;R)h=AW zf&{qk8`5P_{Y&R>1jsMkTp*ueI)6^@DXx2v7`lsXJL*AGG#F1=65@xXaDU=V3-?v= zm~G92H)7u-h{J7T+!#a9i0=1ni;R5pkZad~*?t|XhOKaz(CVCP00 zpeF2z6UzDocNjMTC+2o%38dBM-q zsGc}`bAM%0-BcydA1^nhI~0!YfNqjvE>nKE>caNa=(2oHf}FUD5aH!@9gM_}p+Z<~ z+at}yd|D(qIV%hfpO-GLZs6pCU*`4RQW$an91cP%)E;*g<$9+K*C!f99pH2{5 zt9CL^{_`qlM&NjGss`X#V_v~)4Jol@(V!dX}0xb!moHzjJpz?ap z%KRszF3rUq5+FBvTy-H7E5>KQ0h^K4?<15vNjcP1Q?p(DhuwVCd}j54MeH|qs+Z+D zeT{`B1x$W@&(nYKaFw9U*j#^_%kV=h_34rDXk5Y#wms-Ej>G%&&=1ydzOACu6s5{z z>CBbD^|;~gGR);sgM1>+Tt9N ze{9n~$u{6T{*X9{@==hPCyL5=JEOA}P!VcJ(jfuPM?Rh>lusg^5TSb3Ujl%e_rU)M z;4tfdk-o`9S}=d}_l5bXdue{~d!d=TFr0^(jsxpi{-f3k0bU3A7Wd2YVOaUKx=b`s1d`>Ad=d_*xYy(rq5;H*tQ!*P?1Mn- z%`SGIdG#EU$Y9;3U@6`c7Cf>oIKlOI3|7WJ3_r~MQeGrH|DQ9ie6}Lz^}o&6Kc>Lj A)c^nh literal 0 HcmV?d00001 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Dance_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Dance_54.bin new file mode 100644 index 0000000000000000000000000000000000000000..85cb1e01da2efdf3aa422f1a39869371b40813e2 GIT binary patch literal 2904 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 literal 0 HcmV?d00001 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Walking_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Walking_54.bin new file mode 100644 index 0000000000000000000000000000000000000000..7e498ca0dc88caae3583443b5091e7e5787ff4d6 GIT binary patch literal 2904 zcmeH|Z)_7~9LImp-ToY123-dP2)5VK;f8F14aTCl-L>P739@#RKQ9m_Bn!r9Fc9Sh z?yl=@Tb03BH|YMg-7-NMjAA5$QC8dw4A}x3OpJzX2q+RJj17c_-s5w3)DU@5jW6^C z_oB(K_dL&i?)&@xz6U%&K9m5anf#^B42WG1qxi84;A#Ds9QgmQN1D4$mTM+O*5u$mDw(yiE8ES?{Z^ZE02g z;SdD#P5S)Q{3sH!2^_)Ox8wOEC)<#ok^ewj50iBkSEs+q<83GBHMoY>t#OJ0e@*Os z*p@WMrPe+<6+VJGs9X5@x-z-Rp5~04p(b#Ta7haIt3GIMhXirV@N*w)8m05r6kb!$ zFTa=C5Rb>;>Wt|FaM^x8P3rWE(q2E|>8CHv+?wlZ^HOx)D^IkdO?AvlJn6@E`hl@x* zmKY}id`gc{TvCkh3gMGgKuxd1a#mKMqF3X2PSFod@VAm1Xc2)~dc?!P5!<{V6?-3T z>YtqV+$@8)W6@$W1Lr2Q$$jd)U@|)PxiBA%08s9i`-@B!=^|k4##m=i^?DPZT2L4` zdu9BA%1hA+&x;Lm4)ws?osku-7zZr&yUEiT7C;6#4zOt9r1zaCoQ}=cg3d^BR1i)| zEnT8VBJ;>yJX-(mu+tW(X_J3MVDPM5YBBFAJoe(D;~T#Ea@I}LNR8h7c|4vpx6-e+ zKl6vohrhCRpVEJzz8~LJ#uFZqN`j^2{lnNWU?Vm0ch_`Jfz{Gfr{xjUrGj4B0)r$U z#9B`f;GL0YmG;nn#((9OWrGM>zzi@J_`@s!_+!g9Ym;1g?AKU?2Qa`In~(%!-SHNX;F zYSR51@pzQ{5wKU$N6jDYednWd0P0_AzeL)BG4b#3c#|_Te@E3J{6gl=2tsUlk9z+o zjdAS*ylET8#J|33X|E4_aO6fv2d|FOWsyd^%A;p&`glD3B%kkQYk6MoW*Jov7lnmr z&sb5|MEt#GZIreemi?62of0+xFAX>gXI4xF4nB#5rhwT!bmqO&`ye4)2O|u8qw*mO zKosB(fP>^S$)890-(A7PSKgRKb{L7f*wos+lYVKS2fpEa?s^{`R# zcS=+5g57zY0T{k8lYC98b6zq+rTToJ1RY>E;9DBs@`W5Uc%Yr(b`yQP-!)EF^;w^i z*b$G1mz>l|bddBa6bc1rh3s|uYz7Xt=~!0jV8KR7`JM!neoAMD5kmF)QJf5=SJO=p z1jo=EkA75usjE#p5hTHE$n`whk5~u~k0tWN5B0cH^8*%U$K!c=UrT1~_sM+zul4x@ DOi1&{ literal 0 HcmV?d00001 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Walking_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Walking_54.bin deleted file mode 100644 index 0c977057b58150e4c31757c2d3db7677f4862dcd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2904 zcmcImdrVVT82@e`*A{t{sRKqvE9hpov0-DdOLW{@q8S@iPFp8S#)Qlbi~BfhrwGDFnfWPz%*$`A({4G+T3x+Fqo%$`T zE*^6nX4%cioY{e-Op&&JlF;^e;7Q}f`ahp;*>fa#F|1ZEK6#?U`4sQJc5QceVIj-* zkG@pk3lO041spA(w*T*ZP+ytxYosU!V1V$bqVae>$iA}rrWBC2euAhO*HrU-AGaQ{ z{zs1L@BIw`KY@lw1+n7Cza$9&?lsFU+n`7UU{GhbUkHkU;t04!+hgI)c3)>7ZF6OG zxxmH-6P5zxzg~Q}X_=J(P@FvBOp)P!sV>ipAG zB>o;8zxfgIg?xmzp@3*_T#2u{1gDe*F(55zf}mMyWqFn{$gpWnE#0Ljy^KaL+# z(iBAy=(ZT!oSuzuJy%4NLVTeuYAZ?O&QAFPT@IM1LVc;GGH%{O_tUo+!_j`?&x2YM zv0jYeNo1;P!+BK(d&>aVFO3*uq-nH#U{jW{){CC!Ah|EoF2?g)ic2^#F}G_(EQ~L- z_50(nKddPmR6a;yJZ}^z zWn#{wt}hGYt$2H*RRXwz@xu5KeGZqg3)Mb6@6JQCW8<>`>4fL3-tGnv@&1@oWId_9 z!A=e?C@0_zj7DKThJxAza9;@ScBfHslvp_bQ^+he`EKnmUq`5hwcU!C=bbG-x-Fx_ z)!FHS{tl4zEL9-1YN&!bOZHY!lvYC#sG#;?f4oA&W!1y`)WUN2=~4FHl+K(P$?qiw zlDr^$Vtz{tz&Lp*e+`%Hs`WLm(sD1>gS@HMk3@{)n|r_Gd5*+eWX01Q55)9+c8u%K zs>&S}3mScI$gjtG=I>3WK%$s^KJp{=XR`I%+*SpkCDr%m=Z28)kaFw;izSaX?;owm z2G4Uflk8EMZU#OwzlQbW>iYGBO0xxpC&X2)RYu@u ziO=x>(cgN;vF{YS`gF}0dqfO?+E(`Xd(VTZJfrV^kt0lZTpKn>*I z^Ir}*9vFuMf6nxPW(}@p!zfKAq7Q=$V6`C&!@?7$F|kJLftQ>s_cz!GOqv z>?x-Ar{8lw*M%*Xd4G}^KcXix8-Pmqe=Iu-zmI%@i#YzG>=P#Eb^5Nj!?hFN&)c#`p?$Zn5EPCB2-e`@2UCf