初步添加打包器

1.3.3初步
添加deepin打包格式的deb包目录
2021-08-19 08:49:50 +08:00 · 2021-08-18 21:54:28 +08:00 · 2021-08-18 16:02:07 +08:00 · 2021-08-18 15:14:40 +08:00 · 2021-08-16 09:35:08 +08:00 · 2021-08-16 07:40:30 +08:00
45 changed files with 3431 additions and 325 deletions
--- a/373
+++ b/373
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
--- a/README.md
+++ b/README.md
@@ -1,86 +1,155 @@
-# 我图标的获取有问题,继续深造去了（为什么图标是xml）,可以使用其他替代品,链接:https://bbs.deepin.org/zh/post/222874
+# uengine 运行器 1.3.2

-# uengine 运行器 1.2.1
+### 介绍
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;新版本Deepin/UOS发布后，可以在应用商店安装部分官方已适配的安卓应用，对爱好者来说，不能自己安装APK软件包始终差点意思，本程序可以为Deepin/UOS上的Uengine安卓运行环境安装自定义APK软件包，并能发送安装的APK包启动菜单到桌面或系统菜单。  
+![主界面](https://storage.deepin.org/thread/202108152141139401_截图_选择区域_20210815213948.png)  
+（测试平台：UOS 家庭版，deepin 20.2.2,UOS 专业版 1040）   
+（自己美术功底太差，图标直接用 anbox 的了）   

-#### 介绍
+### 更新内容

-使用 Python3 的 tkinter 构建
+#### V1.3.2：
+**※1、支持uengine数据重置;**  
+**※2、支持修改uengine网络桥接的启动状态;**  
+**※3、支持右键安装/卸载;**  
+**※4、支持启用或禁用uengine;**  
+**※5、修复打包问题，不会出现“dpkg:警告:卸载spark-uengine-runner时，目录/opt/apps/uengine-runner非空，因而不会删除该目录”的错误;**  
+![1.3.2](https://storage.deepin.org/thread/202108152141139401_截图_选择区域_20210815213948.png)  

-（测试平台：UOS 家庭版，deepin 20.2.2 待测试）
+#### V1.3.1：
+**※1、修复打包问题，防止部分用户安装出错的问题;**  
+**※2、修复了程序无法提取图标时可以提取默认图标使用;**  
+![1.3.1](https://storage.deepin.org/thread/202108121509217807_截图_选择区域_20210812150849.png)

-（自己美术功底太差，图标直接用 anbox 的了）
+#### V1.3.0：  
+**※1、修改了界面布局;**  
+**※2、修复大多数新安装普通用户的路图标及启动菜单文件路径不存在导致安装APK报错的bugs;**  
+3、删除少量冗余代码，调整代码顺序;   
+4、支持提取 apk 图标。   
+![1.3.0](https://storage.deepin.org/thread/202108082100582804_截图_tk_20210808210047.png)

-#### 软件架构
-i386 和 amd64
+#### V1.2.3：  
+1、调整部分控件名称；  
+2、调整界面布局及界面风格；  
+![1.2.3](https://images.gitee.com/uploads/images/2021/0802/080620_1dd289ca_7896131.png)

-#### 更新内容
+#### V1.2.2：  
+1、对程序错误的显示更加人性化；  
+2、对 icon 的获取方式进行了升级；  
+3、增加了注释、删除部分冗余代码。  
+![1.2.2](https://images.gitee.com/uploads/images/2021/0711/145140_b04e51b7_7896131.png)

-1.2.1更新内容：
+#### V1.2.1：  
+**※1、进行了安装方式的修改（不使用 adb），修复原无法安装和卸载的问题；**  
+2、进行了部分优化；  
+3、进行了功能缩水；  
+4、修复 deb 打包错误。  
+![1.2.1](https://images.gitee.com/uploads/images/2021/0702/204040_6abb6f3f_7896131.png)

-※1、进行了安装方式的修改（不使用 adb），修复原无法安装和卸载的问题；
-
-2、进行了部分优化；
-
-3、进行了功能缩水；
-
-4、修复 deb 打包错误。
-
-1.2.0更新内容：
-
-1、支持安装自动添加快捷方式、卸载删除快捷方式；
-
-2、支持使用包名或 APK 文件卸载程序；
-
-3、支持查看安装的所有包名；
-
-4、进行了部分优化
-
-
-#### 源码安装教程
+#### V1.2.0：  
+1、支持安装自动添加快捷方式、卸载删除快捷方式；  
+2、支持使用包名或 APK 文件卸载程序；  
+3、支持查看安装的所有包名；  
+4、进行了部分优化  
+![1.2.0](https://images.gitee.com/uploads/images/2021/0606/115536_0c0ddf38_7896131.png) 

+### 源码安装教程
+按下 <kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>T</kbd> 打开终端，按以下内容操作：
 1.  安装所需依赖

-```
+```bash
 sudo apt install python3 python3-tk git python3-pip aapt uengine
-pip3 install pillow
-pip3 install ttkthemes
-pip3 install pillow -U
-pip3 install ttkthemes -U
+python3 -m pip install ttkthemes
 ```

 2.  下载本程序

-```
+```bash
 git clone https://gitee.com/gfdgd-xi/uengine-runner.git
 ```

 3.  运行本程序

-```
-sudo cp uengine-runner /opt/apps -rv
+```bash
+sudo mkdir /opt/apps/uengine-runner
+sudo cp uengine-runner /opt/apps/uengine-runner -rv
+sudo cp getxmlimg.py /opt/apps/uengine-runner -rv
+sudo cp icon.png /opt/apps/uengine-runner -rv
 chmod 777 /opt/apps/uengine-runner/main.py
 sudo cp /opt/apps/uengine-runner/main.py /usr/bin/uengine-runner
 ./main.py
 ```

 4.  卸载本程序
-```
+```bash
 sudo rm /usr/bin/uengine-runner -v
 sudo rm /opt/apps/uengine-runner/ -rfv
-pip3 uninstall pillow
 pip3 uninstall ttkthemes
 ```

-#### 使用说明
+### 使用说明
+1、需要你有使用 root 权限的能力；  
+2、需要安装 uengine 才能使用，UOS建议在商店安装一个安卓应用，让系统自动安装uengine及相关的依赖包；  
+3、提取 apk 图标的 apk 路径以“安装 apk”那栏为准;  
+4、如果报错是有关产生 .deksotp 文件有关，一般可以打开程序列表运行。如果想要连接其他手机，请使用 1.2.0 以前的版本，可以使用 adb 连接。  

-提示：
-1、需要你有使用 root 权限的能力；
+### 故障排除
+提 issue 最好，当然有些问题自己无法解决，请大佬 push 一下
+如果出现故障，尝试终端运行，如果是可以自行解决的问题，就**自行解决**，如果可以就**提 issues 并提供解决方案**，不行就**提 isscue 并提供程序和终端报错以及程序版本**

-2、需要安装 uengine 才能使用。
+### 下载量
+这里只统计蓝奏云的下载量，链接（每周更新一次）：  
+[https://kdocs.cn/l/smrvazWGuKcY](https://kdocs.cn/l/smrvazWGuKcY)  

-如果想要连接其他手机，请使用 1.2.0 以前的版本，可以使用 adb 连接。
+### 已知问题
+![Error](https://storage.deepin.org/thread/202108101105396531_截图___tk__messagebox_20210810110449.png)
+部分 app 无法读取出图片，已知：
+| 程序 | 下载链接 |
+| :-: | :-: |
+| Firefox For Android | https://www.firefox.com.cn/download/ |
+| 网易云音乐 For Android | https://music.163.com/#/download |
+| 抖音 | https://www.wandoujia.com/apps/7461948 |
+| 360 手机浏览器 | https://mse.360.cn/ |
+| E-Go | 忘了 |
+| 其他待测试…… | 其他待测试…… |
+**注意：提取不出图标不代表未安装成功！**


-#### 特技
+### 贡献
+我非常欢迎大家的贡献  
+有通过贡献的开发者列表：  
+| 开发者 | 邮箱 |
+| :-: | :-: |
+| gfdgd xi | 3025613752@qq.com |
+| actionchen | 917981399@qq.com |

-……
+### 相关项目  
+| 项目名称 | 项目地址 |
+|   :-:  |      :-:|
+| uengine-installer | https://gitee.com/Maicss/uengine-installer |  
+| uengine APK 打包器 | https://gitee.com/gfdgd-xi/uengine-apk-builder |
+
+### 附测试生成图标无问题列表：
+**至于能不能用就不测试了，这暂时不是重点**
+| 程序 | 下载链接 |
+|:-:|:-:|
+| QQ 全家桶（完整版、极速版、Android Pad 版） | https://im.qq.com |
+| TIM | 忘了 |
+| 微信 | https://weixin.qq.com |
+| 百度翻译 | 忘了 |
+| 百度网盘 | https://pan.baidu.com |
+| 腾讯课堂 | 忘了 |
+| 抖音极速版 | 忘了 |
+| 豌豆荚 | 忘了 |
+| 小猿口算 | 忘了 |
+| Hyperbowl | 忘了 |
+| bilibili | https://d.bilibili.com/download_app.html?bsource=app_bili |
+| 蓝奏云 | https://up.woozooo.com/lanzouh5.apk |
+| QQ 音乐（完整版、Android Pad 版、TV 版、车载版） | https://y.qq.com/download/index.html |
+| 360 手机卫士（完整版、极速版） | https://shouji.360.cn/v6/index.html |
+| 360 清理大师（稳定版、尝鲜版） | http://shouji.360.cn/360cleandroid/ |
+| 360 手机助手 | http://sj.360.cn/index.html |
+| WPS Office For Android | https://www.wps.cn/ |
+| 钉钉 for android | https://page.dingtalk.com/wow/dingtalk/act/download?spm=a3140.8196062.0.0.6f4c5c3dWBhYUM |
+
+### ©2021-2021
--- a/pycache/getxmlimg.cpython-37.pyc
+++ b/pycache/getxmlimg.cpython-37.pyc
--- a/build/DEBIAN/control
+++ b/build/DEBIAN/control
@@ -1,9 +1,10 @@
 Package: spark-uengine-runner
-Version: 1.2.3
-Maintainer: gfdgd xi <3025613752@qq.com>
-Homepage: https://gitee.com/gfdgd-xi/uengine-runner
+Version: 1.3.2
+Maintainer: gfdgd xi <3025613752@qq.com>, actionchen<917981399@qq.com>
+Homepage: [https://gitee.com/gfdgd-xi/uengine-runner, https://github.com/gfdgd-xi/uengine-runner]
 Architecture: all
 Priority: optional
-Depends: python3, python3-tk, python3-pip, aapt, uengine, python3-pil, python3-pil.imagetk
-Description: gfdgd xi make's uengine runner
+Conflicts: com.gitee.uengine.runner.spark
+Depends: python3, python3-tk, python3-pip, aapt, uengine, python3-pil, python3-setuptools
+Description: uengine runner for deepin and UOS

--- a/build/DEBIAN/postinst
+++ b/build/DEBIAN/postinst
@@ -1,4 +1,2 @@
-# !/bin/sh 
-# python3 -m pip install --upgrade pillow
-# 依赖已经有设置，可以舍去
+#!/bin/sh 
 python3 -m pip install --upgrade ttkthemes
--- a/build/opt/apps/uengine-runner/README.md
+++ b/build/opt/apps/uengine-runner/README.md
@@ -1,46 +0,0 @@
-# uengine 运行器
-
-#### 介绍
-
-使用 Python3 的 tkinter 构建
-
-（测试平台：UOS 家庭版）
-
-（自己美术功底太差，图标直接用 anbox 的了）
-
-#### 软件架构
-i386 和 amd64
-
-
-#### 源码安装教程
-
-1.  安装所需依赖
-
-```
-sudo apt install python3 python3-tk git adb
-```
-
-2.  下载本程序
-
-```
-git clone https://gitee.com/gfdgd-xi/uengine-runner.git
-```
-
-3.  运行本程序
-
-```
-cd uengine-runner
-chmod 777 main.py
-./main.py
-```
-
-
-#### 使用说明
-
-提示：
-
-None
-
-
-#### 特技
-
--- a/build/opt/apps/uengine-runner/UengineAndroidProgramList.desktop
+++ b/build/opt/apps/uengine-runner/UengineAndroidProgramList.desktop
--- a/build/opt/apps/uengine-runner/pycache/getxmlimg.cpython-37.pyc
+++ b/build/opt/apps/uengine-runner/pycache/getxmlimg.cpython-37.pyc
--- a/build/opt/apps/uengine-runner/defult.png
+++ b/build/opt/apps/uengine-runner/defult.png
--- a/build/opt/apps/uengine-runner/getxmlimg.py
+++ b/build/opt/apps/uengine-runner/getxmlimg.py
@@ -0,0 +1,115 @@
+import PIL.Image as Image
+import PIL.ImageDraw as ImageDraw
+import zipfile
+import subprocess
+import re
+
+class getsavexml():
+
+    def savexml(self,apkFilePath,xmlpath,iconSavePath):
+        cmddumpid = "aapt dump xmltree "+ apkFilePath + " " + xmlpath
+        print(cmddumpid)
+        xmltree =  subprocess.getoutput(cmddumpid)
+        xmls = xmltree.splitlines()
+        # find strs ,print next line
+        def FindStrs(lines,strs):
+            i=0
+            while i < len(lines):
+                if re.search(strs,lines[i]):
+                    tmpstr = lines[i+1]
+                    i += 1
+                    Resultstr = tmpstr.split(":")[-1].split("=")[-1].split("0x")[-1] 
+                    return Resultstr
+                else:
+                    i += 1
+        #从apk的信息中获取前后景图片的ID号
+        backimgid =  FindStrs(xmls,"background")
+        foreimgid =  FindStrs(xmls,"foreground")
+        print(backimgid)
+        print(foreimgid)
+
+        # 直接从apk resource文件获取前后两层图片路径及ID字符串
+        resource =  subprocess.getoutput("aapt dump --values resources " +  apkFilePath + "| grep -iE -A1 " +  "\"" + backimgid + "|" + foreimgid + "\"")
+        resourcelines = resource.splitlines()
+        print(resourcelines)
+
+        # 从过滤出的字符串中获取所有相同ID的图片路径
+        def Findpicpath(lines,imgid):
+            i=0
+            Resultstr = []
+            while i < len(lines):
+                if re.search(imgid,lines[i]) and re.search("string8",lines[i+1]) :
+                    print(lines[i+1])
+                    tmpstr = lines[i+1].replace("\"","")
+                    i += 1 
+                    Resultstr.append(tmpstr.split()[-1])
+                else:
+                    i += 1
+            return Resultstr
+
+        #获取所有带前后图片ID的图片路径（相同背景或者前景的图片ID但分辨率不一样）
+        backimgs =  Findpicpath(resourcelines,backimgid)
+        foreimgs =  Findpicpath(resourcelines,foreimgid)
+
+        #获取分辨率最高的图片路径
+        def getmaxsize(imgs):
+            j = 0
+            size=(0,0)
+            zipapk = zipfile.ZipFile(apkFilePath)
+            while j < len(imgs):
+                img = Image.open(zipapk.open(imgs[j]))
+                print(imgs[j])
+                print(img.size)
+                if size < img.size:
+                    size = img.size
+                    imgpath = imgs[j]
+                j += 1
+            return imgpath
+
+        # 获取到文件列表后，进行比较分辨率，选取分辨率最高的张图片
+        iconbackpath = getmaxsize(backimgs)
+        iconforepath = getmaxsize(foreimgs)
+        print(iconbackpath + " " + iconforepath)
+
+        #从APK文件获取最终图片
+        zipapk = zipfile.ZipFile(apkFilePath)
+        iconback = zipapk.open(iconbackpath)
+        iconfore = zipapk.open(iconforepath)
+
+
+        # 叠加图片，mask 设置前景为蒙版
+        iconbackimg =  Image.open(iconback).convert("RGBA")
+        iconforeimg =  Image.open(iconfore).convert("RGBA")
+        iconbackimg.paste(iconforeimg,mask=iconforeimg)
+
+
+        # 圆角图片函数，网上拷贝的
+        def circle_corner(img, radii):  #把原图片变成圆角，这个函数是从网上找的，原址 https://www.pyget.cn/p/185266
+            """
+            圆角处理
+            :param img: 源图象。
+            :param radii: 半径，如：30。
+            :return: 返回一个圆角处理后的图象。
+            """
+            # 画圆（用于分离4个角）
+            circle = Image.new('L', (radii * 2, radii * 2), 0)  # 创建一个黑色背景的画布
+            draw = ImageDraw.Draw(circle)
+            draw.ellipse((0, 0, radii * 2, radii * 2), fill=255)  # 画白色圆形
+            # 原图
+            img = img.convert("RGBA")
+            w, h = img.size
+            # 画4个角（将整圆分离为4个部分）
+            alpha = Image.new('L', img.size, 255)
+            alpha.paste(circle.crop((0, 0, radii, radii)), (0, 0))  # 左上角
+            alpha.paste(circle.crop((radii, 0, radii * 2, radii)), (w - radii, 0))  # 右上角
+            alpha.paste(circle.crop((radii, radii, radii * 2, radii * 2)), (w - radii, h - radii))  # 右下角
+            alpha.paste(circle.crop((0, radii, radii, radii * 2)), (0, h - radii))  # 左下角
+            # alpha.show()
+            img.putalpha(alpha)  # 白色区域透明可见，黑色区域不可见
+            return img
+
+        #  圆角半径1/8边长,保存icon图片
+        w,h = iconbackimg.size
+        iconimg = circle_corner(iconbackimg,int(w/8))
+        iconimg.save(iconSavePath)
+
--- a/build/opt/apps/uengine-runner/icon.png
+++ b/build/opt/apps/uengine-runner/icon.png
--- a/build/opt/apps/uengine-runner/uengine-runner
+++ b/build/opt/apps/uengine-runner/uengine-runner
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 # 使用系统默认的 python3 运行
 ###########################################################################################
-# 作者：gfdgd xi
-# 版本：1.2.3
-# 更新时间：2021年8月2日
+# 作者：gfdgd xi<3025613752@qq.com>
+# 版本：1.3.2
+# 更新时间：2021年8月15日
 # 感谢：anbox、deepin 和 UOS
 # 基于 Python3 的 tkinter 构建
+# 更新：actionchen<917981399@qq.com>
 ###########################################################################################
 #################
 # 引入所需的库
@@ -18,15 +19,15 @@ import shutil
 import zipfile
 import traceback
 import threading
+import ttkthemes
 import webbrowser
 import subprocess
-import ttkthemes
 import tkinter as tk
 import tkinter.ttk as ttk
 import tkinter.messagebox as messagebox
 import tkinter.filedialog as filedialog
-import PIL.Image as Image
-import PIL.ImageTk as ImageTk
+from getxmlimg import getsavexml
+from tkinter.constants import TOP

 # 卸载程序
 def UninstallProgram(package: "apk 包名")->"卸载程序":
@@ -37,70 +38,89 @@ def UninstallProgram(package: "apk 包名")->"卸载程序":
            os.remove("{}/.local/share/applications/{}.desktop".format(get_home(), package))
        if os.path.exists("{}/{}.desktop".format(get_desktop_path(), package)):
            os.remove("{}/{}.desktop".format(get_desktop_path(), package))
-        fineUninstallApkHistory.append(combobox3.get())
-        combobox3['value'] = fineUninstallApkHistory
+        fineUninstallApkHistory.append(ComboUninstallPath.get())
+        ComboUninstallPath['value'] = fineUninstallApkHistory
        write_txt(get_home() + "/.config/uengine-runner/FindUninstallApkHistory.json", str(json.dumps(ListToDictionary(fineUninstallApkHistory))))  # 将历史记录的数组转换为字典并写入
        return Return
    except:
        traceback.print_exc()
        messagebox.showerror(title="错误", message=traceback.format_exc())

-def ButtonClick7():
+def BtnFindUninstallApkClk():
    path = filedialog.askopenfilename(title="选择 Apk", filetypes=[("APK 文件", "*.apk"), ("所有文件", "*.*")], initialdir=json.loads(readtxt(get_home() + "/.config/uengine-runner/FindUninstallApk.json"))["path"])
    if path != "" and path != "()":
        try:
-            combobox3.set(path)
+            ComboUninstallPath.set(path)
            write_txt(get_home() + "/.config/uengine-runner/FindUninstallApk.json", json.dumps({"path": os.path.dirname(path)}))  # 写入配置文件
        except:
            pass

 def ButtonClick8():
-    if combobox3.get() is "":
+    if ComboUninstallPath.get() is "":
        messagebox.showerror(title="提示", message="信息没有填写完整，无法继续卸载 APK")
        return
    DisabledAndEnbled(True)
-    if os.path.exists(combobox3.get()):
-        path = GetApkPackageName(combobox3.get())
+    if os.path.exists(ComboUninstallPath.get()):
+        path = GetApkPackageName(ComboUninstallPath.get())
    else:
-        path = combobox3.get()
+        path = ComboUninstallPath.get()
    UninstallProgram(path)
    messagebox.showinfo(message="操作执行完毕！", title="提示")
    DisabledAndEnbled(False)

 # 浏览窗口
+# temp strs
+temppath=""
 def FindApk()->"浏览窗口":
    path = filedialog.askopenfilename(title="选择 Apk", filetypes=[("APK 文件", "*.apk"), ("所有文件", "*.*")], initialdir=json.loads(readtxt(get_home() + "/.config/uengine-runner/FindApk.json"))["path"])
+    global temppath    
+    temppath = path
+    print("apk path is find:" + path)
    if path != "" and path != "()":
        try:
-            combobox1.set(path)
+            ComboInstallPath.set(path)
            write_txt(get_home() + "/.config/uengine-runner/FindApk.json", json.dumps({"path": os.path.dirname(path)}))  # 写入配置文件
        except:
            pass

 def Button3Install():
-    if combobox1.get() is "":
+    if ComboInstallPath.get() is "":
        messagebox.showerror(title="提示", message="信息没有填写完整，无法继续安装 APK")
        return
    DisabledAndEnbled(True)
-    threading.Thread(target=InstallApk, args=(combobox1.get(),)).start()
+    threading.Thread(target=InstallApk, args=(ComboInstallPath.get(),)).start()

 # 安装应用
 def InstallApk(path: "apk 路径", quit: "是否静默安装" = False):
    try:
+        if not os.path.exists("{}/.local/share/applications/uengine/".format(get_home())):
+            print("Mkdir")
+            os.mkdir("{}/.local/share/applications/uengine/".format(get_home()))
+        print("start install apk")
        global findApkHistory
        commandReturn = GetCommandReturn("pkexec /usr/bin/uengine-session-launch-helper -- uengine install --apk='{}'".format(path))
+        print(commandReturn)
+        print("start install apk12")
        iconSavePath = "{}/.local/share/icons/hicolor/256x256/apps/{}.png".format(get_home(), GetApkPackageName(path))
+        tempstr1 = iconSavePath
+        print("start install apk1")
+        iconSaveDir = os.path.dirname(iconSavePath)
+        if not os.path.exists(iconSaveDir):
+          os.makedirs(iconSaveDir,exist_ok=True)
        SaveApkIcon(path, iconSavePath)
+        print("start install apk2")
        BuildUengineDesktop(GetApkPackageName(path), GetApkActivityName(path), GetApkChineseLabel(path), iconSavePath,
                            "{}/{}.desktop".format(get_desktop_path(), GetApkPackageName(path)))
+        print("start install apk3")
        BuildUengineDesktop(GetApkPackageName(path), GetApkActivityName(path), GetApkChineseLabel(path), iconSavePath,
-                            "{}/.local/share/applications/{}.desktop".format(get_home(), GetApkPackageName(path)))
+                            "{}/.local/share/applications/uengine/{}.desktop".format(get_home(), GetApkPackageName(path)))
+        print("\nprint install complete")
        if quit:
            print(commandReturn)
            return
        messagebox.showinfo(title="提示", message="操作完成！")
-        findApkHistory.append(combobox1.get())
-        combobox1['value'] = findApkHistory
+        findApkHistory.append(ComboInstallPath.get())
+        ComboInstallPath['value'] = findApkHistory
        write_txt(get_home() + "/.config/uengine-runner/FindApkHistory.json", str(json.dumps(ListToDictionary(findApkHistory))))  # 将历史记录的数组转换为字典并写入
    except:
        traceback.print_exc()
@@ -111,13 +131,14 @@ def InstallApk(path: "apk 路径", quit: "是否静默安装" = False):
 def DisabledAndEnbled(choose: "启动或者禁用")->"禁用或启动所有控件":
    userChoose = {True: tk.DISABLED, False: tk.NORMAL}
    a = userChoose[choose]
-    combobox1.configure(state=a)
-    combobox3.configure(state=a)
-    button2.configure(state=a)
-    button3.configure(state=a)
-    button5.configure(state=a)
-    button7.configure(state=a)
-    button8.configure(state=a)
+    ComboInstallPath.configure(state=a)
+    ComboUninstallPath.configure(state=a)
+    BtnFindApk.configure(state=a)
+    BtnInstall.configure(state=a)
+    BtnShowUengineApp.configure(state=a)
+    BtnUninstallApkBrowser.configure(state=a)
+    BtnUninstall.configure(state=a)
+    Btngeticon.configure(state=a)

 # 需引入 subprocess
 # 运行系统命令并获取返回值
@@ -141,12 +162,12 @@ def about_this_program()->"显示“关于这个程序”窗口":
    message = ttk.Frame(mess)
    mess.resizable(0, 0)
    mess.title("关于 {}".format(title))
-    mess.iconphoto(False, tk.PhotoImage(file=iconPath))
+    #mess.iconphoto(False, tk.PhotoImage(file=iconPath))
    img = ImageTk.PhotoImage(Image.open(iconPath))
-    label1 = ttk.Label(message, image=img)
+    LabApkPath = ttk.Label(message, image=img)
    label2 = ttk.Label(message, text=about)
    button1 = ttk.Button(message, text="确定", command=mess.withdraw)
-    label1.pack()
+    LabApkPath.pack()
    label2.pack()
    button1.pack(side="bottom")
    message.pack()
@@ -250,16 +271,14 @@ def readtxt(path: "路径")->"读取文本文档":

 # 写入文本文档
 def write_txt(path: "路径", things: "内容")->"写入文本文档":
+    TxtDir = os.path.dirname(path)
+    print(TxtDir)
+    if not os.path.exists(TxtDir):
+        os.makedirs(TxtDir,exist_ok=True)    
    file = open(path, 'w', encoding='UTF-8')  # 设置文件对象
    file.write(things)  # 写入文本
    file.close()  # 关闭文本对象

-# 显示本程序所有使用的程序
-def ShowUseProgram()->"显示本程序所有使用的程序":
-    global title
-    global useProgram
-    messagebox.showinfo(title="{} 使用的程序列表（部分）".format(title), message=useProgram)
-
 # 获取 aapt 的所有信息
 def GetApkInformation(apkFilePath: "apk 所在路径")->"获取 aapt 的所有信息":
    return GetCommandReturn("aapt dump badging '{}'".format(apkFilePath))
@@ -316,22 +335,152 @@ def GetApkChineseLabel(apkFilePath)->"获取软件的中文名称":
            return line

 # 获取图标在包内的路径
-def GetApkIconInApk(apkFilePath)->"获取图标在包内的路径":
-    info = GetApkInformation(apkFilePath)
-    for line in info.split('\n'):
-        if "application:" in line:
-            line = line[line.index("icon='"): -1]
-            line = line.replace("icon='", "")
-            if "'" in line:
-                line = line[0: line.index("'")]
-            return line
+#def GetApkIconInApk(apkFilePath)->"获取图标在包内的路径":
+
+#合并两个函数到一起
+def SaveApkIcon(apkFilePath, iconSavePath)->"获取 apk 文件的图标":
+    try:
+        info = GetApkInformation(apkFilePath)
+        for line in info.split('\n'):
+            if "application:" in line:
+                xmlpath = line.split(":")[-1].split()[-1].split("=")[-1].replace("'","")  
+                if xmlpath.endswith('.xml'):
+                        xmlsave = getsavexml()
+                        print(xmlpath)
+                        xmlsave.savexml(apkFilePath,xmlpath,iconSavePath)
+                else:
+                    zip = zipfile.ZipFile(apkFilePath)
+                    iconData = zip.read(xmlpath)
+                    with open(iconSavePath, 'w+b') as saveIconFile:
+                        saveIconFile.write(iconData)
+    except:
+        traceback.print_exc()
+        print("Error, show defult icon")
+        shutil.copy(programPath + "/defult.png", iconSavePath)
+
+def saveicon():
+    global temppath
+    global tempstr1
+    iconSavePath = "{}/.local/share/icons/hicolor/256x256/apps/{}.png".format(get_home(), GetApkPackageName(temppath))
+    print(iconSavePath+"iconpaths")
+    SaveApkIcon(temppath, iconSavePath)
+
+def SaveIconToOtherPath():
+    apkPath = ComboInstallPath.get()
+    if apkPath == "":
+        messagebox.showerror(title="错误", message="你没有选择 apk 文件")
+        return
+    path = filedialog.asksaveasfilename(title="保存图标", filetypes=[("PNG 图片", "*.png"), ("所有文件", "*.*")], initialdir=json.loads(readtxt(get_home() + "/.config/uengine-runner/SaveApkIcon.json"))["path"])
+    if not path == "":
+        try:
+            SaveApkIcon(apkPath, path)
+        except:
+            traceback.print_exc()
+            messagebox.showerror(title="错误", message="本程序不支持保存该 apk 的图标")
+            return
+        write_txt(get_home() + "/.config/uengine-runner/SaveApkIcon.json", json.dumps({"path": os.path.dirname(path)}))  # 写入配置文件
+        findApkHistory.append(ComboInstallPath.get())
+        ComboInstallPath['value'] = findApkHistory
+        write_txt(get_home() + "/.config/uengine-runner/FindApkHistory.json", str(json.dumps(ListToDictionary(findApkHistory))))  # 将历史记录的数组转换为字典并写入
+        messagebox.showinfo(title="提示", message="保存成功！")
+
+## 获取 apk 文件的图标（部分程序不支持）
+# def SaveApkIcon(apkFilePath, iconSavePath)->"获取 apk 文件的图标（部分程序不支持）":
+#    zip = zipfile.ZipFile(apkFilePath)
+#    iconData = zip.read(GetApkIconInApk(apkFilePath))
+#    with open(iconSavePath, 'w+b') as saveIconFile:
+#        saveIconFile.write(iconData)
+
+def BackUengineClean()->"清空 uengine 数据":
+    print("Choose")
+    if messagebox.askokcancel(title="警告", message="清空后数据将会完全丢失，确定要继续吗？"):
+        DisabledAndEnbled(True)
+        try:
+            if os.path.exists("{}/.local/share/applications/uengine/".format(get_home())):
+                shutil.rmtree("{}/.local/share/applications/uengine/".format(get_home()))
+        except:
+            traceback.print_exc()
+            messagebox.showerror(title="错误", message=traceback.format_exc())
+        InstallWindow.ShowWindows("pkexec rm -rfv /data/uengine")
+        return
+    print("Choose False")
+
+def UengineBridgeStart():
+    DisabledAndEnbled(True)
+    os.system("pkexec uengine-bridge.sh start")
+    DisabledAndEnbled(False)
+
+def UengineBridgeStop():
+    DisabledAndEnbled(True)
+    os.system("pkexec uengine-bridge.sh stop")
+    DisabledAndEnbled(False)
+
+def UengineBridgeRestart():
+    DisabledAndEnbled(True)
+    os.system("pkexec uengine-bridge.sh restart")
+    DisabledAndEnbled(False)
+
+def UengineBridgeReload():
+    DisabledAndEnbled(True)
+    os.system("pkexec uengine-bridge.sh reload")
+    DisabledAndEnbled(False)
+
+def UengineBridgeForceReload():
+    DisabledAndEnbled(True)
+    os.system("pkexec uengine-bridge.sh force-reload")
+    DisabledAndEnbled(False)
+
+class InstallWindow():
+    def ShowWindows(command):
+        global message
+        global text
+        global installTipsText
+        global progressbar
+        message = tk.Toplevel()
+        message.iconphoto(False, tk.PhotoImage(file=iconPath))
+        messageFrame = ttk.Frame(message)
+        installTipsText = tk.StringVar()
+        message.title("正在操作……")
+        installTipsText.set("正在操作……")
+        installTips = ttk.Label(messageFrame, textvariable=installTipsText)
+        progressbar = ttk.Progressbar(messageFrame, length=500, mode='indeterminate')
+        text = tk.Text(messageFrame)
+        text.config(background="black", foreground="white")
+        installTips.pack()
+        progressbar.pack(fill="x")
+        text.pack(expand='yes', fill='both')
+        messageFrame.pack(expand='yes', fill='both')
+        print("Run!")
+        threading.Thread(target=InstallWindow.RunCommand, args=[command]).start()
+        message.mainloop()
+    
+    def RunCommand(command):
+        global message
+        global text
+        global progressbar
+        global installTipsText
+        InstallWindow.AddText("$>" + command + "\n")
+        progressbar.start()
+        result = subprocess.getoutput(command)
+        InstallWindow.AddText(result)
+        messagebox.showinfo(title="提示", message="操作完毕！")
+        installTipsText.set("操作完毕！")
+        message.title("操作完毕！")
+        progressbar.stop()
+        progressbar["value"] = 100
+        # 特意添加！
+        DisabledAndEnbled(False)
+        print("Clean!")
+        if messagebox.askyesno(title="提示", message="清空完毕，将会在重启后生效，是否要重启？"):
+            print("reboot")
+            os.system("reboot")
+
+    def AddText(things):
+        global text
+        text.configure(state=tk.NORMAL)
+        text.insert("end", things)
+        text.configure(state=tk.DISABLED)

-# 获取 apk 文件的图标（部分程序不支持）
-def SaveApkIcon(apkFilePath, iconSavePath)->"获取 apk 文件的图标（部分程序不支持）":
-    zip = zipfile.ZipFile(apkFilePath)
-    iconData = zip.read(GetApkIconInApk(apkFilePath))
-    with open(iconSavePath, 'w+b') as saveIconFile:
-        saveIconFile.write(iconData)

 # 获取用户桌面目录
 def get_desktop_path()->"获取用户桌面目录":
@@ -352,34 +501,92 @@ def get_desktop_path()->"获取用户桌面目录":
 def get_home()->"获取用户主目录":
    return os.path.expanduser('~')

+def StartUengine():
+    os.system("systemctl enable uengine-container uengine-session && systemctl start uengine-container uengine-session")
+
+def StopUengine():
+    os.system("systemctl disable uengine-container uengine-session")
+
 ###########################
 # 程序信息
 ###########################
 programUrl = "https://gitee.com/gfdgd-xi/uengine-runner"
-version = "1.2.3"
+version = "1.3.2"
 goodRunSystem = "Linux（deepin/UOS）"
 aaptVersion = GetCommandReturn("aapt version")
-about = '''一个基于 Python3 的 tkinter 制作的 uengine APK 安装器
-版本：{}
-适用平台：{}
-tkinter 版本：{}
-aapt 版本：{}
-程序官网：{}
-©2021-{} gfdgd xi'''.format(version, goodRunSystem, tk.TkVersion, aaptVersion,programUrl, time.strftime("%Y"))
-tips = '''提示：
+about = '''    一个基于 Python3 的 tkinter 制作的 uengine APK 安装器
+
+版本        ：{}
+
+适用平台    ：{}
+
+tkinter版本：{}
+
+aapt 版本  ：{}
+
+程序官网    ：{}
+
+©2021-{}'''.format(version, goodRunSystem, tk.TkVersion, aaptVersion,programUrl, time.strftime("%Y"))
+tips = '''    新版本Deepin/UOS发布后，可以在应用商店安装部分官方已适配的安卓应用，对爱好者来说，不能自己安装APK软件包始终差点意思，本程序可以为Deepin/UOS上的Uengine安卓运行环境安装自定义APK软件包，并能发送安装的APK包启动菜单到桌面或系统菜单。
+
+安装APK：
+    点浏览按钮，选中需要安装的APK，然后点安装按钮
+
+卸载APK：
+    在卸载APK下面的输入框内输入需要卸载的APK包名，点卸载按钮，如果无法获取包名，可以通过浏览APK文件程序自动获取包名进行卸载。
+
+保存APK图标：
+    在安装APK下面的输入框浏览或输入APK的路径，然后点击“保存图标”按钮，选择保存位置即可
+
+重置（删除）uengine 数据：
+    点击菜单栏的“uengine”的“清空uengine数据”，输入密码重启即可
+    注意：如果任何安卓一遍打不开，多打开几遍应该就可以重新加载uengine配置了
+
+打开Uengine应用列表：
+    打开系统已安装的应用列表（安卓界面）
+
+提示：
 1、需要你有使用 root 权限的能力；
 2、需要安装 uengine 才能使用；
-3、如果报错是有关产生 .deksotp 文件有关，一般可以打开程序列表安装。
-如果想要连接其他手机，请使用 1.2.0 以前的版本，可以使用 adb 连接。'''
-updateThingsString = '''※1、修改了 deb 的打包，防止部分需要库没有安装;
-2、修改了一个弱智错误'''
-title = "uengine 运行器 {}".format(version)
-updateTime = "2021年8月2日"
+3、提取 apk 图标的 apk 路径以“安装 apk”那栏为准;
+4、如果想要连接其他手机，请使用 1.2.0 以前的版本，可以使用 adb 连接。
+'''
+updateThingsString = '''V.1.3.2：
+※1、支持uengine数据重置;
+※2、支持修改uengine网络桥接的启动状态;
+※3、支持右键安装/卸载;
+※4、支持启用或禁用uengine;
+※5、修复打包问题，不会出现“dpkg:警告:卸载spark-uengine-runner时，目录/opt/apps/uengine-runner非空，因而不会删除该目录”的错误;
+
+V1.3.1：
+※1、修复打包问题，防止部分用户安装出错的问题;
+※2、修复了程序无法提取图标时可以提取默认图标使用;
+
+V1.3.0：
+※1、修改了界面布局;
+※2、修复大多数新安装普通用户的路图标及启动菜单文件路径不存在导致安装APK报错的bugs;
+3、删除少量冗余代码，调整代码顺序;
+4、支持提取apk图标。
+
+V1.2.3
+1、调整部分控件名称；
+2、调整界面布局及界面风格；
+
+V1.2.2
+1、对程序错误的显示更加人性化；
+2、对icon的获取方式进行了升级；
+3、增加了注释、删除部分冗余代码。
+'''
+title = "uengine 安装器 {}".format(version)
+updateTime = "2021年08月15日"
 updateThings = "{} 更新内容：\n{}\n更新时间：{}".format(version, updateThingsString, updateTime, time.strftime("%Y"))
+programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
 iconPath = "{}/icon.png".format(os.path.split(os.path.realpath(__file__))[0])
 desktop = "/opt/apps/uengine-runner/UengineAndroidProgramList.desktop"
 desktopName = "UengineAndroidProgramList.desktop"
-useProgram = '''1、uengine（anbox）
+contribute = '''gfdgd xi<3025613752@qq.com>
+actionchen<917981399@qq.com>'''
+useProgram = '''1、uengine相关软件包（基于anbox开发）
 2、Python3
 3、tkinter（tkinter.tk、ttkthemes 和 tkinter.ttk）
 4、aapt
@@ -388,6 +595,8 @@ useProgram = '''1、uengine（anbox）
 ###########################
 # 加载配置
 ###########################
+if not os.path.exists("{}/.local/share/applications/uengine/".format(get_home())):
+    os.mkdir("{}/.local/share/applications/uengine/".format(get_home()))
 if not os.path.exists(get_home() + "/.config/uengine-runner"):  # 如果没有配置文件夹
    os.mkdir(get_home() + "/.config/uengine-runner")  # 创建配置文件夹
 if not os.path.exists(get_home() + "/.config/uengine-runner/FindApkHistory.json"):  # 如果没有配置文件
@@ -398,6 +607,8 @@ if not os.path.exists(get_home() + "/.config/uengine-runner/FindApk.json"):  #
    write_txt(get_home() + "/.config/uengine-runner/FindApk.json", json.dumps({"path": "~"}))  # 写入（创建）一个配置文件
 if not os.path.exists(get_home() + "/.config/uengine-runner/FindUninstallApk.json"):  # 如果没有配置文件
    write_txt(get_home() + "/.config/uengine-runner/FindUninstallApk.json", json.dumps({"path": "~"}))  # 写入（创建）一个配置文件
+if not os.path.exists(get_home() + "/.config/uengine-runner/SaveApkIcon.json"):  # 如果没有配置文件
+    write_txt(get_home() + "/.config/uengine-runner/SaveApkIcon.json", json.dumps({"path": "~"}))  # 写入（创建）一个配置文件

 ###########################
 # 设置变量
@@ -405,72 +616,208 @@ if not os.path.exists(get_home() + "/.config/uengine-runner/FindUninstallApk.jso
 findApkHistory = list(json.loads(readtxt(get_home() + "/.config/uengine-runner/FindApkHistory.json")).values())
 fineUninstallApkHistory = list(json.loads(readtxt(get_home() + "/.config/uengine-runner/FindUninstallApkHistory.json")).values())

+# add sub window
+#添加窗口开启关闭开关，防止重复开启
+windowflag = "close"
+
+def showhelp():
+     
+    #define  window and frame and button label   
+    # 
+    global windowflag
+    if windowflag == "close":
+        helpwindow=tk.Toplevel()
+        helpwindow.resizable(0, 0)
+        helpwindow.title("帮助")
+        
+
+        # get screen width and height
+        screen_width = helpwindow.winfo_screenwidth()
+        screen_height = helpwindow.winfo_screenheight()
+        # calculate position x and y coordinates  假设主窗口大小固定 570x236像素 ，设置窗口位置为屏幕中心。
+        winwith=550
+        winhigh=700
+        x = (screen_width/2) - (winwith/2)
+        y = (screen_height/2) - (winhigh/2)
+        
+        helpwindow.geometry("550x700"+"+{:.0f}+{:.0f}".format(x, y))
+
+        style = ttkthemes.ThemedStyle(helpwindow)
+        style.set_theme("breeze")
+        
+        
+
+        Frmroot=ttk.Frame(helpwindow)
+        FrmMenu = ttk.Frame(Frmroot)
+        FrmText = ttk.Frame(Frmroot)
+
+        LabFrmText=ttk.LabelFrame(FrmText,text="帮助",height=800,borderwidth=3)  
+        HelpStr = tk.StringVar() 
+        HelpStr.set(tips)
+        LabText = ttk.Label(LabFrmText, textvariable=HelpStr,width=55)
+        LabText.config(wraplength=350)
+        
+        def on_closing():
+            global windowflag
+            windowflag = "close"
+            print(windowflag)
+            helpwindow.destroy()
+
+
+
+        # define button func        
+        def ChgLog():
+            HelpStr.set(updateThingsString)
+        def ChgAbout():
+            HelpStr.set(about)
+        def ChgDep():
+            HelpStr.set(useProgram)
+        def ChgCon():
+            HelpStr.set(contribute)
+        def ChgTips():
+            HelpStr.set(tips)
+            LabText.config(wraplength=350)
+
+        BtnReadme = ttk.Button(FrmMenu, text="使用说明",width=14,command=ChgTips)
+        BtnLog = ttk.Button(FrmMenu, text="更新内容",width=14,command=ChgLog)
+        BtnZujian = ttk.Button(FrmMenu, text="程序依赖的组件",width=14,command=ChgDep)
+        BtnGongxian = ttk.Button(FrmMenu, text="有贡献的开发者",width=14,command=ChgCon)
+        BtnAbout = ttk.Button(FrmMenu, text="关于",width=14,command=ChgAbout)
+
+
+        #layout
+        FrmMenu.grid(row=0,column=0,sticky=tk.NW)
+        BtnReadme.grid(row=0,column=0,sticky=tk.NW,padx=3)
+        BtnLog.grid(row=1,column=0,sticky=tk.NW,padx=3)
+        BtnZujian.grid(row=2,column=0,sticky=tk.NW,padx=3)
+        BtnGongxian.grid(row=3,column=0,sticky=tk.NW,padx=3)
+        BtnAbout.grid(row=4,column=0,sticky=tk.NW,padx=3)
+
+        FrmText.grid(row=0,column=1,sticky=tk.NW)
+        LabFrmText.grid(row=0,column=0,sticky=tk.NW,padx=3,pady=3)
+        LabText.grid(row=0,column=0,sticky=tk.NW)
+      
+        Frmroot.pack()
+        windowflag = "open"
+        print(windowflag)
+        #helpwindow.mainloop()
+        helpwindow.protocol("WM_DELETE_WINDOW", on_closing)
+
+
 ###########################
 # 窗口创建
 ###########################
 win = tk.Tk()  # 创建窗口
-# 设置窗口所需的全局变量
-checkButtonBool1 = tk.BooleanVar()
+
 # 设置窗口
 style = ttkthemes.ThemedStyle(win)
-style.set_theme("adapta")
+style.set_theme("breeze")
 window = ttk.Frame(win)
 win.attributes('-alpha', 0.5)
 win.title(title)
 win.resizable(0, 0)
 win.iconphoto(False, tk.PhotoImage(file=iconPath))
+
+# get screen width and height
+screen_width = win.winfo_screenwidth()
+screen_height = win.winfo_screenheight()
+# calculate position x and y coordinates  假设主窗口大小固定 570x236像素 ，设置窗口位置为屏幕中心。 
+winwith=570
+winhigh=236
+x = (screen_width/2) - (winwith/2)
+y = (screen_height/2) - (winhigh/2)
+
+win.geometry(""+"+{:.0f}+{:.0f}".format(x, y))
+
 # 创建控件
-frame1 = ttk.Frame(window)
-frame2 = ttk.Frame(window)
-frame3 = ttk.Frame(window)
-label1 = ttk.Label(window, text="要安装的 apk 路径：")
-label3 = ttk.Label(window, text="要卸载的包名或程序对应的 APK 文件：")
-combobox1 = ttk.Combobox(window, width=100)
-combobox3 = ttk.Combobox(window, width=100)
-button2 = ttk.Button(window, text="浏览", command=FindApk)
-button3 = ttk.Button(frame2, text="安装", command=Button3Install)
-button5 = ttk.Button(frame2, text="打开 uengine 应用列表", command=Button5Click)
-button7 = ttk.Button(window, text="浏览", command=ButtonClick7)
-button8 = ttk.Button(frame3, text="卸载", command=ButtonClick8)
+FrmInstall = ttk.Frame(window)
+FrmUninstall = ttk.Frame(window)
+LabApkPath = ttk.Label(window, text="安装APK：")
+LabUninstallPath = ttk.Label(window, text="卸载APK：")
+ComboInstallPath = ttk.Combobox(window, width=50)
+ComboUninstallPath = ttk.Combobox(window, width=50)
+BtnFindApk = ttk.Button(FrmInstall, text="浏览", command=FindApk)
+BtnInstall = ttk.Button(FrmInstall, text="安装", command=Button3Install)
+BtnShowUengineApp = ttk.Button(window, text="打开 uengine 应用列表", command=Button5Click)
+BtnUninstallApkBrowser = ttk.Button(FrmUninstall, text="浏览", command=BtnFindUninstallApkClk)
+BtnUninstall = ttk.Button(FrmUninstall, text="卸载", command=ButtonClick8)
+Btngeticon = ttk.Button(window, text="保存图标", command=SaveIconToOtherPath)
 # 设置菜单栏
 menu = tk.Menu(window, background="white")  
+
 programmenu = tk.Menu(menu, tearoff=0, background="white")  # 设置“程序”菜单栏
 uengine = tk.Menu(menu, tearoff=0, background="white")
 help = tk.Menu(menu, tearoff=0, background="white")  # 设置“帮助”菜单栏
+
 menu.add_cascade(label="程序", menu=programmenu)
 menu.add_cascade(label="uengine", menu=uengine)
-menu.add_cascade(label="帮助", menu=help)
+menu.add_cascade(label="关于", menu=help)
+
 programmenu.add_command(label="清空软件历史记录", command=CleanProgramHistory)
 programmenu.add_separator()  # 设置分界线
-programmenu.add_command(label="退出程序", command=window.quit)  # 设置“退出程序”项
+programmenu.add_command(label="退出程序", command=window.quit)  # 设置“退出程序”
+
 uengine.add_command(label="发送 uengine 应用列表到桌面", command=SendUengineAndroidListForDesktop)
 uengine.add_command(label="发送 uengine 应用列表到启动器", command=SendUengineAndroidListForLauncher)
+uengine.add_separator()
+uengine.add_command(label="启用 uengine", command=StartUengine)
+uengine.add_command(label="禁用 uengine", command=StopUengine)
+uengine.add_separator()
+uengine.add_command(label="启用 uengine 网络桥接", command=UengineBridgeStart)
+uengine.add_command(label="关闭 uengine 网络桥接", command=UengineBridgeStop)
+uengine.add_command(label="重启 uengine 网络桥接", command=UengineBridgeRestart)
+uengine.add_command(label="加载 uengine 网络桥接", command=UengineBridgeReload)
+uengine.add_command(label="强制加载 uengine 网络桥接", command=UengineBridgeForceReload)
+
+uengine.add_separator()
+uengine.add_command(label="清空 uengine 数据", command=BackUengineClean)
+
 help.add_command(label="程序官网", command=OpenProgramURL)  # 设置“程序官网”项
-help.add_separator()
-help.add_command(label="小提示", command=helps)  # 设置“小提示”项
-help.add_command(label="更新内容", command=UpdateThings)  # 设置“更新内容”项
-help.add_command(label="这个程序使用的程序列表（部分）", command=ShowUseProgram)  # 设置“更新内容”项
-help.add_command(label="关于这个程序", command=about_this_program)  # 设置“关于这个程序”项
-menu.configure(activebackground="white")
-help.configure(activebackground="white")
-uengine.configure(activebackground="white")
-programmenu.configure(activebackground="white")
+help.add_command(label="帮助", command=showhelp)  # 设置“关于这个程序”项
+
+menu.configure(activebackground="dodgerblue")
+help.configure(activebackground="dodgerblue")
+uengine.configure(activebackground="dodgerblue")
+programmenu.configure(activebackground="dodgerblue")
+
 # 设置控件
-combobox3['value'] = fineUninstallApkHistory
-combobox1['value'] = findApkHistory
+ComboUninstallPath['value'] = fineUninstallApkHistory
+ComboInstallPath['value'] = findApkHistory
+try:
+    if sys.argv[1] == "-i":
+        ComboInstallPath.set(sys.argv[2])
+        print("Install Path: " + sys.argv[2])
+    elif sys.argv[1] == "-u":
+        ComboUninstallPath.set(sys.argv[2])
+        print("Unstall Path: " + sys.argv[2])
+    else:
+        print("Command Format Error")
+except:
+    print("Not Command Or Command Format Error")
 # 显示控件
 win.config(menu=menu)  # 显示菜单栏
-label1.grid(row=2, column=0)
-label3.grid(row=4, column=0)
-combobox1.grid(row=2, column=1)
-combobox3.grid(row=4, column=1)
-button2.grid(row=2, column=2)
-button3.grid(row=0, column=0)
-button5.grid(row=0, column=1)
-button7.grid(row=4, column=2)
-button8.grid(row=0, column=1)
-frame1.grid(row=1, columnspa=3)
-frame2.grid(row=3, columnspa=3)
-frame3.grid(row=5, columnspa=3)
+
+
+
+LabApkPath.grid(row=1, column=0,sticky= tk.W,padx=3)
+ComboInstallPath.grid(row=2, column=0,padx=3)
+
+
+FrmInstall.grid(row=2, column=1,padx=3)
+BtnFindApk.grid(row=0, column=0)
+BtnInstall.grid(row=0, column=1)
+
+LabUninstallPath.grid(row=3, column=0,sticky= tk.W,padx=3)
+ComboUninstallPath.grid(row=4, column=0,padx=3)
+
+FrmUninstall.grid(row=4, column=1,padx=3)
+BtnUninstallApkBrowser.grid(row=0, column=0)
+BtnUninstall.grid(row=0, column=1)
+
+BtnShowUengineApp.grid(row=5, column=0,sticky= tk.W,padx=3,pady=2)
+
+Btngeticon.grid(row=3, column=1,sticky= tk.W,padx=3,pady=2)
+
 window.pack()
-win.mainloop()
+
+win.mainloop()
--- a/build/usr/share/applications/spark-uengine-install.desktop
+++ b/build/usr/share/applications/spark-uengine-install.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Categories=System;
+Terminal=false
+Exec=/usr/bin/uengine-runner -i %F
+Icon=/opt/apps/uengine-runner/icon.png
+Name=Install APK(uengine runner)
+Comment=Install APK(uengine runner)
+Comment[zh]=安装 APK（uengine 运行器）
+Name[zh]=安装 APK（uengine 运行器）
+StartupNotify=true
+Hidden=false
+NoDisplay=true
+MimeType=application/vnd.android.package-archive
--- a/build/usr/share/applications/spark-uengine-uninstall.desktop
+++ b/build/usr/share/applications/spark-uengine-uninstall.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Categories=System;
+Terminal=false
+Exec=/usr/bin/uengine-runner -u %F
+Icon=/opt/apps/uengine-runner/icon.png
+Name=Uninstall APK(uengine runner)
+Comment=Uninstall APK(uengine runner)
+Comment[zh]=卸载 APK（uengine 运行器）
+Name[zh]=卸载 APK（uengine 运行器）
+StartupNotify=true
+Hidden=false
+NoDisplay=true
+MimeType=application/vnd.android.package-archive
--- a/build/usr/share/applications/uengine-runner.desktop
+++ b/build/usr/share/applications/uengine-runner.desktop
@@ -1,11 +1,13 @@
 [Desktop Entry]
-Categories=System;
-Comment=uengine（anbox） 运行器
+Type=Application
 Encoding=UTF-8
+Categories=System;
+Terminal=false
 Exec=/usr/bin/uengine-runner
 Icon=/opt/apps/uengine-runner/icon.png
-MimeType=
-Name=uengine 运行器
-StartupWMClass=uengine 运行器
-Terminal=false
-Type=Application
+Name=uengine runner
+Comment=uengine runner
+Comment[zh]=uengine 运行器
+Name[zh]=uengine 运行器
+StartupNotify=true
+MimeType=
--- a/com.gitee.uengine.runner.spark.deb
+++ b/com.gitee.uengine.runner.spark.deb
--- a/defult.png
+++ b/defult.png
--- a/getxmlimg.py
+++ b/getxmlimg.py
@@ -0,0 +1,118 @@
+import PIL.Image as Image
+import PIL.ImageDraw as ImageDraw
+import zipfile
+import subprocess
+import re
+
+class getsavexml():
+
+    def savexml(self,apkFilePath,xmlpath,iconSavePath):
+        cmddumpid = "aapt dump xmltree "+ apkFilePath + " " + xmlpath
+        print(cmddumpid)
+        xmltree =  subprocess.getoutput(cmddumpid)
+        xmls = xmltree.splitlines()
+        # find strs ,print next line
+        def FindStrs(lines,strs):
+            i=0
+            while i < len(lines):
+                if re.search(strs,lines[i]):
+                    tmpstr = lines[i+1]
+                    i += 1
+                    Resultstr = tmpstr.split(":")[-1].split("=")[-1].split("0x")[-1] 
+                    return Resultstr
+                else:
+                    i += 1
+        #从apk的信息中获取前后景图片的ID号
+        backimgid =  FindStrs(xmls,"background")
+        foreimgid =  FindStrs(xmls,"foreground")
+        print(backimgid)
+        print(foreimgid)
+
+        # 直接从apk resource文件获取前后两层图片路径及ID字符串
+        resource =  subprocess.getoutput("aapt dump --values resources " +  apkFilePath + "| grep -iE -A1 " +  "\"" + backimgid + "|" + foreimgid + "\"")
+        resourcelines = resource.splitlines()
+        print(resourcelines)
+
+        # 从过滤出的字符串中获取所有相同ID的图片路径
+        def Findpicpath(lines,imgid):
+            i=0
+            Resultstr = []
+            while i < len(lines):
+                if re.search(imgid,lines[i]) and re.search("string8",lines[i+1]) :
+                    print(lines[i+1])
+                    tmpstr = lines[i+1].replace("\"","")
+                    i += 1 
+                    Resultstr.append(tmpstr.split()[-1])
+                else:
+                    i += 1
+            return Resultstr
+
+        #获取所有带前后图片ID的图片路径（相同背景或者前景的图片ID但分辨率不一样）
+        backimgs =  Findpicpath(resourcelines,backimgid)
+        foreimgs =  Findpicpath(resourcelines,foreimgid)
+        print(backimgs)
+        print(foreimgs)
+        #获取分辨率最高的图片路径
+        def getmaxsize(imgs):
+            j = 0
+            size=(0,0)
+            zipapk = zipfile.ZipFile(apkFilePath)
+            imgpath = ""
+            while j < len(imgs):
+                print(imgs[j])
+                img = Image.open(zipapk.open(imgs[j]))
+                print(imgs[j])
+                print(img.size)
+                if size < img.size:
+                    size = img.size
+                    imgpath = imgs[j]
+                j += 1
+            return imgpath
+
+        # 获取到文件列表后，进行比较分辨率，选取分辨率最高的张图片
+        iconbackpath = getmaxsize(backimgs)
+        iconforepath = getmaxsize(foreimgs)
+        print(iconbackpath + " " + iconforepath)
+
+        #从APK文件获取最终图片
+        zipapk = zipfile.ZipFile(apkFilePath)
+        iconback = zipapk.open(iconbackpath)
+        iconfore = zipapk.open(iconforepath)
+
+
+        # 叠加图片，mask 设置前景为蒙版
+        iconbackimg =  Image.open(iconback).convert("RGBA")
+        iconforeimg =  Image.open(iconfore).convert("RGBA")
+        iconbackimg.paste(iconforeimg,mask=iconforeimg)
+
+
+        # 圆角图片函数，网上拷贝的
+        def circle_corner(img, radii):  #把原图片变成圆角，这个函数是从网上找的，原址 https://www.pyget.cn/p/185266
+            """
+            圆角处理
+            :param img: 源图象。
+            :param radii: 半径，如：30。
+            :return: 返回一个圆角处理后的图象。
+            """
+            # 画圆（用于分离4个角）
+            circle = Image.new('L', (radii * 2, radii * 2), 0)  # 创建一个黑色背景的画布
+            draw = ImageDraw.Draw(circle)
+            draw.ellipse((0, 0, radii * 2, radii * 2), fill=255)  # 画白色圆形
+            # 原图
+            img = img.convert("RGBA")
+            w, h = img.size
+            # 画4个角（将整圆分离为4个部分）
+            alpha = Image.new('L', img.size, 255)
+            alpha.paste(circle.crop((0, 0, radii, radii)), (0, 0))  # 左上角
+            alpha.paste(circle.crop((radii, 0, radii * 2, radii)), (w - radii, 0))  # 右上角
+            alpha.paste(circle.crop((radii, radii, radii * 2, radii * 2)), (w - radii, h - radii))  # 右下角
+            alpha.paste(circle.crop((0, radii, radii, radii * 2)), (0, h - radii))  # 左下角
+            # alpha.show()
+            img.putalpha(alpha)  # 白色区域透明可见，黑色区域不可见
+            return img
+
+        #  圆角半径1/8边长,保存icon图片
+        w,h = iconbackimg.size
+        iconimg = circle_corner(iconbackimg,int(w/8))
+        iconimg.save(iconSavePath)
+
--- a/main.py
+++ b/main.py
@@ -1,15 +1,17 @@
 #!/usr/bin/env python3
 # 使用系统默认的 python3 运行
 ###########################################################################################
-# 作者：gfdgd xi
-# 版本：1.2.3
-# 更新时间：2021年8月2日
+# 作者：gfdgd xi<3025613752@qq.com>
+# 版本：1.3.2
+# 更新时间：2021年8月15日
 # 感谢：anbox、deepin 和 UOS
 # 基于 Python3 的 tkinter 构建
+# 更新：actionchen<917981399@qq.com>
 ###########################################################################################
 #################
 # 引入所需的库
 #################
+from genericpath import exists
 import os
 import sys
 import time
@@ -18,15 +20,16 @@ import shutil
 import zipfile
 import traceback
 import threading
+import ttkthemes
 import webbrowser
 import subprocess
-import ttkthemes
 import tkinter as tk
 import tkinter.ttk as ttk
 import tkinter.messagebox as messagebox
 import tkinter.filedialog as filedialog
-import PIL.Image as Image
-import PIL.ImageTk as ImageTk
+import tkinter.simpledialog as simpledialog
+from getxmlimg import getsavexml
+from tkinter.constants import TOP

 # 卸载程序
 def UninstallProgram(package: "apk 包名")->"卸载程序":
@@ -37,70 +40,89 @@ def UninstallProgram(package: "apk 包名")->"卸载程序":
            os.remove("{}/.local/share/applications/{}.desktop".format(get_home(), package))
        if os.path.exists("{}/{}.desktop".format(get_desktop_path(), package)):
            os.remove("{}/{}.desktop".format(get_desktop_path(), package))
-        fineUninstallApkHistory.append(combobox3.get())
-        combobox3['value'] = fineUninstallApkHistory
+        fineUninstallApkHistory.append(ComboUninstallPath.get())
+        ComboUninstallPath['value'] = fineUninstallApkHistory
        write_txt(get_home() + "/.config/uengine-runner/FindUninstallApkHistory.json", str(json.dumps(ListToDictionary(fineUninstallApkHistory))))  # 将历史记录的数组转换为字典并写入
        return Return
    except:
        traceback.print_exc()
        messagebox.showerror(title="错误", message=traceback.format_exc())

-def ButtonClick7():
+def BtnFindUninstallApkClk():
    path = filedialog.askopenfilename(title="选择 Apk", filetypes=[("APK 文件", "*.apk"), ("所有文件", "*.*")], initialdir=json.loads(readtxt(get_home() + "/.config/uengine-runner/FindUninstallApk.json"))["path"])
    if path != "" and path != "()":
        try:
-            combobox3.set(path)
+            ComboUninstallPath.set(path)
            write_txt(get_home() + "/.config/uengine-runner/FindUninstallApk.json", json.dumps({"path": os.path.dirname(path)}))  # 写入配置文件
        except:
            pass

 def ButtonClick8():
-    if combobox3.get() is "":
+    if ComboUninstallPath.get() is "":
        messagebox.showerror(title="提示", message="信息没有填写完整，无法继续卸载 APK")
        return
    DisabledAndEnbled(True)
-    if os.path.exists(combobox3.get()):
-        path = GetApkPackageName(combobox3.get())
+    if os.path.exists(ComboUninstallPath.get()):
+        path = GetApkPackageName(ComboUninstallPath.get())
    else:
-        path = combobox3.get()
+        path = ComboUninstallPath.get()
    UninstallProgram(path)
    messagebox.showinfo(message="操作执行完毕！", title="提示")
    DisabledAndEnbled(False)

 # 浏览窗口
+# temp strs
+temppath=""
 def FindApk()->"浏览窗口":
    path = filedialog.askopenfilename(title="选择 Apk", filetypes=[("APK 文件", "*.apk"), ("所有文件", "*.*")], initialdir=json.loads(readtxt(get_home() + "/.config/uengine-runner/FindApk.json"))["path"])
+    global temppath    
+    temppath = path
+    print("apk path is find:" + path)
    if path != "" and path != "()":
        try:
-            combobox1.set(path)
+            ComboInstallPath.set(path)
            write_txt(get_home() + "/.config/uengine-runner/FindApk.json", json.dumps({"path": os.path.dirname(path)}))  # 写入配置文件
        except:
            pass

 def Button3Install():
-    if combobox1.get() is "":
+    if ComboInstallPath.get() is "":
        messagebox.showerror(title="提示", message="信息没有填写完整，无法继续安装 APK")
        return
    DisabledAndEnbled(True)
-    threading.Thread(target=InstallApk, args=(combobox1.get(),)).start()
+    threading.Thread(target=InstallApk, args=(ComboInstallPath.get(),)).start()

 # 安装应用
 def InstallApk(path: "apk 路径", quit: "是否静默安装" = False):
    try:
+        if not os.path.exists("{}/.local/share/applications/uengine/".format(get_home())):
+            print("Mkdir")
+            os.mkdir("{}/.local/share/applications/uengine/".format(get_home()))
+        print("start install apk")
        global findApkHistory
        commandReturn = GetCommandReturn("pkexec /usr/bin/uengine-session-launch-helper -- uengine install --apk='{}'".format(path))
+        print(commandReturn)
+        print("start install apk12")
        iconSavePath = "{}/.local/share/icons/hicolor/256x256/apps/{}.png".format(get_home(), GetApkPackageName(path))
+        tempstr1 = iconSavePath
+        print("start install apk1")
+        iconSaveDir = os.path.dirname(iconSavePath)
+        if not os.path.exists(iconSaveDir):
+          os.makedirs(iconSaveDir,exist_ok=True)
        SaveApkIcon(path, iconSavePath)
+        print("start install apk2")
        BuildUengineDesktop(GetApkPackageName(path), GetApkActivityName(path), GetApkChineseLabel(path), iconSavePath,
                            "{}/{}.desktop".format(get_desktop_path(), GetApkPackageName(path)))
+        print("start install apk3")
        BuildUengineDesktop(GetApkPackageName(path), GetApkActivityName(path), GetApkChineseLabel(path), iconSavePath,
-                            "{}/.local/share/applications/{}.desktop".format(get_home(), GetApkPackageName(path)))
+                            "{}/.local/share/applications/uengine/{}.desktop".format(get_home(), GetApkPackageName(path)))
+        print("\nprint install complete")
        if quit:
            print(commandReturn)
            return
        messagebox.showinfo(title="提示", message="操作完成！")
-        findApkHistory.append(combobox1.get())
-        combobox1['value'] = findApkHistory
+        findApkHistory.append(ComboInstallPath.get())
+        ComboInstallPath['value'] = findApkHistory
        write_txt(get_home() + "/.config/uengine-runner/FindApkHistory.json", str(json.dumps(ListToDictionary(findApkHistory))))  # 将历史记录的数组转换为字典并写入
    except:
        traceback.print_exc()
@@ -111,13 +133,15 @@ def InstallApk(path: "apk 路径", quit: "是否静默安装" = False):
 def DisabledAndEnbled(choose: "启动或者禁用")->"禁用或启动所有控件":
    userChoose = {True: tk.DISABLED, False: tk.NORMAL}
    a = userChoose[choose]
-    combobox1.configure(state=a)
-    combobox3.configure(state=a)
-    button2.configure(state=a)
-    button3.configure(state=a)
-    button5.configure(state=a)
-    button7.configure(state=a)
-    button8.configure(state=a)
+    ComboInstallPath.configure(state=a)
+    ComboUninstallPath.configure(state=a)
+    BtnFindApk.configure(state=a)
+    BtnInstall.configure(state=a)
+    BtnShowUengineApp.configure(state=a)
+    BtnUninstallApkBrowser.configure(state=a)
+    BtnUninstall.configure(state=a)
+    Btngeticon.configure(state=a)
+    BtnSaveApk.configure(state=a)

 # 需引入 subprocess
 # 运行系统命令并获取返回值
@@ -141,12 +165,12 @@ def about_this_program()->"显示“关于这个程序”窗口":
    message = ttk.Frame(mess)
    mess.resizable(0, 0)
    mess.title("关于 {}".format(title))
-    mess.iconphoto(False, tk.PhotoImage(file=iconPath))
+    #mess.iconphoto(False, tk.PhotoImage(file=iconPath))
    img = ImageTk.PhotoImage(Image.open(iconPath))
-    label1 = ttk.Label(message, image=img)
+    LabApkPath = ttk.Label(message, image=img)
    label2 = ttk.Label(message, text=about)
    button1 = ttk.Button(message, text="确定", command=mess.withdraw)
-    label1.pack()
+    LabApkPath.pack()
    label2.pack()
    button1.pack(side="bottom")
    message.pack()
@@ -250,16 +274,14 @@ def readtxt(path: "路径")->"读取文本文档":

 # 写入文本文档
 def write_txt(path: "路径", things: "内容")->"写入文本文档":
+    TxtDir = os.path.dirname(path)
+    print(TxtDir)
+    if not os.path.exists(TxtDir):
+        os.makedirs(TxtDir,exist_ok=True)    
    file = open(path, 'w', encoding='UTF-8')  # 设置文件对象
    file.write(things)  # 写入文本
    file.close()  # 关闭文本对象

-# 显示本程序所有使用的程序
-def ShowUseProgram()->"显示本程序所有使用的程序":
-    global title
-    global useProgram
-    messagebox.showinfo(title="{} 使用的程序列表（部分）".format(title), message=useProgram)
-
 # 获取 aapt 的所有信息
 def GetApkInformation(apkFilePath: "apk 所在路径")->"获取 aapt 的所有信息":
    return GetCommandReturn("aapt dump badging '{}'".format(apkFilePath))
@@ -316,22 +338,167 @@ def GetApkChineseLabel(apkFilePath)->"获取软件的中文名称":
            return line

 # 获取图标在包内的路径
-def GetApkIconInApk(apkFilePath)->"获取图标在包内的路径":
-    info = GetApkInformation(apkFilePath)
-    for line in info.split('\n'):
-        if "application:" in line:
-            line = line[line.index("icon='"): -1]
-            line = line.replace("icon='", "")
-            if "'" in line:
-                line = line[0: line.index("'")]
-            return line
+#def GetApkIconInApk(apkFilePath)->"获取图标在包内的路径":
+
+#合并两个函数到一起
+def SaveApkIcon(apkFilePath, iconSavePath)->"获取 apk 文件的图标":
+    try:
+        info = GetApkInformation(apkFilePath)
+        for line in info.split('\n'):
+            if "application:" in line:
+                xmlpath = line.split(":")[-1].split()[-1].split("=")[-1].replace("'","")  
+                if xmlpath.endswith('.xml'):
+                        xmlsave = getsavexml()
+                        print(xmlpath)
+                        xmlsave.savexml(apkFilePath,xmlpath,iconSavePath)
+                else:
+                    zip = zipfile.ZipFile(apkFilePath)
+                    iconData = zip.read(xmlpath)
+                    with open(iconSavePath, 'w+b') as saveIconFile:
+                        saveIconFile.write(iconData)
+    except:
+        traceback.print_exc()
+        print("Error, show defult icon")
+        shutil.copy(programPath + "/defult.png", iconSavePath)
+
+def saveicon():
+    global temppath
+    global tempstr1
+    iconSavePath = "{}/.local/share/icons/hicolor/256x256/apps/{}.png".format(get_home(), GetApkPackageName(temppath))
+    print(iconSavePath+"iconpaths")
+    SaveApkIcon(temppath, iconSavePath)
+
+def SaveIconToOtherPath():
+    apkPath = ComboInstallPath.get()
+    if apkPath == "":
+        messagebox.showerror(title="错误", message="你没有选择 apk 文件")
+        return
+    path = filedialog.asksaveasfilename(title="保存图标", filetypes=[("PNG 图片", "*.png"), ("所有文件", "*.*")], initialdir=json.loads(readtxt(get_home() + "/.config/uengine-runner/SaveApkIcon.json"))["path"])
+    if not path == "":
+        try:
+            SaveApkIcon(apkPath, path)
+        except:
+            traceback.print_exc()
+            messagebox.showerror(title="错误", message="本程序不支持保存该 apk 的图标")
+            return
+        write_txt(get_home() + "/.config/uengine-runner/SaveApkIcon.json", json.dumps({"path": os.path.dirname(path)}))  # 写入配置文件
+        findApkHistory.append(ComboInstallPath.get())
+        ComboInstallPath['value'] = findApkHistory
+        write_txt(get_home() + "/.config/uengine-runner/FindApkHistory.json", str(json.dumps(ListToDictionary(findApkHistory))))  # 将历史记录的数组转换为字典并写入
+        messagebox.showinfo(title="提示", message="保存成功！")
+
+## 获取 apk 文件的图标（部分程序不支持）
+# def SaveApkIcon(apkFilePath, iconSavePath)->"获取 apk 文件的图标（部分程序不支持）":
+#    zip = zipfile.ZipFile(apkFilePath)
+#    iconData = zip.read(GetApkIconInApk(apkFilePath))
+#    with open(iconSavePath, 'w+b') as saveIconFile:
+#        saveIconFile.write(iconData)
+
+def BackUengineClean()->"清空 uengine 数据":
+    print("Choose")
+    if messagebox.askokcancel(title="警告", message="清空后数据将会完全丢失，确定要继续吗？"):
+        DisabledAndEnbled(True)
+        try:
+            if os.path.exists("{}/.local/share/applications/uengine/".format(get_home())):
+                shutil.rmtree("{}/.local/share/applications/uengine/".format(get_home()))
+        except:
+            traceback.print_exc()
+            messagebox.showerror(title="错误", message=traceback.format_exc())
+        InstallWindow.ShowWindows("pkexec rm -rfv /data/uengine")
+        return
+    print("Choose False")
+
+def UengineBridgeStart()->"启用 uengine 网络桥接":
+    DisabledAndEnbled(True)
+    os.system("pkexec uengine-bridge.sh start")
+    DisabledAndEnbled(False)
+
+def UengineBridgeStop()->"关闭 uengine 网络桥接":
+    DisabledAndEnbled(True)
+    os.system("pkexec uengine-bridge.sh stop")
+    DisabledAndEnbled(False)
+
+def UengineBridgeRestart()->"重启 uengine 网络桥接":
+    DisabledAndEnbled(True)
+    os.system("pkexec uengine-bridge.sh restart")
+    DisabledAndEnbled(False)
+
+def UengineBridgeReload()->"加载 uengine 网络桥接":
+    DisabledAndEnbled(True)
+    os.system("pkexec uengine-bridge.sh reload")
+    DisabledAndEnbled(False)
+
+def UengineBridgeForceReload()->"强制加载 uengine 网络桥接":
+    DisabledAndEnbled(True)
+    os.system("pkexec uengine-bridge.sh force-reload")
+    DisabledAndEnbled(False)
+
+def StartUengine()->"启用 uengine 服务":
+    DisabledAndEnbled(True)
+    os.system("systemctl enable uengine-container uengine-session && systemctl start uengine-container uengine-session")
+    DisabledAndEnbled(False)
+
+def StopUengine()->"关闭 uengine 服务":
+    DisabledAndEnbled(True)
+    os.system("systemctl disable uengine-container uengine-session")
+    DisabledAndEnbled(False)
+
+def UengineRestart()->"重启 uengine 服务":
+    DisabledAndEnbled(True)
+    os.system("systemctl restart uengine*")
+    DisabledAndEnbled(False)
+
+class InstallWindow():
+    def ShowWindows(command):
+        global message
+        global text
+        global installTipsText
+        global progressbar
+        message = tk.Toplevel()
+        message.iconphoto(False, tk.PhotoImage(file=iconPath))
+        messageFrame = ttk.Frame(message)
+        installTipsText = tk.StringVar()
+        message.title("正在操作……")
+        installTipsText.set("正在操作……")
+        installTips = ttk.Label(messageFrame, textvariable=installTipsText)
+        progressbar = ttk.Progressbar(messageFrame, length=500, mode='indeterminate')
+        text = tk.Text(messageFrame)
+        text.config(background="black", foreground="white")
+        installTips.pack()
+        progressbar.pack(fill="x")
+        text.pack(expand='yes', fill='both')
+        messageFrame.pack(expand='yes', fill='both')
+        print("Run!")
+        threading.Thread(target=InstallWindow.RunCommand, args=[command]).start()
+        message.mainloop()
+    
+    def RunCommand(command):
+        global message
+        global text
+        global progressbar
+        global installTipsText
+        InstallWindow.AddText("$>" + command + "\n")
+        progressbar.start()
+        result = subprocess.getoutput(command)
+        InstallWindow.AddText(result)
+        messagebox.showinfo(title="提示", message="操作完毕！")
+        installTipsText.set("操作完毕！")
+        message.title("操作完毕！")
+        progressbar.stop()
+        progressbar["value"] = 100
+        # 特意添加！
+        DisabledAndEnbled(False)
+        print("Clean!")
+        if messagebox.askyesno(title="提示", message="清空完毕，将会在重启后生效，是否要重启？"):
+            print("reboot")
+            os.system("reboot")
+
+    def AddText(things):
+        global text
+        text.configure(state=tk.NORMAL)
+        text.insert("end", things)
+        text.configure(state=tk.DISABLED)

-# 获取 apk 文件的图标（部分程序不支持）
-def SaveApkIcon(apkFilePath, iconSavePath)->"获取 apk 文件的图标（部分程序不支持）":
-    zip = zipfile.ZipFile(apkFilePath)
-    iconData = zip.read(GetApkIconInApk(apkFilePath))
-    with open(iconSavePath, 'w+b') as saveIconFile:
-        saveIconFile.write(iconData)

 # 获取用户桌面目录
 def get_desktop_path()->"获取用户桌面目录":
@@ -348,38 +515,215 @@ def get_desktop_path()->"获取用户桌面目录":
            get = get.replace("$HOME", get_home())  # 则把其替换为用户目录（～）
        return get  # 返回目录

+def SaveInstallUengineApp():
+    while True:
+        result = simpledialog.askstring(title="输入apk包名", prompt="请输入要获取的apk包名以便进行下一步操作")
+        if result == "" or result == None:
+            return
+        if os.path.exists("/data/uengine/data/data/app/{}-1".format(result)):
+            break
+        messagebox.showerror(title="错误", message="路径不存在，请重试！")
+    path = filedialog.asksaveasfilename(title="保存apk", filetypes=[("APK 文件", "*.apk"), ("所有文件", "*.*")], initialdir=json.loads(readtxt(get_home() + "/.config/uengine-runner/SaveApk.json"))["path"])
+    if path == "" or path == ():
+        return
+    try:
+        shutil.copy("/data/uengine/data/data/app/{}-1/base.apk".format(result), path)
+        write_txt(get_home() + "/.config/uengine-runner/SaveApk.json", json.dumps({"path": os.path.dirname(path)}))
+        messagebox.showinfo(title="提示", message="提取完成！")
+    except:
+        traceback.print_exc()
+        messagebox.showerror(title="错误", message=traceback.format_exc())
+    
+    
+
 # 获取用户主目录
 def get_home()->"获取用户主目录":
    return os.path.expanduser('~')

+def CleanAllUengineDesktopLink():
+    if messagebox.askokcancel(title="提示", message="你确定要删除所有的 uengine 快捷方式吗？"):
+        try:
+            shutil.rmtree("{}/.local/share/applications/uengine".format(get_home()))
+            os.mkdir("{}/.local/share/applications/uengine".format(get_home()))
+            messagebox.showinfo(title="提示", message="删除完毕！")
+        except:
+            traceback.print_exc()
+            messagebox.showerror(title="错误", message=traceback.format_exc())
+
+class AddNewUengineDesktopLink():
+    addTips = '''可以输入app的包名和Activity或通过浏览apk文件来获取包名和Activity
+注意：如果是要删除只要输入包名即可'''
+    def ShowWindow():
+        global activityName
+        global packageName
+        message = tk.Toplevel()
+
+        tipsLabel = ttk.Label(message, text=AddNewUengineDesktopLink.addTips)
+        packageName = ttk.Combobox(message, width=30)
+        activityName = ttk.Combobox(message, width=30)
+        findApk = ttk.Button(message, text="浏览", command=AddNewUengineDesktopLink.FindApk)
+        controlFrame = ttk.Frame(message)
+        saveButton = ttk.Button(controlFrame, text="写入", command=AddNewUengineDesktopLink.SaveDesktopLink)
+        delButton = ttk.Button(controlFrame, text="删除", command=AddNewUengineDesktopLink.DelDesktopLink)
+
+        message.title("添加/删除 uengine 图标")
+        message.resizable(0, 0)
+        # get screen width and height
+        screen_width = message.winfo_screenwidth()
+        screen_height = message.winfo_screenheight()
+        # calculate position x and y coordinates  假设主窗口大小固定 570x236像素 ，设置窗口位置为屏幕中心。 
+        winwith=570
+        winhigh=236
+        x = (screen_width/2) - (winwith/2)
+        y = (screen_height/2) - (winhigh/2)
+        message.geometry("+{}+{}".format(int(x), int(y)))
+
+        packageName["value"] = findApkNameHistory
+        activityName["value"] = findApkActivityHistory
+        
+        tipsLabel.grid(row=0, column=0, columnspan=3)
+        packageName.grid(row=1, column=0)
+        activityName.grid(row=1, column=1)
+        findApk.grid(row=1, column=2)
+        controlFrame.grid(row=2, column=0, columnspan=3)
+        saveButton.grid(row=0, column=0)
+        delButton.grid(row=0, column=1)
+
+        message.mainloop()
+
+    def SaveDesktopLink():
+        if os.path.exists("{}/.local/share/applications/uengine/{}.desktop".format(get_home(), packageName.get())):
+            if not messagebox.askokcancel(title="提示", message="文件已存在，确定要覆盖吗？"):
+                return
+        global activityName
+        iconSavePath = "{}/.local/share/icons/hicolor/256x256/apps/{}.png".format(get_home(), packageName.get())
+        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()))
+        AddNewUengineDesktopLink.SaveHistory()
+        messagebox.showinfo(title="提示", message="创建完毕！")
+
+    def DelDesktopLink():
+        global packageName
+        if not os.path.exists("{}/.local/share/applications/uengine/{}.desktop".format(get_home(), packageName.get())):
+            messagebox.showerror(title="错误", message="此包名对应的uengine桌面快捷方式不存在！")
+            return
+        if not messagebox.askyesno(title="提示", message="你确定要删除吗？删除后将无法恢复！"):
+            return
+        try:
+            os.remove("{}/.local/share/applications/uengine/{}.desktop".format(get_home(), packageName.get()))
+            AddNewUengineDesktopLink.SaveHistory()
+            messagebox.showinfo(title="提示", message="已删除")
+        except:
+            traceback.print_exc()
+            messagebox.showerror(title="错误", message=traceback.format_exc())
+
+    def SaveHistory():
+        findApkNameHistory.append(packageName.get())
+        findApkActivityHistory.append(activityName.get())
+        packageName['value'] = findApkNameHistory
+        activityName['value'] = findApkActivityHistory
+        write_txt(get_home() + "/.config/uengine-runner/FindApkNameHistory.json", str(json.dumps(ListToDictionary(findApkNameHistory))))  # 将历史记录的数组转换为字典并写入 
+        write_txt(get_home() + "/.config/uengine-runner/FindApkActivityHistory.json", str(json.dumps(ListToDictionary(findApkActivityHistory))))  # 将历史记录的数组转换为字典并写入
+
+    def TestOpen():
+        threading.Thread(target=os.system, args=["/usr/bin/uengine-launch.sh --package={} --component={}".format(packageName.get(), activityName.get())]).start()
+        AddNewUengineDesktopLink.SaveHistory()
+
+    def FindApk():
+        path = filedialog.askopenfilename(title="选择apk", filetypes=[("APK 文件", "*.apk"), ("所有文件", "*.*")], initialdir=json.loads(readtxt(get_home() + "/.config/uengine-runner/FindApkName.json"))["path"])
+        if path == "" or path == ():
+            return
+        packageName.set(GetApkPackageName(path))
+        activityName.set(GetApkActivityName(path))
+        write_txt(get_home() + "/.config/uengine-runner/FindApkName.json", json.dumps({"path": os.path.dirname(path)}))  # 写入配置文件
+
 ###########################
 # 程序信息
 ###########################
 programUrl = "https://gitee.com/gfdgd-xi/uengine-runner"
-version = "1.2.3"
+version = "1.3.3"
 goodRunSystem = "Linux（deepin/UOS）"
 aaptVersion = GetCommandReturn("aapt version")
-about = '''一个基于 Python3 的 tkinter 制作的 uengine APK 安装器
-版本：{}
-适用平台：{}
-tkinter 版本：{}
-aapt 版本：{}
-程序官网：{}
-©2021-{} gfdgd xi'''.format(version, goodRunSystem, tk.TkVersion, aaptVersion,programUrl, time.strftime("%Y"))
-tips = '''提示：
+about = '''    一个基于 Python3 的 tkinter 制作的 uengine APK 运行器
+
+版本        ：{}
+
+适用平台    ：{}
+
+tkinter版本：{}
+
+aapt 版本  ：{}
+
+程序官网    ：{}
+
+©2021-{}'''.format(version, goodRunSystem, tk.TkVersion, aaptVersion,programUrl, time.strftime("%Y"))
+tips = '''    新版本Deepin/UOS发布后，可以在应用商店安装部分官方已适配的安卓应用，对爱好者来说，不能自己安装APK软件包始终差点意思，本程序可以为Deepin/UOS上的Uengine安卓运行环境安装自定义APK软件包，并能发送安装的APK包启动菜单到桌面或系统菜单。
+
+安装APK：
+    点浏览按钮，选中需要安装的APK，然后点安装按钮
+
+卸载APK：
+    在卸载APK下面的输入框内输入需要卸载的APK包名，点卸载按钮，如果无法获取包名，可以通过浏览APK文件程序自动获取包名进行卸载。
+
+保存APK图标：
+    在安装APK下面的输入框浏览或输入APK的路径，然后点击“保存图标”按钮，选择保存位置即可
+
+重置（删除）uengine 数据：
+    点击菜单栏的“uengine”的“清空uengine数据”，输入密码重启即可
+    注意：如果任何安卓一遍打不开，多打开几遍应该就可以重新加载uengine配置了
+
+打开Uengine应用列表：
+    打开系统已安装的应用列表（安卓界面）
+
+提示：
 1、需要你有使用 root 权限的能力；
 2、需要安装 uengine 才能使用；
-3、如果报错是有关产生 .deksotp 文件有关，一般可以打开程序列表安装。
-如果想要连接其他手机，请使用 1.2.0 以前的版本，可以使用 adb 连接。'''
-updateThingsString = '''※1、修改了 deb 的打包，防止部分需要库没有安装;
-2、修改了一个弱智错误'''
+3、提取 apk 图标的 apk 路径以“安装 apk”那栏为准;
+4、如果想要连接其他手机，请使用 1.2.0 以前的版本，可以使用 adb 连接。
+'''
+updateThingsString = '''V1.3.3：
+※1、添加新版打包方式（deepin打包方式）;
+※2、支持测试运行/创建/删除uengine图标;
+※3、支持提取安装的apk;
+4、修改菜单栏布局;
+
+V.1.3.2：
+※1、支持uengine数据重置;
+※2、支持修改uengine网络桥接的启动状态;
+※3、支持右键安装/卸载;
+※4、支持启用或禁用uengine;
+※5、修复打包问题，不会出现“dpkg:警告:卸载spark-uengine-runner时，目录/opt/apps/uengine-runner非空，因而不会删除该目录”的错误;
+
+V1.3.1：
+※1、修复打包问题，防止部分用户安装出错的问题;
+※2、修复了程序无法提取图标时可以提取默认图标使用;
+
+V1.3.0：
+※1、修改了界面布局;
+※2、修复大多数新安装普通用户的路图标及启动菜单文件路径不存在导致安装APK报错的bugs;
+3、删除少量冗余代码，调整代码顺序;
+4、支持提取apk图标。
+
+V1.2.3
+1、调整部分控件名称；
+2、调整界面布局及界面风格；
+
+V1.2.2
+1、对程序错误的显示更加人性化；
+'''
 title = "uengine 运行器 {}".format(version)
-updateTime = "2021年8月2日"
+updateTime = "2021年08月18日"
 updateThings = "{} 更新内容：\n{}\n更新时间：{}".format(version, updateThingsString, updateTime, time.strftime("%Y"))
+programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
 iconPath = "{}/icon.png".format(os.path.split(os.path.realpath(__file__))[0])
 desktop = "/opt/apps/uengine-runner/UengineAndroidProgramList.desktop"
 desktopName = "UengineAndroidProgramList.desktop"
-useProgram = '''1、uengine（anbox）
+contribute = '''gfdgd xi<3025613752@qq.com>
+actionchen<917981399@qq.com>'''
+useProgram = '''1、uengine相关软件包（基于anbox开发）
 2、Python3
 3、tkinter（tkinter.tk、ttkthemes 和 tkinter.ttk）
 4、aapt
@@ -388,89 +732,255 @@ useProgram = '''1、uengine（anbox）
 ###########################
 # 加载配置
 ###########################
+if not os.path.exists("{}/.local/share/applications/uengine/".format(get_home())):
+    os.mkdir("{}/.local/share/applications/uengine/".format(get_home()))
 if not os.path.exists(get_home() + "/.config/uengine-runner"):  # 如果没有配置文件夹
    os.mkdir(get_home() + "/.config/uengine-runner")  # 创建配置文件夹
 if not os.path.exists(get_home() + "/.config/uengine-runner/FindApkHistory.json"):  # 如果没有配置文件
    write_txt(get_home() + "/.config/uengine-runner/FindApkHistory.json", json.dumps({}))  # 创建配置文件
+if not os.path.exists(get_home() + "/.config/uengine-runner/FindApkNameHistory.json"):  # 如果没有配置文件
+    write_txt(get_home() + "/.config/uengine-runner/FindApkNameHistory.json", json.dumps({}))  # 创建配置文件
+if not os.path.exists(get_home() + "/.config/uengine-runner/FindApkActivityHistory.json"):  # 如果没有配置文件
+    write_txt(get_home() + "/.config/uengine-runner/FindApkActivityHistory.json", json.dumps({}))  # 创建配置文件
 if not os.path.exists(get_home() + "/.config/uengine-runner/FindUninstallApkHistory.json"):  # 如果没有配置文件
    write_txt(get_home() + "/.config/uengine-runner/FindUninstallApkHistory.json", json.dumps({}))  # 创建配置文件
+if not os.path.exists(get_home() + "/.config/uengine-runner/FindApkName.json"):  # 如果没有配置文件
+    write_txt(get_home() + "/.config/uengine-runner/FindApkName.json", json.dumps({"path": "~"}))  # 写入（创建）一个配置文件
 if not os.path.exists(get_home() + "/.config/uengine-runner/FindApk.json"):  # 如果没有配置文件
    write_txt(get_home() + "/.config/uengine-runner/FindApk.json", json.dumps({"path": "~"}))  # 写入（创建）一个配置文件
 if not os.path.exists(get_home() + "/.config/uengine-runner/FindUninstallApk.json"):  # 如果没有配置文件
    write_txt(get_home() + "/.config/uengine-runner/FindUninstallApk.json", json.dumps({"path": "~"}))  # 写入（创建）一个配置文件
+if not os.path.exists(get_home() + "/.config/uengine-runner/SaveApkIcon.json"):  # 如果没有配置文件
+    write_txt(get_home() + "/.config/uengine-runner/SaveApkIcon.json", json.dumps({"path": "~"}))  # 写入（创建）一个配置文件
+if not os.path.exists(get_home() + "/.config/uengine-runner/SaveApk.json"):  # 如果没有配置文件
+    write_txt(get_home() + "/.config/uengine-runner/SaveApk.json", json.dumps({"path": "~"}))  # 写入（创建）一个配置文件

 ###########################
 # 设置变量
 ###########################
 findApkHistory = list(json.loads(readtxt(get_home() + "/.config/uengine-runner/FindApkHistory.json")).values())
 fineUninstallApkHistory = list(json.loads(readtxt(get_home() + "/.config/uengine-runner/FindUninstallApkHistory.json")).values())
+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())
+
+# add sub window
+#添加窗口开启关闭开关，防止重复开启
+windowflag = "close"
+
+def showhelp():
+     
+    #define  window and frame and button label   
+    # 
+    global windowflag
+    if windowflag == "close":
+        helpwindow=tk.Toplevel()
+        helpwindow.resizable(0, 0)
+        helpwindow.title("帮助")
+        
+
+        # get screen width and height
+        screen_width = helpwindow.winfo_screenwidth()
+        screen_height = helpwindow.winfo_screenheight()
+        # calculate position x and y coordinates  假设主窗口大小固定 570x236像素 ，设置窗口位置为屏幕中心。
+        winwith=550
+        winhigh=700
+        x = (screen_width/2) - (winwith/2)
+        y = (screen_height/2) - (winhigh/2)
+        
+        helpwindow.geometry("550x700"+"+{:.0f}+{:.0f}".format(x, y))
+
+        style = ttkthemes.ThemedStyle(helpwindow)
+        style.set_theme("breeze")
+        
+        
+
+        Frmroot=ttk.Frame(helpwindow)
+        FrmMenu = ttk.Frame(Frmroot)
+        FrmText = ttk.Frame(Frmroot)
+
+        LabFrmText=ttk.LabelFrame(FrmText,text="帮助",height=800,borderwidth=3)  
+        HelpStr = tk.StringVar() 
+        HelpStr.set(tips)
+        LabText = ttk.Label(LabFrmText, textvariable=HelpStr,width=55)
+        LabText.config(wraplength=350)
+        
+        def on_closing():
+            global windowflag
+            windowflag = "close"
+            print(windowflag)
+            helpwindow.destroy()
+
+
+
+        # define button func        
+        def ChgLog():
+            HelpStr.set(updateThingsString)
+        def ChgAbout():
+            HelpStr.set(about)
+        def ChgDep():
+            HelpStr.set(useProgram)
+        def ChgCon():
+            HelpStr.set(contribute)
+        def ChgTips():
+            HelpStr.set(tips)
+            LabText.config(wraplength=350)
+
+        BtnReadme = ttk.Button(FrmMenu, text="使用说明",width=14,command=ChgTips)
+        BtnLog = ttk.Button(FrmMenu, text="更新内容",width=14,command=ChgLog)
+        BtnZujian = ttk.Button(FrmMenu, text="程序依赖的组件",width=14,command=ChgDep)
+        BtnGongxian = ttk.Button(FrmMenu, text="有贡献的开发者",width=14,command=ChgCon)
+        BtnAbout = ttk.Button(FrmMenu, text="关于",width=14,command=ChgAbout)
+
+
+        #layout
+        FrmMenu.grid(row=0,column=0,sticky=tk.NW)
+        BtnReadme.grid(row=0,column=0,sticky=tk.NW,padx=3)
+        BtnLog.grid(row=1,column=0,sticky=tk.NW,padx=3)
+        BtnZujian.grid(row=2,column=0,sticky=tk.NW,padx=3)
+        BtnGongxian.grid(row=3,column=0,sticky=tk.NW,padx=3)
+        BtnAbout.grid(row=4,column=0,sticky=tk.NW,padx=3)
+
+        FrmText.grid(row=0,column=1,sticky=tk.NW)
+        LabFrmText.grid(row=0,column=0,sticky=tk.NW,padx=3,pady=3)
+        LabText.grid(row=0,column=0,sticky=tk.NW)
+      
+        Frmroot.pack()
+        windowflag = "open"
+        print(windowflag)
+        #helpwindow.mainloop()
+        helpwindow.protocol("WM_DELETE_WINDOW", on_closing)
+

 ###########################
 # 窗口创建
 ###########################
 win = tk.Tk()  # 创建窗口
-# 设置窗口所需的全局变量
-checkButtonBool1 = tk.BooleanVar()
+
 # 设置窗口
 style = ttkthemes.ThemedStyle(win)
-style.set_theme("adapta")
+style.set_theme("breeze")
 window = ttk.Frame(win)
 win.attributes('-alpha', 0.5)
 win.title(title)
 win.resizable(0, 0)
 win.iconphoto(False, tk.PhotoImage(file=iconPath))
+
+# get screen width and height
+screen_width = win.winfo_screenwidth()
+screen_height = win.winfo_screenheight()
+# calculate position x and y coordinates  假设主窗口大小固定 570x236像素 ，设置窗口位置为屏幕中心。 
+winwith=570
+winhigh=236
+x = (screen_width/2) - (winwith/2)
+y = (screen_height/2) - (winhigh/2)
+
+win.geometry(""+"+{:.0f}+{:.0f}".format(x, y))
+
 # 创建控件
-frame1 = ttk.Frame(window)
-frame2 = ttk.Frame(window)
-frame3 = ttk.Frame(window)
-label1 = ttk.Label(window, text="要安装的 apk 路径：")
-label3 = ttk.Label(window, text="要卸载的包名或程序对应的 APK 文件：")
-combobox1 = ttk.Combobox(window, width=100)
-combobox3 = ttk.Combobox(window, width=100)
-button2 = ttk.Button(window, text="浏览", command=FindApk)
-button3 = ttk.Button(frame2, text="安装", command=Button3Install)
-button5 = ttk.Button(frame2, text="打开 uengine 应用列表", command=Button5Click)
-button7 = ttk.Button(window, text="浏览", command=ButtonClick7)
-button8 = ttk.Button(frame3, text="卸载", command=ButtonClick8)
+FrmInstall = ttk.Frame(window)
+FrmUninstall = ttk.Frame(window)
+LabApkPath = ttk.Label(window, text="安装APK：")
+LabUninstallPath = ttk.Label(window, text="卸载APK：")
+ComboInstallPath = ttk.Combobox(window, width=50)
+ComboUninstallPath = ttk.Combobox(window, width=50)
+BtnFindApk = ttk.Button(FrmInstall, text="浏览", command=FindApk)
+BtnInstall = ttk.Button(FrmInstall, text="安装", command=Button3Install)
+BtnShowUengineApp = ttk.Button(window, text="打开 uengine 应用列表", command=Button5Click)
+BtnUninstallApkBrowser = ttk.Button(FrmUninstall, text="浏览", command=BtnFindUninstallApkClk)
+BtnUninstall = ttk.Button(FrmUninstall, text="卸载", command=ButtonClick8)
+Btngeticon = ttk.Button(FrmInstall, text="保存图标", command=SaveIconToOtherPath)
+BtnSaveApk = ttk.Button(FrmInstall, text="保存apk", command=SaveInstallUengineApp)
 # 设置菜单栏
 menu = tk.Menu(window, background="white")  
+
 programmenu = tk.Menu(menu, tearoff=0, background="white")  # 设置“程序”菜单栏
 uengine = tk.Menu(menu, tearoff=0, background="white")
 help = tk.Menu(menu, tearoff=0, background="white")  # 设置“帮助”菜单栏
+
+uengineService = tk.Menu(uengine)
+uengineInternet = tk.Menu(uengine)
+uengineIcon = tk.Menu(uengine)
+
 menu.add_cascade(label="程序", menu=programmenu)
 menu.add_cascade(label="uengine", menu=uengine)
-menu.add_cascade(label="帮助", menu=help)
+menu.add_cascade(label="关于", menu=help)
+
 programmenu.add_command(label="清空软件历史记录", command=CleanProgramHistory)
 programmenu.add_separator()  # 设置分界线
-programmenu.add_command(label="退出程序", command=window.quit)  # 设置“退出程序”项
-uengine.add_command(label="发送 uengine 应用列表到桌面", command=SendUengineAndroidListForDesktop)
-uengine.add_command(label="发送 uengine 应用列表到启动器", command=SendUengineAndroidListForLauncher)
+programmenu.add_command(label="退出程序", command=window.quit)  # 设置“退出程序”
+
+uengine.add_cascade(label="uengine 服务", menu=uengineService)
+uengine.add_cascade(label="uengine 网络桥接", menu=uengineInternet)
+uengine.add_cascade(label="uengine 快捷方式", menu=uengineIcon)
+uengine.add_command(label="清空 uengine 数据", command=BackUengineClean)
+
 help.add_command(label="程序官网", command=OpenProgramURL)  # 设置“程序官网”项
-help.add_separator()
-help.add_command(label="小提示", command=helps)  # 设置“小提示”项
-help.add_command(label="更新内容", command=UpdateThings)  # 设置“更新内容”项
-help.add_command(label="这个程序使用的程序列表（部分）", command=ShowUseProgram)  # 设置“更新内容”项
-help.add_command(label="关于这个程序", command=about_this_program)  # 设置“关于这个程序”项
-menu.configure(activebackground="white")
-help.configure(activebackground="white")
-uengine.configure(activebackground="white")
-programmenu.configure(activebackground="white")
+help.add_command(label="帮助", command=showhelp)  # 设置“关于这个程序”项
+
+uengineService.add_command(label="启用 uengine 服务", command=StartUengine)
+uengineService.add_command(label="关闭 uengine 服务", command=StopUengine)
+uengineService.add_command(label="重启 uengine 服务", command=UengineRestart)
+
+uengineInternet.add_command(label="启用 uengine 网络桥接", command=UengineBridgeStart)
+uengineInternet.add_command(label="关闭 uengine 网络桥接", command=UengineBridgeStop)
+uengineInternet.add_command(label="重启 uengine 网络桥接", command=UengineBridgeRestart)
+uengineInternet.add_command(label="加载 uengine 网络桥接", command=UengineBridgeReload)
+uengineInternet.add_command(label="强制加载 uengine 网络桥接", command=UengineBridgeForceReload)
+
+uengineIcon.add_command(label="发送 uengine 应用列表到桌面", command=SendUengineAndroidListForDesktop)
+uengineIcon.add_command(label="发送 uengine 应用列表到启动器", command=SendUengineAndroidListForLauncher)
+uengineIcon.add_separator()
+uengineIcon.add_command(label="添加/删除指定的 uengine 快捷方式", command=AddNewUengineDesktopLink.ShowWindow)
+uengineIcon.add_separator()
+uengineIcon.add_command(label="清空所有 uengine 快捷方式", command=CleanAllUengineDesktopLink)
+
+menu.configure(activebackground="dodgerblue")
+help.configure(activebackground="dodgerblue")
+uengine.configure(activebackground="dodgerblue")
+programmenu.configure(activebackground="dodgerblue")
+uengineService.configure(activebackground="dodgerblue")
+uengineInternet.configure(activebackground="dodgerblue")
+uengineIcon.configure(activebackground="dodgerblue")
+
 # 设置控件
-combobox3['value'] = fineUninstallApkHistory
-combobox1['value'] = findApkHistory
+ComboUninstallPath['value'] = fineUninstallApkHistory
+ComboInstallPath['value'] = findApkHistory
+try:
+    if sys.argv[1] == "-i":
+        ComboInstallPath.set(sys.argv[2])
+        print("Install Path: " + sys.argv[2])
+    elif sys.argv[1] == "-u":
+        ComboUninstallPath.set(sys.argv[2])
+        print("Unstall Path: " + sys.argv[2])
+    else:
+        print("Command Format Error")
+except:
+    print("Not Command Or Command Format Error")
 # 显示控件
 win.config(menu=menu)  # 显示菜单栏
-label1.grid(row=2, column=0)
-label3.grid(row=4, column=0)
-combobox1.grid(row=2, column=1)
-combobox3.grid(row=4, column=1)
-button2.grid(row=2, column=2)
-button3.grid(row=0, column=0)
-button5.grid(row=0, column=1)
-button7.grid(row=4, column=2)
-button8.grid(row=0, column=1)
-frame1.grid(row=1, columnspa=3)
-frame2.grid(row=3, columnspa=3)
-frame3.grid(row=5, columnspa=3)
+
+
+
+LabApkPath.grid(row=1, column=0,sticky= tk.W,padx=3)
+ComboInstallPath.grid(row=2, column=0,padx=3)
+
+
+FrmInstall.grid(row=2, column=1,padx=3)
+BtnFindApk.grid(row=0, column=0)
+BtnInstall.grid(row=0, column=1)
+
+LabUninstallPath.grid(row=3, column=0,sticky= tk.W,padx=3)
+ComboUninstallPath.grid(row=4, column=0,padx=3)
+
+FrmUninstall.grid(row=4, column=1,padx=3)
+BtnUninstallApkBrowser.grid(row=0, column=0)
+BtnUninstall.grid(row=0, column=1)
+
+BtnShowUengineApp.grid(row=5, column=0,sticky= tk.W,padx=3,pady=2)
+
+Btngeticon.grid(row=1, column=0,sticky= tk.W,padx=3,pady=2)
+BtnSaveApk.grid(row=1, column=1,sticky= tk.W,padx=3,pady=2)
+
 window.pack()
-win.mainloop()
+
+win.mainloop()
--- a/new-deb-build/DEBIAN/control
+++ b/new-deb-build/DEBIAN/control
@@ -0,0 +1,11 @@
+Package: com.gitee.uengine.runner.spark
+Source: spark-uengine-runner
+Version: 1.3.2
+Architecture: all
+Maintainer: gfdgd xi <3025613752@qq.com>, actionchen<917981399@qq.com>
+Depends: deepin-elf-verify (>= 0.0.16.7-1), python3, python3-tk, python3-pip, aapt, adb, python3-pil, python3-setuptools, uengine
+Section: utils
+Priority: optional
+Conflicts: spark-uengine-runner
+Homepage: [https://gitee.com/gfdgd-xi/uengine-runner, https://github.com/gfdgd-xi/uengine-runner]
+Description: uengine runner for deepin and UOS
--- a/new-deb-build/DEBIAN/postinst
+++ b/new-deb-build/DEBIAN/postinst
@@ -0,0 +1,3 @@
+#!/bin/sh 
+python3 -m pip install --upgrade ttkthemes
+ln -s /opt/apps/com.gitee.uengine.runner.spark/files/uengine-runner /usr/bin/uengine-runner
--- 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
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Categories=System;
+Comment=uengine（anbox） 程序菜单
+Encoding=UTF-8
+Exec=/usr/bin/uengine-launch.sh --package=org.anbox.appmgr --component=org.anbox.appmgr.AppViewActivity
+Icon=/opt/apps/com.gitee.uengine.runner.spark/files/icon.png
+MimeType=
+Name=uengine 程序菜单
+StartupWMClass=uengine 程序菜单
+Terminal=false
+Type=Application
--- 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
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Categories=System;
+Terminal=false
+Exec=/usr/bin/uengine-runner -i %F
+Icon=/opt/apps/com.gitee.uengine.runner.spark/files/icon.png
+Name=Install APK(uengine runner)
+Comment=Install APK(uengine runner)
+Comment[zh]=安装 APK（uengine 运行器）
+Name[zh]=安装 APK（uengine 运行器）
+StartupNotify=true
+Hidden=false
+NoDisplay=true
+MimeType=application/vnd.android.package-archive
--- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/entries/applications/spark-uengine-uninstall.desktop
+++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/entries/applications/spark-uengine-uninstall.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Categories=System;
+Terminal=false
+Exec=/usr/bin/uengine-runner -u %F
+Icon=/opt/apps/com.gitee.uengine.runner.spark/files/icon.png
+Name=Uninstall APK(uengine runner)
+Comment=Uninstall APK(uengine runner)
+Comment[zh]=卸载 APK（uengine 运行器）
+Name[zh]=卸载 APK（uengine 运行器）
+StartupNotify=true
+Hidden=false
+NoDisplay=true
+MimeType=application/vnd.android.package-archive
--- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/entries/applications/uengine-runner.desktop
+++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/entries/applications/uengine-runner.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Categories=System;
+Terminal=false
+Exec=/usr/bin/uengine-runner
+Icon=/opt/apps/com.gitee.uengine.runner.spark/files/icon.png
+Name=uengine runner
+Comment=uengine runner
+Comment[zh]=uengine 运行器
+Name[zh]=uengine 运行器
+StartupNotify=true
+MimeType=
--- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/UengineAndroidProgramList.desktop
+++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/UengineAndroidProgramList.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Categories=System;
+Comment=uengine（anbox） 程序菜单
+Encoding=UTF-8
+Exec=/usr/bin/uengine-launch.sh --package=org.anbox.appmgr --component=org.anbox.appmgr.AppViewActivity
+Icon=/opt/apps/uengine-runner/icon.png
+MimeType=
+Name=uengine 程序菜单
+StartupWMClass=uengine 程序菜单
+Terminal=false
+Type=Application
--- 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
--- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/defult.png
+++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/defult.png
--- 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
@@ -0,0 +1,115 @@
+import PIL.Image as Image
+import PIL.ImageDraw as ImageDraw
+import zipfile
+import subprocess
+import re
+
+class getsavexml():
+
+    def savexml(self,apkFilePath,xmlpath,iconSavePath):
+        cmddumpid = "aapt dump xmltree "+ apkFilePath + " " + xmlpath
+        print(cmddumpid)
+        xmltree =  subprocess.getoutput(cmddumpid)
+        xmls = xmltree.splitlines()
+        # find strs ,print next line
+        def FindStrs(lines,strs):
+            i=0
+            while i < len(lines):
+                if re.search(strs,lines[i]):
+                    tmpstr = lines[i+1]
+                    i += 1
+                    Resultstr = tmpstr.split(":")[-1].split("=")[-1].split("0x")[-1] 
+                    return Resultstr
+                else:
+                    i += 1
+        #从apk的信息中获取前后景图片的ID号
+        backimgid =  FindStrs(xmls,"background")
+        foreimgid =  FindStrs(xmls,"foreground")
+        print(backimgid)
+        print(foreimgid)
+
+        # 直接从apk resource文件获取前后两层图片路径及ID字符串
+        resource =  subprocess.getoutput("aapt dump --values resources " +  apkFilePath + "| grep -iE -A1 " +  "\"" + backimgid + "|" + foreimgid + "\"")
+        resourcelines = resource.splitlines()
+        print(resourcelines)
+
+        # 从过滤出的字符串中获取所有相同ID的图片路径
+        def Findpicpath(lines,imgid):
+            i=0
+            Resultstr = []
+            while i < len(lines):
+                if re.search(imgid,lines[i]) and re.search("string8",lines[i+1]) :
+                    print(lines[i+1])
+                    tmpstr = lines[i+1].replace("\"","")
+                    i += 1 
+                    Resultstr.append(tmpstr.split()[-1])
+                else:
+                    i += 1
+            return Resultstr
+
+        #获取所有带前后图片ID的图片路径（相同背景或者前景的图片ID但分辨率不一样）
+        backimgs =  Findpicpath(resourcelines,backimgid)
+        foreimgs =  Findpicpath(resourcelines,foreimgid)
+
+        #获取分辨率最高的图片路径
+        def getmaxsize(imgs):
+            j = 0
+            size=(0,0)
+            zipapk = zipfile.ZipFile(apkFilePath)
+            while j < len(imgs):
+                img = Image.open(zipapk.open(imgs[j]))
+                print(imgs[j])
+                print(img.size)
+                if size < img.size:
+                    size = img.size
+                    imgpath = imgs[j]
+                j += 1
+            return imgpath
+
+        # 获取到文件列表后，进行比较分辨率，选取分辨率最高的张图片
+        iconbackpath = getmaxsize(backimgs)
+        iconforepath = getmaxsize(foreimgs)
+        print(iconbackpath + " " + iconforepath)
+
+        #从APK文件获取最终图片
+        zipapk = zipfile.ZipFile(apkFilePath)
+        iconback = zipapk.open(iconbackpath)
+        iconfore = zipapk.open(iconforepath)
+
+
+        # 叠加图片，mask 设置前景为蒙版
+        iconbackimg =  Image.open(iconback).convert("RGBA")
+        iconforeimg =  Image.open(iconfore).convert("RGBA")
+        iconbackimg.paste(iconforeimg,mask=iconforeimg)
+
+
+        # 圆角图片函数，网上拷贝的
+        def circle_corner(img, radii):  #把原图片变成圆角，这个函数是从网上找的，原址 https://www.pyget.cn/p/185266
+            """
+            圆角处理
+            :param img: 源图象。
+            :param radii: 半径，如：30。
+            :return: 返回一个圆角处理后的图象。
+            """
+            # 画圆（用于分离4个角）
+            circle = Image.new('L', (radii * 2, radii * 2), 0)  # 创建一个黑色背景的画布
+            draw = ImageDraw.Draw(circle)
+            draw.ellipse((0, 0, radii * 2, radii * 2), fill=255)  # 画白色圆形
+            # 原图
+            img = img.convert("RGBA")
+            w, h = img.size
+            # 画4个角（将整圆分离为4个部分）
+            alpha = Image.new('L', img.size, 255)
+            alpha.paste(circle.crop((0, 0, radii, radii)), (0, 0))  # 左上角
+            alpha.paste(circle.crop((radii, 0, radii * 2, radii)), (w - radii, 0))  # 右上角
+            alpha.paste(circle.crop((radii, radii, radii * 2, radii * 2)), (w - radii, h - radii))  # 右下角
+            alpha.paste(circle.crop((0, radii, radii, radii * 2)), (0, h - radii))  # 左下角
+            # alpha.show()
+            img.putalpha(alpha)  # 白色区域透明可见，黑色区域不可见
+            return img
+
+        #  圆角半径1/8边长,保存icon图片
+        w,h = iconbackimg.size
+        iconimg = circle_corner(iconbackimg,int(w/8))
+        iconimg.save(iconSavePath)
+
--- 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
--- 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
@@ -0,0 +1,823 @@
+#!/usr/bin/env python3
+# 使用系统默认的 python3 运行
+###########################################################################################
+# 作者：gfdgd xi<3025613752@qq.com>
+# 版本：1.3.2
+# 更新时间：2021年8月15日
+# 感谢：anbox、deepin 和 UOS
+# 基于 Python3 的 tkinter 构建
+# 更新：actionchen<917981399@qq.com>
+###########################################################################################
+#################
+# 引入所需的库
+#################
+import os
+import sys
+import time
+import json
+import shutil
+import zipfile
+import traceback
+import threading
+import ttkthemes
+import webbrowser
+import subprocess
+import tkinter as tk
+import tkinter.ttk as ttk
+import tkinter.messagebox as messagebox
+import tkinter.filedialog as filedialog
+from getxmlimg import getsavexml
+from tkinter.constants import TOP
+
+# 卸载程序
+def UninstallProgram(package: "apk 包名")->"卸载程序":
+    try:
+        global fineUninstallApkHistory
+        Return = GetCommandReturn("pkexec /usr/bin/uengine-session-launch-helper -- uengine uninstall --pkg='{}'".format(package))
+        if os.path.exists("{}/.local/share/applications/{}.desktop".format(get_home(), package)):
+            os.remove("{}/.local/share/applications/{}.desktop".format(get_home(), package))
+        if os.path.exists("{}/{}.desktop".format(get_desktop_path(), package)):
+            os.remove("{}/{}.desktop".format(get_desktop_path(), package))
+        fineUninstallApkHistory.append(ComboUninstallPath.get())
+        ComboUninstallPath['value'] = fineUninstallApkHistory
+        write_txt(get_home() + "/.config/uengine-runner/FindUninstallApkHistory.json", str(json.dumps(ListToDictionary(fineUninstallApkHistory))))  # 将历史记录的数组转换为字典并写入
+        return Return
+    except:
+        traceback.print_exc()
+        messagebox.showerror(title="错误", message=traceback.format_exc())
+
+def BtnFindUninstallApkClk():
+    path = filedialog.askopenfilename(title="选择 Apk", filetypes=[("APK 文件", "*.apk"), ("所有文件", "*.*")], initialdir=json.loads(readtxt(get_home() + "/.config/uengine-runner/FindUninstallApk.json"))["path"])
+    if path != "" and path != "()":
+        try:
+            ComboUninstallPath.set(path)
+            write_txt(get_home() + "/.config/uengine-runner/FindUninstallApk.json", json.dumps({"path": os.path.dirname(path)}))  # 写入配置文件
+        except:
+            pass
+
+def ButtonClick8():
+    if ComboUninstallPath.get() is "":
+        messagebox.showerror(title="提示", message="信息没有填写完整，无法继续卸载 APK")
+        return
+    DisabledAndEnbled(True)
+    if os.path.exists(ComboUninstallPath.get()):
+        path = GetApkPackageName(ComboUninstallPath.get())
+    else:
+        path = ComboUninstallPath.get()
+    UninstallProgram(path)
+    messagebox.showinfo(message="操作执行完毕！", title="提示")
+    DisabledAndEnbled(False)
+
+# 浏览窗口
+# temp strs
+temppath=""
+def FindApk()->"浏览窗口":
+    path = filedialog.askopenfilename(title="选择 Apk", filetypes=[("APK 文件", "*.apk"), ("所有文件", "*.*")], initialdir=json.loads(readtxt(get_home() + "/.config/uengine-runner/FindApk.json"))["path"])
+    global temppath    
+    temppath = path
+    print("apk path is find:" + path)
+    if path != "" and path != "()":
+        try:
+            ComboInstallPath.set(path)
+            write_txt(get_home() + "/.config/uengine-runner/FindApk.json", json.dumps({"path": os.path.dirname(path)}))  # 写入配置文件
+        except:
+            pass
+
+def Button3Install():
+    if ComboInstallPath.get() is "":
+        messagebox.showerror(title="提示", message="信息没有填写完整，无法继续安装 APK")
+        return
+    DisabledAndEnbled(True)
+    threading.Thread(target=InstallApk, args=(ComboInstallPath.get(),)).start()
+
+# 安装应用
+def InstallApk(path: "apk 路径", quit: "是否静默安装" = False):
+    try:
+        if not os.path.exists("{}/.local/share/applications/uengine/".format(get_home())):
+            print("Mkdir")
+            os.mkdir("{}/.local/share/applications/uengine/".format(get_home()))
+        print("start install apk")
+        global findApkHistory
+        commandReturn = GetCommandReturn("pkexec /usr/bin/uengine-session-launch-helper -- uengine install --apk='{}'".format(path))
+        print(commandReturn)
+        print("start install apk12")
+        iconSavePath = "{}/.local/share/icons/hicolor/256x256/apps/{}.png".format(get_home(), GetApkPackageName(path))
+        tempstr1 = iconSavePath
+        print("start install apk1")
+        iconSaveDir = os.path.dirname(iconSavePath)
+        if not os.path.exists(iconSaveDir):
+          os.makedirs(iconSaveDir,exist_ok=True)
+        SaveApkIcon(path, iconSavePath)
+        print("start install apk2")
+        BuildUengineDesktop(GetApkPackageName(path), GetApkActivityName(path), GetApkChineseLabel(path), iconSavePath,
+                            "{}/{}.desktop".format(get_desktop_path(), GetApkPackageName(path)))
+        print("start install apk3")
+        BuildUengineDesktop(GetApkPackageName(path), GetApkActivityName(path), GetApkChineseLabel(path), iconSavePath,
+                            "{}/.local/share/applications/uengine/{}.desktop".format(get_home(), GetApkPackageName(path)))
+        print("\nprint install complete")
+        if quit:
+            print(commandReturn)
+            return
+        messagebox.showinfo(title="提示", message="操作完成！")
+        findApkHistory.append(ComboInstallPath.get())
+        ComboInstallPath['value'] = findApkHistory
+        write_txt(get_home() + "/.config/uengine-runner/FindApkHistory.json", str(json.dumps(ListToDictionary(findApkHistory))))  # 将历史记录的数组转换为字典并写入
+    except:
+        traceback.print_exc()
+        messagebox.showerror(title="错误", message=traceback.format_exc())
+    DisabledAndEnbled(False)
+
+# 禁用或启动所有控件
+def DisabledAndEnbled(choose: "启动或者禁用")->"禁用或启动所有控件":
+    userChoose = {True: tk.DISABLED, False: tk.NORMAL}
+    a = userChoose[choose]
+    ComboInstallPath.configure(state=a)
+    ComboUninstallPath.configure(state=a)
+    BtnFindApk.configure(state=a)
+    BtnInstall.configure(state=a)
+    BtnShowUengineApp.configure(state=a)
+    BtnUninstallApkBrowser.configure(state=a)
+    BtnUninstall.configure(state=a)
+    Btngeticon.configure(state=a)
+
+# 需引入 subprocess
+# 运行系统命令并获取返回值
+def GetCommandReturn(cmd: "命令")->"运行系统命令并获取返回值":
+    # cmd 是要获取输出的命令
+    return subprocess.getoutput(cmd)
+
+def Button5Click():
+    threading.Thread(target=OpenUengineProgramList).start()
+
+# 打开“uengine 所有程序列表”
+def OpenUengineProgramList()->"打开“uengine 所有程序列表”":
+    os.system("/usr/bin/uengine-launch.sh --package=org.anbox.appmgr --component=org.anbox.appmgr.AppViewActivity")
+
+# 显示“关于这个程序”窗口
+def about_this_program()->"显示“关于这个程序”窗口":
+    global about
+    global title
+    global iconPath
+    mess = tk.Toplevel()
+    message = ttk.Frame(mess)
+    mess.resizable(0, 0)
+    mess.title("关于 {}".format(title))
+    #mess.iconphoto(False, tk.PhotoImage(file=iconPath))
+    img = ImageTk.PhotoImage(Image.open(iconPath))
+    LabApkPath = ttk.Label(message, image=img)
+    label2 = ttk.Label(message, text=about)
+    button1 = ttk.Button(message, text="确定", command=mess.withdraw)
+    LabApkPath.pack()
+    label2.pack()
+    button1.pack(side="bottom")
+    message.pack()
+    mess.mainloop()
+
+# 显示“提示”窗口
+def helps()->"显示“提示”窗口":
+    global tips
+    messagebox.showinfo(title="提示", message=tips)
+
+# 显示更新内容窗口
+def UpdateThings()->"显示更新内容窗口":
+    messagebox.showinfo(title="更新内容", message=updateThings)
+
+# 打开程序官网
+def OpenProgramURL()->"打开程序官网":
+    webbrowser.open_new_tab(programUrl)
+
+# 重启本应用程序
+def ReStartProgram()->"重启本应用程序":
+    python = sys.executable
+    os.execl(python, python, * sys.argv)
+
+# 清理历史记录
+def CleanProgramHistory()->"清理历史记录":
+    try:
+        if messagebox.askokcancel(title="警告", message="删除后将无法恢复，你确定吗？\n删除后软件将会自动重启。"):
+            shutil.rmtree(get_home() + "/.config/uengine-runner")
+            ReStartProgram()
+    except:
+        traceback.print_exc()
+        messagebox.showerror(title="错误", message=traceback.format_exc())
+
+# 获取用户主目录
+def get_home()->"获取用户主目录":
+    return os.path.expanduser('~')
+
+# 发送“启动 uengine 所有程序”的 .desktop 文件到桌面
+def SendUengineAndroidListForDesktop()->"发送“启动 uengine 所有程序”的 .desktop 文件到桌面":
+    global desktop
+    global desktopName
+    DisabledAndEnbled(True)
+    try:
+        if os.path.exists("{}/{}".format(get_desktop_path(), desktopName)):
+            if not messagebox.askokcancel(title="提示", message="桌面已经存在快捷方式，你确定要覆盖吗？"):
+                DisabledAndEnbled(False)
+                return
+        shutil.copy(desktop, get_desktop_path())
+        messagebox.showinfo(title="提示", message="发送成功！")
+    except:
+        traceback.print_exc()
+        messagebox.showerror(title="错误", message=traceback.format_exc())
+    DisabledAndEnbled(False)
+
+# 获取用户桌面目录
+def get_desktop_path()->"获取用户桌面目录":
+    for line in open(get_home() + "/.config/user-dirs.dirs"):  # 以行来读取配置文件
+        desktop_index = line.find("XDG_DESKTOP_DIR=\"")  # 寻找是否有对应项，有返回 0，没有返回 -1
+        if desktop_index != -1:  # 如果有对应项
+            break  # 结束循环
+    if desktop_index == -1:  # 如果是提前结束，值一定≠-1，如果是没有提前结束，值一定＝-1
+        return -1
+    else:
+        get = line[17:-2]  # 截取桌面目录路径
+        get_index = get.find("$HOME")  # 寻找是否有对应的项，需要替换内容
+        if get != -1:  # 如果有
+            get = get.replace("$HOME", get_home())  # 则把其替换为用户目录（～）
+        return get  # 返回目录
+
+# 发送“启动 uengine 所有程序”的 .desktop 文件到启动器
+def SendUengineAndroidListForLauncher()->"发送“启动 uengine 所有程序”的 .desktop 文件到启动器":
+    DisabledAndEnbled(True)
+    try:
+        if os.path.exists("{}/.local/share/applications/{}".format(get_home(), desktopName)):
+            if not messagebox.askokcancel(title="提示", message="启动器已经存在快捷方式，你确定要覆盖吗？"):
+                DisabledAndEnbled(False)
+                return
+        if not os.path.exists("{}/.local/share/applications/".format(get_home())):
+            os.makedirs("{}/.local/share/applications/".format(get_home()))
+        shutil.copy(desktop, "{}/.local/share/applications/{}".format(get_home(), desktopName))
+        os.system("chmod 755 {}/.local/share/applications/{}".format(get_home(), desktopName))
+        messagebox.showinfo(title="提示", message="发送成功！")
+    except:
+        traceback.print_exc()
+        messagebox.showerror(title="错误", message=traceback.format_exc())
+    DisabledAndEnbled(False)
+
+# 数组转字典
+def ListToDictionary(list: "需要转换的数组")->"数组转字典":
+    dictionary = {}
+    for i in range(len(list)):
+        dictionary[i] = list[i]
+    return dictionary
+
+# 读取文本文档
+def readtxt(path: "路径")->"读取文本文档":
+    f = open(path, "r")  # 设置文件对象
+    str = f.read()  # 获取内容
+    f.close()  # 关闭文本对象
+    return str  # 返回结果
+
+# 写入文本文档
+def write_txt(path: "路径", things: "内容")->"写入文本文档":
+    TxtDir = os.path.dirname(path)
+    print(TxtDir)
+    if not os.path.exists(TxtDir):
+        os.makedirs(TxtDir,exist_ok=True)    
+    file = open(path, 'w', encoding='UTF-8')  # 设置文件对象
+    file.write(things)  # 写入文本
+    file.close()  # 关闭文本对象
+
+# 获取 aapt 的所有信息
+def GetApkInformation(apkFilePath: "apk 所在路径")->"获取 aapt 的所有信息":
+    return GetCommandReturn("aapt dump badging '{}'".format(apkFilePath))
+
+# 获取 apk Activity
+def GetApkActivityName(apkFilePath: "apk 所在路径")->"获取 apk Activity":
+    info = GetApkInformation(apkFilePath)
+    for line in info.split('\n'):
+        if "launchable-activity" in line:
+            line = line[0: line.index("label='")]
+            line = line.replace("launchable-activity: ", "")
+            line = line.replace("'", "")
+            line = line.replace(" ", "")
+            line = line.replace("name=", "")
+            line = line.replace("label=", "")
+            line = line.replace("icon=", "")
+            return line
+
+# 获取 apk 包名
+def GetApkPackageName(apkFilePath: "apk 所在路径")->"获取 apk 包名":
+    info = GetApkInformation(apkFilePath)
+    for line in info.split('\n'):
+        if "package:" in line:
+            line = line[0: line.index("versionCode='")]
+            line = line.replace("package:", "")
+            line = line.replace("name=", "")
+            line = line.replace("'", "")
+            line = line.replace(" ", "")
+            return line
+
+# 生成 uengine 启动文件到桌面
+def BuildUengineDesktop(packageName: "软件包名", activityName: "activity", showName: "显示名称", iconPath: "程序图标所在目录", savePath:".desktop 文件保存路径")->"生成 uengine 启动文件到桌面":
+    things = '''[Desktop Entry]
+Categories=app;
+Encoding=UTF-8
+Exec=/usr/bin/uengine-launch.sh --action=android.intent.action.MAIN --package={} --component={}
+GenericName={}
+Icon={}
+MimeType=
+Name={}
+StartupWMClass={}
+Terminal=false
+Type=Application
+'''.format(packageName, activityName, showName, iconPath, showName, showName)
+    write_txt(savePath, things)
+
+# 获取软件的中文名称
+def GetApkChineseLabel(apkFilePath)->"获取软件的中文名称":
+    info = GetApkInformation(apkFilePath)
+    for line in info.split('\n'):
+        if "application-label:" in line:
+            line = line.replace("application-label:", "")
+            line = line.replace("'", "")
+            return line
+
+# 获取图标在包内的路径
+#def GetApkIconInApk(apkFilePath)->"获取图标在包内的路径":
+
+#合并两个函数到一起
+def SaveApkIcon(apkFilePath, iconSavePath)->"获取 apk 文件的图标":
+    try:
+        info = GetApkInformation(apkFilePath)
+        for line in info.split('\n'):
+            if "application:" in line:
+                xmlpath = line.split(":")[-1].split()[-1].split("=")[-1].replace("'","")  
+                if xmlpath.endswith('.xml'):
+                        xmlsave = getsavexml()
+                        print(xmlpath)
+                        xmlsave.savexml(apkFilePath,xmlpath,iconSavePath)
+                else:
+                    zip = zipfile.ZipFile(apkFilePath)
+                    iconData = zip.read(xmlpath)
+                    with open(iconSavePath, 'w+b') as saveIconFile:
+                        saveIconFile.write(iconData)
+    except:
+        traceback.print_exc()
+        print("Error, show defult icon")
+        shutil.copy(programPath + "/defult.png", iconSavePath)
+
+def saveicon():
+    global temppath
+    global tempstr1
+    iconSavePath = "{}/.local/share/icons/hicolor/256x256/apps/{}.png".format(get_home(), GetApkPackageName(temppath))
+    print(iconSavePath+"iconpaths")
+    SaveApkIcon(temppath, iconSavePath)
+
+def SaveIconToOtherPath():
+    apkPath = ComboInstallPath.get()
+    if apkPath == "":
+        messagebox.showerror(title="错误", message="你没有选择 apk 文件")
+        return
+    path = filedialog.asksaveasfilename(title="保存图标", filetypes=[("PNG 图片", "*.png"), ("所有文件", "*.*")], initialdir=json.loads(readtxt(get_home() + "/.config/uengine-runner/SaveApkIcon.json"))["path"])
+    if not path == "":
+        try:
+            SaveApkIcon(apkPath, path)
+        except:
+            traceback.print_exc()
+            messagebox.showerror(title="错误", message="本程序不支持保存该 apk 的图标")
+            return
+        write_txt(get_home() + "/.config/uengine-runner/SaveApkIcon.json", json.dumps({"path": os.path.dirname(path)}))  # 写入配置文件
+        findApkHistory.append(ComboInstallPath.get())
+        ComboInstallPath['value'] = findApkHistory
+        write_txt(get_home() + "/.config/uengine-runner/FindApkHistory.json", str(json.dumps(ListToDictionary(findApkHistory))))  # 将历史记录的数组转换为字典并写入
+        messagebox.showinfo(title="提示", message="保存成功！")
+
+## 获取 apk 文件的图标（部分程序不支持）
+# def SaveApkIcon(apkFilePath, iconSavePath)->"获取 apk 文件的图标（部分程序不支持）":
+#    zip = zipfile.ZipFile(apkFilePath)
+#    iconData = zip.read(GetApkIconInApk(apkFilePath))
+#    with open(iconSavePath, 'w+b') as saveIconFile:
+#        saveIconFile.write(iconData)
+
+def BackUengineClean()->"清空 uengine 数据":
+    print("Choose")
+    if messagebox.askokcancel(title="警告", message="清空后数据将会完全丢失，确定要继续吗？"):
+        DisabledAndEnbled(True)
+        try:
+            if os.path.exists("{}/.local/share/applications/uengine/".format(get_home())):
+                shutil.rmtree("{}/.local/share/applications/uengine/".format(get_home()))
+        except:
+            traceback.print_exc()
+            messagebox.showerror(title="错误", message=traceback.format_exc())
+        InstallWindow.ShowWindows("pkexec rm -rfv /data/uengine")
+        return
+    print("Choose False")
+
+def UengineBridgeStart():
+    DisabledAndEnbled(True)
+    os.system("pkexec uengine-bridge.sh start")
+    DisabledAndEnbled(False)
+
+def UengineBridgeStop():
+    DisabledAndEnbled(True)
+    os.system("pkexec uengine-bridge.sh stop")
+    DisabledAndEnbled(False)
+
+def UengineBridgeRestart():
+    DisabledAndEnbled(True)
+    os.system("pkexec uengine-bridge.sh restart")
+    DisabledAndEnbled(False)
+
+def UengineBridgeReload():
+    DisabledAndEnbled(True)
+    os.system("pkexec uengine-bridge.sh reload")
+    DisabledAndEnbled(False)
+
+def UengineBridgeForceReload():
+    DisabledAndEnbled(True)
+    os.system("pkexec uengine-bridge.sh force-reload")
+    DisabledAndEnbled(False)
+
+class InstallWindow():
+    def ShowWindows(command):
+        global message
+        global text
+        global installTipsText
+        global progressbar
+        message = tk.Toplevel()
+        message.iconphoto(False, tk.PhotoImage(file=iconPath))
+        messageFrame = ttk.Frame(message)
+        installTipsText = tk.StringVar()
+        message.title("正在操作……")
+        installTipsText.set("正在操作……")
+        installTips = ttk.Label(messageFrame, textvariable=installTipsText)
+        progressbar = ttk.Progressbar(messageFrame, length=500, mode='indeterminate')
+        text = tk.Text(messageFrame)
+        text.config(background="black", foreground="white")
+        installTips.pack()
+        progressbar.pack(fill="x")
+        text.pack(expand='yes', fill='both')
+        messageFrame.pack(expand='yes', fill='both')
+        print("Run!")
+        threading.Thread(target=InstallWindow.RunCommand, args=[command]).start()
+        message.mainloop()
+    
+    def RunCommand(command):
+        global message
+        global text
+        global progressbar
+        global installTipsText
+        InstallWindow.AddText("$>" + command + "\n")
+        progressbar.start()
+        result = subprocess.getoutput(command)
+        InstallWindow.AddText(result)
+        messagebox.showinfo(title="提示", message="操作完毕！")
+        installTipsText.set("操作完毕！")
+        message.title("操作完毕！")
+        progressbar.stop()
+        progressbar["value"] = 100
+        # 特意添加！
+        DisabledAndEnbled(False)
+        print("Clean!")
+        if messagebox.askyesno(title="提示", message="清空完毕，将会在重启后生效，是否要重启？"):
+            print("reboot")
+            os.system("reboot")
+
+    def AddText(things):
+        global text
+        text.configure(state=tk.NORMAL)
+        text.insert("end", things)
+        text.configure(state=tk.DISABLED)
+
+
+# 获取用户桌面目录
+def get_desktop_path()->"获取用户桌面目录":
+    for line in open(get_home() + "/.config/user-dirs.dirs"):  # 以行来读取配置文件
+        desktop_index = line.find("XDG_DESKTOP_DIR=\"")  # 寻找是否有对应项，有返回 0，没有返回 -1
+        if desktop_index != -1:  # 如果有对应项
+            break  # 结束循环
+    if desktop_index == -1:  # 如果是提前结束，值一定≠-1，如果是没有提前结束，值一定＝-1
+        return -1
+    else:
+        get = line[17:-2]  # 截取桌面目录路径
+        get_index = get.find("$HOME")  # 寻找是否有对应的项，需要替换内容
+        if get != -1:  # 如果有
+            get = get.replace("$HOME", get_home())  # 则把其替换为用户目录（～）
+        return get  # 返回目录
+
+# 获取用户主目录
+def get_home()->"获取用户主目录":
+    return os.path.expanduser('~')
+
+def StartUengine():
+    os.system("systemctl enable uengine-container uengine-session && systemctl start uengine-container uengine-session")
+
+def StopUengine():
+    os.system("systemctl disable uengine-container uengine-session")
+
+###########################
+# 程序信息
+###########################
+programUrl = "https://gitee.com/gfdgd-xi/uengine-runner"
+version = "1.3.2"
+goodRunSystem = "Linux（deepin/UOS）"
+aaptVersion = GetCommandReturn("aapt version")
+about = '''    一个基于 Python3 的 tkinter 制作的 uengine APK 安装器
+
+版本        ：{}
+
+适用平台    ：{}
+
+tkinter版本：{}
+
+aapt 版本  ：{}
+
+程序官网    ：{}
+
+©2021-{}'''.format(version, goodRunSystem, tk.TkVersion, aaptVersion,programUrl, time.strftime("%Y"))
+tips = '''    新版本Deepin/UOS发布后，可以在应用商店安装部分官方已适配的安卓应用，对爱好者来说，不能自己安装APK软件包始终差点意思，本程序可以为Deepin/UOS上的Uengine安卓运行环境安装自定义APK软件包，并能发送安装的APK包启动菜单到桌面或系统菜单。
+
+安装APK：
+    点浏览按钮，选中需要安装的APK，然后点安装按钮
+
+卸载APK：
+    在卸载APK下面的输入框内输入需要卸载的APK包名，点卸载按钮，如果无法获取包名，可以通过浏览APK文件程序自动获取包名进行卸载。
+
+保存APK图标：
+    在安装APK下面的输入框浏览或输入APK的路径，然后点击“保存图标”按钮，选择保存位置即可
+
+重置（删除）uengine 数据：
+    点击菜单栏的“uengine”的“清空uengine数据”，输入密码重启即可
+    注意：如果任何安卓一遍打不开，多打开几遍应该就可以重新加载uengine配置了
+
+打开Uengine应用列表：
+    打开系统已安装的应用列表（安卓界面）
+
+提示：
+1、需要你有使用 root 权限的能力；
+2、需要安装 uengine 才能使用；
+3、提取 apk 图标的 apk 路径以“安装 apk”那栏为准;
+4、如果想要连接其他手机，请使用 1.2.0 以前的版本，可以使用 adb 连接。
+'''
+updateThingsString = '''V.1.3.2：
+※1、支持uengine数据重置;
+※2、支持修改uengine网络桥接的启动状态;
+※3、支持右键安装/卸载;
+※4、支持启用或禁用uengine;
+※5、修复打包问题，不会出现“dpkg:警告:卸载spark-uengine-runner时，目录/opt/apps/uengine-runner非空，因而不会删除该目录”的错误;
+
+V1.3.1：
+※1、修复打包问题，防止部分用户安装出错的问题;
+※2、修复了程序无法提取图标时可以提取默认图标使用;
+
+V1.3.0：
+※1、修改了界面布局;
+※2、修复大多数新安装普通用户的路图标及启动菜单文件路径不存在导致安装APK报错的bugs;
+3、删除少量冗余代码，调整代码顺序;
+4、支持提取apk图标。
+
+V1.2.3
+1、调整部分控件名称；
+2、调整界面布局及界面风格；
+
+V1.2.2
+1、对程序错误的显示更加人性化；
+2、对icon的获取方式进行了升级；
+3、增加了注释、删除部分冗余代码。
+'''
+title = "uengine 安装器 {}".format(version)
+updateTime = "2021年08月15日"
+updateThings = "{} 更新内容：\n{}\n更新时间：{}".format(version, updateThingsString, updateTime, time.strftime("%Y"))
+programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
+iconPath = "{}/icon.png".format(os.path.split(os.path.realpath(__file__))[0])
+desktop = "/opt/apps/uengine-runner/UengineAndroidProgramList.desktop"
+desktopName = "UengineAndroidProgramList.desktop"
+contribute = '''gfdgd xi<3025613752@qq.com>
+actionchen<917981399@qq.com>'''
+useProgram = '''1、uengine相关软件包（基于anbox开发）
+2、Python3
+3、tkinter（tkinter.tk、ttkthemes 和 tkinter.ttk）
+4、aapt
+……'''
+
+###########################
+# 加载配置
+###########################
+if not os.path.exists("{}/.local/share/applications/uengine/".format(get_home())):
+    os.mkdir("{}/.local/share/applications/uengine/".format(get_home()))
+if not os.path.exists(get_home() + "/.config/uengine-runner"):  # 如果没有配置文件夹
+    os.mkdir(get_home() + "/.config/uengine-runner")  # 创建配置文件夹
+if not os.path.exists(get_home() + "/.config/uengine-runner/FindApkHistory.json"):  # 如果没有配置文件
+    write_txt(get_home() + "/.config/uengine-runner/FindApkHistory.json", json.dumps({}))  # 创建配置文件
+if not os.path.exists(get_home() + "/.config/uengine-runner/FindUninstallApkHistory.json"):  # 如果没有配置文件
+    write_txt(get_home() + "/.config/uengine-runner/FindUninstallApkHistory.json", json.dumps({}))  # 创建配置文件
+if not os.path.exists(get_home() + "/.config/uengine-runner/FindApk.json"):  # 如果没有配置文件
+    write_txt(get_home() + "/.config/uengine-runner/FindApk.json", json.dumps({"path": "~"}))  # 写入（创建）一个配置文件
+if not os.path.exists(get_home() + "/.config/uengine-runner/FindUninstallApk.json"):  # 如果没有配置文件
+    write_txt(get_home() + "/.config/uengine-runner/FindUninstallApk.json", json.dumps({"path": "~"}))  # 写入（创建）一个配置文件
+if not os.path.exists(get_home() + "/.config/uengine-runner/SaveApkIcon.json"):  # 如果没有配置文件
+    write_txt(get_home() + "/.config/uengine-runner/SaveApkIcon.json", json.dumps({"path": "~"}))  # 写入（创建）一个配置文件
+
+###########################
+# 设置变量
+###########################
+findApkHistory = list(json.loads(readtxt(get_home() + "/.config/uengine-runner/FindApkHistory.json")).values())
+fineUninstallApkHistory = list(json.loads(readtxt(get_home() + "/.config/uengine-runner/FindUninstallApkHistory.json")).values())
+
+# add sub window
+#添加窗口开启关闭开关，防止重复开启
+windowflag = "close"
+
+def showhelp():
+     
+    #define  window and frame and button label   
+    # 
+    global windowflag
+    if windowflag == "close":
+        helpwindow=tk.Toplevel()
+        helpwindow.resizable(0, 0)
+        helpwindow.title("帮助")
+        
+
+        # get screen width and height
+        screen_width = helpwindow.winfo_screenwidth()
+        screen_height = helpwindow.winfo_screenheight()
+        # calculate position x and y coordinates  假设主窗口大小固定 570x236像素 ，设置窗口位置为屏幕中心。
+        winwith=550
+        winhigh=700
+        x = (screen_width/2) - (winwith/2)
+        y = (screen_height/2) - (winhigh/2)
+        
+        helpwindow.geometry("550x700"+"+{:.0f}+{:.0f}".format(x, y))
+
+        style = ttkthemes.ThemedStyle(helpwindow)
+        style.set_theme("breeze")
+        
+        
+
+        Frmroot=ttk.Frame(helpwindow)
+        FrmMenu = ttk.Frame(Frmroot)
+        FrmText = ttk.Frame(Frmroot)
+
+        LabFrmText=ttk.LabelFrame(FrmText,text="帮助",height=800,borderwidth=3)  
+        HelpStr = tk.StringVar() 
+        HelpStr.set(tips)
+        LabText = ttk.Label(LabFrmText, textvariable=HelpStr,width=55)
+        LabText.config(wraplength=350)
+        
+        def on_closing():
+            global windowflag
+            windowflag = "close"
+            print(windowflag)
+            helpwindow.destroy()
+
+
+
+        # define button func        
+        def ChgLog():
+            HelpStr.set(updateThingsString)
+        def ChgAbout():
+            HelpStr.set(about)
+        def ChgDep():
+            HelpStr.set(useProgram)
+        def ChgCon():
+            HelpStr.set(contribute)
+        def ChgTips():
+            HelpStr.set(tips)
+            LabText.config(wraplength=350)
+
+        BtnReadme = ttk.Button(FrmMenu, text="使用说明",width=14,command=ChgTips)
+        BtnLog = ttk.Button(FrmMenu, text="更新内容",width=14,command=ChgLog)
+        BtnZujian = ttk.Button(FrmMenu, text="程序依赖的组件",width=14,command=ChgDep)
+        BtnGongxian = ttk.Button(FrmMenu, text="有贡献的开发者",width=14,command=ChgCon)
+        BtnAbout = ttk.Button(FrmMenu, text="关于",width=14,command=ChgAbout)
+
+
+        #layout
+        FrmMenu.grid(row=0,column=0,sticky=tk.NW)
+        BtnReadme.grid(row=0,column=0,sticky=tk.NW,padx=3)
+        BtnLog.grid(row=1,column=0,sticky=tk.NW,padx=3)
+        BtnZujian.grid(row=2,column=0,sticky=tk.NW,padx=3)
+        BtnGongxian.grid(row=3,column=0,sticky=tk.NW,padx=3)
+        BtnAbout.grid(row=4,column=0,sticky=tk.NW,padx=3)
+
+        FrmText.grid(row=0,column=1,sticky=tk.NW)
+        LabFrmText.grid(row=0,column=0,sticky=tk.NW,padx=3,pady=3)
+        LabText.grid(row=0,column=0,sticky=tk.NW)
+      
+        Frmroot.pack()
+        windowflag = "open"
+        print(windowflag)
+        #helpwindow.mainloop()
+        helpwindow.protocol("WM_DELETE_WINDOW", on_closing)
+
+
+###########################
+# 窗口创建
+###########################
+win = tk.Tk()  # 创建窗口
+
+# 设置窗口
+style = ttkthemes.ThemedStyle(win)
+style.set_theme("breeze")
+window = ttk.Frame(win)
+win.attributes('-alpha', 0.5)
+win.title(title)
+win.resizable(0, 0)
+win.iconphoto(False, tk.PhotoImage(file=iconPath))
+
+# get screen width and height
+screen_width = win.winfo_screenwidth()
+screen_height = win.winfo_screenheight()
+# calculate position x and y coordinates  假设主窗口大小固定 570x236像素 ，设置窗口位置为屏幕中心。 
+winwith=570
+winhigh=236
+x = (screen_width/2) - (winwith/2)
+y = (screen_height/2) - (winhigh/2)
+
+win.geometry(""+"+{:.0f}+{:.0f}".format(x, y))
+
+# 创建控件
+FrmInstall = ttk.Frame(window)
+FrmUninstall = ttk.Frame(window)
+LabApkPath = ttk.Label(window, text="安装APK：")
+LabUninstallPath = ttk.Label(window, text="卸载APK：")
+ComboInstallPath = ttk.Combobox(window, width=50)
+ComboUninstallPath = ttk.Combobox(window, width=50)
+BtnFindApk = ttk.Button(FrmInstall, text="浏览", command=FindApk)
+BtnInstall = ttk.Button(FrmInstall, text="安装", command=Button3Install)
+BtnShowUengineApp = ttk.Button(window, text="打开 uengine 应用列表", command=Button5Click)
+BtnUninstallApkBrowser = ttk.Button(FrmUninstall, text="浏览", command=BtnFindUninstallApkClk)
+BtnUninstall = ttk.Button(FrmUninstall, text="卸载", command=ButtonClick8)
+Btngeticon = ttk.Button(window, text="保存图标", command=SaveIconToOtherPath)
+# 设置菜单栏
+menu = tk.Menu(window, background="white")  
+
+programmenu = tk.Menu(menu, tearoff=0, background="white")  # 设置“程序”菜单栏
+uengine = tk.Menu(menu, tearoff=0, background="white")
+help = tk.Menu(menu, tearoff=0, background="white")  # 设置“帮助”菜单栏
+
+menu.add_cascade(label="程序", menu=programmenu)
+menu.add_cascade(label="uengine", menu=uengine)
+menu.add_cascade(label="关于", menu=help)
+
+programmenu.add_command(label="清空软件历史记录", command=CleanProgramHistory)
+programmenu.add_separator()  # 设置分界线
+programmenu.add_command(label="退出程序", command=window.quit)  # 设置“退出程序”
+
+uengine.add_command(label="发送 uengine 应用列表到桌面", command=SendUengineAndroidListForDesktop)
+uengine.add_command(label="发送 uengine 应用列表到启动器", command=SendUengineAndroidListForLauncher)
+uengine.add_separator()
+uengine.add_command(label="启用 uengine", command=StartUengine)
+uengine.add_command(label="禁用 uengine", command=StopUengine)
+uengine.add_separator()
+uengine.add_command(label="启用 uengine 网络桥接", command=UengineBridgeStart)
+uengine.add_command(label="关闭 uengine 网络桥接", command=UengineBridgeStop)
+uengine.add_command(label="重启 uengine 网络桥接", command=UengineBridgeRestart)
+uengine.add_command(label="加载 uengine 网络桥接", command=UengineBridgeReload)
+uengine.add_command(label="强制加载 uengine 网络桥接", command=UengineBridgeForceReload)
+
+uengine.add_separator()
+uengine.add_command(label="清空 uengine 数据", command=BackUengineClean)
+
+help.add_command(label="程序官网", command=OpenProgramURL)  # 设置“程序官网”项
+help.add_command(label="帮助", command=showhelp)  # 设置“关于这个程序”项
+
+menu.configure(activebackground="dodgerblue")
+help.configure(activebackground="dodgerblue")
+uengine.configure(activebackground="dodgerblue")
+programmenu.configure(activebackground="dodgerblue")
+
+# 设置控件
+ComboUninstallPath['value'] = fineUninstallApkHistory
+ComboInstallPath['value'] = findApkHistory
+try:
+    if sys.argv[1] == "-i":
+        ComboInstallPath.set(sys.argv[2])
+        print("Install Path: " + sys.argv[2])
+    elif sys.argv[1] == "-u":
+        ComboUninstallPath.set(sys.argv[2])
+        print("Unstall Path: " + sys.argv[2])
+    else:
+        print("Command Format Error")
+except:
+    print("Not Command Or Command Format Error")
+# 显示控件
+win.config(menu=menu)  # 显示菜单栏
+
+
+
+LabApkPath.grid(row=1, column=0,sticky= tk.W,padx=3)
+ComboInstallPath.grid(row=2, column=0,padx=3)
+
+
+FrmInstall.grid(row=2, column=1,padx=3)
+BtnFindApk.grid(row=0, column=0)
+BtnInstall.grid(row=0, column=1)
+
+LabUninstallPath.grid(row=3, column=0,sticky= tk.W,padx=3)
+ComboUninstallPath.grid(row=4, column=0,padx=3)
+
+FrmUninstall.grid(row=4, column=1,padx=3)
+BtnUninstallApkBrowser.grid(row=0, column=0)
+BtnUninstall.grid(row=0, column=1)
+
+BtnShowUengineApp.grid(row=5, column=0,sticky= tk.W,padx=3,pady=2)
+
+Btngeticon.grid(row=3, column=1,sticky= tk.W,padx=3,pady=2)
+
+window.pack()
+
+win.mainloop()
--- a/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/info
+++ b/new-deb-build/opt/apps/com.gitee.uengine.runner.spark/info
@@ -0,0 +1,17 @@
+{
+    "appid": "com.gitee.uengine.runner.spark",
+    "name": "com.gitee.uengine.runner.spark",
+    "version": "1.3.2",
+    "arch": ["all"],
+    "permissions": {
+        "autostart": false,
+        "notification": false,
+        "trayicon": false,
+        "clipboard": false,
+        "account": false,
+        "bluetooth": false,
+        "camera": false,
+        "audio_record": false,
+        "installed_apps": false
+    }
+}
--- a/spark-uengine-runner.deb
+++ b/spark-uengine-runner.deb
--- a/uengine-apk-builder.py
+++ b/uengine-apk-builder.py
@@ -0,0 +1,522 @@
+#!/usr/bin/env python3
+# 使用系统默认的 python3 运行
+###########################################################################################
+# 作者：gfdgd xi
+# 版本：1.3.2
+# 更新时间：2021年7月6日
+# 感谢：anbox、deepin 和 统信
+# 基于 Python3 的 tkinter 构建
+###########################################################################################
+#################
+# 引入所需的库
+#################
+import os
+import sys
+import time
+import json
+import shutil
+import random
+import zipfile
+import traceback
+import threading
+import webbrowser
+import subprocess
+import ttkthemes
+import tkinter as tk
+import tkinter.ttk as ttk
+import tkinter.messagebox as messagebox
+import tkinter.filedialog as filedialog
+import PIL.Image as Image
+import PIL.ImageTk as ImageTk
+from getxmlimg import getsavexml
+
+def FindApk():
+    path = filedialog.askopenfilename(title="选择 Apk", filetypes=[("APK 文件", "*.apk"), ("所有文件", "*.*")], initialdir=json.loads(readtxt(get_home() + "/.config/uengine-apk-builder/FindApk.json"))["path"])
+    if path != "" and path != "()":
+        try:
+            combobox1.set(path)
+            write_txt(get_home() + "/.config/uengine-apk-builder/FindApk.json", json.dumps({"path": os.path.dirname(path)}))  # 写入配置文件
+        except:
+            pass
+
+def BuildDeb():
+    if combobox1.get() == "":
+        messagebox.showerror(title="提示", message="信息没有填写完整，无法继续打包 APK")
+        return
+    if not os.path.exists(combobox1.get()):
+        messagebox.showerror(title="提示", message="信息填写错误，无法继续打包 APK")
+        return
+    DisabledAndEnbled(True)
+    threading.Thread(target=BuildApkDeb, args=(combobox1.get(),)).start()
+
+def RunCommandShow(command):
+    TextboxAddText1("$> {}".format(command))
+    TextboxAddText1(GetCommandReturn(command))
+
+def BuildApkDeb(apkPath):
+    tempPath = "/tmp/uengine-apk-builder-{}".format(int(random.randint(0, 1024)))
+    RunCommandShow("echo '======================================New===================================='")
+    RunCommandShow("echo '创建目录'")
+    RunCommandShow("mkdir -pv '{}/DEBIAN'".format(tempPath))
+    RunCommandShow("mkdir -pv '{}/usr/share/applications'".format(tempPath))
+    RunCommandShow("mkdir -pv '{}/usr/share/uengine/apk'".format(tempPath))
+    RunCommandShow("mkdir -pv '{}/usr/share/uengine/icons'".format(tempPath))
+    RunCommandShow("echo '写入文件，因为写入过程过于复杂，不显示写入命令……'")
+    apkPackageName = GetApkPackageName(apkPath)
+    apkPackageVersion = GetApkVersion(apkPath)
+    apkChineseLabel = GetApkChineseLabel(apkPath)
+    apkActivityName = GetApkActivityName(apkPath)
+    iconSavePath = "{}/usr/share/uengine/icons/{}.png".format(tempPath, apkPackageName)
+    debControl = '''Package: {}
+Version: {}
+Architecture: all
+Maintainer: {}
+Depends: deepin-elf-verify (>= 0.0.16.7-1), uengine (>= 1.0.1)
+Section: utils
+Priority: optional
+Description: {}\n'''.format(apkPackageName, apkPackageVersion, apkChineseLabel, apkChineseLabel)
+    debPostinst = '''#!/bin/sh
+
+APK_DIR="/usr/share/uengine/apk"
+APK_NAME="{}.apk"
+APK_PATH="$APK_DIR/$APK_NAME"
+DESKTOP_FILE="/usr/share/applications/{}.desktop"
+ICON_FILE="/usr/share/uengine/icons/{}.png"
+
+if [ -f $APK_PATH ]; then
+    echo "Installing $APK_NAME"
+else 
+    echo "ERROR: $APK_NAME file not found."
+    exit 1
+fi
+
+session_manager=`ps -ef | grep "uengine session-manager" | grep -v grep`
+if test -z "$session_manager"; then
+    echo "ERROR: app install failed(session-manager not start)."
+    #sudo rm -f $DESKTOP_FILE
+    #sudo rm -f $ICON_FILE
+    #sudo rm -f "$APK_PATH"
+    exit 1
+fi
+
+ret=`/usr/bin/uengine-session-launch-helper -- uengine install  --apk="$APK_PATH"`
+if [ $? -ne 0 ]; then
+    echo "ERROR: apk install error..."
+    #sudo rm -f $DESKTOP_FILE
+    #sudo rm -f $ICON_FILE
+    #sudo rm -f "$APK_PATH"
+    exit 1
+fi
+chkfail=`echo $ret |grep "Failed"`
+if test -n "$chkfail" ; then
+    echo "ERROR: $ret"
+    #sudo rm -f $DESKTOP_FILE
+    #sudo rm -f $ICON_FILE
+    #sudo rm -f "$APK_PATH"
+    exit 1
+fi
+
+sudo rm -f "$APK_PATH"
+
+exit 0'''.format(apkPackageName, apkPackageName, apkPackageName)
+    debPrerm = '''#!/bin/sh
+
+APP_NAME="{}"
+
+session_manager=`ps -ef | grep "uengine session-manager" | grep -v grep`
+if test -z "$session_manager"; then
+    echo "ERROR: app install failed(session-manager not start)."
+    exit 1
+fi
+
+echo "Uninstalling $APP_NAME"
+ret=`/usr/bin/uengine-session-launch-helper -- uengine uninstall --pkg="$APP_NAME"`
+if [ $? -ne 0 ]; then
+    echo "ERROR: app uninstall error..."
+    exit 1
+fi
+chkfail=`echo $ret |grep "Failed"`
+if test -n "$chkfail" ; then
+    echo "ERROR: $ret"
+    exit 1
+fi
+
+cat /etc/passwd | awk -F: '$3>=1000' | cut -f 1 -d : | while read line
+do
+    inifile="/home/$line/.config/uengineAppGeometry.ini"
+    if [ -f $inifile ]; then
+        sed -i "/$APP_NAME/d" $inifile
+    fi
+done
+
+exit 0'''.format(apkPackageName)
+    desktopFile = '''[Desktop Entry]
+Categories=Other;
+Exec=/usr/bin/uengine-launch.sh --action=android.intent.action.MAIN --package={} --component={}
+Icon=/usr/share/uengine/icons/{}.png
+Terminal=false
+Type=Application
+GenericName={}
+Name={}
+'''
+    #RunCommandShow("echo '{}' > '{}/DEBIAN/control'".format(debControl, tempPath))
+    RunCommandShow("echo 正在写入文件：'{}/DEBIAN/control'".format(tempPath))
+    write_txt("{}/DEBIAN/control".format(tempPath), debControl)
+    RunCommandShow("echo 正在写入文件：'{}/DEBIAN/postinst'".format(tempPath))
+    write_txt("{}/DEBIAN/postinst".format(tempPath), debPostinst)
+    RunCommandShow("echo 正在写入文件：'{}/DEBIAN/prerm'".format(tempPath))
+    write_txt("{}/DEBIAN/prerm".format(tempPath), debPrerm)
+    RunCommandShow("echo 正在写入文件：'/usr/share/applications/{}.desktop'".format(apkPackageName))
+    #write_txt("{}/usr/share/applications/{}.desktop".format(tempPath, apkPackageName), desktopFile)
+    BuildUengineDesktop(apkPackageName, apkActivityName, apkChineseLabel, iconSavePath,
+                        "{}/usr/share/applications/{}.desktop".format(tempPath, apkPackageName))
+    RunCommandShow("echo '复制文件'")
+    RunCommandShow("echo '写入 APK 软件图标'")
+    SaveApkIcon(apkPath, iconSavePath)
+    RunCommandShow("echo '复制 APK 文件'")
+    RunCommandShow("cp -rv '{}' '{}/usr/share/uengine/apk/{}.apk'".format(apkPath, tempPath, apkPackageName))
+    RunCommandShow("echo '正在设置文件权限……'")
+    RunCommandShow("chmod 0775 -vR '{}/DEBIAN/postinst'".format(tempPath))
+    RunCommandShow("chmod 0775 -vR '{}/DEBIAN/prerm'".format(tempPath))
+    RunCommandShow("echo '打包 deb 到桌面……'")
+    RunCommandShow("dpkg -b '{}' '{}/{}_{}.deb'".format(tempPath, get_desktop_path(),apkPackageName, apkPackageVersion))
+    RunCommandShow("echo '完成！'")
+    findApkHistory.append(apkPath)
+    combobox1['value'] = findApkHistory
+    write_txt(get_home() + "/.config/uengine-apk-builder/FindApkHistory.json", str(json.dumps(ListToDictionary(findApkHistory))))  # 将历史记录的数组转换为字典并写入
+    messagebox.showinfo(title="提示", message="打包完成")
+    DisabledAndEnbled(False)
+
+def DisabledAndEnbled(choose):
+    userChoose = {True: tk.DISABLED, False: tk.NORMAL}
+    a = userChoose[choose]
+    combobox1.configure(state=a)
+    button2.configure(state=a)
+    button3.configure(state=a)
+
+# 需引入 subprocess
+def GetCommandReturn(cmd):
+    # cmd 是要获取输出的命令
+    return subprocess.getoutput(cmd)
+
+# 显示“关于这个程序”窗口
+def about_this_program():
+    global about
+    global title
+    global iconPath
+    mess = tk.Toplevel()
+    message = ttk.Frame(mess)
+    mess.resizable(0, 0)
+    mess.title("关于 {}".format(title))
+    mess.iconphoto(False, tk.PhotoImage(file=iconPath))
+    img = ImageTk.PhotoImage(Image.open(iconPath))
+    label1 = ttk.Label(message, image=img)
+    label2 = ttk.Label(message, text=about)
+    button1 = ttk.Button(message, text="确定", command=mess.withdraw)
+    label1.pack()
+    label2.pack()
+    button1.pack(side="bottom")
+    message.pack()
+    mess.mainloop()
+
+# 显示“提示”窗口
+def helps():
+    global tips
+    messagebox.showinfo(title="提示", message=tips)
+
+# 显示更新内容窗口
+def UpdateThings():
+    messagebox.showinfo(title="更新内容", message=updateThings)
+
+# 打开程序官网
+def OpenProgramURL():
+    webbrowser.open_new_tab(programUrl)
+
+# 重启本应用程序
+def ReStartProgram():
+    python = sys.executable
+    os.execl(python, python, * sys.argv)
+
+def CleanProgramHistory():
+    try:
+        if messagebox.askokcancel(title="警告", message="删除后将无法恢复，你确定吗？\n删除后软件将会自动重启。"):
+            shutil.rmtree(get_home() + "/.config/uengine-apk-builder")
+            ReStartProgram()
+    except:
+        traceback.print_exc()
+        messagebox.showerror(title="错误", message=traceback.format_exc())
+
+# 获取用户主目录
+def get_home():
+    return os.path.expanduser('~')
+
+# 获取用户桌面目录
+def get_desktop_path():
+    for line in open(get_home() + "/.config/user-dirs.dirs"):  # 以行来读取配置文件
+        desktop_index = line.find("XDG_DESKTOP_DIR=\"")  # 寻找是否有对应项，有返回 0，没有返回 -1
+        if desktop_index != -1:  # 如果有对应项
+            break  # 结束循环
+    if desktop_index == -1:  # 如果是提前结束，值一定≠-1，如果是没有提前结束，值一定＝-1
+        return -1
+    else:
+        get = line[17:-2]  # 截取桌面目录路径
+        get_index = get.find("$HOME")  # 寻找是否有对应的项，需要替换内容
+        if get != -1:  # 如果有
+            get = get.replace("$HOME", get_home())  # 则把其替换为用户目录（～）
+        return get  # 返回目录
+
+# 数组转字典
+def ListToDictionary(list):
+    dictionary = {}
+    for i in range(len(list)):
+        dictionary[i] = list[i]
+    return dictionary
+
+# 读取文本文档
+def readtxt(path):
+    f = open(path, "r")  # 设置文件对象
+    str = f.read()  # 获取内容
+    f.close()  # 关闭文本对象
+    return str  # 返回结果
+
+# 写入文本文档
+def write_txt(path, things):
+    file = open(path, 'w', encoding='UTF-8')  # 设置文件对象
+    file.write(things)  # 写入文本
+    file.close()  # 关闭文本对象
+
+def GetApkInformation(apkFilePath):
+    return GetCommandReturn("aapt dump badging '{}'".format(apkFilePath))
+
+def GetApkActivityName(apkFilePath):
+    info = GetApkInformation(apkFilePath)
+    for line in info.split('\n'):
+        if "launchable-activity" in line:
+            line = line[0: line.index("label='")]
+            line = line.replace("launchable-activity: ", "")
+            line = line.replace("'", "")
+            line = line.replace(" ", "")
+            line = line.replace("name=", "")
+            line = line.replace("label=", "")
+            line = line.replace("icon=", "")
+            return line
+
+def GetApkPackageName(apkFilePath):
+    info = GetApkInformation(apkFilePath)
+    for line in info.split('\n'):
+        if "package:" in line:
+            line = line[0: line.index("versionCode='")]
+            line = line.replace("package:", "")
+            line = line.replace("name=", "")
+            line = line.replace("'", "")
+            line = line.replace(" ", "")
+            return line
+
+def GetApkVersion(apkFilePath):
+    info = GetApkInformation(apkFilePath)
+    for line in info.split('\n'):
+        if "package:" in line:
+            if "compileSdkVersion='" in line:
+                line = line.replace(line[line.index("compileSdkVersion='"): -1], "")
+            if "platform" in line:
+                line = line.replace(line[line.index("platform"): -1], "")
+            line = line.replace(line[0: line.index("versionName='")], "")
+            line = line.replace("versionName='", "")
+            line = line.replace("'", "")
+            line = line.replace(" ", "")
+            return line
+
+def BuildUengineDesktop(packageName, activityName, showName, iconPath, savePath):
+    things = '''
+    [Desktop Entry]
+Categories=app;
+Encoding=UTF-8
+Exec=/usr/bin/uengine-launch.sh --action=android.intent.action.MAIN --package={} --component={}
+GenericName={}
+Icon={}
+MimeType=
+Name={}
+StartupWMClass={}
+Terminal=false
+Type=Application
+'''.format(packageName, activityName, showName, iconPath, showName, showName)
+    write_txt(savePath, things)
+
+def GetApkChineseLabel(apkFilePath):
+    info = GetApkInformation(apkFilePath)
+    for line in info.split('\n'):
+        if "application-label:" in line:
+            line = line.replace("application-label:", "")
+            line = line.replace("'", "")
+            return line
+
+def GetApkIconInApk(apkFilePath):
+    info = GetApkInformation(apkFilePath)
+    for line in info.split('\n'):
+        if "application:" in line:
+            line = line[line.index("icon='"): -1]
+            line = line.replace("icon='", "")
+            if "'" in line:
+                line = line[0: line.index("'")]
+            return line
+            return line
+
+#合并两个函数到一起
+def SaveApkIcon(apkFilePath, iconSavePath)->"获取 apk 文件的图标":
+    try:
+        info = GetApkInformation(apkFilePath)
+        for line in info.split('\n'):
+            if "application:" in line:
+                xmlpath = line.split(":")[-1].split()[-1].split("=")[-1].replace("'","")  
+                if xmlpath.endswith('.xml'):
+                        xmlsave = getsavexml()
+                        print(xmlpath)
+                        xmlsave.savexml(apkFilePath,xmlpath,iconSavePath)
+                else:
+                    zip = zipfile.ZipFile(apkFilePath)
+                    iconData = zip.read(xmlpath)
+                    with open(iconSavePath, 'w+b') as saveIconFile:
+                        saveIconFile.write(iconData)
+    except:
+        traceback.print_exc()
+        print("Error, show defult icon")
+        shutil.copy(programPath + "/defult.png", iconSavePath)
+
+
+#def SaveApkIcon(apkFilePath, iconSavePath):
+#    zip = zipfile.ZipFile(apkFilePath)
+#    iconData = zip.read(GetApkIconInApk(apkFilePath))
+#    with open(iconSavePath, 'w+b') as saveIconFile:
+#        saveIconFile.write(iconData)
+
+def TextboxAddText1(message):
+    global textbox1
+    textbox1.configure(state=tk.NORMAL)
+    textbox1.insert(tk.END,message + "\n")
+    textbox1.configure(state=tk.DISABLED)    
+
+# 获取用户桌面目录
+def get_desktop_path():
+    for line in open(get_home() + "/.config/user-dirs.dirs"):  # 以行来读取配置文件
+        desktop_index = line.find("XDG_DESKTOP_DIR=\"")  # 寻找是否有对应项，有返回 0，没有返回 -1
+        if desktop_index != -1:  # 如果有对应项
+            break  # 结束循环
+    if desktop_index == -1:  # 如果是提前结束，值一定≠-1，如果是没有提前结束，值一定＝-1
+        return -1
+    else:
+        get = line[17:-2]  # 截取桌面目录路径
+        get_index = get.find("$HOME")  # 寻找是否有对应的项，需要替换内容
+        if get != -1:  # 如果有
+            get = get.replace("$HOME", get_home())  # 则把其替换为用户目录（～）
+        return get  # 返回目录
+
+# 获取用户主目录
+def get_home():
+    return os.path.expanduser('~')
+
+def ShowUseProgram():
+    global title
+    global useProgram
+    messagebox.showinfo(title="{} 使用的程序列表（部分）".format(title), message=useProgram)
+
+###########################
+# 程序信息
+###########################
+programUrl = "https://gitee.com/gfdgd-xi/uengine-runner"
+version = "1.3.2"
+goodRunSystem = "Linux(deepin/UOS)"
+about = '''一个基于 Python3 的 tkinter 制作的 uengine APK 应用打包器
+版本：{}
+适用平台：{}
+tkinter 版本：{}
+程序官网：{}
+©2021-{} gfdgd xi'''.format(version, goodRunSystem, tk.TkVersion, programUrl, time.strftime("%Y"))
+tips = '''提示：
+1、无'''
+updateThingsString = '''1、无'''
+title = "uengine APK 应用打包器 {}".format(version)
+updateTime = "2021年8月19日"
+updateThings = "{} 更新内容：\n{}\n更新时间：{}".format(version, updateThingsString, updateTime, time.strftime("%Y"))
+iconPath = "{}/icon.png".format(os.path.split(os.path.realpath(__file__))[0])
+useProgram = '''1、uengine（anbox）
+2、Python3
+3、tkinter（tkinter.tk、ttkthemes 和 tkinter.ttk）
+4、aapt
+5、dpkg
+6、tree
+7、mkdir
+8、echo
+9、chmod
+……'''
+programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
+
+###########################
+# 加载配置
+###########################
+if not os.path.exists(get_home() + "/.config/uengine-apk-builder"):  # 如果没有配置文件夹
+    os.mkdir(get_home() + "/.config/uengine-apk-builder")  # 创建配置文件夹
+if not os.path.exists(get_home() + "/.config/uengine-apk-builder/FindApkHistory.json"):  # 如果没有配置文件
+    write_txt(get_home() + "/.config/uengine-apk-builder/FindApkHistory.json", json.dumps({}))  # 创建配置文件
+if not os.path.exists(get_home() + "/.config/uengine-apk-builder/FindApk.json"):  # 如果没有配置文件
+    write_txt(get_home() + "/.config/uengine-apk-builder/FindApk.json", json.dumps({"path": "~"}))  # 创建配置文件
+
+###########################
+# 设置变量
+###########################
+findApkHistory = list(json.loads(readtxt(get_home() + "/.config/uengine-apk-builder/FindApkHistory.json")).values())
+
+###########################
+# 窗口创建
+###########################
+win = tk.Tk()
+checkButtonBool1 = tk.BooleanVar()
+style = ttkthemes.ThemedStyle(win)
+style.set_theme("adapta")
+window = ttk.Frame(win)
+win.attributes('-alpha', 0.5)
+win.title(title)
+win.resizable(0, 0)
+win.iconphoto(False, tk.PhotoImage(file=iconPath))
+frame2 = ttk.Frame(window)
+label1 = ttk.Label(window, text="要打包的 apk 路径：")
+combobox1 = ttk.Combobox(window, width=100)
+button2 = ttk.Button(window, text="浏览", command=FindApk)
+button3 = ttk.Button(frame2, text="打包", command=BuildDeb)
+textbox1 = tk.Text(window, width=100)
+menu = tk.Menu(window, background="white")  # 设置菜单栏
+programmenu = tk.Menu(menu, tearoff=0, background="white")  # 设置“程序”菜单栏
+#adb = tk.Menu(menu, tearoff=0, background="white")
+uengine = tk.Menu(menu, tearoff=0, background="white")
+help = tk.Menu(menu, tearoff=0, background="white")  # 设置“帮助”菜单栏
+menu.add_cascade(label="程序", menu=programmenu)
+menu.add_cascade(label="帮助", menu=help)
+programmenu.add_command(label="清空软件历史记录", command=CleanProgramHistory)
+programmenu.add_separator()  # 设置分界线
+programmenu.add_command(label="退出程序", command=window.quit)  # 设置“退出程序”项
+help.add_command(label="程序官网", command=OpenProgramURL)  # 设置“程序官网”项
+help.add_separator()
+help.add_command(label="小提示", command=helps)  # 设置“小提示”项
+help.add_command(label="更新内容", command=UpdateThings)  # 设置“更新内容”项
+help.add_command(label="这个程序使用的程序列表（部分）", command=ShowUseProgram)  # 设置“更新内容”项
+#help.add_command(label="关于 adb", command=AboutAdb)  # 设置“关于这个程序”项
+help.add_command(label="关于这个程序", command=about_this_program)  # 设置“关于这个程序”项
+menu.configure(activebackground="white")
+help.configure(activebackground="white")
+uengine.configure(activebackground="white")
+#adb.configure(activebackground="white")
+programmenu.configure(activebackground="white")
+# 设置控件
+combobox1['value'] = findApkHistory
+textbox1.configure(state=tk.DISABLED)
+textbox1.config(foreground='white', background='black')
+#
+win.config(menu=menu)  # 显示菜单栏
+label1.grid(row=2, column=0)
+combobox1.grid(row=2, column=1)
+#button1.grid(column=0, row=0)
+button2.grid(row=2, column=2)
+button3.grid(row=0, column=0)
+frame2.grid(row=3, columnspa=3)
+textbox1.grid(row=4, columnspa=3)
+window.pack()
+win.mainloop()
--- a/uengine-app-install.py
+++ b/uengine-app-install.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python3
+import os
+import sys
+if len(sys.argv) > 1:
+    if sys.argv[1] == "--help":
+        print("帮助：")
+        print("uengine-app-install apk路径")
+        sys.exit(0)
+    sys.exit(os.system("sudo /usr/bin/uengine-session-launch-helper -- uengine install --apk='{}'".format(sys.argv[1])))
+print("命令参数错误")
+sys.exit(1)
--- a/uengine-app-uninstall.py
+++ b/uengine-app-uninstall.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python3
+import os
+import sys
+if len(sys.argv) > 1:
+    if sys.argv[1] == "--help":
+        print("帮助：")
+        print("uengine-app-uninstall apk包名")
+        sys.exit(0)
+    sys.exit(os.system("sudo /usr/bin/uengine-session-launch-helper -- uengine uninstall --pkg='{}'".format(sys.argv[1])))
+print("命令参数错误")
+sys.exit(1)
--- a/uengine-clean.py
+++ b/uengine-clean.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python3
+import os
+import sys
+if len(sys.argv) > 1:
+    if sys.argv[1] == "--help":
+        print("帮助：")
+        print("输入命令即可清空/重置uengine")
+        sys.exit(0)
+    print("参数错误")
+    sys.exit(1)
+sys.exit(os.system("sudo rm -rf /data/uengine"))
--- a/截图/1.2.2/截图录屏_选择区域_20210711143832.png
+++ b/截图/1.2.2/截图录屏_选择区域_20210711143832.png
--- a/示例/HyperBowl.png
+++ b/示例/HyperBowl.png
--- a/示例/QQ.png
+++ b/示例/QQ.png
--- a/示例/小猿口算.png
+++ b/示例/小猿口算.png
--- a/示例/微信.png
+++ b/示例/微信.png
--- a/示例/百度网盘.png
+++ b/示例/百度网盘.png
--- a/示例/百度翻译.png
+++ b/示例/百度翻译.png
--- a/示例/腾讯课堂.png
+++ b/示例/腾讯课堂.png
Author	SHA1	Message	Date
gfdgd xi	f5b04826c2	初步添加打包器	2021-08-19 08:49:50 +08:00
gfdgd xi	9d1f3e8176	1.3.3初步	2021-08-18 21:54:28 +08:00
gfdgd xi	a80397ee9e	添加deepin打包格式的deb包目录	2021-08-18 16:02:07 +08:00
gfdgd xi	deec28ce83	加一点命令以便操作	2021-08-18 15:14:40 +08:00
gfdgd xi	4dd48b5273	添加重启 uengine 服务、注释，以及修改部分文本	2021-08-16 09:35:08 +08:00
gfdgd xi	a28f4e6ba9	README有点问题	2021-08-16 07:40:30 +08:00
gfdgd xi	3ba28b053d	这才是真正的1.3.2	2021-08-16 07:36:36 +08:00
gfdgd xi	becf3200ec	上一个1.3.2不算，这个1.3.2待测试	2021-08-16 07:22:18 +08:00
gfdgd xi	db206335b1	Merge branch 'main' of https://gitee.com/gfdgd-xi/uengine-runner into main	2021-08-15 21:47:20 +08:00
gfdgd xi	a1eee38deb	1.3.2	2021-08-15 21:46:48 +08:00
gfdgd xi	67f8d2beca	add LICENSE.	2021-08-13 10:36:36 +00:00
gfdgd xi	d01423853a	Merge branch 'main' of https://gitee.com/gfdgd-xi/uengine-runner into main	2021-08-12 15:12:49 +08:00
gfdgd xi	d486fa55d8	1.3.1	2021-08-12 15:12:13 +08:00
actionchen	73d1e3b484	update README.MD	2021-08-11 17:26:57 +08:00
gfdgd xi	ce52b8579a	加个说明	2021-08-10 21:27:10 +08:00
gfdgd xi	fcc37f707e	更新一下 README.md	2021-08-10 11:09:51 +08:00
gfdgd xi	908177b69d	更新一下 README.md	2021-08-10 11:09:35 +08:00
gfdgd xi	89702f681e	忘传了点东西	2021-08-08 22:08:06 +08:00
gfdgd xi	7786c7b855	1.3.0	2021-08-08 22:02:43 +08:00
actionchen	2c75309d75	调整代码，修复了少量bug,修复了不能获取apk图标的问题	2021-08-08 17:14:48 +08:00