From 75f818b962f8e317d643b828c3885df5e52c984a Mon Sep 17 00:00:00 2001 From: blakeyzhang Date: Fri, 19 Mar 2021 14:53:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81android=2010?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qt4a/androiddriver/adb.py | 3 +- qt4a/androiddriver/devicedriver.py | 32 +++++++++++++++--- .../tools/arm64-v8a/droid_inject | Bin 18536 -> 18528 bytes .../tools/arm64-v8a/droid_inject64 | Bin 23032 -> 23032 bytes .../tools/armeabi-v7a/droid_inject | Bin 18536 -> 18536 bytes qt4a/androiddriver/tools/armeabi/droid_inject | Bin 18528 -> 18528 bytes qt4a/androiddriver/tools/version.txt | 2 +- qt4a/androiddriver/tools/x86/droid_inject | Bin 18508 -> 18508 bytes qt4a/device.py | 1 + 9 files changed, 31 insertions(+), 7 deletions(-) diff --git a/qt4a/androiddriver/adb.py b/qt4a/androiddriver/adb.py index 262c115..14470b0 100644 --- a/qt4a/androiddriver/adb.py +++ b/qt4a/androiddriver/adb.py @@ -450,8 +450,7 @@ def wait_for_boot_complete(self, _timeout=180): wait_period = 5 while not boot_complete and (attempts * wait_period) < _timeout: output = self.run_shell_cmd("getprop sys.boot_completed", retry_count=1) - output = output.strip() - if output == "1": + if output and output.strip() == "1": boot_complete = True else: time.sleep(wait_period) diff --git a/qt4a/androiddriver/devicedriver.py b/qt4a/androiddriver/devicedriver.py index 680c452..7c363ea 100644 --- a/qt4a/androiddriver/devicedriver.py +++ b/qt4a/androiddriver/devicedriver.py @@ -20,6 +20,8 @@ import re import os import time +import traceback + import six from qt4a.androiddriver.adb import ADB from qt4a.androiddriver.clientsocket import DirectAndroidSpyClient @@ -127,8 +129,10 @@ def is_package_installed(self, pkg_name, pkg_size, pkg_md5): :param pkg_md5: 安装包md5 :type pkg_md5: string """ + timeout = 60 ret = self.run_driver_cmd( - "isPackageInstalled", pkg_name, pkg_size, pkg_md5, root=self.adb.is_rooted() + "isPackageInstalled", pkg_name, pkg_size, pkg_md5, root=self.adb.is_rooted(), + timeout=timeout ) return "true" in ret @@ -295,12 +299,32 @@ def get_screen_size(self): width, height = result.split(",") return int(width), int(height) + def _take_screen_shot(self, path, _format='png', quality=90): + """ + 使用android系统命令截图 + # todo:使用android的java接口替换该方案 + """ + # result = self.adb.run_shell_cmd( + # "sh %s/SpyHelper.sh takeScreenshot %s %s %s" % (qt4a_path, path, _format, quality), self.adb.is_rooted()) + # if 'true' in result: + # return True + # logger.warn("Take screenshot by SpyHelper.sh failed: %s" % result) + try: + result = self.adb.run_shell_cmd("screencap -p", binary_output=True) + return result + except Exception as e: + logger.warn("Take screenshot failed: %s" % traceback.format_exc(e)) + return False + def take_screen_shot(self, path, quality=90): """截屏 """ - result = self.adb.run_shell_cmd( - "%s/screenshot capture -q %s" % (qt4a_path, quality), binary_output=True - ) + if self.adb.get_sdk_version() >= 29: + result = self._take_screen_shot(path) + else: + result = self.adb.run_shell_cmd( + "%s/screenshot capture -q %s" % (qt4a_path, quality), binary_output=True + ) # 为避免pull文件耗时,直接写到stdout if len(result) < 256: logger.warn("Take screenshot failed: %s" % result) diff --git a/qt4a/androiddriver/tools/arm64-v8a/droid_inject b/qt4a/androiddriver/tools/arm64-v8a/droid_inject index 667b374ce94227decd41b655241de3463c76480c..12755cd25202e0794d33b85dd25bfcf3a6831795 100644 GIT binary patch delta 10029 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 delta 9017 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 diff --git a/qt4a/androiddriver/tools/arm64-v8a/droid_inject64 b/qt4a/androiddriver/tools/arm64-v8a/droid_inject64 index fcd496fa16d9c1d29aece9c626a00c8a5d5d5ab8..e03f19f4f628643ba71e799c3c2634bf932e8092 100644 GIT binary patch delta 2586 zcmZ8j4Qx}_6~6a9J5HSPli0D7*ootq#LT8(+NdmcNE`<>U6ZM_0YcYqn4}_fY*M;Z zOHnjzh_tRh(sFm%0tE%ysV#Y}2FUGNO_j)?(k4-9p+lA0X3dKo+7z~x4rpQs+kMFtXp7WjWoOkTG1f5IJp>cC>6Ulsfo7gA6F5X$6-QAIiU(nABy23eqpo3-% zR72M8ft-HhBK^jkzITy+YfeA3NFS|F{H3tYRBvKeyA}2;6WKqbdMkC+qWx6u8QG0J zCGlciEzx#i|2^WZd>T51knt(isYP@L_geha$vZM@%;GPrVn_Cn(Ia~(9tDqz$1qwt zXiS{3sFYUlzgdT=n{O*|P!k_0ag>=DQW_^?)$H9{VmRx%M2l2;`07i`YjycKTN_f2cM@3euXK+OB_DPv}QjaBev_A@k(|I_Zl zI%{`PQ^H>Qx`O0Rm9N7(TmDC^ha54Q&mGP-TEKgpEm+@h!jzwNUZMqwcPcEDn)%tv zHmr8nLq&z`o_R4W(a2J`!-c%x6{CfG*5xfRGhzsjM)Sxh&QIjd6Zcld6r+hn^g{kl zbsJ1oPY1n=cY0)$e$TG5B`oP8X zq-E$@9mFdZcI`1bdZW)UI@_&`wv(QbYbxP^1h?{YnkL?f45({1n^yeWpi zLBcaF;hU0Z_gFa}@Ox@(+N*jw(_1B%Moq>mMT`qA;dDy1Y16IYw2X7c?^jFMJpbBX z7IPrFRa*tCY1Qf5j`m8acI^U4OyUOKEnfqWwg@qN1M%D5iJY^;XKWcc`J91ll71|BSO0`UrNB-cOlEL5>u>}B5nt^=)8B2O4 z&9aCQQqHb`E=jYbyC3%!{G?D!8GZ!1{g@DkvlHUPaIA$eca@dtaC|TNq!9fQHj}ry zfOjv>BtIdN&(N)`58OyjWGy5w=p$B(JCZ92Zh^}uVK-hmbgsK3 z7&j7*NuqX3q#$()?Jb>Lx-N#VC?p*Qc^MFSB<&`K3>Xuf>t>S9HkVb494)!cU?`XI zf^%7@F6f>>u=|kpLL==%a_+DlGte5-WT!1OR1b`Qm>rp<6U_5QWpp9EtH=3>+ zP4^0HHhjyOJ1nbh{f?i_unEB?%amPn$E|Dvz%%S#6K~(v>oF_)D0dL2~fSj2Yq8IY%3ql-#d=K(nssCJvImo&%gs8&%`S&k{h(b=_C-Rs| z?jct%32|8-{6~oI38WNOQi2F8o76Sa z=me@gm{wIqTJA2b>F7w>X|#UbL@Kkj+CK!Swn~0c7y75RSZeq@KNUr`=>dd%bA)OwrCy;vbMA0m*2Mg!`Hr|KKvt zj}Vdr$um*9_oScr_?tCe*j%g$tnsq3|Mr?==PfJ?V%|kenKK`2+RaxxE>H{qtD^zy zqQgtIl*9SDg5u8BZp6A+`zx#`+%a0h-JU*L%11ptSl{%(lwb5*p{1#}*Vrj7;}`4t zusXbtR9e~k8zLdm$X56xR(`-6qgKA?4OEvgVu>V&OGpyuQ^oVtgT9!eX)J13`P=n< zFjX4{XgMEhkXa5i>~~eLjF*^(s_52bk;r%>rX=)LMdQm2F%Nefz)IL6etHmwfLflzS^g%xeQAY3^5( zf6VlnGX3I+l3X6MB>Tze$uCqAd>-;ViI`(bCCfZVQIlQA*i0>`G!JjChnU-m#;&WX z{-}vsah?V2wCdt#gMK>6(?K_l^P9nqR$o0C6nn|{-{YMjuXhIujplmIK4fUSDH1nO z@O)3?rX<=w?c@hT4UHcC*M^fBy^>2!m${tCG1n6@v$zqny%AI9xeyAecDBr~hFmch zvRCQNu$oof!6z_YC5V?*9r_%I%)krxEBFx*M}?4jVb6BF4)-jW7HdP!3Jj0HO=N9=!^EI0d^S z(BF>Xu^@np|LnfLm_xo9Qyx$zsgV>tUo@8#$)`!WO+nW{o9fUIKy$#`nTMW0#gbl0 zvutFPIN3GOwG!)x@LP$KMMGt*UqW{buLLN~(HI;Z5yJdF8vr=;^_Z0k%uKwToY@V` zY3L+J%Ssu;^s=YHkL0CrVcj}ri8aDU@|9NId0RJP?t|UItP?y)J?0|cd$+y?$!Cib zCX0z>;3QE!BawpGG)7z|ynJ0Gt|`QffIy>!n0d4SD$o4H!Zai>%86MRuqr(|Y5#J- zS`kYEl$Fcaey}T>whQ__*gsgPeg-zNsl%w!AF0k8$cbAStUWO9D?Fw%vPJTdJa56H z8?R&|7`_n<-vn$h>5@trY|0;zov+gWKaQ-p6*dLN9J)VlW0wHFun$9F*x28o$kVyn?(cSx8b^f%nq*{d9y=es+MUcPdxU@cI8Fh-{s+_!j;x$ zxF1DvAM$hIb@T?m8V=C;l&j0JipRU+sh0jX%IPq_v~69v(E?L^j23Pi`fB;@|DpI6 RY^Pcar&Fz|pAYR-{s(svnfL$z diff --git a/qt4a/androiddriver/tools/armeabi-v7a/droid_inject b/qt4a/androiddriver/tools/armeabi-v7a/droid_inject index 667b374ce94227decd41b655241de3463c76480c..a2a7ee0301615722f31e341cc0379bbcb81d9685 100644 GIT binary patch delta 1722 zcmYjSc}!GC7@ye#_JAy_D96IG>vB`ddeOyFh2=4_tO#0<5;dVVD%D;}t)jL2IJB{c zQl=UaZ`5)r;7XJ>rkI#UjmDCYMjI^)B4RcB7OTE3$G(1V?H|14_kQ2+oB8JZX6C(_ z;Tk+#gKMhgXVVcn`@`N(m6@ps`QgO)l3IJi>t)Pje*yMf^BM^DTy@?EN|U^QH31=H zLZ}Tm-HOmpzzY)*atVTP7Z3pYc|1acfK^~`0PHa$R1CZwd~1N;1KtSyCiu4iZvvD7 zDgk?)#Tp$}eiVbyRsieV6=K5j&3c5E(KFf07fseBHeLBJ;zhmS=s2P+?NDh#14;I{#pfHwfKG$Nu( zIS`J}Wk3-<6HzAr04x`cj%;vDKt$>jPoa$bvbd`~m>9`djJ#G!&7{xks`c@IahGhf zh>4UlQiG4b&*jt^$iIxh+sCt`0toV~tO#v3kbqh(5%_{JtKY{|#J7Yt<;_sgaN^^8 zIf36YTKIxp657lX1N7VA%YlB1o|E=dj=W;8G-Nx|IMc`9CRozmRc9-LQUv}8sO?<`|5pbX*3eTbq=YGnFKqI0Sy%gtR__Nc@#u8Q)`HLUuAzS`CeB$!%{)w~t@V zJph*0OAQX&Z7=GMgc9C`nXTXqWF|?5;?9gpOsa!wn$~3?>X((91>QOyRI@cd30ASU zV+SLv9b-Zu!on33+2Ir-uBC-TX+e%(r6!3fo2Z%*HITsC(3YhHQ&mf8p};@%IT)5$ zNHzpUaXAoFOy&{Ah+y&YkzDwQRHMEpE@y$SD1VI&Hi#5^B`BFRnuA@5L|!NG>&F90 zQCFUQrA>Yq))|#EDbVWUOE{w|$vF~hvjifG*Vc;943H(_q|~hR}MzT0oq= ztaB%$E0vLb`q>?3f}4DNI(-mRrCbE9b41V&4cqX~wBJyLTj@IETwFuzjgRrLvucJ$ zf`=%L&BZtAz1X982i+Fei36Oe@wWrQS~*4M1mDcT0k^Q5pzh<3G@kEV-Bg>Zb1do; z9PMq%Z1{lSz;L8=12=0rSo1@{abDWN?g4HK>|mb(w*Y4j3XWFjSOVM*Tn&5?__V0c z$=E}WfE%@JFK{FHUjVl$I#}^hMzIHob*?G5p$5{RBELP_dT3#fBg@ z?VH0i_xF?Z$Dn_lq}PEyJV_UUKIzQOxg^0y=tOReJQnVsSZX9Dx&IcTHn7B8 QQFJp{C%`)4tRr{uf9OY&1ONa4 delta 1710 zcmYjSdrTBZ7@xVlgF7BQLFE0|1C*D9!v_kj6>*tz9tdb#5Gkp)rX;PcVr)fY_dt`r zjGm05C$*ALlT)N{9)w`pYMZ8M8;xK{V;duAeW2*=U99d3$8Ntp`v;r+_V+#J`{tW( zXJ#ktc*2hD`*rOF2(=&n;v>VtT!aE}V>}od@slKRW^$+kd%u@hg1tlT-^21Wn_L+P zc~cQO1zb>q&@td;nFx(5igF$BYym>I0iysb_-X(jn-H=9H-fDKxD2=sI2r7lfj0u) z0W<-c-5ZPv*ifH>&=$Zp_ue^aShpz|A&#Do$ieA!B=DYz$iNHe{751ECGa&RA(Z_J zLOZEx?)w^lB0V_wS%i{^P%NMd9KQnh)1y&c;RqxxKo7V{OXs<80Tt)<7~V`k=z}b?c@Q(r-D2|;@Dg~(s&=!M`88`>95ReFnqH%Hi z4A&ro6HrV~$L-Lq2Wgll#dqkLnT$!pt+IGia9b9U zG}6p5tSsITRykNAaf)d5uSyIe$h)>BvYRDZ8b=hdV!9+?d$}dOJMv6fY7mVjvN$Rz zV$)RRzqabgvn_;$aqr2iVVr*Cr1cxVtX5*??BbmHvUpvHzcu8GGZsHdX&IB=ZF5+j za|WN*(9D%VP}fW==^Q$0DT7iJ@#`7-zjO@j#Y10N?XxoV3(j$rF(xf(TL%*cvS7ng zyhjl)`#-ldb2@u1WZXTof$(Ee?D=U<6R7J)zs|vsS`tq*R2DZ2nhxGlM;I1S2vlz4;}5ZqNu#bTwQq-~x#wIhti4#MBjG+a)IxF~ zk1W0_puDh)OqwRGn&?g-%JL+#8`F)Xu~HEyWu9v#%Skl^rVHyKz(R^hh)*e!#Z)2Q z#~4HZQrq{2T(#ycSOt_SX;3zCn#0F43FA=25BU~%*i^Cpl4&u2-_swg~m9Xg?JREXabb1z%LP(>w%jwA?bCN4kj;lnF&4vJApn< z*=MK+FQ8Qhc0to9<(;o2D8y*h9P0OYt@OApIn6rJv0oz|rm% z3$6sk^b7id8S%UTb-i|ppi8Ij8odX`hp8zyfv+D^_`cq3Tjp(r#|X|l@L8kFR{W2` zf5*6N?ZCakE}I{?8@T+A!k>eI+kpFkj{x@r_p5r3*5#7X|;EC~6{Uy1<`@T0m0g3ZvUWvV&xIJIGc1AND_u A3jhEB diff --git a/qt4a/androiddriver/tools/armeabi/droid_inject b/qt4a/androiddriver/tools/armeabi/droid_inject index eeec863ba6a5422947d801f2aa35d3f7e12a33ec..12755cd25202e0794d33b85dd25bfcf3a6831795 100644 GIT binary patch delta 3295 zcmZ8k3vipo5#E!2J^YMcNi64V{gP})mK7q|4#)|K9Yt|0D>9}T8bi}2q|h-9&l0Ge zm&EWaPsazuk^?1y76$=w;+jX>v}OhdC=?_}hLG@33aM!*%%4*5Z%NkQz29zlXy()2 z?(N;}?e6W}pX?{ee$s!N?xUpuAMO6lbvb2j02QNz{4OtaSQeJJD3M;4?fCza+#l#) zyZfT;KB2LkY8a7Tknaz;=?>p^Updt>jkHZ}r1x}Ms5ZLGrxiJ0M_p7ST`SkqJAw_= zLU*e2Yh_Kuj`Gd2g=&Tzlk$=NSo zm*nI0>|nu~s~j?jHznHwxnjE8M2FoP>8!jWc^dVB!CXam@=3ZQj0z|w^P`Cfq2^)onyw9g5UR21bn;z!7P5DvsX!~w)>H2@K$ z&p7}dLHaP#;c{&J5<3nfeG+jH@fXA^?5A@Q>z~V(v|rU$672P12(vwHL^_h)=_6F! z#NG1OY=Pg_GvgK_jc0QM+9(FNr?DsMC2`&_j9h&pu0CI{6G5oybeeiR&K zanx4jMB2ob6<3BX&Vpz_mraftXb~-=1vta{?3~Uzs-e4lHg(2@SrMgcv$_5TT2G4McbMrbKDpb=-MzdtRR)%+QAmzax>OuPJz6!vhp z3sDRRyS(H^GRlsX*y;{UyQnT{L9@FRu)lXw?8!k#jJI{6HBVarLU{nz3jv;ImeLw> z8Cz4@Y+C+<)q>MAb~Uj`>4K1L8tj@AjkvwSBv>?7?zZM>u$GG!w3bMv*e{%Ls@t!b z4kk5LuyCD)(;`|isML1qXdSwphw*f#I?#Y8csrgn4Xa1VrIUKXY}` z_)Hz;-gzRkXbYciIOCvt3Kk-Lo_1i58)d)GaE%x{Hg^rNvC4TH4F}WQ0UOw@^DNh_ z%M>+%og{YjXp&^fmlIIU`&u&~-iAj`7k#Y4rbhhcW`MiQ00Wf(FI54^V}(?Q5qT(M zz6f1GLp~3VyE;w%T5&0E+J@XUY3j6oXj0uKxQSHBiszdGUFl-fX_(cyI1SFCIM0we zobBl>m~t^M_+Eqzw>}45NfIX}L@FP-9oNmr_5b4m*o^I??56oOAt|k^`X#HW>c^ED~G~kgW(ni%EThlOz#X=gv zS>8*KB&oi_%V#~FM*l?u(Y)CrB&CArk^Tz+QfSKu0{(4amE{+#|5K`gF7DjnTZZo7 zmk^Qun3~D8XH)gmaqbc#(z7Xk2@z?3%0X*_nxUD?iSvRge>i2qx+DzoIR;s*yt3dH zlq{v%As(Dt*|Bo-x-BUeuCo-Y4LUkyr^RU0QFP3&(Vk6+rx##>M|wG8Gol;OhPZyL zGWhU_fESUl#IB}FVcO*9jwxYlOwDs@Qh90(>r;17%N{V9a=6oz6kr!SWLjN%W-1Ra zFCJumf=CmQ{>5@C7U=Fl4I`_os3(uJODbxJhi$KD-ZC`hR}<)X6ToALMW`iV^88`# znE%BQ176`+c6N)jnd%2}@M6DlYQ%4)%W!tS`>j(R+7eMFyD|dxQb=^1DtpF*Cs>(W zmlm+5LSn_KI@)fn9VXJv%)Fp7G!)p|{_gDMOQi6Wc5me=le7B6J;6c$%%1yv%H*G? z0Z*cl4SH#UsR^n~9-bDe<|g`QxfpVV2_bT4;J)@Z&dt|7bs%|nK!^~lap2AFyUIQh> zNys51PO~K#@CH_D8iAF?EYuJsEH|c1evUUSKdL#{AYwn_ zF~kSh*@=p+=L6h>{7wWd2RMVWjo3auA7CBQRzx#m8R9&I88idW7qh9V z=X16#2IxiH%w9C_$=QT0FTyu^srbB(I7f?XA25uLFY3}1dvN96HREkC{@c@Yqq#Xv5_5!oA1NUM0RKk%)SN@%O&@c)KI}{? zp_t)NxEJZ0sIV7l9O*dHqezoTM`FhCYp0MNCKzji1d-(2F$IVhrbxj=AUOj~-pV zmdvfJ1z3o1Bls`B5kDqIm$baCU3mmQFmO5bcRl{U@*Vyf2Yvr@6uyq_;$47U!y-ofHToiGA delta 3294 zcmZ8k3v`o37M@A|H0hJRfP_xTpM=)*fuv2lwtzfpC{5EATzu5`V|^6S1M1PGQb^Y4 z(M3!dL6ah&i)(2Wie2QeZqH%Q>aMR{lVcSG-3{w%)q}hLqHF&qX|mt^?Xqaj`Euvp zxpQac-aB{Zj|FKgNP`a>K3Yh~N4<})&&;VIM8hzpFJ}7>s8YR)QRSHG#Q%sI^aa~` zS8ei0ZZp$ys{BUX=Br^no=qMz({r72zv^bc?65I?c#B6b3%-K6m`=GvtzwV1*D@R1 ztjX_Cbs;C@*Q++B>#Jl!_eRy!Pi#)RPFbYVdBmaP5--cO&{n=Qw}xKI@6N5y+^w#U ziE%o9Fn8tJa+S#U#hQIta-!41`fGH`H|mnug>2gxsWzQl=JT{9IyZWzdh*p9V&uZS z$g=htX2&YTe*T!g*h`+)%iW$z=GJ(9AF0ZY*7_Q>k&N}%*&sj5Z^*M&)T#?wHhKjA zX`0H*nyO;eE%Q4zdUVPwYIW-tPYrtjd!x!u{!*URzf-lh>SZA_#%vg;Q=U}iX$e(+ zo_4aTA!Ve?L&$B-gj{E zGWkZ~me*6cUPsrITd4B8RF+R4Mu5BAUEwAg5&hE8hLK~<-!CDg6${_#z#PB;e4SB5n4hXx-OiWPVnpkx`jAsIpD#twd5#CCER^uXo&+lHjIFX6U2J?Nj<; zQdt~NQOn=bD#unM?cgz@CJ>OC6_P?2wVsfi&djPTcQ_|{n zGQ?GRCux{#j7rQFYd~2MJaJ}5GYjmN|wQhjVfb_O7zq~_Ciu8u-!g9+h) zPX5p=+g+=Y`E|reqdi@^7_I;37?~&f7AJ}PFpiudymyX6i}?MGgaoXFJW)!>(YbKc z;XGzQM0O;ttKbUe_cUN!SAu!<@cA5W7!Z7#y zh#2v&1aUedMJ}r764KoNM9g0O0T<@6qwlN4EU#!&<+4P^+_6YD!sR8kIFeMkM)Svp z1bG(4LU|chjz?*X&by^aSRGBke<5Eud%6gniMPWe!HcjCtYuUz=rUevzUay$@mjW^ zqsOxd?huy{RbGov<=Q~JidCMwgs3tQ7ncxKcE>AOS-Y-p>T(jiq{+9(ZKz99pRn;X zA2gTdZiZwb)Axzs`1yxs>zdo+F3htK)dr4^J6Qo1H44Y9$9g(}eIJ{gYb$uRdf%(d`=mylTSQoqBFwwx4hSKA!lM-uUB)Z~s@hc5D z!Rhfe2?;foL>o_6uoioHKUMDG){;^`BGvN2^yN#Ho(cUf^Jxpxa7WutFDdKsNOdx7 zr^jEPGz9ybN}|2qDSmh|INds+_2fmR(4)SsE$^PQb;ZQ5V~_h#BFjGLH1Nl~hOju@ zQcZgNc=D09N4%yWtox_UZ=J;ZLM!-hCj)I6K~t#5BeM+D*KgH~aF5s2N4AU16q`J& zHZVO3QF?qhuJ6lwIg9HY*__PJh~BFe5HUq_a_^0Iw}}^zIL%RYJ)Gp$oRrZk_;pR| zmh0Sv`-=xnVag4mtU+TC#pwbQgjEgr03Sp$SOFb53X7B4@~KNqOt;Z%tps#G8- z<@?j)RdF%l**G#(%j4rXS2rV%3oSSkco;nl{sr()f^IJ%9b_*WyMRy7`BQXwenQA& z;JX2{8OaaXb!dMyn~+OEn}9{Y#efTN13AENXAxrJxpTjzYdEzY$$W4DDlo8x|K9pc zW*1tmK-=(5@(}~A8@7}`Wh@@Wq#IWrYbM9`d_F_j8jFA*-ZlSP9e-;hr#Q>sfey?#6zKY!kY@zyVrl=N@lYTD`W_Va zfkr^z0v!eY5_D+L6o{M#-Cr0m|2^%03-Sigp+PB7_gUKi2KY0egQi0P=^sLF4|IO6 z@s)uyqOmk5u=NYkksk<-fey?Jamhg)y_5fEh1Kw# f3r^vdW`{xhQsK+d5_3s>Em{$@BE!AS@6-PRZS-?L diff --git a/qt4a/androiddriver/tools/version.txt b/qt4a/androiddriver/tools/version.txt index 725cdcd..4be28fd 100644 --- a/qt4a/androiddriver/tools/version.txt +++ b/qt4a/androiddriver/tools/version.txt @@ -1 +1 @@ -193 \ No newline at end of file +194 \ No newline at end of file diff --git a/qt4a/androiddriver/tools/x86/droid_inject b/qt4a/androiddriver/tools/x86/droid_inject index a6a1d0e38d2f5c63574d78ecb33865014a79ebb3..12576ec616844d57bde356a72d143db2b136673d 100644 GIT binary patch delta 1487 zcmYk6e^69a6vyA$b`xazmCN!QcG<`BV;6zk1s2wX5t*H2ih|UNiKZbN$7wR*4}TF6 zSnlA{#X}92js1aB(^zA!IT_|)WENrJNM%AIhPgzhQ=}2#?fZ6^hBtHH=bd}bJ$vu@ zp1lJ;8t{>?O}EZ1N$Wbi4~N#4NK$ZoG336r!@`?rmc8L0QYIHg ztTwvG5U!O2W3xh>)ynrslBBdg%KIZKjT`1&%?n*kJQI;@+&Ay4T z(-13>D^nNGhn3F=(fXB`IEuZsm&yf zz8(7wR(u}!4=LOepGwU<9RG~*W3^TeS^f1u!_DBg(%Q$>3ESw5|J#IHnlQ&z%mz1S z<*$?Nbe3-?zd#pxeToVBUQ2198$6TJ9)Cy8gsMF>Da6iR@0XEnBf-MW@xj#X)W?Y? z-=c_7Ar$`-K5AO&QdOF-F4F70jj}dS9Y79MsP-I0di647j0@yowjCev=#`#QUTSvI z<6Ljfp-sHcypBlvbskJB!M^mCcVoNMog=Nof{Gfynu@(YqV zWTmH@IcqOnXG?Y|me*&i%lBr#g5~$woG zNA7go#gtoCS`Am`eR==;;yBr!Ws_A03i|~LHt{yvW-{Ej@L9X2I&fiJh?c$)-e^yw zy}ZYsWa^k-b!h}8ua~2qe5$T*y$_*{!O$k|w;YdU~>71#W z*f^xZ#t2~UIJXqX@MdQU6zFi4pit+W)pUi;1tnC@Ed`08CPWU9 zB)tsFLMQo9!7@}u^;E&*(MXcaa|P98;ztTC_ts*w;Tk^WO5n~ylgKcSI?r_>24N-eT9+9Oy4AIUcJT?k zJv{ANp({dTj`8y19@@gw#kuqeXO-kOcb*esNC+Vh3egQ3z87N0v=9!k6YKD8)Fa#j#~H(G*y(691NNQ1<7$ zFOc8x!0%KRo-audBlv8>J7$6XJnW?*H>yLuJYUZ9y-s7N!w_g{YhU?20N0M z8?6z9YvpLDZVFocXGY)xoOw-nXYv_m7Htrn0D3AbbY`JQ#^EmUr#BZ z2v;FT-H z$y_Ua$#-(s(+O_NGa=u5c^hejr}6@sH`Gk1+S50M=sN2EE~WEQtZ=uuFMkV#INQ`4 z_Yg5kXciwdEp@70nyxO=>-}%a+Gt}GIn+i4a<5>em(j+IXc?>lEa1^AgB856z)nwc zYe5;U;`a+S(aWqaRB)@03+>d!LxpafOK;wr-mRV-Y1LU#ev4&BiH)IC<{qN`yt1f< zj_~fH9E2Y(Iz^kfy||Q)a({6PhC*Mmg|ysVvVzL_O3Aw&-aY!x39L?c=+)Y|Pp`d%i}0 ziL2~+nQ_>xRo{Wf1_?qYFA8y(ce>_rhdqzp;m_=D6l28RNE2LH<)$XyS(Tk&LS&dE zsTZ0VGkK_L5lzNC4e-=ykdKq98>xau3@mgmAMcMCMOds({{5Erf zYq72lgE-7jxdy456Wrw(S*N>vd+@XnKM5ghLqY^W`J512?+W1scY#5002~E}KmksG z+Mgl!gg6d*z~HbDZ>jouA;MtmFG9qlO~*kiC|?kw0qg`j!BKGElz3j)P~-bB>;g^q zkq8Z51^$iM*aO;7n=q)wkTu}rphf?JpckbW1r4~i{1A5hD_T{K!4KL(HJ-D?8$78Y z!{g&r^PobK(2&@(0l&J+|Mhjy^)vKWpwF41t3AsM)hy}Lsk5>yKfzQcNvdRUd+l7# dsnzQo&>UP=Yt{{5QU>^0tYV+&(6-ti>0eo^q|E>T diff --git a/qt4a/device.py b/qt4a/device.py index 8546778..d019da5 100644 --- a/qt4a/device.py +++ b/qt4a/device.py @@ -747,6 +747,7 @@ def read_logcat(self, tag, process_name_pattern, pattern, num=1): pat = re.compile(r'^\[(.+)\(\d+\)\]\s+\[.+\]\s+\w/(.+)\(\s*\d+\):\s+(.+)$') log_pat = re.compile(pattern) log_list = self.adb.get_log(False) + log_list = [i.decode("utf-8") for i in log_list] result_list = [] k = 0 for i in range(len(log_list) - 1, -1, -1):