1.4.2

2021-08-30 17:49:12 +08:00
parent 76d3710963
commit 4b889b6056
59 changed files with 2221 additions and 244 deletions
--- a/main.py
+++ b/main.py
@@ -11,7 +11,6 @@
 #################
 # 引入所需的库
 #################
-from genericpath import exists
 import os
 import sys
 import time
@@ -29,7 +28,7 @@ import tkinter.messagebox as messagebox
 import tkinter.filedialog as filedialog
 import tkinter.simpledialog as simpledialog
 from getxmlimg import getsavexml
-from tkinter.constants import TOP
+

 # 卸载程序
 def UninstallProgram(package: "apk 包名")->"卸载程序":
@@ -552,7 +551,7 @@ def get_home()->"获取用户主目录":

 # 删除所有的 uengine 应用快捷方式
 def CleanAllUengineDesktopLink():
-    if messagebox.askokcancel(title="提示", message="你确定要删除所有的 uengine 应用快捷方式吗？"):
+    if messagebox.askokcancel(title="提示", message="你确定要删除所有的 UEngine 应用快捷方式吗？"):
        try:
            shutil.rmtree("{}/.local/share/applications/uengine".format(get_home()))
            os.mkdir("{}/.local/share/applications/uengine".format(get_home()))
@@ -573,6 +572,84 @@ def OpenUengineRootData():
 def OpenUengineUserData():
    threading.Thread(target=os.system, args=["xdg-open ~/安卓应用文件"]).start()

+# 终端显示 adb 命令行
+def AdbShellShowInTer():
+    os.system("adb connect 192.168.250.2:5555")
+    threading.Thread(target=os.system, args=["deepin-terminal -w ~ -e 'adb -s 192.168.250.2:5555 shell'"]).start()
+
+# 终端显示 adb top
+def AdbCPUAndRAWShowInTer():
+    os.system("adb connect 192.168.250.2:5555")
+    threading.Thread(target=os.system, args=["deepin-terminal -w ~ -e 'adb -s 192.168.250.2:5555 shell top'"]).start()
+
+def UengineSettingShow():
+    threading.Thread(target=os.system, args=["/usr/bin/uengine-launch.sh --action=android.intent.action.MAIN --package=com.android.settings --component=com.android.settings.Settings"]).start()
+
+# 杀死 adb 进程
+def AdbKillAdbProgress():
+    os.system("killall adb")
+    messagebox.showinfo(title="提示", message="完成！")
+
+# 关闭 adb 服务
+def AdbStopServer():
+    os.system("adb kill-server")
+    messagebox.showinfo(title="提示", message="完成！")
+
+# 开启 adb 服务
+def AdbStartServer():
+    os.system("adb start-server")
+    messagebox.showinfo(title="提示", message="完成！")
+
+# 使用 adb 连接 uengine
+def UengineConnectAdb():
+    messagebox.showinfo(title="提示", message=subprocess.getoutput("adb connect 192.168.250.2:5555"))
+
+# 允许用户使用 adb
+def UengineUseAdb():
+    # 因为需要 root，所以需要开二号程序
+    os.system("adb start-server")  # 保证有生成文件
+    os.system("pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY {}/uengine-useadb 0 '{}'".format(programPath, "{}/.android/adbkey.pub".format(get_home())))  # 写入配置
+    if messagebox.askyesno(title="提示", message="是否要连接到 UEngine？"):
+        UengineConnectAdb()
+
+def UengineDoNotUseAdb():
+    # 因为需要 root，所以需要开二号程序
+    if not os.path.exists("/data/uengine/data/data/misc/adb/adb_keys"):
+        messagebox.showinfo(title="提示", message="你的 uengine 在设置前已经禁用 adb 连接，无需重复设置")
+        return
+    threading.Thread(target=os.system, args=["pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY {}/uengine-useadb 1".format(programPath)]).start()
+
+def AdbConnectDeviceShow():
+    ShowTextTipsWindow.ShowWindow(subprocess.getoutput("adb devices -l"))
+
+def AdbAndroidInstallAppList():
+    ShowTextTipsWindow.ShowWindow('''系统应用：
+{}
+第三方应用：
+{}
+全部应用以及apk所在路径：
+{}'''.format(subprocess.getoutput("adb -s 192.168.250.2:5555 shell pm list packages -s"),
+    subprocess.getoutput("adb -s 192.168.250.2:5555 shell pm list package -3"),
+    subprocess.getoutput("adb -s 192.168.250.2:5555 shell pm list packages -f")))
+
+class ShowTextTipsWindow():
+    def ShowWindow(things):
+        message = tk.Toplevel()
+
+        message.title("提示")
+        message.iconphoto(False, tk.PhotoImage(file=iconPath))
+
+        text = tk.Text(message)
+        quitButton = ttk.Button(message, text="确定", command=message.destroy)
+
+        text.insert("end", things)
+        text.configure(state=tk.DISABLED)
+
+        text.pack(fill="both", expand="yes")
+        quitButton.pack()
+
+        message.mainloop()
+
 # 添加/删除 uengine 应用快捷方式
 class AddNewUengineDesktopLink():
    addTips = '''可以输入app的包名和Activity或通过浏览apk文件来获取包名和Activity
@@ -591,8 +668,9 @@ class AddNewUengineDesktopLink():
        saveButton = ttk.Button(controlFrame, text="写入", command=AddNewUengineDesktopLink.SaveDesktopLink)
        delButton = ttk.Button(controlFrame, text="删除", command=AddNewUengineDesktopLink.DelDesktopLink)

-        message.title("添加/删除 uengine 图标")
+        message.title("添加/删除 UEngine 图标")
        message.resizable(0, 0)
+        message.iconphoto(False, tk.PhotoImage(file=iconPath))
        # get screen width and height
        screen_width = message.winfo_screenwidth()
        screen_height = message.winfo_screenheight()
@@ -636,7 +714,7 @@ class AddNewUengineDesktopLink():
    def DelDesktopLink():
        global packageName
        if not os.path.exists("{}/.local/share/applications/uengine/{}.desktop".format(get_home(), packageName.get())):
-            messagebox.showerror(title="错误", message="此包名对应的uengine桌面快捷方式不存在！")
+            messagebox.showerror(title="错误", message="此包名对应的 UEngine 桌面快捷方式不存在！")
            return
        if not messagebox.askyesno(title="提示", message="你确定要删除吗？删除后将无法恢复！"):
            return
@@ -680,29 +758,42 @@ programUrl = information["Url"][0]
 version = information["Version"]
 goodRunSystem = information["System"]
 aaptVersion = GetCommandReturn("aapt version")
-about = '''    一个基于 Python3 的 tkinter 制作的 uengine APK 运行器
+about = '''介绍        ：一个基于 Python3 的 tkinter 制作的 UEngine 运行器，在新版本Deepin/UOS发布后，可以在应用商店安装部分官方已适配的安卓应用，对爱好者来说，不能自己安装APK软件包始终差点意思，本程序可以为Deepin/UOS上的UEngine安卓运行环境安装自定义APK软件包，并能发送安装的APK包启动菜单到桌面或系统菜单。

 版本        ：{}

 适用平台    ：{}

-tkinter版本：{}
-
-aapt 版本  ：{}
-
 程序官网    ：{}

-©2021-{}'''.format(version, goodRunSystem, tk.TkVersion, aaptVersion,programUrl, time.strftime("%Y"))
+©2021-{}'''.format(version, goodRunSystem, tk.TkVersion,  programUrl, time.strftime("%Y"))
 tips = "\n".join(information["Tips"])
 updateThingsString = "\n".join(information["Update"])
-title = "uengine 运行器 {}".format(version)
+title = "UEngine 运行器 {}".format(version)
 updateTime = information["Time"]
 updateThings = "{} 更新内容：\n{}\n更新时间：{}".format(version, updateThingsString, updateTime, time.strftime("%Y"))
 iconPath = "{}/icon.png".format(os.path.split(os.path.realpath(__file__))[0])
 desktop = programPath + "/UengineAndroidProgramList.desktop"
 desktopName = "UengineAndroidProgramList.desktop"
 contribute = "\n".join(information["Contribute"])
-useProgram = "\n".join(information["Use"])
+useProgram = '''1、UEngine：{}
+2、python3：{}
+3、tkinter：{}
+4、aapt：{}
+5、dpkg：{}
+6、mkdir：{}
+7、echo
+8、chmod：{}
+9、adb：{}
+10、deepin 终端：{}'''.format(subprocess.getoutput("uengine version"),
+    subprocess.getoutput("python3 --version"),
+    tk.TkVersion,
+    subprocess.getoutput("aapt version"),
+    subprocess.getoutput("dpkg --version"),
+    subprocess.getoutput("mkdir --version"),
+    subprocess.getoutput("chmod --version"),
+    subprocess.getoutput("adb version"),
+    subprocess.getoutput("deepin-terminal -v"))


 ###########################
@@ -752,7 +843,7 @@ def showhelp():
        helpwindow=tk.Toplevel()
        helpwindow.resizable(0, 0)
        helpwindow.title("帮助")
-        
+        helpwindow.iconphoto(False, tk.PhotoImage(file=iconPath))

        # get screen width and height
        screen_width = helpwindow.winfo_screenwidth()
@@ -861,7 +952,7 @@ ComboInstallPath = ttk.Combobox(window, width=50)
 ComboUninstallPath = ttk.Combobox(window, width=50)
 BtnFindApk = ttk.Button(FrmInstall, text="浏览", command=FindApk)
 BtnInstall = ttk.Button(FrmInstall, text="安装", command=Button3Install)
-BtnShowUengineApp = ttk.Button(window, text="打开 uengine 应用列表", command=Button5Click)
+BtnShowUengineApp = ttk.Button(window, text="打开 UEngine 应用列表", command=Button5Click)
 BtnUninstallApkBrowser = ttk.Button(FrmUninstall, text="浏览", command=BtnFindUninstallApkClk)
 BtnUninstall = ttk.Button(FrmUninstall, text="卸载", command=ButtonClick8)
 Btngeticon = ttk.Button(FrmInstall, text="保存图标", command=SaveIconToOtherPath)
@@ -870,61 +961,91 @@ BtnSaveApk = ttk.Button(FrmInstall, text="保存apk", command=SaveInstallUengine
 menu = tk.Menu(window, background="white")  

 programmenu = tk.Menu(menu, tearoff=0, background="white")  # 设置“程序”菜单栏
+adb = tk.Menu(menu, tearoff=0, background="white")
 uengine = tk.Menu(menu, tearoff=0, background="white")
 help = tk.Menu(menu, tearoff=0, background="white")  # 设置“帮助”菜单栏

+adbServer = tk.Menu(adb, tearoff=0, background="white")
+
 uengineService = tk.Menu(uengine, tearoff=0, background="white")
 uengineInternet = tk.Menu(uengine, tearoff=0, background="white")
 uengineIcon = tk.Menu(uengine, tearoff=0, background="white")
+uengineUseAdb = tk.Menu(uengine, tearoff=0, background="white")
 uengineData = tk.Menu(uengine, tearoff=0, background="white")

 menu.add_cascade(label="程序", menu=programmenu)
-menu.add_cascade(label="uengine", menu=uengine)
+menu.add_cascade(label="adb", menu=adb)
+menu.add_cascade(label="UEngine", menu=uengine)
 menu.add_cascade(label="关于", menu=help)

 programmenu.add_command(label="清空软件历史记录", command=CleanProgramHistory)
 programmenu.add_separator()  # 设置分界线
 programmenu.add_command(label="退出程序", command=window.quit)  # 设置“退出程序”

-uengine.add_command(label="uengine 应用打包", command=OpenUengineDebBuilder)
-uengine.add_command(label="uengine 键盘映射", command=KeyboardToMouse)
-uengine.add_cascade(label="uengine 服务", menu=uengineService)
-uengine.add_cascade(label="uengine 网络桥接", menu=uengineInternet)
-uengine.add_cascade(label="uengine 快捷方式", menu=uengineIcon)
-uengine.add_cascade(label="uengine 数据", menu=uengineData)
+adb.add_command(label="adb 连接 UEngine", command=UengineConnectAdb)
+adb.add_separator()
+adb.add_cascade(label="adb 服务", menu=adbServer)
+adb.add_command(label="显示 adb 连接的设备", command=AdbConnectDeviceShow)
+adb.add_separator()
+adb.add_command(label="adb 查看 UEngine 应用列表", command=AdbAndroidInstallAppList)
+adb.add_command(label="adb 查看 UEngine 资源使用情况", command=AdbCPUAndRAWShowInTer)
+adb.add_command(label="打开 adb 连接 UEngine 的终端", command=AdbShellShowInTer)
+adb.add_separator()
+adb.add_cascade(label="UEngine 使用 adb", menu=uengineUseAdb)
+
+adbServer.add_command(label="开启 adb 服务", command=AdbStartServer)
+adbServer.add_command(label="关闭 adb 服务", command=AdbStopServer)
+adbServer.add_command(label="杀死 adb 进程", command=AdbKillAdbProgress)
+
+uengine.add_command(label="UEngine 系统设置", command=UengineSettingShow)
+uengine.add_command(label="UEngine 应用打包", command=OpenUengineDebBuilder)
+#uengine.add_command(label="UEngine 键盘映射", command=KeyboardToMouse)
+uengine.add_cascade(label="UEngine 服务", menu=uengineService)
+uengine.add_cascade(label="UEngine 网络桥接", menu=uengineInternet)
+uengine.add_cascade(label="UEngine 快捷方式", menu=uengineIcon)
+uengine.add_cascade(label="UEngine 使用 adb", menu=uengineUseAdb)
+uengine.add_cascade(label="UEngine 数据", menu=uengineData)

 help.add_command(label="程序官网", command=OpenProgramURL)  # 设置“程序官网”项
 help.add_command(label="帮助", command=showhelp)  # 设置“关于这个程序”项

-uengineService.add_command(label="启用 uengine 服务", command=StartUengine)
-uengineService.add_command(label="关闭 uengine 服务", command=StopUengine)
-uengineService.add_command(label="重启 uengine 服务", command=UengineRestart)
+uengineService.add_command(label="启用 UEngine 服务（需要 root）", command=StartUengine)
+uengineService.add_command(label="关闭 UEngine 服务（需要 root）", command=StopUengine)
+uengineService.add_command(label="重启 UEngine 服务（需要 root）", command=UengineRestart)

-uengineInternet.add_command(label="启用 uengine 网络桥接", command=UengineBridgeStart)
-uengineInternet.add_command(label="关闭 uengine 网络桥接", command=UengineBridgeStop)
-uengineInternet.add_command(label="重启 uengine 网络桥接", command=UengineBridgeRestart)
-uengineInternet.add_command(label="加载 uengine 网络桥接", command=UengineBridgeReload)
-uengineInternet.add_command(label="强制加载 uengine 网络桥接", command=UengineBridgeForceReload)
+uengineInternet.add_command(label="启用 UEngine 网络桥接（需要 root）", command=UengineBridgeStart)
+uengineInternet.add_command(label="关闭 UEngine 网络桥接（需要 root）", command=UengineBridgeStop)
+uengineInternet.add_command(label="重启 UEngine 网络桥接（需要 root）", command=UengineBridgeRestart)
+uengineInternet.add_command(label="加载 UEngine 网络桥接（需要 root）", command=UengineBridgeReload)
+uengineInternet.add_command(label="强制加载 UEngine 网络桥接（需要 root）", command=UengineBridgeForceReload)

-uengineIcon.add_command(label="发送 uengine 应用列表到桌面", command=SendUengineAndroidListForDesktop)
-uengineIcon.add_command(label="发送 uengine 应用列表到启动器", command=SendUengineAndroidListForLauncher)
+uengineIcon.add_command(label="发送 UEngine 应用列表到桌面", command=SendUengineAndroidListForDesktop)
+uengineIcon.add_command(label="发送 UEngine 应用列表到启动器", command=SendUengineAndroidListForLauncher)
 uengineIcon.add_separator()
-uengineIcon.add_command(label="添加/删除指定的 uengine 快捷方式", command=AddNewUengineDesktopLink.ShowWindow)
+uengineIcon.add_command(label="添加/删除指定的 UEngine 快捷方式", command=AddNewUengineDesktopLink.ShowWindow)
 uengineIcon.add_separator()
-uengineIcon.add_command(label="清空所有 uengine 快捷方式", command=CleanAllUengineDesktopLink)
+uengineIcon.add_command(label="清空所有 UEngine 快捷方式", command=CleanAllUengineDesktopLink)

-uengineData.add_command(label="打开 uengine 根目录", command=OpenUengineRootData)
-uengineData.add_command(label="打开 uengine 用户数据目录", command=OpenUengineUserData)
+uengineUseAdb.add_command(label="adb 连接 UEngine", command=UengineConnectAdb)
+uengineUseAdb.add_separator()
+uengineUseAdb.add_command(label="允许此设备使用 adb 连接本 UEngine（需要 root）", command=UengineUseAdb)
+uengineUseAdb.add_command(label="禁止任何设备使用 adb 连接本 UEngine（需要 root）", command=UengineDoNotUseAdb)
+
+uengineData.add_command(label="打开 UEngine 根目录", command=OpenUengineRootData)
+uengineData.add_command(label="打开 UEngine 用户数据目录", command=OpenUengineUserData)
 uengineData.add_separator()
-uengineData.add_command(label="清空 uengine 数据", command=BackUengineClean)
+uengineData.add_command(label="清空 UEngine 数据（需要 root）", command=BackUengineClean)

 menu.configure(activebackground="dodgerblue")
 help.configure(activebackground="dodgerblue")
+adb.configure(activebackground="dodgerblue")
 uengine.configure(activebackground="dodgerblue")
 programmenu.configure(activebackground="dodgerblue")
 uengineService.configure(activebackground="dodgerblue")
 uengineInternet.configure(activebackground="dodgerblue")
 uengineIcon.configure(activebackground="dodgerblue")
+uengineUseAdb.configure(activebackground="dodgerblue")
+uengineData.configure(activebackground="dodgerblue")

 # 设置控件
 ComboUninstallPath['value'] = fineUninstallApkHistory