From 02acc5403d8878f3f4245cf5b10bf4fef73247be Mon Sep 17 00:00:00 2001 From: fengjignqi <15192412330@163.com> Date: Thu, 11 Jun 2026 09:23:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=93=9D=E7=89=99=E8=BF=9E=E6=8E=A5=E4=B8=8D?= =?UTF-8?q?=E7=A8=B3=E5=AE=9A=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../water/device/AddDeviceActivity_copy.java | 8 +++- .../water/device/DeviceConnectActivity.java | 35 +++++++++++++----- app/src/main/res/layout/dialog_loading_my.xml | 6 +-- .../res/mipmap-xxhdpi/icon_water_loading.png | Bin 0 -> 3112 bytes .../res/mipmap-xxxhdpi/icon_water_loading.png | Bin 0 -> 5219 bytes app/src/main/res/values-en/strings.xml | 21 +++++++---- 6 files changed, 49 insertions(+), 21 deletions(-) create mode 100644 app/src/main/res/mipmap-xxhdpi/icon_water_loading.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/icon_water_loading.png diff --git a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java index 074f181..8785fe7 100644 --- a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java +++ b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java @@ -18,6 +18,7 @@ import android.os.Handler; import android.os.ParcelUuid; import android.text.TextUtils; import android.util.Log; +import android.util.SparseArray; import android.view.View; import android.widget.ImageView; import android.widget.Toast; @@ -164,6 +165,7 @@ public class AddDeviceActivity_copy extends BaseActivity filters = new ArrayList<>(); filters.add(new ScanFilter.Builder().setServiceUuid(parcelUuid).build()); +// filters.add(new ScanFilter.Builder().setDeviceName("PROV_Water_01").build()); Log.e("TEST", "开始扫描"); mScanCallback = new ScanCallback() { @Override @@ -179,6 +181,10 @@ public class AddDeviceActivity_copy extends BaseActivity manufacturerData = record.getManufacturerSpecificData(); + //设备名字 String deviceName = result.getScanRecord() != null ? result.getScanRecord().getDeviceName() : "无名称"; @@ -194,8 +200,8 @@ public class AddDeviceActivity_copy extends BaseActivity { - if (animationDrawable != null && animationDrawable.isRunning()) { - animationDrawable.stop(); - } - viewBinding.linearConnectIng.setVisibility(GONE); - viewBinding.linearSuccess.setVisibility(VISIBLE); - }, ANIMATION_DURATION); } + viewBinding.linearConnectIng.setVisibility(VISIBLE); + viewBinding.linearSuccess.setVisibility(GONE); } + private void stopConnectAnimation() { + handler.removeCallbacksAndMessages(null); + if (animationDrawable != null) { + animationDrawable.stop(); + animationDrawable = null; + } + viewBinding.linearConnectIng.setVisibility(GONE); + viewBinding.linearSuccess.setVisibility(VISIBLE); + } + + + private void initEspProvision() { espProvisionManager = EspProvisionManager.init(mContext).setCallback(new ProvisionCallback() { @Override @@ -106,7 +120,10 @@ public class DeviceConnectActivity extends BaseActivity Px#1am@3R0s$N2z&@+hyVZ!(n&-?RCt{2U2Uu#MHznHJ$v@tdrwQ#+fqtF#fq9% zDPO?|MGc7jB&V;7ZxuCzF|} zfDn0ko)R%0C!!ZecUFFwr~pFzmjLYXA=y)iBFCNr@M9u+awI3{fr$vf%-aBbikWXt zBQ%HXVTrf*Jqh5xNqEFq1rXvt3E;g$5<9AW`vClih|X1X%DEVu0L=UerPPOlAZUA7 zdLD6Q$oBos0)U5!=!eyveL6-ifLQ%k*neQo3w->@H3uESw0k~BNhgdz!$sjMTi!lk2 zV7xL? zI&Si@;)?raTx!2bY8v_4gRS^(X1;Tnc9a%Cx}IBL=PyXewITvF>~P9|HV>u7X1M;zZJl}Id=%I z^g$xJuS_Gy4Q75sZZ2$+krTg>h+ZgCR~ZlZpu@tIY%JQ6T}Cc?*EI*rc1maUD=Hl6byo<0b`pxcUKrz$BVhZs!8yx}cBg?F~h*1w}pJ zDvNyOiW^>_06arP2Mg9SaS+iX0RF6rP9fg(1iihbNIgXbxY8or7J&gM%L{&0u#RcM zy*BX{;eo>w-e05wZvmKj7Qp2W@=X!!^k0bRP^nX&0ua#)MD$Bdw#x$?-OyfUew}X} zMLgi07SU;>o8jSdr#@BqzD2SfOwZ8Uy}pHe3!s#`!o&K_aEORrE`8cl0=ca`=px+= z+B0PP0pIey1YqXbAP6qbAbVBl^?HYgI`iqm?*KGXJirxhW#&yj1^aryJb)Qb@_PVO zqtRGT0{qq@I86-GGp_I{*jIoZS){9#p-(fMk}2Wq0z~u=W5l)$;Gu_iA}tjR!Y6%S?*fGYsQ7v zhHKwupF)cWpdbXp5Wwhu`o~(W)_N4+tayO$5PqcsL|Oooa1GlF04#f!yO!`Ds|(7* zPLDj^0x0V)XaFuz)*FcE3^P|cl@kR7c-5HW53E={f*?qnD7$H$dV$LWvL*}n@(T17 zU`Zah`lMTZzb!_~v)nZU8DujBu!+x0J5fjg+u}9xh8X&IJ=D!r9X?XpdH z36LbonJ^5MU9oZNX?g(5T$%L-Ex@W3J}L3)1PH_MjH5qexXA~AEk5P0F*FPTd_~BG zZx?hntzvm9hP;N<$9DKOU=5)qUXVuqNCjB7TxviJ>5AC!hBh;AC8BjPCdAB50L>I5 z)GK;y(yQx&0Gu-3fc4vDZ>_HAvUM~l=dym65auy20lc1|h^PbLNX{!rJG{Q|X-+R% z1>OS$0F>`?+aiy!M?KyHn_;tjaA{40nHw?-eAQd8#l=N?pWep4;=p`1E4)K zGZUC1%+Ah|7C~EmyWOVq=g$Z2b~`Sz+P~;1+H)yWQ?i7(zWAw64dy$YP5^*rW@ZRL zUkF=-rKP1{Zf=eMbc$3^RDgfycz{ckZOrU7G&@a@nSgVxR*L{or_%|RmzM{Gn4O&^ zO}-&Wp+U$(0ua$cuh)AqgKSrv0lb}=+a6U+1!UlDyPkg7>2!ittEI^&mk_e;5>f65 zsENV@`He>7aRX5KC<{)vdlCg1FmEFn7byi^FKUS)-0_*V}PaD~g6c~_Y_#{pS@vIPKj zyWK#xc?Cxvkl3LR-D<1v%ji5qS-~xiHjp1|s@Mh6G1 zUz2a;gY>uWmcDnaFcuun#c@19y6FizZO6qMmWXJmIZ(cnjIvIo4d5oZ)r3n32l=k_ zX#oEm_Jlmz8v%Hud}S-GE!^#P5k*l}ybIvDVXPlj2!Q{KaI^8!0(s=y$Bgt#vZ%Y# z`K8RU`dz6U0M?KR}i2#rbnSA{mHo;(Rmn9Bay%Wky^OihFT_EvQ1ZR1GD{gwi!otGIjT<*s_KBTJ1;C03dyM6*D0odk zh6rZ9ep>RWv~qGR-C2K{2vHQBs`?A-l~3v`;ersF3e)1lFkH1yTfD>adjMV}qC=x5ALH-<6XFeTmM2lC6}qf7%YrjJ zAoaJdeqZ*T0&sjB#A}RI01bKHx(C2~$^{y}VwmZy{5e9L0&r}c#A{4M01alImuH6g z0@nv*ctGy&to*M@KVSGwR#lj&02<;E+u}Ih)@(L6XAzg>0e0RLA**_R8n)u)>}QUbaom@H!*brm|*7c^y$;HTeoi2LdyW6qY9ZSmq0000#)uCEQ$j&ki>FUb704b7;o5k}>V27p_%hEOfDpxpgDM567qRsTOi-pBBh z+GnAN{u)Gwm=IYe1B8aQ#)umhkFo$kS9Q$oFQ_9|m}7ptVxXetPiJawx&(N&wQrQ5 zEy{%uaC0qfU6X}72CmF?)?M=rYm2jsv%#(OynmF}KDdp3I>Coyv5V>vJH&<7Ej+$e zwd+!opnQVo?jHU>P^Euwk1p|5RxnSu)>)`ANmdHNI@@+CyXvwEikv#|YlpSd@PRhS zP~>9tvWHp%*(rCurt~lyLJ9RZTErtT03<}C=Nlc-Q?*!t5mskKd zPzTk@F4T;$iqwOv((y%Z3ZYI&m3r{dZ|WnD8O}YP?TJj~r|<9NQA{QQXsifG?dFOI zInO#^@cq0T=LQP%C{vomQ5Y<2T9Wa|C5v%ls*eMJ2c$uss!>gnpr@OpB%|;B%F*

G{d>mGnDyYEr*HJH% z`@+jP^28ssTrqYpGmg{fnF>;4)>R_z)XKpy#g)SomL7o|-M<*e&z8Er`^fuU-$+0o zD#cc6MXo%yOcR^}g~g-aeWCJj22wD`&w!WObS$gl!63}c9fT&=0#O-=P!s1z2>tK0 z44^A+zU1l=t3=Ex;G8l+e_u!A3dPx9P?EjVWDEjOAQU&P?tj?Ic~>T9!+m`U#j zZ^Mm{{5q%5C3Qff7ax1^(_@rV9D?t75>-Z-RNXx@_vJ|VIM}_hwf{TCf2&H3qX!+m z_`g=JS4)ZEqs4`wFZh1oFAM4tN59k;J^`d|w2IwgtE@((PqHUDsp~;wK{r{73fCbd zg#II|jq0;Eo=zFQ1eqaoD|Vc?jU9}A7yXmm#{j(4wrPO%uZTXh0{yjS83-t?+iFI#_^-6c}ko8mn_U_Hr)8gqvRhRaRZkuADU9CtW_Z-vA=bpyD++fh@ zl$OptQ`9XraYyh_fWXi*;EJW&2zq3#wN(ZQkpj|JN?+aCC_i9A(bF;&MP4Vs3|zr) zBQ}`YxQ5)aM>ge}t@mv~Wh@o0AI@~rVH@1QOY7W<`8o-2;_s6-vX%d|Mwn@t3YIB< z3!Y!J{pG(vVr%D-DtT^3B@=Q#)O1p#+n%H#^fW&T_z8Qx-j>RMm1qu}81HdXLGXXs zQS_X@W&^#MQ$=_8-;w>k$!N#>rL`3XIY)U-)|yNbG_em)*q}%By7`u?*TwJ8cSk0_tme#})_QFk}?`aKeJ6XHkE98pQtkB8txeQHt%AhBA<+oFuilohTs~0252-cu7Ci65R=cd!NChP6Fh6;Pa zbUfzM^lF|It&=-yy3j6VBL7_zC^81E!54hni@M<_bO?JMz3uDTSy%5bN{qpt)q(b= zm-S;L*FH_AJzyT6)IAPof4WIedRp)M4(l&CE-VmY$#@C=5}9>&3H%Z3XFPG3d}CHI zR}QzmGZc5_TGkVFfA>@fm0TISDKBHQvu*qZ|J-$R8CLPUdg~WGQm0Ra z7#9cLN6cH15JY}(-TCbC!**L8uaqxC>{?;M z{YdfNpW(rJ4pw&nAxdEW7Xd;QPiSAQJW@V>)-Ou+Dp_??{q5*`qVq+c?Rok!c~?Cz=H8J#P{12K+4QYh)s$R;NXpQio0(58&$2dd^! zBxAQ`8OOx@0va1}_gTK|wTRcW7$n%i6QqV|YwYvlsDJnn?RH51^g^FRXs%(PfI20U zIz~RxC7>Xc+H@vYEK#&;by36$ihPUK;9V7uG&+^VQ8pfl+=ZOXIW)vnlCjZjTn*ZL zpXbuD%F&ZBY+rERJHHD3fE2n55#iEKrIq;5p&TE$%xTUz9$}~fy~C$)GM;QjnQ8| zb0a5n7xp;bl(}r^{1?G-UO#_qH)ngVHsTZI*DYY-QwvSO)-D9_xrd;HD>KLuK;?Zc z$s>`*TMy^=oAORRe@shoFC4n*;mYHD!_nVE|EY)0j2Fp06X_Vo7Cq>$*hT%WE;Mlc z&kJ=1E58ECL(L3KhIpdOV5FDaaB2G&Zu%&`AobphP=sF8^W8D_?xS@z#{Ln^R&|r| zST02@_=BLUdLmc(m`(B?ljN>mf!}STcawt0l9nEdIh!MsB+gNkjQweNXO)UinNdQC z$Iz7M;?}YeX@JIwh}fQYhzq5aQj`=a5%4uB4xfGr9?2;qcUS09x6SKI?rt0=LTceY zj1R>rVd-izhpM0sxeZ0! z9g?Y=K#V;PZo@?+p|8~M^L8lo;e|5^|Fv!@{JQT;{8mv;5H~&y<@fL}c&$USmm(NU zIRu8Gg%a=k9Q}E?e@-DvU|^MxV^@AlRgisf`RQk6@dE}Ds*H?`5bzU#ij|Ems;{rF z{CJ|G)T|K?ZMXl5ZU^I}{>Rl289Iqu6-S<%z$QfjxH~#Vva+&@Qs6q%SqoIDGi86& z#_c3m;rDtU!v?vMf@`WSPUo7RfdCc1b%T@B^t+ZgB@D&<3YUSa=4~19Ey_1%L0!Ez zA+s*EAR2&7@%hqCVC?VTFal?xPAuJ9x=fr!$O``+ZET;juaO-GpqMja>n+!4WIhgv zfvCKfJGuAfKPCfYAH5gnQf`RVBU`)|THeluV@M%}!&dJ*ZMraX^>UTf^VNFQ+y z^7gLXRS7-$Nqfr-7@+umb$RhfWNd)Mw0*IYku>>b9q&9@(N(Tu$$k`@C-5pgJ>8qi z#@_ztXWy;SJf3ng3Am{XMcwTgVBcYIp2rB9Eg^oK^5r$Z1^$LfPEC0s`c-va^dqJ}m|C zHP_jCxVpZ+7fS@eY%B9{%vQBOz{BuYN)FYlBhls7H7_IPUhY{;?HT?UnH>79^UQbFV=it=CCj^d{+MHCh^-hvtR^5GAlP% z$XpzKv{5;>JOHk-bbx30vy!?k)(BH9|Zcd-192M(U=?ZL9NCYQ8hEzM0i95?j|+ zOo?VYR1SbWL~YkL;c%>?ZjH@(+1Z{Yd65=F#A|JXbx-5xOoG_rGg=5YQ4U^SUI~+l z$;p8|rryOmr4F*)&s_E&@c?!|Nf~y(?;!auQvK%HrP}`hqVk+?es07yG{|_~;{>6+ zD-^iJ$&>sKnBO;RA|c)X&DW;Dxp0?qjE?N;g+HgO4QHQ0Q`M zhYEThhKIy?QjIha-WKFz8p*sNs^@o;TWAqmya>yfb+c;)gj9AJDlsc+V?)$H%wMx( zg-LY)R=Ng7DCom&-j5eFG&GpLOps*TpkQE}ni?s(=M%C}PC%q!1NQ@DUEe)d$XRRa z6=jPTzpvjIjce{$pj1|606N@J%!jE?yLOZf&DE@PyT&=*Q-u}b9G~x!?3EUkc9Ix*4W6AIEm5d zXxs8fWNM;Akv=C~J2JmomO5;adWGIU&-E#LPb@&?~ImGo)>YYNKqCo_rw@! zG&MAgS5A2v1&>~2iQ^;dceEt|!cZ@m-O%I~=?JTSN+ZciEcVRNl}G9z>;Tg;D$^?E z-#q2X_$9n}Fr&Y1tz1@|S2kCqddf31KAKWj6~iRg#nK%GrYr7Ec{;F6<^$@E>DW?j zjK@~_DW>!iG2-S+?>98Jrz0f-EE8b40W3ra?BH268)gNfH=0UO6fZFv!6qj)z?oeb zk9~#@qeoo;3r;FYL!n3Tcb)+P=6Y|wtj`Sbt@IRdQ3W0r>bp$wr+m(+xgXDHWAu`C zTZM6vb0DsgPL_aP+apNF(KtC%P*Qq=f||F-O72Oc>d*A^wvj4ju#$<4Vih``SZ7W! zuR;5wy;SCKCRu6vtI_97-Nsc@DrOaCm9Fl7l5aY7Vht$2l00PYPFa6PIt~H7f(U)2 zdI#|vbyEGFsoFe`NE_bp7CS}&(;KlcZ_>xV6x~vOD~Ty8%~b7|5$kRkU-#RCF0Ic| zjzDxfL*7rMO1fy!kM1F&9;1s_!D!B}-OqaQu$b5s}^8TkZS z*(Fv9KRio@o8>LtsjRu;-*sWVe&~eJqm6@2z;r~SmpypL#rC$2&75V`)aKo~jz%Sk zAZcStc#6*-^qN=m{$ti@LoX*4%%7RFa9ggg^3fg__c;*qGEmx)$TYM&ZMPy&&Efsj zpVKYY4|#hFS33Dcy&oyE=$K|4JHCbbkxQKu=l|^1N{^@#CI!!|UVh1m{0Ng;dwq`k z6P~mklBBz#;EO;6c%-^~GWqj_(kBib;&j4r4@n6ZC}L&2{P-7B%^9z!@+RSeJ-$i@ zZkJnhz-N;;VqTO>@mkJYJUsz=l=m=_^8GrbEi1Tm(fgl!tE~l_{$$$&LPIpyoyPFF ztyWy%K;USy_JFLsEM0K|I%9a_;P5;|fICe|U)Hv`Kj2$z_V*H`M{Clf(D?!J!5Gdr zUnPNms`0-a%(x9Qt8;>H1K|~V#TPSIhjz)cTmtl44ctaPTmx*(tooO3frwN<)_wrLMR7v>ke!%oW_#J6wCF%(!%-ZgE zkS(abBX99*X<;45s7<5vp7}z|4uER)YgMCkkRS$=yqXM!HX}aH3rWkbTXH`KJzn$} z+n)2KyCvevLn{68x(V7>O??H7sm(S-MGSqiaNQF?eOqH=ql&t^-SS{})|@$@YuF9{ zS=^pB_ncY+fi3Hqn1HXH{Select a trigger type Watering Time - Total Watering Sessions - This Week - This Month - Scheduled Sessions - Manual Sessions - Total Watering Time - Average Duration + Total + + Week + + Month + + Scheduled + + Manual + + Duration + + Average + times