diff --git a/README.md b/README.md
index 8095216..7d5f6d3 100755
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-UEngine 运行器 1.8.1-1
+UEngine 运行器 1.8.2
### 介绍
@@ -37,6 +37,16 @@ sudo apt upgrade
### 更新内容
+#### V1.8.2(2022年11月28日)
+**※1、重新恢复 uengine-installer For Ubuntu**
+**※2、修复 postrm 的问题**
+**※3、修复“添加UEngine应用快捷方式出现问题”的问题**
+**※4、修复打包器无参数问题**
+**※5、打包器默认勾选“使用 uengine-dc 前缀”**
+6、修复Python主版本号判断时潜在的问题(By Bail)
+7、新增部分资源入口
+![image.png](https://storage.deepin.org/thread/202211282224306611_image.png)
+
#### V1.8.1-1(2022年09月03日)
**※1、修复缺失依赖 python3-matplotlib 导致程序无法开启的问题**
**※2、移除在 Ubuntu 上用于安装 UEngine 的安装工具**
diff --git a/com.gitee.uengine.runner.spark.deb b/com.gitee.uengine.runner.spark.deb
deleted file mode 100755
index 206f884..0000000
Binary files a/com.gitee.uengine.runner.spark.deb and /dev/null differ
diff --git a/information.json b/information.json
index a5c0dee..2ae4043 100755
--- a/information.json
+++ b/information.json
@@ -28,8 +28,9 @@
"※2、修复 postrm 的问题",
"※3、修复“添加UEngine应用快捷方式出现问题”的问题",
"※4、修复打包器无参数问题",
- "5、修复Python主版本号判断时潜在的问题(By Bail)",
- "6、新增部分资源入口",
+ "※5、打包器默认勾选“使用 uengine-dc 前缀”",
+ "6、修复Python主版本号判断时潜在的问题(By Bail)",
+ "7、新增部分资源入口",
"",
"V1.8.1-1:",
"※1、修复缺失依赖 python3-matplotlib 导致程序无法开启的问题",
diff --git a/new-deb-build/DEBIAN/control b/new-deb-build/DEBIAN/control
index 3ece531..97ba9f6 100755
--- 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, com.gitee.uengine.runner.spark.ubuntu
-Version: 1.8.2
+Version: 1.8.2-uos
Architecture: all
Section: utils
Installed-Size: 1600
@@ -12,10 +12,11 @@ Priority: optional
Conflicts: spark-uengine-apk-builder, com.gitee.uengine.runner.spark.ubuntu
Homepage: [https://gitee.com/gfdgd-xi/uengine-runner, https://github.com/gfdgd-xi/uengine-runner, https://www.gitlink.org.cn/gfdgd_xi/uengine-runner]
Description: UEngine 运行器,1.8.2 更新内容:
- 1、修复依赖缺失导致程序无法开启的问题
- 1.8.1更新内容:
- ※1、修复在 APK 详细信息中图标可能过大导致无法正常使用的问题
- ※2、修复 APK 路径带空格无法正常安装的问题
- 3、修复打包器打包的 APK 带下划线“_”无法正常打包的问题
- 4、修复打包器下方命令返回过多空白行的问题
+ ※1、重新恢复 uengine-installer For Ubuntu
+ ※2、修复 postrm 的问题
+ ※3、修复“添加UEngine应用快捷方式出现问题”的问题
+ ※4、修复打包器无参数问题
+ ※5、打包器默认勾选“使用 uengine-dc 前缀”
+ 6、修复Python主版本号判断时潜在的问题(By Bail)
+ 7、新增部分资源入口
开发/参与者:gfdgd xi <3025613752@qq.com>, actionchen<917981399@qq.com>, 柚子, 为什么您不喜欢熊出没和阿布呢, 星空露光, shenmo
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
index 175249d..2bd853a 100755
Binary files a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/__pycache__/__init__.cpython-37.pyc 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 5985c61..2ae4043 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
@@ -5,7 +5,7 @@
"https://github.com/gfdgd-xi/uengine-runner",
"https://gitlink.org.cn/gfdgd_xi/uengine-runner"
],
- "Version": "1.8.1-1",
+ "Version": "1.8.2",
"System": "Linux(deepin/UOS)",
"Tips": [
"更多可见:https://gitee.com/gfdgd-xi/uengine-runner/wikis 或程序的更多帮助",
@@ -23,6 +23,15 @@
"5、如果想要使用adb连接UEngine或其他手机,请使用 1.2.0 以前的版本。(如需连接UEngine请安装adb补丁)"
],
"Update": [
+ "V1.8.2:",
+ "※1、重新恢复 uengine-installer For Ubuntu",
+ "※2、修复 postrm 的问题",
+ "※3、修复“添加UEngine应用快捷方式出现问题”的问题",
+ "※4、修复打包器无参数问题",
+ "※5、打包器默认勾选“使用 uengine-dc 前缀”",
+ "6、修复Python主版本号判断时潜在的问题(By Bail)",
+ "7、新增部分资源入口",
+ "",
"V1.8.1-1:",
"※1、修复缺失依赖 python3-matplotlib 导致程序无法开启的问题",
"※2、移除在 Ubuntu 上用于安装 UEngine 的安装工具",
@@ -194,6 +203,7 @@
"Contribute": [
"感谢以下用户提供的问题、建议、图标、代码等,如果有遗漏,请及时与开发者联系添加,以及如果侵犯到您的合法权益,也及时与开发者联系:",
"
",
+ "感谢 Bail Pr 修复Python主版本号判断时潜在的问题的补丁",
"感谢 麻木法师(1312580754) 在星火应用商店QQ交流群展示的接口及其原理",
"感谢 Bail(https://github.com/BailPlus) 修复的函数未输入密码自动回车的 bug",
"感谢 actionchen(917981399@qq.com) 提供了新版页面布局(1.3.0 ~ 最新版本)以及布局代码(1.3.0 ~ 1.7.0)",
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-apk-builder b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-apk-builder
index 400c2d4..7f1d5a0 100755
--- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-apk-builder
+++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-apk-builder
@@ -468,6 +468,7 @@ exitProgram = QtWidgets.QAction(langFile[lang]["Uengine Apk Builder"]["Menu"][0]
exitProgram.triggered.connect(window.close)
programmenu.addAction(exitProgram)
#
+check.setChecked(True)
frame2.addWidget(check)
frame2.addWidget(sizes)
frame2.addWidget(button3)
@@ -476,5 +477,9 @@ window.setWindowTitle(title)
window.setCentralWidget(widget)
window.setWindowIcon(QtGui.QIcon(iconPath))
window.resize(window.frameSize().width() * 1.3, window.frameSize().height() * 1.1)
+try:
+ combobox1.setCurrentText(sys.argv[1])
+except:
+ print("无参数")
window.show()
sys.exit(app.exec_())
\ 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 2eacf87..8a0a44b 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
@@ -2,14 +2,17 @@
is_tar_checked="0"
rm -rf /tmp/uengine
until [ "$is_tar_checked" = "1" ];do
-echo "请拖入uengine.tar.xz并回车确认,可在 https://cowtransfer.com/s/44656ada129e42 下载获取。"
-read tar_path
+#echo "请拖入uengine.tar.xz并回车确认,可在 https://cowtransfer.com/s/44656ada129e42 下载获取。"
+#read tar_path
+mkdir -p /tmp/uengine
+aria2c -x 16 -s 16 -d /tmp/uengine -o uenginetar.xz https://code.gitlink.org.cn/gfdgd_xi/uengine-installer/raw/branch/master/uenginetar.xz
+tar_path="/tmp/uengine/uenginetar.xz"
tar_path=`echo "$tar_path" | sed $'s/\'//g'`
-echo "路径为 $tar_path"
+#echo "路径为 $tar_path"
tar_md5sum=`md5sum $tar_path`
tar_md5sum=`echo ${tar_md5sum%%/*}`
-if [ "$tar_md5sum" = "b8429c4d8bfd507b9dc4547e0b71c962" ];then
+if [ "$tar_md5sum" = "5668b6bb54d28406e527989348126982" ];then
is_tar_checked="1"
else
echo $tar_md5sum
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 ee1da40..0fe2796 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
@@ -20,6 +20,7 @@ import numpy
import base64
import shutil
import zipfile
+import platform
import requests
import traceback
import threading
@@ -36,6 +37,18 @@ import PyQt5.QtCore as QtCore
import PyQt5.QtWidgets as QtWidgets
from getxmlimg import getsavexml
+def PythonLower():
+ app = QtWidgets.QApplication(sys.argv)
+ QtWidgets.QMessageBox.critical(None, "错误", "Python 至少需要 3.6 及以上版本,目前版本:" + platform.python_version() + "")
+ sys.exit(1)
+
+# Python 版本检测,因为 f-string 格式化要至少 Python 3.6 及以上的版本,所以需要检测
+# 判断主版本号
+if sys.version_info[0] < 3:
+ PythonLower()
+if sys.version_info[1] < 6:
+ PythonLower()
+
class UninstallProgram(QtCore.QThread):
info = QtCore.pyqtSignal(str)
error = QtCore.pyqtSignal(str)
@@ -1373,18 +1386,18 @@ class AddNewUengineDesktopLink():
# 添加快捷方式
def SaveDesktopLink():
try:
- if os.path.exists("{}/.local/share/applications/uengine/{}.desktop".format(get_home(), packageName.get())):
+ if os.path.exists("{}/.local/share/applications/uengine/{}.desktop".format(get_home(), packageName.text())):
if QtWidgets.QMessageBox.question(widget, "提示", "文件已存在,是否要覆盖?") == QtWidgets.QMessageBox.No:
return
if not os.path.exists("{}/.local/share/icons/hicolor/256x256/apps/".format(get_home())):
os.makedirs("{}/.local/share/icons/hicolor/256x256/apps/".format(get_home()))
global activityName
- iconSavePath = "{}/.local/share/icons/hicolor/256x256/apps/{}.png".format(get_home(), packageName.get())
+ iconSavePath = "{}/.local/share/icons/hicolor/256x256/apps/{}.png".format(get_home(), packageName.text())
shutil.copy(programPath + "/defult.png", iconSavePath)
- BuildUengineDesktop(packageName.get(), activityName, packageName.get(), iconSavePath,
- "{}/.local/share/applications/uengine/{}.desktop".format(get_home(), packageName.get()))
- BuildUengineDesktop(packageName.get(), activityName, packageName.get(), iconSavePath,
- "{}/{}.desktop".format(get_desktop_path(), packageName.get()))
+ BuildUengineDesktop(packageName.text(), activityName, packageName.text(), iconSavePath,
+ "{}/.local/share/applications/uengine/{}.desktop".format(get_home(), packageName.text()))
+ BuildUengineDesktop(packageName.text(), activityName, packageName.text(), iconSavePath,
+ "{}/{}.desktop".format(get_desktop_path(), packageName.text()))
AddNewUengineDesktopLink.SaveHistory()
QtWidgets.QMessageBox.information(widget, "提示", "创建完毕!")
except:
@@ -1396,13 +1409,13 @@ class AddNewUengineDesktopLink():
def DelDesktopLink():
try:
global packageName
- if not os.path.exists("{}/.local/share/applications/uengine/{}.desktop".format(get_home(), packageName.get())):
+ if not os.path.exists("{}/.local/share/applications/uengine/{}.desktop".format(get_home(), packageName.text())):
QtWidgets.QMessageBox.critical(widget, "错误", "此包名对应的 UEngine 桌面快捷方式不存在!")
return
if QtWidgets.QMessageBox.warning(widget, "警告", "你确定要删除吗?删除后将无法恢复!", QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel, QtWidgets.QMessageBox.Cancel) == QtWidgets.QMessageBox.Cancel:
return
try:
- os.remove("{}/.local/share/applications/uengine/{}.desktop".format(get_home(), packageName.get()))
+ os.remove("{}/.local/share/applications/uengine/{}.desktop".format(get_home(), packageName.text()))
AddNewUengineDesktopLink.SaveHistory()
QtWidgets.QMessageBox.information(widget, "提示", "已删除")
except:
@@ -1667,11 +1680,11 @@ if not os.path.exists("/usr/bin/uengine"):
# 非 Deepin/UOS 用户
# 因为安装器出现问题,所以废弃
else:
- QtWidgets.QMessageBox.critical(None, "错误", "请安装 UEngine 后继续")
- sys.exit(0)
- #if QtWidgets.QMessageBox.question(None, "提示", "您的电脑没有安装 UEngine,是否安装 UEngine 以便更好的使用\n这里将会使用 shenmo 提供的脚本进行安装\n安装完后重新启动该程序即可\n提示:无法保证此安装脚本安装的 UEngine 可以使用") == QtWidgets.QMessageBox.Yes:
- # os.system(f"'{programPath}/launch.sh' deepin-terminal -C \"bash '{programPath}/uengine-installer'\"")
- # sys.exit(0)
+ #QtWidgets.QMessageBox.critical(None, "错误", "请安装 UEngine 后继续")
+ #sys.exit(0)
+ if QtWidgets.QMessageBox.question(None, "提示", "您的电脑没有安装 UEngine,是否安装 UEngine 以便更好的使用\n这里将会使用 shenmo 提供的脚本进行安装\n安装完后重新启动该程序即可\n提示:无法保证此安装脚本安装的 UEngine 可以使用") == QtWidgets.QMessageBox.Yes:
+ os.system(f"'{programPath}/launch.sh' deepin-terminal -C \"bash '{programPath}/uengine-installer'\"")
+ sys.exit(0)
###########################
# 窗口创建
@@ -1829,7 +1842,7 @@ uengineData = uengine.addMenu(langFile[lang]["Main"]["MainWindow"]["Menu"][2]["M
uengine.addAction(uengineDeleteUengineCheck)
uengine.addAction(uengineReinstall)
uengineRoot = uengine.addMenu(langFile[lang]["Main"]["MainWindow"]["Menu"][2]["Menu"][11]["Name"])
-uengineUbuntuInstall.setDisabled(True)
+#uengineUbuntuInstall.setDisabled(True)
# 绑定信号
uengineAllowOrDisallowUpdateAndroidApp.triggered.connect(AllowOrDisallowUpdateAndroidApp)
uengineSetHttpProxy.triggered.connect(SetHttpProxy)
@@ -1912,12 +1925,18 @@ uengineBuildRootUengineImage.triggered.connect(BuildRootUengineImage)
uengineReinstallUengineImage.triggered.connect(ReinstallUengineImage)
helpOpenProgramUrl = QtWidgets.QAction(langFile[lang]["Main"]["MainWindow"]["Menu"][3]["Menu"][0])
+makerWebsize = QtWidgets.QAction("作者个人站")
+helpForum = QtWidgets.QAction("程序论坛")
+uengineRunnerSearch = QtWidgets.QAction("查询指定程序在 UEngine 的运行情况")
helpUengineRunnerBugUpload = QtWidgets.QAction(langFile[lang]["Main"]["MainWindow"]["Menu"][3]["Menu"][2])
helpShowHelp = QtWidgets.QAction(langFile[lang]["Main"]["MainWindow"]["Menu"][3]["Menu"][4])
helpRunnerUpdate = QtWidgets.QAction(langFile[lang]["Main"]["MainWindow"]["Menu"][3]["Menu"][3])
helpAbout = QtWidgets.QAction(langFile[lang]["Main"]["MainWindow"]["Menu"][3]["Menu"][1])
helpAboutQt = QtWidgets.QAction(langFile[lang]["Main"]["MainWindow"]["Menu"][3]["Menu"][5])
help.addAction(helpOpenProgramUrl)
+help.addAction(uengineRunnerSearch)
+help.addAction(makerWebsize)
+help.addAction(helpForum)
help.addAction(helpUengineRunnerBugUpload)
help.addAction(helpShowHelp)
help.addAction(helpRunnerUpdate)
@@ -1929,6 +1948,9 @@ hm1.addAction(hm1_1)
hm1_1.triggered.connect(lambda: webbrowser.open_new_tab("https://gitee.com/gfdgd-xi/deep-wine-runner"))
# 绑定信号
helpOpenProgramUrl.triggered.connect(OpenProgramURL)
+uengineRunnerSearch.triggered.connect(lambda: webbrowser.open_new_tab("https://gfdgd-xi.github.io/uengine-runner-info/"))
+makerWebsize.triggered.connect(lambda: webbrowser.open_new_tab("https://gfdgd-xi.github.io"))
+helpForum.triggered.connect(lambda: webbrowser.open_new_tab("https://gfdgdxi.flarum.cloud/"))
helpUengineRunnerBugUpload.triggered.connect(UengineRunnerBugUpload)
helpShowHelp.triggered.connect(ShowHelp)
helpRunnerUpdate.triggered.connect(UpdateWindow.ShowWindow)