diff --git a/README.md b/README.md
index 6168267..15801bc 100755
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
<p width=100px align="center"><img src="runner.svg"></p>
-<h1 align="center">UEngine 运行器 2.1.1</h1>
+<h1 align="center">UEngine 运行器 2.1.2</h1>
<hr>
<a href='https://gitee.com/gfdgd-xi-org/uengine-runner/stargazers'><img src='https://gitee.com/gfdgd-xi-org/uengine-runner/badge/star.svg?theme=dark' alt='star'></img></a>
<a href='https://gitee.com/gfdgd-xi/uengine-runner/members'><img src='https://gitee.com/gfdgd-xi/uengine-runner/badge/fork.svg?theme=dark' alt='fork'></img></a>
@@ -27,6 +27,10 @@ Deepin 论坛：https://bbs.deepin.org
https://gfdgdxi.lanzoue.com/b01qiu22f
密码:dihl
或者从星火应用商店下载安装，星火应用商店的源里已经补齐 UEngine 运行器在 Deepin 23 Alpha2/Beta 缺少的依赖
+然后输入：
+```bash
+python3 -m pip install pillow
+```
## 上架到的应用商店
> 可以从下列应用商店获取 UEngine 运行器
@@ -76,6 +80,15 @@ sudo apt upgrade
### 更新内容
+#### V2.1.2（2023年08月14日）
+**※1、修复 https://gitee.com/gfdgd-xi/uengine-runner/issues/I6ZRZX**
+**※2、修复添加应用图标时activity名称错误的问题**
+**※3、修复 UEngine 运行器在 23 运行时提示缺失 PIL.Image 库的问题**
+
+
+
+
+
#### V2.1.1（2023年07月06日）
**※1、修复在 Ubuntu/Debian 安装 UEngine 时提示“该脚本不支持 deepin”的问题；**
**※2、修复 UEngine 在 debian12 安装无法正常开启 UEngine 的问题；**
diff --git a/information.json b/information.json
index 170a674..621b86c 100755
--- a/information.json
+++ b/information.json
@@ -4,7 +4,7 @@
"https://gitee.com/gfdgd-xi/uengine-runner",
"https://github.com/gfdgd-xi/uengine-runner"
],
- "Version": "2.1.1",
+ "Version": "2.1.2",
"System": "Linux（deepin/UOS/Ubuntu/Debian）",
"Tips": [
"更多可见：https://gitee.com/gfdgd-xi/uengine-runner/wikis 或程序的更多帮助",
@@ -22,6 +22,11 @@
"5、如果想要使用adb连接UEngine或其他手机，请使用 1.2.0 以前的版本。（如需连接UEngine请安装adb补丁）"
],
"Update": [
+ "<b>V2.1.2：</b>",
+ "※1、修复 https://gitee.com/gfdgd-xi/uengine-runner/issues/I6ZRZX",
+ "※2、修复添加应用图标时activity名称错误的问题",
+ "※3、修复 UEngine 运行器在 23 运行时提示缺失 PIL.Image 库的问题",
+ "",
"<b>V2.1.1：</b>",
"※1、修复在 Ubuntu/Debian 安装 UEngine 时提示“该脚本不支持 deepin”的问题；",
"※2、修复 UEngine 在 debian12 安装无法正常开启 UEngine 的问题；",
diff --git a/new-deb-build/DEBIAN/control b/new-deb-build/DEBIAN/control
index 2cfe3a9..eba6e6d 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: 2.1.1
+Version: 2.1.2
Architecture: all
Section: utils
Installed-Size: 2920
diff --git a/new-deb-build/DEBIAN/postinst b/new-deb-build/DEBIAN/postinst
index f65225b..e7bfe6e 100755
--- a/new-deb-build/DEBIAN/postinst
+++ b/new-deb-build/DEBIAN/postinst
@@ -63,4 +63,4 @@ fi
# 因为 Ubuntu 的问题，省略
gtk-update-icon-cache /usr/share/icons/bloom > /dev/null | true
# 向服务器返回安装数加1（不显示内容且忽略错误）
-python3 /opt/apps/com.gitee.uengine.runner.spark/files/Download.py 2.1.1 > /dev/null | true
+python3 /opt/apps/com.gitee.uengine.runner.spark/files/Download.py 2.1.2 > /dev/null | true
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/ConfigLanguareRunner.py b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/ConfigLanguareRunner.py
index 381b3f7..7c275ce 100755
--- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/ConfigLanguareRunner.py
+++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/ConfigLanguareRunner.py
@@ -41,8 +41,8 @@ programEnv = [
["($PROGRAMPATH)", programPath],
["($VERSION)", version],
["($THANK)", thankText],
- ["($MAKER)", "RacoonGX 团队，By gfdgd xi"],
- ["($COPYRIGHT)", f"©2020~{time.strftime('%Y')} RacoonGX 团队，By gfdgd xi"],
+ ["($MAKER)", "gfdgd xi"],
+ ["($COPYRIGHT)", f"©2020~{time.strftime('%Y')} gfdgd xi"],
["($?)", "0"],
["($PLATFORM)", platform.system()],
["($DEBUG)", "1"]
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/getxmlimg.py b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/getxmlimg.py
index af59a70..2bda884 100755
--- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/getxmlimg.py
+++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/getxmlimg.py
@@ -1,5 +1,11 @@
-import PIL.Image as Image
-import PIL.ImageDraw as ImageDraw
+import os
+try:
+ import PIL.Image as Image
+ import PIL.ImageDraw as ImageDraw
+except:
+ os.system("python3 -m pip install --upgrade pillow --break-system-packages --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple")
+ import PIL.Image as Image
+ import PIL.ImageDraw as ImageDraw
import zipfile
import subprocess
import re
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 de175a0..ebadbc7 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
@@ -4,7 +4,7 @@
"https://gitee.com/gfdgd-xi/uengine-runner",
"https://github.com/gfdgd-xi/uengine-runner"
],
- "Version": "2.1.1",
+ "Version": "2.1.2",
"System": "Linux（deepin/UOS/Ubuntu/Debian）",
"Tips": [
"更多可见：https://gitee.com/gfdgd-xi/uengine-runner/wikis 或程序的更多帮助",
@@ -22,6 +22,11 @@
"5、如果想要使用adb连接UEngine或其他手机，请使用 1.2.0 以前的版本。（如需连接UEngine请安装adb补丁）"
],
"Update": [
+ "<b>V2.1.2：</b>",
+ "※1、修复 https://gitee.com/gfdgd-xi/uengine-runner/issues/I6ZRZX",
+ "※2、修复添加应用图标时activity名称错误的问题",
+ "※3、修复 UEngine 运行器在 23 运行时提示缺失 PIL.Image 库的问题",
+ "",
"<b>V2.1.1：</b>",
"※1、修复在 Ubuntu/Debian 安装 UEngine 时提示“该脚本不支持 deepin”的问题；",
"※2、修复 UEngine 在 debian12 安装无法正常开启 UEngine 的问题；",
@@ -258,7 +263,7 @@
"11、deepin 终端",
"……"
],
- "Time": "2023-07-06 11:35:32 Linux-5.15.77-amd64-desktop-x86_64-with-Deepin-20.9-apricot",
+ "Time": "2023-08-14 17:02:40 Linux-6.1.32-amd64-desktop-hwe-x86_64-with-glibc2.35",
"Contribute": [
"<b>感谢以下用户提供的问题、建议、图标、代码等，如果有遗漏，请及时与开发者联系添加，以及如果侵犯到您的合法权益，也及时与开发者联系：</p>",
"<hr>",
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 4533230..1490450 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
@@ -207,7 +207,7 @@ Name={}
self.RunCommandShow("chmod 0775 -vR '{}/DEBIAN/postinst'".format(tempPath))
self.RunCommandShow("chmod 0775 -vR '{}/DEBIAN/prerm'".format(tempPath))
self.RunCommandShow("echo '打包 deb 到桌面……'")
- self.RunCommandShow("dpkg -b '{}' '{}/{}_{}.deb'".format(tempPath, get_desktop_path(),apkPackageNameNew, apkPackageVersion))
+ self.RunCommandShow("dpkg-deb -Z xz -b '{}' '{}/{}_{}.deb'".format(tempPath, get_desktop_path(),apkPackageNameNew, apkPackageVersion))
self.RunCommandShow("echo '正在删除临时目录……'")
self.RunCommandShow("rm -rfv '{}'".format(tempPath))
self.RunCommandShow("echo '完成！'")
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-apk-builder-more b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-apk-builder-more
index 90a0399..c1035b7 100755
--- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-apk-builder-more
+++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-apk-builder-more
@@ -227,7 +227,7 @@ Name={}
self.RunCommandShow("chmod 0775 -vR '{}/DEBIAN/postinst'".format(tempPath))
self.RunCommandShow("chmod 0775 -vR '{}/DEBIAN/prerm'".format(tempPath))
self.RunCommandShow("echo '打包 deb 到桌面……'")
- self.RunCommandShow("dpkg -b '{}' '{}/{}_{}_all.deb'".format(tempPath, get_desktop_path(),apkPackageNameNew, versionText.text()))
+ self.RunCommandShow("dpkg-deb -Z xz -b '{}' '{}/{}_{}_all.deb'".format(tempPath, get_desktop_path(),apkPackageNameNew, versionText.text()))
self.RunCommandShow("echo '正在删除临时目录……'")
self.RunCommandShow("rm -rfv '{}'".format(tempPath))
self.RunCommandShow("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 66be878..202943e 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
@@ -1470,9 +1470,9 @@ class AddNewUengineDesktopLink():
global activityName
iconSavePath = "{}/.local/share/icons/hicolor/256x256/apps/{}.png".format(get_home(), packageName.text())
shutil.copy(programPath + "/defult.png", iconSavePath)
- BuildUengineDesktop(packageName.text(), activityName, packageName.text(), iconSavePath,
+ BuildUengineDesktop(packageName.text(), activityName.text(), packageName.text(), iconSavePath,
"{}/.local/share/applications/uengine/{}.desktop".format(get_home(), packageName.text()))
- BuildUengineDesktop(packageName.text(), activityName, packageName.text(), iconSavePath,
+ BuildUengineDesktop(packageName.text(), activityName.text(), packageName.text(), iconSavePath,
"{}/{}.desktop".format(get_desktop_path(), packageName.text()))
AddNewUengineDesktopLink.SaveHistory()
QtWidgets.QMessageBox.information(widget, "提示", "创建完毕！")
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner-update-bug b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner-update-bug
index 8627439..aadbde8 100755
--- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner-update-bug
+++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner-update-bug
@@ -33,7 +33,7 @@ def Update(name, stars, contact, things, version):
"Version": version
}
try:
- QtWidgets.QMessageBox.information(widget, "提示", requests.post(parse.unquote(base64.b64decode("aHR0cHM6Ly8zMDQ2MjZwOTI3LmdvaG8uY28vdWVuZ2luZS1ydW5uZXIvYnVnL3VwbG9hZC5waHA=").decode("utf-8")), data=data).text)
+ QtWidgets.QMessageBox.information(widget, "提示", requests.post(parse.unquote(base64.b64decode("aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3VlbmdpbmUtcnVubmVyL2J1Zy91cGxvYWQucGhw").decode("utf-8")), data=data).text)
print(data)
except:
traceback.print_exc()
@@ -104,4 +104,11 @@ window.setCentralWidget(widget)
window.setWindowTitle(f"UEngine 运行器 {version} 问题/建议反馈")
window.setWindowIcon(QtGui.QIcon(iconPath))
window.show()
+starMenu.setDisabled(True)
+contactThings.setDisabled(True)
+#otherUpload.setDisabled(True)
+nameThings.setDisabled(True)
+updateButton.setDisabled(True)
+updateThings.setDisabled(True)
+updateThings.setText("请移步到 Gitee 或 Github 提交 Bug（推荐使用 Gitee）")
sys.exit(app.exec_())
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/updatekiller.py b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/updatekiller.py
index d44b6b9..43356db 100755
--- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/updatekiller.py
+++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/updatekiller.py
@@ -8,15 +8,12 @@ PIDFILE = '/tmp/uengine-runner.pid'
#程序结束时清理pid
@atexit.register
def remove_pid():
- try:
- with open(PIDFILE) as pidfile:
- pidlst = pidfile.readlines()
- pidlst.remove(str(PID)+'\n')
- with open(PIDFILE,'w') as pidfile:
- pidfile.writelines(pidlst)
- except:
- # 忽略
- pass
+ '''程序结束时清理pid'''
+ with open(PIDFILE) as pidfile:
+ pidlst = pidfile.readlines()
+ pidlst.remove(str(PID)+'\n') #移除记录中的pid
+ with open(PIDFILE,'w') as pidfile:
+ pidfile.writelines(pidlst)
#更新时结束进程
def main():
@@ -25,7 +22,7 @@ def main():
os.kill(int(i),15)
except ProcessLookupError:
pass
- os.remove(PIDFILE)
+## os.remove(PIDFILE) #因修复#I6ZRZX而注释
#当该程序被直接执行时，执行结束进程操作。如果是导入的形式，则只是记录pid
if __name__ == '__main__':