diff --git a/assets/patch.tar.gz b/assets/patch.tar.gz index 3129732..5380f72 100644 Binary files a/assets/patch.tar.gz and b/assets/patch.tar.gz differ diff --git a/extra/readme.md b/extra/readme.md index 910cf5d..73471c5 100644 --- a/extra/readme.md +++ b/extra/readme.md @@ -33,6 +33,10 @@ linux在需要数据时,使用socket通知位于安卓的getifaddrs_bridge_ser 修复wine显示方块字的注册表文件和[小赖字体](https://github.com/lxgw/kose-font)。 +#### extra/libvulkan_freedreno.so, extra/freedreno_icd.aarch64.json: + +Turnip驱动。根据[这里](https://github.com/xDoge26/proot-setup/issues/26#issuecomment-1712404849)和[这里](https://github.com/MastaG/mesa-turnip-ppa)编译 + #### caj, edraw 这些分别是cajviewer,亿图图示的补丁 diff --git a/lib/main.dart b/lib/main.dart index f81b9a3..bf1ff3a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -175,6 +175,13 @@ class _SettingPageState extends State { OutlinedButton(style: D.commandButtonStyle, child: const Text("复制分享链接"), onPressed: () async { final String? ip = await NetworkInfo().getWifiIP(); if (!context.mounted) return; + if (G.wasX11Enabled) { + ScaffoldMessenger.of(context).hideCurrentSnackBar(); + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text("使用X11时此功能无效")) + ); + return; + } if (ip == null) { ScaffoldMessenger.of(context).hideCurrentSnackBar(); ScaffoldMessenger.of(context).showSnackBar( @@ -336,9 +343,10 @@ sed -i -E "s@^(VNC_RESOLUTION)=.*@\\1=${w}x${h}@" \$(command -v startvnc)"""); const SizedBox.square(dimension: 16), const Divider(height: 2, indent: 8, endIndent: 8), const SizedBox.square(dimension: 16), - const Text("""Termux X11可以带来比VNC更快的速度,某些情况下兼容性也会更好。这是一个实验性功能。 + const Text("""Termux X11可以带来比VNC更快的速度,某些情况下兼容性也会更好。 支持使用DRI3(需在图形加速中开启),可以带来相当大的性能提升。 -随着版本的迭代,Termux X11如今也支持了双向剪切板等功能。"""), +随着版本的迭代,Termux X11如今也支持了双向剪切板等功能。 +这是一个实验性功能!如果黑屏,请尝试彻底关闭本应用再重新启动。"""), const SizedBox.square(dimension: 16), Wrap(alignment: WrapAlignment.center, spacing: 4.0, runSpacing: 4.0, children: [ OutlinedButton(style: D.commandButtonStyle, child: const Text("Termux X11偏好设置"), onPressed: () async { @@ -547,7 +555,7 @@ Virgl可为使用OpenGL ES的应用提供加速。"""), }), body: Padding(padding: const EdgeInsets.all(12), child: Column(children: [ const Text("""使用box86/box64运行x86/x64架构的程序,或使用wine运行windows程序。 -运行windows程序需要经过架构和系统两层模拟,不要对运行速度抱有期待。程序崩溃也是常有的。 +运行windows程序需要经过架构和系统两层模拟,不要对运行速度抱有期待!程序崩溃甚至打不开也是常有的。 建议将要运行的Windows程序连同程序文件夹移至桌面运行。 @@ -1112,6 +1120,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 本软件申请的权限用于以下目的: 文件相关权限:用于系统访问手机目录; 相机和麦克风:用于推流,默认不会开启。 +通知和无障碍:Termux X11需要。 """))), ExpansionPanel( isExpanded: _expandState[3], diff --git a/lib/workflow.dart b/lib/workflow.dart index 4c4911f..5ca6801 100644 --- a/lib/workflow.dart +++ b/lib/workflow.dart @@ -401,6 +401,7 @@ rm /tmp/wps.deb"""}, {"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"""}, {"name":"卸载钉钉", "command":"sudo apt autoremove --purge -y com.alibabainc.dingtalk"}, {"name":"修复无法编译C语言程序", "command":"sudo apt update && sudo apt reinstall -y libc6-dev"}, + {"name":"修复系统语言到中文", "command":"sudo localedef -c -i zh_CN -f UTF-8 zh_CN.UTF-8 #重启生效"}, {"name":"启用回收站", "command":"sudo apt update && sudo apt install -y gvfs && echo '安装完成, 重启软件即可使用回收站。'"}, {"name":"拉流测试", "command":"ffplay rtsp://127.0.0.1:8554/stream &"}, {"name":"关机", "command":"stopvnc\nexit\nexit"}, @@ -409,6 +410,8 @@ rm /tmp/wps.deb"""}, //默认wine快捷指令 static const wineCommands = [{"name":"wine配置", "command":"wine64 winecfg"}, + {"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"}, + {"name":"开始菜单文件夹", "command":"wine64 explorer \"C:\\\\ProgramData\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\""}, {"name":"我的电脑", "command":"wine64 explorer"}, {"name":"记事本", "command":"wine64 notepad"}, {"name":"扫雷", "command":"wine64 winemine"}, @@ -777,6 +780,7 @@ ${G.dataPath}/bin/virgl_test_server ${Util.getGlobal("defaultVirglCommand")}""") box64LibraryPath += "/home/tiny/.local/share/tiny/cross/wine/lib/wine/x86_64-unix:"; extraMount += "--wine=/home/tiny/.local/bin/wine64 "; extraMount += "--mount=\$DATA_DIR/tiny/cross/wine.desktop:/usr/share/applications/wine.desktop "; + extraMount += "--mount=\$DATA_DIR/tiny/extra/XiaolaiMonoSC-Regular.ttf:/usr/share/fonts/truetype/XiaolaiMonoSC-Regular.ttf "; //extraMount += "--mount=\$DATA_DIR/tiny/cross/winetricks:/home/tiny/.local/bin/winetricks --mount=\$DATA_DIR/tiny/cross/winetricks.desktop:/usr/share/applications/winetricks.desktop "; } if (G.wasBoxEnabled) { diff --git a/pubspec.yaml b/pubspec.yaml index 111244e..d4b08c3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.17+13 +version: 1.0.18+14 environment: sdk: '>=3.1.0 <4.0.0'