Compare commits
27 Commits
2.0.1
...
2.1.0-alph
| Author | SHA1 | Date | |
|---|---|---|---|
| f2acfcc4be | |||
| 5a0aa5160c | |||
|
|
abf6d4903f | ||
|
|
5bcb05142c | ||
|
|
b358b56974 | ||
|
|
ef1b7800c6 | ||
|
|
0b2a8e7821 | ||
|
|
9608ce6bfc | ||
|
|
0e21b7187d | ||
| b277bb25b4 | |||
| 35416ce12b | |||
| 8ccd721c98 | |||
| 0f6f24aa95 | |||
| 6bdfd5a9ef | |||
| 27817c824e | |||
| 06c763d862 | |||
| 4937e60333 | |||
| 6775f5433d | |||
| eeeff8429a | |||
| 1d3ca4bf2d | |||
| 59e2ccfd63 | |||
| f716c22e76 | |||
| 9c86d23d31 | |||
| 4e3b49007d | |||
| 0a2c8bbdab | |||
| 0c1ab111a6 | |||
| 8092d608c3 |
@@ -146,7 +146,7 @@ class InformationWindow():
|
|||||||
about = f"<h1>关于“{choose}”的介绍</h1>\n<p>暂无此程序的介绍</p>"
|
about = f"<h1>关于“{choose}”的介绍</h1>\n<p>暂无此程序的介绍</p>"
|
||||||
try:
|
try:
|
||||||
import requests as r
|
import requests as r
|
||||||
fenlists = requests.get(base64.b64decode("aHR0cHM6Ly9jb2RlLmdpdGxpbmsub3JnLmNuL2dmZGdkLXhpLW9yZy93aW5lLXJ1bm5lci1kb3dubG9hZHMtb2YtcnVubmVyL3Jhdy9icmFuY2gvbWFzdGVyL0Jhc2hBcHBGZW4v").decode("utf-8") + urllib.request.quote(fileName) + base64.b64decode("L2FsbC5qc29u").decode("utf-8"), timeout=1000).json()
|
fenlists = requests.get("http://data.download.gfdgdxi.top/BashAppFen/" + urllib.request.quote(fileName) + base64.b64decode("L2FsbC5qc29u").decode("utf-8"), timeout=1000).json()
|
||||||
tipsInfo = ""
|
tipsInfo = ""
|
||||||
except:
|
except:
|
||||||
fenlists = [0, 0, 0, 0, 0]
|
fenlists = [0, 0, 0, 0, 0]
|
||||||
@@ -166,19 +166,19 @@ class InformationWindow():
|
|||||||
if maxHead > 5:
|
if maxHead > 5:
|
||||||
for i in range(end):
|
for i in range(end):
|
||||||
if webeng:
|
if webeng:
|
||||||
starHtml += f"<img src='https://code.gitlink.org.cn/gfdgd_xi/deep-wine-runner/raw/branch/main/Icon/BadStar.svg' width=50>\n"
|
starHtml += f"<img src='http://wine-runner.gfdgdxi.top/Icon/BadStar.svg' width=50>\n"
|
||||||
else:
|
else:
|
||||||
starHtml += f"<img src='{programPath}/Icon/BadStar.svg' width=50>\n"
|
starHtml += f"<img src='{programPath}/Icon/BadStar.svg' width=50>\n"
|
||||||
else:
|
else:
|
||||||
for i in range(maxHead):
|
for i in range(maxHead):
|
||||||
if webeng:
|
if webeng:
|
||||||
starHtml += f"<img src='https://code.gitlink.org.cn/gfdgd_xi/deep-wine-runner/raw/branch/main/Icon/Star.svg' width=50>\n"
|
starHtml += f"<img src='http://wine-runner.gfdgdxi.top/Icon/Star.svg' width=50>\n"
|
||||||
else:
|
else:
|
||||||
starHtml += f"<img src='{programPath}/Icon/Star.svg' width=50>\n"
|
starHtml += f"<img src='{programPath}/Icon/Star.svg' width=50>\n"
|
||||||
head = maxHead
|
head = maxHead
|
||||||
for i in range(head, end):
|
for i in range(head, end):
|
||||||
if webeng:
|
if webeng:
|
||||||
starHtml += f"<img src='https://code.gitlink.org.cn/gfdgd_xi/deep-wine-runner/raw/branch/main/Icon/UnStar.svg' width=50>"
|
starHtml += f"<img src='http://wine-runner.gfdgdxi.top/Icon/UnStar.svg' width=50>"
|
||||||
else:
|
else:
|
||||||
starHtml += f"<img src='{programPath}/Icon/UnStar.svg' width=50>"
|
starHtml += f"<img src='{programPath}/Icon/UnStar.svg' width=50>"
|
||||||
about += f"\n<hr/><h1>评分情况</h1>\n<p align='center'>{starHtml}</p>\n<p align='center'>{tipsInfo}</p>"
|
about += f"\n<hr/><h1>评分情况</h1>\n<p align='center'>{starHtml}</p>\n<p align='center'>{tipsInfo}</p>"
|
||||||
@@ -260,7 +260,7 @@ class ProgramRunStatusShow():
|
|||||||
fileName = i[1]
|
fileName = i[1]
|
||||||
break
|
break
|
||||||
try:
|
try:
|
||||||
fenlists = requests.get(base64.b64decode("aHR0cHM6Ly9jb2RlLmdpdGxpbmsub3JnLmNuL2dmZGdkLXhpLW9yZy93aW5lLXJ1bm5lci1kb3dubG9hZHMtb2YtcnVubmVyL3Jhdy9icmFuY2gvbWFzdGVyL0Jhc2hBcHBGZW4v").decode("utf-8") + urllib.request.quote(fileName) + base64.b64decode("L2FsbC5qc29u").decode("utf-8")).json()
|
fenlists = requests.get("http://data.download.gfdgdxi.top/BashAppFen/" + urllib.request.quote(fileName) + base64.b64decode("L2FsbC5qc29u").decode("utf-8")).json()
|
||||||
tipsInfo = ""
|
tipsInfo = ""
|
||||||
except:
|
except:
|
||||||
#traceback.print_exc()
|
#traceback.print_exc()
|
||||||
@@ -318,7 +318,7 @@ class ProgramRunStatusShow():
|
|||||||
else:
|
else:
|
||||||
# 显示最新的3条评论
|
# 显示最新的3条评论
|
||||||
try:
|
try:
|
||||||
all = int(requests.get(f"{base64.b64decode('aHR0cHM6Ly9jb2RlLmdpdGxpbmsub3JnLmNuL2dmZGdkLXhpLW9yZy9iYXNocGlubHVuL3Jhdy9icmFuY2gvbWFzdGVyLw==').decode('utf-8')}{urllib.request.quote(fileName)}/data.txt").text)
|
all = int(requests.get(f"http://bashpinlun.gfdgdxi.top/{urllib.request.quote(fileName)}/data.txt").text)
|
||||||
now = all - 3
|
now = all - 3
|
||||||
print(all)
|
print(all)
|
||||||
if all < 3:
|
if all < 3:
|
||||||
@@ -329,7 +329,7 @@ class ProgramRunStatusShow():
|
|||||||
uploadList = []
|
uploadList = []
|
||||||
for i in range(all - 1, start - 1, -1):
|
for i in range(all - 1, start - 1, -1):
|
||||||
print(f"第 {i + 1} 条评论:")
|
print(f"第 {i + 1} 条评论:")
|
||||||
info = requests.get(f"{base64.b64decode('aHR0cHM6Ly9jb2RlLmdpdGxpbmsub3JnLmNuL2dmZGdkLXhpLW9yZy9iYXNocGlubHVuL3Jhdy9icmFuY2gvbWFzdGVyLw==').decode('utf-8')}{urllib.request.quote(fileName)}/pf-{i}.txt").text.strip()
|
info = requests.get(f"http://bashpinlun.gfdgdxi.top/{urllib.request.quote(fileName)}/pf-{i}.txt").text.strip()
|
||||||
print(info)
|
print(info)
|
||||||
uploadList.append([f"用户{i + 1}", i + 1, info])
|
uploadList.append([f"用户{i + 1}", i + 1, info])
|
||||||
Add(uploadList)
|
Add(uploadList)
|
||||||
@@ -386,7 +386,7 @@ def UpdateFen():
|
|||||||
uploadList = []
|
uploadList = []
|
||||||
for i in range(now + 2, now - 1, -1):
|
for i in range(now + 2, now - 1, -1):
|
||||||
print(f"第 {i + 1} 条评论:")
|
print(f"第 {i + 1} 条评论:")
|
||||||
info = requests.get(f"https://code.gitlink.org.cn/gfdgd-xi-org/bashpinlun/raw/branch/master/{urllib.request.quote(fileName)}/pf-{i}.txt").text.strip()
|
info = requests.get(f"http://bashpinlun.gfdgdxi.top/{urllib.request.quote(fileName)}/pf-{i}.txt").text.strip()
|
||||||
print(info)
|
print(info)
|
||||||
uploadList.append([f"用户{i + 1}", i + 1, info])
|
uploadList.append([f"用户{i + 1}", i + 1, info])
|
||||||
#ProgramRunStatusShow.pingLunLayout.removeItem(ProgramRunStatusShow.pingLunLayout.itemAt(2))
|
#ProgramRunStatusShow.pingLunLayout.removeItem(ProgramRunStatusShow.pingLunLayout.itemAt(2))
|
||||||
|
|||||||
0
2048/.gitignore → Help/2048/.gitignore
vendored
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 5.7 KiB |
|
Before Width: | Height: | Size: 69 KiB After Width: | Height: | Size: 69 KiB |
|
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 41 KiB |
|
Before Width: | Height: | Size: 77 KiB After Width: | Height: | Size: 77 KiB |
|
Before Width: | Height: | Size: 94 KiB After Width: | Height: | Size: 94 KiB |
|
Before Width: | Height: | Size: 81 KiB After Width: | Height: | Size: 81 KiB |
@@ -2,7 +2,7 @@
|
|||||||
<meta charset='UTF-8'>
|
<meta charset='UTF-8'>
|
||||||
<meta name='viewport' content='width=device-width initial-scale=1'>
|
<meta name='viewport' content='width=device-width initial-scale=1'>
|
||||||
<link rel="shortcut icon" href="../runner.svg">
|
<link rel="shortcut icon" href="../runner.svg">
|
||||||
<title>UEngine 程序帮助</title>
|
<title>UEngine 运行器帮助</title>
|
||||||
</head>
|
</head>
|
||||||
<h1 id="uengine-运行器帮助">UEngine 运行器帮助</h1>
|
<h1 id="uengine-运行器帮助">UEngine 运行器帮助</h1>
|
||||||
<hr>
|
<hr>
|
||||||
@@ -12,6 +12,9 @@
|
|||||||
</blockquote>
|
</blockquote>
|
||||||
<hr>
|
<hr>
|
||||||
<h2 id="常见问题">常见问题</h2>
|
<h2 id="常见问题">常见问题</h2>
|
||||||
|
<h3 id="Deepin 23Alpha2 缺失依赖怎么办?">Deepin 23Alpha2 缺失依赖怎么办?</h3>
|
||||||
|
<p>从 <a href="https://gfdgdxi.lanzoue.com/b01qiu22f">https://gfdgdxi.lanzoue.com/b01qiu22f</a> 拉取依赖</p>
|
||||||
|
<p>密码:dihl</p>
|
||||||
<h3 id="出现如下图的情况如何修复?">出现如下图的情况如何修复?</h3>
|
<h3 id="出现如下图的情况如何修复?">出现如下图的情况如何修复?</h3>
|
||||||
<p><img src="2-1-1.png" alt=""><br>出于安全考虑,您的平板电脑已设置为禁止安装来源不明的应用。 </p>
|
<p><img src="2-1-1.png" alt=""><br>出于安全考虑,您的平板电脑已设置为禁止安装来源不明的应用。 </p>
|
||||||
<h4 id="修复方法">修复方法</h4>
|
<h4 id="修复方法">修复方法</h4>
|
||||||
|
|||||||
@@ -16,6 +16,10 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
## 常见问题
|
## 常见问题
|
||||||
|
### Deepin 23Alpha2 缺失依赖怎么办?
|
||||||
|
从 https://gfdgdxi.lanzoue.com/b01qiu22f 拉取依赖
|
||||||
|
密码:dihl
|
||||||
|
|
||||||
### 出现如下图的情况如何修复?
|
### 出现如下图的情况如何修复?
|
||||||

|

|
||||||
出于安全考虑,您的平板电脑已设置为禁止安装来源不明的应用。
|
出于安全考虑,您的平板电脑已设置为禁止安装来源不明的应用。
|
||||||
|
|||||||
@@ -1,17 +1,14 @@
|
|||||||
<head>
|
<head>
|
||||||
<title>Wine 运行器程序公告</title>
|
<title>UEngine 运行器程序公告</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<h1>针对在 Ubuntu 安装 UEngine 后狂刷通知的解答(UEngine Installer)</h1>
|
|
||||||
<p>先用如下命令移除掉该组件(在终端输入),然后等待作者修复该问题:</p>
|
|
||||||
<pre><code>s
|
|
||||||
sudo rm /usr/share/applications/uengine-loading-ubuntu.desktop
|
|
||||||
sudo rm /etc/xdg/autostart/uengine-loading-ubuntu.desktop
|
|
||||||
sudo rm /usr/bin/uengine-loading-ubuntu</code></pre>
|
|
||||||
<hr/>
|
|
||||||
<h1>常见链接</h1>
|
<h1>常见链接</h1>
|
||||||
<p>程序论坛:<a href="https://gfdgdxi.flarum.cloud/">https://gfdgdxi.flarum.cloud/</a></p>
|
|
||||||
<p>星火应用商店:<a href="https://spark-app.store/">https://spark-app.store/</a></p>
|
<p>星火应用商店:<a href="https://spark-app.store/">https://spark-app.store/</a></p>
|
||||||
|
<p><a href='https://deepin-community-store.gitee.io/spk-resolv?spk=spk://store/tools/com.gitee.uengine.runner.spark'>点击这里从星火应用商店获取 UEngine 运行器</a></p>
|
||||||
<hr/>
|
<hr/>
|
||||||
<p align="center"><img src="https://gitee.com/gfdgd-xi/uengine-runner/widgets/widget_card.svg?colors=eae9d7,2e2f29,272822,484a45,eae9d7,747571"></p>
|
<p align="center"><img src="https://gitee.com/gfdgd-xi/uengine-runner/widgets/widget_card.svg?colors=eae9d7,2e2f29,272822,484a45,eae9d7,747571"></p>
|
||||||
</body>
|
<hr/>
|
||||||
|
<h1>程序安装/打开量</h1>
|
||||||
|
<p align="center"><img src="http://gfdgd-xi.github.io/images/uengine-runner-open.svg"></p>
|
||||||
|
<p align="center"><img src="http://gfdgd-xi.github.io/images/uengine-runner.svg"></p>
|
||||||
|
</body>
|
||||||
|
|||||||
3
Help/shell/index.html
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
<!DOCTYPE html><html lang="zh-CN"><head><meta charset="UTF-8"><title>文件目录</title></head><body><h1>文件目录</h1><ul>
|
||||||
|
<li><a href="run_daemon.sh">run_daemon.sh</a></li>
|
||||||
|
</ul></body></html>
|
||||||
77
Help/shell/run_daemon.sh
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
#/bin/bash
|
||||||
|
# 狗头
|
||||||
|
echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'
|
||||||
|
echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@`***,@@@@@@@@'
|
||||||
|
echo '@@@@^*****,\@@@@@@@@@@@@@@@@@@@@`*.....*\@@@@@@'
|
||||||
|
echo '@@@@*.......**\@[`***......*****.....*..*\@@@@@'
|
||||||
|
echo '@@@@^*..............................***...@@@@@'
|
||||||
|
echo '@@@@@*...............................**..*\@@@@'
|
||||||
|
echo '@@@@@^*..*............................*..*=@@@@'
|
||||||
|
echo '@@@@@^**................................**=@@@@'
|
||||||
|
echo '@@@@@/*..................................*=@@@@'
|
||||||
|
echo '@@@@@*..... ..... ............*@@@@'
|
||||||
|
echo '@@@@`*. .]]]]` ... ]/[[[O/O]`........*,@@@'
|
||||||
|
echo '@@@@*.=` =O.,OO......=` .OOOOOO^........*@@@'
|
||||||
|
echo '@@@^*.\ =OOOOO^.....=` .OOOOOO^........*=@@'
|
||||||
|
echo '@@@^*..,\].=OO/.........,[\]]O/[` ......*=@@'
|
||||||
|
echo '@@@@*...................... .*@@@'
|
||||||
|
echo '@@@@`. ......,]]...... .,@@@'
|
||||||
|
echo '@@@@@*. OOOOOOO^ .*@@@@'
|
||||||
|
echo '@@@@@\*. \OOOO` .*/@@@@'
|
||||||
|
echo '@@@@@@\*. =. / .*/@@@@@'
|
||||||
|
echo '@@@@@@@@`*. ,\OOOOOOO]]OO` .*,@@@@@@@'
|
||||||
|
echo '@@@@@@@@@@`*. . .*,@@@@@@@@@'
|
||||||
|
echo '@@@@@@@@@@@@\**.. ......... ..**/@@@@@@@@@@@'
|
||||||
|
echo '@@@@@@@@@@@@@@@@]`***......***,]@@@@@@@@@@@@@@@'
|
||||||
|
echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'
|
||||||
|
|
||||||
|
# 使 UEngine 能在 Wayland 下运行
|
||||||
|
export XDG_SESSION_TYPE=x11
|
||||||
|
export QT_QPA_PLATFORM=xcb
|
||||||
|
unset WAYLAND_DISPLAYCOPY
|
||||||
|
# 判断是否是开机后第一次运行(无用)
|
||||||
|
#if [[ ! -f /tmp/uengine-loading-ubuntu ]]; then
|
||||||
|
# # 需等待一段时间等系统全部加载完成
|
||||||
|
# notify-send -i /opt/apps/com.gitee.uengine.runner.spark/files/icon.png "UEngine 服务正在加载" -a uengine-runner
|
||||||
|
# sleep 10
|
||||||
|
# touch /tmp/uengine-loading-ubuntu
|
||||||
|
#fi
|
||||||
|
# 修复程序显示问题
|
||||||
|
XDG_CURRENT_DESKTOP="Deepin"
|
||||||
|
export LD_LIBRARY_PATH=/usr/share/uengine/lib64/
|
||||||
|
# 判断 UEngine 是否被正确安装
|
||||||
|
which uengine
|
||||||
|
if [[ $? != 0 ]]; then
|
||||||
|
notify-send -i /opt/apps/com.gitee.uengine.runner.spark/files/icon.png "未安装 UEngine,结束!" -a uengine-runner
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
uname -r | grep 5.17.3
|
||||||
|
if [[ $? != 0 ]]; then
|
||||||
|
if [[ -f /usr/bin/uengine-loading-binder ]]; then
|
||||||
|
echo 加载 binder
|
||||||
|
pkexec /usr/bin/uengine-loading-binder
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
notify-send -i /opt/apps/com.gitee.uengine.runner.spark/files/icon.png "UEngine 服务启动完成" -a uengine-runner
|
||||||
|
bad=0
|
||||||
|
# 守护进程,防止异常退出
|
||||||
|
while [[ true ]]; do
|
||||||
|
uengine session-manager -platformtheme=deepin
|
||||||
|
# 让用户可以强制结束
|
||||||
|
if [[ -f "/tmp/uengine-loading-ubuntu-end" ]]; then
|
||||||
|
rm /tmp/uengine-loading-ubuntu-end
|
||||||
|
echo UEngine 服务异常崩溃,不再重启服务
|
||||||
|
notify-send -i /opt/apps/com.gitee.uengine.runner.spark/files/icon.png "UEngine 服务异常崩溃,不再重启服务" -a uengine-runner
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
if [[ $bad -gt 9 ]]; then
|
||||||
|
# 错误次数太多,结束
|
||||||
|
notify-send -i /opt/apps/com.gitee.uengine.runner.spark/files/icon.png "UEngine 服务异常崩溃次数过多,不再重启服务" -a uengine-runner
|
||||||
|
echo UEngine 服务异常崩溃次数过多,不再重启服务
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
bad=$(($bad+1))
|
||||||
|
echo "UEngine 服务异常结束,重新启动($bad次)"
|
||||||
|
notify-send -i /opt/apps/com.gitee.uengine.runner.spark/files/icon.png "UEngine 服务异常结束,重新启动($bad次)" -a uengine-runner
|
||||||
|
|
||||||
|
done
|
||||||
13
LoadingBinder/load.cpp
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
#include <iostream>
|
||||||
|
using namespace std;
|
||||||
|
int main(){
|
||||||
|
// 检查是否是 root 用户
|
||||||
|
if(system("[[ `whoami` == root ]]")){
|
||||||
|
cout << "这不是 root 账户,失败!";
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
system("modprobe binder_linux");
|
||||||
|
system("mkdir /dev/binderfs");
|
||||||
|
system("mount -t binder binder /dev/binderfs");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
BIN
LoadingBinder/load.out
Executable file
8
LoadingBinder/load.sh
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
if [[ `whoami` != root ]]; then
|
||||||
|
echo 这不是 root 用户,结束
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
modprobe binder_linux
|
||||||
|
mkdir /dev/binderfs
|
||||||
|
mount -t binder binder /dev/binderfs
|
||||||
2
Makefile
@@ -56,6 +56,8 @@ build:
|
|||||||
cp -rv Icon new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/
|
cp -rv Icon new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/
|
||||||
cp -rv CompareVersion.py new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/
|
cp -rv CompareVersion.py new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/
|
||||||
cp -rv uengine-remove.sh new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/
|
cp -rv uengine-remove.sh new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/
|
||||||
|
cp -rv pkexec new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/
|
||||||
|
cp -rv LoadingBinder new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/
|
||||||
rm -rfv new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/information
|
rm -rfv new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/Help/information
|
||||||
python3 UpdateTime.py
|
python3 UpdateTime.py
|
||||||
python3 RemovePycacheFile.py #new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/
|
python3 RemovePycacheFile.py #new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/
|
||||||
|
|||||||
@@ -1153,7 +1153,7 @@ class UpdateWindow():
|
|||||||
cancel.clicked.connect(UpdateWindow.update.close)
|
cancel.clicked.connect(UpdateWindow.update.close)
|
||||||
ok.setDisabled(True)
|
ok.setDisabled(True)
|
||||||
try:
|
try:
|
||||||
UpdateWindow.data = json.loads(requests.get("https://code.gitlink.org.cn/gfdgd_xi/wine-runner-update-information/raw/branch/master/uengine-runner/update.json").text)
|
UpdateWindow.data = json.loads(requests.get("http://update.gfdgdxi.top/uengine-runner/update.json").text)
|
||||||
versionLabel = QtWidgets.QLabel(f"当前版本:{version}\n最新版本:{UpdateWindow.data['Version']}\n更新内容:")
|
versionLabel = QtWidgets.QLabel(f"当前版本:{version}\n最新版本:{UpdateWindow.data['Version']}\n更新内容:")
|
||||||
if UpdateWindow.data["Version"] == version:
|
if UpdateWindow.data["Version"] == version:
|
||||||
updateText.setText("此为最新版本,无需更新")
|
updateText.setText("此为最新版本,无需更新")
|
||||||
@@ -1324,7 +1324,7 @@ class ApkInformation():
|
|||||||
QtWidgets.QMessageBox.critical(widget, "错误", langFile[lang]["Main"]["MainWindow"]["Error"]["ApkFileError"])
|
QtWidgets.QMessageBox.critical(widget, "错误", langFile[lang]["Main"]["MainWindow"]["Error"]["ApkFileError"])
|
||||||
return
|
return
|
||||||
try:
|
try:
|
||||||
data = json.loads(requests.get("https://code.gitlink.org.cn/gfdgd_xi/wine-runner-downloads-of-runner/raw/branch/master/uengineapp/" + package +"/data.json").text)
|
data = json.loads(requests.get("http://data.download.gfdgdxi.top/uengineapp/" + package +"/data.json").text)
|
||||||
print(data)
|
print(data)
|
||||||
except:
|
except:
|
||||||
QtWidgets.QMessageBox.information(widget, "提示", "此程序暂时没有评分,欢迎您贡献第一个评分!")
|
QtWidgets.QMessageBox.information(widget, "提示", "此程序暂时没有评分,欢迎您贡献第一个评分!")
|
||||||
@@ -1524,7 +1524,7 @@ class AddNewUengineDesktopLink():
|
|||||||
|
|
||||||
def GetNewInformation():
|
def GetNewInformation():
|
||||||
try:
|
try:
|
||||||
text = requests.get("https://code.gitlink.org.cn/gfdgd_xi/uengine-runner-list/raw/branch/master/information/index.html").text
|
text = requests.get("http://uengine-runner.gfdgdxi.top/information/index.html").text
|
||||||
except:
|
except:
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
text = """<p>无法连接到服务器</p>
|
text = """<p>无法连接到服务器</p>
|
||||||
@@ -1696,10 +1696,10 @@ except:
|
|||||||
windowflag = "close"
|
windowflag = "close"
|
||||||
def Open():
|
def Open():
|
||||||
try:
|
try:
|
||||||
lists = json.loads(requests.get("https://code.gitlink.org.cn/gfdgd_xi/wine-runner-downloads-of-runner/raw/branch/master/Open-UEngine/lists.json").text)
|
lists = json.loads(requests.get("https://data.download.gfdgdxi.top/Open-UEngine/lists.json").text)
|
||||||
data = []
|
data = []
|
||||||
for i in lists:
|
for i in lists:
|
||||||
data.append(int(requests.get("https://code.gitlink.org.cn/gfdgd_xi/wine-runner-downloads-of-runner/raw/branch/master/Open-UEngine/{}.txt".format(i)).text))
|
data.append(int(requests.get("https://data.download.gfdgdxi.top/Open-UEngine/{}.txt".format(i)).text))
|
||||||
except:
|
except:
|
||||||
QtWidgets.QMessageBox.critical(widget, "错误", "服务器出错!数据获取失败!")
|
QtWidgets.QMessageBox.critical(widget, "错误", "服务器出错!数据获取失败!")
|
||||||
return
|
return
|
||||||
@@ -1716,11 +1716,12 @@ def Open():
|
|||||||
|
|
||||||
def Download():
|
def Download():
|
||||||
try:
|
try:
|
||||||
lists = json.loads(requests.get("https://code.gitlink.org.cn/gfdgd_xi/wine-runner-downloads-of-runner/raw/branch/master/Install-UEngine/lists.json").text)
|
lists = json.loads(requests.get("https://data.download.gfdgdxi.top/Install-UEngine/lists.json").text)
|
||||||
data = []
|
data = []
|
||||||
for i in lists:
|
for i in lists:
|
||||||
data.append(int(requests.get("https://code.gitlink.org.cn/gfdgd_xi/wine-runner-downloads-of-runner/raw/branch/master/Install-UEngine/{}.txt".format(i)).text))
|
data.append(int(requests.get("https://data.download.gfdgdxi.top/Install-UEngine/{}.txt".format(i)).text))
|
||||||
except:
|
except:
|
||||||
|
traceback.print_exc()
|
||||||
QtWidgets.QMessageBox.critical(widget, "错误", "服务器出错!数据获取失败!")
|
QtWidgets.QMessageBox.critical(widget, "错误", "服务器出错!数据获取失败!")
|
||||||
return
|
return
|
||||||
fig = matplotlib.pylab.figure()
|
fig = matplotlib.pylab.figure()
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
Package: com.gitee.uengine.runner.spark
|
Package: com.gitee.uengine.runner.spark
|
||||||
Source: com.gitee.uengine.runner.spark
|
Source: com.gitee.uengine.runner.spark
|
||||||
Replaces: spark-uengine-runner, com.gitee.uengine.runner.spark.ubuntu
|
Replaces: spark-uengine-runner, com.gitee.uengine.runner.spark.ubuntu
|
||||||
Version: 2.0.1
|
Version: 2.1.0~alpha1
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Section: utils
|
Section: utils
|
||||||
Installed-Size: 2920
|
Installed-Size: 2920
|
||||||
|
|||||||
@@ -243,7 +243,7 @@
|
|||||||
"11、deepin 终端",
|
"11、deepin 终端",
|
||||||
"……"
|
"……"
|
||||||
],
|
],
|
||||||
"Time": "2023-04-29 15:56:49 Linux-5.15.77-amd64-desktop-x86_64-with-Deepin-20.9-apricot",
|
"Time": "2023-04-29 16:16:10 Linux-5.15.77-amd64-desktop-x86_64-with-Deepin-20.9-apricot",
|
||||||
"Contribute": [
|
"Contribute": [
|
||||||
"<b>感谢以下用户提供的问题、建议、图标、代码等,如果有遗漏,请及时与开发者联系添加,以及如果侵犯到您的合法权益,也及时与开发者联系:</p>",
|
"<b>感谢以下用户提供的问题、建议、图标、代码等,如果有遗漏,请及时与开发者联系添加,以及如果侵犯到您的合法权益,也及时与开发者联系:</p>",
|
||||||
"<hr>",
|
"<hr>",
|
||||||
|
|||||||
21
pkexec/com.deepin.pkexec.binder.loader.policy
Executable file
@@ -0,0 +1,21 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE policyconfig PUBLIC
|
||||||
|
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
|
||||||
|
"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
|
||||||
|
<policyconfig>
|
||||||
|
<vendor>gfdgd xi</vendor>
|
||||||
|
<vendor_url>https://gitee.com/gfdgd-xi/uengine-runner/</vendor_url>
|
||||||
|
<action id="com.deepin.pkexec.binder.loader">
|
||||||
|
<message>Authentication is required to Loading Binder Module</message>
|
||||||
|
<message xml:lang="zh_CN">加载 binder 模块需要输入密码</message>
|
||||||
|
<icon_name>preferences-system</icon_name>
|
||||||
|
<defaults>
|
||||||
|
<allow_any>yes</allow_any>
|
||||||
|
<allow_inactive>yes</allow_inactive>
|
||||||
|
<allow_active>yes</allow_active>
|
||||||
|
</defaults>
|
||||||
|
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/uengine-loading-binder</annotate>
|
||||||
|
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
|
||||||
|
</action>
|
||||||
|
|
||||||
|
</policyconfig>
|
||||||
@@ -3,21 +3,27 @@
|
|||||||
CheckEnv(){
|
CheckEnv(){
|
||||||
# 检测是不是 Ubuntu
|
# 检测是不是 Ubuntu
|
||||||
lsb_release -i | grep -i ubuntu
|
lsb_release -i | grep -i ubuntu
|
||||||
if [[ $? != 0 ]]; then
|
# if [[ $? != 0 ]]; then
|
||||||
zenity --error --no-wrap '--text=您的系统无法安装 UEngine,原因:此脚本只支持 Ubuntu'
|
# zenity --error --no-wrap '--text=您的系统无法安装 UEngine,原因:此脚本只支持 Ubuntu'
|
||||||
exit
|
# exit
|
||||||
fi
|
# fi
|
||||||
# 检测架构
|
# 检测架构
|
||||||
if [[ `arch` != "x86_64" ]]; then
|
if [[ `arch` != "x86_64" ]]; then
|
||||||
zenity --error --no-wrap '--text=您的系统无法安装 UEngine,原因:暂不支持非 X86 架构'
|
zenity --error --no-wrap '--text=您的系统无法安装 UEngine,原因:暂不支持非 X86 架构'
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
# 检测内核
|
# 检测内核
|
||||||
kernel=`uname -r`
|
sudo modprobe binder_linux
|
||||||
python3 "${programPath}/CompareVersion.py" "${kernel}" "5.17.3"
|
lsmod | grep -e binder_linux
|
||||||
if [[ $? == 0 ]]; then
|
if [[ $? != 0 ]]; then
|
||||||
zenity --warning --no-wrap "--text=提示:您当前使用的内核版本是${kernel},而一会将会安装内核 5.17.3\n如果要使用 UEngine,请在重启后选择该版本内核启动,否则无法启动"
|
zenity --error --no-wrap '--text=您的系统无法安装 UEngine,原因:当前内核不支持 binder 模块,请安装支持 binder 模块的 Linux 内核'
|
||||||
|
exit
|
||||||
fi
|
fi
|
||||||
|
#kernel=`uname -r`
|
||||||
|
#python3 "${programPath}/CompareVersion.py" "${kernel}" "5.17.3"
|
||||||
|
#if [[ $? == 0 ]]; then
|
||||||
|
# zenity --warning --no-wrap "--text=提示:您当前使用的内核版本是${kernel},而一会将会安装内核 5.17.3\n如果要使用 UEngine,请在重启后选择该版本内核启动,否则无法启动"
|
||||||
|
#fi
|
||||||
#exit
|
#exit
|
||||||
}
|
}
|
||||||
programPath=$(cd $(dirname $0); pwd)
|
programPath=$(cd $(dirname $0); pwd)
|
||||||
@@ -38,7 +44,8 @@ mkdir -p /tmp/uengine
|
|||||||
if [[ $1 == "SuperSU" ]]; then
|
if [[ $1 == "SuperSU" ]]; then
|
||||||
aria2c -x 16 -s 16 -d /tmp/uengine -o uenginetar.xz https://code.gitlink.org.cn/gfdgd_xi/uengine-installer/raw/branch/master/uengine2.1.2.2007-supersu.tar.xz
|
aria2c -x 16 -s 16 -d /tmp/uengine -o uenginetar.xz https://code.gitlink.org.cn/gfdgd_xi/uengine-installer/raw/branch/master/uengine2.1.2.2007-supersu.tar.xz
|
||||||
else
|
else
|
||||||
aria2c -x 16 -s 16 -d /tmp/uengine -o uenginetar.xz https://code.gitlink.org.cn/gfdgd_xi/uengine-installer/raw/branch/master/uengine2.1.2.2007.tar.xz
|
# 改为 Github
|
||||||
|
aria2c -x 16 -s 16 -d /tmp/uengine -o uenginetar.xz https://github.com/rain-gfd/uengine-installer-package/releases/download/uengine2.1.2.2010/uengine2.1.2.2010.tar.xz
|
||||||
fi
|
fi
|
||||||
tar_path="/tmp/uengine/uenginetar.xz"
|
tar_path="/tmp/uengine/uenginetar.xz"
|
||||||
tar_path=`echo "$tar_path" | sed $'s/\'//g'`
|
tar_path=`echo "$tar_path" | sed $'s/\'//g'`
|
||||||
@@ -61,8 +68,13 @@ tar_path=`echo "$tar_path" | sed $'s/\'//g'`
|
|||||||
echo "开始部署。部署过程会需要root权限,完成后会要求重启。请注意不要在安装过程中安装或卸载其他软件"
|
echo "开始部署。部署过程会需要root权限,完成后会要求重启。请注意不要在安装过程中安装或卸载其他软件"
|
||||||
cd /tmp
|
cd /tmp
|
||||||
tar -xf "$tar_path"
|
tar -xf "$tar_path"
|
||||||
|
if [[ $? != 0 ]]; then
|
||||||
|
echo 解压错误,无法继续
|
||||||
|
zenity --error --no-wrap '--text=安装错误,原因:资源解压失败!'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
# 移除包内旧版的run_daemon.sh(如果有的话)
|
# 移除包内旧版的run_daemon.sh(如果有的话)
|
||||||
aria2c -x 16 -s 16 -d /tmp -o run_daemon.sh https://code.gitlink.org.cn/gfdgd_xi/uengine-installer-bak/raw/branch/master/run_daemon.sh
|
aria2c -x 16 -s 16 -d /tmp -o run_daemon.sh http://uengine-runner.gfdgdxi.top/shell/run_daemon.sh
|
||||||
if [[ $? == 0 ]]; then
|
if [[ $? == 0 ]]; then
|
||||||
# 如果下载成功,就使用下载好的 run_daemon.sh
|
# 如果下载成功,就使用下载好的 run_daemon.sh
|
||||||
if [[ -f /tmp/run_daemon.sh ]]; then
|
if [[ -f /tmp/run_daemon.sh ]]; then
|
||||||
@@ -94,6 +106,10 @@ sudo apt update
|
|||||||
/tmp/uengine/install.sh
|
/tmp/uengine/install.sh
|
||||||
# 安装所需依赖
|
# 安装所需依赖
|
||||||
sudo apt install -y libkf5globalaccel5 libqt5multimedia5 libqt5sensors5 libegl1-mesa-dev
|
sudo apt install -y libkf5globalaccel5 libqt5multimedia5 libqt5sensors5 libegl1-mesa-dev
|
||||||
|
# 启动内核 binder 模块
|
||||||
|
sudo modprobe binder_linux
|
||||||
|
sudo mkdir /dev/binderfs
|
||||||
|
sudo mount -t binder binder /dev/binderfs
|
||||||
# 用于修复 UEngine 在 Ubuntu 无法安装 APK 的问题
|
# 用于修复 UEngine 在 Ubuntu 无法安装 APK 的问题
|
||||||
sudo mkdir -p /var/lib/uengine
|
sudo mkdir -p /var/lib/uengine
|
||||||
sudo ln -s /data/uengine/data/data/ /var/lib/uengine/data
|
sudo ln -s /data/uengine/data/data/ /var/lib/uengine/data
|
||||||
@@ -117,6 +133,10 @@ if [[ $? != 0 ]]; then
|
|||||||
zenity --error --no-wrap '--text=抱歉,UEngine 安装失败,已移除安装时进行的修改'
|
zenity --error --no-wrap '--text=抱歉,UEngine 安装失败,已移除安装时进行的修改'
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
# 拷贝 binder loader
|
||||||
|
sudo cp "${programPath}/LoadingBinder/load.sh" /usr/bin/uengine-loading-binder -v
|
||||||
|
sudo chmod 777 -Rv /usr/bin/uengine-loading-binder
|
||||||
|
sudo cp "${programPath}/pkexec/com.deepin.pkexec.binder.loader.policy" /usr/share/polkit-1/actions/ -v
|
||||||
# echo "重启后在$HOME/uengine-launch执行launch_uengine.sh即可打开uengine守护进程。随后即可安装和使用安卓应用"
|
# echo "重启后在$HOME/uengine-launch执行launch_uengine.sh即可打开uengine守护进程。随后即可安装和使用安卓应用"
|
||||||
# 这里直接运行 run_daemon.sh,运行 launch_uengine.sh 好像不行
|
# 这里直接运行 run_daemon.sh,运行 launch_uengine.sh 好像不行
|
||||||
echo "重启后在$HOME/uengine-launch执行run_daemon.sh或在启动器手动运行或执行命令uengine-loading-ubuntu即可打开uengine守护进程。随后即可安装和使用安卓应用"
|
echo "重启后在$HOME/uengine-launch执行run_daemon.sh或在启动器手动运行或执行命令uengine-loading-ubuntu即可打开uengine守护进程。随后即可安装和使用安卓应用"
|
||||||
|
|||||||