From 0085745586f089db84febcf12b6bfca04464c144 Mon Sep 17 00:00:00 2001 From: Caisking <3449750381@qq.com> Date: Tue, 16 Apr 2024 10:30:51 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E4=BA=A4?= =?utf8?q?=E4=BA=92=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../traing/src/TraingEnddataPresenter.cpp | 17 +++++++++++------ .../traing/src/TraingSetPresenter.cpp | 11 ++++++++--- .../fd230/fs/user/res/message/message.bin | Bin 6824 -> 6824 bytes 3 files changed, 19 insertions(+), 9 deletions(-) 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 983459fbc..8a3a93ac8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp @@ -1,6 +1,12 @@ +/*** + * @Date: 2024-04-15 14:19:47 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-04-16 10:29:09 + * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp + */ #include "AppViewIDs.h" #include "components/ui_label_ext.h" -#include"language/font/ui_resource_string.h" +#include "language/font/ui_resource_string.h" #include "NativeAbility.h" #include @@ -59,11 +65,10 @@ namespace OHOS bool TraingEnddataPresenter::OnDrag(UIView &view, const DragEvent &event) { - - // if (event.GetDragDirection() == DragEvent::DIRECTION_TOP_TO_BOTTOM) - // { - // NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGDATA); - // } + if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) + { + NativeAbility::GetInstance().ChangeSlice(VIEW_TRAINING); + } UNUSED(view); return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp index 4adb8a570..a4214dccf 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-04-15 10:55:58 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-04-16 10:29:50 + * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp + */ #include "AppViewIDs.h" #include "components/ui_label_ext.h" #include "language/font/ui_resource_string.h" @@ -61,12 +67,11 @@ namespace OHOS { return true; } - + bool TraingSetPresenter::OnDragEnd(UIView &view, const DragEvent &event) { - if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && - (event.GetDeltaX() > 40) && (event.GetDeltaX() > (2 * MATH_ABS(event.GetDeltaY())))) + if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { // uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/message/message.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/message/message.bin index 7bc9bc605f3b55b972cea5b7ea713bdff0d2d445..c3799e3f991ad31df7b9b9c9c83c4f9722508220 100644 GIT binary patch literal 6824 zcmeHLZ)h837=P|^ZQic2z0}!dtmFP9W0$gN%A5wLN$!?U!@+X+eHHs*1wl6kvN6o1 z71l6isZQ|QELK>)tswsS;?hiE!Of-k#ScQ0eKCU4)()vI>FaYT3BAjQ5YyFe>l*_1 z-1|Q7`}}^-pL^~=1sK5}b&!!%Y#-D{xkA?sfNgml9dw(I?RePSc+eB8G*L}X{_5Rd zm;cs`nv6HmlxA{Wzsywix0?S{#5Y?jKC6glMlIc-ba@^ehi?6Wvj0Ve=RObv!Rn${ ztoBpds%)M|6HM(yPVd^QkbWW^#57%mJGeD-unb7=Ay0qc^Xs6#B zPXLkKZPga-SDbd{pntMQJ zg@p%kE8mTLoSa$y9Up@;$R|WH&pE8?A3gkb`?Z{=@M1y?K$tF5I&YnC^t$ z$^!j~e%8!B`@GrDQ1kI!hH$2L(dO^=`S5nVf&IoM5q1J&fN0Av0I&aPg%29yFz1_^ z{`g8tp1Jh`0iNB@F@P-!vDynDCwEAqXzU@tLLPeaUVOfXL5lY9@<_lfJMHUZ>-rNe z!yDH5M*lr*K6L+ag&0Ko1TwAyM3`*q`XK2e5}D&J+{b{_(oW>-dl7s95nwnyEf(op z)EQ-s0bnAW>UK+{pC9|GW9n4ob4peJ*|mN`VEfUFT5N8#L@V?%jpt8)y%LBV^&e3# zjuVga!}HT$UYY!`8Gifx!{)<&-d30O>`uVDj1X}A z(opXocRs4`!?SDcCwAx%8}1X5bI%Qfrbge`nS+3p6&JMwffljc-iK+PA*y}~W25sUp7sDBsD049*#<Ih{aLqcDh zOTT^Zeed)AywCf-?;Xeh2k3)*&VlB-3Sez|1{2M)5i@p%50in69!v%@`(df`foy|X zOIvic0R&q7s$uKi?5T1&^XacZza}X={}$bzinE>0OHlNc25WAj$mWo3CmYRw)S6aT z9YhRrlW5i9aQ1)3f34}ivH4G5DgBNE!&b1#|Lm#Pc0Iv?*Wcf+d?PA$fLp>Y^0L(N zruw7!B?~QG&G-v_`b^EbcDKj1z0>ZmF7abo-d{zv1@!hW-XtYDM;hWiLQ%Z-RIO+dE#mm+w-TMW)PV2WtyWQ01$8Bn> z-1D9u7l8+x?gX!$WB$_RgY?jBjioE;K`#7M{pFS+DkWqi9%ug2#kbt!H-2yiZi>-- zkTkU=N7WdfbomJO|Ehj3LJk~@=1Pv7|GgeqeDkeO$ny|*ALimXiQVX%z&ZP0T6jN& zVmy2p!2B(+TaA}9UNYekGjuh`B27-;m8Zg@$>0X?)pT9#;FA3FpcQ%ISMK?mrI9;ap8D8 zF#5J){2|u5D_vO^oo%gKTPhWbU&(gZmT)s(>1eLR32E)?m$!*c&mx*_J9M>oLr zNepR?Q1Au^aXu=PThVM}lNpC#uw*QwyB5J89ZL%84($W~<~ zb$q}(2=FuFF%cr4KDjr^b&QJLA0M;bF^n=ZxZ@p6c*J&qU!dg8lfIwpX z3~#EvSUzO!Bq$@Z`k?ba5NlFyi`8XAkM<3i_XstVgL;rN;ZETIZU}WrN&##`6i~R~ z8$fyAM?l$|8#X={;ngybV<)Me5OLU42;#dGKR1aOxr6W&LUc0V>4j+3xah8`;5L&+ z82)tmnAHaqoBE&)z~-CQz3TVH^1=M2i)XpVU*BTwmoCa5u_-%8;l zxMe%QIfM6umnh)94F783BS`rh9qRdT=`$U|jmz;l^#^5;)y7AtVJ#Gtaxl$*DUAEZ z7yZ6#rRR@8O;hz9dVT><`Pt64HhO+(p?X8L!7Fc-QQ}V4Q}gYQRJ{~kHW2B+P4~QI z^Oq}s$TqJD*J=daU$qw`+hdXE?T~v|zc$VAr5k_h_@H(MB4aW02}X