diff --git a/README.md b/README.md index cf72334..7521b25 100755 --- a/README.md +++ b/README.md @@ -38,6 +38,14 @@ sudo apt upgrade ### 更新内容 +#### V1.6.2（2022年06月21日，中考假期+即将期末考试） +**※1、优化了 UEngine 运行器的英语翻译** +**※2、新增加了可以打开或关闭第三方应用安装的功能（使用此功能后在UEngine里可以使用默认的APK安装程序安装应用，此操作需要使用程序的Adb补丁）** +**※3、新增加了 UEngine 的 Ubuntu 安装程序** +**※4、双包合一，只保留了UOS打包标准，可以从旧标准无缝升级（推荐使用本程序的升级程序进行升级） +5、修复了本程序在 Ubuntu 上安装和卸载报错而无法继续的问题 +6、优化帮助/关于窗口在高分辨率电脑上显示不全的问题 + #### V1.6.1（2022年05月21日，521） **※1、修复了打包 deb 包在 APK 的包名有大写时无法启动的问题** **※2、提供新版本的 UEngine Root 镜像** diff --git a/com.gitee.uengine.runner.spark.deb b/com.gitee.uengine.runner.spark.deb index eb63885..ba816b8 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 eef6435..430e2e0 100755 --- a/information.json +++ b/information.json @@ -28,6 +28,7 @@ "※3、新增加了 UEngine 的 Ubuntu 安装程序", "※4、双包合一，只保留了UOS打包标准，可以从旧标准无缝升级（推荐使用本程序的升级程序进行升级）", "5、修复了本程序在 Ubuntu 上安装和卸载报错而无法继续的问题", + "6、优化帮助/关于窗口在高分辨率电脑上显示不全的问题", "V1.6.1：", "※1、修复了打包 deb 包在 APK 的包名有大写时无法启动的问题", "※2、提供新版本的 UEngine Root 镜像", @@ -164,6 +165,6 @@ "柚子", "为什么您不喜欢熊出没和阿布呢", "星空露光", - "shenmo" + "shenmo" ] } \ No newline at end of file diff --git a/main.py b/main.py index e39e58c..1316fe0 100755 --- a/main.py +++ b/main.py @@ -1351,7 +1351,7 @@ if not os.path.exists("/usr/bin/uengine"): sys.exit(0) # 非 Deepin/UOS 用户 else: - if messagebox.askyesno(title="提示", message="您的电脑没有安装 UEngine，是否安装 UEngine 以便更好的使用\n这里将会使用 shenmo 提供的脚本进行安装\n安装完后重新启动该程序即可"): + if messagebox.askyesno(title="提示", message="您的电脑没有安装 UEngine，是否安装 UEngine 以便更好的使用\n这里将会使用 shenmo 提供的脚本进行安装\n安装完后重新启动该程序即可\n提示：无法保证此安装脚本安装的 UEngine 可以使用"): os.system(f"deepin-terminal -C \"bash '{programPath}/uengine-installer'\"") sys.exit(0) # 重新显示窗口 diff --git a/new-deb-build/DEBIAN/control b/new-deb-build/DEBIAN/control index 7938ea7..89d29d4 100644 --- a/new-deb-build/DEBIAN/control +++ b/new-deb-build/DEBIAN/control @@ -1,7 +1,7 @@ Package: com.gitee.uengine.runner.spark Source: com.gitee.uengine.runner.spark Replaces: spark-uengine-runner -Version: 1.6.2Alpha2 +Version: 1.6.2 Architecture: all Section: utils Maintainer: gfdgd xi <3025613752@qq.com>, actionchen<917981399@qq.com>, 柚子, 为什么您不喜欢熊出没和阿布呢, 星空露光, shenmo @@ -9,4 +9,10 @@ Depends: deepin-elf-verify (>= 0.0.16.7-1), python3, python3-tk, python3-pip, aa Priority: optional Conflicts: spark-uengine-apk-builder Homepage: [https://gitee.com/gfdgd-xi/uengine-runner, https://github.com/gfdgd-xi/uengine-runner] -Description: UEngine Runner for deepin and UOS +Description: UEngine 运行器，1.6.2 更新内容： + ※1、优化了 UEngine 运行器的英语翻译 + ※2、新增加了可以打开或关闭第三方应用安装的功能（使用此功能后在UEngine里可以使用默认的APK安装程序安装应用，此操作需要使用程序的Adb补丁） + ※3、新增加了 UEngine 的 Ubuntu 安装程序 + ※4、双包合一，只保留了UOS打包标准，可以从旧标准无缝升级（推荐使用本程序的升级程序进行升级） + 5、修复了本程序在 Ubuntu 上安装和卸载报错而无法继续的问题 + 6、优化帮助/关于窗口在高分辨率电脑上显示不全的问题 diff --git a/new-deb-build/DEBIAN/postinst b/new-deb-build/DEBIAN/postinst index 6252c31..092a6d7 100755 --- a/new-deb-build/DEBIAN/postinst +++ b/new-deb-build/DEBIAN/postinst @@ -6,19 +6,20 @@ python3 -m pip install --upgrade pyautogui -i http://mirrors.aliyun.com/pypi/si python3 -m pip install --upgrade keyboard -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com python3 -m pip install --upgrade easygui -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com # 建立软链接 -ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner /usr/bin/uengine-runner -ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-apk-builder /usr/bin/uengine-apk-builder -ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-app-uninstall /usr/bin/uengine-app-uninstall -ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-app-install /usr/bin/uengine-app-install -ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-clean /usr/bin/uengine-clean -ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner-about /usr/bin/uengine-runner-about -ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-keyboard /usr/bin/uengine-keyboard -ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-useadb /usr/bin/uengine-useadb -ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner-launch.sh /usr/bin/uengine-runner-launch.sh -ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner-update-bug /usr/bin/uengine-runner-update-bug -ln -s /opt/apps/com.gitee.uengine.runner.spark/files/root-uengine /usr/bin/uengine-root +ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner /usr/bin/uengine-runner +ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-apk-builder /usr/bin/uengine-apk-builder +ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-app-uninstall /usr/bin/uengine-app-uninstall +ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-app-install /usr/bin/uengine-app-install +ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-clean /usr/bin/uengine-clean +ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner-about /usr/bin/uengine-runner-about +ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-keyboard /usr/bin/uengine-keyboard +ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-useadb /usr/bin/uengine-useadb +ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner-launch.sh /usr/bin/uengine-runner-launch.sh +ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner-update-bug /usr/bin/uengine-runner-update-bug +ln -s /opt/apps/com.gitee.uengine.runner.spark/files/root-uengine /usr/bin/uengine-root +ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner-applist-launch.sh /usr/bin/uengine-runner-applist-launch.sh # 刷新图标缓存 # 因为 Ubuntu 的问题，省略 -# gtk-update-icon-cache /usr/share/icons/bloom +gtk-update-icon-cache /usr/share/icons/bloom | true # 向服务器返回安装数加1（不显示内容且忽略错误） curl http://120.25.153.144/uengine-runner/Install.php?Version=1.6.2 -s > /dev/null | true \ No newline at end of file diff --git a/new-deb-build/DEBIAN/postrm b/new-deb-build/DEBIAN/postrm index 4594bb3..f7b5294 100755 --- a/new-deb-build/DEBIAN/postrm +++ b/new-deb-build/DEBIAN/postrm @@ -11,6 +11,7 @@ rm -fv /usr/bin/uengine-useadb rm -fv /usr/bin/uengine-runner-launch.sh rm -fv /usr/bin/uengine-runner-update-bug rm -fv /usr/bin/uengine-root +rm -fv /opt/apps/com.gitee.uengine.runner.spark/files/ # 刷新图标缓存 # 因为 Ubuntu 的问题，省略 -# gtk-update-icon-cache /usr/share/icons/bloom \ No newline at end of file +gtk-update-icon-cache /usr/share/icons/bloom | true \ No newline at end of file diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/entries/applications/UengineAndroidProgramList.desktop b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/entries/applications/UengineAndroidProgramList.desktop index 4a52bf1..9a06a55 100644 --- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/entries/applications/UengineAndroidProgramList.desktop +++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/entries/applications/UengineAndroidProgramList.desktop @@ -2,7 +2,7 @@ Categories=System; Comment=UEngine 程序菜单 Encoding=UTF-8 -Exec=/usr/bin/uengine-runner-launch.sh +Exec=/usr/bin/uengine-runner-applist-launch.sh Icon=/opt/apps/com.gitee.uengine.runner.spark/files/menu.svg MimeType= Name=UEngine App List diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/__init__.py b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/__init__.py index 16bbad0..c54a59a 100644 --- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/__init__.py +++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/__init__.py @@ -298,7 +298,7 @@ class UEngine: if not os.path.exists: os.mkdir("/tmp/uengine-runner") File("/tmp/uengine-runner/install.sh").write("sudo dpkg -i /tmp/uengine-runner/u*.deb\nsudo apt install -f") - os.system("wget -P '/tmp/uengine-runner' 'https://hub.fastgit.org/gfdgd-xi/uengine-runner/releases/download/U1.2.15/uengine-android-image_1.2.15_amd64.deb' && pkexec bash '/tmp/uengine-runner/install.sh'") + os.system("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'") class Services: def Open(): os.system("pkexec systemctl enable uengine-container uengine-session && systemctl start uengine-container uengine-session") @@ -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,7 +362,11 @@ class UengineRunner: if __name__ == "__main__": print("本 API 不支持直接运行，请通过引入的方式使用此 API") - quit() + #adb = Adb("192.168.250.2:5555") + #print(adb.boolAndroidInstallOtherAppSetting()) + + #quit() if not ROOT.GetRoot(): - print("请获取 ROOT 权限以便更好的使用该 API") \ No newline at end of file + pass + #print("请获取 ROOT 权限以便更好的使用该 API") \ No newline at end of file diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/__pycache__/__init__.cpython-37.pyc b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 0000000..69ef9b1 Binary files /dev/null and b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/__pycache__/__init__.cpython-37.pyc differ 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 eef6435..430e2e0 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 @@ -28,6 +28,7 @@ "※3、新增加了 UEngine 的 Ubuntu 安装程序", "※4、双包合一，只保留了UOS打包标准，可以从旧标准无缝升级（推荐使用本程序的升级程序进行升级）", "5、修复了本程序在 Ubuntu 上安装和卸载报错而无法继续的问题", + "6、优化帮助/关于窗口在高分辨率电脑上显示不全的问题", "V1.6.1：", "※1、修复了打包 deb 包在 APK 的包名有大写时无法启动的问题", "※2、提供新版本的 UEngine Root 镜像", @@ -164,6 +165,6 @@ "柚子", "为什么您不喜欢熊出没和阿布呢", "星空露光", - "shenmo" + "shenmo" ] } \ No newline at end of file diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-installer b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-installer index 8111fd2..2eacf87 100755 --- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-installer +++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-installer @@ -28,6 +28,7 @@ cp /tmp/uengine/run_daemon.sh $HOME/uengine-launch cp /tmp/uengine/launch_uengine.sh $HOME/uengine-launch cd /tmp/uengine /tmp/uengine/install.sh +sudo apt install -y libkf5globalaccel5 libqt5multimedia5 libqt5sensors5 libegl1-mesa-dev echo "重启后在$HOME/uengine-launch执行launch_uengine.sh即可打开uengine守护进程。随后即可安装和使用安卓应用" echo "你需要在每次启动安卓应用之前打开这个脚本。打开后可安全关闭" echo "按回车重启" 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 e39e58c..1316fe0 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 @@ -1351,7 +1351,7 @@ if not os.path.exists("/usr/bin/uengine"): sys.exit(0) # 非 Deepin/UOS 用户 else: - if messagebox.askyesno(title="提示", message="您的电脑没有安装 UEngine，是否安装 UEngine 以便更好的使用\n这里将会使用 shenmo 提供的脚本进行安装\n安装完后重新启动该程序即可"): + if messagebox.askyesno(title="提示", message="您的电脑没有安装 UEngine，是否安装 UEngine 以便更好的使用\n这里将会使用 shenmo 提供的脚本进行安装\n安装完后重新启动该程序即可\n提示：无法保证此安装脚本安装的 UEngine 可以使用"): os.system(f"deepin-terminal -C \"bash '{programPath}/uengine-installer'\"") sys.exit(0) # 重新显示窗口 diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner-applist-launch.sh b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner-applist-launch.sh index 27e1c9c..83d7a99 100755 --- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner-applist-launch.sh +++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner-applist-launch.sh @@ -16,8 +16,8 @@ else deepin-terminal -C "pkexec apt install uengine" fi else - echo "非 Deepin/UOS 系统，使用 shenmo 提供的脚本安装" - zenity --question --text="您还未安装 UEngine，是否现在安装？\n将会使用 shenmo 提供的脚本进行安装" --no-wrap + echo "非 Deepin/UOS 系统，使用 shenmo 提供的脚本安装\n暂未保证此安装脚本一定安装成功" + zenity --question --text="您还未安装 UEngine，是否现在安装？\n将会使用 shenmo 提供的脚本进行安装\n暂未保证此安装脚本一定安装成功" --no-wrap if [[ $? = 0 ]]; then deepin-terminal -C "bash /opt/apps/com.gitee.uengine.runner.spark/files/uengine-installer" fi diff --git a/old-deb-build/DEBIAN/control b/old-deb-build/DEBIAN/control index 7f5de4a..e3932c5 100644 --- a/old-deb-build/DEBIAN/control +++ b/old-deb-build/DEBIAN/control @@ -3,8 +3,8 @@ Depends: com.gitee.uengine.runner.spark(>=1.6.2Alpha1) Architecture: all Priority: optional Section: oldlibs -Version: 1.6.2Alpha2 +Version: 1.6.2 Maintainer: gfdgd xi <3025613752@qq.com>, actionchen<917981399@qq.com>, 柚子, 为什么您不喜欢熊出没和阿布呢, 星空露光, shenmo Conflicts: spark-uengine-apk-builder Homepage: [https://gitee.com/gfdgd-xi/uengine-runner, https://github.com/gfdgd-xi/uengine-runner] -Description: UEngine 运行器，此包只做升级过渡使用 +Description: UEngine 运行器，此包只做升级过渡使用，无实质内容