diff --git a/README.md b/README.md index 568ec4c..694be28 100644 --- a/README.md +++ b/README.md @@ -21,21 +21,20 @@ Click-to-run debian bookworm xfce on android for Chinese users, with fcitx pinyi assets的文件来源如下: -- [proot](https://github.com/termux/proot/), 使用[build-proot-android](https://github.com/green-green-avk/build-proot-android)脚本编译 +- [proot](https://github.com/Cateners/proot), 使用[build-proot-android](https://github.com/green-green-avk/build-proot-android)脚本编译 - [busybox](https://github.com/meefik/busybox) +- [tar](https://github.com/Rprop/tar-android-static) - [Xserver XSDL, pulseaudio相关文件](https://github.com/pelya/commandergenius/tree/sdl_android/project/jni/application/xserver) - [Tmoe Linux, debian包来源](https://github.com/2moe/tmoe) -其中busybox和pulseaudio相关文件都是直接用了二进制文件。 - -(pulseaudio我真的编译不来,如果你会的话请教教我吧) +其中tar、busybox和pulseaudio相关文件都是直接用了二进制文件。 对debian容器进行了如下修改: - 使用tmoe安装了xfce环境和全套VNC; - 使用kali-undercover提供的Win10主题美化xfce; - (使用tmoe)安装了fcitx输入法和云拼音组件。按切换输入法。 - 强烈建议**不要**使用安卓中文输入法直接输入中文,而是使用英文键盘通过容器的输入法输入中文,避免丢字错字。 -- 对noVNC进行[修改](https://github.com/Cateners/noVNC) (scale_factor分支),添加了scale factor滑块控制缩放,添加了上下左右shift等按键 +- 对noVNC进行[修改](https://github.com/Cateners/noVNC),添加了scale factor滑块控制缩放(scale_factor分支),添加了上下左右shift等按键(arrow_key分支) - 在主目录下可以方便地访问手机存储(如果提供了存储权限的话) - 启动时会尝试挂载手机的一些字体目录(AppFiles/Fonts、Fonts和/system/fonts), 如果这些目录下有字体文件的话会一并加载到系统中,无需额外安装 - 最后采用tar.xz压缩,用split命令分成了xa*等多个文件 diff --git a/lib/main.dart b/lib/main.dart index d2b55aa..3200148 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -115,6 +115,11 @@ class _InfoPageState extends State { 第一次加载, 大概需要5到10分钟... 请不要在安装时退出软件 +如果过了很长时间都没有加载完成 +可以去设置里看看小小电脑占用空间是不是一直没变 +如果是说明卡在什么地方了 +建议清除本软件数据重来一次 + 一些注意事项: 此软件以GPL协议免费开源 如果是买的就是被骗了, 请举报 @@ -617,7 +622,7 @@ SOFTWARE. 版权所有(C) 2023 Caten Hu -本程序是自由软件:你可以再分发之和/或依照由自由软件基金会发布的 GNU 通用公共许可证修改之,无论是版本 3 许可证,还是(按你的决定)任何以后版都可以。 +本程序是自由软件:你可以再分发之和/或依照由自由软件基金会发布的 GNU 通用公共许可证修改之,无论是版本 3 许可证,还是任何以后版都可以。 发布该程序是希望它能有用,但是并无保障;甚至连可销售和符合某个特定的目的都不保证。请参看 GNU 通用公共许可证,了解详情。 你应该随程序获得一份 GNU 通用公共许可证的复本。如果没有,请看 。 @@ -631,8 +636,6 @@ SOFTWARE. ...但是! 我还是不想看到你们去编译一个不含广告的版本>< -或者把收款账户改为其他人的!!! - """))), ExpansionPanel( isExpanded: _expandState[4], @@ -651,6 +654,8 @@ SOFTWARE. 本软件的广告分为横幅广告和视频广告 横幅广告在终端和控制页面的顶端出现 +(但不知道是不是因为代码没写对 +反正我从没见横幅广告成功加载过) 视频广告在需要解锁某些功能时自行观看 这些功能需要累计完整观看对应数目广告后永久解锁: @@ -680,7 +685,7 @@ SOFTWARE. ), ElevatedButton( onPressed: () { - launchUrl(Uri.parse("https://github.com/Cateners/tiny_computer")); + launchUrl(Uri.parse("https://github.com/Cateners/tiny_computer"), mode: LaunchMode.externalApplication); }, child: const Text("项目地址"), ), @@ -787,10 +792,10 @@ class _MyHomePageState extends State { body: isLoadingComplete?Column(mainAxisSize: MainAxisSize.min, children: [ G.prefs.getBool("isBannerAdsClosed")!||bannerAdsFailedToLoad?SizedBox.fromSize(size: const Size.square(0)):UnityBannerAd( placementId: AdManager.bannerAdPlacementId, - onLoad: (placementId) => print('Banner loaded: $placementId'), - onClick: (placementId) => print('Banner clicked: $placementId'), + onLoad: (placementId) => debugPrint('Banner loaded: $placementId'), + onClick: (placementId) => debugPrint('Banner clicked: $placementId'), onFailed: (placementId, error, message) { - print('Banner Ad $placementId failed: $error $message'); + debugPrint('Banner Ad $placementId failed: $error $message'); setState(() { bannerAdsFailedToLoad = true; }); diff --git a/lib/workflow.dart b/lib/workflow.dart index 37ff237..594442a 100644 --- a/lib/workflow.dart +++ b/lib/workflow.dart @@ -28,6 +28,7 @@ import 'package:retry/retry.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:url_launcher/url_launcher.dart'; import 'package:webview_flutter/webview_flutter.dart'; import 'package:xterm/xterm.dart'; @@ -40,6 +41,8 @@ import 'package:shared_preferences/shared_preferences.dart'; import 'package:unity_ads_plugin/unity_ads_plugin.dart'; +import 'package:clipboard/clipboard.dart'; + class Util { static Future copyAsset(String src, String dst) async { @@ -110,7 +113,6 @@ class Util { ret.add("""{"name": "${bonus["name"]}", "amount": ${bonus["amount"]}}"""); } await G.prefs.setStringList("adsBonus", ret); - print(G.prefs.getStringList("adsBonus")!); } } @@ -185,19 +187,30 @@ class TermPty { if (code == 0) { SystemChannels.platform.invokeMethod("SystemNavigator.pop"); } - //TODO: Singal 9 hint, 改成对话框 + //TODO: Signal 9 hint, 改成对话框? if (code == -9) { Navigator.push(G.homePageStateContext, MaterialPageRoute(builder: (context) { const TextStyle ts = TextStyle(fontSize: 16, color: Colors.white, fontWeight: FontWeight.normal); - return const Scaffold(backgroundColor: Colors.deepPurple, + const String helperLink = "https://www.vmos.cn/zhushou.htm"; + return Scaffold(backgroundColor: Colors.deepPurple, body: Center( child: Scrollbar(child: SingleChildScrollView( child: Column(children: [ - Text("发生了什么?", textScaleFactor: 2, style: ts, textAlign: TextAlign.center,), - Text("终端异常退出, 返回错误码9\n此错误通常是高版本安卓系统(12+)限制进程造成的, \n可以使用以下工具修复:", style: ts, textAlign: TextAlign.center), - SelectableText("https://www.vmos.cn/zhushou.htm", style: ts, textAlign: TextAlign.center), - Text("(复制链接到浏览器查看)", style: ts, textAlign: TextAlign.center), + const Text(":(\n发生了什么?", textScaleFactor: 2, style: ts, textAlign: TextAlign.center,), + const Text("终端异常退出, 返回错误码9\n此错误通常是高版本安卓系统(12+)限制进程造成的, \n可以使用以下工具修复:", style: ts, textAlign: TextAlign.center), + const SelectableText(helperLink, style: ts, textAlign: TextAlign.center), + const Text("(复制链接到浏览器查看)", style: ts, textAlign: TextAlign.center), + OutlinedButton(onPressed: () { + FlutterClipboard.copy(helperLink).then(( value ) { + ScaffoldMessenger.of(context).hideCurrentSnackBar(); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar(content: const Text("已复制"), action: SnackBarAction(label: "跳转", onPressed: () { + launchUrl(Uri.parse(helperLink), mode: LaunchMode.externalApplication); + },)) + ); + }); + }, child: const Text("复制", style: ts, textAlign: TextAlign.center)) ]), ) ) @@ -280,10 +293,10 @@ class AdManager { UnityAds.load( placementId: placementId, onComplete: (placementId) { - print('Load Complete $placementId'); + debugPrint('Load Complete $placementId'); placements[placementId] = true; }, - onFailed: (placementId, error, message) => print('Load Failed $placementId: $error $message'), + onFailed: (placementId, error, message) => debugPrint('Load Failed $placementId: $error $message'), ); } @@ -298,20 +311,20 @@ class AdManager { UnityAds.showVideoAd( placementId: placementId, onComplete: (placementId) async { - print('Video Ad $placementId completed'); + debugPrint('Video Ad $placementId completed'); loadAd(placementId); await G.prefs.setInt("adsWatchedTotal", G.prefs.getInt("adsWatchedTotal")!+1); await G.prefs.setInt("adsWatchedToday", G.prefs.getInt("adsWatchedToday")!+1); completeExtra(); }, onFailed: (placementId, error, message) { - print('Video Ad $placementId failed: $error $message'); + debugPrint('Video Ad $placementId failed: $error $message'); loadAd(placementId); }, - onStart: (placementId) => print('Video Ad $placementId started'), - onClick: (placementId) => print('Video Ad $placementId click'), + onStart: (placementId) => debugPrint('Video Ad $placementId started'), + onClick: (placementId) => debugPrint('Video Ad $placementId click'), onSkipped: (placementId) { - print('Video Ad $placementId skipped'); + debugPrint('Video Ad $placementId skipped'); loadAd(placementId); }, ); @@ -419,7 +432,7 @@ done //$DATA_DIR是数据文件夹, $CONTAINER_DIR是容器根目录 await G.prefs.setStringList("containersInfo", ["""{ "name":"Debian Bookworm", -"boot":"\$DATA_DIR/bin/proot --change-id=1000:1000 --pwd=/home/tiny --rootfs=\$CONTAINER_DIR --mount=/system --mount=/apex --kill-on-exit --mount=/storage:/storage --sysvipc -L --link2symlink --mount=/proc:/proc --mount=/dev:/dev --mount=\$CONTAINER_DIR/tmp:/dev/shm --mount=/dev/urandom:/dev/random --mount=/proc/self/fd:/dev/fd --mount=/proc/self/fd/0:/dev/stdin --mount=/proc/self/fd/1:/dev/stdout --mount=/proc/self/fd/2:/dev/stderr --mount=/dev/null:/dev/tty0 --mount=/dev/null:/proc/sys/kernel/cap_last_cap --mount=/storage/self/primary:/media/sd --mount=\$DATA_DIR/share:/home/tiny/公共 --mount=/storage/self/primary/Fonts:/usr/share/fonts/wpsm --mount=/storage/self/primary/AppFiles/Fonts:/usr/share/fonts/yozom --mount=/system/fonts:/usr/share/fonts/androidm --mount=/storage/self/primary/Pictures:/home/tiny/图片 --mount=/storage/self/primary/Music:/home/tiny/音乐 --mount=/storage/self/primary/Movies:/home/tiny/视频 --mount=/storage/self/primary/Download:/home/tiny/下载 --mount=/storage/self/primary/DCIM:/home/tiny/照片 --mount=/storage/self/primary/Documents:/home/tiny/文档 --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/.tmoe-container.stat:/proc/stat --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/.tmoe-container.version:/proc/version --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/bus:/proc/bus --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/buddyinfo:/proc/buddyinfo --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/cgroups:/proc/cgroups --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/consoles:/proc/consoles --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/crypto:/proc/crypto --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/devices:/proc/devices --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/diskstats:/proc/diskstats --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/execdomains:/proc/execdomains --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/fb:/proc/fb --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/filesystems:/proc/filesystems --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/interrupts:/proc/interrupts --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/iomem:/proc/iomem --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/ioports:/proc/ioports --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/kallsyms:/proc/kallsyms --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/keys:/proc/keys --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/key-users:/proc/key-users --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linuxproot_proc/kpageflags:/proc/kpageflags --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/loadavg:/proc/loadavg --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/locks:/proc/locks --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/misc:/proc/misc --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/modules:/proc/modules --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/pagetypeinfo:/proc/pagetypeinfo --mount=/data/data/com.termux/files/home/.local/share/tmoe-linux/containersproot/debian-bookworm_arm64/usr/local/etc/tmoe-linux/proot_proc/partitions:/proc/partitions --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/sched_debug:/proc/sched_debug --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/softirqs:/proc/softirqs --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/timer_list:/proc/timer_list --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/uptime:/proc/uptime --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/vmallocinfo:/proc/vmallocinfo --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/vmstat:/proc/vmstat --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/zoneinfo:/proc/zoneinfo /usr/bin/env -i HOSTNAME=TINY HOME=/home/tiny USER=tiny TERM=xterm-256color SDL_IM_MODULE=fcitx XMODIFIERS=\@im=fcitx QT_IM_MODULE=fcitx GTK_IM_MODULE=fcitx TMOE_CHROOT=false TMOE_PROOT=true TMPDIR=/tmp MOZ_FAKE_NO_SANDBOX=1 DISPLAY=:4 PULSE_SERVER=tcp:127.0.0.1:4718 LANG=zh_CN.UTF-8 SHELL=/bin/bash PATH=/usr/local/sbin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/games:/usr/local/games /bin/bash -l", +"boot":"\$DATA_DIR/bin/proot --change-id=1000:1000 --pwd=/home/tiny --rootfs=\$CONTAINER_DIR --mount=/system --mount=/apex --kill-on-exit --mount=/storage:/storage --sysvipc -L --link2symlink --mount=/proc:/proc --mount=/dev:/dev --mount=\$CONTAINER_DIR/tmp:/dev/shm --mount=/dev/urandom:/dev/random --mount=/proc/self/fd:/dev/fd --mount=/proc/self/fd/0:/dev/stdin --mount=/proc/self/fd/1:/dev/stdout --mount=/proc/self/fd/2:/dev/stderr --mount=/dev/null:/dev/tty0 --mount=/dev/null:/proc/sys/kernel/cap_last_cap --mount=/storage/self/primary:/media/sd --mount=\$DATA_DIR/share:/home/tiny/公共 --mount=/storage/self/primary/Fonts:/usr/share/fonts/wpsm --mount=/storage/self/primary/AppFiles/Fonts:/usr/share/fonts/yozom --mount=/system/fonts:/usr/share/fonts/androidm --mount=/storage/self/primary/Pictures:/home/tiny/图片 --mount=/storage/self/primary/Music:/home/tiny/音乐 --mount=/storage/self/primary/Movies:/home/tiny/视频 --mount=/storage/self/primary/Download:/home/tiny/下载 --mount=/storage/self/primary/DCIM:/home/tiny/照片 --mount=/storage/self/primary/Documents:/home/tiny/文档 --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/.tmoe-container.stat:/proc/stat --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/.tmoe-container.version:/proc/version --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/bus:/proc/bus --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/buddyinfo:/proc/buddyinfo --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/cgroups:/proc/cgroups --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/consoles:/proc/consoles --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/crypto:/proc/crypto --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/devices:/proc/devices --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/diskstats:/proc/diskstats --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/execdomains:/proc/execdomains --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/fb:/proc/fb --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/filesystems:/proc/filesystems --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/interrupts:/proc/interrupts --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/iomem:/proc/iomem --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/ioports:/proc/ioports --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/kallsyms:/proc/kallsyms --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/keys:/proc/keys --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/key-users:/proc/key-users --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linuxproot_proc/kpageflags:/proc/kpageflags --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/loadavg:/proc/loadavg --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/locks:/proc/locks --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/misc:/proc/misc --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/modules:/proc/modules --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/pagetypeinfo:/proc/pagetypeinfo --mount=/data/data/com.termux/files/home/.local/share/tmoe-linux/containersproot/debian-bookworm_arm64/usr/local/etc/tmoe-linux/proot_proc/partitions:/proc/partitions --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/sched_debug:/proc/sched_debug --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/softirqs:/proc/softirqs --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/timer_list:/proc/timer_list --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/uptime:/proc/uptime --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/vmallocinfo:/proc/vmallocinfo --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/vmstat:/proc/vmstat --mount=\$CONTAINER_DIR/usr/local/etc/tmoe-linux/proot_proc/zoneinfo:/proc/zoneinfo /usr/bin/env -i HOSTNAME=TINY HOME=/home/tiny USER=tiny TERM=xterm-256color SDL_IM_MODULE=fcitx XMODIFIERS=@im=fcitx QT_IM_MODULE=fcitx GTK_IM_MODULE=fcitx TMOE_CHROOT=false TMOE_PROOT=true TMPDIR=/tmp MOZ_FAKE_NO_SANDBOX=1 DISPLAY=:4 PULSE_SERVER=tcp:127.0.0.1:4718 LANG=zh_CN.UTF-8 SHELL=/bin/bash PATH=/usr/local/sbin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/games:/usr/local/games /bin/bash -l", "vnc":"startnovnc &", "vncUrl":"http://localhost:36082/vnc.html?host=localhost&port=36082&autoconnect=true&resize=remote&password=12345678", "commands":[{"name":"检查更新并升级", "command":"sudo apt update && sudo apt upgrade -y"}, @@ -487,10 +500,10 @@ done gameId: AdManager.gameId, testMode: true, onComplete: () { - print('Initialization Complete'); + debugPrint('Initialization Complete'); AdManager.loadAds(); }, - onFailed: (error, message) => print('Initialization Failed: $error $message'), + onFailed: (error, message) => debugPrint('Initialization Failed: $error $message'), ); } diff --git a/pubspec.lock b/pubspec.lock index 845044e..0d0130e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -25,6 +25,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" + clipboard: + dependency: "direct main" + description: + name: clipboard + sha256: "2ec38f0e59878008ceca0ab122e4bfde98847f88ef0f83331362ba4521f565a9" + url: "https://pub.dev" + source: hosted + version: "0.1.3" clock: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index d5d2db5..cfc98cb 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.6+1 +version: 1.0.7+2 environment: sdk: '>=3.1.0 <4.0.0' @@ -39,8 +39,9 @@ dependencies: retry: ^3.1.2 url_launcher: ^6.1.12 shared_preferences: ^2.2.1 - intl: ^0.18.1 + intl: ^0.18.1 #日期字符串转换 unity_ads_plugin: ^0.3.8 + clipboard: ^0.1.3 # The following adds the Cupertino Icons font to your application.