From c5c9aaa8e1cccbc798da9868cd3a289e135b5774 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Sun, 16 Sep 2018 01:49:33 +0800
Subject: [PATCH] fix(automator): RootAutomator (x, y) not correct on some
 devices

---
 .idea/caches/build_file_checksums.ser         | Bin 733 -> 733 bytes
 app/build.gradle                              |   4 +--
 .../autojs/ui/edit/editor/CodeEditText.java   |   2 +-
 autojs/src/main/assets/binary/root_automator  | Bin 13668 -> 13672 bytes
 .../autojs/core/inputevent/RootAutomator.java |  24 ++++++++++--------
 .../com/stardust/autojs/core/util/Shell.java  |   2 +-
 common/release/output.json                    |   2 +-
 7 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index c8bc7e01b5e3e79cee11fb1d49ca23437aa5c8a9..db0c40bccc96ab1e017a72cc9c2d93db4206f9dc 100644
GIT binary patch
delta 36
scmcc1dY5&=43>LQ5<U~>lnW#$`WI9#j?G*DWO1C^>^{-W%8a`h0V947RR910

delta 36
ucmV+<0NelF1>FUZm;~EjYvqxgcMuPHMnKVt_tV{1bJ035Pg}Di0lEP|77%~{

diff --git a/app/build.gradle b/app/build.gradle
index c0a6ac79..0d7b5a16 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.autojs.autojs"
         minSdkVersion 17
         targetSdkVersion 23
-        versionCode 414
-        versionName "4.0.2 Alpha9"
+        versionCode 416
+        versionName "4.0.2 Alpha11"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         ndk {
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditText.java b/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditText.java
index 55ad7c49..f22218f7 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditText.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditText.java
@@ -192,7 +192,7 @@ public class CodeEditText extends AppCompatEditText {
             return;
         }
         JavaScriptHighlighter.HighlightTokens highlightTokens = mHighlightTokens;
-        Log.d(LOG_TAG, "drawText: tokens = " + highlightTokens);
+        //Log.d(LOG_TAG, "drawText: tokens = " + highlightTokens);
         Layout layout = getLayout();
         int lineCount = getLineCount();
         int textLength = highlightTokens == null ? 0 : highlightTokens.getText().length();
diff --git a/autojs/src/main/assets/binary/root_automator b/autojs/src/main/assets/binary/root_automator
index 4e296d1497ea848e1f54ef028a6c90b60a4f33cf..b84731d3e2712071af343dd97ae84281445d8573 100644
GIT binary patch
delta 4139
zcmZWs3s4hh9{)BkmWLR`M}QR*q8LKKD34Ohod}VVMtt4%j`MtgKpP&_6i|b&jaFLq
ztOKr75ov2%$D`m>lw$2n>DZ2)b~>GDa_4of)H~xL#cF$Que~D)l)c{<(1X35`Q`Wh
z{*Ujq|NS<5yZTObvo5?NnvhIFh`Ys5u4yq7(qe8o60hbIgjBS=wK}FFnUIHI&=$g(
zFZgB1cyP@?<B10X90RPJq^W<MOqa;?CYi33Y3EeUlburyWRFbmm+3<?eN3iL$aI@b
zpP8b6MaUng7zlY=rZ3BMpG;qq>Cc4}WsiZ)8#imo57Jib_GG;adX4b2GIvGQw(^Er
zvUzi5UES7g<Y{MJ)z*fmq3a9D&bq3GN|?4c)RU*{D$6R!_WIh&N+;P;U$MEq>Y1%&
zwWPkGuKZc2P^J0}izYhRRwvw0-B!=W*jnLZ^}M;$CnjeAqYy&ZEd0&`A_Ybho0fnU
zz0nV@2sGjVR8#2U@T&(>fmmU=W|11RCt)qOVuccowwQ&Od`*LxIbl#va5$LOjv9yu
zq5vI0uS8%@s71(JVNi22T9r3$$wg_-iV%*3ZDzuI?uK1b@M3RMx1!~|P1$^Yr9$6m
zWyGzcM9(xc3-(x*txfss`xR{$NDcSp@0PgI%qq{DPtN6bS!b7uLvPqDoFa>6Y#ddb
zz8ObM8n4U2h?_>+?Yph5r8kF8BZB&iM<4jsjGm;vGVjpK<33(o2B*TyJD8K73>}|H
z$a<KNGkOdOy3+TCUYhVNeCRWe9;UvsuAxKr!?q>dKuM!j$8}g3ad0HU$Fvc1g!h2`
z`J#ammo<*-Sj>puj;QoRObRlsO4p*)Fwfp1o;l^R5^?Rw9(1MkF|7&%BWf@N+h1>Y
z*_gHmohpp4`nDrx`zqa*eb%gMk`~@yW3QVO!HAtB$9yJ^7>F1Xbe0m6%4_1Xpdz45
z9D|lR_{^$(R%h9`FWW$PaWvp8D_=zn+N6C}3pXFL|6-&R10^^ZA;CpbS9v!+xyu?`
zy0Lg;(Ozo`XXaA5M;50qv1GWgwI7ZsO{~Xe|Lvqz?i~5vcek2ZqV}3=*4f+g886Wv
z99oM$+g?(dXL`SWDJzxnkW{s|xR~E-HPsMtU4Zpv!^psBD;~Gi22ABo*tAKFR<?RR
zHqSbuHNEdiw--zrDt~0QFVD^_WLkGy=av2vL&R|kff4tOs1qZ-M*HIr_eXJ>-kA6i
zg?`ykwyhC+o*vAyxAOVno_Kraq%Pw|a=7%N#WoX4hlpH|F>U@^j6L19bkhAD4l4EB
z(A7das{b6$XG<0#38?zn;IX-c1YsKlUk5%z`+e}+;2V-8ok6=DI0aN>@`M~jBM;7{
zz<#txGYGj2cz_Rpj{qa=iNJka2cez724EG?ji;TXjHmh)pc8m@_Z9LcxC?k4m^ZPU
z-aw*FL@m&zT?mK<F}G|fhtd%52eYdw{}}8%%xIKccyzO7&UGnCl@j^Y3|o9&SqaNA
zEitwZ3w@wmK}P?|H_^g}QL|F}gBIki4zfkG9v%-8y}DcMi^8B3bj3F@!Q+bv`Lpos
zv~AHl#-w{HkNqFyP~V+)i*R?EnXeg>?s_bQlpvVxjSdwbNsaJE(fjEjDQeH}9jEdY
zo{|Du*(}OYaG-oVUdJCMtePO(ceU^x^l=$D1N>h<RiS>W9`y5lfTaalMa&xB^HtT6
ze5Gei!B-9<-U_gNwdi0gPy%RsRh+uWz|qz14X8q^+#k?m%`XI;IPrD@Y_A%f>8go|
z`I-?A1k`$IctE;Z7=?UGZzMO3)7oC_&dZ1^s4is0T>)Z>_Mk`u3P)s7q>WES=fu%y
zr4_m-pg{7+lA?_{jYr4hiDxWf-4?8ltkAg$wlO(0V8o;+qdK59MR+u}u%bq5xWi?o
zM~x%Y&+8J~*M^)c=_pDZ$!xF6PLi<hrv9e*a%uQ$__y!~$mun$RC26gk97f;nT1M7
z!aWTz=+<a6PU`j-0S43CAsIQdD=Q<xHA7+G;tPyiHrkIa4tFIe-e`&}FmOv3vn~Vo
z7%W6F&=js>VS5~kat=6L!xrevmF5_4Rw_>q1C>`AR!R}r#;}Q#fLanI4c%DG^hGJB
zuLu*}f|XpsN<IZ&2AsV!G4W{b!NgStI`x0~8B?Sux@bC%<^S#N7k)Z<9VVZhp>r8I
zx`0PB39m>{=?aW4T|ufVL8B{h_BEs9b7^=-VjyiVyOOmjjeD$();F87jRQ^e_DI9t
zF+HZ0D`|0SEQr647xdKFtWfL)#GVYrCWm5Gi1i>=ZDV^It<vyok~U~OO-c$F@r<8V
z@w>Byb=ssy2mJYV2DeIAn!~LxWyAr$`h+I2)RS;t&pn3f8}QQ_yyKs*+rlj}DvukT
z^f|mEbZHIzC;l9czDRcaRf*I48F7)H;Kg{|zwk+uP04lQJ*CBaYANE){uEzLAxWyq
z2)hvPG~kqDM6I8gVs0?v%uv>Q{&+iQOXBV!i!`f*jtm{AIL(OD{AwRYImL)Mh!6MZ
zIU?SZ-X6j%1ba+MVifkzhX=Y=OGrQ3^dxX%KQ${>yVuSUj>mk!JTI)B@ovN>{H@&p
ztTziYVqcE1qL~bs%srQ4FRK;W`90Nf$HMriZzRd}1RjH{uMJKYkNQ}dR>?Gx>CwTd
z`F@%HNv6fAn)iJ-)!@4$)3;^XC(}1%`mZv5U8X%#G=J3h`4q!Z-={KtO{TBP^!qY>
zMW)}8>F&w;DQx-q$p+{SnLaDiXJoovrq2!vpCxTltQi!{#>AvtnKwtKGY5rgW3_N?
zL6LA`K|BA`fW&uqsob}RB%c0zJ$gstSxMqQ2S<UUzJ<TL!)*dndoI;)Y21gvD(EW{
z_D{iYu@~L0yEMMj?Fn&*TYpdDe;SkcOt2s9{BC?4-S^{mUXMmMIq0@f?$Ws1CiFFM
zr}CnE!#`<<9qv~tBko*Cce~GqxYPY5xNFBHck_K3*X=$E?pl`P{uB5N2K;---sz4P
zCB7Z{5ipHQ2Dgs!5}zJ2bhy`pJEmWBJ0|pr34Ipa6@AGa^#c;SqTC06l=xb7^a9uk
zJ_K$69|3nQ)3`nV9$#VW@c4v30@Hpy;1a}9rVA|z!ft|N2O2BkaDmr=4}yOUJ^-c(
zZZIRHCC4R%zKQgqkC~<V1r?9z%Uo6U`d^?KA*@JV8MhAKLi&bn+shsLMlwmbgy!T~
z+O(Y{%|X&CNLoEw^^Tqol5eSIq~P=8Jsd8t13%+y#~af#mR88j-iW^&&j8N>^jc%0
z-^jxHMdviMPF9-*h2>^+L)jLRzI<JAdZnwX!qs!%a*IjPPGrz575%}r9H43RL+kv4
zap;5(Gh$~wHOX@g9*Wx`PwBYFc>w(I>s&A(r)DB&37F1{VtLPV8FLunYQ{{VJu@nt
t&BJRN{~L;gi<w4-75<XBkjWE%&RnS80Bf4CUlS|jW@*)jq5ebFe*qeK+ou2k

delta 3567
zcmZWs4Nw#58UDUx6A}m^B4~sK^P?CDLgdGCVynU)k_#$#TAOj~LHO|kqA-9pQD7HG
zuXm^IfXjIP(3bOV+6cCym^-JVC+&DMbabxa#@?KqH;sjBsM_AzI%g8DZr@G7f$cZ*
z<oTX=-|yY``^~r0jZ=+1TIJDrgbENs9liQmIb}kKGWEWbBGXC`s_eb6ZP8sLLUZWB
z2=%Z^{Ac?6&|<DEf=bDp08Rvyi*%((|45{3MEVVpZd#~m)V9!o+#*ej^f8e>F48AO
z`iw}ww?J=4$g{wJ&?S-nNThFy^q5G0%4SMO^u)%fS%aSN`(d=_>qDT|v;UQ@w;XJ3
zXs<_mS`M_gp{lC3GPI|)-cbjJ)`tD<d(eTlruzC8RMS>h)z<LFen%7AMeIzgs;X~o
z-QSGb+FPO0+=?2SYulRyS-Y==y-!TZ7Q?&K*-vE4(_l?RiXMJpAw-HWt;+#1ES4``
zt%X`z#2)=o0xbckW^K!WbpSI!!)}u2_C8jyc6k!pA}840SkcQ6)>wEZEFPgqqlDss
z696*6Qh*wu0Hgwhk{l&O0w>MZQ`oQN@2b(pXp8k5z)Q)#6H|p_M;^vpk<ib)3FJvD
z>XGQ&6y}^WJryVeuk4`E>0>216Bp1S`(9GxT5TeH$E|6kn~JS|64>sN6uPxqxm4{m
zt9%E|QeT}pVSKA|Dp2mk+}4?H+hOVp$5#=xd4>jMulYRCW$Us|+TE0v^jI)woKgBw
zPAom{vK=a)w7aNfq-PE06f=YlaR)>Bu3U4Buf2Q?>7o$#cDN0KX#5sZqQ_ju3^FMu
z8g0$iJaR6e#JJnv1U^mMwAD0K>_leeM2)Rso(JY0hAaF<X-KazU`{nt3*PBYI^TuN
zIpdBkHRYXDCYeQ=N!1#4o+jS~qam4*n&iGp+wK<$7W=22*diOxYOveRmf&%u^8|KU
zH3k^FKVj~CSYx{9qiow>_+xG$oanE#S;)iCLBwLtAC{%ZjThT0qN&j^9O#@dApK#9
z?nq#>)eZeU9V)Y(E>ZaMY%k9XbvXQzzr<>SNkH6BL)aAiRhDgo6&vQp0CR`JQeAbR
zc-H4YXq~mFChFfD;`G;Qu)#!P?l<8dI0YUG55Ap=<x*0q?vXFO%NvNyxO>Ugl#LF%
zf<(R9R*ywk6P01CTN}t^UsWg5C&LzKxIAnu7se+pjC9X$jFz2)1v&`lWL_a0Z~y{u
zpXd2YurPlMxCj`9=kEgd1D^u)L46N!HNXY+Ho!MfR)DTdL1;7R0>CD~zQfnhI$%l*
zKSE{OEDXSgHL$tZUUjqj=5ziL;j{e>y>(-HbPcOc$fB=4=O1$5V25lpUV@aB>tR7*
zt|~-CdQcnEL4TYf0=8@%K;f0avd}t_34e*Xx{yrAKbz!7%dSHVg*W!aOjm_8rdVH$
zHKyE6DV;7#Sh_zBNx=IKuYeKxCHVi*f@m}b`&8j2Y{+n!I@>+bo#No1eF-jmz(M29
zsF0EheFvo@lPnlkB_+(NPj5BM3!4|h5cWOZ&{^C0pfgdDQu==9K-c;1R7qT^qYFtU
zyOo5Z^g)-RRNtkPD@t_^X%;zNXpS47Y@m@@=F>MGFOm4{rHCsI#Y6An{cFvt@!CdY
zmix{(vL#Y@rf)=Cc1SMt9TGgwYi?9Pf=w2L-h>YLfuT33$h!y<jwhoD6M7-#M?q|g
z^Qp>J)+}MGI^C48n5Tn6(wk|10J27sR6<)i*{LlxcBaa;rA0UTA=tHCguaDSQD#+m
z-4y?9oDUn%A$uw2J_`y%_!oGl@v16RR;jUrdcWIE6&feI`DZuy$%cj9@&$?6#B(9>
zY>52{w2cKW(Rkx4;$H+<8wv0W{{Q=aDHxe|=(`$1jFvry<W546v0Sz!(eS<7!4eyW
z8Prx6k-MrfcRMKSlc!hvQZMSrmtX<i4hqZ27hIvOA#;t=lg1WdoA}ssiF*1{uqbkB
z)dq?5gbB>u3?eurZv|JqVzNrfK{yaKa3HP&|GZ$Pe{UHw?9Gq4l+vQN3bt!OWLk6|
zb00)nT?nSwNUMQ-1g%gH!Fuwwq~sjtl7lioyyXn$Jm9bN=}5#q;(r%_EZE}3nd#r<
zz$C&JXwo3`A#_dHoQq*%<u7kzo-SdJEdCht?53oTVz*`^Q~`J;o0TM=iY<WZ5`Z>)
z<b3jnG6~8U*_Hb982Y;a&$~8{mZ8yKeVxFa@CQZusYr7o{aB=@MS4o4{R=hizrWDn
z|3akiinLFp?}+r6NZ%6a(FK}5;lIAXaKe90q_2wfut;ANX^%*MAkqW#^$%gl`{x@#
zpBCvpk?s-c6C&LgV1K{jb;-s6o3b+9kS%&@66qBIcGt>AdhG8!Jrr}9>H7yy!vzej
zf5_9r!yd*C+zy5&U>9&da0l?k+2=bR@$?17Wo7`l1?*RWg?5(5Jl!O;`)4#>(!Y4x
z37P~RMn{=!frsSGsi>xzQK$?`FEjRUq5;kd436g`dYBoA@F4RU@X$}LFef;{Z<u)t
zcxXcr^C@r=ykH_?A7qw1;b{$M6R_ZC09Jv{if9kB6WEh*nW>9t+QanB8U}!e)K?hA
zzoFrfieaAev>!&~2=El}QQ&FdH-U#X$eBCeMtj&7j3)dsun_nT@E!0ISm^1FnW()L
zcogjIz_)-I;4#?Es0%7WgAQQK{$XW4tIFtSD^0MgO}5oe$Nsveddku6*x_!e-yXU8
zz6RG}U3>F^TBpv1<_Y&mT;>B}WFTvcB+(1k%*$}SJOdbq`XbH9^VMZ|$v(Kc9t3m)
zgi^Os_yA&e<^EbCF|l&XU)2qDE|jzBwJkaIu69Sw$bT#kutc|v{X8#SejUD+t{d5K
zUfSy|N1*ZiFDKy|D-;4C)T;q7?vV?&@Dc$+H|L7rCzQPa!7mSB$%rCp<UsyXj0yH<
m1<RGfM*;zV1x2j4zzDW`1*`CS78kC<b~Y1!kFl>7F8v>Dpzi<x

diff --git a/autojs/src/main/java/com/stardust/autojs/core/inputevent/RootAutomator.java b/autojs/src/main/java/com/stardust/autojs/core/inputevent/RootAutomator.java
index b63dd277..b11a1ed0 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/inputevent/RootAutomator.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/inputevent/RootAutomator.java
@@ -13,6 +13,7 @@ import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
 import com.stardust.util.ScreenMetrics;
 
 import java.io.IOException;
+import java.util.Locale;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static com.stardust.autojs.core.inputevent.InputEventCodes.*;
@@ -45,7 +46,7 @@ public class RootAutomator implements Shell.Callback {
         mContext = context;
         mShell = new Shell(true);
         mShell.setCallback(this);
-        if(waitForReady){
+        if (waitForReady) {
             waitForReady();
         }
     }
@@ -61,11 +62,11 @@ public class RootAutomator implements Shell.Callback {
     }
 
     private void waitForReady() throws IOException {
-        if(mReady){
+        if (mReady) {
             return;
         }
-        synchronized (mReadyLock){
-            if(mReady){
+        synchronized (mReadyLock) {
+            if (mReady) {
                 return;
             }
             try {
@@ -168,7 +169,7 @@ public class RootAutomator implements Shell.Callback {
     }
 
     public void touchDown(int x, int y, int id) throws IOException {
-        if(mSlotIdMap.size() == 0){
+        if (mSlotIdMap.size() == 0) {
             touchDown0(x, y, id);
             return;
         }
@@ -199,17 +200,17 @@ public class RootAutomator implements Shell.Callback {
     }
 
     public void touchUp(int id) throws IOException {
-        int slotId ;
+        int slotId;
         int i = mSlotIdMap.indexOfKey(id);
-        if( i < 0){
+        if (i < 0) {
             slotId = 0;
-        }else {
+        } else {
             slotId = mSlotIdMap.valueAt(i);
             mSlotIdMap.removeAt(i);
         }
         sendEvent(EV_ABS, ABS_MT_SLOT, slotId);
         sendEvent(EV_ABS, ABS_MT_TRACKING_ID, 0xffffffff);
-        if(mSlotIdMap.size() == 0){
+        if (mSlotIdMap.size() == 0) {
             sendEvent(EV_KEY, BTN_TOUCH, 0x00000000);
             sendEvent(EV_KEY, BTN_TOOL_FINGER, 0x00000000);
         }
@@ -281,9 +282,10 @@ public class RootAutomator implements Shell.Callback {
         String deviceNameOrPath = RootAutomatorEngine.getDeviceNameOrPath(mContext, InputDevices.getTouchDeviceName());
         Log.d(LOG_TAG, "deviceNameOrPath: " + deviceNameOrPath);
         mShell.exec("chmod 777 " + path);
-        String command = path + " -d " + deviceNameOrPath;
+        String command = String.format(Locale.getDefault(), "%s -d %s -sw %d -sh %d", path, deviceNameOrPath,
+                ScreenMetrics.getDeviceScreenWidth(), ScreenMetrics.getDeviceScreenHeight());
         mShell.exec(command);
-        synchronized (mReadyLock){
+        synchronized (mReadyLock) {
             Log.d(LOG_TAG, "notify ready");
             mReady = true;
             mReadyLock.notifyAll();
diff --git a/autojs/src/main/java/com/stardust/autojs/core/util/Shell.java b/autojs/src/main/java/com/stardust/autojs/core/util/Shell.java
index 7df46d77..406bf33f 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/util/Shell.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/util/Shell.java
@@ -62,7 +62,7 @@ public class Shell extends AbstractShell {
         }
     }
 
-    private static final boolean DEBUG = false;
+    private static final boolean DEBUG = true;
     private static final String TAG = "Shell";
 
     private volatile TermSession mTermSession;
diff --git a/common/release/output.json b/common/release/output.json
index e93cf595..81df78ee 100644
--- a/common/release/output.json
+++ b/common/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":414},"path":"commonRelease-4.0.2 Alpha9.apk","properties":{"packageId":"org.autojs.autojs","split":"","minSdkVersion":"17"}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":415},"path":"commonRelease-4.0.2 Alpha10.apk","properties":{"packageId":"org.autojs.autojs","split":"","minSdkVersion":"17"}}]
\ No newline at end of file