1.5.2
This commit is contained in:
@@ -96,7 +96,15 @@
|
||||
"UEngine 键盘映射",
|
||||
"UEngine 检测 CPU 是否支持运行",
|
||||
"删除 UEngine 运行检查",
|
||||
"重新安装 UEngine"
|
||||
"重新安装 UEngine",
|
||||
{
|
||||
"Name": "获取 UEngine 最高权限",
|
||||
"Menu": [
|
||||
"安装已经制作好的 UEngine 带最高权限的镜像",
|
||||
"构建 UEngine 带最高权限的镜像到用户主目录",
|
||||
"安装默认的 UEngine 镜像"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -222,7 +230,15 @@
|
||||
"UEngine Keyboard",
|
||||
"UEngine Check CPU Can Or Can't Run",
|
||||
"Delete UEngine Runing Checking",
|
||||
"Reinstall UEngine"
|
||||
"Reinstall UEngine",
|
||||
{
|
||||
"Name": "Get UEngine Root User",
|
||||
"Menu": [
|
||||
"Install UEngine Image With Root User",
|
||||
"Build An UEngine Image With Root User In Your Home Path",
|
||||
"Install Defult UEngine Image"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
Categories=System;
|
||||
Comment=UEngine 程序菜单
|
||||
Encoding=UTF-8
|
||||
Exec=/usr/bin/uengine launch --package=org.anbox.appmgr --component=org.anbox.appmgr.AppViewActivity
|
||||
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 程序菜单
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"https://gitee.com/gfdgd-xi/uengine-runner",
|
||||
"https://github.com/gfdgd-xi/uengine-runner"
|
||||
],
|
||||
"Version": "1.5.1",
|
||||
"Version": "1.5.2",
|
||||
"System": "Linux(deepin/UOS)",
|
||||
"Tips": [
|
||||
"更多可见:https://gitee.com/gfdgd-xi/uengine-runner/wikis",
|
||||
@@ -26,6 +26,10 @@
|
||||
"4、如果想要使用adb连接UEngine或其他手机,请使用 1.2.0 以前的版本。(如需连接UEngine请安装adb补丁)"
|
||||
],
|
||||
"Update": [
|
||||
"V1.5.2:",
|
||||
"※1、支持安装和构建带 Root 的 UEngine 的镜像",
|
||||
"2、更新了反馈链接",
|
||||
"",
|
||||
"V1.5.1:",
|
||||
"※1、精简用户界面,合并安装和卸载输入框和浏览按钮等",
|
||||
"※2、修复安装以其的程序图标无法点击进入的问题(deepin 社区版不存在此问题)",
|
||||
|
||||
76
new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/root-uengine.sh
Executable file
76
new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/root-uengine.sh
Executable file
@@ -0,0 +1,76 @@
|
||||
#!/bin/bash
|
||||
|
||||
#sudo apt install squashfs-tools
|
||||
|
||||
mkdir -p ~/temp
|
||||
cd ~/temp
|
||||
echo "正在下载supersu"
|
||||
wget -P ~/temp http://supersuroot.org/downloads/SuperSU-v2.82-201705271822.zip
|
||||
cd ..
|
||||
mkdir -p ~/temp/work/dabao/extract/DEBIAN
|
||||
echo "正在解压supersu"
|
||||
unzip ~/temp/SuperSU-v2.82-201705271822.zip -d ~/temp/work/su
|
||||
WORKDIR=~/temp/work
|
||||
cd "$WORKDIR"
|
||||
echo "正在下载uengine-android-image"
|
||||
apt download uengine-android-image
|
||||
echo "正在解压uengine-android-image"
|
||||
cd dabao
|
||||
dpkg-deb -x $WORKDIR/uengine-android-image*.deb extract/
|
||||
dpkg-deb -e $WORKDIR/uengine-android-image*.deb extract/DEBIAN
|
||||
cd ..
|
||||
cp dabao/extract/usr/share/uengine/android.img android.img
|
||||
|
||||
echo "正在解压android镜像"
|
||||
sudo unsquashfs android.img
|
||||
|
||||
sudo mkdir -p ./squashfs-root/system/app/SuperSU
|
||||
sudo mkdir -p ./squashfs-root/system/bin/.ext/
|
||||
|
||||
echo "正在将supersu安装到android镜像"
|
||||
sudo cp ./su/common/Superuser.apk ./squashfs-root/system/app/SuperSU/SuperSU.apk
|
||||
sudo cp ./su/common/install-recovery.sh ./squashfs-root/system/etc/install-recovery.sh
|
||||
sudo cp ./su/common/install-recovery.sh ./squashfs-root/system/bin/install-recovery.sh
|
||||
sudo cp ./su/x64/su ./squashfs-root/system/xbin/su
|
||||
sudo cp ./su/x64/su ./squashfs-root/system/bin/.ext/.su
|
||||
sudo cp ./su/x64/su ./squashfs-root/system/xbin/daemonsu
|
||||
sudo cp ./su/x64/supolicy ./squashfs-root/system/xbin/supolicy
|
||||
sudo cp ./su/x64/libsupol.so ./squashfs-root/system/lib64/libsupol.so
|
||||
sudo cp ./squashfs-root/system/bin/app_process64 ./squashfs-root/system/bin/app_process_init
|
||||
sudo cp ./squashfs-root/system/bin/app_process64 ./squashfs-root/system/bin/app_process64_original
|
||||
sudo cp ./squashfs-root/system/xbin/daemonsu ./squashfs-root/system/bin/app_process
|
||||
sudo cp ./squashfs-root/system/xbin/daemonsu ./squashfs-root/system/bin/app_process64
|
||||
|
||||
sudo chmod +x ./squashfs-root/system/app/SuperSU/SuperSU.apk
|
||||
sudo chmod +x ./squashfs-root/system/etc/install-recovery.sh
|
||||
sudo chmod +x ./squashfs-root/system/bin/install-recovery.sh
|
||||
sudo chmod +x ./squashfs-root/system/xbin/su
|
||||
sudo chmod +x ./squashfs-root/system/bin/.ext/.su
|
||||
sudo chmod +x ./squashfs-root/system/xbin/daemonsu
|
||||
sudo chmod +x ./squashfs-root/system/xbin/supolicy
|
||||
sudo chmod +x ./squashfs-root/system/lib64/libsupol.so
|
||||
sudo chmod +x ./squashfs-root/system/bin/app_process_init
|
||||
sudo chmod +x ./squashfs-root/system/bin/app_process64_original
|
||||
sudo chmod +x ./squashfs-root/system/bin/app_process
|
||||
sudo chmod +x ./squashfs-root/system/bin/app_process64
|
||||
|
||||
echo "正在打包android镜像"
|
||||
sudo rm android.img
|
||||
sudo mksquashfs squashfs-root android.img -b 131072 -comp xz -Xbcj ia64
|
||||
|
||||
|
||||
cp android.img dabao/extract/usr/share/uengine/android.img
|
||||
|
||||
echo "正在打包uengine-android-image"
|
||||
cd dabao/extract
|
||||
find usr -type f -print0 |xargs -0 md5sum >md5sums
|
||||
cd ..
|
||||
mkdir build
|
||||
dpkg-deb -b extract/ build/
|
||||
|
||||
cp build/*.deb ~/
|
||||
|
||||
echo "正在清理垃圾"
|
||||
sudo rm -rf ~/temp
|
||||
|
||||
echo "已在用户主目录生成新的安装包,安装后重启即可生效"
|
||||
@@ -2,8 +2,8 @@
|
||||
# 使用系统默认的 python3 运行
|
||||
###########################################################################################
|
||||
# 作者:gfdgd xi
|
||||
# 版本:1.4.2
|
||||
# 更新时间:2021年8月30日
|
||||
# 版本:1.5.1
|
||||
# 更新时间:2021年10月06日
|
||||
# 感谢:anbox、deepin 和 统信
|
||||
# 基于 Python3 的 tkinter 构建
|
||||
###########################################################################################
|
||||
@@ -435,7 +435,7 @@ if len(sys.argv) > 1:
|
||||
# 设置窗口
|
||||
style = ttkthemes.ThemedStyle(win)
|
||||
style.set_theme("breeze")
|
||||
win.attributes('-alpha', 0.5)
|
||||
#win.attributes('-alpha', 0.5)
|
||||
win.title(title)
|
||||
win.resizable(0, 0)
|
||||
win.iconphoto(False, tk.PhotoImage(file=iconPath))
|
||||
|
||||
@@ -75,7 +75,6 @@ def ButtonClick8():
|
||||
threading.Thread(target=UninstallProgram, args=[path]).start()
|
||||
|
||||
# 浏览窗口
|
||||
# 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"])
|
||||
@@ -170,26 +169,6 @@ def Button5Click():
|
||||
def OpenUengineProgramList()->"打开“uengine 所有程序列表”":
|
||||
os.system("uengine launch --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
|
||||
@@ -330,6 +309,18 @@ def GetApkPackageName(apkFilePath: "apk 所在路径")->"获取 apk 包名":
|
||||
line = line.replace(" ", "")
|
||||
return line
|
||||
|
||||
def InstallRootUengineImage():
|
||||
if not os.path.exists:
|
||||
os.mkdir("/tmp/uengine-runner")
|
||||
write_txt("/tmp/uengine-runner/install.sh", "sudo dpkg -i /tmp/uengine-runner/u*.deb\nsudo apt install -f")
|
||||
threading.Thread(target=os.system, args=["deepin-terminal -C \"wget -P '/tmp/uengine-runner' 'https://hub.fastgit.org/gfdgd-xi/uengine-runner/releases/download/U1.1.14/uengine-android-image_1.1.14_amd64.deb' && pkexec bash '/tmp/uengine-runner/install.sh'\""]).start()
|
||||
|
||||
def BuildRootUengineImage():
|
||||
threading.Thread(target=os.system, args=["deepin-terminal -C \"bash '{}'\"".format(programPath + "/root-uengine.sh")]).start()
|
||||
|
||||
def ReinstallUengineImage():
|
||||
threading.Thread(target=os.system, args=["deepin-terminal -e ''pkexec apt reinstall uengine-android-image"]).start()
|
||||
|
||||
# 生成 uengine 启动文件到桌面
|
||||
def BuildUengineDesktop(packageName: "软件包名", activityName: "activity", showName: "显示名称", iconPath: "程序图标所在目录", savePath:".desktop 文件保存路径")->"生成 uengine 启动文件到桌面":
|
||||
things = '''[Desktop Entry]
|
||||
@@ -520,10 +511,6 @@ def SaveInstallUengineApp():
|
||||
|
||||
def UengineCheckCpu():
|
||||
english = GetCommandReturn("uengine check-features")
|
||||
#chinese = GetCommandReturn("trans -b \"{}\"".format(english)) # 获取中文翻译
|
||||
#for i in chinese.split("\n"): # 删除提示
|
||||
# if "Did you mean:" in i:
|
||||
# chinese = chinese.replace(i, "").replace("\n", "")
|
||||
messagebox.showinfo(title="提示", message="{}".format(english))
|
||||
|
||||
# 获取用户主目录
|
||||
@@ -1161,6 +1148,7 @@ uengineInternet = tk.Menu(uengine, tearoff=0, background="white")
|
||||
uengineIcon = tk.Menu(uengine, tearoff=0, background="white")
|
||||
uengineUseAdb = tk.Menu(uengine, tearoff=0, background="white")
|
||||
uengineData = tk.Menu(uengine, tearoff=0, background="white")
|
||||
uengineRoot = tk.Menu(uengine, tearoff=0, background="white")
|
||||
|
||||
menu.add_cascade(label=langFile[lang]["Main"]["MainWindow"]["Menu"][0]["Name"], menu=programmenu)
|
||||
menu.add_cascade(label=langFile[lang]["Main"]["MainWindow"]["Menu"][1]["Name"], menu=adb)
|
||||
@@ -1199,6 +1187,7 @@ uengine.add_cascade(label=langFile[lang]["Main"]["MainWindow"]["Menu"][2]["Menu"
|
||||
uengine.add_cascade(label=langFile[lang]["Main"]["MainWindow"]["Menu"][2]["Menu"][6]["Name"], menu=uengineData)
|
||||
uengine.add_command(label=langFile[lang]["Main"]["MainWindow"]["Menu"][2]["Menu"][9], command=DelUengineCheck)
|
||||
uengine.add_command(label=langFile[lang]["Main"]["MainWindow"]["Menu"][2]["Menu"][10], command=ReinstallUengine)
|
||||
uengine.add_cascade(label=langFile[lang]["Main"]["MainWindow"]["Menu"][2]["Menu"][11]["Name"], menu=uengineRoot)
|
||||
|
||||
help.add_command(label=langFile[lang]["Main"]["MainWindow"]["Menu"][3]["Menu"][0], command=OpenProgramURL) # 设置“程序官网”项
|
||||
help.add_command(label=langFile[lang]["Main"]["MainWindow"]["Menu"][3]["Menu"][2], command=UengineRunnerBugUpload) # 设置“程序官网”项
|
||||
@@ -1231,6 +1220,11 @@ uengineData.add_command(label=langFile[lang]["Main"]["MainWindow"]["Menu"][2]["M
|
||||
uengineData.add_separator()
|
||||
uengineData.add_command(label=langFile[lang]["Main"]["MainWindow"]["Menu"][2]["Menu"][6]["Menu"][2], command=BackUengineClean)
|
||||
|
||||
uengineRoot.add_command(label=langFile[lang]["Main"]["MainWindow"]["Menu"][2]["Menu"][11]["Menu"][0], command=InstallRootUengineImage)
|
||||
uengineRoot.add_command(label=langFile[lang]["Main"]["MainWindow"]["Menu"][2]["Menu"][11]["Menu"][1], command=BuildRootUengineImage)
|
||||
uengineRoot.add_separator()
|
||||
uengineRoot.add_command(label=langFile[lang]["Main"]["MainWindow"]["Menu"][2]["Menu"][11]["Menu"][2], command=ReinstallUengineImage)
|
||||
|
||||
menu.configure(activebackground="dodgerblue")
|
||||
help.configure(activebackground="dodgerblue")
|
||||
adb.configure(activebackground="dodgerblue")
|
||||
@@ -1270,11 +1264,6 @@ FrmInstall.grid(row=0, column=1,padx=3, rowspan=3)
|
||||
BtnFindApk.grid(row=0, column=0)
|
||||
BtnInstall.grid(row=0, column=1)
|
||||
|
||||
#LabUninstallPath.grid(row=4, column=0,sticky= tk.W,padx=3)
|
||||
#ComboUninstallPath.grid(row=5, column=0,padx=3)
|
||||
|
||||
#FrmUninstall.grid(row=5, column=1,padx=3)
|
||||
#BtnUninstallApkBrowser.grid(row=0, column=0)
|
||||
BtnUninstall.grid(row=1, column=0)
|
||||
|
||||
BtnShowUengineApp.grid(row=2, column=0,sticky= tk.W,padx=3,pady=2)
|
||||
|
||||
@@ -28,7 +28,7 @@ def Update(name, stars, contact, things, version):
|
||||
"Version": version
|
||||
}
|
||||
try:
|
||||
messagebox.showinfo(message=requests.post(parse.unquote(base64.b64decode("aHR0cCUzQS8vZ2ZkZ2R4aS5xaWNwLnZpcC91ZW5naW5lL2J1Zy91cGxvYWQucGhw").decode("utf-8")), data=data).text)
|
||||
messagebox.showinfo(message=requests.post(parse.unquote(base64.b64decode("aHR0cCUzQS8vMTIwLjI1LjE1My4xNDQvdWVuZ2luZS1ydW5uZXIvYnVnL3VwbG9hZC5waHA=").decode("utf-8")), data=data).text)
|
||||
except:
|
||||
traceback.print_exc()
|
||||
messagebox.showerror(title="错误", message="服务器疑似出现错误,可以进行以下尝试:①多尝试几次;②使用其他反馈途径\n错误信息:{}".format(traceback.format_exc()))
|
||||
|
||||
Reference in New Issue
Block a user