From c14b397bd3596db7558a02e9d0edf458e23a9f2b Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 20 Jan 2025 14:10:55 +0800 Subject: [PATCH 01/11] =?UTF-8?q?other:=20xhj=20google=20appbundle=20?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E6=89=93=E5=8C=85=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main_xhj_bundle_lite.dart | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 lib/main_xhj_bundle_lite.dart diff --git a/lib/main_xhj_bundle_lite.dart b/lib/main_xhj_bundle_lite.dart new file mode 100755 index 00000000..d24e296d --- /dev/null +++ b/lib/main_xhj_bundle_lite.dart @@ -0,0 +1,11 @@ +import 'app_settings/app_settings.dart'; +import 'flavors.dart'; + +import 'main.dart' as runner; + +Future main() async { + F.appFlavor = Flavor.xhj; + F.isLite = true; + // AppLog.log('xhj_lite调用了main函数'); + await runner.main(); +} From 20b21f6c888bf527796a84a8f6661b53f5704b99 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 20 Jan 2025 14:31:41 +0800 Subject: [PATCH 02/11] =?UTF-8?q?other:=20xhj=20google=20appbundle=20?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E6=89=93=E5=8C=85=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/xhj_bundle/agconnect-services.json | 96 ++++++++++++++++++ .../app/src/xhj_bundle/google-services.json | 29 ++++++ .../res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 2734 bytes .../res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 1662 bytes .../res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 3940 bytes .../res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 6187 bytes .../res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 8600 bytes .../xhj_bundle/res/values-en-rUS/string.xml | 4 + .../xhj_bundle/res/values-zh-rCN/string.xml | 4 + 9 files changed, 133 insertions(+) create mode 100644 android/app/src/xhj_bundle/agconnect-services.json create mode 100644 android/app/src/xhj_bundle/google-services.json create mode 100755 android/app/src/xhj_bundle/res/mipmap-hdpi/ic_launcher.png create mode 100755 android/app/src/xhj_bundle/res/mipmap-mdpi/ic_launcher.png create mode 100755 android/app/src/xhj_bundle/res/mipmap-xhdpi/ic_launcher.png create mode 100755 android/app/src/xhj_bundle/res/mipmap-xxhdpi/ic_launcher.png create mode 100755 android/app/src/xhj_bundle/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 android/app/src/xhj_bundle/res/values-en-rUS/string.xml create mode 100644 android/app/src/xhj_bundle/res/values-zh-rCN/string.xml diff --git a/android/app/src/xhj_bundle/agconnect-services.json b/android/app/src/xhj_bundle/agconnect-services.json new file mode 100644 index 00000000..52e91d21 --- /dev/null +++ b/android/app/src/xhj_bundle/agconnect-services.json @@ -0,0 +1,96 @@ +{ + "agcgw":{ + "backurl":"connect-drcn.hispace.hicloud.com", + "url":"connect-drcn.dbankcloud.cn", + "websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com", + "websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn" + }, + "agcgw_all":{ + "CN":"connect-drcn.dbankcloud.cn", + "CN_back":"connect-drcn.hispace.hicloud.com", + "DE":"connect-dre.dbankcloud.cn", + "DE_back":"connect-dre.hispace.hicloud.com", + "RU":"connect-drru.hispace.dbankcloud.ru", + "RU_back":"connect-drru.hispace.dbankcloud.cn", + "SG":"connect-dra.dbankcloud.cn", + "SG_back":"connect-dra.hispace.hicloud.com" + }, + "websocketgw_all":{ + "CN":"connect-ws-drcn.hispace.dbankcloud.cn", + "CN_back":"connect-ws-drcn.hispace.dbankcloud.com", + "DE":"connect-ws-dre.hispace.dbankcloud.cn", + "DE_back":"connect-ws-dre.hispace.dbankcloud.com", + "RU":"connect-ws-drru.hispace.dbankcloud.ru", + "RU_back":"connect-ws-drru.hispace.dbankcloud.cn", + "SG":"connect-ws-dra.hispace.dbankcloud.cn", + "SG_back":"connect-ws-dra.hispace.dbankcloud.com" + }, + "client":{ + "cp_id":"30086000752967166", + "product_id":"388421841222116270", + "client_id":"1406555529261648640", + "client_secret":"843E8191B02B692239726CF0ED990E1EC2B31928F825AA012B932A128FD2C516", + "project_id":"388421841222116270", + "app_id":"110798531", + "api_key":"DQEDAALnPCtuCgoYOyZfsIDa9/YZZhQ+buDGpypeurXhQUGMajWcVyYLQgXXqV3x2HbI6oyG+Wm2Gf+1hPs6j+wA3B6ylYAXG4aAQA==", + "package_name":"com.xhjcn.lock" + }, + "oauth_client":{ + "client_id":"110798531", + "client_type":1 + }, + "app_info":{ + "app_id":"110798531", + "package_name":"com.xhjcn.lock" + }, + "service":{ + "analytics":{ + "collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn", + "collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com", + "collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn", + "collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn", + "collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn", + "resource_id":"p1", + "channel_id":"" + }, + "edukit":{ + "edu_url":"edukit.cloud.huawei.com.cn", + "dh_url":"edukit.cloud.huawei.com.cn" + }, + "search":{ + "url":"https://search-drcn.cloud.huawei.com" + }, + "cloudstorage":{ + "storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia", + "storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru", + "storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru", + "storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu", + "storage_url_de":"https://ops-dre.agcstorage.link", + "storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn", + "storage_url_sg":"https://ops-dra.agcstorage.link", + "storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn", + "storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn" + }, + "ml":{ + "mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn" + } + }, + "region":"CN", + "configuration_version":"3.0", + "appInfos":[ + { + "package_name":"com.xhjcn.lock", + "client":{ + "app_id":"110798531" + }, + "app_info":{ + "package_name":"com.xhjcn.lock", + "app_id":"110798531" + }, + "oauth_client":{ + "client_type":1, + "client_id":"110798531" + } + } + ] +} \ No newline at end of file diff --git a/android/app/src/xhj_bundle/google-services.json b/android/app/src/xhj_bundle/google-services.json new file mode 100644 index 00000000..453982a0 --- /dev/null +++ b/android/app/src/xhj_bundle/google-services.json @@ -0,0 +1,29 @@ +{ + "project_info": { + "project_number": "448746601330", + "project_id": "smart-lock-12b8c", + "storage_bucket": "smart-lock-12b8c.firebasestorage.app" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:448746601330:android:1a8056175e1dad5e317beb", + "android_client_info": { + "package_name": "ltd.xhjcn.lock" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyAm8dJlBY5hjslJDVDBNd2bkWrJlGjAMqw" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/android/app/src/xhj_bundle/res/mipmap-hdpi/ic_launcher.png b/android/app/src/xhj_bundle/res/mipmap-hdpi/ic_launcher.png new file mode 100755 index 0000000000000000000000000000000000000000..e17ec78d37e5f5d8014c59a9b1e380c5723f871b GIT binary patch literal 2734 zcmV;f3Q_fmP)L?g+p|8O3!YjPTBy%fMX|W>6!lf>^7Ivo zh~kD6kVSTpMG%N0h!Da~NCHVOq+n1XGa->jAK#h7NhWt@?l<$_d%yetgBXXy!Tc2= zHr@`13X{Yp8bnKs)yFQNw3ODhH+3+i#PNozLjHw)@- z6*a)N$9HPjG7BsgD+&iNq9FFTs@dZ}N)L-2w!}PmftjQPe(0yUpQvy3G=;(WWlYZZ z@nv0%-iQEe5pfeTvDPl;(qkFDY|hOcuJbL`KWJm4ub3XZDpLXQlv9*GqfQWE$}o1M&pZwFs3TIQ%DA%+vK8yKMz`%hM_njB%%9Amzg zN-~5kb4^0yN|H<7cv@))*A0wtiFGr2OY7S|bJ9il1U#+Of!O0J+W$JS)@~M?%~6w= zL}<^oZ0zU}q7Oq5Cb0oIjUvZ!^C4R_B79O(O*Eh&*3i~dNNEB2H#T8#@#7 z>yVs~+R<lmLXB{qmEu^@N;Wu(aF{Ge*C@cpcnGa zfWMdUxFVA(b(N&k_PI+F#vvxx%rwwal>X*=@x^q?Hm@lNkK*qrv{KDoOmAzAabd-U zkBue}tD$xyKZL)p?18uv$BC-HKmsv*|J6}>Fq!Tr8YYR2jP+-83{;4_eaRyk^f3E; zBGT5o8!dO#`Je&h^yhCnzlhF0zS`E#fHZcOFk>M`Y3f>VIBmO^X+ptkQ*{|SlYOh` zb?V;PyvY-Ktt}S{LKczlmo^%x5`WEk1^vwBubg?$v-48n?I#TzW*cTz(QX$t?6_QH zt*a3ExsBkQ1|T>wX$gEs59`abxp*9w+QCRIZ?e@_6vGee#N?#JYnnP&MQ6k3^QjaN zE`hH4@0`chK=J6EiXB&q;PZEJCB1!YNbUlAH3R{P)ziAe=kiKBI~;C8&Ec8w3Qg|?avQ9j>XD?XP-`EwVC6TZ}9tEVY$u#~%-tJOv> zToIL#Sw-XSk-+0FZ*uhJ8ELzG%zSJ#e2=7852^|hQT)cX8Fq$aO(BBESVco8+**jM z>ZUFgSpuV%9THa(HTV5TonnPBF5?krVf;fRzVX z^+9Q)o0&@5GwQ*_^7!qpW1=+{Vh%>6e{XPDWT$1Z`wmEC_?-TXs;)3>!o$x=N0BHo zo2;s}<;ILDD*pKkW1}J`8Q`J^Wh(X`F7^f_9VO}a&tt463mb#gcM)!ry_Srm5LjV^QlMv= zsf=!b#bOuRYmaUNw`tW3{jobUgh@#?(ZHXWymWsrR@*}V2;PhYZuyqtS-9Z~{=|p` zvH2G2NlzQj{ay{(0{?M4PDnf;N`nUkmoFNrg=i>7t+t&J{vaqOciS(8(r9km*a314 zgeaTC+37uHx~Veq0}&B3Qj^IKpZC+<%6v)-6k-$oprsf(JfpcO&%JG zQV0Aj(K|M7_&?5y6BJ`21~J{z#q43Sr3rWiX>rlL0w4ecA=cW>{3ZPbDEG(Jv<^Cp zyOShCa4}H=)w|3=2lSCpofHJeE3Kf#P~};b<#0eBbe&GFI(DZr;AB=p zLH)UP4yd$(aDkK<^igj6A40dk+(8H0Dn%KIcMRb1=qVHTudv+UVZ1sz`)XEgV;dte z*i~|zh9x3mkR$?5W&*1{pOVA*y(a`s=iRSot&7R|IsL`oFXW#NnkFPy(E$;$vk$A2 zir=iAX~35i7vgx_*>w(eH2Rs8niY;Zb1X)CnMFk4PYin7Z{tc-BHtTTDzD(CYJxr!}x>K7(;-E4Cw@|Pea&yz4+MO%0oBH zzxJJq_E`SJva6ak6(m96^X^P7Z~7sjTw76U^IVfrj)kEsGln&5sE0{UUWdd!oo}g* zYGoaRgcuAYM?=yFqf68;wo6LjPp!3gKajHK^yA#Hx#DPElH*T|*~=cUT7(&x0y9vS z23gbG$xv62LVh5BVkDwCwUfcu3^_6?sD8&YBmAvaIK7Qq(4S$kC4sXHEp&$Ez^j=r zYpC6uJ&aJX!XP0wRZ}jX(h5nRSK8{U5LIOfrfRaNE(XY|qi!VL%u$q?`X7HuFQNZDF4kVO;G8V)2 zd)dS4^E#B;&FqWa>ax&Alg+^ZH^c3TT;pkmq?A3gzxp}Tc2%Z;IvSZK=!x*4Kn zg+W4$tR?4bqY;}|msv@5HbF5@bS=9!r<%59o(WemOW<*Sj=FO!)D{lRqJ=Cbx6@fQ zOGWH4pk2VJY`6U>w}M?w z)cNF$?B~rsN76cbdgHdbklt%>J`Rw|0{`iHP3??rmkaIp-8<}W1$p^{BZSWEJ)HRL z`x|BO+m+2uZe&%VdW!-m^v+gKQ)4xmpqQNX=kg9EK7$V0ovdoAAuB@=gJ>zKYrj|A z06kbkTaSsF%*Bn4qWRLQR1H~EJGKYXI3`nQE0WzbULdK9-6)~(ZPshZ%F#cs}>_cKNklxN4m6}Qo171vg4-LTfJqC?Tn zvu(Hb7td9|0*;n)4j~#r(QQ4ISXqT?wG2vo9x131PSlDUeL5jy}v~Qb-q81mLZ)+Mu5Y>Epl=skt?Cj^!2X z4)diDhYsjsUY%T}NnJJ38i(l}N25_ogT0FD+IM7>U0y$R=zwmNH7}m#*@s4F%R^{W z_uSTKx-l5^5COGy$v<$kHFOm&L2h-)RYY5>Ap$~mqm2A_bB3jty+3tG&@SEdOKBlr zsOh)2G>c^AjiOzd<$7;~?1Aqw+phOdArEJ}y$k$8e2opKS|x+lxj_rQ0h6{zE51LP_;{x{VP+u1O~dBOt2XgpyceQ0F;(jyCQ@( zgW(E07X)GKcW0JE&KK~7ljzRz!8D4~e^{MT<+k)PkbY1hT}k-ua~MQBq(u@DkV>to zZI%3R^BMR%FP8`T41X2ZXiDoku9gbGheEI<$Wt4~pwSO%gg^;C%Y&3S+ZQ1XQlPzA z6~}Kp)A}N*YSzJ=mQ!=lX!O3U%0Eg3+IWLd%09wK?3Mo5Dc2#3XtaJD}b%es(LvpS5f+s1JiG|OYyq>;{lSHGN0Cu=Feuo(0VrppAH z6XX!p(H3V)X+@gUTiByPm(60iF(@Qm5D4~v!V*iBpNi!pT^)3BycKr;LRO1N2FXV; zv9y}7?BOxJX>jnRe?n8Hi+S@KjM*IRqsxppG$>2O zwe1h1$yP~u7R7?A8H1Aztmy3`+MLp@XvG|0#e zwwD2Qt+AvACFJc!uoMkKL%PZ!1H@7lq!R&;vs6}@36%5X#g8|h->PWokSL%zoQRKN zxowCXHO|v-k(A+)UZQ+?bCpsy>M#Ob_-NqcUu38Q}>%QC47zY&mJ zsb(MMcFL6H-$nM;Ku~!j#<*>W8ny7mJ*dT(RtH*k1`Pu3yHeRAmfhPmQ}4R)qmnq= zL;aI({&a`GYUap62NFsYpvYjCHnK`xi1;IMW8+f_Q*!u7p7c=w^(zFzNI%e(qDCf_ zG})W1Z9Z#;sZ)>f7}lrTf&eOP_;6{!$H2*Yj{*BA^R`%#4e^q7NZ(Q_R>6!rK zyp_dJ8N(X_lCE1%0aY135BT=oR|X@AL4Lg#2}b>g9)EBkD33pZPvlujD#uuN9cKT zXH0VbWV-XJ8Lz6MmIl>xdWVm$r>R2LAP`LdpPPeLUMONFX0HvW!(8~d6JgJKx@0!avA-@+ag!lo!76;W}iT9?;q-TJgH^{LhNZ>|1)w6-pFq4jS)T9;$3 zb*t6dK8v<4C<=lPL=a@(7g+;g%R=^K{=X1W1boS4gT9mR$>9u>J2Q7ax%ao+duMP6 zf?!N~y>LTaf#EI_AT=@pQX>-}H8KHGqoD-U*)91!yYX%zE4Q|@u3adS${nnT3@1vI zpWXa$`Z$Ii7KZvp|fLght{ntuPrBruI7p~+{_S{NMBnIdomGc25qXWnU`A1ept~~(7;`KJoEg++H-3o z9jz^lUr&{c4e0pYiVf#;VS{Rc`)WbZn#sPF1oMH#N}ISlek;84xZ!p|OT><(2iqrm z+LMi3Rh5hiC?UJy;|oeU<9ux|ZHV%6ccEr zJV5b(lyF5dnkD|{567vc^FlHHj{mnLbmRHl@7B%rs-mluXFvKtwe65TGD80OmBb0%=UNzAh?Xl)&*p)HfTQ28c%WmBJ zZm^NPzL5YGHE`gsj|17wmZZhukqkTd3lV@srXb=q?Vfs(kpOiGlu-{@Tu2s4)8Qo+(*XBNHGsG67N}W7(h~K3;oi3822<144S$OoIk9__wYZ$1cT{B2cNviMt1S=C036?&AaS=a3XR$e`4#y6?Cd#77y8(yLYwBu?K(D8GkB!4zZ zyRg`3`Yp45;n9rJX5NLg+BLDh+MNU)Ag)lFTBhtH2bP2mb2^{}k?vDds_z!I+{$Me z2@snrR`fWO5W2N?*E6!1u2cZjEs<$`26TXsUVl3brW-Vp?)5YUifUv6q(&w{YGeYW zMuq~^!53dluX|^#n}*RqSra#^38gHK$j{ko>G4N7&$=uKW=o?y%bIzCbn3v- zH3UIYOWAZ=lDi#g)`3)s9H}|<7MX}^>=1-{+UWO2UP#Y?HvjbWXi~-ENDoraBp+Wa z`}lnB(YqCk#(7-c7}c*Zf?%R|-!Ew3oLCVC%>ni_bqHhkr#viU|FC-O>dE~>yR52? zN&Av*NQ7TMdPA8BVzD_jo&WPwZheRF;r7YnM>^>DUR2UEAm^Sboy(c^s+{|FK1-SI zW3i5djYdNgai&@1H*nUU&B2>1%kN4kR^7P+b&#ncZ%4A54XLqHIQ!c))gEYfBAJ3_ zi8owWuTMabh|G_mKdx%O{#OcI+Rtuntgk>KBN1M?TvxYb|DuqFjz`5!Jc+!w zJc4YP%3#v16$<3VP_#-i1p;jipzy_VRR{=l@aEVf%SOu-3b_I?H`9Oosy9HKZVBVl zn{C~afnPnWXb*}@3~;e3jGyu1o*`@T+j4^=9FPQHvB&OJ9ZRZQKHlrx`p6f%|IBTg z`|ZPl17}h>vi$qUfOSQ**O_&Z1HRW)dIN-2_v@L#Z{DYfnL20HuYlUtVP=5lgV7@( zswKYi+gWUmcKS~pF8zH5& zvc&U5GAj!lIP%o;wr_5fp8iL~fb#g+XLEoK&I}7iS}2t(%Zp@3k}4w^cHT~ue&r!V zT75bj=ujA|3Kv9WaNnQQ-HO~k#z7KkT_cyrYm29>`nRkiWU z#wh4qK8|EKzr7*H#SN8^awvq!lsj`DzQeO=CI(gUE(%J!YV7v0HcyEF+k(^UvUwnT0Bm(S$c)z5H zn^x8afPmDGsWlhVpM5?zAZ~8J@XS#LN_#-nt^Dcn531P8(e)rV>YfEbZ-u$yUY*VI zcf-U4IIf+-fV}Z^O7-r9;#Qvc%d17n#jRI2ji-?bx>n!t(h^WbGcR_3N<*g*XNKMR zcHq|8{{MN|iUq-Z!*svDM|*9%ly@?@D!G(BE&f4L+(c{AaA%|qpr%ftijF;nkg#dI z=F2LqN%#}1#*Fo`U3VrsyS8(|;q+Vo8#B!N8friYf_!i)3+NDWW;eD>h(MVrgUjz3 zB*Cscm6cT7x+kG{=lmeFbugw-1G@I4@m78_Y#e%T6k0kjv?9hkx3=@h-O7D`lq`&N zXAa|4*XRH#6v*dS3ZNNG4{};JMa#A8D(znsay_@HwoS0~_#;#kK5FGw4BM(EU^|RLkxzY~=p)O2N!f7thzf8$@%V03?$uZsjSh&%2R> z%xZ%1-uiQ1QJxpmx4;{hfXs9rib4U%hOC?d12ZI(BY2#_$G~!G zIu{*He>24SyX9d6LyDvVRym6YY4D)&&JQWoCCxneX1C5^ItoAxM+(>(IR;zN!ehGi zkA2OtSV&x@a)s`W1N5Y(V`}_^E`hZ2Zlx>D^0Rr&zTe&{V9h?5CY2+F4cucZ`s3pW zBs>091RJYjyhnNIy7CMSAZIIUOFTy;%cy7{2#AO`Kl*+ct4qXmqiTLmo=D0Q%KE*~ zrKXiX>p+_Fg)w0FvDodu6^{0#%^c;b`nIHz3t6sIIculn>5|rSj0Y#HKD$ar_LQ-ZiaFox&O4 zq{1CiEpR`7IPSx9Id$!V=+;0(`&*Zp?x{djUeAG3!4_KoYejE(+O|vzSnnMxvId|i$d^vibc=?0wO!#30!nE z1A5tSnf33E^U(Uj`>q#Pw(`xfn7(U0$wXZ7*E2;@xlf-JJxiiILfoyP@2LKzkqIw4 zRImrFD1Jr_`;|r2He^DuK2k-MP{%=#h@DHTy_wJY;B@u~7pity#jlz5yAz5b}v0fncUE z9e2EgVyWVWL(0Tnuvh%w1D9oXxqIQI}fQHvQ`dzK#^IP%$GN{9UbVDMST=v~k5x z>$;S)U|9_;5&gbV8v}64Nm`U~*{_FCn|(UU6%FT^GC8B||dpZfhCl zWiutnX?{4}nP${?MCwKQ8SVf~0dCX)H)h;CCW0UWiJU8x0v&4-9&)t5Mqhf3^gkX1 yupr)pkKWHbB>FG84a3OMySsJqqD!&juoPX~ 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 literal 0 HcmV?d00001 diff --git a/android/app/src/xhj_bundle/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/xhj_bundle/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100755 index 0000000000000000000000000000000000000000..58a29a5e322242bc35212bd924afe2509b18503f GIT binary patch literal 8600 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 G@P7auPKKHQ literal 0 HcmV?d00001 diff --git a/android/app/src/xhj_bundle/res/values-en-rUS/string.xml b/android/app/src/xhj_bundle/res/values-en-rUS/string.xml new file mode 100644 index 00000000..7c497348 --- /dev/null +++ b/android/app/src/xhj_bundle/res/values-en-rUS/string.xml @@ -0,0 +1,4 @@ + + + Star Lock + \ No newline at end of file diff --git a/android/app/src/xhj_bundle/res/values-zh-rCN/string.xml b/android/app/src/xhj_bundle/res/values-zh-rCN/string.xml new file mode 100644 index 00000000..384ea2dd --- /dev/null +++ b/android/app/src/xhj_bundle/res/values-zh-rCN/string.xml @@ -0,0 +1,4 @@ + + + 星星锁 + \ No newline at end of file From a960136c7b341f9c51db728421549bf7f559f981 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 20 Jan 2025 14:38:41 +0800 Subject: [PATCH 03/11] =?UTF-8?q?other:=20xhj=20google=20appbundle=20?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E6=89=93=E5=8C=85=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/src/xhj_bundle/agconnect-services.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/android/app/src/xhj_bundle/agconnect-services.json b/android/app/src/xhj_bundle/agconnect-services.json index 52e91d21..de206a1a 100644 --- a/android/app/src/xhj_bundle/agconnect-services.json +++ b/android/app/src/xhj_bundle/agconnect-services.json @@ -33,7 +33,7 @@ "project_id":"388421841222116270", "app_id":"110798531", "api_key":"DQEDAALnPCtuCgoYOyZfsIDa9/YZZhQ+buDGpypeurXhQUGMajWcVyYLQgXXqV3x2HbI6oyG+Wm2Gf+1hPs6j+wA3B6ylYAXG4aAQA==", - "package_name":"com.xhjcn.lock" + "package_name":"ltd.xhjcn.lock" }, "oauth_client":{ "client_id":"110798531", @@ -41,7 +41,7 @@ }, "app_info":{ "app_id":"110798531", - "package_name":"com.xhjcn.lock" + "package_name":"ltd.xhjcn.lock" }, "service":{ "analytics":{ @@ -79,12 +79,12 @@ "configuration_version":"3.0", "appInfos":[ { - "package_name":"com.xhjcn.lock", + "package_name":"ltd.xhjcn.lock", "client":{ "app_id":"110798531" }, "app_info":{ - "package_name":"com.xhjcn.lock", + "package_name":"ltd.xhjcn.lock", "app_id":"110798531" }, "oauth_client":{ From 7866a5c60126fd245744f39905b1fc730bc35996 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 20 Jan 2025 17:19:53 +0800 Subject: [PATCH 04/11] =?UTF-8?q?fix:=20sky=20=E9=94=81=E9=80=9A=E9=80=9A?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=86=85=E8=8B=B1=E6=96=87=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lan/lan_en.json | 2 +- lan/lan_hu.json | 2 +- lan/lan_lt.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lan/lan_en.json b/lan/lan_en.json index 9138e86a..37e99e98 100644 --- a/lan/lan_en.json +++ b/lan/lan_en.json @@ -1,6 +1,6 @@ { "星锁": "Star Lock", - "锁通通": "Lock Through", + "锁通通": "TTLock Pro", "点击开锁，长按闭锁": "Touch to Unlock,Hold to Lock", "考勤": "Attendance", "考勤设置": "Attendance Settings", diff --git a/lan/lan_hu.json b/lan/lan_hu.json index 5f6c38c9..6398d992 100644 --- a/lan/lan_hu.json +++ b/lan/lan_hu.json @@ -1,6 +1,6 @@ { "星锁": "Star lock", - "锁通通": "Lock through", + "锁通通": "TTLock Pro", "点击开锁，长按闭锁": "Érintse fel, hogy kinyit, tartsa zárni", "考勤": "Látogatottság", "考勤设置": "Látogatottsági beállítások", diff --git a/lan/lan_lt.json b/lan/lan_lt.json index d9e18b00..939601de 100644 --- a/lan/lan_lt.json +++ b/lan/lan_lt.json @@ -1,6 +1,6 @@ { "星锁": "Žvaigždžių užraktas", - "锁通通": "Lock through", + "锁通通": "TTLock Pro", "点击开锁，长按闭锁": "Palieskite atrakinti, laikykite užrakinti", "考勤": "Lankomumas", "考勤设置": "Lankomumo nustatymai", From e2af53b58b47398c9f5dd70fa5060de3fe7433c2 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 20 Jan 2025 18:07:00 +0800 Subject: [PATCH 05/11] =?UTF-8?q?ci:=20=E4=BF=AE=E5=A4=8Dxhj=20apkbundle?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0release=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1704ba4b..868db348 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,7 +172,7 @@ create-release: url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-xhj-release-${CI_COMMIT_TAG}.apk' link_type: 'package' - name: 'xhj bundle binary package' - url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-xhj-release-${CI_COMMIT_TAG}.aab' + url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-xhj_bundle-release-${CI_COMMIT_TAG}.aab' link_type: 'package' - name: 'sky apk binary package' url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-sky-release-${CI_COMMIT_TAG}.apk' From 7251fdcb7805bb4b8c362836b8515463a1038bbd Mon Sep 17 00:00:00 2001 From: liyi Date: Thu, 23 Jan 2025 09:44:56 +0800 Subject: [PATCH 06/11] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=8F=AA=E6=9C=89?= =?UTF-8?q?=E5=9C=A8=E6=8E=A5=E5=90=AC=E6=88=90=E5=8A=9F=E6=88=96=E8=80=85?= =?UTF-8?q?=E7=AD=89=E5=BE=85=E6=8E=A5=E5=90=AC=E7=8A=B6=E6=80=81=E6=89=8D?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=8C=82=E6=96=AD=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handle/impl/udp_talk_hangup_handler.dart | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/talk/startChart/handle/impl/udp_talk_hangup_handler.dart b/lib/talk/startChart/handle/impl/udp_talk_hangup_handler.dart index a0da47d7..80a9051a 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_hangup_handler.dart +++ b/lib/talk/startChart/handle/impl/udp_talk_hangup_handler.dart @@ -17,25 +17,25 @@ class UdpTalkHangUpHandler extends ScpMessageBaseHandle implements ScpMessageHandler { @override void handleReq(ScpMessage scpMessage) { - // if (talkStatus.status != TalkStatus.answeredSuccessfully) { - // // 如果不是接听中，不处理通话中挂断请求 - // return; - // } + // 只有接听成功或者等待接听时才处理挂断请求 + if (talkStatus.status == TalkStatus.answeredSuccessfully || + talkStatus.status == TalkStatus.passiveCallWaitingAnswer || + talkStatus.status == TalkStatus.proactivelyCallWaitingAnswer) { + // 回复请求 + replySuccessMessage(scpMessage); + talkStatus.setHangingUpDuring(); + stopRingtone(); + startChartManage.stopTalkExpectMessageTimer(); + startChartManage.stopTalkPingMessageTimer(); + // 挂断之后，停止对讲请求超时监听定时器 - // 回复请求 - replySuccessMessage(scpMessage); - talkStatus.setHangingUpDuring(); - stopRingtone(); - startChartManage.stopTalkExpectMessageTimer(); - startChartManage.stopTalkPingMessageTimer(); - // 挂断之后，停止对讲请求超时监听定时器 + talkeRequestOverTimeTimerManager.cancel(); + talkePingOverTimeTimerManager.cancel(); + talkDataOverTimeTimerManager.cancel(); - talkeRequestOverTimeTimerManager.cancel(); - talkePingOverTimeTimerManager.cancel(); - talkDataOverTimeTimerManager.cancel(); - - // EasyLoading.showToast('已挂断'.tr); - Get.back(); + EasyLoading.showToast('已挂断'.tr); + Get.back(); + } } @override From 35362797361fd7cff473a924de57c5724e9c963a Mon Sep 17 00:00:00 2001 From: Liuyf Date: Thu, 23 Jan 2025 10:17:35 +0800 Subject: [PATCH 07/11] =?UTF-8?q?Revert=20"other=EF=BC=9A=E4=B8=B4?= =?UTF-8?q?=E6=97=B6=E6=89=93=E5=8C=85sky=20pre"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f28237c7c7946e74a3cdd5f5c697ecce713de9c6. --- .gitlab-ci.yml | 1 - ios/build.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92747b72..1704ba4b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,6 @@ variables: - if: $CI_COMMIT_BRANCH == "release" - if: $CI_COMMIT_BRANCH =~ /feat_[a-zA-Z]+/ - if: $CI_COMMIT_BRANCH == "canary_release" - - if: $CI_COMMIT_BRANCH == "develop_liyi" - if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+\.[0-9]+)?$/ .notify_rule: diff --git a/ios/build.sh b/ios/build.sh index 79239db5..a8a977bf 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -23,7 +23,7 @@ elif [[ "${ENV_BUILD_BRANCH}" == "develop" ]]; then echo "===build dev===${NEXT_VERSION}" bundle exec fastlane beta flavor:xhj env:Dev --verbose bundle exec fastlane beta flavor:sky env:Dev --verbose -elif [[ "${ENV_BUILD_BRANCH}" == "release" ]] || [[ "${ENV_BUILD_BRANCH}" == "feat_devops" ]] || [[ "${ENV_BUILD_BRANCH}" == "develop_liyi" ]] ; then +elif [[ "${ENV_BUILD_BRANCH}" == "release" ]] || [[ "${ENV_BUILD_BRANCH}" == "feat_devops" ]] ; then echo "===build pre===${NEXT_VERSION}" bundle exec fastlane beta flavor:xhj env:Pre --verbose bundle exec fastlane beta flavor:sky env:Pre --verbose From acbf82c2dace74fe6c8ec725da012a8587a6287d Mon Sep 17 00:00:00 2001 From: liyi Date: Thu, 23 Jan 2025 10:43:37 +0800 Subject: [PATCH 08/11] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=85=8D=E7=BD=91=E7=BB=93=E6=9E=9C=E6=97=B6=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main/lockDetail/lockDetail/lockDetail_page.dart | 5 +++-- lib/network/api_provider.dart | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 91cd15a5..5e5a253c 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -1584,11 +1584,12 @@ class _LockDetailPageState extends State if (mac != null && mac.isNotEmpty) { final DeviceNetwork deviceNetworkInfo = await ApiRepository.to .getDeviceNetwork(deviceType: 2, deviceMac: mac); - if (deviceNetworkInfo.data?.wifiName == null) { + if (deviceNetworkInfo.data?.wifiName == null || + deviceNetworkInfo.data?.wifiName == '') { return; } else { final peerId = deviceNetworkInfo?.data?.peerId; - if (peerId == null || peerId.isEmpty) { + if (peerId == null || peerId.isEmpty || peerId == '') { throw Exception('设备peerId为空'); } // 设置锁的peerID diff --git a/lib/network/api_provider.dart b/lib/network/api_provider.dart index e31b9522..855df195 100755 --- a/lib/network/api_provider.dart +++ b/lib/network/api_provider.dart @@ -2747,6 +2747,7 @@ class ApiProvider extends BaseProvider { 'deviceMac': deviceMac, }), isShowNetworkErrorMsg: false, + isShowErrMsg: false, isUnShowLoading: true); } From 5c4aab96343f54b0c7fa5c4d8dd37fb1d4ba6e0c Mon Sep 17 00:00:00 2001 From: Liuyf Date: Thu, 23 Jan 2025 10:54:20 +0800 Subject: [PATCH 09/11] =?UTF-8?q?fix=EF=BC=9Afirebase=20base=20on=20iOS=20?= =?UTF-8?q?13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Podfile | 2 +- ios/Podfile.lock | 124 ++++++++++++++++++++++++++- ios/Runner.xcodeproj/project.pbxproj | 18 ++-- 3 files changed, 133 insertions(+), 11 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 76407fa5..64791de8 100755 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '12.0' +platform :ios, '13.0' #use_modular_headers! use_frameworks! :linkage => :static # CocoaPods analytics sends network stats synchronously affecting flutter build latency. diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 9dca6bdf..e0f0b584 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -77,6 +77,49 @@ PODS: - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter + - Firebase/Analytics (11.0.0): + - Firebase/Core + - Firebase/Core (11.0.0): + - Firebase/CoreOnly + - FirebaseAnalytics (~> 11.0.0) + - Firebase/CoreOnly (11.0.0): + - FirebaseCore (= 11.0.0) + - firebase_analytics (11.3.0): + - Firebase/Analytics (= 11.0.0) + - firebase_core + - Flutter + - firebase_core (3.4.0): + - Firebase/CoreOnly (= 11.0.0) + - Flutter + - FirebaseAnalytics (11.0.0): + - FirebaseAnalytics/AdIdSupport (= 11.0.0) + - FirebaseCore (~> 11.0) + - FirebaseInstallations (~> 11.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/MethodSwizzler (~> 8.0) + - GoogleUtilities/Network (~> 8.0) + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - nanopb (~> 3.30910.0) + - FirebaseAnalytics/AdIdSupport (11.0.0): + - FirebaseCore (~> 11.0) + - FirebaseInstallations (~> 11.0) + - GoogleAppMeasurement (= 11.0.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/MethodSwizzler (~> 8.0) + - GoogleUtilities/Network (~> 8.0) + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - nanopb (~> 3.30910.0) + - FirebaseCore (11.0.0): + - FirebaseCoreInternal (~> 11.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/Logger (~> 8.0) + - FirebaseCoreInternal (11.7.0): + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - FirebaseInstallations (11.4.0): + - FirebaseCore (~> 11.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/UserDefaults (~> 8.0) + - PromisesObjC (~> 2.4) - Flutter (1.0.0) - flutter_blue_plus (0.0.1): - Flutter @@ -104,11 +147,58 @@ PODS: - google_maps_flutter_ios (0.0.1): - Flutter - GoogleMaps (< 9.0) + - GoogleAppMeasurement (11.0.0): + - GoogleAppMeasurement/AdIdSupport (= 11.0.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/MethodSwizzler (~> 8.0) + - GoogleUtilities/Network (~> 8.0) + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - nanopb (~> 3.30910.0) + - GoogleAppMeasurement/AdIdSupport (11.0.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 11.0.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/MethodSwizzler (~> 8.0) + - GoogleUtilities/Network (~> 8.0) + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - nanopb (~> 3.30910.0) + - GoogleAppMeasurement/WithoutAdIdSupport (11.0.0): + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/MethodSwizzler (~> 8.0) + - GoogleUtilities/Network (~> 8.0) + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - nanopb (~> 3.30910.0) - GoogleMaps (6.2.1): - GoogleMaps/Maps (= 6.2.1) - GoogleMaps/Base (6.2.1) - GoogleMaps/Maps (6.2.1): - GoogleMaps/Base + - GoogleUtilities/AppDelegateSwizzler (8.0.2): + - GoogleUtilities/Environment + - GoogleUtilities/Logger + - GoogleUtilities/Network + - GoogleUtilities/Privacy + - GoogleUtilities/Environment (8.0.2): + - GoogleUtilities/Privacy + - GoogleUtilities/Logger (8.0.2): + - GoogleUtilities/Environment + - GoogleUtilities/Privacy + - GoogleUtilities/MethodSwizzler (8.0.2): + - GoogleUtilities/Logger + - GoogleUtilities/Privacy + - GoogleUtilities/Network (8.0.2): + - GoogleUtilities/Logger + - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Privacy + - GoogleUtilities/Reachability + - "GoogleUtilities/NSData+zlib (8.0.2)": + - GoogleUtilities/Privacy + - GoogleUtilities/Privacy (8.0.2) + - GoogleUtilities/Reachability (8.0.2): + - GoogleUtilities/Logger + - GoogleUtilities/Privacy + - GoogleUtilities/UserDefaults (8.0.2): + - GoogleUtilities/Logger + - GoogleUtilities/Privacy - image_gallery_saver (2.0.2): - Flutter - image_picker_ios (0.0.1): @@ -123,6 +213,11 @@ PODS: - JPush (= 5.3.0) - just_audio (0.0.1): - Flutter + - nanopb (3.30910.0): + - nanopb/decode (= 3.30910.0) + - nanopb/encode (= 3.30910.0) + - nanopb/decode (3.30910.0) + - nanopb/encode (3.30910.0) - network_info_plus (0.0.1): - Flutter - open_filex (0.0.2): @@ -134,6 +229,7 @@ PODS: - FlutterMacOS - permission_handler_apple (9.3.0): - Flutter + - PromisesObjC (2.4.0) - SDWebImage (5.19.2): - SDWebImage/Core (= 5.19.2) - SDWebImage/Core (5.19.2) @@ -177,6 +273,8 @@ DEPENDENCIES: - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - file_picker (from `.symlinks/plugins/file_picker/ios`) + - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`) + - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - Flutter (from `Flutter`) - flutter_blue_plus (from `.symlinks/plugins/flutter_blue_plus/ios`) - flutter_bugly (from `.symlinks/plugins/flutter_bugly/ios`) @@ -222,10 +320,19 @@ SPEC REPOS: - Bugly - DKImagePickerController - DKPhotoGallery + - Firebase + - FirebaseAnalytics + - FirebaseCore + - FirebaseCoreInternal + - FirebaseInstallations + - GoogleAppMeasurement - GoogleMaps + - GoogleUtilities - ios-voice-processor - JCore - JPush + - nanopb + - PromisesObjC - SDWebImage - SwiftyGif - Toast @@ -258,6 +365,10 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/device_info_plus/ios" file_picker: :path: ".symlinks/plugins/file_picker/ios" + firebase_analytics: + :path: ".symlinks/plugins/firebase_analytics/ios" + firebase_core: + :path: ".symlinks/plugins/firebase_core/ios" Flutter: :path: Flutter flutter_blue_plus: @@ -336,6 +447,13 @@ SPEC CHECKSUMS: DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 EMASRest: 8df6f87836767a9415ad5cc4af739bc9d215b475 file_picker: ce3938a0df3cc1ef404671531facef740d03f920 + Firebase: 9f574c08c2396885b5e7e100ed4293d956218af9 + firebase_analytics: 1a66fe8d4375eccff44671ea37897683a78b2675 + firebase_core: ceec591a66629daaee82d3321551692c4a871493 + FirebaseAnalytics: 27eb78b97880ea4a004839b9bac0b58880f5a92a + FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383 + FirebaseCoreInternal: d6c17dafc8dc33614733a8b52df78fcb4394c881 + FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_blue_plus: 4837da7d00cf5d441fdd6635b3a57f936778ea96 flutter_bugly: bf35df32a9c5d50b8aacdd35bd8ddc5b55150dae @@ -346,7 +464,9 @@ SPEC CHECKSUMS: fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c fluwx: c18fd6c16b03a2187cd07d6e48e32a7801962849 google_maps_flutter_ios: f135b968a67c05679e0a53538e900b5c174b0d99 + GoogleAppMeasurement: 6e49ffac7d3f2c3ded9cc663f912a13b67bbd0de GoogleMaps: 20d7b12be49a14287f797e88e0e31bc4156aaeb4 + GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1 ios-voice-processor: 8e32d7f980a06d392d128ef1cd19cf6ddcaca3c1 @@ -354,11 +474,13 @@ SPEC CHECKSUMS: JPush: b71f497a3c1b825c7843fd97f290b05d5cd75f2e jpush_flutter: c87be254790933c0363684169ef9d3d279a5adc5 just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa + nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 network_info_plus: 6d0c3eb8367b8164fa3fb0c19875e3f59d49697f open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4 package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 + PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 SDWebImage: dfe95b2466a9823cf9f0c6d01217c06550d7b29a shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec @@ -373,6 +495,6 @@ SPEC CHECKSUMS: webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1 WechatOpenSDK-XCFramework: 36fb2bea0754266c17184adf4963d7e6ff98b69f -PODFILE CHECKSUM: a4d4747e9f246a7c5b9d643d5efa33799112963a +PODFILE CHECKSUM: 728f9c851a19709391c77c54ed3556e484b54db6 COCOAPODS: 1.14.3 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 26844532..7a12c6ca 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -1080,7 +1080,7 @@ DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = NAQ5PL2DYC; INFOPLIST_FILE = Runner/info_sky.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", @@ -1178,7 +1178,7 @@ DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = NAQ5PL2DYC; INFOPLIST_FILE = Runner/info_xhj.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", @@ -1205,7 +1205,7 @@ DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = NAQ5PL2DYC; INFOPLIST_FILE = Runner/info_sky.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", @@ -1231,7 +1231,7 @@ DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = P8997RW3V8; INFOPLIST_FILE = Runner/info_xhj.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", @@ -1477,7 +1477,7 @@ DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = NAQ5PL2DYC; INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", @@ -1575,7 +1575,7 @@ DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = NAQ5PL2DYC; INFOPLIST_FILE = Runner/info_sky.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", @@ -1673,7 +1673,7 @@ DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = NAQ5PL2DYC; INFOPLIST_FILE = Runner/info_sky.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", @@ -1771,7 +1771,7 @@ DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = P8997RW3V8; INFOPLIST_FILE = Runner/info_xhj.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", @@ -1869,7 +1869,7 @@ DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = P8997RW3V8; INFOPLIST_FILE = Runner/info_xhj.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", From 459f94658deca5f59f9470da4eaf6555ab3cf771 Mon Sep 17 00:00:00 2001 From: liyi Date: Thu, 23 Jan 2025 14:28:36 +0800 Subject: [PATCH 10/11] =?UTF-8?q?fix:=E6=94=B6=E5=88=B0=E8=93=9D=E7=89=99?= =?UTF-8?q?=E9=80=8F=E4=BC=A0=E6=B6=88=E6=81=AF=E4=BD=BF=E7=94=A8=E5=8E=9F?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E8=93=9D=E7=89=99=E4=BA=8B=E4=BB=B6=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E7=9B=91=E5=90=AC=E4=BA=8B=E4=BB=B6=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lockDetail/lockDetail_logic.dart | 52 +++- .../impl/udp_ble_passthrough_handler.dart | 80 ++++++ .../impl/udp_ble_passthrough_handler.dart | 250 ------------------ 3 files changed, 131 insertions(+), 251 deletions(-) create mode 100644 lib/talk/starChart/handle/impl/udp_ble_passthrough_handler.dart delete mode 100644 lib/talk/startChart/handle/impl/udp_ble_passthrough_handler.dart diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index 5cef5acf..163ded98 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -12,6 +12,8 @@ import 'package:star_lock/login/login/entity/LoginEntity.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart'; import 'package:star_lock/main/lockDetail/lockSet/lockTime/getServerDatetime_entity.dart'; import 'package:star_lock/main/lockMian/entity/lockListInfo_entity.dart'; +import 'package:star_lock/talk/starChart/constant/talk_status.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; import 'package:star_lock/tools/bugly/bugly_tool.dart'; import 'package:star_lock/tools/throttler.dart'; import 'package:star_lock/widget/permission/permission_dialog.dart'; @@ -48,7 +50,7 @@ class LockDetailLogic extends BaseGetXController { state.replySubscription = EventBusManager().eventBus!.on().listen((Reply reply) async { // 开门 - if (reply is OpenDoorReply && state.ifCurrentScreen.value == true) { + if (reply is OpenDoorReply) { _replyOpenLock(reply); } @@ -116,6 +118,11 @@ class LockDetailLogic extends BaseGetXController { //锁数据更新 getLockRecordLastUploadDataTime(); + // 只有接听状态时才可以重发开门指令 + if (StartChartManage().talkStatus.status == + TalkStatus.answeredSuccessfully) { + showToast('开锁成功'.tr); + } break; case 0x06: //无权限 @@ -143,6 +150,12 @@ class LockDetailLogic extends BaseGetXController { signKey: signKeyDataList, privateKey: getPrivateKeyList, ); + // 只有接听状态时才可以重发开门指令 + if (StartChartManage().talkStatus.status == + TalkStatus.answeredSuccessfully) { + sendStarChartOpenLockMessage(reply); + } + break; case 0x16: // 正在开锁中... @@ -198,6 +211,43 @@ class LockDetailLogic extends BaseGetXController { } } + /// 发送星图的开门蓝牙透传命令 + void sendStarChartOpenLockMessage(Reply reply) async { + /// 无权限开门时，重新发送一个带token信息的开门信息 + final List? privateKey = + await Storage.getStringList(saveBluePrivateKey); + final List getPrivateKeyList = changeStringListToIntList(privateKey!); + + final List? signKey = await Storage.getStringList(saveBlueSignKey); + final List signKeyDataList = changeStringListToIntList(signKey!); + + final List tokenData = reply.data.sublist(2, 6); + final List saveStrList = changeIntListToStringList(tokenData); + Storage.setStringList(saveBlueToken, saveStrList); + + final OpenLockCommand openLockCommand = OpenLockCommand( + lockID: BlueManage().connectDeviceName, + userID: await Storage.getUid(), + openMode: state.openDoorModel, + openTime: getUTCNetTime(), + onlineToken: state.lockNetToken, + token: tokenData, + needAuthor: 1, + signKey: signKeyDataList, + privateKey: getPrivateKeyList, + ); + final messageDetail = openLockCommand.packageData(); + // 将 List 转换为十六进制字符串 + String hexString = messageDetail + .map((byte) => byte.toRadixString(16).padLeft(2, '0')) + .join(' '); + // 发送远程开门消息 + StartChartManage().sendRemoteUnLockMessage( + bluetoothDeviceName: BlueManage().connectDeviceName, + openLockCommand: messageDetail, + ); + } + Future loadData( {required LockListInfoItemEntity lockListInfoItemEntity, required bool isOnlyOneData}) async { diff --git a/lib/talk/starChart/handle/impl/udp_ble_passthrough_handler.dart b/lib/talk/starChart/handle/impl/udp_ble_passthrough_handler.dart new file mode 100644 index 00000000..ba052eb9 --- /dev/null +++ b/lib/talk/starChart/handle/impl/udp_ble_passthrough_handler.dart @@ -0,0 +1,80 @@ +import 'dart:async'; +import 'dart:convert'; +import 'dart:typed_data'; + +import 'package:flutter_easyloading/flutter_easyloading.dart'; +import 'package:get/get.dart'; +import 'package:star_lock/appRouters.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; +import 'package:star_lock/blue/blue_manage.dart'; +import 'package:star_lock/blue/io_protocol/io_openLock.dart'; +import 'package:star_lock/blue/io_reply.dart'; +import 'package:star_lock/blue/io_tool/io_tool.dart'; +import 'package:star_lock/blue/io_tool/manager_event_bus.dart'; +import 'package:star_lock/blue/reciver_data.dart'; +import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_logic.dart'; +import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_state.dart'; +import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/proto/ble_message.pbserver.dart'; +import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart'; +import 'package:star_lock/talk/starChart/proto/generic.pb.dart'; +import 'package:star_lock/tools/bugly/bugly_tool.dart'; +import 'package:star_lock/tools/dateTool.dart'; +import 'package:star_lock/tools/eventBusEventManage.dart'; +import 'package:star_lock/tools/storage.dart'; +import 'package:umeng_common_sdk/umeng_common_sdk.dart'; + +import '../../star_chart_manage.dart'; + +class UdpBlePassThroughHandler extends ScpMessageBaseHandle + implements ScpMessageHandler { + @override + void handleReq(ScpMessage scpMessage) { + //TODO 收到蓝牙透传请求指令 + } + + @override + void handleResp(ScpMessage scpMessage) async { + final BleResp bleResp = scpMessage.Payload; + String hexString = bleResp.structData + .map((byte) => byte.toRadixString(16).padLeft(2, '0')) + .join(' '); + AppLog.log('收到蓝牙透传回复：$hexString'); + + // 触发数据对应的事件 + await CommandReciverManager.appDataReceive(bleResp.structData); + } + + @override + void handleInvalidReq(ScpMessage scpMessage) {} + + @override + void handleRealTimeData(ScpMessage scpMessage) {} + + @override + deserializePayload( + {required int payloadType, + required int messageType, + required List byte, + int? offset, + int? PayloadLength, + int? spTotal, + int? spIndex, + int? messageId}) { + if (messageType == MessageTypeConstant.Resp) { + final BleResp bleResp = BleResp(); + bleResp.mergeFromBuffer(byte); + return bleResp; + } else if (messageType == MessageTypeConstant.Req) { + final BleReq talkExpect = BleReq(); + talkExpect.mergeFromBuffer(byte); + return talkExpect; + } else { + String payload = utf8.decode(byte); + return payload; + } + } +} diff --git a/lib/talk/startChart/handle/impl/udp_ble_passthrough_handler.dart b/lib/talk/startChart/handle/impl/udp_ble_passthrough_handler.dart deleted file mode 100644 index 10be6d6b..00000000 --- a/lib/talk/startChart/handle/impl/udp_ble_passthrough_handler.dart +++ /dev/null @@ -1,250 +0,0 @@ -import 'dart:async'; -import 'dart:convert'; -import 'dart:typed_data'; - -import 'package:flutter_easyloading/flutter_easyloading.dart'; -import 'package:get/get.dart'; -import 'package:star_lock/appRouters.dart'; -import 'package:star_lock/app_settings/app_settings.dart'; -import 'package:star_lock/blue/blue_manage.dart'; -import 'package:star_lock/blue/io_protocol/io_openLock.dart'; -import 'package:star_lock/blue/io_reply.dart'; -import 'package:star_lock/blue/io_tool/io_tool.dart'; -import 'package:star_lock/blue/io_tool/manager_event_bus.dart'; -import 'package:star_lock/blue/reciver_data.dart'; -import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_logic.dart'; -import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_state.dart'; -import 'package:star_lock/talk/startChart/constant/message_type_constant.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/proto/ble_message.pbserver.dart'; -import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart'; -import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; -import 'package:star_lock/tools/bugly/bugly_tool.dart'; -import 'package:star_lock/tools/dateTool.dart'; -import 'package:star_lock/tools/eventBusEventManage.dart'; -import 'package:star_lock/tools/storage.dart'; -import 'package:umeng_common_sdk/umeng_common_sdk.dart'; - -import '../../start_chart_manage.dart'; - -class UdpBlePassThroughHandler extends ScpMessageBaseHandle - implements ScpMessageHandler { - LockDetailLogic lockDetailLogic = Get.put(LockDetailLogic()); - LockDetailState lockDetailState = Get.find().state; - - @override - void handleReq(ScpMessage scpMessage) { - //TODO 收到蓝牙透传请求指令 - } - - @override - void handleResp(ScpMessage scpMessage) async { - final BleResp bleResp = scpMessage.Payload; - String hexString = bleResp.structData - .map((byte) => byte.toRadixString(16).padLeft(2, '0')) - .join(' '); - AppLog.log('收到蓝牙透传回复：$hexString'); - - await CommandReciverManager.appDataReceive(bleResp.structData); - - EventBusManager().eventBus!.on().listen((Reply reply) async { - // 开门 - if (reply is OpenDoorReply) { - AppLog.log('收到开门请求命令回复'); - _replyOpenLock(reply); - } - }); - } - - @override - void handleInvalidReq(ScpMessage scpMessage) {} - - @override - void handleRealTimeData(ScpMessage scpMessage) {} - - @override - deserializePayload( - {required int payloadType, - required int messageType, - required List byte, - int? offset, - int? PayloadLength, - int? spTotal, - int? spIndex, - int? messageId}) { - if (messageType == MessageTypeConstant.Resp) { - final BleResp bleResp = BleResp(); - bleResp.mergeFromBuffer(byte); - return bleResp; - } else if (messageType == MessageTypeConstant.Req) { - final BleReq talkExpect = BleReq(); - talkExpect.mergeFromBuffer(byte); - return talkExpect; - } else { - String payload = utf8.decode(byte); - return payload; - } - } - - // 开门数据解析 - Future _replyOpenLock(Reply reply) async { - final int status = reply.data[6]; - - BuglyTool.uploadException( - message: '开锁结果，解析数据', - detail: '开锁结果，解析数据 _replyOpenLock:${reply.data}', - upload: true); - - if (status != 6) { - final String getMobile = (await Storage.getMobile())!; - UmengCommonSdk.onEvent('open_lock', { - 'lock_name': lockDetailState.keyInfos.value.lockName!, - 'account': - getMobile.isNotEmpty ? getMobile : (await Storage.getEmail())!, - 'date': DateTool().getNowDateWithType(1), - 'open_lock_result': '${reply.data}', - }); - } - - switch (status) { - case 0x00: - //成功 - // _showFullScreenOverlay(Get.context!); - lockDetailState.iSClosedUnlockSuccessfulPopup.value = true; - lockDetailLogic.cancelBlueConnetctToastTimer(); - lockDetailState.closedUnlockSuccessfulTimer?.cancel(); - // EasyLoading.dismiss(); - // 如果没有点击关闭弹窗，3秒后自动关闭 - lockDetailState.closedUnlockSuccessfulTimer = - Timer.periodic(3.seconds, (Timer timer) { - lockDetailState.iSClosedUnlockSuccessfulPopup.value = false; - timer.cancel(); - eventBus.fire(RefreshLockDetailInfoDataEvent()); - }); - - // 电量 - final int power = reply.data[7]; - lockDetailState.electricQuantity.value = power; - - // 备用电量 - if (lockDetailState - .keyInfos.value.lockFeature!.isSupportBackupBattery == - 1) { - final int powerStandby = reply.data[9]; - lockDetailState.electricQuantityStandby.value = powerStandby; - } - // 更新电量 - await lockDetailLogic.uploadElectricQuantityRequest(); - - // 开锁成功上报 - lockDetailLogic.lockReportLockSuccessfullyUploadData(); - - lockDetailLogic.resetOpenDoorState(); - lockDetailState.animationController?.stop(); - - //锁数据更新 - lockDetailLogic.getLockRecordLastUploadDataTime(); - if (!EasyLoading.isShow) { - lockDetailLogic.showToast('开门成功'.tr); - } - - break; - case 0x06: - //无权限 - // 获取token后在重新发送 - sendCarryTokenOpenLockMessage(reply); - break; - case 0x16: - // 正在开锁中... - final int isOpen = reply.data[8]; - String? msg; - if (isOpen == 0) { - msg = '正在开锁中...'.tr; - } else if (isOpen == 32) { - msg = '正在闭锁中...'.tr; - } - lockDetailLogic.resetOpenDoorState(); - if (msg != null) { - lockDetailLogic.showToast(msg, something: () { - lockDetailLogic.cancelBlueConnetctToastTimer(); - }); - } - break; - case 0x0d: - // 钥匙无效 - lockDetailLogic.showToast('钥匙无效'.tr); - lockDetailLogic.openDoorError(); - break; - case 0x0b: - // 钥匙无效 - lockDetailLogic.showToast('钥匙过期'.tr); - lockDetailLogic.openDoorError(); - break; - case 0x0a: - // 钥匙不存在 - lockDetailLogic.showToast('钥匙不存在'.tr); - lockDetailLogic.openDoorError(); - break; - case 0x0c: - // 钥匙数量已到上限 - lockDetailLogic.showToast('钥匙数量已到上限'.tr); - lockDetailLogic.openDoorError(); - break; - case 0x0e: - // 钥匙已存在 - lockDetailLogic.showToast('钥匙已存在'.tr); - lockDetailLogic.openDoorError(); - break; - case 0x0f: - // 用户已存在 - lockDetailLogic.showToast('用户已存在'.tr); - lockDetailLogic.openDoorError(); - break; - default: - //失败 - // AppLog.log('开锁失败'); - lockDetailLogic.openDoorError(); - break; - } - } - - void sendCarryTokenOpenLockMessage(Reply reply) async { - /// 无权限开门时，重新发送一个带token信息的开门信息 - final List? privateKey = - await Storage.getStringList(saveBluePrivateKey); - final List getPrivateKeyList = changeStringListToIntList(privateKey!); - - final List? signKey = await Storage.getStringList(saveBlueSignKey); - final List signKeyDataList = changeStringListToIntList(signKey!); - - final List tokenData = reply.data.sublist(2, 6); - final List saveStrList = changeIntListToStringList(tokenData); - Storage.setStringList(saveBlueToken, saveStrList); - - final OpenLockCommand openLockCommand = OpenLockCommand( - lockID: BlueManage().connectDeviceName, - userID: await Storage.getUid(), - openMode: lockDetailState.openDoorModel, - openTime: lockDetailLogic.getUTCNetTime(), - onlineToken: lockDetailState.lockNetToken, - token: tokenData, - needAuthor: 1, - signKey: signKeyDataList, - privateKey: getPrivateKeyList, - ); - final messageDetail = openLockCommand.packageData(); - // 将 List 转换为十六进制字符串 - String hexString = messageDetail - .map((byte) => byte.toRadixString(16).padLeft(2, '0')) - .join(' '); - - AppLog.log('open lock hexString: $hexString'); - // 发送远程开门消息 - StartChartManage().sendRemoteUnLockMessage( - bluetoothDeviceName: BlueManage().connectDeviceName, - openLockCommand: messageDetail, - ); - } -} From 359a7f3de4e6bce424cfbca207f62f1ef46be9e8 Mon Sep 17 00:00:00 2001 From: liyi Date: Thu, 23 Jan 2025 14:30:31 +0800 Subject: [PATCH 11/11] =?UTF-8?q?style:=E8=B0=83=E6=95=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E9=94=99=E5=88=AB=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/appRouters.dart | 2 +- lib/blue/io_tool/manager_event_bus.dart | 16 ++--- lib/login/login/starLock_login_logic.dart | 2 +- lib/login/login/starLock_login_page.dart | 4 +- lib/main.dart | 4 +- .../lockDetail/lockDetail_page.dart | 2 +- .../catEyeCustomMode_logic.dart | 2 +- .../catEyeSet/catEyeSet/catEyeSet_logic.dart | 2 +- .../catEyeSet/videoSlot/videoSlot_logic.dart | 2 +- .../configuringWifi_logic.dart | 4 +- .../wifiList/wifiList_logic.dart | 2 +- .../lockSet/liveVideo/liveVideo_logic.dart | 2 +- .../lockMian/lockMain/lockMain_logic.dart | 2 +- lib/main/lockMian/lockMain/lockMain_page.dart | 10 ++-- .../lockMain/xhj/lockMain_xhj_logic.dart | 2 +- lib/mine/mineSet/mineSet/mineSet_logic.dart | 2 +- lib/network/start_chart_api.dart | 6 +- lib/talk/other/audio_player_manager.dart | 6 +- .../command/message_command.dart | 32 +++++----- .../constant/exception_constant.dart | 0 .../constant/ip_constant.dart | 0 .../constant/listen_addr_type_constant.dart | 0 .../constant/message_type_constant.dart | 0 .../constant/payload_type_constant.dart | 0 .../constant/protocol_flag_constant.dart | 0 .../constant/talk_constant.dart | 0 .../constant/talk_status.dart | 0 .../constant/udp_constant.dart | 0 .../entity/heartbeat_response.dart | 0 .../entity/login_response.dart | 0 .../entity/relay_info_entity.dart | 0 .../entity/report_information_data.dart | 0 .../entity/scp_message.dart | 8 +-- .../star_chart_register_node_entity.dart | 0 .../start_chart_message_exception.dart | 0 .../start_chart_talk_status_exception.dart | 0 .../handle/impl/debug_Info_model.dart | 0 .../handle/impl/udp_echo_test_handler.dart | 10 ++-- .../impl/udp_gateway_reset_handler.dart | 12 ++-- .../impl/udp_gateway_transfer_handler.dart | 16 ++--- .../handle/impl/udp_go_online_handler.dart | 12 ++-- .../handle/impl/udp_heart_beat_handler.dart | 14 ++--- .../handle/impl/udp_rbcuInfo_handler.dart | 14 ++--- .../handle/impl/udp_rbcuProBe_handler.dart | 14 ++--- .../impl/udp_remote_un_lock_handler.dart | 18 +++--- .../handle/impl/udp_talk_accept_handler.dart | 20 +++---- .../handle/impl/udp_talk_data_handler.dart | 14 ++--- .../handle/impl/udp_talk_expect_handler.dart | 24 ++++---- .../handle/impl/udp_talk_hangup_handler.dart | 16 ++--- .../handle/impl/udp_talk_ping_handler.dart | 12 ++-- .../handle/impl/udp_talk_push_handler.dart | 16 ++--- .../udp_talk_receiver_transfer_handler.dart | 16 ++--- .../handle/impl/udp_talk_reject_handler.dart | 16 ++--- .../handle/impl/udp_talk_request_handler.dart | 18 +++--- .../impl/unknow_payload_type_handler.dart | 6 +- .../handle/other/do_sign.dart | 2 +- .../handle/other/talk_data_repository.dart | 2 +- .../talke_data_over_time_timer_manager.dart | 8 +-- .../talke_ping_over_time_timer_manager.dart | 8 +-- ...talke_request_over_time_timer_manager.dart | 8 +-- .../handle/scp_message_base_handle.dart | 22 +++---- .../handle/scp_message_handle.dart | 2 +- .../handle/scp_message_handler_factory.dart | 40 ++++++------- .../proto/ble_message.pb.dart | 0 .../proto/ble_message.pbenum.dart | 0 .../proto/ble_message.pbjson.dart | 0 .../proto/ble_message.pbserver.dart | 0 .../proto/ble_message.proto | 0 .../proto/device_scan.pb.dart | 0 .../proto/device_scan.pbenum.dart | 0 .../proto/device_scan.pbjson.dart | 0 .../proto/device_scan.pbserver.dart | 0 .../proto/device_scan.proto | 0 .../proto/gateway_reset.pb.dart | 0 .../proto/gateway_reset.pbenum.dart | 0 .../proto/gateway_reset.pbjson.dart | 0 .../proto/gateway_reset.pbserver.dart | 0 .../proto/gateway_reset.proto | 0 .../proto/gateway_transfer.pb.dart | 0 .../proto/gateway_transfer.pbenum.dart | 0 .../proto/gateway_transfer.pbjson.dart | 0 .../proto/gateway_transfer.pbserver.dart | 0 .../proto/gateway_transfer.proto | 0 .../proto/generic.pb.dart | 0 .../proto/generic.pbenum.dart | 0 .../proto/generic.pbjson.dart | 0 .../proto/generic.pbserver.dart | 0 .../proto/generic.proto | 0 .../proto/rbcu.pb.dart | 0 .../proto/rbcu.pbenum.dart | 0 .../proto/rbcu.pbjson.dart | 0 .../proto/rbcu.pbserver.dart | 0 .../proto/rbcu.proto | 0 .../proto/remote_unlock.pb.dart | 0 .../proto/remote_unlock.pbenum.dart | 0 .../proto/remote_unlock.pbjson.dart | 0 .../proto/remote_unlock.pbserver.dart | 0 .../proto/remote_unlock.proto | 0 .../proto/talk_accept.pb.dart | 0 .../proto/talk_accept.pbenum.dart | 0 .../proto/talk_accept.pbjson.dart | 0 .../proto/talk_accept.pbserver.dart | 0 .../proto/talk_accept.proto | 0 .../proto/talk_data.pb.dart | 0 .../proto/talk_data.pbenum.dart | 0 .../proto/talk_data.pbjson.dart | 0 .../proto/talk_data.pbserver.dart | 0 .../proto/talk_data.proto | 0 .../proto/talk_data_h264_frame.pb.dart | 0 .../proto/talk_data_h264_frame.pbenum.dart | 0 .../proto/talk_data_h264_frame.pbjson.dart | 0 .../proto/talk_data_h264_frame.pbserver.dart | 0 .../proto/talk_data_h264_frame.proto | 0 .../proto/talk_expect.pb.dart | 0 .../proto/talk_expect.pbenum.dart | 0 .../proto/talk_expect.pbjson.dart | 0 .../proto/talk_expect.pbserver.dart | 0 .../proto/talk_expect.proto | 0 .../proto/talk_hangup.pb.dart | 0 .../proto/talk_hangup.pbenum.dart | 0 .../proto/talk_hangup.pbjson.dart | 0 .../proto/talk_hangup.pbserver.dart | 0 .../proto/talk_hangup.proto | 0 .../proto/talk_ping.pb.dart | 0 .../proto/talk_ping.pbenum.dart | 0 .../proto/talk_ping.pbjson.dart | 0 .../proto/talk_ping.pbserver.dart | 0 .../proto/talk_ping.proto | 0 .../proto/talk_push.pb.dart | 0 .../proto/talk_push.pbenum.dart | 0 .../proto/talk_push.pbjson.dart | 0 .../proto/talk_push.pbserver.dart | 0 .../proto/talk_push.proto | 0 .../proto/talk_receiver_transfer.pb.dart | 0 .../proto/talk_receiver_transfer.pbenum.dart | 0 .../proto/talk_receiver_transfer.pbjson.dart | 0 .../talk_receiver_transfer.pbserver.dart | 0 .../proto/talk_receiver_transfer.proto | 0 .../proto/talk_reject.pb.dart | 0 .../proto/talk_reject.pbenum.dart | 0 .../proto/talk_reject.pbjson.dart | 0 .../proto/talk_reject.pbserver.dart | 0 .../proto/talk_reject.proto | 0 .../proto/talk_request.pb.dart | 0 .../proto/talk_request.pbenum.dart | 0 .../proto/talk_request.pbjson.dart | 0 .../proto/talk_request.pbserver.dart | 0 .../proto/talk_request.proto | 0 .../proto/test.pb.dart | 0 .../proto/test.pbenum.dart | 0 .../proto/test.pbjson.dart | 0 .../proto/test.pbserver.dart | 0 .../proto/test.proto | 0 .../star_chart_manage.dart} | 60 +++++++++++-------- .../status/appLifecycle_observer.dart | 2 +- .../status/star_chart_talk_status.dart} | 2 +- .../views/talkView/talk_view_logic.dart | 12 ++-- .../views/talkView/talk_view_page.dart | 16 +++-- .../views/talkView/talk_view_state.dart | 8 +-- .../webView/h264_web_view.dart | 4 +- lib/tools/storage.dart | 4 +- 161 files changed, 295 insertions(+), 285 deletions(-) rename lib/talk/{startChart => starChart}/command/message_command.dart (93%) rename lib/talk/{startChart => starChart}/constant/exception_constant.dart (100%) rename lib/talk/{startChart => starChart}/constant/ip_constant.dart (100%) rename lib/talk/{startChart => starChart}/constant/listen_addr_type_constant.dart (100%) rename lib/talk/{startChart => starChart}/constant/message_type_constant.dart (100%) rename lib/talk/{startChart => starChart}/constant/payload_type_constant.dart (100%) rename lib/talk/{startChart => starChart}/constant/protocol_flag_constant.dart (100%) rename lib/talk/{startChart => starChart}/constant/talk_constant.dart (100%) rename lib/talk/{startChart => starChart}/constant/talk_status.dart (100%) rename lib/talk/{startChart => starChart}/constant/udp_constant.dart (100%) rename lib/talk/{startChart => starChart}/entity/heartbeat_response.dart (100%) rename lib/talk/{startChart => starChart}/entity/login_response.dart (100%) rename lib/talk/{startChart => starChart}/entity/relay_info_entity.dart (100%) rename lib/talk/{startChart => starChart}/entity/report_information_data.dart (100%) rename lib/talk/{startChart => starChart}/entity/scp_message.dart (97%) rename lib/talk/{startChart => starChart}/entity/star_chart_register_node_entity.dart (100%) rename lib/talk/{startChart => starChart}/exception/start_chart_message_exception.dart (100%) rename lib/talk/{startChart => starChart}/exception/start_chart_talk_status_exception.dart (100%) rename lib/talk/{startChart => starChart}/handle/impl/debug_Info_model.dart (100%) rename lib/talk/{startChart => starChart}/handle/impl/udp_echo_test_handler.dart (82%) rename lib/talk/{startChart => starChart}/handle/impl/udp_gateway_reset_handler.dart (78%) rename lib/talk/{startChart => starChart}/handle/impl/udp_gateway_transfer_handler.dart (71%) rename lib/talk/{startChart => starChart}/handle/impl/udp_go_online_handler.dart (76%) rename lib/talk/{startChart => starChart}/handle/impl/udp_heart_beat_handler.dart (75%) rename lib/talk/{startChart => starChart}/handle/impl/udp_rbcuInfo_handler.dart (78%) rename lib/talk/{startChart => starChart}/handle/impl/udp_rbcuProBe_handler.dart (72%) rename lib/talk/{startChart => starChart}/handle/impl/udp_remote_un_lock_handler.dart (66%) rename lib/talk/{startChart => starChart}/handle/impl/udp_talk_accept_handler.dart (75%) rename lib/talk/{startChart => starChart}/handle/impl/udp_talk_data_handler.dart (93%) rename lib/talk/{startChart => starChart}/handle/impl/udp_talk_expect_handler.dart (76%) rename lib/talk/{startChart => starChart}/handle/impl/udp_talk_hangup_handler.dart (80%) rename lib/talk/{startChart => starChart}/handle/impl/udp_talk_ping_handler.dart (75%) rename lib/talk/{startChart => starChart}/handle/impl/udp_talk_push_handler.dart (70%) rename lib/talk/{startChart => starChart}/handle/impl/udp_talk_receiver_transfer_handler.dart (69%) rename lib/talk/{startChart => starChart}/handle/impl/udp_talk_reject_handler.dart (78%) rename lib/talk/{startChart => starChart}/handle/impl/udp_talk_request_handler.dart (86%) rename lib/talk/{startChart => starChart}/handle/impl/unknow_payload_type_handler.dart (82%) rename lib/talk/{startChart => starChart}/handle/other/do_sign.dart (97%) rename lib/talk/{startChart => starChart}/handle/other/talk_data_repository.dart (96%) rename lib/talk/{startChart => starChart}/handle/other/talke_data_over_time_timer_manager.dart (83%) rename lib/talk/{startChart => starChart}/handle/other/talke_ping_over_time_timer_manager.dart (86%) rename lib/talk/{startChart => starChart}/handle/other/talke_request_over_time_timer_manager.dart (83%) rename lib/talk/{startChart => starChart}/handle/scp_message_base_handle.dart (83%) rename lib/talk/{startChart => starChart}/handle/scp_message_handle.dart (89%) rename lib/talk/{startChart => starChart}/handle/scp_message_handler_factory.dart (50%) rename lib/talk/{startChart => starChart}/proto/ble_message.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/ble_message.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/ble_message.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/ble_message.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/ble_message.proto (100%) rename lib/talk/{startChart => starChart}/proto/device_scan.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/device_scan.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/device_scan.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/device_scan.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/device_scan.proto (100%) rename lib/talk/{startChart => starChart}/proto/gateway_reset.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/gateway_reset.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/gateway_reset.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/gateway_reset.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/gateway_reset.proto (100%) rename lib/talk/{startChart => starChart}/proto/gateway_transfer.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/gateway_transfer.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/gateway_transfer.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/gateway_transfer.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/gateway_transfer.proto (100%) rename lib/talk/{startChart => starChart}/proto/generic.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/generic.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/generic.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/generic.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/generic.proto (100%) rename lib/talk/{startChart => starChart}/proto/rbcu.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/rbcu.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/rbcu.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/rbcu.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/rbcu.proto (100%) rename lib/talk/{startChart => starChart}/proto/remote_unlock.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/remote_unlock.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/remote_unlock.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/remote_unlock.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/remote_unlock.proto (100%) rename lib/talk/{startChart => starChart}/proto/talk_accept.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_accept.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_accept.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_accept.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_accept.proto (100%) rename lib/talk/{startChart => starChart}/proto/talk_data.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_data.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_data.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_data.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_data.proto (100%) rename lib/talk/{startChart => starChart}/proto/talk_data_h264_frame.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_data_h264_frame.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_data_h264_frame.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_data_h264_frame.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_data_h264_frame.proto (100%) rename lib/talk/{startChart => starChart}/proto/talk_expect.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_expect.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_expect.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_expect.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_expect.proto (100%) rename lib/talk/{startChart => starChart}/proto/talk_hangup.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_hangup.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_hangup.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_hangup.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_hangup.proto (100%) rename lib/talk/{startChart => starChart}/proto/talk_ping.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_ping.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_ping.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_ping.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_ping.proto (100%) rename lib/talk/{startChart => starChart}/proto/talk_push.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_push.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_push.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_push.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_push.proto (100%) rename lib/talk/{startChart => starChart}/proto/talk_receiver_transfer.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_receiver_transfer.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_receiver_transfer.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_receiver_transfer.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_receiver_transfer.proto (100%) rename lib/talk/{startChart => starChart}/proto/talk_reject.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_reject.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_reject.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_reject.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_reject.proto (100%) rename lib/talk/{startChart => starChart}/proto/talk_request.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_request.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_request.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_request.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/talk_request.proto (100%) rename lib/talk/{startChart => starChart}/proto/test.pb.dart (100%) rename lib/talk/{startChart => starChart}/proto/test.pbenum.dart (100%) rename lib/talk/{startChart => starChart}/proto/test.pbjson.dart (100%) rename lib/talk/{startChart => starChart}/proto/test.pbserver.dart (100%) rename lib/talk/{startChart => starChart}/proto/test.proto (100%) rename lib/talk/{startChart/start_chart_manage.dart => starChart/star_chart_manage.dart} (94%) rename lib/talk/{startChart => starChart}/status/appLifecycle_observer.dart (94%) rename lib/talk/{startChart/status/start_chart_talk_status.dart => starChart/status/star_chart_talk_status.dart} (97%) rename lib/talk/{startChart => starChart}/views/talkView/talk_view_logic.dart (98%) rename lib/talk/{startChart => starChart}/views/talkView/talk_view_page.dart (97%) rename lib/talk/{startChart => starChart}/views/talkView/talk_view_state.dart (92%) rename lib/talk/{startChart => starChart}/webView/h264_web_view.dart (96%) diff --git a/lib/appRouters.dart b/lib/appRouters.dart index 50aec2f6..c7d403a1 100755 --- a/lib/appRouters.dart +++ b/lib/appRouters.dart @@ -60,7 +60,7 @@ import 'package:star_lock/mine/mineSet/transferSmartLock/transferSmartLockList/t import 'package:star_lock/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_page.dart'; import 'package:star_lock/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_page.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_page.dart'; -import 'package:star_lock/talk/startChart/views/talkView/talk_view_page.dart'; +import 'package:star_lock/talk/starChart/views/talkView/talk_view_page.dart'; import 'common/safetyVerification/safetyVerification_page.dart'; import 'login/forgetPassword/starLock_forgetPassword_page.dart'; diff --git a/lib/blue/io_tool/manager_event_bus.dart b/lib/blue/io_tool/manager_event_bus.dart index 566a1899..d68053c3 100755 --- a/lib/blue/io_tool/manager_event_bus.dart +++ b/lib/blue/io_tool/manager_event_bus.dart @@ -1,32 +1,28 @@ - - import 'package:event_bus/event_bus.dart'; class EventBusManager { - factory EventBusManager() => shareManager(); - EventBusManager._init(){ + + EventBusManager._init() { eventBus = EventBus(sync: false); } + EventBus? eventBus; static EventBusManager? _manager; - static EventBusManager shareManager(){ + static EventBusManager shareManager() { _manager ??= EventBusManager._init(); return _manager!; } + EventBusManager get manager => shareManager(); + //发送事件 eventBusFir(dynamic event) { eventBus?.fire(event); } - // 发送事件 - void fireEvent(dynamic event) { - eventBus?.fire(event); - } - // 获取 EventBus 实例 EventBus? get bus => eventBus; } diff --git a/lib/login/login/starLock_login_logic.dart b/lib/login/login/starLock_login_logic.dart index 4dac8e8f..8518669b 100755 --- a/lib/login/login/starLock_login_logic.dart +++ b/lib/login/login/starLock_login_logic.dart @@ -8,7 +8,7 @@ import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart'; import 'package:star_lock/login/login/entity/LoginEntity.dart'; import 'package:star_lock/mine/mine/starLockMine_state.dart'; import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart'; -import 'package:star_lock/talk/startChart/entity/star_chart_register_node_entity.dart'; +import 'package:star_lock/talk/starChart/entity/star_chart_register_node_entity.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import '../../main/lockMian/lockMain/lockMain_logic.dart'; diff --git a/lib/login/login/starLock_login_page.dart b/lib/login/login/starLock_login_page.dart index 2b9be8e9..ea0793c0 100755 --- a/lib/login/login/starLock_login_page.dart +++ b/lib/login/login/starLock_login_page.dart @@ -4,8 +4,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/flavors.dart'; import 'package:star_lock/login/login/starLock_login_state.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_talk_ping_handler.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_talk_ping_handler.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; import 'package:star_lock/tools/appFirstEnterHandle.dart'; import 'package:star_lock/tools/storage.dart'; import 'package:star_lock/tools/wechat/customer_tool.dart'; diff --git a/lib/main.dart b/lib/main.dart index 868bba91..496b2b69 100755 --- a/lib/main.dart +++ b/lib/main.dart @@ -13,8 +13,8 @@ import 'package:star_lock/mine/about/debug/debug_tool.dart'; import 'package:star_lock/network/api_provider.dart'; import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/network/start_chart_api.dart'; -import 'package:star_lock/talk/startChart/handle/impl/debug_Info_model.dart'; -import 'package:star_lock/talk/startChart/status/appLifecycle_observer.dart'; +import 'package:star_lock/talk/starChart/handle/impl/debug_Info_model.dart'; +import 'package:star_lock/talk/starChart/status/appLifecycle_observer.dart'; import 'package:star_lock/tools/bugly/bugly_tool.dart'; import 'package:star_lock/tools/device_info_service.dart'; import 'package:star_lock/tools/platform_info_services.dart'; diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 5e5a253c..ee6895aa 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -13,7 +13,7 @@ import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dar import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart'; import 'package:star_lock/mine/gateway/addGateway/gatewayConfigurationWifi/getGatewayConfiguration_entity.dart'; import 'package:star_lock/network/api_repository.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; import 'package:star_lock/tools/aliyunRealNameAuth/aliyunRealNameAuthHandle.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/bugly/bugly_tool.dart'; diff --git a/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart b/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart index 1e066b81..c64479b0 100755 --- a/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart +++ b/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart @@ -7,7 +7,7 @@ import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/cat import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_state.dart'; import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart'; import 'package:star_lock/network/api_repository.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/storage.dart'; diff --git a/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart b/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart index e49bf4ca..1ae06b97 100755 --- a/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart +++ b/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart @@ -7,7 +7,7 @@ import 'package:star_lock/blue/io_tool/io_tool.dart'; import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart'; import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart'; import 'package:star_lock/network/api_repository.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/storage.dart'; import 'package:star_lock/versionUndate/versionUndate_entity.dart'; diff --git a/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_logic.dart b/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_logic.dart index f1e8c700..7ba96c46 100755 --- a/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_logic.dart +++ b/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_logic.dart @@ -7,7 +7,7 @@ import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_ import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_state.dart'; import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart'; import 'package:star_lock/network/api_repository.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/dateTool.dart'; import 'package:star_lock/tools/storage.dart'; diff --git a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart index efbb595b..4eb5b6c6 100755 --- a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart +++ b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart @@ -15,8 +15,8 @@ import 'package:star_lock/login/login/entity/LoginEntity.dart'; import 'package:star_lock/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifiEntity.dart'; import 'package:star_lock/mine/gateway/addGateway/gatewayConfigurationWifi/getGatewayConfiguration_entity.dart'; import 'package:star_lock/mine/gateway/addGateway/selectGateway/getGatewayInfo_model.dart'; -import 'package:star_lock/talk/startChart/entity/star_chart_register_node_entity.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; +import 'package:star_lock/talk/starChart/entity/star_chart_register_node_entity.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import '../../../../../blue/blue_manage.dart'; diff --git a/lib/main/lockDetail/lockSet/configuringWifi/wifiList/wifiList_logic.dart b/lib/main/lockDetail/lockSet/configuringWifi/wifiList/wifiList_logic.dart index 2804b678..8f95204e 100755 --- a/lib/main/lockDetail/lockSet/configuringWifi/wifiList/wifiList_logic.dart +++ b/lib/main/lockDetail/lockSet/configuringWifi/wifiList/wifiList_logic.dart @@ -4,7 +4,7 @@ import 'package:flutter_blue_plus/flutter_blue_plus.dart'; import 'package:get/get.dart'; import 'package:star_lock/blue/io_gateway/io_gateway_getWifiList.dart'; import 'package:star_lock/blue/io_protocol/io_getWifiList.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import '../../../../../blue/blue_manage.dart'; diff --git a/lib/main/lockDetail/lockSet/liveVideo/liveVideo_logic.dart b/lib/main/lockDetail/lockSet/liveVideo/liveVideo_logic.dart index b5785515..72525db9 100755 --- a/lib/main/lockDetail/lockSet/liveVideo/liveVideo_logic.dart +++ b/lib/main/lockDetail/lockSet/liveVideo/liveVideo_logic.dart @@ -7,7 +7,7 @@ import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_ import 'package:star_lock/main/lockDetail/lockSet/liveVideo/liveVideo_state.dart'; import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart'; import 'package:star_lock/network/api_repository.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/storage.dart'; import 'package:star_lock/versionUndate/versionUndate_entity.dart'; diff --git a/lib/main/lockMian/lockMain/lockMain_logic.dart b/lib/main/lockMian/lockMain/lockMain_logic.dart index 64dddf4b..c2de6a69 100755 --- a/lib/main/lockMian/lockMain/lockMain_logic.dart +++ b/lib/main/lockMian/lockMain/lockMain_logic.dart @@ -11,7 +11,7 @@ import 'package:star_lock/flavors.dart'; import 'package:star_lock/login/login/entity/LoginEntity.dart'; import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_logic.dart'; import 'package:star_lock/main/lockMian/lockList/lockList_logic.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; import 'package:star_lock/tools/eventBusEventManage.dart'; import 'package:star_lock/tools/push/xs_jPhush.dart'; import 'package:star_lock/tools/showTipView.dart'; diff --git a/lib/main/lockMian/lockMain/lockMain_page.dart b/lib/main/lockMian/lockMain/lockMain_page.dart index 6b875202..8d0e50d3 100755 --- a/lib/main/lockMian/lockMain/lockMain_page.dart +++ b/lib/main/lockMian/lockMain/lockMain_page.dart @@ -12,11 +12,11 @@ import 'package:star_lock/blue/blue_manage.dart'; import 'package:star_lock/main/lockMian/lockList/lockList_xhj_page.dart'; import 'package:star_lock/main/lockMian/lockMain/lockMain_state.dart'; import 'package:star_lock/talk/call/g711.dart'; -import 'package:star_lock/talk/startChart/proto/talk_data.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_expect.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_request.pb.dart'; -import 'package:star_lock/talk/startChart/proto/test.pb.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; +import 'package:star_lock/talk/starChart/proto/talk_data.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_expect.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_request.pb.dart'; +import 'package:star_lock/talk/starChart/proto/test.pb.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; import 'package:star_lock/tools/noData.dart'; import 'package:star_lock/tools/submitBtn.dart'; diff --git a/lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart b/lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart index 35da69fd..0cea9990 100755 --- a/lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart +++ b/lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart @@ -8,7 +8,7 @@ import 'package:star_lock/main/lockMian/lockMain/lockMain_page.dart'; import 'package:star_lock/main/lockMian/lockMain/xhj/lockMain_xhj_state.dart'; import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart'; import 'package:star_lock/network/api_repository.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/push/xs_jPhush.dart'; import 'package:star_lock/tools/storage.dart'; diff --git a/lib/mine/mineSet/mineSet/mineSet_logic.dart b/lib/mine/mineSet/mineSet/mineSet_logic.dart index e9666460..15473ec3 100755 --- a/lib/mine/mineSet/mineSet/mineSet_logic.dart +++ b/lib/mine/mineSet/mineSet/mineSet_logic.dart @@ -10,7 +10,7 @@ import 'package:star_lock/mine/mineSet/lockUserManage/expireLockList/expireElect import 'package:star_lock/mine/mineSet/mineSet/mineSet_state.dart'; import 'package:star_lock/mine/mineSet/mineSet/userSettingInfoEntity.dart'; import 'package:star_lock/mine/mineSet/mineSet/weChatQRCodeEntity.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; import 'package:star_lock/tools/push/xs_jPhush.dart'; import 'package:star_lock/tools/showCupertinoAlertView.dart'; import 'package:star_lock/tools/storage.dart'; diff --git a/lib/network/start_chart_api.dart b/lib/network/start_chart_api.dart index 3767f6ca..a8566924 100644 --- a/lib/network/start_chart_api.dart +++ b/lib/network/start_chart_api.dart @@ -3,9 +3,9 @@ import 'dart:convert'; import 'package:get/get.dart'; import 'package:star_lock/network/api_provider.dart'; import 'package:star_lock/network/api_provider_base.dart'; -import 'package:star_lock/talk/startChart/entity/relay_info_entity.dart'; -import 'package:star_lock/talk/startChart/entity/report_information_data.dart'; -import 'package:star_lock/talk/startChart/entity/star_chart_register_node_entity.dart'; +import 'package:star_lock/talk/starChart/entity/relay_info_entity.dart'; +import 'package:star_lock/talk/starChart/entity/report_information_data.dart'; +import 'package:star_lock/talk/starChart/entity/star_chart_register_node_entity.dart'; class StartChartApi extends BaseProvider { // 星图url diff --git a/lib/talk/other/audio_player_manager.dart b/lib/talk/other/audio_player_manager.dart index ff6ffa4c..2c7c5fb9 100644 --- a/lib/talk/other/audio_player_manager.dart +++ b/lib/talk/other/audio_player_manager.dart @@ -1,8 +1,8 @@ import 'package:audioplayers/audioplayers.dart'; import 'package:star_lock/app_settings/app_settings.dart'; -import 'package:star_lock/talk/startChart/constant/udp_constant.dart'; -import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; +import 'package:star_lock/talk/starChart/constant/udp_constant.dart'; +import 'package:star_lock/talk/starChart/proto/generic.pb.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; class AudioPlayerManager { // 私有构造函数，防止外部创建实例 diff --git a/lib/talk/startChart/command/message_command.dart b/lib/talk/starChart/command/message_command.dart similarity index 93% rename from lib/talk/startChart/command/message_command.dart rename to lib/talk/starChart/command/message_command.dart index c90a207a..06dcb314 100644 --- a/lib/talk/startChart/command/message_command.dart +++ b/lib/talk/starChart/command/message_command.dart @@ -1,22 +1,22 @@ import 'dart:convert'; import 'dart:typed_data'; -import 'package:star_lock/talk/startChart/constant/message_type_constant.dart'; -import 'package:star_lock/talk/startChart/constant/payload_type_constant.dart'; -import 'package:star_lock/talk/startChart/constant/protocol_flag_constant.dart'; -import 'package:star_lock/talk/startChart/constant/udp_constant.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/proto/ble_message.pb.dart'; -import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart'; -import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; -import 'package:star_lock/talk/startChart/proto/rbcu.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_accept.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_data.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_expect.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_hangup.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_ping.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_reject.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_request.pb.dart'; +import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; +import 'package:star_lock/talk/starChart/constant/payload_type_constant.dart'; +import 'package:star_lock/talk/starChart/constant/protocol_flag_constant.dart'; +import 'package:star_lock/talk/starChart/constant/udp_constant.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/proto/ble_message.pb.dart'; +import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart'; +import 'package:star_lock/talk/starChart/proto/generic.pb.dart'; +import 'package:star_lock/talk/starChart/proto/rbcu.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_accept.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_data.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_expect.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_hangup.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_ping.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_reject.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_request.pb.dart'; class MessageCommand { // 全局字典，用于存储每个 ToPeerId 对应的当前 messageId diff --git a/lib/talk/startChart/constant/exception_constant.dart b/lib/talk/starChart/constant/exception_constant.dart similarity index 100% rename from lib/talk/startChart/constant/exception_constant.dart rename to lib/talk/starChart/constant/exception_constant.dart diff --git a/lib/talk/startChart/constant/ip_constant.dart b/lib/talk/starChart/constant/ip_constant.dart similarity index 100% rename from lib/talk/startChart/constant/ip_constant.dart rename to lib/talk/starChart/constant/ip_constant.dart diff --git a/lib/talk/startChart/constant/listen_addr_type_constant.dart b/lib/talk/starChart/constant/listen_addr_type_constant.dart similarity index 100% rename from lib/talk/startChart/constant/listen_addr_type_constant.dart rename to lib/talk/starChart/constant/listen_addr_type_constant.dart diff --git a/lib/talk/startChart/constant/message_type_constant.dart b/lib/talk/starChart/constant/message_type_constant.dart similarity index 100% rename from lib/talk/startChart/constant/message_type_constant.dart rename to lib/talk/starChart/constant/message_type_constant.dart diff --git a/lib/talk/startChart/constant/payload_type_constant.dart b/lib/talk/starChart/constant/payload_type_constant.dart similarity index 100% rename from lib/talk/startChart/constant/payload_type_constant.dart rename to lib/talk/starChart/constant/payload_type_constant.dart diff --git a/lib/talk/startChart/constant/protocol_flag_constant.dart b/lib/talk/starChart/constant/protocol_flag_constant.dart similarity index 100% rename from lib/talk/startChart/constant/protocol_flag_constant.dart rename to lib/talk/starChart/constant/protocol_flag_constant.dart diff --git a/lib/talk/startChart/constant/talk_constant.dart b/lib/talk/starChart/constant/talk_constant.dart similarity index 100% rename from lib/talk/startChart/constant/talk_constant.dart rename to lib/talk/starChart/constant/talk_constant.dart diff --git a/lib/talk/startChart/constant/talk_status.dart b/lib/talk/starChart/constant/talk_status.dart similarity index 100% rename from lib/talk/startChart/constant/talk_status.dart rename to lib/talk/starChart/constant/talk_status.dart diff --git a/lib/talk/startChart/constant/udp_constant.dart b/lib/talk/starChart/constant/udp_constant.dart similarity index 100% rename from lib/talk/startChart/constant/udp_constant.dart rename to lib/talk/starChart/constant/udp_constant.dart diff --git a/lib/talk/startChart/entity/heartbeat_response.dart b/lib/talk/starChart/entity/heartbeat_response.dart similarity index 100% rename from lib/talk/startChart/entity/heartbeat_response.dart rename to lib/talk/starChart/entity/heartbeat_response.dart diff --git a/lib/talk/startChart/entity/login_response.dart b/lib/talk/starChart/entity/login_response.dart similarity index 100% rename from lib/talk/startChart/entity/login_response.dart rename to lib/talk/starChart/entity/login_response.dart diff --git a/lib/talk/startChart/entity/relay_info_entity.dart b/lib/talk/starChart/entity/relay_info_entity.dart similarity index 100% rename from lib/talk/startChart/entity/relay_info_entity.dart rename to lib/talk/starChart/entity/relay_info_entity.dart diff --git a/lib/talk/startChart/entity/report_information_data.dart b/lib/talk/starChart/entity/report_information_data.dart similarity index 100% rename from lib/talk/startChart/entity/report_information_data.dart rename to lib/talk/starChart/entity/report_information_data.dart diff --git a/lib/talk/startChart/entity/scp_message.dart b/lib/talk/starChart/entity/scp_message.dart similarity index 97% rename from lib/talk/startChart/entity/scp_message.dart rename to lib/talk/starChart/entity/scp_message.dart index 48a97f3b..fc8a3141 100644 --- a/lib/talk/startChart/entity/scp_message.dart +++ b/lib/talk/starChart/entity/scp_message.dart @@ -1,10 +1,10 @@ import 'dart:convert'; import 'dart:typed_data'; import 'package:star_lock/app_settings/app_settings.dart'; -import 'package:star_lock/talk/startChart/exception/start_chart_message_exception.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_heart_beat_handler.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handler_factory.dart'; +import 'package:star_lock/talk/starChart/exception/start_chart_message_exception.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_heart_beat_handler.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handler_factory.dart'; class ScpMessage { ScpMessage({ diff --git a/lib/talk/startChart/entity/star_chart_register_node_entity.dart b/lib/talk/starChart/entity/star_chart_register_node_entity.dart similarity index 100% rename from lib/talk/startChart/entity/star_chart_register_node_entity.dart rename to lib/talk/starChart/entity/star_chart_register_node_entity.dart diff --git a/lib/talk/startChart/exception/start_chart_message_exception.dart b/lib/talk/starChart/exception/start_chart_message_exception.dart similarity index 100% rename from lib/talk/startChart/exception/start_chart_message_exception.dart rename to lib/talk/starChart/exception/start_chart_message_exception.dart diff --git a/lib/talk/startChart/exception/start_chart_talk_status_exception.dart b/lib/talk/starChart/exception/start_chart_talk_status_exception.dart similarity index 100% rename from lib/talk/startChart/exception/start_chart_talk_status_exception.dart rename to lib/talk/starChart/exception/start_chart_talk_status_exception.dart diff --git a/lib/talk/startChart/handle/impl/debug_Info_model.dart b/lib/talk/starChart/handle/impl/debug_Info_model.dart similarity index 100% rename from lib/talk/startChart/handle/impl/debug_Info_model.dart rename to lib/talk/starChart/handle/impl/debug_Info_model.dart diff --git a/lib/talk/startChart/handle/impl/udp_echo_test_handler.dart b/lib/talk/starChart/handle/impl/udp_echo_test_handler.dart similarity index 82% rename from lib/talk/startChart/handle/impl/udp_echo_test_handler.dart rename to lib/talk/starChart/handle/impl/udp_echo_test_handler.dart index a814992c..beebeb75 100644 --- a/lib/talk/startChart/handle/impl/udp_echo_test_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_echo_test_handler.dart @@ -3,12 +3,12 @@ import 'dart:typed_data'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/proto/talk_data.pb.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/proto/talk_data.pb.dart'; -import '../../start_chart_manage.dart'; +import '../../star_chart_manage.dart'; class UdpEchoTestHandler extends ScpMessageBaseHandle implements ScpMessageHandler { diff --git a/lib/talk/startChart/handle/impl/udp_gateway_reset_handler.dart b/lib/talk/starChart/handle/impl/udp_gateway_reset_handler.dart similarity index 78% rename from lib/talk/startChart/handle/impl/udp_gateway_reset_handler.dart rename to lib/talk/starChart/handle/impl/udp_gateway_reset_handler.dart index b0a54741..81b32e9d 100644 --- a/lib/talk/startChart/handle/impl/udp_gateway_reset_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_gateway_reset_handler.dart @@ -3,13 +3,13 @@ import 'dart:typed_data'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; -import 'package:star_lock/talk/startChart/constant/message_type_constant.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart'; +import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart'; -import '../../start_chart_manage.dart'; +import '../../star_chart_manage.dart'; class UdpGateWayResetHandler extends ScpMessageBaseHandle implements ScpMessageHandler { diff --git a/lib/talk/startChart/handle/impl/udp_gateway_transfer_handler.dart b/lib/talk/starChart/handle/impl/udp_gateway_transfer_handler.dart similarity index 71% rename from lib/talk/startChart/handle/impl/udp_gateway_transfer_handler.dart rename to lib/talk/starChart/handle/impl/udp_gateway_transfer_handler.dart index 705c5ffe..97dca7f3 100644 --- a/lib/talk/startChart/handle/impl/udp_gateway_transfer_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_gateway_transfer_handler.dart @@ -3,15 +3,15 @@ import 'dart:typed_data'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; -import 'package:star_lock/talk/startChart/constant/message_type_constant.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart'; -import 'package:star_lock/talk/startChart/proto/gateway_transfer.pb.dart'; -import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; +import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart'; +import 'package:star_lock/talk/starChart/proto/gateway_transfer.pb.dart'; +import 'package:star_lock/talk/starChart/proto/generic.pb.dart'; -import '../../start_chart_manage.dart'; +import '../../star_chart_manage.dart'; class UdpGateWayTransferHandler extends ScpMessageBaseHandle implements ScpMessageHandler { diff --git a/lib/talk/startChart/handle/impl/udp_go_online_handler.dart b/lib/talk/starChart/handle/impl/udp_go_online_handler.dart similarity index 76% rename from lib/talk/startChart/handle/impl/udp_go_online_handler.dart rename to lib/talk/starChart/handle/impl/udp_go_online_handler.dart index f3e9dd69..d9029777 100644 --- a/lib/talk/startChart/handle/impl/udp_go_online_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_go_online_handler.dart @@ -1,12 +1,12 @@ import 'dart:typed_data'; -import 'package:star_lock/talk/startChart/constant/payload_type_constant.dart'; -import 'package:star_lock/talk/startChart/entity/login_response.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/constant/payload_type_constant.dart'; +import 'package:star_lock/talk/starChart/entity/login_response.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; -import '../../start_chart_manage.dart'; +import '../../star_chart_manage.dart'; class UdpGoOnlineHandler extends ScpMessageBaseHandle implements ScpMessageHandler { diff --git a/lib/talk/startChart/handle/impl/udp_heart_beat_handler.dart b/lib/talk/starChart/handle/impl/udp_heart_beat_handler.dart similarity index 75% rename from lib/talk/startChart/handle/impl/udp_heart_beat_handler.dart rename to lib/talk/starChart/handle/impl/udp_heart_beat_handler.dart index 5f0a6031..6cdb5305 100644 --- a/lib/talk/startChart/handle/impl/udp_heart_beat_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_heart_beat_handler.dart @@ -1,13 +1,13 @@ import 'dart:typed_data'; -import 'package:star_lock/talk/startChart/constant/payload_type_constant.dart'; -import 'package:star_lock/talk/startChart/entity/heartbeat_response.dart'; -import 'package:star_lock/talk/startChart/entity/login_response.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/constant/payload_type_constant.dart'; +import 'package:star_lock/talk/starChart/entity/heartbeat_response.dart'; +import 'package:star_lock/talk/starChart/entity/login_response.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; -import '../../start_chart_manage.dart'; +import '../../star_chart_manage.dart'; class UdpHeartBeatHandler extends ScpMessageBaseHandle implements ScpMessageHandler { diff --git a/lib/talk/startChart/handle/impl/udp_rbcuInfo_handler.dart b/lib/talk/starChart/handle/impl/udp_rbcuInfo_handler.dart similarity index 78% rename from lib/talk/startChart/handle/impl/udp_rbcuInfo_handler.dart rename to lib/talk/starChart/handle/impl/udp_rbcuInfo_handler.dart index 63e532a8..7e3bc531 100644 --- a/lib/talk/startChart/handle/impl/udp_rbcuInfo_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_rbcuInfo_handler.dart @@ -1,12 +1,12 @@ import 'package:star_lock/login/selectCountryRegion/common/index.dart'; -import 'package:star_lock/talk/startChart/constant/message_type_constant.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; -import 'package:star_lock/talk/startChart/proto/rbcu.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_request.pb.dart'; +import 'package:star_lock/talk/starChart/proto/generic.pb.dart'; +import 'package:star_lock/talk/starChart/proto/rbcu.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_request.pb.dart'; class UdpRbcuInfoHandler extends ScpMessageBaseHandle implements ScpMessageHandler { diff --git a/lib/talk/startChart/handle/impl/udp_rbcuProBe_handler.dart b/lib/talk/starChart/handle/impl/udp_rbcuProBe_handler.dart similarity index 72% rename from lib/talk/startChart/handle/impl/udp_rbcuProBe_handler.dart rename to lib/talk/starChart/handle/impl/udp_rbcuProBe_handler.dart index aea2b1cb..90a8aeef 100644 --- a/lib/talk/startChart/handle/impl/udp_rbcuProBe_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_rbcuProBe_handler.dart @@ -1,12 +1,12 @@ import 'package:star_lock/login/selectCountryRegion/common/index.dart'; -import 'package:star_lock/talk/startChart/constant/message_type_constant.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; -import 'package:star_lock/talk/startChart/proto/rbcu.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_request.pb.dart'; +import 'package:star_lock/talk/starChart/proto/generic.pb.dart'; +import 'package:star_lock/talk/starChart/proto/rbcu.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_request.pb.dart'; class UdpRbcuProBeHandler extends ScpMessageBaseHandle implements ScpMessageHandler { diff --git a/lib/talk/startChart/handle/impl/udp_remote_un_lock_handler.dart b/lib/talk/starChart/handle/impl/udp_remote_un_lock_handler.dart similarity index 66% rename from lib/talk/startChart/handle/impl/udp_remote_un_lock_handler.dart rename to lib/talk/starChart/handle/impl/udp_remote_un_lock_handler.dart index 9e037284..0de73653 100644 --- a/lib/talk/startChart/handle/impl/udp_remote_un_lock_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_remote_un_lock_handler.dart @@ -4,16 +4,16 @@ import 'dart:typed_data'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; import 'package:star_lock/appRouters.dart'; -import 'package:star_lock/talk/startChart/constant/message_type_constant.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/proto/ble_message.pbserver.dart'; -import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart'; -import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; -import 'package:star_lock/talk/startChart/proto/remote_unlock.pb.dart'; +import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/proto/ble_message.pbserver.dart'; +import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart'; +import 'package:star_lock/talk/starChart/proto/generic.pb.dart'; +import 'package:star_lock/talk/starChart/proto/remote_unlock.pb.dart'; -import '../../start_chart_manage.dart'; +import '../../star_chart_manage.dart'; class UdpRemoteUnLockHandler extends ScpMessageBaseHandle implements ScpMessageHandler { diff --git a/lib/talk/startChart/handle/impl/udp_talk_accept_handler.dart b/lib/talk/starChart/handle/impl/udp_talk_accept_handler.dart similarity index 75% rename from lib/talk/startChart/handle/impl/udp_talk_accept_handler.dart rename to lib/talk/starChart/handle/impl/udp_talk_accept_handler.dart index a47dce87..0f145cd4 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_accept_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_talk_accept_handler.dart @@ -4,17 +4,17 @@ import 'dart:typed_data'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_pcm_sound/flutter_pcm_sound.dart'; import 'package:get/get.dart'; -import 'package:star_lock/talk/startChart/constant/message_type_constant.dart'; -import 'package:star_lock/talk/startChart/constant/talk_status.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart'; -import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_accept.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_expect.pb.dart'; +import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; +import 'package:star_lock/talk/starChart/constant/talk_status.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart'; +import 'package:star_lock/talk/starChart/proto/generic.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_accept.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_expect.pb.dart'; -import '../../start_chart_manage.dart'; +import '../../star_chart_manage.dart'; class UdpTalkAcceptHandler extends ScpMessageBaseHandle implements ScpMessageHandler { diff --git a/lib/talk/startChart/handle/impl/udp_talk_data_handler.dart b/lib/talk/starChart/handle/impl/udp_talk_data_handler.dart similarity index 93% rename from lib/talk/startChart/handle/impl/udp_talk_data_handler.dart rename to lib/talk/starChart/handle/impl/udp_talk_data_handler.dart index a9b04269..4308fc3d 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_data_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_talk_data_handler.dart @@ -1,12 +1,12 @@ import 'dart:typed_data'; import 'package:star_lock/app_settings/app_settings.dart'; -import 'package:star_lock/talk/startChart/constant/message_type_constant.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/proto/talk_data.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_data.pbserver.dart'; -import 'package:star_lock/talk/startChart/proto/talk_data_h264_frame.pb.dart'; +import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/proto/talk_data.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_data.pbserver.dart'; +import 'package:star_lock/talk/starChart/proto/talk_data_h264_frame.pb.dart'; // class UdpTalkDataHandler extends ScpMessageBaseHandle // implements ScpMessageHandler { diff --git a/lib/talk/startChart/handle/impl/udp_talk_expect_handler.dart b/lib/talk/starChart/handle/impl/udp_talk_expect_handler.dart similarity index 76% rename from lib/talk/startChart/handle/impl/udp_talk_expect_handler.dart rename to lib/talk/starChart/handle/impl/udp_talk_expect_handler.dart index f1a6007a..20dc1d2f 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_expect_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_talk_expect_handler.dart @@ -4,19 +4,19 @@ import 'dart:typed_data'; import 'package:flutter/services.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; -import 'package:star_lock/talk/startChart/constant/message_type_constant.dart'; -import 'package:star_lock/talk/startChart/constant/talk_status.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart'; -import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_data.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_expect.pb.dart'; -import 'package:star_lock/talk/startChart/views/talkView/talk_view_logic.dart'; -import 'package:star_lock/talk/startChart/views/talkView/talk_view_state.dart'; +import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; +import 'package:star_lock/talk/starChart/constant/talk_status.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart'; +import 'package:star_lock/talk/starChart/proto/generic.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_data.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_expect.pb.dart'; +import 'package:star_lock/talk/starChart/views/talkView/talk_view_logic.dart'; +import 'package:star_lock/talk/starChart/views/talkView/talk_view_state.dart'; -import '../../start_chart_manage.dart'; +import '../../star_chart_manage.dart'; class UdpTalkExpectHandler extends ScpMessageBaseHandle implements ScpMessageHandler { diff --git a/lib/talk/startChart/handle/impl/udp_talk_hangup_handler.dart b/lib/talk/starChart/handle/impl/udp_talk_hangup_handler.dart similarity index 80% rename from lib/talk/startChart/handle/impl/udp_talk_hangup_handler.dart rename to lib/talk/starChart/handle/impl/udp_talk_hangup_handler.dart index 80a9051a..89d984d4 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_hangup_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_talk_hangup_handler.dart @@ -2,16 +2,16 @@ import 'dart:convert'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; -import 'package:star_lock/talk/startChart/constant/message_type_constant.dart'; -import 'package:star_lock/talk/startChart/constant/talk_status.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; +import 'package:star_lock/talk/starChart/constant/talk_status.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_hangup.pb.dart'; +import 'package:star_lock/talk/starChart/proto/generic.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_hangup.pb.dart'; -import '../../start_chart_manage.dart'; +import '../../star_chart_manage.dart'; class UdpTalkHangUpHandler extends ScpMessageBaseHandle implements ScpMessageHandler { diff --git a/lib/talk/startChart/handle/impl/udp_talk_ping_handler.dart b/lib/talk/starChart/handle/impl/udp_talk_ping_handler.dart similarity index 75% rename from lib/talk/startChart/handle/impl/udp_talk_ping_handler.dart rename to lib/talk/starChart/handle/impl/udp_talk_ping_handler.dart index 59cbabeb..3a995f13 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_ping_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_talk_ping_handler.dart @@ -1,13 +1,13 @@ import 'dart:convert'; import 'dart:typed_data'; -import 'package:star_lock/talk/startChart/constant/message_type_constant.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_ping.pb.dart'; +import 'package:star_lock/talk/starChart/proto/generic.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_ping.pb.dart'; class UdpTalkPingHandler extends ScpMessageBaseHandle implements ScpMessageHandler { diff --git a/lib/talk/startChart/handle/impl/udp_talk_push_handler.dart b/lib/talk/starChart/handle/impl/udp_talk_push_handler.dart similarity index 70% rename from lib/talk/startChart/handle/impl/udp_talk_push_handler.dart rename to lib/talk/starChart/handle/impl/udp_talk_push_handler.dart index addcedbc..c8442fc5 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_push_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_talk_push_handler.dart @@ -3,15 +3,15 @@ import 'dart:typed_data'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; -import 'package:star_lock/talk/startChart/constant/message_type_constant.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart'; -import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_push.pb.dart'; +import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart'; +import 'package:star_lock/talk/starChart/proto/generic.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_push.pb.dart'; -import '../../start_chart_manage.dart'; +import '../../star_chart_manage.dart'; class UdpTalkPushHandler extends ScpMessageBaseHandle implements ScpMessageHandler { diff --git a/lib/talk/startChart/handle/impl/udp_talk_receiver_transfer_handler.dart b/lib/talk/starChart/handle/impl/udp_talk_receiver_transfer_handler.dart similarity index 69% rename from lib/talk/startChart/handle/impl/udp_talk_receiver_transfer_handler.dart rename to lib/talk/starChart/handle/impl/udp_talk_receiver_transfer_handler.dart index 154afbac..2e50e1fe 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_receiver_transfer_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_talk_receiver_transfer_handler.dart @@ -3,15 +3,15 @@ import 'dart:typed_data'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; -import 'package:star_lock/talk/startChart/constant/message_type_constant.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart'; -import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_receiver_transfer.pb.dart'; +import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart'; +import 'package:star_lock/talk/starChart/proto/generic.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_receiver_transfer.pb.dart'; -import '../../start_chart_manage.dart'; +import '../../star_chart_manage.dart'; class UdpTalkReceiverTransferHandler extends ScpMessageBaseHandle implements ScpMessageHandler { diff --git a/lib/talk/startChart/handle/impl/udp_talk_reject_handler.dart b/lib/talk/starChart/handle/impl/udp_talk_reject_handler.dart similarity index 78% rename from lib/talk/startChart/handle/impl/udp_talk_reject_handler.dart rename to lib/talk/starChart/handle/impl/udp_talk_reject_handler.dart index c292ba8e..b12cf70a 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_reject_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_talk_reject_handler.dart @@ -3,15 +3,15 @@ import 'dart:typed_data'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; -import 'package:star_lock/talk/startChart/constant/message_type_constant.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart'; -import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_reject.pb.dart'; +import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart'; +import 'package:star_lock/talk/starChart/proto/generic.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_reject.pb.dart'; -import '../../start_chart_manage.dart'; +import '../../star_chart_manage.dart'; class UdpTalkRejectHandler extends ScpMessageBaseHandle implements ScpMessageHandler { diff --git a/lib/talk/startChart/handle/impl/udp_talk_request_handler.dart b/lib/talk/starChart/handle/impl/udp_talk_request_handler.dart similarity index 86% rename from lib/talk/startChart/handle/impl/udp_talk_request_handler.dart rename to lib/talk/starChart/handle/impl/udp_talk_request_handler.dart index 9acc4752..ed3953bc 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_request_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_talk_request_handler.dart @@ -5,15 +5,15 @@ import 'package:flutter/services.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:get/get.dart'; import 'package:star_lock/appRouters.dart'; -import 'package:star_lock/talk/startChart/constant/message_type_constant.dart'; -import 'package:star_lock/talk/startChart/constant/talk_status.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart'; -import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_expect.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_request.pb.dart'; +import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; +import 'package:star_lock/talk/starChart/constant/talk_status.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart'; +import 'package:star_lock/talk/starChart/proto/generic.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_expect.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_request.pb.dart'; import 'package:star_lock/tools/storage.dart'; class UdpTalkRequestHandler extends ScpMessageBaseHandle diff --git a/lib/talk/startChart/handle/impl/unknow_payload_type_handler.dart b/lib/talk/starChart/handle/impl/unknow_payload_type_handler.dart similarity index 82% rename from lib/talk/startChart/handle/impl/unknow_payload_type_handler.dart rename to lib/talk/starChart/handle/impl/unknow_payload_type_handler.dart index 29665244..26c504ca 100644 --- a/lib/talk/startChart/handle/impl/unknow_payload_type_handler.dart +++ b/lib/talk/starChart/handle/impl/unknow_payload_type_handler.dart @@ -1,9 +1,9 @@ import 'dart:typed_data'; import 'package:star_lock/app_settings/app_settings.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; class UnKnowPayloadTypeHandler extends ScpMessageBaseHandle implements ScpMessageHandler { diff --git a/lib/talk/startChart/handle/other/do_sign.dart b/lib/talk/starChart/handle/other/do_sign.dart similarity index 97% rename from lib/talk/startChart/handle/other/do_sign.dart rename to lib/talk/starChart/handle/other/do_sign.dart index c02c9aa6..5466012d 100644 --- a/lib/talk/startChart/handle/other/do_sign.dart +++ b/lib/talk/starChart/handle/other/do_sign.dart @@ -7,7 +7,7 @@ import 'package:flutter/services.dart'; import 'package:pointycastle/export.dart' as pc; import 'dart:convert'; import 'package:asn1lib/asn1lib.dart' as asn1lib; -import 'package:star_lock/talk/startChart/exception/start_chart_message_exception.dart'; // Prefix for asn1lib +import 'package:star_lock/talk/starChart/exception/start_chart_message_exception.dart'; // Prefix for asn1lib class DoSign { // 生成签名sing diff --git a/lib/talk/startChart/handle/other/talk_data_repository.dart b/lib/talk/starChart/handle/other/talk_data_repository.dart similarity index 96% rename from lib/talk/startChart/handle/other/talk_data_repository.dart rename to lib/talk/starChart/handle/other/talk_data_repository.dart index 2a994bdd..90fc77df 100644 --- a/lib/talk/startChart/handle/other/talk_data_repository.dart +++ b/lib/talk/starChart/handle/other/talk_data_repository.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:star_lock/talk/startChart/proto/talk_data.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_data.pb.dart'; class TalkDataRepository { // 创建一个私有的构造函数，防止外部创建实例 diff --git a/lib/talk/startChart/handle/other/talke_data_over_time_timer_manager.dart b/lib/talk/starChart/handle/other/talke_data_over_time_timer_manager.dart similarity index 83% rename from lib/talk/startChart/handle/other/talke_data_over_time_timer_manager.dart rename to lib/talk/starChart/handle/other/talke_data_over_time_timer_manager.dart index 377f5dc4..4223f441 100644 --- a/lib/talk/startChart/handle/other/talke_data_over_time_timer_manager.dart +++ b/lib/talk/starChart/handle/other/talke_data_over_time_timer_manager.dart @@ -3,10 +3,10 @@ import 'dart:async'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; import 'package:star_lock/talk/other/audio_player_manager.dart'; -import 'package:star_lock/talk/startChart/constant/talk_constant.dart'; -import 'package:star_lock/talk/startChart/constant/talk_status.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; -import 'package:star_lock/talk/startChart/status/start_chart_talk_status.dart'; +import 'package:star_lock/talk/starChart/constant/talk_constant.dart'; +import 'package:star_lock/talk/starChart/constant/talk_status.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; +import 'package:star_lock/talk/starChart/status/star_chart_talk_status.dart'; class TalkDataOverTimeTimerManager { // 单例实例 diff --git a/lib/talk/startChart/handle/other/talke_ping_over_time_timer_manager.dart b/lib/talk/starChart/handle/other/talke_ping_over_time_timer_manager.dart similarity index 86% rename from lib/talk/startChart/handle/other/talke_ping_over_time_timer_manager.dart rename to lib/talk/starChart/handle/other/talke_ping_over_time_timer_manager.dart index 9e4807e5..ac86f94b 100644 --- a/lib/talk/startChart/handle/other/talke_ping_over_time_timer_manager.dart +++ b/lib/talk/starChart/handle/other/talke_ping_over_time_timer_manager.dart @@ -3,10 +3,10 @@ import 'dart:async'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; import 'package:star_lock/app_settings/app_settings.dart'; -import 'package:star_lock/talk/startChart/constant/talk_constant.dart'; -import 'package:star_lock/talk/startChart/constant/talk_status.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; -import 'package:star_lock/talk/startChart/status/start_chart_talk_status.dart'; +import 'package:star_lock/talk/starChart/constant/talk_constant.dart'; +import 'package:star_lock/talk/starChart/constant/talk_status.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; +import 'package:star_lock/talk/starChart/status/star_chart_talk_status.dart'; class TalkePingOverTimeTimerManager { // 单例实例 diff --git a/lib/talk/startChart/handle/other/talke_request_over_time_timer_manager.dart b/lib/talk/starChart/handle/other/talke_request_over_time_timer_manager.dart similarity index 83% rename from lib/talk/startChart/handle/other/talke_request_over_time_timer_manager.dart rename to lib/talk/starChart/handle/other/talke_request_over_time_timer_manager.dart index 6868bfa8..035b098a 100644 --- a/lib/talk/startChart/handle/other/talke_request_over_time_timer_manager.dart +++ b/lib/talk/starChart/handle/other/talke_request_over_time_timer_manager.dart @@ -2,10 +2,10 @@ import 'dart:async'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; -import 'package:star_lock/talk/startChart/constant/talk_constant.dart'; -import 'package:star_lock/talk/startChart/constant/talk_status.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; -import 'package:star_lock/talk/startChart/status/start_chart_talk_status.dart'; +import 'package:star_lock/talk/starChart/constant/talk_constant.dart'; +import 'package:star_lock/talk/starChart/constant/talk_status.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; +import 'package:star_lock/talk/starChart/status/star_chart_talk_status.dart'; class TalkeRequestOverTimeTimerManager { // 单例实例 diff --git a/lib/talk/startChart/handle/scp_message_base_handle.dart b/lib/talk/starChart/handle/scp_message_base_handle.dart similarity index 83% rename from lib/talk/startChart/handle/scp_message_base_handle.dart rename to lib/talk/starChart/handle/scp_message_base_handle.dart index dc3d0514..1fbe013a 100644 --- a/lib/talk/startChart/handle/scp_message_base_handle.dart +++ b/lib/talk/starChart/handle/scp_message_base_handle.dart @@ -9,21 +9,21 @@ import 'package:get/get.dart'; import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/talk/other/audio_player_manager.dart'; -import 'package:star_lock/talk/startChart/constant/payload_type_constant.dart'; +import 'package:star_lock/talk/starChart/constant/payload_type_constant.dart'; -import 'package:star_lock/talk/startChart/constant/udp_constant.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/constant/udp_constant.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/handle/other/talk_data_repository.dart'; -import 'package:star_lock/talk/startChart/handle/other/talke_data_over_time_timer_manager.dart'; -import 'package:star_lock/talk/startChart/handle/other/talke_ping_over_time_timer_manager.dart'; -import 'package:star_lock/talk/startChart/handle/other/talke_request_over_time_timer_manager.dart'; +import 'package:star_lock/talk/starChart/handle/other/talk_data_repository.dart'; +import 'package:star_lock/talk/starChart/handle/other/talke_data_over_time_timer_manager.dart'; +import 'package:star_lock/talk/starChart/handle/other/talke_ping_over_time_timer_manager.dart'; +import 'package:star_lock/talk/starChart/handle/other/talke_request_over_time_timer_manager.dart'; -import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_data.pb.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; +import 'package:star_lock/talk/starChart/proto/generic.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_data.pb.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; -import 'package:star_lock/talk/startChart/status/start_chart_talk_status.dart'; +import 'package:star_lock/talk/starChart/status/star_chart_talk_status.dart'; class ScpMessageBaseHandle { /// 使用单例 TimerManager diff --git a/lib/talk/startChart/handle/scp_message_handle.dart b/lib/talk/starChart/handle/scp_message_handle.dart similarity index 89% rename from lib/talk/startChart/handle/scp_message_handle.dart rename to lib/talk/starChart/handle/scp_message_handle.dart index 352b5f3f..c0b72a15 100644 --- a/lib/talk/startChart/handle/scp_message_handle.dart +++ b/lib/talk/starChart/handle/scp_message_handle.dart @@ -1,6 +1,6 @@ import 'dart:typed_data'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; abstract class ScpMessageHandler { // 处理请求 diff --git a/lib/talk/startChart/handle/scp_message_handler_factory.dart b/lib/talk/starChart/handle/scp_message_handler_factory.dart similarity index 50% rename from lib/talk/startChart/handle/scp_message_handler_factory.dart rename to lib/talk/starChart/handle/scp_message_handler_factory.dart index 73d5df19..67c7a963 100644 --- a/lib/talk/startChart/handle/scp_message_handler_factory.dart +++ b/lib/talk/starChart/handle/scp_message_handler_factory.dart @@ -1,23 +1,23 @@ -import 'package:star_lock/talk/startChart/constant/payload_type_constant.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_ble_passthrough_handler.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_rbcuInfo_handler.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_talk_request_handler.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_echo_test_handler.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_gateway_reset_handler.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_gateway_transfer_handler.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_go_online_handler.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_heart_beat_handler.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_remote_un_lock_handler.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_talk_accept_handler.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_talk_data_handler.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_talk_expect_handler.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_talk_hangup_handler.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_talk_ping_handler.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_talk_push_handler.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_talk_receiver_transfer_handler.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_talk_reject_handler.dart'; -import 'package:star_lock/talk/startChart/handle/impl/unknow_payload_type_handler.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/constant/payload_type_constant.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_ble_passthrough_handler.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_rbcuInfo_handler.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_talk_request_handler.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_echo_test_handler.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_gateway_reset_handler.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_gateway_transfer_handler.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_go_online_handler.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_heart_beat_handler.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_remote_un_lock_handler.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_talk_accept_handler.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_talk_data_handler.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_talk_expect_handler.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_talk_hangup_handler.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_talk_ping_handler.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_talk_push_handler.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_talk_receiver_transfer_handler.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_talk_reject_handler.dart'; +import 'package:star_lock/talk/starChart/handle/impl/unknow_payload_type_handler.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; class ScpMessageHandlerFactory { /// 构造工厂 diff --git a/lib/talk/startChart/proto/ble_message.pb.dart b/lib/talk/starChart/proto/ble_message.pb.dart similarity index 100% rename from lib/talk/startChart/proto/ble_message.pb.dart rename to lib/talk/starChart/proto/ble_message.pb.dart diff --git a/lib/talk/startChart/proto/ble_message.pbenum.dart b/lib/talk/starChart/proto/ble_message.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/ble_message.pbenum.dart rename to lib/talk/starChart/proto/ble_message.pbenum.dart diff --git a/lib/talk/startChart/proto/ble_message.pbjson.dart b/lib/talk/starChart/proto/ble_message.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/ble_message.pbjson.dart rename to lib/talk/starChart/proto/ble_message.pbjson.dart diff --git a/lib/talk/startChart/proto/ble_message.pbserver.dart b/lib/talk/starChart/proto/ble_message.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/ble_message.pbserver.dart rename to lib/talk/starChart/proto/ble_message.pbserver.dart diff --git a/lib/talk/startChart/proto/ble_message.proto b/lib/talk/starChart/proto/ble_message.proto similarity index 100% rename from lib/talk/startChart/proto/ble_message.proto rename to lib/talk/starChart/proto/ble_message.proto diff --git a/lib/talk/startChart/proto/device_scan.pb.dart b/lib/talk/starChart/proto/device_scan.pb.dart similarity index 100% rename from lib/talk/startChart/proto/device_scan.pb.dart rename to lib/talk/starChart/proto/device_scan.pb.dart diff --git a/lib/talk/startChart/proto/device_scan.pbenum.dart b/lib/talk/starChart/proto/device_scan.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/device_scan.pbenum.dart rename to lib/talk/starChart/proto/device_scan.pbenum.dart diff --git a/lib/talk/startChart/proto/device_scan.pbjson.dart b/lib/talk/starChart/proto/device_scan.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/device_scan.pbjson.dart rename to lib/talk/starChart/proto/device_scan.pbjson.dart diff --git a/lib/talk/startChart/proto/device_scan.pbserver.dart b/lib/talk/starChart/proto/device_scan.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/device_scan.pbserver.dart rename to lib/talk/starChart/proto/device_scan.pbserver.dart diff --git a/lib/talk/startChart/proto/device_scan.proto b/lib/talk/starChart/proto/device_scan.proto similarity index 100% rename from lib/talk/startChart/proto/device_scan.proto rename to lib/talk/starChart/proto/device_scan.proto diff --git a/lib/talk/startChart/proto/gateway_reset.pb.dart b/lib/talk/starChart/proto/gateway_reset.pb.dart similarity index 100% rename from lib/talk/startChart/proto/gateway_reset.pb.dart rename to lib/talk/starChart/proto/gateway_reset.pb.dart diff --git a/lib/talk/startChart/proto/gateway_reset.pbenum.dart b/lib/talk/starChart/proto/gateway_reset.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/gateway_reset.pbenum.dart rename to lib/talk/starChart/proto/gateway_reset.pbenum.dart diff --git a/lib/talk/startChart/proto/gateway_reset.pbjson.dart b/lib/talk/starChart/proto/gateway_reset.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/gateway_reset.pbjson.dart rename to lib/talk/starChart/proto/gateway_reset.pbjson.dart diff --git a/lib/talk/startChart/proto/gateway_reset.pbserver.dart b/lib/talk/starChart/proto/gateway_reset.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/gateway_reset.pbserver.dart rename to lib/talk/starChart/proto/gateway_reset.pbserver.dart diff --git a/lib/talk/startChart/proto/gateway_reset.proto b/lib/talk/starChart/proto/gateway_reset.proto similarity index 100% rename from lib/talk/startChart/proto/gateway_reset.proto rename to lib/talk/starChart/proto/gateway_reset.proto diff --git a/lib/talk/startChart/proto/gateway_transfer.pb.dart b/lib/talk/starChart/proto/gateway_transfer.pb.dart similarity index 100% rename from lib/talk/startChart/proto/gateway_transfer.pb.dart rename to lib/talk/starChart/proto/gateway_transfer.pb.dart diff --git a/lib/talk/startChart/proto/gateway_transfer.pbenum.dart b/lib/talk/starChart/proto/gateway_transfer.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/gateway_transfer.pbenum.dart rename to lib/talk/starChart/proto/gateway_transfer.pbenum.dart diff --git a/lib/talk/startChart/proto/gateway_transfer.pbjson.dart b/lib/talk/starChart/proto/gateway_transfer.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/gateway_transfer.pbjson.dart rename to lib/talk/starChart/proto/gateway_transfer.pbjson.dart diff --git a/lib/talk/startChart/proto/gateway_transfer.pbserver.dart b/lib/talk/starChart/proto/gateway_transfer.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/gateway_transfer.pbserver.dart rename to lib/talk/starChart/proto/gateway_transfer.pbserver.dart diff --git a/lib/talk/startChart/proto/gateway_transfer.proto b/lib/talk/starChart/proto/gateway_transfer.proto similarity index 100% rename from lib/talk/startChart/proto/gateway_transfer.proto rename to lib/talk/starChart/proto/gateway_transfer.proto diff --git a/lib/talk/startChart/proto/generic.pb.dart b/lib/talk/starChart/proto/generic.pb.dart similarity index 100% rename from lib/talk/startChart/proto/generic.pb.dart rename to lib/talk/starChart/proto/generic.pb.dart diff --git a/lib/talk/startChart/proto/generic.pbenum.dart b/lib/talk/starChart/proto/generic.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/generic.pbenum.dart rename to lib/talk/starChart/proto/generic.pbenum.dart diff --git a/lib/talk/startChart/proto/generic.pbjson.dart b/lib/talk/starChart/proto/generic.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/generic.pbjson.dart rename to lib/talk/starChart/proto/generic.pbjson.dart diff --git a/lib/talk/startChart/proto/generic.pbserver.dart b/lib/talk/starChart/proto/generic.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/generic.pbserver.dart rename to lib/talk/starChart/proto/generic.pbserver.dart diff --git a/lib/talk/startChart/proto/generic.proto b/lib/talk/starChart/proto/generic.proto similarity index 100% rename from lib/talk/startChart/proto/generic.proto rename to lib/talk/starChart/proto/generic.proto diff --git a/lib/talk/startChart/proto/rbcu.pb.dart b/lib/talk/starChart/proto/rbcu.pb.dart similarity index 100% rename from lib/talk/startChart/proto/rbcu.pb.dart rename to lib/talk/starChart/proto/rbcu.pb.dart diff --git a/lib/talk/startChart/proto/rbcu.pbenum.dart b/lib/talk/starChart/proto/rbcu.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/rbcu.pbenum.dart rename to lib/talk/starChart/proto/rbcu.pbenum.dart diff --git a/lib/talk/startChart/proto/rbcu.pbjson.dart b/lib/talk/starChart/proto/rbcu.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/rbcu.pbjson.dart rename to lib/talk/starChart/proto/rbcu.pbjson.dart diff --git a/lib/talk/startChart/proto/rbcu.pbserver.dart b/lib/talk/starChart/proto/rbcu.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/rbcu.pbserver.dart rename to lib/talk/starChart/proto/rbcu.pbserver.dart diff --git a/lib/talk/startChart/proto/rbcu.proto b/lib/talk/starChart/proto/rbcu.proto similarity index 100% rename from lib/talk/startChart/proto/rbcu.proto rename to lib/talk/starChart/proto/rbcu.proto diff --git a/lib/talk/startChart/proto/remote_unlock.pb.dart b/lib/talk/starChart/proto/remote_unlock.pb.dart similarity index 100% rename from lib/talk/startChart/proto/remote_unlock.pb.dart rename to lib/talk/starChart/proto/remote_unlock.pb.dart diff --git a/lib/talk/startChart/proto/remote_unlock.pbenum.dart b/lib/talk/starChart/proto/remote_unlock.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/remote_unlock.pbenum.dart rename to lib/talk/starChart/proto/remote_unlock.pbenum.dart diff --git a/lib/talk/startChart/proto/remote_unlock.pbjson.dart b/lib/talk/starChart/proto/remote_unlock.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/remote_unlock.pbjson.dart rename to lib/talk/starChart/proto/remote_unlock.pbjson.dart diff --git a/lib/talk/startChart/proto/remote_unlock.pbserver.dart b/lib/talk/starChart/proto/remote_unlock.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/remote_unlock.pbserver.dart rename to lib/talk/starChart/proto/remote_unlock.pbserver.dart diff --git a/lib/talk/startChart/proto/remote_unlock.proto b/lib/talk/starChart/proto/remote_unlock.proto similarity index 100% rename from lib/talk/startChart/proto/remote_unlock.proto rename to lib/talk/starChart/proto/remote_unlock.proto diff --git a/lib/talk/startChart/proto/talk_accept.pb.dart b/lib/talk/starChart/proto/talk_accept.pb.dart similarity index 100% rename from lib/talk/startChart/proto/talk_accept.pb.dart rename to lib/talk/starChart/proto/talk_accept.pb.dart diff --git a/lib/talk/startChart/proto/talk_accept.pbenum.dart b/lib/talk/starChart/proto/talk_accept.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/talk_accept.pbenum.dart rename to lib/talk/starChart/proto/talk_accept.pbenum.dart diff --git a/lib/talk/startChart/proto/talk_accept.pbjson.dart b/lib/talk/starChart/proto/talk_accept.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/talk_accept.pbjson.dart rename to lib/talk/starChart/proto/talk_accept.pbjson.dart diff --git a/lib/talk/startChart/proto/talk_accept.pbserver.dart b/lib/talk/starChart/proto/talk_accept.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/talk_accept.pbserver.dart rename to lib/talk/starChart/proto/talk_accept.pbserver.dart diff --git a/lib/talk/startChart/proto/talk_accept.proto b/lib/talk/starChart/proto/talk_accept.proto similarity index 100% rename from lib/talk/startChart/proto/talk_accept.proto rename to lib/talk/starChart/proto/talk_accept.proto diff --git a/lib/talk/startChart/proto/talk_data.pb.dart b/lib/talk/starChart/proto/talk_data.pb.dart similarity index 100% rename from lib/talk/startChart/proto/talk_data.pb.dart rename to lib/talk/starChart/proto/talk_data.pb.dart diff --git a/lib/talk/startChart/proto/talk_data.pbenum.dart b/lib/talk/starChart/proto/talk_data.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/talk_data.pbenum.dart rename to lib/talk/starChart/proto/talk_data.pbenum.dart diff --git a/lib/talk/startChart/proto/talk_data.pbjson.dart b/lib/talk/starChart/proto/talk_data.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/talk_data.pbjson.dart rename to lib/talk/starChart/proto/talk_data.pbjson.dart diff --git a/lib/talk/startChart/proto/talk_data.pbserver.dart b/lib/talk/starChart/proto/talk_data.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/talk_data.pbserver.dart rename to lib/talk/starChart/proto/talk_data.pbserver.dart diff --git a/lib/talk/startChart/proto/talk_data.proto b/lib/talk/starChart/proto/talk_data.proto similarity index 100% rename from lib/talk/startChart/proto/talk_data.proto rename to lib/talk/starChart/proto/talk_data.proto diff --git a/lib/talk/startChart/proto/talk_data_h264_frame.pb.dart b/lib/talk/starChart/proto/talk_data_h264_frame.pb.dart similarity index 100% rename from lib/talk/startChart/proto/talk_data_h264_frame.pb.dart rename to lib/talk/starChart/proto/talk_data_h264_frame.pb.dart diff --git a/lib/talk/startChart/proto/talk_data_h264_frame.pbenum.dart b/lib/talk/starChart/proto/talk_data_h264_frame.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/talk_data_h264_frame.pbenum.dart rename to lib/talk/starChart/proto/talk_data_h264_frame.pbenum.dart diff --git a/lib/talk/startChart/proto/talk_data_h264_frame.pbjson.dart b/lib/talk/starChart/proto/talk_data_h264_frame.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/talk_data_h264_frame.pbjson.dart rename to lib/talk/starChart/proto/talk_data_h264_frame.pbjson.dart diff --git a/lib/talk/startChart/proto/talk_data_h264_frame.pbserver.dart b/lib/talk/starChart/proto/talk_data_h264_frame.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/talk_data_h264_frame.pbserver.dart rename to lib/talk/starChart/proto/talk_data_h264_frame.pbserver.dart diff --git a/lib/talk/startChart/proto/talk_data_h264_frame.proto b/lib/talk/starChart/proto/talk_data_h264_frame.proto similarity index 100% rename from lib/talk/startChart/proto/talk_data_h264_frame.proto rename to lib/talk/starChart/proto/talk_data_h264_frame.proto diff --git a/lib/talk/startChart/proto/talk_expect.pb.dart b/lib/talk/starChart/proto/talk_expect.pb.dart similarity index 100% rename from lib/talk/startChart/proto/talk_expect.pb.dart rename to lib/talk/starChart/proto/talk_expect.pb.dart diff --git a/lib/talk/startChart/proto/talk_expect.pbenum.dart b/lib/talk/starChart/proto/talk_expect.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/talk_expect.pbenum.dart rename to lib/talk/starChart/proto/talk_expect.pbenum.dart diff --git a/lib/talk/startChart/proto/talk_expect.pbjson.dart b/lib/talk/starChart/proto/talk_expect.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/talk_expect.pbjson.dart rename to lib/talk/starChart/proto/talk_expect.pbjson.dart diff --git a/lib/talk/startChart/proto/talk_expect.pbserver.dart b/lib/talk/starChart/proto/talk_expect.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/talk_expect.pbserver.dart rename to lib/talk/starChart/proto/talk_expect.pbserver.dart diff --git a/lib/talk/startChart/proto/talk_expect.proto b/lib/talk/starChart/proto/talk_expect.proto similarity index 100% rename from lib/talk/startChart/proto/talk_expect.proto rename to lib/talk/starChart/proto/talk_expect.proto diff --git a/lib/talk/startChart/proto/talk_hangup.pb.dart b/lib/talk/starChart/proto/talk_hangup.pb.dart similarity index 100% rename from lib/talk/startChart/proto/talk_hangup.pb.dart rename to lib/talk/starChart/proto/talk_hangup.pb.dart diff --git a/lib/talk/startChart/proto/talk_hangup.pbenum.dart b/lib/talk/starChart/proto/talk_hangup.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/talk_hangup.pbenum.dart rename to lib/talk/starChart/proto/talk_hangup.pbenum.dart diff --git a/lib/talk/startChart/proto/talk_hangup.pbjson.dart b/lib/talk/starChart/proto/talk_hangup.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/talk_hangup.pbjson.dart rename to lib/talk/starChart/proto/talk_hangup.pbjson.dart diff --git a/lib/talk/startChart/proto/talk_hangup.pbserver.dart b/lib/talk/starChart/proto/talk_hangup.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/talk_hangup.pbserver.dart rename to lib/talk/starChart/proto/talk_hangup.pbserver.dart diff --git a/lib/talk/startChart/proto/talk_hangup.proto b/lib/talk/starChart/proto/talk_hangup.proto similarity index 100% rename from lib/talk/startChart/proto/talk_hangup.proto rename to lib/talk/starChart/proto/talk_hangup.proto diff --git a/lib/talk/startChart/proto/talk_ping.pb.dart b/lib/talk/starChart/proto/talk_ping.pb.dart similarity index 100% rename from lib/talk/startChart/proto/talk_ping.pb.dart rename to lib/talk/starChart/proto/talk_ping.pb.dart diff --git a/lib/talk/startChart/proto/talk_ping.pbenum.dart b/lib/talk/starChart/proto/talk_ping.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/talk_ping.pbenum.dart rename to lib/talk/starChart/proto/talk_ping.pbenum.dart diff --git a/lib/talk/startChart/proto/talk_ping.pbjson.dart b/lib/talk/starChart/proto/talk_ping.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/talk_ping.pbjson.dart rename to lib/talk/starChart/proto/talk_ping.pbjson.dart diff --git a/lib/talk/startChart/proto/talk_ping.pbserver.dart b/lib/talk/starChart/proto/talk_ping.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/talk_ping.pbserver.dart rename to lib/talk/starChart/proto/talk_ping.pbserver.dart diff --git a/lib/talk/startChart/proto/talk_ping.proto b/lib/talk/starChart/proto/talk_ping.proto similarity index 100% rename from lib/talk/startChart/proto/talk_ping.proto rename to lib/talk/starChart/proto/talk_ping.proto diff --git a/lib/talk/startChart/proto/talk_push.pb.dart b/lib/talk/starChart/proto/talk_push.pb.dart similarity index 100% rename from lib/talk/startChart/proto/talk_push.pb.dart rename to lib/talk/starChart/proto/talk_push.pb.dart diff --git a/lib/talk/startChart/proto/talk_push.pbenum.dart b/lib/talk/starChart/proto/talk_push.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/talk_push.pbenum.dart rename to lib/talk/starChart/proto/talk_push.pbenum.dart diff --git a/lib/talk/startChart/proto/talk_push.pbjson.dart b/lib/talk/starChart/proto/talk_push.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/talk_push.pbjson.dart rename to lib/talk/starChart/proto/talk_push.pbjson.dart diff --git a/lib/talk/startChart/proto/talk_push.pbserver.dart b/lib/talk/starChart/proto/talk_push.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/talk_push.pbserver.dart rename to lib/talk/starChart/proto/talk_push.pbserver.dart diff --git a/lib/talk/startChart/proto/talk_push.proto b/lib/talk/starChart/proto/talk_push.proto similarity index 100% rename from lib/talk/startChart/proto/talk_push.proto rename to lib/talk/starChart/proto/talk_push.proto diff --git a/lib/talk/startChart/proto/talk_receiver_transfer.pb.dart b/lib/talk/starChart/proto/talk_receiver_transfer.pb.dart similarity index 100% rename from lib/talk/startChart/proto/talk_receiver_transfer.pb.dart rename to lib/talk/starChart/proto/talk_receiver_transfer.pb.dart diff --git a/lib/talk/startChart/proto/talk_receiver_transfer.pbenum.dart b/lib/talk/starChart/proto/talk_receiver_transfer.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/talk_receiver_transfer.pbenum.dart rename to lib/talk/starChart/proto/talk_receiver_transfer.pbenum.dart diff --git a/lib/talk/startChart/proto/talk_receiver_transfer.pbjson.dart b/lib/talk/starChart/proto/talk_receiver_transfer.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/talk_receiver_transfer.pbjson.dart rename to lib/talk/starChart/proto/talk_receiver_transfer.pbjson.dart diff --git a/lib/talk/startChart/proto/talk_receiver_transfer.pbserver.dart b/lib/talk/starChart/proto/talk_receiver_transfer.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/talk_receiver_transfer.pbserver.dart rename to lib/talk/starChart/proto/talk_receiver_transfer.pbserver.dart diff --git a/lib/talk/startChart/proto/talk_receiver_transfer.proto b/lib/talk/starChart/proto/talk_receiver_transfer.proto similarity index 100% rename from lib/talk/startChart/proto/talk_receiver_transfer.proto rename to lib/talk/starChart/proto/talk_receiver_transfer.proto diff --git a/lib/talk/startChart/proto/talk_reject.pb.dart b/lib/talk/starChart/proto/talk_reject.pb.dart similarity index 100% rename from lib/talk/startChart/proto/talk_reject.pb.dart rename to lib/talk/starChart/proto/talk_reject.pb.dart diff --git a/lib/talk/startChart/proto/talk_reject.pbenum.dart b/lib/talk/starChart/proto/talk_reject.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/talk_reject.pbenum.dart rename to lib/talk/starChart/proto/talk_reject.pbenum.dart diff --git a/lib/talk/startChart/proto/talk_reject.pbjson.dart b/lib/talk/starChart/proto/talk_reject.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/talk_reject.pbjson.dart rename to lib/talk/starChart/proto/talk_reject.pbjson.dart diff --git a/lib/talk/startChart/proto/talk_reject.pbserver.dart b/lib/talk/starChart/proto/talk_reject.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/talk_reject.pbserver.dart rename to lib/talk/starChart/proto/talk_reject.pbserver.dart diff --git a/lib/talk/startChart/proto/talk_reject.proto b/lib/talk/starChart/proto/talk_reject.proto similarity index 100% rename from lib/talk/startChart/proto/talk_reject.proto rename to lib/talk/starChart/proto/talk_reject.proto diff --git a/lib/talk/startChart/proto/talk_request.pb.dart b/lib/talk/starChart/proto/talk_request.pb.dart similarity index 100% rename from lib/talk/startChart/proto/talk_request.pb.dart rename to lib/talk/starChart/proto/talk_request.pb.dart diff --git a/lib/talk/startChart/proto/talk_request.pbenum.dart b/lib/talk/starChart/proto/talk_request.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/talk_request.pbenum.dart rename to lib/talk/starChart/proto/talk_request.pbenum.dart diff --git a/lib/talk/startChart/proto/talk_request.pbjson.dart b/lib/talk/starChart/proto/talk_request.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/talk_request.pbjson.dart rename to lib/talk/starChart/proto/talk_request.pbjson.dart diff --git a/lib/talk/startChart/proto/talk_request.pbserver.dart b/lib/talk/starChart/proto/talk_request.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/talk_request.pbserver.dart rename to lib/talk/starChart/proto/talk_request.pbserver.dart diff --git a/lib/talk/startChart/proto/talk_request.proto b/lib/talk/starChart/proto/talk_request.proto similarity index 100% rename from lib/talk/startChart/proto/talk_request.proto rename to lib/talk/starChart/proto/talk_request.proto diff --git a/lib/talk/startChart/proto/test.pb.dart b/lib/talk/starChart/proto/test.pb.dart similarity index 100% rename from lib/talk/startChart/proto/test.pb.dart rename to lib/talk/starChart/proto/test.pb.dart diff --git a/lib/talk/startChart/proto/test.pbenum.dart b/lib/talk/starChart/proto/test.pbenum.dart similarity index 100% rename from lib/talk/startChart/proto/test.pbenum.dart rename to lib/talk/starChart/proto/test.pbenum.dart diff --git a/lib/talk/startChart/proto/test.pbjson.dart b/lib/talk/starChart/proto/test.pbjson.dart similarity index 100% rename from lib/talk/startChart/proto/test.pbjson.dart rename to lib/talk/starChart/proto/test.pbjson.dart diff --git a/lib/talk/startChart/proto/test.pbserver.dart b/lib/talk/starChart/proto/test.pbserver.dart similarity index 100% rename from lib/talk/startChart/proto/test.pbserver.dart rename to lib/talk/starChart/proto/test.pbserver.dart diff --git a/lib/talk/startChart/proto/test.proto b/lib/talk/starChart/proto/test.proto similarity index 100% rename from lib/talk/startChart/proto/test.proto rename to lib/talk/starChart/proto/test.proto diff --git a/lib/talk/startChart/start_chart_manage.dart b/lib/talk/starChart/star_chart_manage.dart similarity index 94% rename from lib/talk/startChart/start_chart_manage.dart rename to lib/talk/starChart/star_chart_manage.dart index 464f4f5c..bc5e1617 100644 --- a/lib/talk/startChart/start_chart_manage.dart +++ b/lib/talk/starChart/star_chart_manage.dart @@ -15,31 +15,31 @@ import 'package:star_lock/login/login/entity/LoginEntity.dart'; import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/network/start_chart_api.dart'; import 'package:star_lock/talk/other/audio_player_manager.dart'; -import 'package:star_lock/talk/startChart/command/message_command.dart'; -import 'package:star_lock/talk/startChart/constant/ip_constant.dart'; -import 'package:star_lock/talk/startChart/constant/listen_addr_type_constant.dart'; -import 'package:star_lock/talk/startChart/constant/message_type_constant.dart'; -import 'package:star_lock/talk/startChart/constant/payload_type_constant.dart'; -import 'package:star_lock/talk/startChart/constant/talk_status.dart'; -import 'package:star_lock/talk/startChart/entity/relay_info_entity.dart'; -import 'package:star_lock/talk/startChart/entity/report_information_data.dart'; -import 'package:star_lock/talk/startChart/entity/scp_message.dart'; -import 'package:star_lock/talk/startChart/entity/star_chart_register_node_entity.dart'; -import 'package:star_lock/talk/startChart/exception/start_chart_message_exception.dart'; -import 'package:star_lock/talk/startChart/handle/impl/debug_Info_model.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_talk_data_handler.dart'; -import 'package:star_lock/talk/startChart/handle/other/do_sign.dart'; -import 'package:star_lock/talk/startChart/handle/other/talke_data_over_time_timer_manager.dart'; -import 'package:star_lock/talk/startChart/handle/other/talke_ping_over_time_timer_manager.dart'; -import 'package:star_lock/talk/startChart/handle/other/talke_request_over_time_timer_manager.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; -import 'package:star_lock/talk/startChart/handle/scp_message_handler_factory.dart'; -import 'package:star_lock/talk/startChart/proto/rbcu.pb.dart'; -import 'package:star_lock/talk/startChart/proto/rbcu.pbserver.dart'; -import 'package:star_lock/talk/startChart/proto/talk_data.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_expect.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_expect.pbserver.dart'; -import 'package:star_lock/talk/startChart/status/start_chart_talk_status.dart'; +import 'package:star_lock/talk/starChart/command/message_command.dart'; +import 'package:star_lock/talk/starChart/constant/ip_constant.dart'; +import 'package:star_lock/talk/starChart/constant/listen_addr_type_constant.dart'; +import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; +import 'package:star_lock/talk/starChart/constant/payload_type_constant.dart'; +import 'package:star_lock/talk/starChart/constant/talk_status.dart'; +import 'package:star_lock/talk/starChart/entity/relay_info_entity.dart'; +import 'package:star_lock/talk/starChart/entity/report_information_data.dart'; +import 'package:star_lock/talk/starChart/entity/scp_message.dart'; +import 'package:star_lock/talk/starChart/entity/star_chart_register_node_entity.dart'; +import 'package:star_lock/talk/starChart/exception/start_chart_message_exception.dart'; +import 'package:star_lock/talk/starChart/handle/impl/debug_Info_model.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_talk_data_handler.dart'; +import 'package:star_lock/talk/starChart/handle/other/do_sign.dart'; +import 'package:star_lock/talk/starChart/handle/other/talke_data_over_time_timer_manager.dart'; +import 'package:star_lock/talk/starChart/handle/other/talke_ping_over_time_timer_manager.dart'; +import 'package:star_lock/talk/starChart/handle/other/talke_request_over_time_timer_manager.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; +import 'package:star_lock/talk/starChart/handle/scp_message_handler_factory.dart'; +import 'package:star_lock/talk/starChart/proto/rbcu.pb.dart'; +import 'package:star_lock/talk/starChart/proto/rbcu.pbserver.dart'; +import 'package:star_lock/talk/starChart/proto/talk_data.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_expect.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_expect.pbserver.dart'; +import 'package:star_lock/talk/starChart/status/star_chart_talk_status.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/deviceInfo_utils.dart'; import 'package:star_lock/tools/storage.dart'; @@ -201,6 +201,7 @@ class StartChartManage { void closeUdpSocket() { if (_udpSocket != null) { _udpSocket?.close(); + _udpSocket = null; } } @@ -1100,19 +1101,28 @@ class StartChartManage { /// 销毁资源 void destruction() async { + // 发送挂断消息 sendTalkHangupMessage(); isOnlineStartChartServer = false; + // 停止发送心跳消息 stopHeartbeat(); + // 取消发送期望数据 stopTalkExpectMessageTimer(); + // 取消发送通话保持消息 stopTalkPingMessageTimer(); + // 取消发送上线消息 stopReStartOnlineStartChartServer(); + // 取消发送通话数据 stopTalkDataTimer(); + // 取消p2p打洞 stopSendingRbcuInfoMessages(); stopSendingRbcuProBeMessages(); stopSendingRbcuConfirmMessages(); + // 重置数据 _resetData(); await Storage.removerRelayInfo(); await Storage.removerStarChartRegisterNodeInfo(); + closeUdpSocket(); } /// 重置数据 diff --git a/lib/talk/startChart/status/appLifecycle_observer.dart b/lib/talk/starChart/status/appLifecycle_observer.dart similarity index 94% rename from lib/talk/startChart/status/appLifecycle_observer.dart rename to lib/talk/starChart/status/appLifecycle_observer.dart index 9f4dab42..e0343296 100644 --- a/lib/talk/startChart/status/appLifecycle_observer.dart +++ b/lib/talk/starChart/status/appLifecycle_observer.dart @@ -1,5 +1,5 @@ import 'package:flutter/widgets.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; class AppLifecycleObserver extends WidgetsBindingObserver { @override diff --git a/lib/talk/startChart/status/start_chart_talk_status.dart b/lib/talk/starChart/status/star_chart_talk_status.dart similarity index 97% rename from lib/talk/startChart/status/start_chart_talk_status.dart rename to lib/talk/starChart/status/star_chart_talk_status.dart index b35ca795..54ee1751 100644 --- a/lib/talk/startChart/status/start_chart_talk_status.dart +++ b/lib/talk/starChart/status/star_chart_talk_status.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'package:star_lock/blue/io_tool/manager_event_bus.dart'; -import 'package:star_lock/talk/startChart/constant/talk_status.dart'; +import 'package:star_lock/talk/starChart/constant/talk_status.dart'; class StartChartTalkStatus { // 私有字段，用于存储当前状态 diff --git a/lib/talk/startChart/views/talkView/talk_view_logic.dart b/lib/talk/starChart/views/talkView/talk_view_logic.dart similarity index 98% rename from lib/talk/startChart/views/talkView/talk_view_logic.dart rename to lib/talk/starChart/views/talkView/talk_view_logic.dart index 51b5224e..a87ef0e0 100644 --- a/lib/talk/startChart/views/talkView/talk_view_logic.dart +++ b/lib/talk/starChart/views/talkView/talk_view_logic.dart @@ -26,12 +26,12 @@ import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_state.dart'; import 'package:star_lock/main/lockDetail/lockDetail/lockNetToken_entity.dart'; import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/talk/call/g711.dart'; -import 'package:star_lock/talk/startChart/constant/talk_status.dart'; -import 'package:star_lock/talk/startChart/proto/talk_data.pb.dart'; -import 'package:star_lock/talk/startChart/proto/talk_data.pbenum.dart'; -import 'package:star_lock/talk/startChart/proto/talk_expect.pb.dart'; -import 'package:star_lock/talk/startChart/start_chart_manage.dart'; -import 'package:star_lock/talk/startChart/views/talkView/talk_view_state.dart'; +import 'package:star_lock/talk/starChart/constant/talk_status.dart'; +import 'package:star_lock/talk/starChart/proto/talk_data.pb.dart'; +import 'package:star_lock/talk/starChart/proto/talk_data.pbenum.dart'; +import 'package:star_lock/talk/starChart/proto/talk_expect.pb.dart'; +import 'package:star_lock/talk/starChart/star_chart_manage.dart'; +import 'package:star_lock/talk/starChart/views/talkView/talk_view_state.dart'; import 'package:star_lock/tools/bugly/bugly_tool.dart'; import 'package:star_lock/tools/storage.dart'; diff --git a/lib/talk/startChart/views/talkView/talk_view_page.dart b/lib/talk/starChart/views/talkView/talk_view_page.dart similarity index 97% rename from lib/talk/startChart/views/talkView/talk_view_page.dart rename to lib/talk/starChart/views/talkView/talk_view_page.dart index df733203..72fe0ef5 100644 --- a/lib/talk/startChart/views/talkView/talk_view_page.dart +++ b/lib/talk/starChart/views/talkView/talk_view_page.dart @@ -9,11 +9,11 @@ import 'package:http/http.dart' as http; import 'package:provider/provider.dart'; import 'package:star_lock/flavors.dart'; import 'package:star_lock/talk/call/callTalk.dart'; -import 'package:star_lock/talk/startChart/constant/talk_status.dart'; -import 'package:star_lock/talk/startChart/handle/impl/debug_Info_model.dart'; -import 'package:star_lock/talk/startChart/handle/impl/udp_talk_data_handler.dart'; -import 'package:star_lock/talk/startChart/views/talkView/talk_view_logic.dart'; -import 'package:star_lock/talk/startChart/views/talkView/talk_view_state.dart'; +import 'package:star_lock/talk/starChart/constant/talk_status.dart'; +import 'package:star_lock/talk/starChart/handle/impl/debug_Info_model.dart'; +import 'package:star_lock/talk/starChart/handle/impl/udp_talk_data_handler.dart'; +import 'package:star_lock/talk/starChart/views/talkView/talk_view_logic.dart'; +import 'package:star_lock/talk/starChart/views/talkView/talk_view_state.dart'; import '../../../../app_settings/app_colors.dart'; import '../../../../tools/showTFView.dart'; @@ -455,8 +455,12 @@ class _TalkViewPageState extends State '开锁'.tr, AppColors.mainColor, onClick: () { + if (state.talkStatus.value == TalkStatus.answeredSuccessfully && + state.listData.value.length > 0) { + logic.udpOpenDoorAction(); + } // if (UDPManage().remoteUnlock == 1) { - logic.udpOpenDoorAction(); + // logic.udpOpenDoorAction(); // showDeletPasswordAlertDialog(context); // } else { // logic.showToast('请在锁设置中开启远程开锁'.tr); diff --git a/lib/talk/startChart/views/talkView/talk_view_state.dart b/lib/talk/starChart/views/talkView/talk_view_state.dart similarity index 92% rename from lib/talk/startChart/views/talkView/talk_view_state.dart rename to lib/talk/starChart/views/talkView/talk_view_state.dart index 21d6db4c..7e56836a 100644 --- a/lib/talk/startChart/views/talkView/talk_view_state.dart +++ b/lib/talk/starChart/views/talkView/talk_view_state.dart @@ -8,10 +8,10 @@ import 'package:get/get_rx/get_rx.dart'; import 'package:get/get_rx/src/rx_types/rx_types.dart'; import 'package:get/state_manager.dart'; import 'package:network_info_plus/network_info_plus.dart'; -import 'package:star_lock/talk/startChart/constant/talk_status.dart'; -import 'package:star_lock/talk/startChart/handle/other/talk_data_repository.dart'; -import 'package:star_lock/talk/startChart/proto/talk_data.pb.dart'; -import 'package:star_lock/talk/startChart/status/start_chart_talk_status.dart'; +import 'package:star_lock/talk/starChart/constant/talk_status.dart'; +import 'package:star_lock/talk/starChart/handle/other/talk_data_repository.dart'; +import 'package:star_lock/talk/starChart/proto/talk_data.pb.dart'; +import 'package:star_lock/talk/starChart/status/star_chart_talk_status.dart'; import '../../../../tools/storage.dart'; diff --git a/lib/talk/startChart/webView/h264_web_view.dart b/lib/talk/starChart/webView/h264_web_view.dart similarity index 96% rename from lib/talk/startChart/webView/h264_web_view.dart rename to lib/talk/starChart/webView/h264_web_view.dart index 463b00e8..2392c5fa 100644 --- a/lib/talk/startChart/webView/h264_web_view.dart +++ b/lib/talk/starChart/webView/h264_web_view.dart @@ -4,8 +4,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart' show ByteData, Uint8List, rootBundle; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:star_lock/app_settings/app_colors.dart'; -import 'package:star_lock/talk/startChart/handle/other/talk_data_repository.dart'; -import 'package:star_lock/talk/startChart/proto/talk_data.pbserver.dart'; +import 'package:star_lock/talk/starChart/handle/other/talk_data_repository.dart'; +import 'package:star_lock/talk/starChart/proto/talk_data.pbserver.dart'; import 'package:star_lock/tools/titleAppBar.dart'; import 'package:webview_flutter/webview_flutter.dart'; diff --git a/lib/tools/storage.dart b/lib/tools/storage.dart index 2a251a44..cf4e9666 100755 --- a/lib/tools/storage.dart +++ b/lib/tools/storage.dart @@ -5,8 +5,8 @@ import 'dart:convert'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:star_lock/apm/apm_helper.dart'; -import 'package:star_lock/talk/startChart/entity/relay_info_entity.dart'; -import 'package:star_lock/talk/startChart/entity/star_chart_register_node_entity.dart'; +import 'package:star_lock/talk/starChart/entity/relay_info_entity.dart'; +import 'package:star_lock/talk/starChart/entity/star_chart_register_node_entity.dart'; import '../login/login/entity/LoginData.dart'; import '../main/lockMian/entity/lockListInfo_entity.dart';