新建文件夹AXVM

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()
+sys.exit(app.exec_())