From fd97f7e2015030f949205836085168a0775f4f7f Mon Sep 17 00:00:00 2001 From: MistEO Date: Sun, 27 Nov 2022 21:38:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9Emaatouch=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B9=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/minitouch/maatouch/minitouch | Bin 0 -> 10891 bytes resource/config.json | 41 ++++++++++++++---- src/MeoAssistant/AsstCaller.cpp | 8 ++-- src/MeoAssistant/Controller.cpp | 5 +-- .../Resources/Localizations/en-us.xaml | 1 + .../Resources/Localizations/zh-cn.xaml | 1 + .../ViewModels/SettingsViewModel.cs | 1 + 7 files changed, 42 insertions(+), 15 deletions(-) create mode 100644 3rdparty/resource/minitouch/maatouch/minitouch diff --git a/3rdparty/resource/minitouch/maatouch/minitouch b/3rdparty/resource/minitouch/maatouch/minitouch new file mode 100644 index 0000000000000000000000000000000000000000..02db3af473258fae9a24f29079f3da32ca3c5460 GIT binary patch literal 10891 zcmbVyWl)^YvN!DF?g4^?;2zu^f=h6h;7)K|SO~#g7KflAcyQkYcUjz>;O_SFKetZZ zdr#d@?@V=7&(q!0Jv}{N`uV9T0ukU|2MQb&3Kakm4$YeDb;bWm0(^1*HLb%zj4YvEdN;%mWf2Asn3A|B58o zx<=2G4i0Wh84eEpH4<|NGdDL&H#Q4P?;d|Y|3%r9lk{9;Q2(#TT6`f;_pif375v3t z+1%K>W__yj=hO{{Q(xYtIMQlUD@M}nPN<_eQWX&}DB7YQN$Tl0c!ALk70{QC)pb*k z07HNyOLPL8?~3SkI5uWxsP3KCRy0Eqi@ySm9xkrZ1>AN#c81frI&;hKPWJ#N54;)A z<0HUO>}cUY*=^{XF&>`41EF?RLa~!uPZ(F1H0pank@{(xCk-THO@?RUwHkb|jE+Ef zu{b*cP5{ECxr{Vzo@)M%n-G+p+P5j@FFJHK$QihboCBYOn1ehD3`CF?N&qsz&%pDD zi&T^Rh4Tdip=2%uO{7go-pnpdDlL; zaGm0=MM1g5e|zQ=t--}39m7!oIuIZ67=qargQ(VsU4%~Kpw2<{LJ^g4#b6lJ5o!dr z4ypo*!P~sKN9KiZhf=-6%mS_;`xD&aoocMbi7O-b0;7SlU<0rpm>n(-ehd(ZG;>5p z3bzBc2j9Tmz+=OkAcGJdk#sx5Y;aJ3*5F2XuYW!ROprRTgyA0vZrPzNkRLcd5O{%( z;$k1L$l!OtWv|8tLD+DV$j|WJq~7qiMfz# zxQqp$UL1c7=m}>8h5LXu3@8b5gH}M7p?%;npb4-8`4MnStM-f17sv~@7(^~kKaPw6 z)PQ2(AgRFf0lff$=)ws8gx+MY;ZbJs7r`T*urrB zh_`%esB3*tHz+%J6);0FOwIuO3D(b}Xu>#sJq6sU?;4E@(B-WQI_DQ4vB-rdQmk2m{6iMv^*d&fDWwp4$uuw zf_gw>UJw5O_6v#wA>r`ZEu1GU*(T%|12N(6lBGz2qL)P1@NQpt<2bp6;E04edHDLoEA^!~*r+y^Wr zI0@6lDFIiUCcHExEO;*HLC`Ev_O=aP63X%cc^GK6#^8bx4yOa`12a^kbO-U5)*c|l zBdCj$>H<^%CAV$BQMg&SS->p3Gr}lf7RU!jiSSP<{E2SKPJPy10NB7l?D7fg9sjb) zf^najlJ79co;v|&j9~Vtd?);#vS0x9B;??dRp3#`ZR^BV%ieP0sPTZiF@!q0JOdk| zjI~S`i}mM=@(pzib@-C+@S;aXUxP*o#7<((r^XxLmS5uX11i80N7MiP)l3(p>f6zA#_>nO+4#_0%YMBykVQ z-l@Me5j+CEoVfeSsXriDoBRJq#E6#8OW0)e0Of zB`0+d?!_HkX20^V;_LCCnXwZ043G0b_j^#kzkZ3&G4@~X#q|)uCpZhy0+_kLUY#*} zr&BHrKAWxE$pJ6Y)6Q2M7GA6qB3M&~#*+>2k-+GjIS~2vTVG$Z{k2o1; za_T>)0=U#(?>vWH(WTg zN@mJ^gb{FG8X;AI)G8c|a9rvPPEe@Q$qo?tJdGS2u6e3>w$q)U-7JM-&JiH8U zu%P;bx1uaNAWHHNrJ68K`3IXAHCK>rn5bUd(YbX-N8X+@ z&r?#N{kDW*@vaFHrjYzLWs*B~J&H^~MuT087R)ij`1_vcvavV}Rhhn?+@L7?=kttd zdv@X#>JBG=zHaI~|fwr^&(nG-7^2gB~-AG8jd zb48NY9{yO}^L<`WCgc>8%cQON9uRzj_p_bia*p+a$6d`OdRkeGuGqr@pUm1wB@Q2^ zT=(hp&RA+S8Kl&+m`cs>|2dCJCD@c2y%r7TEFh`Z<>t z=!8J=@lLD7|48P@?QWBy6LY)st@;<=<6Ebh%eNsz7bC2Jt;M^@kljoJ5c(;`g0uMI zn{QM8ZV!PZVoH5snjQQ3=QlRKx)2=`&Ex6Iik7yWd{;^r_@_?FZFcO0Xb;z+7X=vd zCoAkzAG`jC$*vKa&4@HVeBlJxMh});lR)AR0+ZsjT_Rn{VUf6B0Njfj2A&aut@!2~^0#bc9|Uo^uxrIZMVWu$gYFXd z*fVzpG~?__iPHLK)&#bVPn55VS0*m?mZ#BFtxG;hM*GYp$`gyIuC902=@VZ0m zkhK9ONs*$z1-qSZRZ7nT6myBUZayWRd9~fpK*&`nu+mBYgRQ8jZF~*U6Daw2~i$ zb8$ILx68dIZ*b#?JDy4EcZalE2?@us4jRj3M1}@74H6iNgv)PGOQ$8H^x9zkT@=pW z@sCAMBcnoi+2;=}2`cwX#^bM1fqGK%|c<9veoCol`hvg8YuYTHK@ ztb7X01V8663d*yPyH9=kFc!iaH$Kn?@O$`(>|{qrH0jNe#uXz`Uf| z+LgD)N^;7|KJ(7%cgCOEhZ+8{W3DJAozg`Y$RF{T&(ib9c!JxbeYaWfZKkBC>GL#7 z%=ABZ5T~aCKCz(H031xX#%1AuFp}x$CB-gw2iOX&I--;H#6}N0d@MdzPY2A=3`xK1 z@~Sia!(8vd+Zi-$(r8YQ;?~8Gz01=wo;_XB~@M4p8+(t*+%T+)90{9bar;Z^l_`D;c_uNbPDD>-bNc;3;@cb?9Dw`@=K6b;8CdN%? zUTBF!zO5p)vH^QY*fK*vyWox3O8)0W1z$Yo2eSZP$B!MxEW3^G0$J!+gC7sv&PVzK zMM|Ex`)_uV`3BB(>&N`6WqPzwZ-jiNm%^4s|90TtEzXfH9dVmCOeoowT_z2N`IpM{ z;7O?Z^*XQhHX_|=qs`Qt2Z;6?kEWiH2poO?rg*P=1X&^quzFOCio~|&SV`M8mLBGR zvrH+e2d?R={{Bof<$}A2mm9X~@M#Qa{hczkGx7;x>u8eQ%ao2|Z1vslS30NohV9Uo z4+rUfhz`47AIhV-hAW2ms7q1=w3({u{DD(eJgxPG*>^V6&vO%yz59aS5uSn*5t(=8 zu#C$k%rQOFd0TL2;6RGVOU|no5#{JZvYX&14q3Ny9$#IQt zLECaUaSg{Q-PF@M4iEY~12yYEo8}piQ*N$$I$`C!A>TVKZFYlavA;crTI}gO&jr_S zYO8-M&Nc-H(=Eat5_Xg4ef}7|cT8P0PtQhL@Z&H?MGz}osK4ht;vMo7;;?g?W!g3T zzUz?U)(l@4A8f#(ugb_WYU^@as|Zre@pd&)J&9Yz`K=G+_dS{geaL4Ph0o!-nyhLs1)lIc_z*m ztLwx!=W3)2z1?(OUS)CY2|t0=$cWz?M18DPZNEAFtdz1rahZC0BrS~(rX#@qlAONo z2x}W5miX3abRi0^vG5k+siG(tJgpRetTB3Mt0=s5PB5PuyJ<@Kc1Bza)*b%u2 ztsf^io<~pW4cU->N<47;)dycyFW-9B;F8e#t5lQiK#y(SEB#SqD z;FErQorfs2Od#ZNKy^cO&4r{9d%3uCF{_sK5p zhY<^>=!T*SK|$9+%y`GM0~gJhH(XUe@}zfBJm!N9 znxAg)J~nAhZ(N+9mR)UsE}MUL3 zvkATI5FYweh%QqmGk5!yMH}}tFs+ld!EzKOU-fRPHdV<2~)#%-9g&i8fkk7$F)Z^>?~j#o1Cw1j-^!Kdq0V?|#$=Cq4`xk>AfR zcrQ~73Of&tonPA-mo{OQW^Qxw-<2!pF4~2?_=b)a_fTZ;UhfE(yw~?xIU}Daev>+pl9~^ueOd( zn`~{-t_-3l-4fAqSzO=kx23gO0owGp1MsCrl_rcJa9UXhD9x$@-(ulg1(Ct97kM+Q z3L3~RXuqA>RaB)MTHPZ)Zz2(>k`){tkwvSr9Q%X2?fp(O(L+kEZHIwxkb+|NR{fyc z$?~MCrhXVrRn(^K>6+06Q^f)M&bE$zpkxMpT3EXgRF%FhmZ|w0M30R3EG6k0Y3?H` zp+I|+&@U5^GzbuGBhfp+ikn%7D4|uc0CC?LecBC|@Hw6*@hT;;w$f7sIg#&%*ctVY zVVsT$PJ=9W=JOkQZss?liQ{iL>p5fYYh~yZ-pm)vxV(HgHo7{Z=60x!Z~n#;?Ux=f z=afKNSf#*L-GO(7SzSNh|JP<$}J^}nJ^nojl91mS*a!2L;CThJA`bttgFu# z=^j0TtcK0@ZqBa^TlJ@RXM=Uf#fJ@@V@><8g)pM_)_iCSRqp2FfB8%4-(G2^L*#3W zHtPn2);o|I4u{LQI~1-gyEGkZrF68><0>cihs)T(#~3t%I5Bwkb+!B)?Dio~|@`r_^vKf-Am>nf7CvpyR zNB4>q<|Pwwf5@?pmi)AVXCDQeq8l@AkxVeM+2jgSy+9T=T%;tnvkeBT%4Se2k4U)y zE90_yuie+x|K?+gldB@RENqSTygLP6EW5@A{)j}jV!?E3EsnqmTypQD08Jc6N>6pG zqK7PH1Wz=gn%Pfo9X)ChqWcwM~J-O>KXUWdf5#35COZ zkZEJYtkNmXof|IOb9Ly!QEm)H21jK8dmvsR5+dd}tw~UCQ>f62Cv5zvF%YSBv_5WU zVxt+wGeo}*b4e2aW&Q3qX6she{p0rMW1<E^Skhet?ABx`=`b`_kCo18mj2-8gd^<657=DpASp- zoppB_$ImZtLNudorl;ah68MdZ+!W|G4IEo?q%<0f?YT$VOpL1zc+}#Cou?j^=WB>F zJmnUEWgF-4tb9KMqP|<(^v@xfpQ?dN92Xmck)9PBzC~P4vIvkCw*Zpb@#V5GWFUVS z4TbwBn`|R7-UUWkQ;`WY#IH!ru;y^xE-oBid|EkfwxJ=CKcRhal8I?2w^&{TcX~cY z{j994sR`65!bcI^D!p-GB2nv?lKwdkBJB_K52b}AjaBxXIKq=Kq3x67 z?JupIIf9}?%x>0Cu(aqw;!o=i+|5zBr`S`&s zFo@+@JgEG(D^T|SV`;Y-C(0gmSAj^oYztknY)dH<#G@LW>F_PN*yJwdnJPw` z0-ap;vw4j-=b?NbWQRz2J!xInH;O*-It#5xxbIJm3uiLcm|tvfQck?JsOzN-KPu{& z|E+}u+o8NnC8{}pO}DylkMwe4N-G1vjRYeeB_0>5kNlw>`i>A83Hd24eRXwqw+~wn z7y=e0Fq;uxJr`%-&5f4bF^Hv=iU{pD{AnpH3^~rjoDU9FbA8riAaROtfv`54@8$g} z*A<@LSfz{@;cE0poTXF@OOlmxTgUp@&zi=cq!9L|wcxCIlib2eF?BM*M)4h}JY>ew zhn{*}6aY*W{gXk7WY~=uVUiNYmOsCw`Hg$zcIZ! z+dBNNgEzoYhNa*6Q|{diP7tB2504J}N#0K_#ljAuA3G`NK8Iyx;%`dmCg<23%*s$> zE&!F9FF(WdYrE-V5UfjtFHTUc(XMJlQ+d$3pQ90}wL_xf8yzvi_1O|I<-d zT0@g6pwX9YX^p^4NKYC`Zol`3Aj#E_F6m2h%1-i8TwlSuS~)eB|G?ol`b?BuU9`SA z!j!F4hR_x_-S(QI9z}sxE-9_7Z9PA?Ind#6^Y1pZOJtrNu}a5q^YjW*r-t21bPzm# zY}cRLu~ay5M|aWe>rMnA0(`QKi+@1{cUY-{A>Sg%qWX4H6aDuOa1VE>anWX`UtH&xNsJWcX;==q{Xh9SfpzvK^J~;d zk&xR3033wU{9&z?!koPOl&G%ZTVxd3`y<~>d#JytMoOi9b?w)(cB2 zHZ;Za~q zSd%#MxSgF;F!jBn4Je1So-Tt6-tD3djUnTSnHpUmk`P^zp|ij-FJK%#QgElq>p-_# zE;w3zODF$1_R#Hb0kd+ffR!p;e{Td$k~hW;B15wPOxBKyEJmHNHhCqJ%a{I5T2#Vi z_v9h!HH8gZM_Raam*xjZ3~i}5)~FEqaYU~AfkJ5HL~EK{?m#kDpXxU)+l0?bbeh@_ zN(>pzEtStX`#abrynGZnt8IHJ3<7og3?}rC7h4%7r82m5LMj((+%hu-P2TZGKMXOD zc~|9ZIFyLUu#&^XCgb~KG*!LXB2&^KedsA$E>j#5Dpr=QEQ2FO{V7Q@7!~_fWCUKX z%_E%BXAAzUZ?@{9oWS#5RbHBjOF=pg-kojx7z(Kx7JV!>OO0n;CUVI&NzZiop&CR< z>p$||u;xuos9sjor@E2$y#@;$_Ob2B<0=Gsab!oaM%(OYZ@Mj|&*91T13Eo$7&TdSO5IfW{v*#R}0K_xZ{lgOSq z-tq*34CdgNol9dJBV&C(ZZaVxa>0DxfT;X4b6lEw837M%+ZLxY9xsRoNB4r^l)0?r zHxvsK&D75^XV;7op{gbH=8BA8rCZGX{CP*T9KUp+#RJ2{X^0}#&4fw7#wiK98;UM? z5o(--$EnYu=awHw6zR6r)pAs<5%`;??g(y_a-U?Ze`l@dqs`k^x889hq<;dgo z>wC&?Y*3>FSREEJC)w>-v&3Wyw|@DSd)yUy3QwV@Bu#Z9&;E5XCtlWW1wZ{pT0KY2 z6PHV*Ea+P~s<+Z*{JdZfsz>^7QlzBAKJrA|&`9rl-fefpETphLl-+j;7+nb^rcVQ> z?+@T)(m-z(>ghLsLE0>=`1BJMIb4ghDc<>%4zsZ@?Gl)wG~3)4H< zA_G-B0Zo0+TT*7DV!=_qoX9WFdl#NemT2m?$Q7rg`sumU0iTy-B!ORf1B12g zEJj4A@@iDFk)N%-wao=%h1J+2NdAhO^-oluxIICr3#)SVMe}B9QBShh?58ZUb=H+0 zxpKzjaBr{rdZ)9EJk{@PKkNA#`A%$ZjAg&+Ja+$RNbPKXRNe+|v!!?>FLFko|8@=g zyztvU+v*K-s*F{n=Evm47=0S18B&VPTxltp-KURt>(OhHcOMWA3Qc=5Fm5on&DUm_ zkG0?GeJxP`yBeH1s-N3z*mhTbH8Jw>StB!h;}0EZbH|YWvMOq*Va~zRKt8o`2Is!< z_P%yT$Uyp8ogCo&oOnkLkpl?Iw+adJmrg~R)ufh1;Ao4H=d6q zg#p6wS;$VyPK`vw5bIqgrhuQwo36w6U~=Ju2QRcu`L(3huV(}<-=&B zn8I+6plFBp&be8bFR|js#}l8vti;^`Z-8-djR5R8v@`xwVbj{{@&g|1Um)49XMe+c z_{C_VGm%2ijOPa2hc$grdqmY+N9JAeE)ONBh2V5>mU7v?=NDAQ{dM zR0Z&HKwIhMB#D7m2(IkpZTd@|I0r(u92n~mPyC?g0tUa&`ow%Heccs0qzq&d1H@I) zxU%y}VXVEOdtaOUkhs!oQUd+_I)6C2m}ncD)+SC@>sS1-<0zjpZ3@*Q-hQcms>YcC zM6nR$KN{Q{4J`vBL7FgG?f@lN3DT5Mc`i5ynau{&Ve&}>rvD@spYEk1y)V+nRXseG ztYt46__2tk`Z1PCW98@2ou3jZU_bEcr$pmUU60tKz%uLFl|{!I)h@jk*&{hQ7+Pfc z`1Ij-&^?&}TdwWS!>G4m`iZc)h(*Uu^s1_5$3yh$>#yyXXfcz7J1p+?PpgVut07ir zKTdwFzlabxC9c*&SAER9HBBBxY_;R=S@5b*eKdt0JIi?E?uRj6;(qqDm+Q33wnuHg zeA$M45q5g6YcguvD?f-f|VpoTSb}c-I(7J|y3vhz+osvHy z#6@3{8U|IZkv_sjZ8`qc4Zy4`iH*H9HYyr4Raq+x+hXA~@E7_J=<7+4G~oLlvqmFe zjh8IROWU#Boc06d*^|-LA*H5|Y)I?9mgA2ij|R=(paH!uA#q6lvD?D4`8nOzkp^us ztZm=iq+TXQDqx0$r*&y1Kk^D|l`&E(nb|+=P`awFca&_Embcd_#je4Bg-7QuoJ%IN z`Qd3r5@H6e*d>s+;p+aSml8I^BIiB4xE zi$>R8sXyL+y7V=3wxV+933HTjOxee&g~0wO9iVgby=zB-JCsK z&0n#HX0C4L062_)NnQnT@Ni_W^M8!jGWqvfO%Wad2mD9&eVhx`A=S^lS+ z|AbBcx0}dU_J4pV|7G|u>3_xdpJo1U!`Gsx|38cVzc={5)ArvRATa)C64ewDk^Ye* PyiW3e-qx!I9Nhl{#k}AS literal 0 HcmV?d00001 diff --git a/resource/config.json b/resource/config.json index 495ad341d0..c5b4b1f20e 100644 --- a/resource/config.json +++ b/resource/config.json @@ -60,7 +60,7 @@ "release": "[Adb] kill-server", "start": "[Adb] -s [AdbSerial] shell am start -n [Intent]", "stop": "[Adb] -s [AdbSerial] shell \"am force-stop `dumpsys activity activities 2>/dev/null | grep Activities= 2>/dev/null | grep -m 1 -i -o -E [^\\ ]*arknights[^/]*`\"", - "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", + "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", "orientation": "[Adb] -s [AdbSerial] shell dumpsys input | grep SurfaceOrientation | grep -m 1 -o -E [0-9]", "pushMinitouch": "[Adb] -s [AdbSerial] push \"[minitouchLocalPath]\" \"/data/local/tmp/[minitouchWorkingFile]\"", "chmodMinitouch": "[Adb] -s [AdbSerial] shell chmod 700 \"/data/local/tmp/[minitouchWorkingFile]\"", @@ -83,7 +83,7 @@ "release": "[Adb] kill-server", "start": "[Adb] -s [AdbSerial] shell am start -n [Intent]", "stop": "[Adb] -s [AdbSerial] shell \"am force-stop `dumpsys activity activities 2>/dev/null | grep Activities= 2>/dev/null | grep -m 1 -i -o -E [^\\ ]*arknights[^/]*`\"", - "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", + "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", "orientation": "[Adb] -s [AdbSerial] shell dumpsys input | grep SurfaceOrientation | grep -m 1 -o -E [0-9]", "pushMinitouch": "[Adb] -s [AdbSerial] push \"[minitouchLocalPath]\" \"/data/local/tmp/[minitouchWorkingFile]\"", "chmodMinitouch": "[Adb] -s [AdbSerial] shell chmod 700 \"/data/local/tmp/[minitouchWorkingFile]\"", @@ -106,7 +106,7 @@ "release": "[Adb] kill-server", "start": "[Adb] -s [AdbSerial] shell am start -n [Intent]", "stop": "[Adb] -s [AdbSerial] shell \"am force-stop `dumpsys activity activities 2>/dev/null | grep Activities= 2>/dev/null | grep -m 1 -i -o -E [^\\ ]*arknights[^/]*`\"", - "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", + "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", "orientation": "[Adb] -s [AdbSerial] shell dumpsys input | grep SurfaceOrientation | grep -m 1 -o -E [0-9]", "pushMinitouch": "[Adb] -s [AdbSerial] push \"[minitouchLocalPath]\" \"/data/local/tmp/[minitouchWorkingFile]\"", "chmodMinitouch": "[Adb] -s [AdbSerial] shell chmod 700 \"/data/local/tmp/[minitouchWorkingFile]\"", @@ -129,7 +129,7 @@ "release": "[Adb] kill-server", "start": "[Adb] -s [AdbSerial] shell am start -n [Intent]", "stop": "[Adb] -s [AdbSerial] shell \"am force-stop `dumpsys activity activities 2>/dev/null | grep Activities= 2>/dev/null | grep -m 1 -i -o -E [^\\ ]*arknights[^/]*`\"", - "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", + "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", "orientation": "[Adb] -s [AdbSerial] shell dumpsys input | grep SurfaceOrientation | grep -m 1 -o -E [0-9]", "pushMinitouch": "[Adb] -s [AdbSerial] push \"[minitouchLocalPath]\" \"/data/local/tmp/[minitouchWorkingFile]\"", "chmodMinitouch": "[Adb] -s [AdbSerial] shell chmod 700 \"/data/local/tmp/[minitouchWorkingFile]\"", @@ -152,7 +152,7 @@ "release": "[Adb] kill-server", "start": "[Adb] -s [AdbSerial] shell am start -n [Intent]", "stop": "[Adb] -s [AdbSerial] shell \"am force-stop `dumpsys activity activities 2>/dev/null | grep Activities= 2>/dev/null | grep -m 1 -i -o -E [^\\ ]*arknights[^/]*`\"", - "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", + "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", "orientation": "[Adb] -s [AdbSerial] shell dumpsys input | grep SurfaceOrientation | grep -m 1 -o -E [0-9]", "pushMinitouch": "[Adb] -s [AdbSerial] push \"[minitouchLocalPath]\" \"/data/local/tmp/[minitouchWorkingFile]\"", "chmodMinitouch": "[Adb] -s [AdbSerial] shell chmod 700 \"/data/local/tmp/[minitouchWorkingFile]\"", @@ -175,7 +175,7 @@ "release": "[Adb] kill-server", "start": "[Adb] -s [AdbSerial] shell am start -n [Intent]", "stop": "[Adb] -s [AdbSerial] shell \"am force-stop `dumpsys activity activities 2>/dev/null | grep Activities= 2>/dev/null | grep -m 1 -i -o -E [^\\ ]*arknights[^/]*`\"", - "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", + "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", "orientation": "[Adb] -s [AdbSerial] shell dumpsys input | grep SurfaceOrientation | grep -m 1 -o -E [0-9]", "pushMinitouch": "[Adb] -s [AdbSerial] push \"[minitouchLocalPath]\" \"/data/local/tmp/[minitouchWorkingFile]\"", "chmodMinitouch": "[Adb] -s [AdbSerial] shell chmod 700 \"/data/local/tmp/[minitouchWorkingFile]\"", @@ -199,7 +199,7 @@ "release": "[Adb] kill-server", "start": "[Adb] -s [AdbSerial] shell am start -n [Intent]", "stop": "[Adb] -s [AdbSerial] shell \"am force-stop `dumpsys activity activities 2>/dev/null | grep Activities= 2>/dev/null | grep -m 1 -i -o -E [^\\ ]*arknights[^/]*`\"", - "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", + "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", "orientation": "[Adb] -s [AdbSerial] shell dumpsys input | grep SurfaceOrientation | grep -m 1 -o -E [0-9]", "pushMinitouch": "[Adb] -s [AdbSerial] push \"[minitouchLocalPath]\" \"/data/local/tmp/[minitouchWorkingFile]\"", "chmodMinitouch": "[Adb] -s [AdbSerial] shell chmod 700 \"/data/local/tmp/[minitouchWorkingFile]\"", @@ -222,7 +222,7 @@ "release": "[Adb] kill-server", "start": "[Adb] -s [AdbSerial] shell am start -n [Intent]", "stop": "[Adb] -s [AdbSerial] shell \"am force-stop `dumpsys activity activities 2>/dev/null | grep Activities= 2>/dev/null | grep -m 1 -i -o -E [^\\ ]*arknights[^/]*`\"", - "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", + "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", "orientation": "[Adb] -s [AdbSerial] shell dumpsys input | grep SurfaceOrientation | grep -m 1 -o -E [0-9]", "pushMinitouch": "[Adb] -s [AdbSerial] push \"[minitouchLocalPath]\" \"/data/local/tmp/[minitouchWorkingFile]\"", "chmodMinitouch": "[Adb] -s [AdbSerial] shell chmod 700 \"/data/local/tmp/[minitouchWorkingFile]\"", @@ -245,11 +245,34 @@ "release": "[Adb] kill-server", "start": "[Adb] -s [AdbSerial] shell am start -n [Intent]", "stop": "[Adb] -s [AdbSerial] shell \"am force-stop `dumpsys activity activities 2>/dev/null | grep Activities= 2>/dev/null | grep -m 1 -i -o -E [^\\ ]*arknights[^/]*`\"", - "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", + "abilist": "[Adb] -s [AdbSerial] shell getprop ro.product.cpu.abilist", "orientation": "[Adb] -s [AdbSerial] shell dumpsys input | grep SurfaceOrientation | grep -m 1 -o -E [0-9]", "pushMinitouch": "[Adb] -s [AdbSerial] push \"[minitouchLocalPath]\" \"/data/local/tmp/[minitouchWorkingFile]\"", "chmodMinitouch": "[Adb] -s [AdbSerial] shell chmod 700 \"/data/local/tmp/[minitouchWorkingFile]\"", "callMinitouch": "[Adb] -s [AdbSerial] shell \"/data/local/tmp/[minitouchWorkingFile]\" -i" + }, + "MaaTouch": { + "devices": "[Adb] devices", + "addressRegex": "(.+)\tdevice", + "connect": "[Adb] connect [AdbSerial]", + "uuid": "[Adb] -s [AdbSerial] shell settings get secure android_id", + "click": "[Adb] -s [AdbSerial] shell input tap [x] [y]", + "swipe": "[Adb] -s [AdbSerial] shell input swipe [x1] [y1] [x2] [y2] [duration]", + "display": "[Adb] -s [AdbSerial] shell dumpsys window displays | grep -o -E cur=+[^\\ ]+ | grep -o -E [0-9]+", + "displayFormat": "%d%d", + "screencapRawByNC": "[Adb] -s [AdbSerial] exec-out \"screencap | nc -w 3 [NcAddress] [NcPort]\"", + "ncAddress": "[Adb] -s [AdbSerial] shell \" cat /proc/net/arp | grep : \"", + "ncPort": 6723, + "screencapRawWithGzip": "[Adb] -s [AdbSerial] exec-out \"screencap | gzip -1\"", + "screencapEncode": "[Adb] -s [AdbSerial] exec-out screencap -p", + "release": "[Adb] kill-server", + "start": "[Adb] -s [AdbSerial] shell am start -n [Intent]", + "stop": "[Adb] -s [AdbSerial] shell \"am force-stop `dumpsys activity activities 2>/dev/null | grep Activities= 2>/dev/null | grep -m 1 -i -o -E [^\\ ]*arknights[^/]*`\"", + "abilist": "[Adb] -s [AdbSerial] shell echo maatouch", + "orientation": "[Adb] -s [AdbSerial] shell echo 0", + "pushMinitouch": "[Adb] -s [AdbSerial] push \"[minitouchLocalPath]\" \"/data/local/tmp/[minitouchWorkingFile]\"", + "chmodMinitouch": "[Adb] -s [AdbSerial] shell chmod 700 \"/data/local/tmp/[minitouchWorkingFile]\"", + "callMinitouch": "[Adb] -s [AdbSerial] shell \"export CLASSPATH=/data/local/tmp/[minitouchWorkingFile]; app_process /data/local/tmp com.shxyke.MaaTouch.App\"" } } } diff --git a/src/MeoAssistant/AsstCaller.cpp b/src/MeoAssistant/AsstCaller.cpp index f55ad3c724..9ecf58ad65 100644 --- a/src/MeoAssistant/AsstCaller.cpp +++ b/src/MeoAssistant/AsstCaller.cpp @@ -48,15 +48,17 @@ bool AsstSetUserDir(const char* path) bool AsstLoadResource(const char* path) { + using namespace asst::utils::path_literals; + auto os_path = asst::utils::path(path); + auto res_path = os_path / "resource"_p; if (asst::ResDir.empty()) { - asst::ResDir.set(os_path); + asst::ResDir.set(res_path); } if (asst::UserDir.empty()) { asst::UserDir.set(os_path); } - using namespace asst::utils::path_literals; - inited = asst::ResourceLoader::get_instance().load(os_path / "resource"_p); + inited = asst::ResourceLoader::get_instance().load(res_path); return inited; } diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index e2c2bd1cef..28a1f6e841 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -1507,9 +1507,8 @@ bool asst::Controller::connect(const std::string& adb_path, const std::string& a } std::string abilist = call_command(cmd_replace(adb_cfg.abilist)).value_or(""); - constexpr std::array OrderedABI = { - "x86_64", "x86", "arm64-v8a", "armeabi-v7a", "armeabi", - }; + constexpr std::array OrderedABI = { "x86_64", "x86", "arm64-v8a", + "armeabi-v7a", "armeabi", "maatouch" }; std::string_view optimal_abi = "armeabi-v7a"; for (const auto& abi : OrderedABI) { if (abilist.find(abi) != std::string::npos) { diff --git a/src/MeoAsstGui/Resources/Localizations/en-us.xaml b/src/MeoAsstGui/Resources/Localizations/en-us.xaml index 99800e578e..22e27bc77e 100644 --- a/src/MeoAsstGui/Resources/Localizations/en-us.xaml +++ b/src/MeoAsstGui/Resources/Localizations/en-us.xaml @@ -60,6 +60,7 @@ Nox XYAZ Old version of WSA + MaaTouch Compatible Mode Morale Threshold diff --git a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml index 26d59fc0f7..1d45adb250 100644 --- a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml +++ b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml @@ -60,6 +60,7 @@ 夜神模拟器 逍遥模拟器 WSA 旧版本 + MaaTouch 兼容模式 基建工作心情阈值 diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs index 4c59a035b8..a4ebf9cc10 100644 --- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs +++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs @@ -176,6 +176,7 @@ namespace MeoAsstGui new CombData { Display = Localization.GetString("Nox"), Value = "Nox" }, new CombData { Display = Localization.GetString("XYAZ"), Value = "XYAZ" }, new CombData { Display = Localization.GetString("WSA"), Value = "WSA" }, + new CombData { Display = Localization.GetString("MaaTouch"), Value = "MaaTouch" }, new CombData { Display = Localization.GetString("Compatible"), Value = "Compatible" }, }; From d10034da02cb374cff8cf35b7eb5d69292981c48 Mon Sep 17 00:00:00 2001 From: MistEO Date: Sun, 27 Nov 2022 23:18:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84minitouch?= =?UTF-8?q?=E7=9A=84=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/config.json | 8 +++ src/MeoAssistant/Controller.cpp | 66 ++++++++++--------- src/MeoAssistant/Resource/GeneralConfiger.cpp | 5 ++ src/MeoAssistant/Resource/GeneralConfiger.h | 1 + 4 files changed, 48 insertions(+), 32 deletions(-) diff --git a/resource/config.json b/resource/config.json index c5b4b1f20e..ec88e08523 100644 --- a/resource/config.json +++ b/resource/config.json @@ -16,6 +16,14 @@ "adbSwipeDurationMultiplier_Doc": "adb 滑动延迟倍数", "minitouchExtraSwipeDist": 100, "minitouchExtraSwipeDuration": 200, + "minitouchProgramsOrder": [ + "x86_64", + "x86", + "arm64-v8a", + "armeabi-v7a", + "armeabi", + "maatouch" + ], "penguinReport": { "Doc": "企鹅物流汇报: https://penguin-stats.cn/", "cmdFormat": "curl -H \"Content-Type: application/json\" -s -S -m 10 -i -d \"[body]\" \"https://penguin-stats.io/PenguinStats/api/v2/report\" --ssl-no-revoke [extra]", diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 28a1f6e841..cfdf3ec1af 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -456,7 +456,6 @@ bool asst::Controller::call_and_hup_minitouch(const std::string& cmd) release_minitouch(true); Log.info(cmd); - m_minitouch_avaiable = false; constexpr int PipeReadBuffSize = 4096ULL; constexpr int PipeWriteBuffSize = 64 * 1024ULL; @@ -639,7 +638,6 @@ bool asst::Controller::call_and_hup_minitouch(const std::string& cmd) m_minitouch_props.x_scaling = static_cast(m_minitouch_props.max_x) / m_width; m_minitouch_props.y_scaling = static_cast(m_minitouch_props.max_y) / m_height; - m_minitouch_avaiable = true; return true; } @@ -1506,42 +1504,46 @@ bool asst::Controller::connect(const std::string& adb_path, const std::string& a return false; } - std::string abilist = call_command(cmd_replace(adb_cfg.abilist)).value_or(""); - constexpr std::array OrderedABI = { "x86_64", "x86", "arm64-v8a", - "armeabi-v7a", "armeabi", "maatouch" }; - std::string_view optimal_abi = "armeabi-v7a"; - for (const auto& abi : OrderedABI) { - if (abilist.find(abi) != std::string::npos) { - optimal_abi = abi; - break; + do { + m_minitouch_avaiable = false; + + std::string abilist = call_command(cmd_replace(adb_cfg.abilist)).value_or("maatouch"); + std::string_view optimal_abi; + for (const auto& abi : Config.get_options().minitouch_programs_order) { + if (abilist.find(abi) != std::string::npos) { + optimal_abi = abi; + break; + } } - } - Log.info("The optimal abi is", optimal_abi); + Log.info("The optimal abi is", optimal_abi); - auto minitouch_cmd_rep = [&](const std::string& cfg_cmd) -> std::string { - using namespace asst::utils::path_literals; - return utils::string_replace_all( - cmd_replace(cfg_cmd), - { - { "[minitouchLocalPath]", - utils::path_to_utf8_string(ResDir.get() / "minitouch"_p / optimal_abi / "minitouch"_p) }, - { "[minitouchWorkingFile]", m_uuid }, - }); - }; + auto minitouch_cmd_rep = [&](const std::string& cfg_cmd) -> std::string { + using namespace asst::utils::path_literals; + return utils::string_replace_all( + cmd_replace(cfg_cmd), + { + { "[minitouchLocalPath]", + utils::path_to_utf8_string(ResDir.get() / "minitouch"_p / optimal_abi / "minitouch"_p) }, + { "[minitouchWorkingFile]", m_uuid }, + }); + }; - call_command(minitouch_cmd_rep(adb_cfg.push_minitouch)); - call_command(minitouch_cmd_rep(adb_cfg.chmod_minitouch)); + if (!call_command(minitouch_cmd_rep(adb_cfg.push_minitouch))) break; + if (!call_command(minitouch_cmd_rep(adb_cfg.chmod_minitouch))) break; - m_adb.call_minitouch = minitouch_cmd_rep(adb_cfg.call_minitouch); - call_and_hup_minitouch(m_adb.call_minitouch); + m_adb.call_minitouch = minitouch_cmd_rep(adb_cfg.call_minitouch); + if (!call_and_hup_minitouch(m_adb.call_minitouch)) break; - std::string orientation_str = call_command(cmd_replace(adb_cfg.orientation)).value_or("0"); - if (!orientation_str.empty()) { - char first = orientation_str.front(); - if (first == '0' || first == '1' || first == '2' || first == '3') { - m_minitouch_props.orientation = static_cast(first - '0'); + std::string orientation_str = call_command(cmd_replace(adb_cfg.orientation)).value_or("0"); + if (!orientation_str.empty()) { + char first = orientation_str.front(); + if (first == '0' || first == '1' || first == '2' || first == '3') { + m_minitouch_props.orientation = static_cast(first - '0'); + } } - } + + m_minitouch_avaiable = true; + } while (false); // try to find the fastest way if (!screencap()) { diff --git a/src/MeoAssistant/Resource/GeneralConfiger.cpp b/src/MeoAssistant/Resource/GeneralConfiger.cpp index 5ee58a8580..6620fcb83a 100644 --- a/src/MeoAssistant/Resource/GeneralConfiger.cpp +++ b/src/MeoAssistant/Resource/GeneralConfiger.cpp @@ -18,6 +18,11 @@ bool asst::GeneralConfiger::parse(const json::value& json) m_options.adb_swipe_duration_multiplier = options_json.get("adbSwipeDurationMultiplier", 10.0); m_options.minitouch_extra_swipe_dist = options_json.get("minitouchExtraSwipeDist", 100); m_options.minitouch_extra_swipe_duration = options_json.get("minitouchExtraSwipeDuration", -1); + if (auto order = options_json.find("minitouchProgramsOrder")) { + for (const auto& type : *order) { + m_options.minitouch_programs_order.emplace_back(type.as_string()); + } + } m_options.penguin_report.cmd_format = options_json.get("penguinReport", "cmdFormat", std::string()); m_options.yituliu_report.cmd_format = options_json.get("yituliuReport", "cmdFormat", std::string()); m_options.depot_export_template.ark_planner = diff --git a/src/MeoAssistant/Resource/GeneralConfiger.h b/src/MeoAssistant/Resource/GeneralConfiger.h index 66e54a92a9..c86fe7174a 100644 --- a/src/MeoAssistant/Resource/GeneralConfiger.h +++ b/src/MeoAssistant/Resource/GeneralConfiger.h @@ -42,6 +42,7 @@ namespace asst double adb_swipe_duration_multiplier = 0; // adb 滑动持续时间倍数 int minitouch_extra_swipe_dist = 0; int minitouch_extra_swipe_duration = -1; + std::vector minitouch_programs_order; PenguinReportCfg penguin_report; // 企鹅物流汇报： // 每次到结算界面，汇报掉落数据至企鹅物流 https://penguin-stats.cn/ DepotExportTemplate depot_export_template; // 仓库识别结果导出模板 From bb01defc1cc9f2da90a14f7d985dd3129ac94450 Mon Sep 17 00:00:00 2001 From: MistEO Date: Mon, 28 Nov 2022 23:57:20 +0800 Subject: [PATCH 3/4] fix: merge error --- src/MeoAssistant/Controller.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index cfdf3ec1af..052304130b 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -1509,7 +1509,7 @@ bool asst::Controller::connect(const std::string& adb_path, const std::string& a std::string abilist = call_command(cmd_replace(adb_cfg.abilist)).value_or("maatouch"); std::string_view optimal_abi; - for (const auto& abi : Config.get_options().minitouch_programs_order) { + for (const auto& abi : Configer.get_options().minitouch_programs_order) { if (abilist.find(abi) != std::string::npos) { optimal_abi = abi; break; From d59cbe7c7e03fd0d7b1e102d6fc3fbd5694b0df7 Mon Sep 17 00:00:00 2001 From: MistEO Date: Tue, 29 Nov 2022 00:02:22 +0800 Subject: [PATCH 4/4] docs: update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1daafdcf9b..d180f26d34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## v4.7.3 + +- 新增 `MaaTouch` 连接配置 项，推荐在 minitouch 无法使用，但又不想用 `兼容触控模式` 时开启 @aa889788 @MistEO +- 修复 minitouch 路径错误无法使用的问题 @MistEO + ## v4.7.2 - 修复 刷理智 掉落识别 在极端情况下疯狂上传的问题 @MistEO