diff --git a/com.gitee.uengine.runner.spark.deb b/com.gitee.uengine.runner.spark.deb index 3ff6cb8..206f884 100755 Binary files a/com.gitee.uengine.runner.spark.deb and b/com.gitee.uengine.runner.spark.deb differ diff --git a/information.json b/information.json index 82275a1..5985c61 100755 --- a/information.json +++ b/information.json @@ -26,6 +26,7 @@ "<b>V1.8.1-1:</b>", "※1、修复缺失依赖 python3-matplotlib 导致程序无法开启的问题", "※2、移除在 Ubuntu 上用于安装 UEngine 的安装工具", + "※3、解决了未输入密码自动回车的 bug", "", "<b>V1.8.1:</b>", "※1、修复在 APK 详细信息中图标可能过大导致无法正常使用的问题", @@ -194,6 +195,7 @@ "<b>感谢以下用户提供的问题、建议、图标、代码等,如果有遗漏,请及时与开发者联系添加,以及如果侵犯到您的合法权益,也及时与开发者联系:</p>", "<hr>", "感谢 麻木法师(1312580754) 在星火应用商店QQ交流群展示的接口及其原理", + "感谢 Bail(https://github.com/BailPlus) 修复的函数未输入密码自动回车的 bug", "感谢 actionchen(917981399@qq.com) 提供了新版页面布局(1.3.0 ~ 最新版本)以及布局代码(1.3.0 ~ 1.7.0)", "感谢 柚子(https://gitee.com/Limexb) 提供了 UEngine 构建 Root 镜像脚本", "感谢 星空露光(https://gitee.com/Cynorkyle) 制作了 UEngine 新版图标和安装应用时能选择应用分类的建议", diff --git a/mainwindow.py b/mainwindow.py index f554902..ee1da40 100755 --- a/mainwindow.py +++ b/mainwindow.py @@ -423,16 +423,16 @@ def InstallRootUengineImage(): threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -e \"wget -P '/tmp/uengine-runner' 'https://hub.fastgit.xyz/gfdgd-xi/uengine-runner/releases/download/U1.2.15/uengine-android-image_1.2.15_amd64.deb' && pkexec bash '/tmp/uengine-runner/install.sh'\""]).start() def UengineUbuntuInstall(): - threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -e \"bash '{programPath + '/uengine-installer'}'\""]).start() + threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -e bash '{programPath + '/uengine-installer'}'"]).start() def UbuntuInstallUengine(): - threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -e \"bash '{programPath + '/uengine-installer'}'\""]).start() + threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -e bash '{programPath + '/uengine-installer'}'"]).start() def BuildRootUengineImage(): - threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -e \"bash '{programPath}/root-uengine.sh'\""]).start() + threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -e bash '{programPath}/root-uengine.sh'"]).start() def ReinstallUengineImage(): - threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -e ''pkexec apt reinstall uengine-android-image -y"]).start() + threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -e pkexec apt reinstall uengine-android-image -y"]).start() # 生成 uengine 启动文件到桌面 diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/information.json b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/information.json index 82275a1..5985c61 100755 --- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/information.json +++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/information.json @@ -26,6 +26,7 @@ "<b>V1.8.1-1:</b>", "※1、修复缺失依赖 python3-matplotlib 导致程序无法开启的问题", "※2、移除在 Ubuntu 上用于安装 UEngine 的安装工具", + "※3、解决了未输入密码自动回车的 bug", "", "<b>V1.8.1:</b>", "※1、修复在 APK 详细信息中图标可能过大导致无法正常使用的问题", @@ -194,6 +195,7 @@ "<b>感谢以下用户提供的问题、建议、图标、代码等,如果有遗漏,请及时与开发者联系添加,以及如果侵犯到您的合法权益,也及时与开发者联系:</p>", "<hr>", "感谢 麻木法师(1312580754) 在星火应用商店QQ交流群展示的接口及其原理", + "感谢 Bail(https://github.com/BailPlus) 修复的函数未输入密码自动回车的 bug", "感谢 actionchen(917981399@qq.com) 提供了新版页面布局(1.3.0 ~ 最新版本)以及布局代码(1.3.0 ~ 1.7.0)", "感谢 柚子(https://gitee.com/Limexb) 提供了 UEngine 构建 Root 镜像脚本", "感谢 星空露光(https://gitee.com/Cynorkyle) 制作了 UEngine 新版图标和安装应用时能选择应用分类的建议", diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner index fc25f60..ee1da40 100755 --- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner +++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner @@ -411,23 +411,29 @@ def GetApkPackageName(apkFilePath: "apk 所在路径")->"获取 apk 包名": line = line.replace(" ", "") return line +''' +Bail修改: +将以下5个函数的deepin-terminal的"-C"参数改为"-e", +解决了BuildRootUengineImage()函数未输入密码自动回车的bug +''' def InstallRootUengineImage(): if not os.path.exists: os.mkdir("/tmp/uengine-runner") write_txt("/tmp/uengine-runner/install.sh", "sudo dpkg -i /tmp/uengine-runner/u*.deb\nsudo apt install -f") - threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -C \"wget -P '/tmp/uengine-runner' 'https://hub.fastgit.xyz/gfdgd-xi/uengine-runner/releases/download/U1.2.15/uengine-android-image_1.2.15_amd64.deb' && pkexec bash '/tmp/uengine-runner/install.sh'\""]).start() + threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -e \"wget -P '/tmp/uengine-runner' 'https://hub.fastgit.xyz/gfdgd-xi/uengine-runner/releases/download/U1.2.15/uengine-android-image_1.2.15_amd64.deb' && pkexec bash '/tmp/uengine-runner/install.sh'\""]).start() def UengineUbuntuInstall(): - threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -C \"bash '{programPath + '/uengine-installer'}'\""]).start() + threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -e bash '{programPath + '/uengine-installer'}'"]).start() def UbuntuInstallUengine(): - threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -C \"bash '{programPath + '/uengine-installer'}'\""]).start() + threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -e bash '{programPath + '/uengine-installer'}'"]).start() def BuildRootUengineImage(): - threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -C \"bash '{programPath}/root-uengine.sh'\""]).start() + threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -e bash '{programPath}/root-uengine.sh'"]).start() def ReinstallUengineImage(): - threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -e ''pkexec apt reinstall uengine-android-image -y"]).start() + threading.Thread(target=os.system, args=[f"'{programPath}/launch.sh' deepin-terminal -e pkexec apt reinstall uengine-android-image -y"]).start() + # 生成 uengine 启动文件到桌面 def BuildUengineDesktop(packageName: "软件包名", activityName: "activity", showName: "显示名称", iconPath: "程序图标所在目录", savePath:".desktop 文件保存路径", choose="")->"生成 uengine 启动文件到桌面": @@ -1936,4 +1942,4 @@ window.setWindowTitle(title) window.show() window.setWindowIcon(QtGui.QIcon(iconPath)) window.setFixedSize(window.frameSize().width(), window.frameSize().height()) -sys.exit(app.exec_()) \ No newline at end of file +sys.exit(app.exec_())