From d385fdd64c4e22804b15136ffb5b75e0fe17a1bb Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Mon, 29 Jan 2024 18:55:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8Ddeepin23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 4 +++- api/__init__.py | 8 +++++++- getxmlimg.py | 6 ++++-- mainwindow.py | 6 +++--- new-deb-build/DEBIAN/control | 6 +++--- .../files/Download.py | 7 ++++++- .../files/Icon/QR/Alipay.jpg | Bin 0 -> 276227 bytes .../files/Icon/QR/QQ.png | Bin 0 -> 67915 bytes .../files/Icon/QR/Wechat.png | Bin 0 -> 77382 bytes .../files/Icon/QR/advertisement0.jpg | Bin 0 -> 346555 bytes .../files/information.json | 2 +- spark-uengine-runner.deb | Bin 972 -> 0 bytes uengine-apk-builder | 2 +- uengine-apk-builder-more | 2 +- uengine-runner-about | 4 ++-- 15 files changed, 31 insertions(+), 16 deletions(-) create mode 100644 new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Icon/QR/Alipay.jpg create mode 100644 new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Icon/QR/QQ.png create mode 100644 new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Icon/QR/Wechat.png create mode 100644 new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Icon/QR/advertisement0.jpg mode change 100755 => 100644 spark-uengine-runner.deb diff --git a/Makefile b/Makefile index d74aea5..9ddaede 100755 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ clean: python3 RemovePycacheFile.py + rm com.gitee.uengine.runner.spark.deb -fv build: echo 别云间 @@ -58,6 +59,7 @@ build: cp -rv uengine-remove.sh new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/ cp -rv pkexec new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/ cp -rv LoadingBinder new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/ + cp -rv aapt new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/ rm -rfv new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/information python3 UpdateTime.py python3 RemovePycacheFile.py #new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/ @@ -86,4 +88,4 @@ depend: python3 -m pip install --upgrade keyboard --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple run: - python3 mainwindow.py \ No newline at end of file + python3 mainwindow.py diff --git a/api/__init__.py b/api/__init__.py index abd242c..d8c2708 100755 --- a/api/__init__.py +++ b/api/__init__.py @@ -6,6 +6,12 @@ import traceback import subprocess from getxmlimg import getsavexml +programPath = os.path.split(os.path.realpath(__file__))[0] # 返回 string + +# 获取用户主目录 +def get_home()->"获取用户主目录": + return os.path.expanduser('~') + class ProgramInformation: programPath = os.path.split(os.path.realpath(__file__))[0] # 返回 string version = "1.6.0Alpha2" @@ -49,7 +55,7 @@ class APK: def uninstall(self): return os.system("uengine uninstall --pkg='{}'".format(self.packageName())) def information(self): - return subprocess.getoutput("aapt dump badging '{}'".format(self.apkPath)) + return subprocess.getoutput("'{}/aapt/run-aapt.sh' dump badging '{}'".format(programPath, self.apkPath)) def activityName(self): info = self.information() for line in info.split('\n'): diff --git a/getxmlimg.py b/getxmlimg.py index 2bda884..cbefdef 100755 --- a/getxmlimg.py +++ b/getxmlimg.py @@ -10,10 +10,12 @@ import zipfile import subprocess import re +programPath = os.path.split(os.path.realpath(__file__))[0] # 返回 string + class getsavexml(): def savexml(self,apkFilePath,xmlpath,iconSavePath): - cmddumpid = "aapt dump xmltree "+ apkFilePath + " " + xmlpath + cmddumpid = f"'{programPath}/aapt/run-aapt.sh' dump xmltree "+ apkFilePath + " " + xmlpath print(cmddumpid) xmltree = subprocess.getoutput(cmddumpid) xmls = xmltree.splitlines() @@ -35,7 +37,7 @@ class getsavexml(): print(foreimgid) # 直接从apk resource文件获取前后两层图片路径及ID字符串 - resource = subprocess.getoutput("aapt dump --values resources " + apkFilePath + "| grep -iE -A1 " + "\"" + backimgid + "|" + foreimgid + "\"") + resource = subprocess.getoutput(f"'{programPath}/aapt/run-aapt.sh' dump --values resources " + apkFilePath + "| grep -iE -A1 " + "\"" + backimgid + "|" + foreimgid + "\"") resourcelines = resource.splitlines() print(resourcelines) diff --git a/mainwindow.py b/mainwindow.py index 202943e..59fa6d1 100755 --- a/mainwindow.py +++ b/mainwindow.py @@ -418,7 +418,7 @@ def write_txt(path: "路径", things: "内容")->"写入文本文档": # 获取 aapt 的所有信息 def GetApkInformation(apkFilePath: "apk 所在路径")->"获取 aapt 的所有信息": - return GetCommandReturn("aapt dump badging '{}'".format(apkFilePath)) + return GetCommandReturn("'{}/aapt/run-aapt.sh' dump badging '{}'".format(programPath, apkFilePath)) # 获取 apk Activity def GetApkActivityName(apkFilePath: "apk 所在路径")->"获取 apk Activity": @@ -1559,7 +1559,7 @@ def UseProgram():
10、deepin 终端:{}
'''.format(subprocess.getoutput("uengine version"), subprocess.getoutput("python3 --version"), QtCore.qVersion, - subprocess.getoutput("aapt version"), + subprocess.getoutput(f"'{programPath}/aapt/run-aapt.sh' version"), subprocess.getoutput("dpkg --version"), subprocess.getoutput("mkdir --version"), subprocess.getoutput("chmod --version"), @@ -1582,7 +1582,7 @@ if not lang in langFile.keys(): programUrl = information["Url"][0] version = information["Version"] goodRunSystem = information["System"] -aaptVersion = GetCommandReturn("aapt version") +aaptVersion = GetCommandReturn(f"'{programPath}/aapt/run-aapt.sh' version") SystemVersion = GetSystemVersion() iconPath = "{}/runner.svg".format(os.path.split(os.path.realpath(__file__))[0]) about = f''' diff --git a/new-deb-build/DEBIAN/control b/new-deb-build/DEBIAN/control index eba6e6d..c5bd458 100755 --- a/new-deb-build/DEBIAN/control +++ b/new-deb-build/DEBIAN/control @@ -1,13 +1,13 @@ Package: com.gitee.uengine.runner.spark Source: com.gitee.uengine.runner.spark Replaces: spark-uengine-runner, com.gitee.uengine.runner.spark.ubuntu -Version: 2.1.2 +Version: 2.2.0 Architecture: all Section: utils Installed-Size: 2920 Maintainer: gfdgd xi <3025613752@qq.com> -Depends: python3, python3-tk, python3-pip, aapt, python3-setuptools, deepin-terminal | mate-terminal | gnome-terminal | xfce4-terminal, curl, python3-pil, python3-requests, adb, fonts-noto-cjk, python3-numpy, wget, inotify-tools, aria2, python3-pyqt5, python3-matplotlib, python3-urllib3, zenity, python3-pil.imagetk -Recommends: uengine, deepin-elf-verify, python3-pyqt5.qtwebengine +Depends: python3, python3-tk, python3-pip, python3-setuptools, deepin-terminal | mate-terminal | gnome-terminal | xfce4-terminal, curl, python3-pil, python3-requests, adb, fonts-noto-cjk, python3-numpy, wget, inotify-tools, aria2, python3-pyqt5, python3-matplotlib, python3-urllib3, zenity, python3-pil.imagetk +Recommends: uengine, deepin-elf-verify, python3-pyqt5.qtwebengine, aapt Priority: optional Conflicts: spark-uengine-apk-builder, com.gitee.uengine.runner.spark.ubuntu Homepage: https://gitee.com/gfdgd-xi/uengine-runner diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Download.py b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Download.py index fb6da69..acf1d9a 100755 --- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Download.py +++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Download.py @@ -1,5 +1,7 @@ #!/usr/bin/env python3 +import os import sys +import json import base64 import requests print("""浣溪沙 @@ -8,4 +10,7 @@ print("""浣溪沙 print("") print("听一支新曲喝一杯美酒,还是去年的天气旧日的亭台,西落的夕阳何时再回来?那花儿落去我也无可奈何,那归来的燕子似曾相识,在小园的花径上独自徘徊。") print("================================") -print(requests.get(base64.b64decode("aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3VlbmdpbmUtcnVubmVyL0luc3RhbGwucGhwP1ZlcnNpb249").decode("utf-8") + sys.argv[1]).text) \ No newline at end of file +programPath = os.path.split(os.path.realpath(__file__))[0] # 返回 string +with open(f"{programPath}/information.json") as file: + version = json.loads(file.read())["Version"] +print(requests.get(base64.b64decode("aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3VlbmdpbmUtcnVubmVyL0luc3RhbGwucGhwP1ZlcnNpb249").decode("utf-8") + version).text) \ No newline at end of file diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Icon/QR/Alipay.jpg b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Icon/QR/Alipay.jpg new file mode 100644 index 0000000000000000000000000000000000000000..64308b8f726a94492835392fec14ed3d6a3a36ea GIT binary patch literal 276227 zcmeFYbyVA5*DsiswvY&LAicrr((7Wen}88b;%GVm?DpCDJUX3BPqrZqM95Vru9m7Rn)!1Vob|(8@-@SR zRP>?SRs!|JbEX-hF )lR` zaAzL8-&3pQB{&fi_{PF_BA_=ho2N;fZ2@+l&Fb#%zDc>QJGQ(cANLoGmEyrQ@}_d( zx{-+=oI77EOd4On8rJ_X 7AV?EL*3_Tm0BC+Bu zoj7tngE$%VcYtViEKqyRgGGkB&i?+kaEgb6L~G7ytb%zGvuF~PEH&uC Ax-G9sOGhc}%!{YU8Tm8}ch8B8?s#UKkO)s4yXqNS%q rscqfRJyRH)gNJ5#2d6}z$*OkGl1kxgyGH^VZo%) zp-0NDclpZrpum+zeU>oeYTLkM@@Gz1JZDe#7>(%@N&ECC@ruqMP~L#NYz7nmrgvpQ z?`U~cqGC{UJ+U(us5^#U+r!eI*bOkpFpp*OZ$uHpCcF=}571$jS9rUE0(*$W`MlL= zy7I$qNR`8vC90LKiY(FJZ vQd0C4FrTTkHBNc8VKeQ${iNI3}9Rd@>4^% zVq*EDS0LM)!Pl^xZ&&0Q`{rlJ-_5m^yN_#^W^-|QAEhawi`p#<5w}sS$|WQ^qukNc zhAE2Rn5>tVxn!DD9-%b{lxT`L$jEl~`-vv2{gUROs>BE61^iiJ88R@1PeBva`AQ%b zmU_5Z#?5f>-gfw;`Mjz^w#!V-*=v`^%-1d(Vn>dpi8VF2d~xZ!2&=&E6QDUYlZCzQ z(&6!1?%7;(&2svl@PLt=HM!W#bH{wfSvf@xj;x4Qik=TNufuX41D(SEh)_y&lB!?K z%?l;D`}B9#_&3>VOjoBj3gvEdai`tu8rSuw+z3X?nr41rP%TYVql|)k%{R2aBxa5s z1Uc_}M!{;jkZwU&K@EZOR$crmgY|cSmnL}Xq6`Vn?gDxE`eCv^1uPxXW%b3zcWA-` z#{A}GP2|eMo%vZPVH0wTxAfI#jW^y#w)QDuKZZvwfO*6E4n>OATSZl)^Cod0SP+m{ zD7Du6^JcJ7^y~0XgiKh+Sc=w;oDC!282ug1h0N`CQgX3~d;U>f)E{KK&~|Tx-b^gX z<1rJu_g>m!n)Wb@mpd4l8~W#rOxzhfwY8ITHQPKjh9?Zi n%CsH+Slt|w~ELACk*TpPLBC?#yQR%fTZt~pxQJkGq7wU@($2icf+CY zmsIU;SO-fHG4 jd`d93nU3J} z9<%%#&9!1{dr(}n5d|xU)w=nZj}EjK?#46Usx>qV@Koo~)Mte8E9LMejzT|J7gwGB zB%F9o#>m2u+Y|W0UlQZBx}^=8Yl@z7{Cq^TtnF $)r#5NIPYNgC|60LM7*3%L9d#g&^${;HL??AUc)guM`~Y7<80 z9gkB^eh?mt#|unmPN*`tt>n(6rM_vm=b3s~e-Y*LbJS02)g0}MthbyzOgn%*@X1`; zU!U?Jjov(`?KS!&Y`*p+w?iQrT0r=VS9MmU`L(tFNrpj{pVJna;#8~;US=x >8 zu3C1C%w*aqYFyPu?lT4Z{NX~ihn#j{ZraO*X1xKkN#u8cujE^}dW#sTg<3Z)WDh-2 z{rvjo;rZ(&osw|oy_XY>Y0NB-c?>dh4P|BJ(EaPg&(N!L8r6-olka_b=AQoU3$dI? zj@Of(wXdck^Uv0i25ZL>XUm$%V*`(8doA;)l$TrZYh?BeSv%y1vydU<5VTw)FiUU# z$L`M{Ti3|UO;-Nw9ntN%8fN;B(*=e)UEGkw<+_g`hTe5}p`MoIRa}#18l$-^;*4Zb zwO@UPaSmp;EYc%2j`0lKH7JXE$=o@F`+CWdiSpRP@uXyXFUuM_8{T-a2U&mT82*5C z4jp~E%Fn;i*pTbMd6L&{{B2xrYmmk)@5EHrTT!;&!98n#FE5Pa9VIcnk!CEu(~ci} zUfvY*ig-GToU_t(!gwSR49=AG>DfdWx(&_d1e~i2jQ8tydN1e8#~gY;SDT`zTWO$i zl8<=%>yLKL&^MbV?N~zoYB@(N_%f0-`pS`!f3cWlfvQpzC2i`LE`8XT?H5M3Twcpnc- z5{FBiX#A93AI&lNeTZH-6(uK#ejh8JFaEHjkrK=(l9Mcy3{lAkZ8D$nTjJK1$^6-+ zKUo>VtY>&J(b$*#6{VyN{Hb5LMctD57?U_-gwsL8(IFgUif%ibtg%hh`F=BNt&?g+ zDi2luGV*DRRZV2*z5a&KCZroS9>pAz5A=pMoQ5q8fA=1M@qAqgmtH0MvSNiJlOXwJ zmob5J8dkW$BiJ0(E^0NpJ&LeAQw+9d0yYna!@Zbj>+pNbL}uIhM7}UJN{l@s=cL=1 zt8D`#snf5u)pGF%+0MG2HL7hOv~gk7HKS=%FJ@E{qL{g@=)UI<_I>94U`im=OHeZr zy_qI*K36+smc$Uq*nH{=wsa2E9SxSe(wzz8WIAw;ii!$uTcXZ?_?f_Jh-;>3T+n7s z$*a$~`-fv@qPliw18o>F7cEZOcc?#3vEPQh6FvlQf~pmr{kJH|wq}U%!5@`t&t* z#4*(2#_dA)$I5?3Hu1qVD~2$_Up Dm?d8XpnTC z&%ZtOp19uLFuw10Vk&VNVpkjj{!>{(p);+=AF8I)+@X3tPCmA!#Aq)tN&SH>TS+C% z%(QtPvR8#6>MWYA68F#Ig=DuC@Xgf!g+n>q@pL;4))0+d o#DE#90yELvbSGt{}xTs*TpH^bf%ry*gC$a*s|48gBk z#wlNie&;jlch_>|m4yd4X$OYkO?C7hwr%^a?)Ip`N++PXJ^v!Kbe$fn-esSECO=8P z)ERI-qOMsI*Dn1iN)oO9DNL EB+wkj%$vUoB_XquQZZo_J-c85yiU$ql>IluOl z4*V6G!W{(%=Z{2#QU-ip>&`lh165~Dqu>y@_d$uT0sb32)F+gAQd)}DbmFF96U05P z7T8orxl3o8Rt@f}`C6 dXW5%sZMI|?+z`zRDfUl{>4 VqW7N*j6)98YL;b%wPo(iA2xrWL>Tqvpxiymk)VaT|;Ogv+g{*f~B3l>X9 zVNqv~ZRfqs^PFqRO;<^jzuC6Oz>1lnxlyka P#} z3=VA(Vttk8a#|ssO_!b9nKjmejt%FVlm|$oN%|70_ACTKN!cU|Yo7cqYq)ZI?>1a+ z^8XzwDMRYwB^J@U1N`oW*hY~1 y}kr3zQVJz}*@kPOJ1WPh7? z5H&rxg1%;Z2(8*FH%q0U;HX3(L4}r09h~@ej3sm2$^@0ykWj2ZinOt*8UYeq($Hp| zH+~R2c9mtSsBADvPAK>%UWpSVZx&P0Z23Ca@R*6_djDPL+^bWFr2;$!?*r9lE{8qV z6NpYuch7~I#55TpJ+h6+c@IgdG06nu=S4T8D+gz~QTjoJ+N_IuH_kHx`Gnl0MZvNK zDvw@Ng7rVe^qLTpxbSa^lp2^%mg8%=W-XM&>m@CXCL&aED$e?v40FDfu&KY8N&1uR zMWRb#IoD&I$=7K=q10>PS2ieopVShbKb!Kk2D0c})lneKxeR(}C`%F`NzKHWVKO}0 z*GWsmCm3#NZ>>_oL}@`mE}B;8%`!DI4$?U?1<(DEjVV_SQ)8vxNJPl`eUlw*2Tj%I z$U=zs%5JFSD+Jn{8-Ch32$nLy^AO*AwdG07>&ZWK>w_V1Lo-iuqeBhazr!iOi58AQ z`!uCoT0wf>X~DhmU7xLesWBN?>BpJ4*r<46a~dYBYU_5nXmsv@x&4F1?4X&-4Z$d% zrETH)KB-j_@NhHkpq+A^n%Q;_df*ZGQ1p2!RNkoz*}7lC#b$bFRu|AZsyi*h2egR% zEl()%>(TMrn>SV9Flzk8P_|!R!{JpDVLhCFFkMv;-wwC&Or-hv;#}<&1|7Lsl-stc zG#wxiV12QXqGsSv6^AYv6NioPFFMM^
4nFE3V0^ F7 z9ZAUi`Y;+;@AzhXS!~|bmBx$|E~nO1pQaDlVpf7Z@Jti-uHjkQS(;V%i_6HbNA&(O z9LwRPxa|8zKm5=^AgG8WZ_6`*x#znguqRR#m82X#jGenCReLCYCh0~D;gnKjv*pz&KexTJC+=>%o?AEM{nZDj zgjx1|F|GFlqV?*^Kv9>1YOz=AOu4~B6(xzkgRHU{jmoXSH z8qA>rIbKzhO$cT#%(97M6<6G3GeyM68p^YNRs=>&b2XsykVnt5+j0E|S_=A_J}}Pr z2(nK;V2|j?8REPN)n-33baxP^%&sKuF-iT|-5sW+iHNO_FSihroI7QaJlvYS{X2hs zzst5>@<>w?D1f#fpZlp&6*cxVfhjW#9br?UvgD?G?|5Ag( eo-0@C7VX>|CEG^9IKbvc4in#V&GA<;v zPQ*7DMc986T_YUyLUFeYxD%oWU5QGT07#k(_d7sX_~7vDrmp1@!L7o8uhU=p{@jq4 zKNju&6Ob(r@G$f3<*}1GdX0QLtNTGr#FNmH==xQ}NNgV9K6l|tW^S-qV6h==Yk$4M zOl#GfQj4*m&_W0CT~M$fMKl4y(5h0E&66XLU&3cwVVfT4?mv=s#`Jo~;f%BKutd7P zylGE8TD5dm5EL`5s%Y5>8VzRoJ0CeI5fs-~@YxDxA; *Dt8y z6wQ1FhK@SY-hYl@Rq%TjHk-pN4~{dI%*vij){@_?XI5lA)2|hz@(6(@rG9ce#@g19 zquu1jcy2`a5yfn^{l0nb<4PCC)+;+hHNNTdd;QUjt;G_FI;--K5ErWa(S@M?hHu7o z@HgO08PitN(>M79C!tB2j-dfj6!^f^dAZdBGQ}>zI_DpPX4E_h3hspB#Oq~!r3&5^ zeD>89wZWN!>D2kG5aOuFo{`f^ZWV9G2`>Dac+N08jSbN!nQDo{m5kzhdkwnN35o7K z0!2Yrmjz5D@ohvu;HpEhCnT|aPP2Z`CQNJQ;Zr_Jy#gfI4efH6>RokXh<&@rQN#J0 z;Ftuqyz`k!Xw>dy6HpxUylsMz_4XNU+B(tM#9!6uKnE%+@F| zn|ihMIDIqmSMHGF4i@o54U?FIhS+jq%AcFGK 85p|09sTbH6*H@n}~1TWBTPZAUq zs7kkcuVrOlD^8{DI_>-lR?UL-VJdXwTL1HOQ_@zQ&0~vC7&!Ox)1`wrZt|6HwVeX> zM@AxRe9?N-4}z|=9TfYr1 ^lp|M)Qd#I8d{HrHtxzWReRgUw!oRcu~lzQSUoG&gKHZg^0GdUZ4ITHW4 z&+)+C(f%ZQ>ySrbLK^jk9#7I}LOaL7)y*AM!CqOd6$9JvC^Fzp&u9q&hs&R6SD#5t zSPfKMY1?N#ANW0Z-I+z~>=?{eR-@}E6c0*#{wH@Jui1M zzy6yp?b=07L_wAX9NJk#8PX7a!v2$sEO3$Q`7*_7Nz;2Qo{qI%+aqrntWa6Dk3yOD ztu4KXUU-II)MPB^dJkBs!MNM%@?xnZ;wBJa-2v%WQOQc!Bg(|WuKS$(@N^^UH`SYn z`r_ FZU>zmmBuyW z?(6J5e$u44UDbD^FA)qzd;FID&N(##NchNH@=nC-5GaeN1|!oPcH3s0)A?x^^-UVh z=t=_vPD%cycm)B9tg$Dk hp*QQELdpmmtPMQOOXFGLQSzzELF)} TL&13If^{ybBpZFeEw{)w0NL@Z$Gj)1DGCec8=Jq6VW&U@()JZh|?V0Z- zCwpFGtt|`cdaWNj5^1+eKSX9{fWs#x^XliB`?Z^T{KQ-B_(3cQzmyrjdM@bx?n|Wg zC~&HQw*AzY7!3|Rjn B1~)(0`ihu+wJT>JQEL$syKHp+>*tz86(D}ntZi=H4+%4p}kv-DCQ zL-n4o^Aexvt*Fk|$F6@$Dc47hn%8*mT}t{LecCs1n%+zE^iltH{oV$%nfqkpcJtOX z8g-4;0na@?``9`ieeuq-UX0f|{