+
+QT_BEGIN_NAMESPACE
+
+class Ui_MainWindow
+{
+public:
+ QWidget *centralWidget;
+ QVBoxLayout *verticalLayout_2;
+ QTabWidget *tabWidget;
+ QWidget *tab;
+ QGridLayout *gridLayout;
+ QHBoxLayout *horizontalLayout_2;
+ QLabel *label_2;
+ QHBoxLayout *horizontalLayout_3;
+ QLabel *label;
+ QLineEdit *lineEdit;
+ QPushButton *pushButton_3;
+ QSpacerItem *verticalSpacer;
+ QWidget *tab_2;
+ QHBoxLayout *horizontalLayout;
+ QListView *listView;
+ QVBoxLayout *verticalLayout;
+ QSpacerItem *verticalSpacer_3;
+ QPushButton *pushButton_2;
+ QPushButton *pushButton;
+ QSpacerItem *verticalSpacer_2;
+ QListView *urlImageList;
+ QWidget *tab_3;
+ QStatusBar *statusBar;
+
+ void setupUi(QMainWindow *MainWindow)
+ {
+ if (MainWindow->objectName().isEmpty())
+ MainWindow->setObjectName(QString::fromUtf8("MainWindow"));
+ MainWindow->resize(683, 416);
+ centralWidget = new QWidget(MainWindow);
+ centralWidget->setObjectName(QString::fromUtf8("centralWidget"));
+ verticalLayout_2 = new QVBoxLayout(centralWidget);
+ verticalLayout_2->setSpacing(6);
+ verticalLayout_2->setContentsMargins(11, 11, 11, 11);
+ verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
+ tabWidget = new QTabWidget(centralWidget);
+ tabWidget->setObjectName(QString::fromUtf8("tabWidget"));
+ tabWidget->setTabPosition(QTabWidget::West);
+ tabWidget->setElideMode(Qt::ElideNone);
+ tab = new QWidget();
+ tab->setObjectName(QString::fromUtf8("tab"));
+ gridLayout = new QGridLayout(tab);
+ gridLayout->setSpacing(6);
+ gridLayout->setContentsMargins(11, 11, 11, 11);
+ gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+ horizontalLayout_2 = new QHBoxLayout();
+ horizontalLayout_2->setSpacing(6);
+ horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
+ label_2 = new QLabel(tab);
+ label_2->setObjectName(QString::fromUtf8("label_2"));
+
+ horizontalLayout_2->addWidget(label_2);
+
+
+ gridLayout->addLayout(horizontalLayout_2, 1, 0, 1, 1);
+
+ horizontalLayout_3 = new QHBoxLayout();
+ horizontalLayout_3->setSpacing(6);
+ horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3"));
+ label = new QLabel(tab);
+ label->setObjectName(QString::fromUtf8("label"));
+
+ horizontalLayout_3->addWidget(label);
+
+ lineEdit = new QLineEdit(tab);
+ lineEdit->setObjectName(QString::fromUtf8("lineEdit"));
+
+ horizontalLayout_3->addWidget(lineEdit);
+
+ pushButton_3 = new QPushButton(tab);
+ pushButton_3->setObjectName(QString::fromUtf8("pushButton_3"));
+
+ horizontalLayout_3->addWidget(pushButton_3);
+
+
+ gridLayout->addLayout(horizontalLayout_3, 0, 0, 1, 1);
+
+ verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+ gridLayout->addItem(verticalSpacer, 2, 0, 1, 1);
+
+ tabWidget->addTab(tab, QString());
+ tab_2 = new QWidget();
+ tab_2->setObjectName(QString::fromUtf8("tab_2"));
+ horizontalLayout = new QHBoxLayout(tab_2);
+ horizontalLayout->setSpacing(6);
+ horizontalLayout->setContentsMargins(11, 11, 11, 11);
+ horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+ listView = new QListView(tab_2);
+ listView->setObjectName(QString::fromUtf8("listView"));
+
+ horizontalLayout->addWidget(listView);
+
+ verticalLayout = new QVBoxLayout();
+ verticalLayout->setSpacing(6);
+ verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
+ verticalSpacer_3 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+ verticalLayout->addItem(verticalSpacer_3);
+
+ pushButton_2 = new QPushButton(tab_2);
+ pushButton_2->setObjectName(QString::fromUtf8("pushButton_2"));
+
+ verticalLayout->addWidget(pushButton_2);
+
+ pushButton = new QPushButton(tab_2);
+ pushButton->setObjectName(QString::fromUtf8("pushButton"));
+
+ verticalLayout->addWidget(pushButton);
+
+ verticalSpacer_2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+ verticalLayout->addItem(verticalSpacer_2);
+
+
+ horizontalLayout->addLayout(verticalLayout);
+
+ urlImageList = new QListView(tab_2);
+ urlImageList->setObjectName(QString::fromUtf8("urlImageList"));
+
+ horizontalLayout->addWidget(urlImageList);
+
+ tabWidget->addTab(tab_2, QString());
+ tab_3 = new QWidget();
+ tab_3->setObjectName(QString::fromUtf8("tab_3"));
+ tabWidget->addTab(tab_3, QString());
+
+ verticalLayout_2->addWidget(tabWidget);
+
+ MainWindow->setCentralWidget(centralWidget);
+ statusBar = new QStatusBar(MainWindow);
+ statusBar->setObjectName(QString::fromUtf8("statusBar"));
+ MainWindow->setStatusBar(statusBar);
+
+ retranslateUi(MainWindow);
+
+ tabWidget->setCurrentIndex(1);
+
+
+ QMetaObject::connectSlotsByName(MainWindow);
+ } // setupUi
+
+ void retranslateUi(QMainWindow *MainWindow)
+ {
+ MainWindow->setWindowTitle(QCoreApplication::translate("MainWindow", "MainWindow", nullptr));
+ label_2->setText(QCoreApplication::translate("MainWindow", "TextLabel", nullptr));
+ label->setText(QCoreApplication::translate("MainWindow", "TextLabel", nullptr));
+ pushButton_3->setText(QCoreApplication::translate("MainWindow", "PushButton", nullptr));
+ tabWidget->setTabText(tabWidget->indexOf(tab), QCoreApplication::translate("MainWindow", "\346\223\215\344\275\234", nullptr));
+ pushButton_2->setText(QCoreApplication::translate("MainWindow", "<<", nullptr));
+ pushButton->setText(QCoreApplication::translate("MainWindow", ">>", nullptr));
+ tabWidget->setTabText(tabWidget->indexOf(tab_2), QCoreApplication::translate("MainWindow", "\346\226\260\345\273\272\346\250\241\346\213\237\345\231\250", nullptr));
+ tabWidget->setTabText(tabWidget->indexOf(tab_3), QCoreApplication::translate("MainWindow", "\345\205\263\344\272\216", nullptr));
+ } // retranslateUi
+
+};
+
+namespace Ui {
+ class MainWindow: public Ui_MainWindow {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // UI_MAINWINDOW_H
diff --git a/Android X86/exampleurl/Makefile b/Android X86/exampleurl/Makefile
new file mode 100644
index 0000000..e772793
--- /dev/null
+++ b/Android X86/exampleurl/Makefile
@@ -0,0 +1,2 @@
+run:
+ sudo mini_httpd
diff --git a/Android X86/exampleurl/list.json b/Android X86/exampleurl/list.json
new file mode 100644
index 0000000..d96d9b6
--- /dev/null
+++ b/Android X86/exampleurl/list.json
@@ -0,0 +1,6 @@
+[
+ ["a", "http://120.25.153.144/index.html"],
+ ["b", "http://127.0.0.1/a.iso"],
+ ["c", "https://github.com/gfdgd-xi/program-internet-library/releases/download/ZYH%E8%B6%85%E7%BA%A7%E5%B7%A5%E5%85%B7%E7%AE%B1/ZYH.zip"],
+ ["d", "https://www.baidu.com"]
+]
diff --git a/Android X86/main.py b/Android X86/main.py
old mode 100644
new mode 100755
diff --git a/Help/1-1-1.png b/Help/1-1-1.png
old mode 100644
new mode 100755
diff --git a/Help/1-1-2.png b/Help/1-1-2.png
old mode 100644
new mode 100755
diff --git a/Help/1-1-3.png b/Help/1-1-3.png
old mode 100644
new mode 100755
diff --git a/Help/1-1-4.png b/Help/1-1-4.png
old mode 100644
new mode 100755
diff --git a/Help/1-1-5.png b/Help/1-1-5.png
old mode 100644
new mode 100755
diff --git a/Help/1-2-1.png b/Help/1-2-1.png
old mode 100644
new mode 100755
diff --git a/Help/1-2-2.png b/Help/1-2-2.png
old mode 100644
new mode 100755
diff --git a/Help/1-3-1.png b/Help/1-3-1.png
old mode 100644
new mode 100755
diff --git a/Help/1-4-1.png b/Help/1-4-1.png
old mode 100644
new mode 100755
diff --git a/Help/1-5-1.png b/Help/1-5-1.png
old mode 100644
new mode 100755
diff --git a/Help/1-5-2.png b/Help/1-5-2.png
old mode 100644
new mode 100755
diff --git a/Help/1-6-1.png b/Help/1-6-1.png
old mode 100644
new mode 100755
diff --git a/Help/1-6-2.png b/Help/1-6-2.png
old mode 100644
new mode 100755
diff --git a/Help/1-6-3.png b/Help/1-6-3.png
old mode 100644
new mode 100755
diff --git a/Help/1-7-1.png b/Help/1-7-1.png
old mode 100644
new mode 100755
diff --git a/Help/1-8-1.png b/Help/1-8-1.png
old mode 100644
new mode 100755
diff --git a/Help/1-9-1.png b/Help/1-9-1.png
old mode 100644
new mode 100755
diff --git a/Help/1-9-2.png b/Help/1-9-2.png
old mode 100644
new mode 100755
diff --git a/Help/1-9-3.png b/Help/1-9-3.png
old mode 100644
new mode 100755
diff --git a/Help/1-9-4.png b/Help/1-9-4.png
old mode 100644
new mode 100755
diff --git a/Help/1-9-5.png b/Help/1-9-5.png
old mode 100644
new mode 100755
diff --git a/Help/1-9-6.png b/Help/1-9-6.png
old mode 100644
new mode 100755
diff --git a/Help/1-9-7.png b/Help/1-9-7.png
old mode 100644
new mode 100755
diff --git a/Help/index.html b/Help/index.html
old mode 100644
new mode 100755
diff --git a/Help/index.md b/Help/index.md
old mode 100644
new mode 100755
diff --git a/Language.json b/Language.json
old mode 100644
new mode 100755
index b10077e..a4ac83a
--- a/Language.json
+++ b/Language.json
@@ -160,6 +160,7 @@
"button2": "浏览",
"button3": " 打包",
"check": "使用前缀“uengine-dc”",
+ "size": "从 UEngine 导入程序大小设置（如果有设置）",
"Menu": [
{
"Name": "程序",
@@ -330,6 +331,7 @@
"button2": "Find",
"button3": " Build",
"check": "Use Prefix With \"uengine-dc\"",
+ "size": "Add Android Program Size Setting From UEngine (If you're setting)",
"Menu": [
{
"Name": "Program",
diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
diff --git a/UpdateApkProgram.py b/UpdateApkProgram.py
old mode 100644
new mode 100755
diff --git a/__pycache__/getxmlimg.cpython-310.pyc b/__pycache__/getxmlimg.cpython-310.pyc
new file mode 100644
index 0000000..0ad6168
Binary files /dev/null and b/__pycache__/getxmlimg.cpython-310.pyc differ
diff --git a/__pycache__/getxmlimg.cpython-37.pyc b/__pycache__/getxmlimg.cpython-37.pyc
old mode 100644
new mode 100755
diff --git a/api-test.py b/api-test.py
old mode 100644
new mode 100755
diff --git a/api/README.md b/api/README.md
old mode 100644
new mode 100755
diff --git a/api/__init__.py b/api/__init__.py
old mode 100644
new mode 100755
diff --git a/api/__pycache__/__init__.cpython-310.pyc b/api/__pycache__/__init__.cpython-310.pyc
new file mode 100644
index 0000000..d5c6100
Binary files /dev/null and b/api/__pycache__/__init__.cpython-310.pyc differ
diff --git a/api/__pycache__/__init__.cpython-37.pyc b/api/__pycache__/__init__.cpython-37.pyc
old mode 100644
new mode 100755
diff --git a/api/__pycache__/getxmlimg.cpython-37.pyc b/api/__pycache__/getxmlimg.cpython-37.pyc
old mode 100644
new mode 100755
diff --git a/api/defult.png b/api/defult.png
old mode 100644
new mode 100755
diff --git a/builer.png b/builer.png
old mode 100644
new mode 100755
diff --git a/com.gitee.uengine.runner.spark.deb b/com.gitee.uengine.runner.spark.deb
index c455064..489786c 100755
Binary files a/com.gitee.uengine.runner.spark.deb and b/com.gitee.uengine.runner.spark.deb differ
diff --git a/defult.png b/defult.png
old mode 100644
new mode 100755
diff --git a/get-uengine-information.sh b/get-uengine-information.sh
old mode 100644
new mode 100755
diff --git a/icon.png b/icon.png
old mode 100644
new mode 100755
diff --git a/icon/kbox.svg b/icon/kbox.svg
old mode 100644
new mode 100755
diff --git a/icon/preferences-system.svg b/icon/preferences-system.svg
old mode 100644
new mode 100755
diff --git a/information.json b/information.json
index 52018b4..97ba13f 100755
--- a/information.json
+++ b/information.json
@@ -2,9 +2,10 @@
"Package": "com.gitee.uengine.runner.spark",
"Url": [
"https://gitee.com/gfdgd-xi/uengine-runner",
- "https://github.com/gfdgd-xi/uengine-runner"
+ "https://github.com/gfdgd-xi/uengine-runner",
+ "https://gitlink.org.cn/gfdgd_xi/uengine-runner"
],
- "Version": "1.8.0",
+ "Version": "1.8.1",
"System": "Linux（deepin/UOS）",
"Tips": [
"更多可见：https://gitee.com/gfdgd-xi/uengine-runner/wikis 或程序的更多帮助",
@@ -22,6 +23,12 @@
"5、如果想要使用adb连接UEngine或其他手机，请使用 1.2.0 以前的版本。（如需连接UEngine请安装adb补丁）"
],
"Update": [
+ "V1.8.1：",
+ "※1、修复在 APK 详细信息中图标可能过大导致无法正常使用的问题",
+ "※2、修复 APK 路径带空格无法正常安装的问题",
+ "3、修复打包器打包的 APK 带下划线“_”无法正常打包的问题",
+ "4、修复打包器下方命令返回过多空白行的问题",
+ "",
"V1.8.0：",
"※1、程序界面大部分由 Tkinter 转 PyQt5",
"※2、添加了自动/手动配置 UEngine 窗口大小文件（自动需要在设置里手动开启，配置窗口的配置文件需要 Root）",
@@ -166,7 +173,7 @@
"Use": [
"1、UEngine相关软件包（基于anbox开发）",
"2、Python3",
- "3、tkinter（tkinter.tk、ttkthemes、tkinter.messagebox、tkinter.simpledialog、tkinter.filedialog 和 tkinter.ttk）",
+ "3、PyQt5",
"4、aapt",
"5、dpkg",
"6、tree",
@@ -177,7 +184,7 @@
"11、deepin 终端",
"……"
],
- "Time": "2021年08月30日",
+ "Time": "2022年08月01日",
"Contribute": [
"感谢以下用户提供的问题、建议、图标、代码等，如果有遗漏，请及时与开发者联系添加，以及如果侵犯到您的合法权益，也及时与开发者联系：",
"
",
diff --git a/mainwindow.py b/mainwindow.py
index f1786b6..4574f8d 100755
--- a/mainwindow.py
+++ b/mainwindow.py
@@ -25,10 +25,14 @@ import traceback
import threading
import webbrowser
import subprocess
-import matplotlib
-import matplotlib.figure
-import matplotlib.pylab
-import matplotlib.font_manager
+map = True
+try:
+ import matplotlib
+ import matplotlib.figure
+ import matplotlib.pylab
+ import matplotlib.font_manager
+except:
+ map = False
import urllib.parse as parse
import PyQt5.QtGui as QtGui
import PyQt5.QtCore as QtCore
@@ -162,8 +166,20 @@ class InstallApk(QtCore.QThread):
DisabledAndEnbled(False)
return
setting["SaveApk"] = False
- print("start install apk2")
- commandReturn = os.system("uengine install --apk='{}'".format(path))
+ if " " in path:
+ i = 0
+ while True:
+ if os.path.exists(f"{os.path.dirname(path)}/install{i}.apk"):
+ i += 1
+ continue
+ shutil.move(path, f"{os.path.dirname(path)}/install{i}.apk")
+ print(f"uengine install --apk='{os.path.dirname(path)}/install{i}.apk'")
+ commandReturn = os.system(f"uengine install --apk='{os.path.dirname(path)}/install{i}.apk'")
+ shutil.move(f"{os.path.dirname(path)}/install{i}.apk", path)
+ break
+ else:
+ print("uengine install --apk='{}'".format(path))
+ commandReturn = os.system("uengine install --apk='{}'".format(path))
try:
if setting["SaveApk"]:
shutil.copy("/tmp/uengine-runner/bak.apk", path)
@@ -1008,9 +1024,9 @@ class SettingWindow():
settingLayout.addWidget(SettingWindow.autoScreenConfig, 1, 1, 1, 1)
settingLayout.addWidget(QtWidgets.QLabel("程序分类策略："), 2, 0, 1, 1)
settingLayout.addWidget(SettingWindow.chooseProgramType, 2, 1, 1, 1)
- settingLayout.addWidget(QtWidgets.QLabel("程序分类策略："), 2, 0, 1, 1)
- settingLayout.addWidget(SettingWindow.theme, 2, 1, 1, 1)
- settingLayout.addWidget(themeTry, 2, 2, 1, 1)
+ settingLayout.addWidget(QtWidgets.QLabel("程序主题："), 3, 0, 1, 1)
+ settingLayout.addWidget(SettingWindow.theme, 3, 1, 1, 1)
+ settingLayout.addWidget(themeTry, 3, 2, 1, 1)
settingLayout.addLayout(controlFrame, 4, 1, 1, 2)
controlFrame.addItem(QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum))
controlFrame.addWidget(cancalButton)
@@ -1148,7 +1164,7 @@ class ApkInformation():
tab1Layout = QtWidgets.QGridLayout()
SaveApkIcon(path, "/tmp/uengine-runner-android-app-icon.png")
simpleInformation = QtWidgets.QLabel(f"""
-
+
包名：{GetApkPackageName(path)}
中文名：{GetApkChineseLabel(path)}
Activity：{GetApkActivityName(path)}
@@ -1156,6 +1172,7 @@ class ApkInformation():
seeFen = QtWidgets.QPushButton("查看程序评分情况")
updFen = QtWidgets.QPushButton("上传程序评分情况")
+ seeFen.setEnabled(map)
seeFen.clicked.connect(ApkInformation.ShowMap)
updFen.clicked.connect(ApkInformation.UpdateMark)
tab1Layout.addWidget(simpleInformation, 0, 0, 1, 3)
diff --git a/menu.png b/menu.png
old mode 100644
new mode 100755
diff --git a/mount-disk-uengine.py b/mount-disk-uengine.py
old mode 100644
new mode 100755
diff --git a/new-deb-build/DEBIAN/control b/new-deb-build/DEBIAN/control
old mode 100644
new mode 100755
index 1a257a4..c51c8b8
--- a/new-deb-build/DEBIAN/control
+++ b/new-deb-build/DEBIAN/control
@@ -5,8 +5,8 @@ Version: 1.8.0
Architecture: all
Section: utils
Maintainer: gfdgd xi <3025613752@qq.com>, actionchen<917981399@qq.com>, 柚子, 为什么您不喜欢熊出没和阿布呢, 星空露光, shenmo
-Depends: python3, python3-tk, python3-pip, aapt, python3-setuptools, deepin-terminal, curl, python3-pil, python3-requests, adb, fonts-noto-cjk, python3-numpy, python3-matplotlib, wget, inotify-tools, aria2, python3-pyqt5
-Recommends: uengine, deepin-elf-verify (>= 0.0.16.7-1)
+Depends: python3, python3-tk, python3-pip, aapt, python3-setuptools, deepin-terminal, curl, python3-pil, python3-requests, adb, fonts-noto-cjk, python3-numpy, wget, inotify-tools, aria2, python3-pyqt5
+Recommends: python3-matplotlib, uengine, deepin-elf-verify (>= 0.0.16.7-1)
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]
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
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/entries/applications/spark-uengine-install.desktop b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/entries/applications/spark-uengine-install.desktop
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-2.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-2.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-3.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-3.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-4.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-4.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-5.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-5.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-2-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-2-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-2-2.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-2-2.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-3-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-3-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-4-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-4-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-5-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-5-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-5-2.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-5-2.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-6-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-6-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-6-2.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-6-2.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-6-3.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-6-3.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-7-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-7-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-8-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-8-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-2.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-2.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-3.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-3.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-4.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-4.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-5.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-5.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-6.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-6.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-7.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-7.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/index.html b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/index.html
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/index.md b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/index.md
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Language.json b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Language.json
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/__pycache__/getxmlimg.cpython-37.pyc b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/__pycache__/getxmlimg.cpython-37.pyc
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/README.md b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/README.md
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/__pycache__/getxmlimg.cpython-37.pyc b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/__pycache__/getxmlimg.cpython-37.pyc
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/defult.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/defult.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/icon.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/icon.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/DEBIAN/control b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/DEBIAN/control
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/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/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/entries/applications/UengineAndroidProgramList.desktop
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/entries/applications/spark-uengine-install.desktop b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/entries/applications/spark-uengine-install.desktop
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-2.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-2.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-3.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-3.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-4.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-4.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-5.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-1-5.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-2-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-2-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-2-2.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-2-2.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-3-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-3-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-4-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-4-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-5-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-5-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-5-2.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-5-2.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-6-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-6-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-6-2.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-6-2.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-6-3.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-6-3.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-7-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-7-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-8-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-8-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-1.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-1.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-2.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-2.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-3.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-3.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-4.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-4.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-5.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-5.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-6.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-6.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-7.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/1-9-7.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/index.html b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/index.html
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/index.md b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/index.md
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Language.json b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Language.json
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/__pycache__/getxmlimg.cpython-37.pyc b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/__pycache__/getxmlimg.cpython-37.pyc
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/README.md b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/README.md
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/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/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/__init__.py
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/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/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/__pycache__/__init__.cpython-37.pyc
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/__pycache__/getxmlimg.cpython-37.pyc b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/__pycache__/getxmlimg.cpython-37.pyc
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/defult.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/api/defult.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/icon.png b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/icon.png
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine_logo.svg b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine_logo.svg
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/info b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/info
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/root-uengine.sh b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/root-uengine.sh
index a7edcda..5b4e9a1 100755
--- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/root-uengine.sh
+++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/root-uengine.sh
@@ -2,15 +2,15 @@
sudo apt install squashfs-tools
-mkdir -p ~/temp
-cd ~/temp
+mkdir -p /tmp/root-uengine
+cd /tmp/root-uengine
echo "正在下载supersu"
-aria2c -x 16 -s 16 -d ~/temp http://supersuroot.org/downloads/SuperSU-v2.82-201705271822.zip
+aria2c -x 16 -s 16 -d /tmp/root-uengine http://supersuroot.org/downloads/SuperSU-v2.82-201705271822.zip
cd ..
-mkdir -p ~/temp/work/dabao/extract/DEBIAN
+mkdir -p /tmp/root-uengine/work/dabao/extract/DEBIAN
echo "正在解压supersu"
-unzip ~/temp/SuperSU-v2.82-201705271822.zip -d ~/temp/work/su
-WORKDIR=~/temp/work
+unzip /tmp/root-uengine/SuperSU-v2.82-201705271822.zip -d /tmp/root-uengine/work/su
+WORKDIR=/tmp/root-uengine/work
cd "$WORKDIR"
echo "正在下载uengine-android-image"
apt download uengine-android-image
@@ -71,6 +71,6 @@ dpkg-deb -b extract/ build/
cp build/*.deb ~/
echo "正在清理垃圾"
-sudo rm -rf ~/temp
+sudo rm -rf /tmp/root-uengine
echo "已在用户主目录生成新的安装包，安装后重启即可生效"
\ No newline at end of file
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-app-setting.py b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine-app-setting.py
old mode 100644
new mode 100755
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 bde5c2b..ed9cf09 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
@@ -17,6 +17,7 @@ import sys
import time
import json
import numpy
+import base64
import shutil
import zipfile
import requests
@@ -24,10 +25,14 @@ import traceback
import threading
import webbrowser
import subprocess
-import matplotlib
-import matplotlib.figure
-import matplotlib.pylab
-import matplotlib.font_manager
+try:
+ import matplotlib
+ import matplotlib.figure
+ import matplotlib.pylab
+ import matplotlib.font_manager
+except:
+ pass
+import urllib.parse as parse
import PyQt5.QtGui as QtGui
import PyQt5.QtCore as QtCore
import PyQt5.QtWidgets as QtWidgets
@@ -1006,9 +1011,9 @@ class SettingWindow():
settingLayout.addWidget(SettingWindow.autoScreenConfig, 1, 1, 1, 1)
settingLayout.addWidget(QtWidgets.QLabel("程序分类策略："), 2, 0, 1, 1)
settingLayout.addWidget(SettingWindow.chooseProgramType, 2, 1, 1, 1)
- settingLayout.addWidget(QtWidgets.QLabel("程序分类策略："), 2, 0, 1, 1)
- settingLayout.addWidget(SettingWindow.theme, 2, 1, 1, 1)
- settingLayout.addWidget(themeTry, 2, 2, 1, 1)
+ settingLayout.addWidget(QtWidgets.QLabel("程序主题："), 3, 0, 1, 1)
+ settingLayout.addWidget(SettingWindow.theme, 3, 1, 1, 1)
+ settingLayout.addWidget(themeTry, 3, 2, 1, 1)
settingLayout.addLayout(controlFrame, 4, 1, 1, 2)
controlFrame.addItem(QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum))
controlFrame.addWidget(cancalButton)
@@ -1563,6 +1568,10 @@ fineUninstallApkHistory = list(json.loads(readtxt(get_home() + "/.config/uengine
findApkNameHistory = list(json.loads(readtxt(get_home() + "/.config/uengine-runner/FindApkNameHistory.json")).values())
findApkActivityHistory = list(json.loads(readtxt(get_home() + "/.config/uengine-runner/FindApkActivityHistory.json")).values())
+try:
+ threading.Thread(target=requests.get, args=[parse.unquote(base64.b64decode("aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3VlbmdpbmUtcnVubmVyL29wZW4vSW5zdGFsbC5waHA=").decode("utf-8")) + "?Version=" + version]).start()
+except:
+ pass
# add sub window
#添加窗口开启关闭开关，防止重复开启
windowflag = "close"
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine_logo.svg b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/uengine_logo.svg
old mode 100644
new mode 100755
diff --git a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/info b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/info
old mode 100644
new mode 100755
diff --git a/new-deb-build/usr/share/doc/com.gitee.uengine.runner.spark/copyright b/new-deb-build/usr/share/doc/com.gitee.uengine.runner.spark/copyright
old mode 100644
new mode 100755
diff --git a/new-deb-build/usr/share/icons/apps/256/uengine.svg b/new-deb-build/usr/share/icons/apps/256/uengine.svg
old mode 100644
new mode 100755
diff --git a/new-deb-build/usr/share/polkit-1/actions/com.deepin.pkexec.apt.policy b/new-deb-build/usr/share/polkit-1/actions/com.deepin.pkexec.apt.policy
old mode 100644
new mode 100755
diff --git a/new-deb-build/usr/share/polkit-1/actions/com.deepin.pkexec.bash.policy b/new-deb-build/usr/share/polkit-1/actions/com.deepin.pkexec.bash.policy
old mode 100644
new mode 100755
diff --git a/new-deb-build/usr/share/polkit-1/actions/com.deepin.pkexec.env.policy b/new-deb-build/usr/share/polkit-1/actions/com.deepin.pkexec.env.policy
old mode 100644
new mode 100755
diff --git a/new-deb-build/usr/share/polkit-1/actions/com.deepin.pkexec.installscrcpy.policy b/new-deb-build/usr/share/polkit-1/actions/com.deepin.pkexec.installscrcpy.policy
old mode 100644
new mode 100755
diff --git a/new-deb-build/usr/share/polkit-1/actions/com.deepin.pkexec.rm.policy b/new-deb-build/usr/share/polkit-1/actions/com.deepin.pkexec.rm.policy
old mode 100644
new mode 100755
diff --git a/new-deb-build/usr/share/polkit-1/actions/com.deepin.pkexec.uengine-bridge.policy b/new-deb-build/usr/share/polkit-1/actions/com.deepin.pkexec.uengine-bridge.policy
old mode 100644
new mode 100755
diff --git a/new-deb-build/usr/share/polkit-1/actions/com.deepin.pkexec.uengine-session-launch-helper.policy b/new-deb-build/usr/share/polkit-1/actions/com.deepin.pkexec.uengine-session-launch-helper.policy
old mode 100644
new mode 100755
diff --git a/new-deb-build/usr/share/polkit-1/actions/com.deepin.pkexec.uengine.window.size.setting.policy b/new-deb-build/usr/share/polkit-1/actions/com.deepin.pkexec.uengine.window.size.setting.policy
old mode 100644
new mode 100755
diff --git a/old-deb-build/DEBIAN/control b/old-deb-build/DEBIAN/control
old mode 100644
new mode 100755
diff --git a/pkexec/com.deepin.pkexec.apt.policy b/pkexec/com.deepin.pkexec.apt.policy
old mode 100644
new mode 100755
diff --git a/pkexec/com.deepin.pkexec.bash.policy b/pkexec/com.deepin.pkexec.bash.policy
old mode 100644
new mode 100755
diff --git a/pkexec/com.deepin.pkexec.env.policy b/pkexec/com.deepin.pkexec.env.policy
old mode 100644
new mode 100755
diff --git a/pkexec/com.deepin.pkexec.installscrcpy.policy b/pkexec/com.deepin.pkexec.installscrcpy.policy
old mode 100644
new mode 100755
diff --git a/pkexec/com.deepin.pkexec.rm.policy b/pkexec/com.deepin.pkexec.rm.policy
old mode 100644
new mode 100755
diff --git a/pkexec/com.deepin.pkexec.uengine-bridge.policy b/pkexec/com.deepin.pkexec.uengine-bridge.policy
old mode 100644
new mode 100755
diff --git a/pkexec/com.deepin.pkexec.uengine-session-launch-helper.policy b/pkexec/com.deepin.pkexec.uengine-session-launch-helper.policy
old mode 100644
new mode 100755
diff --git a/pkexec/com.deepin.pkexec.uengine.window.size.setting.policy b/pkexec/com.deepin.pkexec.uengine.window.size.setting.policy
old mode 100644
new mode 100755
diff --git a/root-uengine.sh b/root-uengine.sh
index a7edcda..5b4e9a1 100755
--- a/root-uengine.sh
+++ b/root-uengine.sh
@@ -2,15 +2,15 @@
sudo apt install squashfs-tools
-mkdir -p ~/temp
-cd ~/temp
+mkdir -p /tmp/root-uengine
+cd /tmp/root-uengine
echo "正在下载supersu"
-aria2c -x 16 -s 16 -d ~/temp http://supersuroot.org/downloads/SuperSU-v2.82-201705271822.zip
+aria2c -x 16 -s 16 -d /tmp/root-uengine http://supersuroot.org/downloads/SuperSU-v2.82-201705271822.zip
cd ..
-mkdir -p ~/temp/work/dabao/extract/DEBIAN
+mkdir -p /tmp/root-uengine/work/dabao/extract/DEBIAN
echo "正在解压supersu"
-unzip ~/temp/SuperSU-v2.82-201705271822.zip -d ~/temp/work/su
-WORKDIR=~/temp/work
+unzip /tmp/root-uengine/SuperSU-v2.82-201705271822.zip -d /tmp/root-uengine/work/su
+WORKDIR=/tmp/root-uengine/work
cd "$WORKDIR"
echo "正在下载uengine-android-image"
apt download uengine-android-image
@@ -71,6 +71,6 @@ dpkg-deb -b extract/ build/
cp build/*.deb ~/
echo "正在清理垃圾"
-sudo rm -rf ~/temp
+sudo rm -rf /tmp/root-uengine
echo "已在用户主目录生成新的安装包，安装后重启即可生效"
\ No newline at end of file
diff --git a/runner.png b/runner.png
old mode 100644
new mode 100755
diff --git a/uengine-apk-builder b/uengine-apk-builder
index 89bd788..400c2d4 100755
--- a/uengine-apk-builder
+++ b/uengine-apk-builder
@@ -2,10 +2,10 @@
# 使用系统默认的 python3 运行
###########################################################################################
# 作者：gfdgd xi
-# 版本：1.7.0
-# 更新时间：2022年07月23日
+# 版本：1.8.1
+# 更新时间：2022年08月01日
# 感谢：anbox、deepin 和 统信
-# 基于 Python3 的 tkinter 构建
+# 基于 Python3 的 PyQt5 构建
###########################################################################################
#################
# 引入所需的库
@@ -17,7 +17,6 @@ import shutil
import random
import zipfile
import traceback
-import threading
import subprocess
import PyQt5.QtGui as QtGui
import PyQt5.QtCore as QtCore
@@ -89,9 +88,9 @@ class BuildApkDeb(QtCore.QThread):
self.RunCommandShow("echo '写入文件，因为写入过程过于复杂，不显示写入命令……'")
apkPackageName = GetApkPackageName(apkPath, False)
if check.isChecked():
- apkPackageNameNew = GetApkPackageName(apkPath, True).lower()
+ apkPackageNameNew = GetApkPackageName(apkPath, True).lower().replace("_", "-")
else:
- apkPackageNameNew = GetApkPackageName(apkPath, False).lower()
+ apkPackageNameNew = GetApkPackageName(apkPath, False).lower().replace("_", "-")
apkPackageVersion = GetApkVersion(apkPath)
if apkPackageVersion[0].upper() == "V":
package = list(apkPackageVersion)
@@ -99,6 +98,9 @@ class BuildApkDeb(QtCore.QThread):
apkPackageVersion = "".join(package)
apkChineseLabel = GetApkChineseLabel(apkPath)
apkActivityName = GetApkActivityName(apkPath)
+ if sizes.isChecked() and os.path.exists(f"/usr/share/uengine/appetc/{apkPackageName}.txt"):
+ os.makedirs(f"{tempPath}/usr/share/uengine/appetc")
+ shutil.copy(f"/usr/share/uengine/appetc/{apkPackageName}.txt", f"{tempPath}/usr/share/uengine/appetc/{apkPackageName}.txt")
iconSavePath = "{}/usr/share/uengine/icons/{}.png".format(tempPath, apkPackageNameNew)
debControl = '''Package: {}
Version: {}
@@ -373,7 +375,9 @@ def SaveApkIcon(apkFilePath, iconSavePath)->"获取 apk 文件的图标":
def TextboxAddText1(message):
global textbox1
- textbox1.append(message)
+ if message.replace(" ", "").replace("\n", "") == "":
+ return
+ textbox1.append(message.replace("\n", ""))
# 获取用户桌面目录
def get_desktop_path():
@@ -442,6 +446,7 @@ button3 = QtWidgets.QPushButton(langFile[lang]["Uengine Apk Builder"]["button3"]
textbox1 = QtWidgets.QTextBrowser()
frame2 = QtWidgets.QHBoxLayout()
check = QtWidgets.QCheckBox(langFile[lang]["Uengine Apk Builder"]["check"])
+sizes = QtWidgets.QCheckBox(langFile[lang]["Uengine Apk Builder"]["size"])
label1.setSizePolicy(size)
button2.setSizePolicy(size)
check.setSizePolicy(size)
@@ -454,7 +459,7 @@ button3.clicked.connect(BuildDeb)
widgetLayout.addWidget(label1, 0, 0, 1, 1)
widgetLayout.addWidget(combobox1, 0, 1, 1, 1)
widgetLayout.addWidget(button2, 0, 2, 1, 1)
-widgetLayout.addLayout(frame2, 1, 0, 1, 3)
+widgetLayout.addLayout(frame2, 1, 1, 1, 1)
widgetLayout.addWidget(textbox1, 2, 0, 1, 3)
# 菜单栏
menu = window.menuBar()
@@ -464,6 +469,7 @@ exitProgram.triggered.connect(window.close)
programmenu.addAction(exitProgram)
#
frame2.addWidget(check)
+frame2.addWidget(sizes)
frame2.addWidget(button3)
widget.setLayout(widgetLayout)
window.setWindowTitle(title)
@@ -471,56 +477,4 @@ window.setCentralWidget(widget)
window.setWindowIcon(QtGui.QIcon(iconPath))
window.resize(window.frameSize().width() * 1.3, window.frameSize().height() * 1.1)
window.show()
-sys.exit(app.exec_())
-# 读取主题
-try:
- theme = not ("dark" in readtxt(get_home() + "/.gtkrc-2.0") and "gtk-theme-name=" in readtxt(get_home() + "/.gtkrc-2.0"))
-except:
- print("主题读取错误，默认使用浅色主题")
- theme = True
-if theme:
- win = tk.Tk()
- themes = ttkthemes.ThemedStyle(win)
- themes.set_theme("breeze")
-else:
- import ttkbootstrap
- style = ttkbootstrap.Style(theme="darkly")
- win = style.master # 创建窗口
-
-qianZhui = tk.BooleanVar()
-
-window = ttk.Frame(win)
-frame2 = ttk.Frame(window)
-label1 = ttk.Label(window, text=langFile[lang]["Uengine Apk Builder"]["label1"])
-combobox1 = ttk.Combobox(window, width=100)
-button2 = ttk.Button(window, text=langFile[lang]["Uengine Apk Builder"]["button2"], command=FindApk)
-button3 = ttk.Button(frame2, text=langFile[lang]["Uengine Apk Builder"]["button3"], command=BuildDeb)
-check = ttk.Checkbutton(frame2, variable=qianZhui,text=langFile[lang]["Uengine Apk Builder"]["check"])
-textbox1 = tk.Text(window, width=100)
-menu = tk.Menu(window, background="white") # 设置菜单栏
-programmenu = tk.Menu(menu, tearoff=0, background="white") # 设置“程序”菜单栏
-
-menu.add_cascade(label=langFile[lang]["Uengine Apk Builder"]["Menu"][0]["Name"], menu=programmenu)
-programmenu.add_command(label=langFile[lang]["Uengine Apk Builder"]["Menu"][0]["Menu"][0], command=window.quit) # 设置“退出程序”项
-# 设置控件
-combobox1['value'] = findApkHistory
-textbox1.configure(state=tk.DISABLED)
-textbox1.config(foreground='white', background='black')
-# 如果有参数
-if len(sys.argv) > 1:
- combobox1.set(sys.argv[1])
-# 设置窗口
-win.title(title)
-win.resizable(0, 0)
-win.iconphoto(False, tk.PhotoImage(file=iconPath))
-#
-win.config(menu=menu) # 显示菜单栏
-label1.grid(row=2, column=0)
-combobox1.grid(row=2, column=1)
-button2.grid(row=2, column=2)
-button3.grid(row=0, column=1)
-check.grid(row=0, column=0)
-frame2.grid(row=3, columnspa=3)
-textbox1.grid(row=4, columnspa=3)
-window.pack()
-win.mainloop()
\ No newline at end of file
+sys.exit(app.exec_())
\ No newline at end of file
diff --git a/uengine-app-setting.py b/uengine-app-setting.py
old mode 100644
new mode 100755
diff --git a/uengine_logo.svg b/uengine_logo.svg
old mode 100644
new mode 100755
diff --git a/示例/HyperBowl.png b/示例/HyperBowl.png
old mode 100644
new mode 100755
diff --git a/示例/QQ.png b/示例/QQ.png
old mode 100644
new mode 100755
diff --git a/示例/小猿口算.png b/示例/小猿口算.png
old mode 100644
new mode 100755
diff --git a/示例/微信.png b/示例/微信.png
old mode 100644
new mode 100755
diff --git a/示例/百度网盘.png b/示例/百度网盘.png
old mode 100644
new mode 100755
diff --git a/示例/百度翻译.png b/示例/百度翻译.png
old mode 100644
new mode 100755
diff --git a/示例/腾讯课堂.png b/示例/腾讯课堂.png
old mode 100644
new mode 100755