From e25b32efc59797bfd7d075cceb83d00d4e20cadb Mon Sep 17 00:00:00 2001 From: Caisking <3449750381@qq.com> Date: Mon, 4 Dec 2023 18:37:55 +0800 Subject: [PATCH] =?utf8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AE=E8=BF=90?= =?utf8?q?=E5=8A=A8=E6=97=B6=E9=95=BF=E7=9A=84=E6=BB=9A=E5=8A=A8=E9=80=89?= =?utf8?q?=E6=8B=A9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 84 +++++- Resource/res/Training/buttonok.bin | Bin 0 -> 31224 bytes .../wearable/nativeapp/CMakeLists.txt | 2 + .../nativelauncher/include/AppViewIDs.h | 1 + .../nativelauncher/include/NativeLauncher.h | 1 + .../nativelauncher/src/NativeLauncher.cpp | 8 + .../nativeui/main/src/MainViewSample.cpp | 4 +- .../traing/include/TraingSetCaluliView.h | 0 .../traing/include/TraingSetTimePresenter.h | 33 +++ .../traing/include/TraingSetTimeView.h | 62 ++++ .../traing/src/TraingSetPresenter.cpp | 4 +- .../traing/src/TraingSetTimePresenter.cpp | 85 ++++++ .../nativeui/traing/src/TraingSetTimeView.cpp | 279 ++++++++++++++++++ 13 files changed, 558 insertions(+), 5 deletions(-) create mode 100644 Resource/res/Training/buttonok.bin create mode 100644 code/sdk/application/wearable/nativeapp/nativeui/traing/include/TraingSetCaluliView.h create mode 100644 code/sdk/application/wearable/nativeapp/nativeui/traing/include/TraingSetTimePresenter.h create mode 100644 code/sdk/application/wearable/nativeapp/nativeui/traing/include/TraingSetTimeView.h create mode 100644 code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingSetTimePresenter.cpp create mode 100644 code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingSetTimeView.cpp diff --git a/.vscode/settings.json b/.vscode/settings.json index e1455a90c..246724561 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -12,7 +12,89 @@ "*.inc": "cpp", "thread": "cpp", "chrono": "cpp", - "iostream": "cpp" + "iostream": "cpp", + "algorithm": "cpp", + "__bit_reference": "cpp", + "__bits": "cpp", + "__config": "cpp", + "__debug": "cpp", + "__errc": "cpp", + "__functional_base": "cpp", + "__hash_table": "cpp", + "__locale": "cpp", + "__mutex_base": "cpp", + "__node_handle": "cpp", + "__nullptr": "cpp", + "__split_buffer": "cpp", + "__string": "cpp", + "__threading_support": "cpp", + "__tree": "cpp", + "__tuple": "cpp", + "array": "cpp", + "atomic": "cpp", + "bit": "cpp", + "bitset": "cpp", + "cctype": "cpp", + "cinttypes": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "codecvt": "cpp", + "condition_variable": "cpp", + "csignal": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "deque": "cpp", + "exception": "cpp", + "forward_list": "cpp", + "fstream": "cpp", + "functional": "cpp", + "future": "cpp", + "initializer_list": "cpp", + "iomanip": "cpp", + "ios": "cpp", + "iosfwd": "cpp", + "istream": "cpp", + "iterator": "cpp", + "limits": "cpp", + "list": "cpp", + "locale": "cpp", + "map": "cpp", + "memory": "cpp", + "mutex": "cpp", + "new": "cpp", + "numeric": "cpp", + "optional": "cpp", + "ostream": "cpp", + "queue": "cpp", + "random": "cpp", + "ratio": "cpp", + "set": "cpp", + "sstream": "cpp", + "stack": "cpp", + "stdexcept": "cpp", + "streambuf": "cpp", + "string": "cpp", + "string_view": "cpp", + "strstream": "cpp", + "system_error": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "typeinfo": "cpp", + "unordered_map": "cpp", + "unordered_set": "cpp", + "utility": "cpp", + "vector": "cpp", + "*.tcc": "cpp", + "memory_resource": "cpp", + "shared_mutex": "cpp", + "cfenv": "cpp" }, "C_Cpp.errorSquiggles": "disabled", "cmake.sourceDirectory": "/home/luozheng/FD230/code/sdk" diff --git a/Resource/res/Training/buttonok.bin b/Resource/res/Training/buttonok.bin new file mode 100644 index 0000000000000000000000000000000000000000..9961e7cb788687f0f01fe96227de8f7ee245e3f3 GIT binary patch literal 31224 zcmeHveRxyl-T(KbX-P|ILoEyu>1ha%hQgqrB8oi;@R&wm$sstZBB>Ung;*U!LrsmK!2r-k6+$>p)wb0-7Q|m)e>n0Rz~OKV|G3-38VA|%?z|CV z|Ihl=8B!>L(p`Ek@=t9FFoHU8{PT^sL@--fsPB2?mvI2bp<2eRfX*?>IbZd^ zfXYL)E~65lPzjpdegO7lB>->Hf7|mtvlIik^I;_Nl z)NeYiP3unO{m~lCN2`px9A1vtIt$>!7$>Fh{VP0k2+HRJhyLS~XXBrSWLTg81|S@M z$Ma64yoR-X_zw!B=JhxwWUF8S1*3Su4n;%^vGM)m9^bM4{bBd-tjbrR(`ATLjUJe< z$VYcVdcgSSc>@!8V7`C+#i}olys{ksY0B*nxin6?AhY3O9KEeRjiqMIFk%7~XDqVS zyx6MAyi=W8F}_;$`_B#?e)O;;2ae6p+5U@GO~LiY9-W>Fpvm)ZTrS`D#7}h(|$b8t^ix2D;|{$alo$y6+`ep{4X|te%SLT z)_?!r{xecAZeZq&kNltUOfJnSI_Zbw`lpP?IOcT)%;1{V{JD1O?mxf(QarHK9XT^F z!AaYv*EU?uV5ynY?!*M9Qa0b*+!4iIYrei^iG&p>*EioIVbdJMbq`9Ift;n;&F3Yo z^0qC~^ZX_FXS}RGr{(VwhH~VmT{4XR%txd7B_ZGG>!RgRc@fvhu#2rV*Ssb9GrDt7 zj{GF#2j%8kv#fl;+w*)V$jvTmZMLjF3MX5nZ;r|t51Y@nMC)TjtbZYzKf{-=8TnFd zzom%lqV+ZL{%YpW%6qS~Y*wb?_s5!huDztL#{QUImGjEn%CxdGSrk~_%OyN|6V@%cegjrhuKZdUtPMiFe*A(-_r z#m5s_wu$ZTR!#ezD^m|X^Vhj&dk>w{RI=19lc!+lS%xm>EGPyyYKcfZbyC~=UHhs%p$v?(7w!nLz%W#$@ zu&`Gs-}pbSKl|yy`!s&Z-sCy8XcEsSLV2-5wuW{G>i4b8J(z*+n65RGqV)k#S@eAQ zZ=XCJ6W=~=+iv6=p**IgXKebqwm+7`HcU6Lm)MLw^K%9Y@=k8hXC zTUmd{+gI=7+f%G>!Txt=@cb*4x6-0-pCHLkIjw8;E$5~B&OGoL+GBks{R&%F_Z~^# zSa|YXeM`q*Rdv8!G{(_y`L_SF$nYiK-=Q3@v%#W(4=DgVAD}U`eUPs&|ND23$5?(p zZoc`x`BDE-R0R-w#LaRi)-y8y`Q3<)MuE(+-{z+M|9I z^mP5FK~rlL%LCwX1lMhp^Z|16+3m9OyZHUI%pb?r>VJ>%nBX5cOMZ596enT(=E&L? z+sn%G@uS!tuIfe8YEDU*ufM(p<6W`;jKRW>W%Y%4cG29rXnhrK%zt~--dLK0@uJyk zJ>lwV=u+U?R-tp;whH-glB>$=^sovpg#6d4Nt~`sQ4E622>r$QFLpl=A>@J4@crM9 z;C_SOb`1P*{LRWb0<@w*@!8jFM)N@##$Wb^27Y8Rv`ydMz)};n*_iPB$KM;-A5Ivj z$AqeWTUI;9D8lv=Xn`COIq5TSI6g19mpkN;IS)~siQUGpR(!s^DhCLyn*HBI-LJwX)PuwXV3meB;FG3-EE7q zo6ogsw)X3myo&K#XYcwIDLs;X(#z(e9Nu2g*YM|0{CT>76-zNbsKfayVB@B|)%s%? ze~5CP4{FeUyk;CGtPhR+bB~mt5}3zQHMd)%a;PW@ejw9F{%yzkEZQ@f7X4Y=?+N9d z-NbY~l2Y5MvGy-7c{LRjl(HJ*Pe~4N;_@TE?Uv+lBk*#md?qi(Gj&Vk`Rn{8C2|bj z;FmJYIo*yUlD&CTUTseEl2*;IJCjn&$5$IPd0i(mW=e7s_7Ap?+}`J@TP?}W?wo~l zYh>*Yp)ba~{fB6MA=8p{c4ZVZ6&C$M)anmK$Ct^C{lD*?NWAyU ztSu+j#L>Gbm>i4uep>wWUDqQ#4;c+re;QFt{e?dR17jRxI&$E^ku~eqtU0vtPzp

}GNPm}T-zo63gkw;m#2O*O*&1L;F;@&iaQRT-#OsB!3Hi z@cciTpMK7Mh%Psz*g;{1Cgc@mc2ybJf+g1*U{w@}aTzeW3{Y_p!jQ2Fq_TTs3 zyC*5>6$Rah@gCn7Z>Ye|7cmy^{lxaS$Y&#=sv@Hyi5tep`?IKw^wF3;`|HN=SO45~ z6VCS$G$t@RaX#1Kd=#)A#~<=pt7cyRvXTS19#i86;t@e^EI+kKe-!ykl1Jhh19kJr zQJ5lw?Jw8DlD|I{n)7GWyiLf=Nx7M6DQkf%ZOla>a3j}sca-&y|@f^-) zA%AA6IbXjE`BcD3$d7vdd`ZCOLVo_5tyIRy(U|!1WV#&4$0BA_7F`YUi=e;Rd2$Dy z7s=#wdeSzG-^BWl`;6Ab+y!@QLHyuP6qA#~(e?@zS{LT<<%#-7zQ_45;Nu=#Kbn#MMSta( z|8|U57k*XjXifo6i>gM62 zFyTyfw|>B+vqqHm8-#`;rH``oMr&;chR4y&$!gMzm?f1({9He z83sOoIrjPMqV`HAarVS+TpvV#ph|YHkoT`Du`$>z&(ET=Ic8;@2D{+`wav+<{i4AB zJLEqcn{Bfpl*ChhjPHJ6@g2tJY1nOGpBnzFOuukTPa;xbN!ua0W~LENwU@ zd~e||oY0QrO~3%j$&T~5UW=IV*(%$Y%jDoL2`-jlF4$PIQHFKCI)_}Y<$SA=4{u5v zi3yTQS+{N2Ju-b)qknH$hMn3X#~~Sp?4aYA4Aa4&1Lvn$J^)|sp2d=XQ#rfCHgbVX z?()_;I*infX(KS4f%&XskG>y3}o+_l_RlRJ6l zWyRphE$q-=x+afoy{G855H1%}=vh<7GtA+PZ?ZC}-J$fa5)3Pbgp@09Z7ZcIO%gLB zY&aZd3Ty?23ubpROjqwA%dqm3mmMo) zxWd=CMUI_~!JxcQ+rtyl@UvTj%ssB_S)^FR5`-1`h{C)bx$a@;WzZ1vno-24CC14lw-Tte{hf@AZU*l?d zeUo*UR_vAhDSO_0dflYT0e-@knBVT{KH>@i?sIuo-u$m~6Ji#u?B zNclB3u6PmWpM-I`tXU=6^Z9qS&Xn6X7A;=0PL@B75f8>AlD+fu;A-3t3GG2Kprp^5 z7VL}T)XyY_2lb|gGM;=p%$__7?%V=3&_^pa#`S@5D{a4)+neD|4#nNc^@Q2O!|f{7 zdiP8C8Q9=$SFh*nYvFq8FK1*@p}FSjE00@mU&PGrPVF6}v~!Q`j(goO)JgZ|W)@WO zJ@7_qdUh7XV(S8^7hbO z3ht5P!r-NK>t*_leg~oNsaaC8k?3E>Bky0|r586IW5xFJR(yP#~-WTL}alb2#Kb1|jO*S6f=30HtT*97vx=*Ih&BpOV$YF4p#Am|;yiOGLh{5R0Q=ix625Pa}2ft#$<&}20xoLxG9Ft}QV zId9N$9>-I1IwrvP?^|sFemo9fMJAI!ZQQdmeHynr9eAJBr_3$Oh-cOg>U!j^N|_ug z>h}J_NZpW}h6x}k;0yS1{g?801wRPN{h|J5 zem^YvbU4;ydGA!Fmc8PBbWiZgIgQ_%=M2FGe4mAMpB=1g zF|J+jx_KqFBW~EVU*ul9o@=jQzTj5)lef>6mEX1F(p-#Jr225amxAYIxPtSq=wL;;(pYKP ze--z4lD_IWx8nmDuJ9}lV!SQLX@!s7b9SZJp8&7%@f6-SN9{45TP(?yJzcA^QhK8O z(Gb{N?34Gev!ZT~yu2=VW3WT!&!zJ7`)A3&%NJaM_sJ4g2HlR5sQ=9kfj}|xq0l}_ zE(YJXunQ<9zkf0P^;O4_-(5QQXq3;=;gh8I-iqbr(ww zQ6*ynZ`J9y@%~X}4_RBhm!kIgXl`?Hz(5U2O2!l^Kyhyv=aWi}35*M;;Q26~htKJM zsAM1BUpR&HH>o@>rGA?%|M|ULC+hM2g;*Zwy-<+SBhMd(c=yV2#gO10!T<9xMg>(W z4f3z#AHWgZi}6WP8YW!c6@FV_+k&hy(7S2Ydz5_;ceC<|YlgKixI(T@<}nM#SgNuw zW}R6AUmwU->HPVB7|{exv#bw5|E3%Jv$9IPBZk4RtovH*mvgTj3t@$)-}lcM*7loW zRPynJxbblfs}F4a)q=^3JHy99oNjn%iDKmS4tDEO==)h;d|cOrf+xt9CCtcaWt9CnRA4Z&^#>#~r-}YOpE^Q-q(M z;~tgdZZ`M^zGo-o|FHniw*>ogHnk_~+Vj|1HaJYZZx^9bd5frZShG z3CCylwJ%MmH7sL4eT}(%tTO|~9QFNtXX&F0D&y!3cmlXMCWQ+h3|pr>OJ7@}-ofC0 zGeL3rpyBYRjC%UDdKaXpL)9%GEGQZbH!G@oANer%@}SU0e2)`SAaiXCC&D+lDGjql z7hNzM<2U9ed%_NC8BxA*GyXteY6jU}%I+@-xq344fvkQILjDofBRr7I(mArC{Zrkt z?BdlTLZ9m;{llUugq&H2@8JZ0G~SNTHF{b9`073=*(k|zL9|SG*VwB0W8Xu${Q3wX z7ngzYUaBeu6Mn+)ay1lhCj7&(X#XbQ`yTcno+n7-p{Zo=`EZoaIK||wZ3kog^yA{E z@4G+0&3CPu_&XJ;rQ_q77r84h;rRuXn4rQG;WuXA*C_8(__+*TnMN zq3G%5-!BmIfTW{y%x6mLiVvh#8V)!NuUy=_*i1!9>GS;ioidD1iTcsy__u z2S+Fx@%|%$%pcBeApF7X9!Vd7xpA-p`9zj~d=qKk z<;M6=Cf|Am-@^{@J(q$Ha^UTugq%5t`*Y<$EDQ{1(K(TyW%kT4jJHHNexBs<)DiN~ zE$4;y8pMA;QO0PHA7u8q-f(8oz`lR@~ZyoZ7 z41YWp&)Xz@)x=PP)aiNE z+PrF6c{p7#SSQL8tLeNnZ6fZ^r269f3hyORu2O4Fn~~3Da#wj{5YNYC<)3gB`BJja z*15NAlVM-B-zWOhsyMBwnjTw5*snV;x7YgID}yq7mB-Du|3Ljlb5Di3?#|vIlurw3 zG*hO{+bous;w!7n+bWG8re+_$H+;ZKLA1YN#A847`4KDsk1HO;^;ta6V^ZSIQL^#c z=&LEh^C3Ls6Mx@?#q$$o7OTxOYv-_nef{e#PlaCE)N)zG_&&aO{ooXgry~CALlb+t zx*pl^jBx&flN%?CMpp&u{~2k=nvITAn*cH9Dx;@Ktr1=SK9iBj7jiP|S;MB$D^G|y|$NK-f^*=d(Af3PreSyHk zm*M%kjIR=zhY76E(gap*-9g|t>1hPERFnA)8qrF~L-v&fUg$Ct7*t&Z-lB98n0|6O zf#0IYcyfv%M93>ur34;gPa^Qhy(C{I16f|hD@sD&*yJK`!eFxe6_y4<4xF0AK*z@O zcN@>K_KLL^-vR?ibl?5&b&~Usv5`1^9Es_>NnBb%U?%-B0t4Md;zeY92{)1P5#EuI z`ja^lD|eF^$oPo!%p>LdfW!}(NNgnIIfhFi;Pi*|e e#?SwL{ff<>*!+pjpV<8Q-^RZ&{`hh6$NvM; NativeAbility::GetInstance().AddSliceProxy(VIEW_TRAININGSET, traingsetview); } +void NativeLauncher::InitTraingSetTimeSlice(void) +{ + SliceProxy *traingsettimeview = new AbilitySliceProxy; + NativeAbility::GetInstance().AddSliceProxy(VIEW_TRAININGSETTIME, traingsettimeview); +} //DisplayBrightness的实例化 void NativeLauncher::InitUIDisplayBrightnessSlice(void) diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp index 8a1ad7441..e7c06b8c1 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp @@ -257,7 +257,7 @@ UICardPage *MainViewSample::InitWatchFacePage(void) return dialUserView; #endif - #if 0 + #if 1 mainClockView = new MainClockView(); if (mainClockView == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainClockView new fail"); @@ -266,7 +266,7 @@ UICardPage *MainViewSample::InitWatchFacePage(void) return mainClockView; #endif - #if 1 + #if 0 dialmalioview = new DialMalioView(); return dialmalioview; #endif diff --git a/code/sdk/application/wearable/nativeapp/nativeui/traing/include/TraingSetCaluliView.h b/code/sdk/application/wearable/nativeapp/nativeui/traing/include/TraingSetCaluliView.h new file mode 100644 index 000000000..e69de29bb diff --git a/code/sdk/application/wearable/nativeapp/nativeui/traing/include/TraingSetTimePresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/traing/include/TraingSetTimePresenter.h new file mode 100644 index 000000000..cacd63a8c --- /dev/null +++ b/code/sdk/application/wearable/nativeapp/nativeui/traing/include/TraingSetTimePresenter.h @@ -0,0 +1,33 @@ +#ifndef _TraingSetTime_PRESENTER_H +#define _TraingSetTime_PRESENTER_H + +#include "Presenter.h" +#include "TraingSetTimeView.h" + +namespace OHOS +{ + class TraingSetTimeView; + + class TraingSetTimePresenter : public Presenter, + public UIView::OnClickListener, + public UIView::OnDragListener + { + public: + TraingSetTimePresenter(); + virtual ~TraingSetTimePresenter(); + + void OnStart() override; + void OnPause() override; + void OnResume() override; + void OnStop() override; + + static TraingSetTimePresenter *GetInstance(); + + private: + // 因为继承了OnClickListener,所以有OnClick属性,至于参数,原函数也这样直接继承; + bool OnClick(UIView &view, const ClickEvent &event) override; + bool OnDrag(UIView &view, const DragEvent &event) override; + }; +} // namespace OHOS + +#endif // SLEEPDETAIL_PRESENTER_H \ No newline at end of file diff --git a/code/sdk/application/wearable/nativeapp/nativeui/traing/include/TraingSetTimeView.h b/code/sdk/application/wearable/nativeapp/nativeui/traing/include/TraingSetTimeView.h new file mode 100644 index 000000000..2256e9896 --- /dev/null +++ b/code/sdk/application/wearable/nativeapp/nativeui/traing/include/TraingSetTimeView.h @@ -0,0 +1,62 @@ +#ifndef _TraingSetTime_VIEW_H +#define _TraingSetTime_VIEW_H + +#include "BaseView.h" +#include "View.h" +#include +#include "components/ui_view_group.h" +#include "components/ui_label.h" +#include "components/ui_image_view.h" +#include "components/ui_button.h" +#include "components/ui_image_animator.h" +#include "components/ui_label_button_ext.h" +#include "components/ui_chart.h" +#include "components/ui_list.h" +#include "components/icon_adapter.h" +#include "wearable_log.h" +#include "ohos_types.h" +#include "components/ui_card_page.h" +#include "components/ui_picker.h" + +#include "TraingSetTimePresenter.h" +namespace OHOS +{ +#define BUTTONOK "button1" + + + class TraingSetTimePresenter; + class TraingSetTimeView : public View + { + + public: + TraingSetTimeView(); + virtual ~TraingSetTimeView(); + static TraingSetTimeView *GetInstance(void); + + void OnStart() override; + void OnSetUpView() override; + void OnTearDownView() override; + void OnStop() override; + void InitView(); + void DeInit(); + void InitLabel(UILabel *&label, int left, int top, int width, int height, const char *viewId, const char *text, const char *fontName, int fontSize); + void InitButton(UIButton *&button, int left, int top, int width, int height, const char *viewId); + void InitImageView(UIImageView *&imageView, int left, int top, int width, int height, const char *viewId, const char *imagePath); + void InitUIPicker(UIPicker *&picker, int x, int y, int width, int height, const char *viewId); + void InitList(); + void PreLoad(void); + + private: + UIView::OnDragListener *draglistener{nullptr}; + TraingSetTimeView(TraingSetTimeView &&) = delete; + TraingSetTimeView &operator=(TraingSetTimeView &&) = delete; + + UIViewGroup *container_ = nullptr; + UILabel *label1_ = nullptr; + UIButton *button1_ = nullptr; + UIPicker *uiPicker1_ = nullptr; + + bool viewiInitStatus{false}; + }; +} // namespace OHOS +#endif // TraingSetTime_PRESENTER_H diff --git a/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingSetPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingSetPresenter.cpp index ec9a33acc..59eb9e1c3 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingSetPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingSetPresenter.cpp @@ -70,9 +70,9 @@ namespace OHOS bool TraingSetPresenter::OnClick(UIView &view, const ClickEvent &event) { // 根据控件id查找是哪个控件触发了点击回调 - if (strcmp(view.GetViewId(), " ") == 0) + if (strcmp(view.GetViewId(), BUTTONTIME) == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); + NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGSETTIME); } if (strcmp(view.GetViewId(), "Remind") == 0) { diff --git a/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingSetTimePresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingSetTimePresenter.cpp new file mode 100644 index 000000000..041d1d66c --- /dev/null +++ b/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingSetTimePresenter.cpp @@ -0,0 +1,85 @@ +#include "AppViewIDs.h" +#include "NativeAbility.h" + +#include +#include +#include +#include "traing/include/TraingSetTimePresenter.h" +// #include "TraingSetTimeView.h" + +namespace OHOS +{ + + // 当前Presenter属性实例化的内存指针 + static TraingSetTimePresenter *g_pTraingSetTimePresenter = nullptr; + + TraingSetTimePresenter::TraingSetTimePresenter() + { + + g_pTraingSetTimePresenter = this; + } + + TraingSetTimePresenter::~TraingSetTimePresenter() + { + + g_pTraingSetTimePresenter = nullptr; + } + + TraingSetTimePresenter *TraingSetTimePresenter::GetInstance() + { + + return g_pTraingSetTimePresenter; + } + + void TraingSetTimePresenter::OnStart() + { + + Presenter::OnStart(); + } + + void TraingSetTimePresenter::OnPause(void) + { + + Presenter::OnPause(); + } + + void TraingSetTimePresenter::OnResume(void) + { + + Presenter::OnResume(); + } + + void TraingSetTimePresenter::OnStop(void) + { + + Presenter::OnStop(); + } + + bool TraingSetTimePresenter::OnDrag(UIView &view, const DragEvent &event) + { + + if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && + (event.GetDeltaX() > 20) && (event.GetDeltaX() > (2 * MATH_ABS(event.GetDeltaY())))) + { + NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGSET); + } + UNUSED(view); + return true; + } + + bool TraingSetTimePresenter::OnClick(UIView &view, const ClickEvent &event) + { + // 根据控件id查找是哪个控件触发了点击回调 + if (strcmp(view.GetViewId(), " ") == 0) + { + NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); + } + if (strcmp(view.GetViewId(), "Remind") == 0) + { + // 模拟心率监测,等待20秒 + // std::this_thread::sleep_for(std::chrono::seconds(20)); + // NativeAbility::GetInstance().ChangeSlice(VIEW_TraingSetTimeREMIND); + } + return true; + } +} diff --git a/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingSetTimeView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingSetTimeView.cpp new file mode 100644 index 000000000..f67809fee --- /dev/null +++ b/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingSetTimeView.cpp @@ -0,0 +1,279 @@ + +#include "traing/include/TraingSetTimeView.h" + +#include "common/image_cache_manager.h" +#include "UiConfig.h" +#include "ui_resource_image.h" +#include +#include "components/ui_button.h" +#include "common/screen.h" +#include +#include +#include + +namespace OHOS +{ + + /***************************************************************************************/ + // 动态生成包含指定时间区间内所有分钟数的字符串数组 + std::vector GenerateTimeValues(int minTime, int maxTime, int interval) + { + std::vector values; + for (int i = minTime; i <= maxTime; i += interval) + { + values.push_back(std::to_string(i) + "分钟"); + } + return values; + } + /***************************************************************************************/ + static TraingSetTimeView *g_pTraingSetTimeView{nullptr}; + + TraingSetTimeView::TraingSetTimeView() + { + g_pTraingSetTimeView = this; + } + + TraingSetTimeView::~TraingSetTimeView() + { + DeInit(); + g_pTraingSetTimeView = nullptr; + } + + TraingSetTimeView *TraingSetTimeView::GetInstance() + { + + return g_pTraingSetTimeView; + } + /* + InitLabel:初始化标签 + @param label 标签指针 + @param left 标签左边位置 + @param top 标签顶部位置 + @param width 标签宽度 + @param height 标签高度 + @param viewId 标签的视图 ID + @param text 标签显示的文本 + @param fontName 字体名称 + @param fontSize 字体大小 + */ + void TraingSetTimeView::InitLabel(UILabel *&label, int left, int top, int width, int height, const char *viewId, const char *text, const char *fontName, int fontSize) + { + // 检查标签指针是否为空 + if (label == nullptr) + { + label = new UILabel(); + } + // 设置标签的位置和大小 + label->SetPosition(left, top); + label->Resize(width, height); + // 设置标签的视图 ID + label->SetViewId(viewId); + // 设置标签的样式 + label->SetStyle(STYLE_TEXT_FONT, fontSize); + label->SetFont(fontName, fontSize); + // 设置标签的文本和其他属性 + label->SetText(text); + label->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + label->SetRollSpeed(0); + // 设置标签可见 + label->SetVisible(true); + } + /* + InitButton:初始化按钮 + @param button 按钮指针 + @param left 按钮左边位置 + @param top 按钮顶部位置 + @param width 按钮宽度 + @param height 按钮高度 + @param viewId 按钮的视图 ID + */ + void TraingSetTimeView::InitButton(UIButton *&button, int left, int top, int width, int height, const char *viewId) + { + // 设置按钮的背景颜色 + uint32_t backgroundColor = 0xff191919; // 默认背景颜色 + uint32_t pressedBackgroundColor = 0xff249115; // 按下时的背景颜色 + uint32_t pressedBorderColor = 0xff0b1928; // 按下时的边框颜色 + // 创建新按钮(如果当前按钮为空) + if (button == nullptr) + { + button = new UIButton(); + } + button->SetPosition(left, top); + button->Resize(width, height); + button->SetViewId(viewId); + button->SetStyle(STYLE_BACKGROUND_COLOR, backgroundColor); + button->SetStyleForState(STYLE_BACKGROUND_COLOR, pressedBackgroundColor, UIButton::PRESSED); + button->SetStyleForState(STYLE_BORDER_COLOR, pressedBorderColor, UIButton::PRESSED); + // 设置按钮的点击事件监听器为 TraingSetTimePresenter 的实例 + button->SetOnClickListener(static_cast(TraingSetTimePresenter::GetInstance())); + // 设置按钮可见 + button->SetVisible(true); + } + /* + InitUIPicker: 初始化UIPicker组件 + @param picker: 指向UIPicker的指针 + @param x: UIPicker的左边位置 + @param y: UIPicker的顶部位置 + @param width: UIPicker的宽度 + @param height: UIPicker的高度 + @param viewId: UIPicker的视图 ID + @param values: 选项数组 + @param count: 选项数量 + @param backgroundFontSize: 普通文本大小 + @highlightFontSize: 高光文本大小 + */ + void TraingSetTimeView::InitUIPicker(UIPicker *&picker, int x, int y, int width, int height, const char *viewId) + { + // 文本大小 + constexpr uint8_t BACKGROUND_FONT = 40; + constexpr uint8_t HIGHTLIGHT_FONT = 60; + // 获取value数组 + int minTime = 10; + int maxTime = 600; + int interval = 10; + std::vector timeValues = GenerateTimeValues(minTime, maxTime, interval); + + const char **values = new const char *[timeValues.size()]; + for (size_t i = 0; i < timeValues.size(); i++) + { + values[i] = timeValues[i].c_str(); + } + // 创建 UIPicker + if (picker == nullptr) + { + picker = new UIPicker(); + } + + // 设置 UIPicker 的位置和大小 + picker->SetPosition(x, y); + picker->Resize(width, height); + // 设置 UIPicker 的 ViewId + picker->SetViewId(viewId); + // 设置 UIPicker 的属性 + picker->SetItemHeight(70); + picker->SetLoopState(true); + picker->SetTextColor(Color::GetColorFromRGBA(0x66, 0x66, 0x66, 0xff), Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff)); + picker->SetBackgroundFont(DEFAULT_VECTOR_FONT_FILENAME, BACKGROUND_FONT); // 设置普通文本大小 + picker->SetHighlightFont(DEFAULT_VECTOR_FONT_FILENAME, HIGHTLIGHT_FONT); // 设置高光文本大小 + picker->SetValues(values, timeValues.size()); + // 将 UIPicker 设置为显示 + picker->SetVisible(true); + } + + /* InitView:初始化界面*/ + void TraingSetTimeView ::InitView() + { + if (container_ == nullptr) + { + container_ = new UIViewGroup(); + container_->SetPosition(0, 0, 466, 466); + container_->SetStyle(STYLE_BACKGROUND_OPA, 0); + } + // 初始化Lable + InitLabel(label1_, 173, 52, 120, 35, "label1", "时长设定", DEFAULT_VECTOR_FONT_FILENAME, 30); + container_->Add(label1_); + + // 初始化UIPicker + InitUIPicker(uiPicker1_, 43, 106, 380, 240, "uiPicker1"); + container_->Add(uiPicker1_); + // 初始化Button + InitButton(button1_, 366, 0, 466, 100, BUTTONOK); + // Set additional property + char *button1defaultImgSrc = "/user/res/Training/buttonok.bin"; + char *button1triggeredImgSrc = nullptr; + button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc); + container_->Add(button1_); + } + /* DeInit:删除组件 */ + void TraingSetTimeView::DeInit() + { + // 删除Label + if (label1_ != nullptr) + { + container_->Remove(label1_); + delete label1_; + label1_ = nullptr; + } + // 删除Button + if (button1_ != nullptr) + { + container_->Remove(button1_); + delete button1_; + button1_ = nullptr; + } + + // 删除Image + + // 删除滚动选择器 + if (uiPicker1_ != nullptr) + { + container_->Remove(uiPicker1_); + delete uiPicker1_; + uiPicker1_ = nullptr; + } + + // 删除容器 + if (container_ != nullptr) + { + container_->RemoveAll(); // 移除容器中的所有组件 + delete container_; + container_ = nullptr; + } + } + + void TraingSetTimeView::PreLoad(void) + { + if (!viewiInitStatus) + { + InitView(); + viewiInitStatus = true; + } + } + void TraingSetTimeView::OnStart() + { + container_ = new UIViewGroup(); + if (container_ == nullptr) + { + return; + } + container_->SetPosition(0, 0); + container_->SetWidth(Screen::GetInstance().GetWidth()); + container_->SetHeight(Screen::GetInstance().GetHeight()); + + // 创建 draglistener 实例并设置为拖动监听器 + UIView::OnDragListener *draglistener = static_cast(TraingSetTimePresenter::GetInstance()); + if (draglistener == nullptr) + { + return; + } + container_->SetOnDragListener(draglistener); + + container_->SetTouchable(true); + container_->SetDraggable(true); + + PreLoad(); + RootView::GetInstance()->Add(container_); + } + + void TraingSetTimeView::OnSetUpView() + { + + View::OnSetUpView(); + Draw(); + } + + void TraingSetTimeView::OnTearDownView() + { + + View::OnTearDownView(); + return; + } + + void TraingSetTimeView::OnStop() + { + View::OnStop(); + RootView::GetInstance()->RemoveAll(); + return; + } +} -- 2.17.1