From c030ab2c165b64a81a7697ce001e971000abbfa1 Mon Sep 17 00:00:00 2001 From: gfdgd xi <3025613752@qq.com> Date: Sun, 19 Jun 2022 14:03:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E7=9A=84=E6=9C=AA=E7=9F=A5?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=AE=89=E8=A3=85=E5=BC=80=E5=90=AF=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Language.json | 30 ++++++++++++++++++++++-- api/__init__.py | 15 ++++++++++++ api/__pycache__/__init__.cpython-37.pyc | Bin 0 -> 16047 bytes information.json | 2 +- main.py | 22 ++++++++++++++--- 5 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 api/__pycache__/__init__.cpython-37.pyc diff --git a/Language.json b/Language.json index cc6f332..c400f98 100644 --- a/Language.json +++ b/Language.json @@ -27,6 +27,18 @@ "ApkFileError": "该应用安装包异常，无法查询相关数据！", "InputDataError": "你输入的数值不正确！" }, + "Information": { + "Title": "提示", + "CompleteInformation": "完成" + }, + "Answer": { + "Title": "提示", + "AllowOrDisallowUpdateAndroidAppAnswer": [ + "你确定要启用 UEngine 可以安装以及使用默认的更新程序升级应用？（即允许未知来源）", + "你确定要禁用 UEngine 可以安装以及使用默认的更新程序升级应用？（即禁止未知来源）" + ], + "UseAdbPackageAnswer": "你没有安装 adb 补丁，必须安装才能继续。是否安装？" + }, "Menu": [ { "Name": "程序", @@ -120,7 +132,8 @@ "安装默认的 UEngine 镜像" ] }, - "在 Ubuntu 上安装 UEngine" + "在 Ubuntu 上安装 UEngine", + "（不）允许安装未知来源应用（即支持UEngine安装的安卓程序程序更新）" ] }, { @@ -179,6 +192,18 @@ "ApkFileError": "This apk file is error and can't find any data about the apk file!", "InputDataError": "Your input error data!" }, + "Information": { + "Title": "Tips", + "CompleteInformation": "Complete!" + }, + "Answer": { + "Title": "Tips", + "AllowOrDisallowUpdateAndroidAppAnswer": [ + "Are you sure to allow UEngine to install or update other android program? (Allow )（即允许未知来源）", + "Are you sure to disallow UEngine to install or update other android program? (Allow )（即允许未知来源）" + ], + "UseAdbPackageAnswer": "You don't install adb package with UEngine, you must install, and after install you can connect to set.\nDo you want to install?" + }, "Menu": [ { "Name": "Program", @@ -272,7 +297,8 @@ "Install Defult UEngine Image" ] }, - "Install UEngine On Ubuntu" + "Install UEngine On Ubuntu", + "Allow/Disallow UEngine To Install Or Update Other Android Program" ] }, { diff --git a/api/__init__.py b/api/__init__.py index 2ab579b..9409c47 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -319,6 +319,12 @@ class UEngine: os.system("pkexec uengine-bridge.sh force-reload") class Adb: + def __init__(self, ip=""): + self.ip = ip + + def connect(self): + os.system(f"adb connect {self.ip}") + class Service: def Open(): os.system("adb start-server") @@ -327,6 +333,12 @@ class Adb: def Kill(): os.system("killall adb") + def boolAndroidInstallOtherAppSetting(self): + return subprocess.getoutput(f"adb -s {self.ip} shell settings get secure install_non_market_apps").replace(" ", "") == "1" + + def setAndroidInstallOtherAppSetting(self, op: bool): + os.system(f"adb -s {self.ip} shell settings put secure install_non_market_apps {int(op)}") + class File: def __init__(self, filePath): self.filePath = filePath @@ -350,6 +362,9 @@ class UengineRunner: if __name__ == "__main__": print("本 API 不支持直接运行，请通过引入的方式使用此 API") + adb = Adb("192.168.250.2:5555") + print(adb.boolAndroidInstallOtherAppSetting()) + quit() if not ROOT.GetRoot(): diff --git a/api/__pycache__/__init__.cpython-37.pyc b/api/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..69ef9b18985764d7949b6227ee2b9ee2e125ce29 GIT binary patch literal 16047 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 X -# 版本：1.6.1 -# 更新时间：2022年5月21日（要开学了） +# 版本：1.6.2 Alpha +# 更新时间：2022年6月19日（要期末考试了） # 感谢：anbox、deepin 和 UOS # 基于 Python3 的 tkinter 构建 # 更新：gfdgd xi<3025613752@qq.com>、actionchen<917981399@qq.com>、为什么您不喜欢熊出没和阿布呢 @@ -12,6 +12,7 @@ # 引入所需的库 ################# import os +import api import sys import time import json @@ -663,6 +664,21 @@ def VersionCheck(version1, version2): def ShowHelp(): webbrowser.open_new_tab(programPath + "/Help/index.html") +def AllowOrDisallowUpdateAndroidApp(): + if not os.path.exists("/data/uengine/data/data/misc/adb/adb_keys"): + if not messagebox.askyesno(title=langFile[lang]["Main"]["MainWindow"]["Answer"]["Title"], message=langFile[lang]["Main"]["MainWindow"]["Answer"]["UseAdbPackageAnswer"]): + return + os.system("pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY {}/uengine-useadb 0 '{}'".format(programPath, + "{}/.android/adbkey.pub".format( + get_home()))) # 写入配置 + + adb = api.Adb("192.168.250.2:5555") + adb.Service.Close() + adb.connect() + if messagebox.askyesno(title=langFile[lang]["Main"]["MainWindow"]["Answer"]["Title"], message=langFile[lang]["Main"]["MainWindow"]["Answer"]["AllowOrDisallowUpdateAndroidAppAnswer"][int(adb.boolAndroidInstallOtherAppSetting())]): + adb.setAndroidInstallOtherAppSetting(not adb.boolAndroidInstallOtherAppSetting()) + messagebox.showinfo(title=langFile[lang]["Main"]["MainWindow"]["Information"]["Title"], message=langFile[lang]["Main"]["MainWindow"]["Answer"]["CompleteInformation"]) + class SettingWindow(): saveApkOption = tk.IntVar() def ShowWindow(): @@ -848,7 +864,6 @@ Activity：{} matplotlib.pylab.title("“" + chinese + "”的用户评分（数据只供参考）", fontproperties=fonts) matplotlib.pylab.show() - class AdbChangeUengineDisplaySize(): def ShowWindows(): global displayX @@ -1400,6 +1415,7 @@ adbServer.add_command(label=langFile[lang]["Main"]["MainWindow"]["Menu"][1]["Men adbServer.add_command(label=langFile[lang]["Main"]["MainWindow"]["Menu"][1]["Menu"][1]["Menu"][1], command=AdbStopServer) adbServer.add_command(label=langFile[lang]["Main"]["MainWindow"]["Menu"][1]["Menu"][1]["Menu"][2], command=AdbKillAdbProgress) +uengine.add_command(label=langFile[lang]["Main"]["MainWindow"]["Menu"][2]["Menu"][13], command=AllowOrDisallowUpdateAndroidApp) uengine.add_command(label=langFile[lang]["Main"]["MainWindow"]["Menu"][2]["Menu"][1], command=OpenUengineDebBuilder) uengine.add_command(label=langFile[lang]["Main"]["MainWindow"]["Menu"][2]["Menu"][7], command=KeyboardToMouse) uengine.add_command(label=langFile[lang]["Main"]["MainWindow"]["Menu"][2]["Menu"][8], command=UengineCheckCpu)