From e97b68be00b13fcfdf4e770603ff90799b3ff37b Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Wed, 6 Mar 2024 17:19:52 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=85=8D=E4=BB=B6?= =?UTF-8?q?=E5=8C=BA=E5=9F=9FUI=202=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E6=91=84=E5=83=8F=E5=A4=B4=E7=9A=84=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../images/main/icon_lockDetail_rectangle.png | Bin 0 -> 2649 bytes .../icon_main_attachment_ElectricCurtain.png | Bin 0 -> 2320 bytes .../main/icon_main_attachment_doorOpener.png | Bin 0 -> 2129 bytes .../main/icon_main_attachment_doorSensor.png | Bin 0 -> 2137 bytes .../main/icon_main_attachment_lighting.png | Bin 0 -> 1527 bytes .../main/icon_main_attachment_sensor.png | Bin 0 -> 4045 bytes .../accessoriesList/accessoriesList_page.dart | 44 +++++----- .../lockDetail/lockDetail_page.dart | 32 ++++---- .../realTimePicture/realTimePicture_page.dart | 77 ++++++++++++------ star_lock/lib/talk/udp/udp_help.dart | 2 +- star_lock/lib/talk/udp/udp_talkClass.dart | 4 - 11 files changed, 87 insertions(+), 72 deletions(-) create mode 100644 star_lock/images/main/icon_lockDetail_rectangle.png create mode 100644 star_lock/images/main/icon_main_attachment_ElectricCurtain.png create mode 100644 star_lock/images/main/icon_main_attachment_doorOpener.png create mode 100644 star_lock/images/main/icon_main_attachment_doorSensor.png create mode 100644 star_lock/images/main/icon_main_attachment_lighting.png create mode 100644 star_lock/images/main/icon_main_attachment_sensor.png diff --git a/star_lock/images/main/icon_lockDetail_rectangle.png b/star_lock/images/main/icon_lockDetail_rectangle.png new file mode 100644 index 0000000000000000000000000000000000000000..df21718ea1231c34919c4e0fbbb9d4007f8d4c79 GIT binary patch literal 2649 zcmV-f3a0gmP) zQG$T}KqROrV1T%gsQZKX2nog)k%S+h7!!lx6(j_Nzz^jS+=KudKpmvv%xq8J zTXoLy$J}ae_jJ$n404j2?z&x%^PM`6uc|4fgkGm9Fikab@ zyFyhT1h8#NTdYYu5uG;BB&A1FN*8(WUjh&_fN6J!nIR$@RQ1xLD1OY$&N+9es(uo{ zwoY6)GdtDHDlEoZGPCypyb9pWH311Be7se*X`1FnRedgm@IhSbZ6f-uhpJZMz$}1$opZ-C^Vun-zXP}uz$;S$AtKEU=UkD$w{9{u z2s1-U0|PoYoOctjn0o8FhI8(x0JfOfEP$x0Gpf2Fgs`u3?lflJ!+ZZ#Gdn;;&Ia)6 zs9{GFfM48@rCGsy4*=Q1D}q=KbY385AT!%)W?SyPDk7R?=EBU@w>xBgy-GyA)dC?RcFuhygs@M38Do4>M4lV%%*+_) z^F;KBnOz8A&r#RT?WSq|sw0-6rfIyY{wjoU=?6K3j1x24nNm7G#`wTEr9@;}kI-_Zt9Ygb_lwf8XQc9OG^En}e{Q>N;*7#uNT2*(7$WzX_>rzUO zjHc&YOZxpjLI^`H)~>rJGvDT%JELoW7~>lvavn23JnE_$NX{Pn6h(1JjPY0zS#M_A z4g5UmghW6@WMx^t2;ko_#&^oH>~#-Ht$(8|OEgV`rfCN6LkRHR59W?B9vMQovy(K? z@ArQQ;5S{*$$E@d_8kCrnAxKlv2$)v#4@{GE}u^lRh^j5&1?Xyswz0=z|33C>{>Is z8Gws1-fd=o?(j8;$RK@Bq$us_4n2BE4eQW-PL>=;E+z|8(q z*Y$w_j#bqkG4tCoMifOcbURaFC@ z@5Y6hW!E~mEXxfkrBh;z`(d$=P8)CpK#QVyors=|F}^4w+n1&BM0BP1{`gKCA%xSL zrny=~uE@LB&19LyW&$~~6T30<)y}!|nR&J-ihYWrn4ZiHi>m6oA%r(o^>=3W2O2$T z0f3o($2oTcGcSow5$VMkFHqIn#%=Y4fG(K%x)8$UAGGL>8Yrb?P19UL3kwTF9f|1p zqA2bnq5~&QCL&MOb^R4peP#5waq&PzCskGT5Hqg>09EaY$YTo&3k_CBgFr-9Rn!!eqg&5S|_XJrr~vZJo+P0V~p(=@9krXV8o z-dC!6aaoqv0N98woIA=ncY=t#B_a2_}Pdc8XU+>&Ezjj~HbeqGn~#-b?B1i<5h{S`C292hXv%K@AaW8A8$-^i7I zRJ`|NYeuWEGmn`KY8W#wF!KvUbSAJ&WzRP#0M@tdJw;?UW}eT?H7nQY zJ2*6T(yp~f-zi*2)N5= zMPwYGk(AOcDWxsU%w<__CZbyb91S2~(NC%KKvhu`6R{3SCZgF0%RS4lZf7!FqdYfnR&2#)95jBxEtE?6|YP? z@LVv*9Is;aY7N{^e_?O42& zUTt|d0DCj@w?hb@%kOAzZf>g4Ii==QnGaN%bY_>$XM1b^xov+tX=Y~Te((Jr0FY9O zwD^bXc2ylJkOOU(9s_bcF=jp-z{$?JOd4Na%Z^MXT_9$*C8czebMC5^2?PLNSSzLP z0&I=;`wtCBzPxB9sp`*SjFFiyVCKD;xfsnns}K>92w+>&G&caa;X?y5M&32E>*~6G zz9@=gn0YT%-J6K4btA)YyyW)KXN&#yl+u6A?4JPc10eqcG0d}cukkjp00000NkvXX Hu0mjfgpJ{d literal 0 HcmV?d00001 diff --git a/star_lock/images/main/icon_main_attachment_ElectricCurtain.png b/star_lock/images/main/icon_main_attachment_ElectricCurtain.png new file mode 100644 index 0000000000000000000000000000000000000000..a662ad60b4bb1e4e4e24de5d3d9681eb0c4d5536 GIT binary patch literal 2320 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 Hu0mjfX71%V literal 0 HcmV?d00001 diff --git a/star_lock/images/main/icon_main_attachment_doorSensor.png b/star_lock/images/main/icon_main_attachment_doorSensor.png new file mode 100644 index 0000000000000000000000000000000000000000..d125e1f2853d5f23b316d1c53e4fdf3c387072ad GIT binary patch literal 2137 zcmV-f2&VUmP)}{TERC8%1JKe<@3Z5USX#($Xa@N!mn7>n>@XI&ttGZ!`96 z_uaz}Z&uf_$DTpzk)Gu7+;{Hxp6}W28BtYQmGKj=qAqJBsk=V)$%Ci9^obqM z9N86{YelEuGAdyD{qg|zBZ44+;ECXgxR!Oc0oNMQ^3$5M#rX|N5I8`w2$#Ce_pBvcrD1T1#$%$w1SiMkzKNrpATfGI*Y1GE;HvNpl~=geDO7w1;@O=U`Z zG9}kla6~bzaT~#iI8Sg+)rjgbr-~E7Ac*h{1w2(3fKd?xP`{UmL44n(Qps#zPikhk zw{z^C;ht(zt^%8X^Q`~RGvhZsIlA)gk@?~eEl_e0)PW(?jtGbdUZF(CKtI>say<{< z(!)L80+(JN;iW(MiN1{Zc39dUd{KQvp8~W1^4)r_>Wh$3O z-!OkXJATJ+PfZ?wX|_O60Af*y8H@)`>vXE1>cBe47Pyky#ZE6l_s$gkejaN|6qYkw znTvuNh#C;ZLkSQN$^2`E4>0%MrG0;R`^xcu&jQI# z;(I$u_awO?Y3TPu43!g#F|00Sn4DeWoN>5_A)%H+&QkO(Sv7c(C?ulL*~RX@BzJTO zJswkeM;eG50W@GalVf~-mGNwmrP(=7oaN!(-qhScfA@?J@WI6Lp4Fus#52!a3*q_>YdZyn;1 zecoq}9vXV#3haS>|GKg>!ScAHOqiU-HM!oQ_|< zlJ8l`Sx9xz`>`RuaMKW9KbZVVowrZayMA_c_UD-q9!nXm(p)bUzm?8T_U+yM`q4v) z7Xa?KW^iil+QTV%X2;Cp_b*H@{_J8cas&W;J3FJ1^B(m=JVQQ-b*rfBXg(<9w%4$AqBHTmguc&IbtW6iq=Ad;FaA+KD zw9-}RU014^MnKH}?H`IwUtUakAZJ!L8zD*6_rzQy@aR90jgI=A`iRTY}* zUsc3SC|6C?8vPogb_@Y4AQ~)IC18vFR9K$0sz8Gr|;|z*HQRm27#VR{CQWTCh*En{Ag~}g9Fvi%;fLR;Ftqsb+3~?iQ z6OZ^doiJaFMFm!Jd~jis*T$}VW+O$VlIua6sHy5G1vb9Xnzv7%Nk4ZfcjWAXf(jjp z7(>a}xIcLFt;NAN-ka&4C^0g-%EWsYc`j1qal5Ps66W`5k7p_t6eD@x_vV)-SMIx* z7xF4$#-|oMP@!7U+$vKuSB8(BoPS_{LS9@h>E7^rL7cO!%ri1N^}t^)jg&5>DlOy`BD z342a420siOj1h1SCMG$xy2wKu z`2d4Q?wz`C`d=?E6eoZ5TGsw_Y-x$nxd2?*3L=d+THk|+4^D`i&_8jmJRk<~!kHM$ z%gin=FdMKw@176wD3Q)ihWGR_c+I|F96iwax7(9uzB+@w|7-WY)7|~@;`O5o@4Rw3 zd)N6D`{;~SmK~@Fs#?26mgg2W2g#VBLyP3IE6h+J6BtY^N}|Ij7mwh1f~-@j#28|p zM_*SbLp!@Ua{b`9?!K<~<@*Oymw*q?U;+Mdd}QBj(e27Q?aV82LSRO~sbZ?p=LwR_ zJGZoA#xteAFA^c1>Y%SH_RXFc^BBP?rZTG%q4vXs2);44Gak#PlkvsTJuLzaWN4)CW8g;&7#s1+OKYZ2=Y_ zRDOVnloNHU(*EvZTbJAqOZ$N}dt=^2+CrtO61XtWSyzt47Nsq~P>d^6=-R_%dw})r zNl#tVA8@&t;)cE$`#a2~j|8xRj}Kh>ob9@KS3Y^;wFi>t4|T~~t?K+Ab+Q6K3#^GW P00000NkvXXu0mjfndTaD literal 0 HcmV?d00001 diff --git a/star_lock/images/main/icon_main_attachment_lighting.png b/star_lock/images/main/icon_main_attachment_lighting.png new file mode 100644 index 0000000000000000000000000000000000000000..571c0e566dba58f7d0b9310bab88447b83e8510b GIT binary patch literal 1527 zcmVuD+cJBny8(C$Gu^T8;&n*%6&Z!$1`_5R`dnG&Xkm2bmHoulyC(=5(t zTLx--Jm(2$>CdBNCm*MhKSQ+~s;5#Ps^!Tv?N3bLmtLbf`!_P@Piz^?i)7Cx$$oyA zigg-);%CH;T&bs~Z0I2Nt0{04@~M+p+qq-EMnvdex3Me*mu#7*R zq2q_e@AcqG=O=S3cE*hW`cjPe@!Ok)+#2eB$(&7+ol4^HF33|T@h|bm zzd-R9k*pBT@*tJ@BUnZULi#Q0?l}^#UT7plV^G<@jIcQI1g`H*wBbL{p8P$rp=^EK zzn>&O`8vk(Y5aY2Bu@Rc`B23R{VZHOK}G!yt;gS>@26V_(XS4YyYx283un>xUuWpW ze|ib!ee+ztHjLrCMP&4Mo`3)%qce0IdxLPxDXf_UwVXB+j|~jtPuP_fKwlZlf8L2@Y6w?GZYdHUEhy-d zQ5HY>1*Y;ILVz$|VfpJ6iI>-8#g#zwq4d-kt_^{nv=?=6P}+!2pgo6_OH#en7*y%XQS?Fr5qN=cucy`PeMb*&A;lV)pyVHcjFX83~J?U2$j^YGB?MpQhrol`l ziv%8>$F*Ad=E~8{f&SM;H9L$PevZKIxlMI<1O*U?FCy7VtlWW3_3YvvtUF`)!a6;} z4c!MDhf?DiWE<@K@a9m<{g`F&wSNBs(R3(ZTLDdb1yR_%u57&*#|LtI;lV=%hAL%dy_A*?LIBiI z!|w~*glZ|`%RuG7Z)4oOct{cm!QI9Qgb8Z@&r!nqhJKm~6&jhw3_gZqPp&}RFTw`3 z=Q^GHJRL2~fYPay(>TuRo74*1y-Ycv#4>fP9}raW`~Za;i5k=zDhUwxeygAk>?b;O z_2EFtq1q#c;76+;rPVf90z@USojnS+^Oo=sWP6zcC|&L*^Hl=V2q62`Kj{clLmj$K z-!roh7b^VYH2LWftaLZ7bb7VYU2r4M6N~1y>w4$Ymp!+S()=S>l>m}vqIP5m^{41) d>=0fn-vJK_G|1!%n|1&I002ovPDHLkV1i`I@6Z4M literal 0 HcmV?d00001 diff --git a/star_lock/images/main/icon_main_attachment_sensor.png b/star_lock/images/main/icon_main_attachment_sensor.png new file mode 100644 index 0000000000000000000000000000000000000000..d97cbf709c8b45e05197568752511acd2e033d6c GIT binary patch literal 4045 zcmV;;4>ItHP)EmEW;k|H_e ztQ^b?X0SZ~Z|fxo%)%K;)Z%=oet75ybpKoT|Md@QzV|wa2`sjB`K3#15B&Ip+PB{d z-WYGfCNMeU@p8YD-IUczH#sFXO8b1`ANX}d`gs%G3XM< zKHbK{vWh5Mz`J$e#w)*uoSB2l>YTu-*>0uL`7}G z5Noz+4g)}GgH#$%DRYMc9b$qE~v!`WRtH19TQUjb(l!hLK!y_{bFh$d-DQfc6xR6%5vxElr#@3mi0#Vk6rlg zp}`-$JGFTJmv3J);0)kw%LK{*kpiRvH~|g;Mgvg_qyz{7WH?|HkVrsSy*>cwMkbr* z`fnfEt4BG;o_lNV_#5rcH|ovSp`XvUGJa%Lkj9t4UzT{-iy)v;GYl5f*qt}%u`ohWHE zI^p)v0f4T;SjoXZJv@ldP2{k$lHeas1(!*`%!2*z~j_`ZDQXUpB@sT&%IlLRV?Knav~04_jG!_l%}oNQ)! z@}8CEVosJWy*u+zj(*YXYX9lQ<=?TZ{e!j`xEmT51nIU26Jy5`7Ko$dXKI#XRo@R} zl)GaOK6f1W;L>#@%MHNG;j0Jx@TW)n@z8h<6w+|N6H5O$t z?uya5jC)7E)Mv(<&gBW0n#Q8hqMtqNdfB|yU3;0RvozvcZ7(AdNCR{ebN@X#^OaE_ znc6&F{8crZaxwWz>^*k1Z>;dZgOfk|!eHM!9Kqfttde=N|5QZ@mEI*_=C?C5VumG8e+L) z1{!hl#|=tGszLP3a)0uACWzQ-EFY^;a(5DhtE=5~&5w1{C_UK}@_SJ`9JQ?GG^n#A zmEg({gV8{uacsiJ-#_5t+_P73@%+3vhyw8@pof8l_4n%3$|U7X5dZ+D_KJ`dr-ZoLy~8IM!#CE8$oR{_Es zm*lwf$7^%1oUR0SEle#RI5RPDD7do>SRRU{=F+i(NKRC`xL$1)gK%)5u2E*j7}oR8 zb`TMaF^EHjdJtl@D-kKvb06Dkg0Yk{f*=D%1Y!(=6D&?0i%}{VncmJ%T5ytFFiEtY zoCpAs>cs^tXj23ctbQM2*AVzaiZFN|bj{0kflF$NgRcd=_bIu}ry+Kq76!DQCz{NKNDaKW2^-SnT!O8& zND{rLqp&9dkb{B6*K@uxT4^w;H&gh>O|<>h1A#yq>;BkyvNLskg5lTO`oi3}XayBT zh@*rh3S4m_CVHXG0chPLEj?;Pj1deY(mNC)Y>$(zdvnukOBO=_*oIs?!c%O1ZDXjN z(cHs2uYxjQEdo$T1K6?-i)qv%@@E2+y0&9EIR^ur;6fqMDY}tCsJI~^R&y3>_<}m0 zz(cf6g
IyGPt(_?c0U;&7C2>emlcrFcNO~4>iUxL-HLRqde6=2`{9e%eN$md4N z9(Gv-2N7CP2TOrQU0a4cXDR21WnW-TtmhyD0LGZ@4S?1LWHv&IZG{{$0EPvL6pCa$ zQuvtxy`ljVCi3x?k@t`^ei$n^j#6j|yTzp6mb#D{W8D%2WWWV8MjI^7HxSM&SUi&* zd3&+-=oIlU=Y|TUdqxTvvMm4s;!X!MO^F5LFzII;C(E0jO)KKV%)Z?R1{?;i(GUO# z41j@B1{Sfk!$baQ%k!^J=GcEa&@XYpv1hbz?Wp5F;`Q6n{^5LQEbWI8R`vc|-#Y{S z?tIZ^4X9hEWsIP;L1n3p2n=f>xauK>NZL;zB$VROFtyZZ;9{$hDBb8m@% z;2|Yp332SMk;}v0V9gnK)4@z>xmbz;E~Y3m^wXM?&y6Rw1tc0U{HAy&(E3FhhR_Jc z6t|Lmf1D|eU3q+8;RnaO?#Xz57HYZrFPG*i z!62g*uJJxRo!N(D$ujon7Gf~yo&n;bYn|g+i#&lghcUz`^)l96f7V*GZD#VW6=$;! z!1-D+W1V4wb6X5dFnk4%(aJ2oiZBtj4-90JBLZ0yY&@wQpy=*`Ii zSkUm00y+h8>%-X6Z9xDeaYQ7bz^8DI!q_&S1NA6l*;0FXw5<#H(9cNe}^Nio`JVJK*zAv?Sy zGFD+^Xkl-8Y;E^=@h5)PdPi!b4SI=IfXHkdA3h59dQ_aGAygpny||4@onXxfB-(&e zPm)%w!9s~tn@uvk!F&}6du0t})rAJZaIu3{tUJd5Qfr9*0!F@c6o2&IRjj>#4OA?^ zVufyj*tM^^gQrHbgGp-W7p+dxglBJxFE+>e2o7qDK`xsC;|%A{U&FbJAK)zO!j~Or zH^KemJ{~>fVYFo9N2i)N`{n|^Gckny6CS#L1_vZC7=~Dq2`nwaVPI&R^)_6U0;q5H zG6v2G4rj=afn)??6f$BnmS9bbGbxFhJE_)fn1TTj!L}`QqX;WYYnVU(9x4~EVVk;NshB$dQX9eie;cgi3P>cclULmogAGLr3zR!LY%t6lc_S z1?z>e?mf_2BSo(+Ct#!|w31Y{5=+5w2HG*0*#3FTRmK=F#*oX|n7MERzdCsuQKJPE z{obZw05IUx{0h!i>mbh1=*EC&;i>C2{P#it%@{-{#us+k`1gmi7|aQvEpH8k-jpN= zEW-#E2#WPMiOUH#nN1$`aoF0n31CFV04COem&-yYDc(Ilg$rjcqP@J{JqECPl6x;4#~ zReL4PUb`7L_Yn}r3QwMCplb~FdHrxLjtploQmrdQfWvWqv4iv1Ydb`=kj;2FkO^>@ zrD$o~7K~tee$g6TO;m6R4-_DSYgh2t{oDJL2_TNx1DR*FF ze~?Q65i$hjbXVsUZt&KIT^ejh>*9Kk+O#pe?%#1JML&z`AB z5cMHzv)oXjad2Yf#Ye~dpY9pSoDMp-QX)eHDJ%?CEKn0jZWA#=O5M44%zOWDzHCP? zPt|9ipKg5XTu0xhq$vPq%Un188TXMi$=v4oMjs=cMWErB7WbOa#0&2K+D7%>QL zEZb@o{LD<*cW<;AH4|kdeHi_Mfihc!_jdR{S6s{*wE2}O00000NkvXXu0mjf^I3x| literal 0 HcmV?d00001 diff --git a/star_lock/lib/main/accessoriesList/accessoriesList_page.dart b/star_lock/lib/main/accessoriesList/accessoriesList_page.dart index f24d03ff..347af63f 100644 --- a/star_lock/lib/main/accessoriesList/accessoriesList_page.dart +++ b/star_lock/lib/main/accessoriesList/accessoriesList_page.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:fluttertoast/fluttertoast.dart'; import 'package:get/get.dart'; -import 'package:star_lock/appRouters.dart'; import 'package:star_lock/main/accessoriesList/accessoriesList_logic.dart'; import '../../../app_settings/app_colors.dart'; @@ -32,15 +30,17 @@ class _AccessoriesListPageState extends State body: ListView( children: [ _accessoriesItem( - 'images/mine/icon_mine_selectGatewayType_G2.png', "照明灯具", true), + 'images/main/icon_main_attachment_lighting.png', "照明灯具", true), _accessoriesItem( - 'images/mine/icon_mine_selectGatewayType_G4.png', "开门器", false), + 'images/main/icon_main_attachment_doorOpener.png', "开门器", false), _accessoriesItem( - 'images/mine/icon_mine_selectGatewayType_G2.png', "电动窗帘", true), + 'images/main/icon_main_attachment_ElectricCurtain.png', + "电动窗帘", + true), + _accessoriesItem('images/main/icon_main_attachment_doorSensor.png', + "门窗传感器", false), _accessoriesItem( - 'images/mine/icon_mine_selectGatewayType_G4.png', "门窗传感器", false), - _accessoriesItem( - 'images/mine/icon_mine_selectGatewayType_G2.png', "传感器", true), + 'images/main/icon_main_attachment_sensor.png', "传感器", true), ], ), ); @@ -57,22 +57,18 @@ class _AccessoriesListPageState extends State width: 1.sw, height: 140.h, padding: EdgeInsets.all(30.w), - child: Center( - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Image.asset( - iconStr, - width: 150.w, - height: 150.w, - ), - // SizedBox(width: 20.w), - Text( - gatewayType, - style: TextStyle(fontSize: 22.sp), - ) - ], - ), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset( + iconStr, + ), + SizedBox(width: 20.w), + Text( + gatewayType, + style: TextStyle(fontSize: 22.sp), + ) + ], ), ), ); diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 6aa0bb07..f711621d 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -379,24 +379,24 @@ class _LockDetailPageState extends State List getAttachmentWidget() { var showWidgetArr = []; // 无线键盘 - if (state.isAttendance.value == 1) { - showWidgetArr.add(bottomItem( - 'images/main/icon_lockDetail_WirelessKeyboard.png', - '无线键盘', - state.bottomBtnisUneable.value, - () {})); - } - // 照明 - showWidgetArr.add(bottomItem('images/main/icon_lockDetail_illuminator.png', - '照明', state.bottomBtnisUneable.value, () {})); + // if (state.isAttendance.value == 1) { + // showWidgetArr.add(bottomItem( + // 'images/main/icon_lockDetail_WirelessKeyboard.png', + // '无线键盘', + // state.bottomBtnisUneable.value, + // () {})); + // } + // // 照明 + // showWidgetArr.add(bottomItem('images/main/icon_lockDetail_illuminator.png', + // '照明', state.bottomBtnisUneable.value, () {})); - // 照明 - showWidgetArr.add(bottomItem('images/main/icon_lockDetail_illuminator.png', - '门磁', state.bottomBtnisUneable.value, () {})); + // // 照明 + // showWidgetArr.add(bottomItem('images/main/icon_lockDetail_illuminator.png', + // '门磁', state.bottomBtnisUneable.value, () {})); - // 门磁 - showWidgetArr.add(bottomItem('images/main/icon_lockDetail_illuminator.png', - '开门器', state.bottomBtnisUneable.value, () {})); + // // 门磁 + // showWidgetArr.add(bottomItem('images/main/icon_lockDetail_illuminator.png', + // '开门器', state.bottomBtnisUneable.value, () {})); // 新增配件 showWidgetArr.add(bottomItem('images/main/icon_main_addLock.png', '新增配件', diff --git a/star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_page.dart b/star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_page.dart index 08abd363..de16104c 100644 --- a/star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_page.dart +++ b/star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_page.dart @@ -79,31 +79,30 @@ class _RealTimePicturePageState extends State alignment: Alignment.center, children: [ Obx( - () => - state.listData.value.isEmpty || state.listData.value.length == 0 - ? Image.asset( - 'images/main/monitorBg.png', - width: ScreenUtil().screenWidth, - height: ScreenUtil().screenHeight, - fit: BoxFit.cover, - ) - : Builder( - builder: (BuildContext context) { - try { - return Image.memory( - state.listData.value, - gaplessPlayback: true, - width: 1.sw, - height: 1.sh, - fit: BoxFit.cover, - ); - } catch (e, stackTrace) { - print('Error loading image: $e'); - print('Stack trace: $stackTrace'); - return Container(); - } - }, - ), + () => state.listData.value.isEmpty || state.listData.value.isEmpty + ? Image.asset( + 'images/main/monitorBg.png', + width: ScreenUtil().screenWidth, + height: ScreenUtil().screenHeight, + fit: BoxFit.cover, + ) + : Builder( + builder: (BuildContext context) { + try { + return Image.memory( + state.listData.value, + gaplessPlayback: true, + width: 1.sw, + height: 1.sh, + fit: BoxFit.cover, + ); + } catch (e, stackTrace) { + print('Error loading image: $e'); + print('Stack trace: $stackTrace'); + return Container(); + } + }, + ), ), Obx(() => state.listData.value.isEmpty ? Positioned( @@ -161,7 +160,7 @@ class _RealTimePicturePageState extends State "images/main/icon_lockDetail_monitoringOpenVoice.png"))), ), ), - SizedBox(width: 60.w), + SizedBox(width: 30.w), // 截图 GestureDetector( onTap: () { @@ -178,7 +177,7 @@ class _RealTimePicturePageState extends State "images/main/icon_lockDetail_monitoringScreenshot.png")), ), ), - SizedBox(width: 60.w), + SizedBox(width: 30.w), // 录制 GestureDetector( onTap: () { @@ -191,10 +190,34 @@ class _RealTimePicturePageState extends State child: Image( width: 40.w, height: 40.w, + fit: BoxFit.fill, image: const AssetImage( "images/main/icon_lockDetail_monitoringScreenRecording.png")), ), ), + SizedBox(width: 30.w), + GestureDetector( + onTap: () { + logic.showToast('该功能暂未开放'); + }, + child: Image( + width: 28.w, + height: 28.w, + fit: BoxFit.fill, + image: + const AssetImage("images/main/icon_lockDetail_rectangle.png")) + // child: Container( + // width: 50.w, + // height: 50.w, + // padding: EdgeInsets.all(5.w), + // child: Image( + // width: 40.w, + // height: 40.w, + // fit: BoxFit.fill, + // image: const AssetImage( + // "images/main/icon_lockDetail_rectangle.png")), + // ), + ) ]); } diff --git a/star_lock/lib/talk/udp/udp_help.dart b/star_lock/lib/talk/udp/udp_help.dart index f248d10b..74634efb 100644 --- a/star_lock/lib/talk/udp/udp_help.dart +++ b/star_lock/lib/talk/udp/udp_help.dart @@ -53,7 +53,7 @@ class UdpHelp { } void closeUDP() { - if(udpHeartTimer != null){ + if (udpHeartTimer != null) { udpHeartTimer!.cancel(); } } diff --git a/star_lock/lib/talk/udp/udp_talkClass.dart b/star_lock/lib/talk/udp/udp_talkClass.dart index 62a28123..8740a9e3 100644 --- a/star_lock/lib/talk/udp/udp_talkClass.dart +++ b/star_lock/lib/talk/udp/udp_talkClass.dart @@ -1,12 +1,8 @@ import 'dart:async'; import 'package:audioplayers/audioplayers.dart'; import 'package:fast_gbk/fast_gbk.dart'; -import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:star_lock/tools/eventBusEventManage.dart'; - import '../../appRouters.dart'; -import '../../main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart'; import '../../tools/storage.dart'; import 'udp_manage.dart';