Skip to content

Commit a911efd

Browse files
committed
Update code to v1.0.18
1 parent 49c2377 commit a911efd

File tree

5 files changed

+21
-4
lines changed

5 files changed

+21
-4
lines changed

assets/patch.tar.gz

13.8 MB
Binary file not shown.

extra/readme.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ linux在需要数据时,使用socket通知位于安卓的getifaddrs_bridge_ser
3333

3434
修复wine显示方块字的注册表文件和[小赖字体](https://github.com/lxgw/kose-font)
3535

36+
#### extra/libvulkan_freedreno.so, extra/freedreno_icd.aarch64.json:
37+
38+
Turnip驱动。根据[这里](https://github.com/xDoge26/proot-setup/issues/26#issuecomment-1712404849)[这里](https://github.com/MastaG/mesa-turnip-ppa)编译
39+
3640
#### caj, edraw
3741

3842
这些分别是cajviewer,亿图图示的补丁

lib/main.dart

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,13 @@ class _SettingPageState extends State<SettingPage> {
175175
OutlinedButton(style: D.commandButtonStyle, child: const Text("复制分享链接"), onPressed: () async {
176176
final String? ip = await NetworkInfo().getWifiIP();
177177
if (!context.mounted) return;
178+
if (G.wasX11Enabled) {
179+
ScaffoldMessenger.of(context).hideCurrentSnackBar();
180+
ScaffoldMessenger.of(context).showSnackBar(
181+
const SnackBar(content: Text("使用X11时此功能无效"))
182+
);
183+
return;
184+
}
178185
if (ip == null) {
179186
ScaffoldMessenger.of(context).hideCurrentSnackBar();
180187
ScaffoldMessenger.of(context).showSnackBar(
@@ -336,9 +343,10 @@ sed -i -E "s@^(VNC_RESOLUTION)=.*@\\1=${w}x${h}@" \$(command -v startvnc)""");
336343
const SizedBox.square(dimension: 16),
337344
const Divider(height: 2, indent: 8, endIndent: 8),
338345
const SizedBox.square(dimension: 16),
339-
const Text("""Termux X11可以带来比VNC更快的速度,某些情况下兼容性也会更好。这是一个实验性功能。
346+
const Text("""Termux X11可以带来比VNC更快的速度,某些情况下兼容性也会更好。
340347
支持使用DRI3(需在图形加速中开启),可以带来相当大的性能提升。
341-
随着版本的迭代,Termux X11如今也支持了双向剪切板等功能。"""),
348+
随着版本的迭代,Termux X11如今也支持了双向剪切板等功能。
349+
这是一个实验性功能!如果黑屏,请尝试彻底关闭本应用再重新启动。"""),
342350
const SizedBox.square(dimension: 16),
343351
Wrap(alignment: WrapAlignment.center, spacing: 4.0, runSpacing: 4.0, children: [
344352
OutlinedButton(style: D.commandButtonStyle, child: const Text("Termux X11偏好设置"), onPressed: () async {
@@ -547,7 +555,7 @@ Virgl可为使用OpenGL ES的应用提供加速。"""),
547555
}), body: Padding(padding: const EdgeInsets.all(12), child: Column(children: [
548556
const Text("""使用box86/box64运行x86/x64架构的程序,或使用wine运行windows程序。
549557
550-
运行windows程序需要经过架构和系统两层模拟,不要对运行速度抱有期待。程序崩溃也是常有的
558+
运行windows程序需要经过架构和系统两层模拟,不要对运行速度抱有期待!程序崩溃甚至打不开也是常有的
551559
552560
建议将要运行的Windows程序连同程序文件夹移至桌面运行。
553561
@@ -1112,6 +1120,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
11121120
本软件申请的权限用于以下目的:
11131121
文件相关权限:用于系统访问手机目录;
11141122
相机和麦克风:用于推流,默认不会开启。
1123+
通知和无障碍:Termux X11需要。
11151124
"""))),
11161125
ExpansionPanel(
11171126
isExpanded: _expandState[3],

lib/workflow.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,7 @@ rm /tmp/wps.deb"""},
401401
{"name":"安装钉钉", "command":"""wget \$(curl -L https://g.alicdn.com/dingding/h5-home-download/0.2.4/js/index.js | grep -oP 'url:"\\K[^"]*arm64\\.deb' | head -n 1) -O /tmp/dingtalk.deb && sudo apt update && sudo apt install -y /tmp/dingtalk.deb libglut3.12 libglu1-mesa && sed -i 's#\\./com.alibabainc.dingtalk#\\./com.alibabainc.dingtalk --no-sandbox#g' /opt/apps/com.alibabainc.dingtalk/files/Elevator.sh; rm /tmp/dingtalk.deb"""},
402402
{"name":"卸载钉钉", "command":"sudo apt autoremove --purge -y com.alibabainc.dingtalk"},
403403
{"name":"修复无法编译C语言程序", "command":"sudo apt update && sudo apt reinstall -y libc6-dev"},
404+
{"name":"修复系统语言到中文", "command":"sudo localedef -c -i zh_CN -f UTF-8 zh_CN.UTF-8 #重启生效"},
404405
{"name":"启用回收站", "command":"sudo apt update && sudo apt install -y gvfs && echo '安装完成, 重启软件即可使用回收站。'"},
405406
{"name":"拉流测试", "command":"ffplay rtsp://127.0.0.1:8554/stream &"},
406407
{"name":"关机", "command":"stopvnc\nexit\nexit"},
@@ -409,6 +410,8 @@ rm /tmp/wps.deb"""},
409410

410411
//默认wine快捷指令
411412
static const wineCommands = [{"name":"wine配置", "command":"wine64 winecfg"},
413+
{"name":"修复方块字", "command":"wine64 regedit Z:\\\\home\\\\tiny\\\\.local\\\\share\\\\tiny\\\\extra\\\\chn_fonts.reg && wine64 reg delete \"HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes\" /va /f"},
414+
{"name":"开始菜单文件夹", "command":"wine64 explorer \"C:\\\\ProgramData\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\""},
412415
{"name":"我的电脑", "command":"wine64 explorer"},
413416
{"name":"记事本", "command":"wine64 notepad"},
414417
{"name":"扫雷", "command":"wine64 winemine"},
@@ -777,6 +780,7 @@ ${G.dataPath}/bin/virgl_test_server ${Util.getGlobal("defaultVirglCommand")}""")
777780
box64LibraryPath += "/home/tiny/.local/share/tiny/cross/wine/lib/wine/x86_64-unix:";
778781
extraMount += "--wine=/home/tiny/.local/bin/wine64 ";
779782
extraMount += "--mount=\$DATA_DIR/tiny/cross/wine.desktop:/usr/share/applications/wine.desktop ";
783+
extraMount += "--mount=\$DATA_DIR/tiny/extra/XiaolaiMonoSC-Regular.ttf:/usr/share/fonts/truetype/XiaolaiMonoSC-Regular.ttf ";
780784
//extraMount += "--mount=\$DATA_DIR/tiny/cross/winetricks:/home/tiny/.local/bin/winetricks --mount=\$DATA_DIR/tiny/cross/winetricks.desktop:/usr/share/applications/winetricks.desktop ";
781785
}
782786
if (G.wasBoxEnabled) {

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1616
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
1717
# In Windows, build-name is used as the major, minor, and patch parts
1818
# of the product and file versions while build-number is used as the build suffix.
19-
version: 1.0.17+13
19+
version: 1.0.18+14
2020

2121
environment:
2222
sdk: '>=3.1.0 <4.0.0'

0 commit comments

Comments
 (0)