Compare commits

...
79 Commits
Author SHA1 Message Date
Morris 3f1f48f54c Merge pull request 'ci(build-bot): 支持 version= 指定版本并加速 macOS 构建' (#40) from ci/buildbot-mac-speed into main
Reviewed-on: Morris/GC#40
2026-11-22 00:14:12 +00:00
远影科技 8b4cabba28 ci(build-bot): 支持 version= 参数指定版本;mac 大小写不敏感;加速 macOS 构建
1. @build-bot build mac version=1.1.3 可指定版本(缺省仍读 Directory.Build.props)
   - 评论里 version=x.y.z 优先,大小写不敏感
   - mac / Mac / MAC 都能匹配(grep -oiE 已忽略大小写)
   - 版本透传给 build.sh / build.ps1,回帖与 Release notes 都显示版本
2. macOS 构建提速
   - 缓存 NuGet 包(~/.nuget/packages)与 CocoaPods(Pods/ + Caches)
   - runner 固定 macos-14(原生 arm64,避开 Rosetta 模拟)
   - build-bot 与 build-release 两个工作流同步优化
2026-11-22 08:09:23 +08:00
远影科技 40d9da1c3d fix: 后端连接失败自动重连重试;签到与每日计数改按本地日历日
1. 有时无法连接后端:
- 根因:请求连接失败直接抛错,运行中从不重新发现地址(睡眠唤醒后旧连接已死、后端换端口后必现)
- _send 对 GET 连接失败自动 rediscover + 重试 1 次;POST 不自动重试,避免签到/扣积分重复提交
- 启动重试从 5 次(约 31s)放宽到 10 次、间隔封顶 8s

2. 签到读日历,不按 24 小时:
- 根因:签到用 DateTime.UtcNow.Date,东八区要早上 8 点才翻篇,凌晨可同一天签到两次
- UserService(签到/人品值/二选一跨天计数)与 UserPayload 统一改 DateTime.Today 本地日历日
- 实测:本地 11-22 07:33(UTC 仍 11-21)时 last_sign_in=11-22,重复签到被拒,免费次数按本地日重置
2026-11-22 07:33:56 +08:00
远影科技 cfd6809714 feat: 模型回退 Avalonia 独立窗口;积分精确到 0.01;人品值/二选一接入后端计费
模型(回退 Flutter 内嵌 → Avalonia):
- 恢复 model/_sdk、5 个模型 src/、GC-DRAW/PlayerWindow、ModelHost/AvaloniaHost(源自 5b62897)
- FlutterShell 主线程承载 Avalonia 事件循环,根治 1.1.1 的 AppKit 崩溃
- /api/models/{id}/launch 由后端开独立 Avalonia 窗口
- 前端删除 Flutter 模型实现与 ModelViewPage 死代码(13 个文件)

积分:
- Points/ThemePaid int → decimal,精确到 0.01;pw.yaml 兼容旧整数格式
- 主题色退款保留 2 位小数;前端新增 formatPoints 显示

人品值/二选一计费(原前端本地免费随机 → 后端计费):
- 新增 POST /api/user/fortune、/api/user/pick,随机数与扣费都在服务端
- 人品值阶梯:当日免费 1 次 → 0.1×5 → 0.2×5 → 0.5×15 → 1.0 起
- 二选一:当日免费 1 次 → 0.5/次;计数按 UTC 日期持久化,跨天清零
- 前端两个功能需登录,扣费后提示本次消耗

附 RELEASE-1.1.2.md 更新日志。
2026-11-21 21:51:34 +08:00
Morris 38781c9807 refactor(ui): 删除百宝箱页;设置页去掉主题色
- 删除 pages/treasure.dart 与侧栏「百宝箱」入口,用户页从 index 6 前移到 5
- 清理 pages.dart 导出与 i18n 里的 nav.treasure / treasure.* 键
- 设置页移除主题色色板、自定义颜色入口与 _applyAccent 等实现
- 强调色改由用户账号的 theme_color 决定:
  · controller._applySettings 不再应用 settings.accentColor
  · 启动后 _applyUserTheme() 拉一次 /api/user/me 并按 theme_color 上色
  · 退出登录回落到 GcPalette.defaultAccent
- 清理 i18n 中的 set.accent.* 键与 settings.dart 无用的 dart:async 导入
2026-11-21 20:45:25 +08:00
Morris 185a8905f9 Merge pull request 'feat(user): 用户系统重做——人机验证、签到、主题色购买与退款' (#39) from feat/user-system into main
Reviewed-on: Morris/GC#39
2026-11-21 12:43:37 +00:00
Morris ecb71ad347 feat(user): 用户系统重做——人机验证、30 天签到、主题色购买与退款、人品值
存储
- 目录改为 .GC/user/<用户名>/pw.yaml(用户名、积分、sha512 口令 + 盐)
- .GC/user/user.yaml 记住当前登录(用户名 + session token),启动自动登录
- 自动迁移旧的 .GC/user/<用户名>.yaml

注册 / 登录
- 新增算术人机验证:GET /api/user/captcha(5 分钟有效、一次性、用后即焚)
- 用户名不可重复、不能含空格、1–20 字符
- 口令只存 sha512(密码 + ":" + 随机盐),不存明文
- 新增 /api/user/logout

签到
- 30 天一循环:1–6 天 +10,第 7 天 +30,8–13 +15,第 14 天 +40,
  15–20 +20,第 21 天 +50,22–27 +25,第 28 天 +60,29 天 +40,第 30 天 +100
- 断签重置连续天数;接口返回 cycle_day / next_reward / today_signed

主题色
- 默认蓝免费,预置色 50,自定义色 150(服务端算价,不信客户端)
- 购买后 1 小时内换色退 80%,record 里存 theme_paid / theme_paid_at
- 禁止充值:积分只能签到获得

前端用户页
- 账号卡片:积分、连续天数、周期进度条、一键签到、退出登录
- 注册表单内嵌验证码(换一题、失败自动刷新)
- 人品值:0–100 随机 + 评语,每天不限次数
- 二选一:两个输入框随机选一个
- 主题色:8 个预置色 + 自定义色取色(十六进制 + 预览),积分不足上锁
- 应用主题色时同步覆盖全局强调色
2026-11-21 20:26:02 +08:00
Morris e7c1429889 feat(ci): 新增 @build-release-bot build <版本号>
编译 macOS + Windows(amd64/arm64),发布 tag = 版本号的正式 Release(非预发布)。

- prepare 解析版本号(必须 主.次.修订),tag 已存在则拒绝并回帖说明
- 两个平台都成功才发 Release,附 SHA256SUMS.txt
- 独立的 report job:任何一步失败都会回帖,列出各平台与发布状态
- 不动 version.json(需 SAVEDOG 签名,CI 无私钥),文档里注明走本地 ./build.sh stamp
- mac job 增加环境自检(sw_vers / xcodebuild -version / flutter --version)
2026-11-21 20:18:28 +08:00
Morris 5b82a885f9 fix(build-bot): report job 加 GH_REPO;已合并 PR 改为编默认分支
- report job 不 checkout,gh 没有 git 上下文会报
  'fatal: not a git repository' → 补 GH_REPO 环境变量
- 只有 state=open 的 PR 才编它的 head.sha;
  已合并/已关闭的 PR 编译默认分支,避免编到过期代码
- 回执里提示「PR 已 merged,改为编译默认分支」
2026-11-21 19:56:13 +08:00
Morris 936ef8333e fix: macOS 构建去掉 --no-codesign;build-bot 失败也回帖结果
- flutter build macos 不支持 --no-codesign(那是 iOS 的选项),
  传了会直接报 'Could not find an option named no-codesign' 导致编译失败。
  macOS 模板本身用 ad-hoc 签名,CI 无证书也能构建。
- 删除 workflow 里的 GC_NO_CODESIGN 环境变量
- build-bot 新增独立 report job(always):
  编译/发布任何一步失败都会回帖,列出各平台结果与日志链接,
  不再因为 publish 被跳过而静默
2026-11-21 19:47:57 +08:00
Morris ab0cee8b40 ci: build-bot 增加「开始编译」回执;macOS runner 改用 macos-latest
- 收到 @build-bot build <目标> 后立即回帖「开始编译」,附来源提交、目标、日志链接
- 编译完成仍走原来的结果回帖(成功给 release 链接,失败给日志链接)
- runs-on: macos-14 → macos-latest:
  macos-14 在本仓库被判为 'macos-14-arm64-us-default' 不受支持,job 在启动前即被取消
2026-11-21 19:44:32 +08:00
Morris b51ebd1a3d Merge pull request #3 from Morris-morris-cloud/feat/github-source-and-ci
feat: 全面迁移到 Flutter + 新增 GitHub 源与 CI 流水线
2026-11-21 19:40:26 +08:00
Morris f64f2708a1 ci: 修 pr-review 日志路径不一致导致「(无日志)」
flutter 步骤在 GC-UI/frontend 下运行,tee 写到 ../flutter-analyze.log(= GC-UI/),
但汇总步骤在仓库根目录读 flutter-analyze.log,永远读不到。
改为统一用 $GITHUB_WORKSPACE 绝对路径;日志缺失时提示「步骤可能未执行」。
2026-11-21 19:37:43 +08:00
Morris 0d383f96fb ci: 修正 pr-review 的冲突判断与静态分析阈值
- mergeable=true 表示「可以合并」,之前误当成冲突,改为 false 才算冲突
- mergeable 为 null 时多等几轮(GitHub 异步计算)
- flutter analyze 加 --no-fatal-infos --no-fatal-warnings:
  仓库里有 44 条历史 warning/info,不该卡住合并,只让 error 失败
- 结论里区分「error 数」与「历史 warning/info 数」
2026-11-21 19:34:46 +08:00
Morris c08206e7db Merge pull request #1 from Morris-morris-cloud/feat/github-source-and-ci
feat: 全面迁移到 Flutter + 新增 GitHub 源与 CI 流水线
2026-11-21 19:33:42 +08:00
Morris 2b036d2226 Merge pull request 'feat: 全面迁移到 Flutter + 新增 GitHub 源与 CI 流水线' (#38) from feat/github-source-and-ci into main
Reviewed-on: Morris/GC#38
2026-11-21 11:25:32 +00:00
Morris ea1fa6b6d1 feat: 全面迁移到 Flutter + 新增 GitHub 源与 CI 流水线
前端
- 移除全部 Avalonia 依赖,模型渲染与界面统一改用 Flutter
- 新增用户页:登录/注册(SHA-512 + 盐)、签到积分(30 天一循环)、
  主题色积分购买、二选一随机、今日人品
- 新增百宝箱页、模型内嵌渲染页、自绘标题栏(最小化/最大化/关闭)
- 下载页显示模型下载进度条,下载源读取加速
- 关于页新增「重新下载启动器」并在下载后做 sha256 完整性校验
- 修复浅色主题下标题栏不跟随主题色、无法连接后端等问题

后端
- 新增 UserService:.GC/user/<用户名>.yaml 存用户名/积分/SHA-512 口令,
  登录返回 session token,本地 .GC/user/user.yaml 保存登录态
- 新增 /api/user/{register,login,me,signin,theme} 接口
- 去掉 Avalonia 窗口宿主,后端只提供 HTTP API

下载源
- 新增 GitHub 镜像源(Morris-morris-cloud/GC),与 Xhmcl 并发测速
- 单源探测超时收紧到 2 秒,取最快且可用的源;GitHub 复用 GiteaRemote
  (contents 带 ref、releases 带 per_page=100)

构建与 CI
- macOS 上默认只出 macOS 包,Windows 交给原生 Windows 构建
- 修复 Windows 交叉编译中 flutter-cpp-client-wrapper 双层目录嵌套
- 新增 GitHub Actions:
  · nightly-prerelease:每天 21:00 编译三平台,发布 nightly 预发布
  · build-bot:Issue/PR 评论 @build-bot build <mac|win-amd|win-arm|all>,
    发布 ip-prerelease 预发布
  · pr-review:检查能否编译、静态分析、合并冲突、是否落后 main
- 忽略 79MB 课件产物等高线.html 与工具链临时备份
2026-11-21 19:18:58 +08:00
远影科技 b9cb56cb8b fix: 清理误提交的构建产物和临时脚本,补充 .gitignore 2026-11-21 09:48:48 +08:00
Morris 82cab7b0e3 Merge pull request 'fix: 后端启动稳定性修复与 macOS 编译' (#37) from fix/backend-stability-macos-build into main
Reviewed-on: Morris/GC#37
2026-11-21 01:42:11 +00:00
远影科技 2640de0836 build: macOS 发布包编译完成 2026-11-21 09:36:06 +08:00
Morris 255cfa3d85 Merge pull request 'feat: rewrite all models in Flutter' (#36) from feat/contour-map-rewrite into main
Reviewed-on: Morris/GC#36
2026-11-21 01:29:32 +00:00
远影科技 487250582c feat: rewrite all models in Flutter
Replace C# Avalonia models with pure Flutter implementations:

1. Contour Map (等高线地形图)
   - Five terrain types: plain, hill, mountain, plateau, basin
   - Animation playback/pause controls
   - Top/3D view toggle
   - Hypsometric coloring

2. Earth Geography (地球地理)
   - Five climate zones display
   - Seven continents outlines
   - Layer toggle controls
   - Tropic/circle annotations

3. Earth Rotation (地球自转)
   - Rotation animation
   - Day/night hemispheres
   - Terminator line annotation
   - Axial tilt (23.5°) display
   - Subsolar point tracking

4. Earth Revolution (地球公转)
   - Orbital animation
   - Four seasons positioning
   - Subsolar point migration
   - Fixed axial direction demo

5. Scale Calculator (比例尺计算器)
   - Three solve modes
   - Visual ruler display
   - Real-time calculation
   - Common scale presets

Implementation details:
- Use Flutter CustomPaint for 2D/3D rendering
- AnimationController for smooth animations
- Follow GC-UI theme and i18n system
- Implement GcModel interface for unified management
- Provide registry.dart for model registration
2026-11-21 09:25:34 +08:00
Morris e39e6f26b1 Merge pull request 'fix: 修复 15 项优化与 bug' (#35) from fix/improvements into main
Reviewed-on: Morris/GC#35
2026-11-21 00:36:49 +00:00
远影科技 9cd4fa6266 fix: 修复 15 项优化与 bug
安全修复(已在 origin2/main):
- #1 DirectoryRemote/GiteaRemote/GitCodeRemote 验签失败时返回 null
- #2 LauncherUpdater 所有源失败时输出明确错误信息
- #3 源码目录删除防护已存在(GC.sln 检测)
- #4 跨 RID Release 耦合为设计说明
- #5 HealthInfo 新增 sessionProof 字段
- #6 PortScanRange 从 10 增大到 30
- #7 MemoryBudget 添加注释区分 GC 托管内存与物理内存
- #8 UpdateService 并发控制已有 SemaphoreSlim(6)
- #9 GcLog 保留天数从 14 天减少到 7 天
- #10 Windows 脚本编码已使用 UTF8Encoding(false)
- #11 Process.Start 返回值检查已添加到 SavedogLauncher
- #12 FlutterShell.IsHealthy 改为异步 IsHealthyAsync
- #13 GiteaRemote/GitCodeRemote 验签失败返回 null
- #14 DirectoryRemote 枚举与远端源保持一致,跳过 ignored 目录
- #15 Flutter 前端工作目录兜底已有 _endpointFileUrl
2026-11-21 08:27:07 +08:00
Morris 4043ed5e72 Merge pull request 'fix(security): 加固模型安装与本地目录源,防止同机后端伪装' (#33) from fix/security-hardening into main
Reviewed-on: Morris/GC#33
2026-11-20 23:58:13 +00:00
Morris 46ed84475d fix(security): 加固模型安装与本地目录源,防止同机后端伪装
- ModelInstaller: 模型 Id 限定为单段安全名称,拒绝路径分隔符/绝对路径/
  符号链接,源目录枚举跳过重解析点,防止写到模型库外
- DirectoryRemote: 清单验签失败如实记录;包 URL 仅允许 http(s) 公网地址,
  拦截 file:/私有 IP/环回/元数据地址(SSRF);SafePath 逐级解析符号链接
  并确认仍在根目录内
- 本机后端健康检查改为一次性会话令牌双向校验(/api/health 返回指纹),
  同机伪造服务无法通过身份确认;所有 /api 请求需带令牌,封面图走 query

只含 7 个安全文件,基于最新 origin2/main(含已合入的 #32 课件)。
2026-11-21 07:43:59 +08:00
Morris 1dd3b40cb6 Merge pull request 'feat(courseware): Flutter WebView 还原等高线课件并去除授权验证' (#32) from feat/flutter-courseware into main
Reviewed-on: Morris/GC#32
2026-11-20 23:39:00 +00:00
远影科技 355ca89a68 feat(courseware): Flutter WebView 还原等高线课件并去除授权验证
- 原课件 HTML/JS/CSS/图片/视频完整搬入 Flutter assets,相对路径可直接离线运行
- 新增 CoursewarePage:本地 HttpServer + Range 支持,避免 file:// 与 CSP 限制
- 导航新增「等高线课件」,后端未就绪也可打开
- 补齐 macOS WebView 插件、Podfile、entitlements 与 Xcode 工程配置
2026-11-21 07:30:48 +08:00
Morris 4ef291568a Merge pull request 'feat(contour-map): 重写为可交互 3D 等高线模型,新增五大地貌专题' (#30) from feat/contour-map-rewrite into main
Reviewed-on: Morris/GC#30
2026-11-19 12:45:58 +00:00
Morris 5b628971a9 feat(contour-map): 重写为可交互 3D 等高线模型,新增五大地貌专题
- 新增 LandformKind 与五套高度场生成器:穹状山峰、宽脊山脊、V 形山谷、双峰鞍部、台地陡崖
- 3D 视图重写:拖动旋转 / 滚轮缩放、按包围盒自动取景、法线光照、四周裙边侧壁、
  切割步骤改为把高度压到切面得到真实截面并用求交线精确出线
- 四步实验动画(等高切割 → 形成交线 → 垂直投影 → 疏密判坡),俯视 / 立体切换
- 界面重排:地貌标签移到画布上方(WrapPanel,窄屏自动换行并隐藏侧栏),
  右侧栏放实验流程 / 观察面板 / 判读要点;播放、重置、视图、上色、实时读数,空格与 1–5 快捷键、全屏
- 文案 90 个键中英双语;LoadTexts 改为「内置默认 + i18n 文件覆盖」,此前完全忽略语言包
- 修复三处渲染缺陷:Chain() 只向尾部延伸把等高线切成虚线;坡度归一化写死导致判坡整片红;
  切割只是叠加半透明板而山尖仍在
- 清单版本 1.1 → 1.2,描述与 help.json 同步;62×62 面片 + 画刷缓存,1440×900 单帧约 35ms
2026-11-19 20:45:03 +08:00
Morris faaee9abe2 Merge pull request 'fix(macos): 模型窗口改由主线程承载,修复启动模型失败与后端崩溃' (#29) from fix/model-launch-main-thread into main
Reviewed-on: Morris/GC#29
2026-11-19 12:25:32 +00:00
Morris ead63e8ffe fix(macos): 模型窗口改由主线程承载,修复启动模型失败与后端崩溃
macOS 的 AppKit 要求 NSApplication 运行在主线程。此前 AvaloniaHost 把
StartWithClassicDesktopLifetime 放到新建的后台线程,点「启动模型」即触发
进程崩溃:界面无反应、后端随之消失,部分机器表现为模型启动失败。

- AvaloniaHost 新增 RunOnCurrentThread / Shutdown:事件循环必须在主线程运行,
  EnsureStartedAsync 改为只等待就绪信号,不再自行起线程。
- BackendServer.Start 增加 out AvaloniaHost 重载,把模型窗口宿主交给启动器。
- FlutterShell 在前端拉起后于主线程运行 Avalonia 事件循环,界面退出时从后台
  请求关闭;无桌面会话(Avalonia 起不来)时退化为继续等待界面退出。
- 独立进程入口 Program.cs 同样把后端放后台,主线程留给 Avalonia。
2026-11-19 20:24:57 +08:00
Morris 01c2d017c6 Merge pull request 'fix(macos): 修复 Release 版因沙箱缺少网络权限导致无法连接后端' (#28) from fix/macos-release-sandbox-network into main
Reviewed-on: Morris/GC#28
2026-11-19 11:59:03 +00:00
Morris 3efdf74258 fix(macos): Release 版补 network 权限,修复启动后无法连接后端
- Release.entitlements 增加 com.apple.security.network.client / network.server:
  发布版启用 App Sandbox 但缺少 network.client 时,前端向 127.0.0.1 后端的
  出站 HTTP 请求会被内核拒绝,表现为打开界面即提示“无法连接后端”。
- project.pbxproj 部署目标 10.14 -> 12.0,兼容 Xcode 27(最低支持 12.0)。
2026-11-19 19:55:46 +08:00
Morris 3c74effb4c release: 1.1.1 发布清单与签名(Windows 双架构) 2026-11-19 18:22:05 +08:00
Morris f03046bffd release: 1.1.1 版本号 2026-11-19 18:19:35 +08:00
Morris 2cd18b4e5f Merge pull request 'fix: 修复模型检测/自动下载与启动器更新' (#25) from fix/model-source-and-updater into main
Reviewed-on: Morris/GC#25
2026-11-19 05:48:49 +00:00
Morris 023e9468db fix: 修复模型检测/自动下载与启动器更新
- ModelSourceClient: 自托管 Gitea 源(git.xhmcl.com)ArchiveCandidates 之前
  直接 yield break,只能靠系统 git clone。没装 git 的机器「检测模型/下载/
  自动更新」全部失效。补上 archive/<branch>.zip 归档地址(已实测可用),
  下载经 ResumableDownloader 完成,无需系统 git。fake-git 实测 5/5 模型可检测。
- LauncherUpdater.HashZipPayloadAsync: 只找 GC.dll/GC/GC*.dll,但产物自 1.0.10
  起是 GCL-<版本>-<平台> 单文件,找不到主程序 -> sha256 无法比对 -> 不提示更新。
  改为优先匹配 GCL- 主程序(排除 GC-UI/GC-SAVEDOG/.GC),兼容旧 GC 命名。
  实测已从「无法比对 sha256」变为能算出远端包 sha256。
- version.json / model/version.json: 5 个模型的 manifestSha256 与仓库实际模型
  json 不符(发布时 updatedAt 漂移导致),使模型自动更新每次因校验失败被丢弃
  (「没有自动下载」)。按当前模型 json 实际 sha256 修正并重新签名(gc-2026-12),
  两份清单保持一致;launcher 包 sha256/size 与版本号不动。
2026-11-19 13:17:22 +08:00
Morris 5e5d84856a Merge pull request 'perf: 前端页面拆分 + 模型下载断点续传' (#24) from fix/build-consistency-and-tests into main
Reviewed-on: Morris/GC#24
2026-11-19 04:37:16 +00:00
Morris b4724d7ca0 perf: 前端页面拆分 + 模型下载断点续传
- pages.dart 按职责拆成 pages/{home,download,settings,about}.dart 四个文件,
  pages.dart 保留为聚合 export,调用方 import 路径不变;flutter analyze
  No issues,flutter test 8+3 项全过
- 新增 ResumableDownloader:HTTP Range 断点续传,.part 文件用 URL 哈希做
  稳定命名,服务器不支持 Range 时自动退化为整段下载
- ModelSourceClient 源码 zip 下载改走断点续传,中断后重试从断点接着下
- 下载并发槽 2 -> 4(更新服务已是 6)
2026-11-19 06:59:06 +08:00
Morris 9a911089bf Merge pull request 'fix: 发布一致性校验、日志轮转与构建脚本对齐' (#23) from fix/build-consistency-and-tests into main
Reviewed-on: Morris/GC#23
2026-11-18 22:46:00 +00:00
Morris 4bdfb49600 refactor(build): 末次签名去重、删死代码、zip 可复现
构建脚本对齐与清理(追加到发布校验 PR):
- 完整 build 只在打包末尾签一次清单(stamp_versions --no-sign +
  pack_launcher 末尾 stamp_launcher_only),去掉中间冗余签名。
  ECDSA 随机 nonce + signedAt 时间戳会让每次签名字节都不同,
  两次签名既浪费又让中间产物反复抖动;单独 stamp/models 工具签名行为不变。
- 删除死代码 publish_backend()(后端已进程内托管,无调用者)。
- 所有 zip 命令加 -X(去掉 extra fields),让相同内容的包字节一致。
- 修复 tools.sh 的 dist 命令文件名过滤 GC-*.zip -> GCL-*.zip。
- PowerShell 版同步上述末次签名改动。
2026-11-19 00:19:27 +08:00
Morris 59a66c8fa8 fix: 发布一致性校验、日志轮转与构建脚本对齐
- 新增发布校验脚本(buildsh/lib/verify_release.py + release.sh),核对 tag/清单/资产
  三者的 sha256 与体积,并复验清单签名;接入 ./build.sh release-verify 与
  .gitea/workflows/release-verify.yml(手动触发)
- GcLog 改为常驻 StreamWriter + 按天轮转 + 14 天/64MB 保留策略,避免高峰期反复
  开关文件句柄;只清理本模块生成的 gc-*.log,不碰用户文件
- 修复 Applier 验签逻辑:无效签名永远拒绝,仅「未签名」在调用方不强制时放行
- 新增应用器测试(GC.Savedog.Tests):整目录替换、.GC/bin 合并、启动失败回滚、
  路径穿越防护、验签;接入 pr-check.yml
- GC.Tests 增加日志用例(写入/轮转/清理/用户文件保护)
- 同步 PowerShell 打包脚本与 buildsh 一致:GCL 命名、单顶层目录、守护进程收进
  .GC/bin、启动器与守护进程压缩单文件、不预置 .GC、prune/strip 对齐、签名
  keyId 改为 gc-2026-12、新增 release-verify 与应用器测试任务
2026-11-19 00:05:16 +08:00
xhgit a5fcaeb658 Merge pull request '1.1.0:版本号同步,关于页补 Git 服务与感谢(itxiaohui)' (#19) from sync/1.1.0-about into main
Reviewed-on: Morris/GC#19
2026-11-18 15:13:00 +00:00
Morris fcaacf3b33 1.1.0:版本号同步,关于页补 Git 服务与感谢
- version.json / model/version.json 升到 1.1.0,写入新包 sha256 与体积并重签(gc-2026-12)
- pubspec.yaml 版本 1.0.0+1 -> 1.1.0+1,Windows 前端 exe 的版本资源跟着走
- 关于页新增「Git 服务」一行(itxiaohui)与「感谢」卡片:
  地理洪老师(学科内容)、itxiaohui(Git 服务与部署),中英双语文案
- 开发者列表把早期账号 xhgit 归并到 itxiaohui,避免同一个人的两个名字
- Avalonia 回退界面同步这两处(Git 服务行 + 感谢项)
2026-11-18 22:51:09 +08:00
xhgit 0997de514e Merge pull request 'release: 1.1.0 版本号' (#18) from release/1.1.0 into main 2026-11-18 14:33:45 +00:00
lead 192f2a63e9 1.1.0:界面重做与 DPI 修复的正式版本号
Directory.Build.props 的 Version 从 1.0.11 提到 1.1.0,启动器程序集版本 / 关于页 / version.json 的 launcher.version 都跟着走。
2026-11-18 22:33:24 +08:00
xhgit a1a14f106b Merge pull request 'feat(ui): 重做启动器界面并修复 DPI 发糊' (#17) from feat/ui-crisp-dpi into main
Reviewed-on: Morris/GC#17
2026-11-18 14:18:00 +00:00
lead e67cc63998 feat(ui): 重做启动器界面并修复 DPI 发糊
- 交叉编译补嵌 runner.exe.manifest:GNUn res 不再丢掉 DPI 声明,缩放屏不再位图拉伸
- main.cpp 建窗前自行声明 Per-Monitor V2 DPI 感知(三级回退)
- win32_window 初始窗口按显示器工作区上限收缩,避免 150% 缩放后超出屏幕
- 重做主题:中性石墨底 + 高对比正文、统一字号/间距/圆角令牌、Segoe UI + 雅黑字体栈
- 首页/下载/设置/关于四页重排,宽屏自适应、小窗不溢出
- 修复下拉框字体丢失、封面遮罩盖住占位、任务状态未翻译等问题
- 截图脚本:注入 CJK/图标字体、runAsync 取像素、补小窗回归用例
2026-11-18 22:15:54 +08:00
Morris 2ba4789c95 Merge pull request 'macOS:守护进程收进 .app/Contents/MacOS/.GC/bin' (#16) from release/1.0.11-singlefile into main
Reviewed-on: Morris/GC#16
2026-11-18 13:50:30 +00:00
Morris 22baa6fda9 macOS 的 .GC/bin 也随包分发:守护进程不再落在 .app 根
- pack_launcher 的 macOS 分支把包内 GC-SAVEDOG 移进 .app/Contents/MacOS/.GC/bin,
  与 Windows 布局一致;.GC 位置不变,仍在启动器同级
- package_mac_app 的注释同步:包里只保留 .GC/bin,模板类目录仍由首次启动创建
- README 补 macOS 的 .GC 位置与守护进程路径
2026-11-18 21:10:43 +08:00
Morris 6ee2e8bead Merge pull request '1.0.11:发布包改为单文件,非本体文件收进 .GC/bin' (#15) from release/1.0.11-singlefile into main
Reviewed-on: Morris/GC#15
2026-11-18 13:10:16 +00:00
Morris daf218ce71 1.0.11:发布包改为单文件,非本体文件收进 .GC/bin
- 启动器改成 self-contained 单文件(压缩);GC.UI.Server 抽出 BackendServer.Start,
  由启动器在自己的进程内托管,发布包只剩一个 exe,不再复制两套 .NET 运行时
- 后端保留独立入口(GC.UI.Server 仍可单独 dotnet run),开发调试方式不变
- 守护进程等非本体文件统一放 .GC/bin:首次启动复制到 .GC/safedog 再运行;
  更新时只合并 .GC/bin,config/model/cache/update/logs 原地不动
- 压缩包不再预置 .GC 模板,首次启动由 AppPaths.EnsureCreated + RuntimeLayout 生成
- macOS 同样打进 .app 内的单文件启动器
- 版本号 1.0.11,version.json / model/version.json 重签(gc-2026-12)
2026-11-18 21:08:54 +08:00
Morris 631a90e862 Linux 产物改为默认不构建(云端可显式开启)
- Linux 目标平台是 arm64,而官方 Flutter 引擎只有 x64 产物,x64 主机编出来的包
  在 arm 机器上跑不起来
- 默认跳过并打印一行提示;GC_BUILD_LINUX=1 ./build.sh build 可显式开启
  (云端 aarch64 runner 用这个开关,代码路径与打包逻辑都保留)
- 清单里的 linux-arm64 条目继续保留:没有产物就没有 sha256,下载端会跳过该平台

验证:./build.sh build 只产 GCL-1.0.10-win-{amd64,arm64}.zip,与开启前一致。
2026-11-18 20:41:35 +08:00
Morris 40af11f78a Merge pull request '1.0.10:启用 GCL 命名,Linux 构建改为 arm64' (#13) from release/1.0.10-gcl into main
Reviewed-on: Morris/GC#13
2026-11-18 12:39:50 +00:00
Morris 4bcffa782d 1.0.10:启用 GCL 命名,Linux 构建改为 arm64
命名
- 发布包统一 GCL-<版本>-<平台>:zip 名、包内启动器、清单 path/name/url 同步
- 旧 GC- 包仍识别(IsLauncherPackage / VersionUtil / SAVEDOG 主程序正则),
  装过 1.0.9 的机器不会把新包判成「不是启动器包」

Linux
- 构建目标由 linux-amd64 改为 linux-arm64,清单平台表同步
- Flutter Linux 引擎只有 x64 官方产物:aarch64 主机读
  build/linux/arm64/release/bundle;x64 主机明确跳过并说明原因,
  不产出装不上 arm 机器的 x64 包
- LabelOf 保留 linux-x64 -> linux-amd64 别名,读得懂历史产物

版本
- Directory.Build.props 1.0.9 -> 1.0.10,version.json / model/version.json 重签

验证
- ./build.sh build:GCL-1.0.10-win-amd64.zip 71MB、GCL-1.0.10-win-arm64.zip 69MB,
  均为单顶层目录 + 包内 safedog/ + Flutter 前端
- GC.Tests --update-test 全部通过
2026-11-18 20:38:29 +08:00
Morris 097bfd198e Merge pull request '发布包改为 GCL 单目录布局,.GC 增加 safedog 与中英双语日志' (#11) from feat/gcl-package-layout into main
Reviewed-on: Morris/GC#11
2026-11-18 12:27:27 +00:00
Morris 31b0c93b25 发布包改为 GCL 单目录布局,.GC 增加 safedog 与中英双语日志
包结构
- 压缩包内只有一个顶层目录 GCL-<版本>-<平台>/,解压后不再散落一屏 dll
- 启动器改名为 GCL-<版本>-<平台>(.exe),Flutter 前端与后端仍在同一目录
- 守护进程移入包内 safedog/,运行时复制到 .GC/safedog

运行目录
- .GC 新增 safedog/:实际运行守护进程,整目录替换永远不会覆盖正在运行的它
- .GC 新增 logs/:按天写 gc-YYYYMMDD.log(中文)与 gc-YYYYMMDD.en.log(英文)
- 启动器、后端、SAVEDOG 共用同一组日志文件,整条启动/更新链路可一起排查

更新链路
- 包名/目录统一 GCL- 前缀,同时兼容旧 GC- 包(可从旧版本升级)
- 更新包解压后展平单顶层目录,仍按整目录替换安装
- Linux 无扩展名启动器仍可识别,兼容脚本清理旧版时覆盖 GCL-*

验证
- ./build.sh build 通过,产物 GCL-1.0.9-{win-amd64,win-arm64,linux-amd64}.zip
- 实跑 Linux 包:.GC/safedog/GC-SAVEDOG 与 .GC/logs/gc-20261118[.en].log 均生成
- GC.Tests --update-test 全部通过
2026-11-18 20:27:06 +08:00
Morris 39dc23cb57 Merge pull request '修复审计问题:整目录更新、主题与轮询、移除 nightly' (#10) from fix/audit-cleanup into main
Reviewed-on: Morris/GC#10
2026-11-18 12:18:10 +00:00
Morris a361c889f8 修复审计发现的问题,默认构建即带 Flutter 前端
P0
- GC-SAVEDOG:更新改为整目录替换(旧文件备份到 .GC/update/backup,
  失败可完整回滚),不再只搬一个 exe;回滚会删掉新包独有文件
- GC-SAVEDOG:包名校验放宽为单文件名模式,Linux 启动器(无扩展名)可更新
- GC-DOWNLOAD:测速全失败时不再回退 GitCode,改为返回「不可用」并保留上次可用源
- GC-DOWNLOAD:识别并赋予 Linux 无扩展名启动器可执行位;兼容脚本清理旧版时
  也覆盖无扩展名产物
- CI:删除 nightly-prerelease(绕开 build.sh,产出无前端空壳);alpha 工作流
  去掉非法 cron,只保留手动触发

P1
- 前端:主题设置真正生效(深色/浅色/跟随系统 + 持久化),去掉死字段
- 前端:下载页轮询改为自适应单次链,页面不可见或任务结束后降频/停止
- 前端:下载完成 / 删除模型后首页列表自动刷新
- 前端:复用 http.Client,不再每次轮询新建连接
- 后端:/api/models 走缓存,不再每次全盘递归统计体积
- 设置页:外部改动能同步进表单,不再只同步一次

P2
- 错误响应统一为 ErrorDto,不再复用 LaunchResultDto
- 限流桶定期清理,避免无限增长
- 播放器窗口去重,避免同一模型重复开窗
- 封面按实际格式返回,去掉错误的 image/png 与 no-store
- 端口集中到 GcUiContract,前端可用 GC_UI_PORT 或 ui-backend.json 发现后端
- 构建:Windows 包改为散开发布,与后端共用运行时(体积约 109MB -> 72MB)
- 文档:更新仓库地址与更新流程说明

测试:dotnet build 全绿;GC.Tests 更新链路全通过;flutter analyze 无问题;
flutter test 11 项全通过。
2026-11-18 20:10:03 +08:00
Morris 461e79aa7f Merge pull request 'build: 默认编 Flutter 前端,补 Linux 目标并按主机选择产物' (#9) from feat/flutter-default into main
Reviewed-on: Morris/GC#9
2026-11-18 11:23:16 +00:00
Morris d7f6d8de9f build: 默认编 Flutter 前端,补 Linux 目标并按主机选择产物
此前 build.sh 在非 Windows 宿主上把前端当「可选项」:flutter 缺失只告警、
交叉编译失败只告警、macOS 前端在 Linux 上直接跳过。结果是包照出,用户拿到
的是 Avalonia 回退界面,而构建日志里一行红字很容易被忽略。

改为默认必需:
- build_flutter_ui / build_flutter_ui_cross 缺 flutter 或编译失败一律返回非 0,
  build.sh 立即中断并给出原因(交叉编译失败时带日志尾巴)
- 确实要出降级包时显式声明 ./build.sh build --allow-no-ui

目标平台按构建主机决定,每条产物都带 Flutter:
  macOS 主机 → mac-arm64(Xcode 原生)+ win-amd64/win-arm64(mingw 交叉)
  Linux 主机 → linux-amd64(原生)+ win-amd64/win-arm64(mingw 交叉)
  Windows 主机 → win-amd64/win-arm64(原生)

Linux 目标此前根本不存在,这次一并补上:
- GC-UI/frontend/linux/ 由 flutter create 生成,BINARY_NAME=GC-UI、
  APPLICATION_ID=com.xhmcl.GC、窗口标题 "Morris GC"
- build_flutter_ui 增加 linux 分支,bundle(GC-UI + lib/ + data/)铺进
  dist/linux-amd64/,pack_launcher 增加 Linux 整目录打包
- linux/CMakeLists.txt 强制 CMAKE_INSTALL_PREFIX 指向 build/.../bundle:
  某些环境下它会被初始化成 /usr/local,导致 flutter 报「构建成功」但
  bundle 是空的、产物装进了系统目录(本机实测踩到)

顺带修正两处:
- 生成 settings.json 的默认 updateRepository 还是 gitcode 地址,与只保留
  xhmcl 源的现状不符
- 进度条权重改为按实际目标动态计算,新平台不会再把总进度算过 100%

验证(Linux 主机,flutter 3.24.5):
- ./build.sh build 出 win-amd64 109 MB、win-arm64 105 MB、linux-amd64 65 MB,
  三份均含 Flutter 前端,清单签名 Verified
- Linux 包在 Xvfb + llvmpipe 下实跑:后端 /api/health 返回 ok,GC-UI 窗口
  正常渲染出模型库首页
- macOS 目标在 Linux 上不再产出 Avalonia 空壳包(要它得回 macOS 编)
2026-11-18 19:15:05 +08:00
Morris 7e34cb0467 Merge pull request 'fix(update): 换发清单签名密钥,补齐 1.0.9 已签名清单' (#8) from feat/manifest-signing into main
Reviewed-on: Morris/GC#8
2026-11-18 10:41:20 +00:00
Morris e327a56421 fix(update): 换发清单签名密钥,补齐 1.0.9 已签名清单
仓库里硬编码的公钥 gc-2026-11 没有对应的私钥(.signing/ 在 .gitignore 里,
私钥从来没入过库,也无法找回),导致 build.sh 每次签名都失败,version.json
始终是「未签名」。而客户端默认 RequireSignedManifest=true,未签名清单一律
拒绝更新 —— 自动更新实际上完全不可用。

改动:
- keygen 生成新密钥 gc-2026-12(指纹 ee6083be47a87907),公钥写进
  SignatureKeyring;旧 gc-2026-11 保留一个版本周期,标注为「私钥遗失、已停用」
- GC-SAVEDOG 的 DefaultKeyId 与 build_funcs.sh 的 GC_SIGNING_KEY_ID 默认值
  同步改为 gc-2026-12,避免 keyId 与私钥不匹配又签出 Invalid
- GC.Tests 构造可信清单时用的 keyId 改为 gc-2026-12(原来硬编码旧 keyId,
  换钥匙后会判成 Invalid)
- README 补上密钥轮换的实际步骤与「换钥匙老客户端就更新不了」的代价
- Directory.Build.props 版本 1.0.7 → 1.0.9(此前只靠 -version 传参,
  仓库里一直停在 1.0.7,与实际发布脱节)
- version.json / model/version.json 换成 1.0.9 且带 gc-2026-12 签名,
  两份字节一致

验证:
- GC.Tests --update-test 全通过,日志里是「清单验签通过(gc-2026-12)」,
  篡改清单被判 Invalid 并拒绝更新
- GC-SAVEDOG verify --manifest version.json → Verified
- 三平台重新出包:win-amd64 109 MB、win-arm64 105 MB、mac-arm64 57 MB

注意:1.0.8 及更早的客户端只认识旧公钥,这份清单在它们眼里是「签名无效」,
与之前的「未签名」等价 —— 都不会自动更新。要让自动更新真正生效,需要把
带新公钥的 1.0.9 发出去。
2026-11-18 18:20:32 +08:00
Morris 40e72957e3 Merge pull request 'build: 支持在 Linux/macOS 上交叉编译 Windows 前端' (#7) from feat/win-cross-compile into main
Reviewed-on: Morris/GC#7
2026-11-18 10:09:49 +00:00
Morris fdbf3160e8 fix(update): 更新清单指向 xhmcl 仓库,下载地址与 tag 对齐
VersionStamp 里硬编码的仓库地址还是 gitcode.com/Morris_1/GC,与启动器
AppSettings.UpdateRepository 的默认值(git.xhmcl.com/Morris/GC)不一致,
导致生成的 version.json 把客户端导到一个没有对应 Release 的仓库。

同时下载地址拼的是 /download/v{版本}/,而实际 tag 没有 v 前缀
(1.0.7、1.0.8),两者对不上会 404。

改为读同一仓库地址并去掉 v 前缀,同时把当前 1.0.8 的清单同步过来
(sha256 沿用本次构建产物,未重算)。
2026-11-18 13:54:15 +08:00
Morris 2cc862a8da Merge pull request '启动器接入 Flutter 前端 · 公司信息统一 Morris · 模型版本 +1' (#6) from feat/flutter-ui into main
Reviewed-on: Morris/GC#6
2026-11-18 05:47:39 +00:00
Morris 2c0c566c81 build: 支持在 Linux/macOS 上交叉编译 Windows 前端
此前 Windows 包内不含 Flutter 界面,只能回退到内置 Avalonia 界面,
原因是 Flutter 官方不支持在非 Windows 主机上执行 flutter build windows。

实际上 Windows 嵌入层(windows/runner + cpp_client_wrapper)是纯 Win32
加标准 C++,只通过 C ABI 调用 flutter_windows.dll,因此用 mingw-w64 即可
编译。整条链路上唯一必须执行的 Windows 二进制是 AOT 快照生成器
gen_snapshot.exe,交给 wine 运行即可。全流程不需要 Windows 机器或 MSVC。

实现:
- buildsh/cross/toolchain-mingw.cmake  CMake 交叉工具链,posix 线程模型,
  静态链接 libstdc++/libgcc,产物只依赖系统 DLL 和 flutter_windows.dll
- buildsh/cross/CMakeLists.txt         只编 C++ 外壳,绕开 tool_backend.bat
  与 MSVC 专用编译参数
- buildsh/cross/build-ui-win-cross.sh  拉取引擎产物、为 gen_snapshot 装 wine
  包装、生成 AOT 快照、组装出与官方 toolchain 一致的目录结构
- build_flutter_ui_cross / build.sh    非 Windows 主机走交叉编译分支,
  x64 产物同时放进 win-amd64 与 win-arm64 两个包

顺带修掉 shell.dart 的常量求值错误:强调色改为跟随设置的动态 getter 后,
const Text 里引用 GcColors.accent 会让编译器报错。

已在 Linux 上用 wine 验证产物:Flutter 引擎正常初始化,Dart AOT 快照加载
并执行到业务代码,后端 /api/health 正常返回。
2026-11-18 13:29:53 +08:00
Morris 926a568dc0 Merge branch 'main' into feat/flutter-ui 2026-11-18 04:37:15 +00:00
Morris cd44c7ecff feat(ui): 启动器接入 Flutter 前端 · 公司名统一 Morris · 模型版本 +1
- GC-BOOT 新增 FlutterShell:随包带 GC.UI.Server 与 GC-UI 时,拉起「本地后端 + Flutter 窗口」,界面退出后一起收尾;缺任一产物则回退内置 Avalonia 界面
- 构建脚本新增 publish_backend(三平台发布 UI 后端)与 build_flutter_ui(宿主平台构建 Flutter 桌面产物)
- Windows 打包由「单文件 exe」改为整目录,包含启动器、GC-SAVEDOG、UI 后端与可选 Flutter 产物
- Flutter 工程:Windows BINARY_NAME 与 macOS PRODUCT_NAME 改为 GC-UI,窗口标题 Morris GC
- 公司信息:Windows CompanyName/LegalCopyright、macOS PRODUCT_COPYRIGHT 统一为 Morris
- 模型版本末位 +1:contour-map 1.1 / earth-geography 1.9 / earth-revolution 1.7 / earth-rotation 1.7 / scale-calculator 1.6,并重算清单哈希
2026-11-18 12:36:21 +08:00
Morris aeab68d421 Merge pull request 'chore: 彻底移除 NeoRF 标识(命名空间 / 作者 / Bundle ID)' (#5) from chore/remove-neorf into main
Reviewed-on: Morris/GC#5
2026-11-17 22:55:44 +00:00
Morris 0b2f263dea chore: 彻底移除 NeoRF 标识,统一为 GC / Morris
- 命名空间 NeoRF.EarthModels / NeoRF.ContourMap / NeoRF.ScaleCalculator
  改为 GC.EarthModels / GC.ContourMap / GC.ScaleCalculator
- 模型清单 type 字段同步更新,五个模型 DLL 全部重新编译并替换
- 程序集 Company 由 NeoRF 改为 Morris
- 模型作者 author 统一为 Morris(原 NeoRF / Morris GC)
- macOS 包标识 cn.neorf.GC 改为 com.xhmcl.GC
- 重算 version.json 与 model/version.json 的 build / manifestSha256 / filesSha256
2026-11-18 06:55:10 +08:00
Morris a18d0ea1a8 Merge pull request '关于页开发者改为读取仓库真实提交者(身份归并 + 排除自动化账号)' (#4) from fix/about-contributors into main
Reviewed-on: Morris/GC#4
2026-11-17 22:52:38 +00:00
Morris 06eb4875a1 fix(about): 开发者改为读取仓库真实提交者
- ContributorsService 改用 /commits 分页统计,不再依赖需要登录的 /collaborators
- 同一人的多个 git 身份按别名归并(Morris_1 / 2509_92447106 / 两个邮箱)
- 自动化提交(agent@teamily.ai)不计入开发者,避免出现在关于页
- 关于页「开发者」标题标注数据来源,贡献数为真实提交数
- 结果缓存 10 分钟;接口失败时静默降级为空列表,不影响关于页其它内容
2026-11-18 00:23:48 +08:00
Morris 2b4ffc7ce5 Merge pull request 'ci(GC-UI): 夜间 alpha 构建工作流(Windows/macOS,21:00 定时,prerelease)' (#2) from gc-ui into main
Reviewed-on: Morris/GC#2
2026-11-17 16:10:36 +00:00
Morris d379902a7a ci: artifact 上传降为 v3,兼容 Gitea Actions 2026-11-17 23:55:21 +08:00
Morris 056d64a3bc Merge pull request 'UI 体验与启动优化 · 主题色 · Gitea CI/夜间预发布 · 后端安全加固' (#3) from feat/ui-perf-ci-security into main
Reviewed-on: Morris/GC#3
2026-11-17 15:53:19 +00:00
Morris ae73eca2c4 UI 体验与启动优化 · 主题色 · Gitea CI/夜间预发布 · 后端安全加固
- 启动:健康检查与设置并行请求,页面按需构建并 Offstage 保活,封面按展示尺寸解码
- UI:模型卡片增加悬停动效、封面渐变遮罩、版本/作者/标签胶囊,空简介占位
- 主题:设置页新增主色调选择(预设 + 自定义 #RRGGBB),前后端持久化并实时生效
- CI:新增 PR 审核流水线(后端编译/自检、Flutter 分析测试、漏洞与密钥扫描、汇总门禁)
- CI:新增每晚 21:00(UTC 13:00)预发布流水线,prerelease 且不设为 Latest,先删旧再建新
- 安全:后端新增安全响应头、Host/Origin 校验、写入限流、请求体上限、ID 与设置白名单、错误信息脱敏
- 源:暂时只启用 Xhmcl;GitCode 实现保留但不再调用,旧配置自动迁移
2026-11-17 23:50:54 +08:00
Morris 3480cbaa5f Merge pull request 'GC-UI:前后端分离,前端改用 Flutter(Windows/macOS)' (#1) from gc-ui into main
Reviewed-on: Morris/GC#1
2026-11-17 14:18:07 +00:00
218 changed files with 24121 additions and 11398 deletions

No files matched your search

+10 -14
View File
@@ -1,9 +1,9 @@
# GC-UI 夜间 alpha 构建(Gitea Actions) # GC-UI alpha 构建(Gitea Actions)
# #
# 触发:每天 21:00(Asia/Shanghai)自动跑一次,产出 Windows 与 macOS 的 Flutter 前端产物, # 触发:**仅手动**。定时任务已取消(不再每天自动构建),需要时在 Actions 页面点
# 发布为一个「预览版(prerelease)」Release —— 不占用 latest。 # Run workflow,或从命令行调
# 手动:Actions 页面点 Run workflow(Gitea 的 workflow_dispatch),用于验证 runner 是否就绪; # POST /api/v1/repos/{owner}/{repo}/actions/workflows/{file}/dispatches。
# 也可以从命令行调 POST /api/v1/repos/{owner}/{repo}/actions/workflows/{file}/dispatches。 # 产物:Windows 与 macOS 的 Flutter 前端,发布为一个「预览版(prerelease)」Release —— 不占用 latest。
# #
# 为什么是 .gitea/workflows/:本仓库是自建 Gitea,不是 GitHub。Gitea Actions 语法与 # 为什么是 .gitea/workflows/:本仓库是自建 Gitea,不是 GitHub。Gitea Actions 语法与
# GitHub Actions 基本一致,但工作流目录是 .gitea/workflows/,API 前缀是 /api/v1, # GitHub Actions 基本一致,但工作流目录是 .gitea/workflows/,API 前缀是 /api/v1,
@@ -16,12 +16,8 @@
name: GC-UI Alpha name: GC-UI Alpha
on: on:
schedule: # 定时触发已取消:夜间构建会绕开 build.sh,产出不含后端/前端的空壳包,
# 每天晚上 21:00,北京时间。 # 且 cron 的 TZ= 前缀在部分 Gitea 版本上非法。需要时手动 dispatch。
# Gitea 1.23 起 Actions 的 cron 默认按 UTC 解释,这里显式带 TZ= 前缀(robfig/cron 支持的
# 时区前缀语法),这样不依赖服务器自身时区设置。
# 如果所在实例不认 TZ= 前缀,改用等效的 UTC 写法 '0 13 * * *'。
- cron: 'TZ=Asia/Shanghai 0 21 * * *'
workflow_dispatch: workflow_dispatch:
inputs: inputs:
note: note:
@@ -67,7 +63,7 @@ jobs:
exit 1 exit 1
fi fi
# 北京时间当天日期,让产物名和 tag 与「每晚 9 点」对得上 # 北京时间当天日期,让同一天的多次手动构建落在同一个日期前缀下
DATE=$(TZ=Asia/Shanghai date +%Y%m%d) DATE=$(TZ=Asia/Shanghai date +%Y%m%d)
# 同一天重跑时用 run_number 区分,tag 不重复 # 同一天重跑时用 run_number 区分,tag 不重复
VERSION="${BASE}-alpha.${DATE}.${{ github.run_number }}" VERSION="${BASE}-alpha.${DATE}.${{ github.run_number }}"
@@ -122,11 +118,11 @@ jobs:
tag, version, sha, server = sys.argv[1:5] tag, version, sha, server = sys.argv[1:5]
short = sha[:7] short = sha[:7]
body = ( body = (
"GC-UI 夜间 alpha 构建(自动生成,**预览版 / prerelease**)。\n\n" "GC-UI alpha 构建(手动触发,**预览版 / prerelease**)。\n\n"
"- 版本:`%s`\n" "- 版本:`%s`\n"
"- 提交:`%s`\n" "- 提交:`%s`\n"
"- 构建来源:%s/commit/%s\n" "- 构建来源:%s/commit/%s\n"
"- 通道:alpha —— 每晚 21:00(Asia/Shanghai)自动构建\n\n" "- 通道:alpha —— 手动触发(定时任务已取消)\n\n"
"产物说明:\n\n" "产物说明:\n\n"
"| 文件 | 平台 | 内容 |\n" "| 文件 | 平台 | 内容 |\n"
"|---|---|---|\n" "|---|---|---|\n"
+143
View File
@@ -0,0 +1,143 @@
# ---------------------------------------------------------------------------
# PR 审核流水线(Gitea Actions)
#
# 触发:向 main / gc-ui 提 PR(新建、追加提交、重新打开、取消草稿)时执行。
# 覆盖:后端编译、后端自检、前端静态分析 / 测试、依赖漏洞与硬编码密钥扫描,
# 最后用 review-gate 汇总,任意一项失败则整条流水线失败(阻止合并)。
# ---------------------------------------------------------------------------
name: PR 审核
on:
pull_request:
branches: [main, gc-ui]
types: [opened, synchronize, reopened, ready_for_review]
concurrency:
group: pr-check-${{ github.event.pull_request.number }}
cancel-in-progress: true
env:
# Avalonia 遥测任务在 CI 只读目录会写日志失败并中断编译(MSB4018)
AVALONIA_TELEMETRY_OPTOUT: '1'
DOTNET_NOLOGO: '1'
DOTNET_CLI_TELEMETRY_OPTOUT: '1'
jobs:
backend-build:
name: 后端编译
runs-on: ubuntu-latest
steps:
- name: 检出代码
uses: actions/checkout@v4
- name: 安装 .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: 还原依赖
run: dotnet restore GC.sln
- name: 编译整个解决方案(Release)
run: dotnet build GC.sln -c Release --no-restore
- name: 编译 GC-UI 后端(前后端契约变更时单独验证)
run: dotnet build GC-UI/backend/GC.UI.Server/GC.UI.Server.csproj -c Release --no-restore
backend-test:
name: 后端自检
runs-on: ubuntu-latest
needs: backend-build
steps:
- name: 检出代码
uses: actions/checkout@v4
- name: 安装 .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: 运行 GC.Tests(含离屏渲染 / 清单校验 / 日志用例)
run: dotnet run --project GC/src/test/dotnet/GC.Tests/GC.Tests.csproj -c Release
- name: 运行应用器测试(整目录替换 / .GC/bin 合并 / 回滚)
run: dotnet run --project GC/src/test/dotnet/GC.Savedog.Tests/GC.Savedog.Tests.csproj -c Release
frontend:
name: 前端检查(Flutter)
runs-on: ubuntu-latest
steps:
- name: 检出代码
uses: actions/checkout@v4
- name: 安装 Flutter
uses: subosito/flutter-action@v2
with:
channel: stable
cache: true
- name: 拉取依赖
working-directory: GC-UI/frontend
run: flutter pub get
- name: 静态分析
working-directory: GC-UI/frontend
run: flutter analyze --no-fatal-infos --no-fatal-warnings
- name: 单元 / 组件测试
working-directory: GC-UI/frontend
run: flutter test
security:
name: 安全扫描
runs-on: ubuntu-latest
steps:
- name: 检出代码
uses: actions/checkout@v4
- name: 安装 .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: 依赖漏洞扫描(含传递依赖)
run: |
dotnet restore GC.sln
dotnet list GC.sln package --vulnerable --include-transitive
- name: 硬编码密钥 / 口令扫描
run: |
set +e
echo "扫描源码中的疑似明文口令 / 令牌…"
MATCHES=$(grep -rInE \
--include='*.cs' --include='*.dart' --include='*.yml' --include='*.yaml' \
--include='*.sh' --include='*.ps1' --include='*.json' \
'(password|passwd|secret|api[_-]?key|access[_-]?token)[[:space:]]*[:=][[:space:]]*["'\''][^"'\''[:space:]]{6,}' \
. 2>/dev/null | grep -vE 'example|placeholder|dummy|CHANGEME|YOUR_|\$\{\{')
if [ -n "$MATCHES" ]; then
echo "$MATCHES"
echo "::error::发现疑似硬编码凭据,请改用 Secrets 或环境变量"
exit 1
fi
echo "未发现硬编码凭据"
review-gate:
name: 审核汇总
runs-on: ubuntu-latest
needs: [backend-build, backend-test, frontend, security]
if: always()
steps:
- name: 检查各阶段结果
run: |
echo "后端编译: ${{ needs.backend-build.result }}"
echo "后端自检: ${{ needs.backend-test.result }}"
echo "前端检查: ${{ needs.frontend.result }}"
echo "安全扫描: ${{ needs.security.result }}"
if [ "${{ needs.backend-build.result }}" != "success" ] || \
[ "${{ needs.backend-test.result }}" != "success" ] || \
[ "${{ needs.frontend.result }}" != "success" ] || \
[ "${{ needs.security.result }}" != "success" ]; then
echo "::error::审核未通过:存在失败阶段,请修复后重新提交"
exit 1
fi
echo "审核通过:可以合并"
+50
View File
@@ -0,0 +1,50 @@
# ---------------------------------------------------------------------------
# 发布一致性核对(Gitea Actions)
#
# 触发:仅手动。发布前跑一次确认「tag / 清单 / 资产」互相对得上,发布后再跑一次
# 确认线上资产就是清单里那两份。
#
# 为什么不用 pull_request 触发:这里要下载几百 MB 的发布包,PR 阶段跑太贵;
# 需要时点 Run workflow 即可,本地也有等价命令:./build.sh release-verify <tag>
# ---------------------------------------------------------------------------
name: 发布核对
on:
workflow_dispatch:
inputs:
tag:
description: '要核对的 tag(如 1.1.0)'
required: true
skip_download:
description: '只比对体积、不下载校验 sha256(快,输入 1 开启)'
required: false
default: ''
env:
DOTNET_NOLOGO: '1'
DOTNET_CLI_TELEMETRY_OPTOUT: '1'
jobs:
verify:
name: 核对 Release 与清单
runs-on: ubuntu-latest
steps:
- name: 检出代码
uses: actions/checkout@v4
- name: 安装 .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: 核对
env:
GC_GITEA_TOKEN: ${{ secrets.GC_GITEA_TOKEN }}
run: |
set -eu
EXTRA=""
if [ -n "${{ github.event.inputs.skip_download }}" ]; then
EXTRA="--skip-download"
fi
chmod +x buildsh/lib/verify_release.py
./build.sh release-verify "${{ github.event.inputs.tag }}" $EXTRA
+87
View File
@@ -0,0 +1,87 @@
# GitHub Actions 说明
三个工作流,都在 `.github/workflows/` 下。自建 Gitea 里对应的老流水线在 `.gitea/workflows/`,两边互不影响。
| 工作流 | 触发 | 做什么 |
| --- | --- | --- |
| `nightly-prerelease.yml` | 每天 21:00(Asia/Shanghai),或手动 | 编译 macOS + Windows(amd64/arm64),发布 **`nightly`** 预发布 |
| `build-bot.yml` | Issue / PR 评论里 `@build-bot build <目标>` | 只编译指定平台,发布 **`ip-prerelease`** 预发布 |
| `build-release.yml` | Issue / PR 评论里 `@build-release-bot build <版本号>` | 编译三平台,发布 **tag = 版本号** 的正式 Release |
| `pr-review.yml` | 向 main 提 PR(新建 / 有新提交 / 重新打开) | 检查能否编译、是否有错、是否冲突、是否落后 main |
预发布用**不同的 tag**,互不覆盖:夜间构建发 `nightly`,`@build-bot` 发 `ip-prerelease`;
`@build-release-bot` 发的是正式版本(tag 就是版本号,会更新 latest)。
## 每夜构建
时区用 `TZ=Asia/Shanghai`,cron 写成 `0 13 * * *`(= 21:00 UTC+8)。
产物是 `GCL-<版本>-<平台>.zip`,由 `build.sh` / `build.ps1` 生成在 `dist/<平台>/`。
`nightly` 这个 tag **每次滚动重建**(先删 release 和 tag,再按当前提交创建),
所以它的下载链接是稳定的。因为 tag 不是版本号,客户端的上传/更新逻辑会跳过它
——夜间版本永远不会被当成「有新版可用」推给用户,符合预期。
## build-bot 用法
在 Issue 或 PR 里评论:
```
@build-bot build mac # 只编 macOS
@build-bot build win-amd # 只编 Windows amd64
@build-bot build win-arm # 只编 Windows arm64
@build-bot build all # 三个平台全编
```
规则:
- 只有 `OWNER` / `MEMBER` / `COLLABORATOR` 的评论才会触发,其他人评论会被忽略。
- PR 上的评论编的是 **该 PR 的 head 提交**;Issue 上评论编的是 main 最新提交。
- 产物用 `gh release upload --clobber` 合并进 `ip-prerelease`,**不会**删掉别的平台资产。
- 编完会在评论里回帖:成功给出 release 链接,失败给出日志链接。
- 同一时刻只跑一个 build-bot(同一 concurrency 组),避免并发改同一个 release;
`nightly` 用的是另一个组,两者互不干扰(tag 本来就不同)。
## PR 自动审查
对 main 的 PR 在新建 / 推新提交 / 重新打开时运行,检查四项:
1. **能否编译**:`dotnet build GC.sln -c Release`
2. **代码检查**:`flutter analyze`(在 `GC-UI/frontend`)
3. **是否冲突**:读 GitHub 的 `mergeable` 字段(异步计算,会重试几次)
4. **是否落后**:`git rev-list --count HEAD..origin/main`
结论写进一条带 `<!-- gc-pr-review -->` 标记的评论,**重复运行只更新这一条**,不会刷屏。
日志尾部(dotnet / flutter 各 40 行)折叠在评论的 `<details>` 里。
> 说明:这里只做「能编译 + 能通过静态分析」,不跑 `flutter build macos`
> (Ubuntu runner 没有 Xcode)。真正的三平台编译由 `nightly-prerelease` 和 `build-bot` 覆盖。
## 需要的仓库设置
- `Settings → Actions → General → Workflow permissions` 给 **Read and write**,
否则 `gh release` / 评论接口会 403(工作流里已声明 `permissions:`,但组织策略可能覆盖)。
- Secrets 不需要额外配置,统一用内置的 `GITHUB_TOKEN`。
- macOS 产物是 **ad-hoc 签名**(无开发者证书)。下载后首次打开需右键 →「打开」,
或在「系统设置 → 隐私与安全性」里放行。
## build-release 用法
在 Issue 或 PR 里评论:
```
@build-release-bot build 1.1.3
```
规则:
- 版本号必须是 `主.次.修订`(如 `1.1.3`),其它写法会被忽略
- tag 已存在时不会触发,会回帖说明「请换一个版本号」——同一个 tag 发两次会让客户端拿到两份不同内容
- 只有 `OWNER` / `MEMBER` / `COLLABORATOR` 能触发
- 编 macOS + Windows(amd64/arm64),**两个平台都成功**才发 Release,否则只回帖失败原因
- Release 附带 `SHA256SUMS.txt`
- **不会**改动仓库里的 `version.json`:它由 GC-SAVEDOG 签名,CI 没有签名私钥。清单更新请在本地跑 `./build.sh stamp`
## macOS runner
统一用 `macos-latest`。`macos-14` 在本账号会被判为 `macos-14-arm64-us-default` 不受支持,
job 在启动前就变成 cancelled。runner 自带多个版本的 Xcode 和 CocoaPods,不需要额外安装。
+342
View File
@@ -0,0 +1,342 @@
name: build-bot
# 在 Issue / PR 里评论触发编译:
# @build-bot build mac 编译 macOS(大小写均可:Mac / MAC)
# @build-bot build mac version=1.1.3 编译 macOS 1.1.3(不写 version= 则用仓库当前版本)
# @build-bot build win-amd 编译 Windows amd64
# @build-bot build win-arm 编译 Windows arm64
# @build-bot build all 三个平台全编
# 产物发布到 ip-prerelease 预发布(同一 tag 滚动更新,不删别的平台资产)。
on:
issue_comment:
types: [created]
concurrency:
group: release-ip-prerelease
cancel-in-progress: false
permissions:
contents: write
issues: write
pull-requests: write
env:
TZ: Asia/Shanghai
BOT_TAG: ip-prerelease
DOTNET_VERSION: '8.0.x'
FLUTTER_VERSION: '3.24.5'
jobs:
prepare:
# 只处理带 @build-bot build 的评论,且只允许仓库成员触发
if: |
contains(github.event.comment.body, '@build-bot') &&
(github.event.comment.author_association == 'OWNER' ||
github.event.comment.author_association == 'MEMBER' ||
github.event.comment.author_association == 'COLLABORATOR')
runs-on: ubuntu-latest
outputs:
target: ${{ steps.parse.outputs.target }}
ref: ${{ steps.parse.outputs.ref }}
is_pr: ${{ steps.parse.outputs.is_pr }}
version: ${{ steps.parse.outputs.version }}
ok: ${{ steps.parse.outputs.ok }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- id: parse
name: 解析指令
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BODY: ${{ github.event.comment.body }}
ISSUE_NUMBER: ${{ github.event.issue.number }}
run: |
set -e
# 抓 @build-bot build <target>,target 白名单外一律忽略
TARGET=$(printf '%s' "$BODY" \
| grep -oiE '@build-bot[[:space:]]+build[[:space:]]+(mac|win-amd|win-arm|all)' \
| head -1 \
| awk '{print tolower($NF)}' || true)
if [ -z "$TARGET" ]; then
echo "ok=false" >> "$GITHUB_OUTPUT"
echo "没有匹配到合法目标,忽略"
exit 0
fi
echo "ok=true" >> "$GITHUB_OUTPUT"
echo "target=$TARGET" >> "$GITHUB_OUTPUT"
# 版本号:评论里的 version=x.y.z 优先(大小写不敏感),没有则用仓库当前版本。
CLI_VERSION=$(printf '%s' "$BODY" \
| grep -oiE 'version[[:space:]]*=[[:space:]]*[0-9]+\.[0-9]+\.[0-9]+' \
| head -1 \
| sed -E 's/.*=[[:space:]]*//' || true)
if [ -n "$CLI_VERSION" ]; then
VERSION="$CLI_VERSION"
echo "使用评论指定版本:$VERSION"
else
VERSION=$(sed -n 's:.*<Version>\(.*\)</Version>.*:\1:p' Directory.Build.props | head -1)
[ -n "$VERSION" ] || VERSION=1.0.0
fi
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
# Issue 评论挂在 PR 上时,用 PR 的 head 提交;否则用默认分支最新
IS_PR=$(gh api "repos/${{ github.repository }}/issues/${ISSUE_NUMBER}" \
--jq '.pull_request != null' 2>/dev/null || echo false)
echo "is_pr=$IS_PR" >> "$GITHUB_OUTPUT"
if [ "$IS_PR" = "true" ]; then
# 只有「还开着」的 PR 才编它的 head;已合并/已关闭的 PR 编默认分支,
# 否则会编到一份过期的代码。
PR_STATE=$(gh api "repos/${{ github.repository }}/pulls/${ISSUE_NUMBER}" --jq '.state')
if [ "$PR_STATE" = "open" ]; then
REF=$(gh api "repos/${{ github.repository }}/pulls/${ISSUE_NUMBER}" --jq '.head.sha')
else
REF="${{ github.event.repository.default_branch }}"
echo "PR 已 $PR_STATE,改为编译默认分支"
fi
else
REF="${{ github.event.repository.default_branch }}"
fi
echo "ref=$REF" >> "$GITHUB_OUTPUT"
echo "目标=$TARGET 提交=$REF 是否PR=$IS_PR"
- name: 回复「开始编译」
if: steps.parse.outputs.ok == 'true'
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ISSUE: ${{ github.event.issue.number }}
TARGET: ${{ steps.parse.outputs.target }}
REF: ${{ steps.parse.outputs.ref }}
VERSION: ${{ steps.parse.outputs.version }}
RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
run: |
set -e
case "$TARGET" in
mac) PLATFORMS="macOS" ;;
win-amd) PLATFORMS="Windows amd64" ;;
win-arm) PLATFORMS="Windows arm64" ;;
*) PLATFORMS="macOS + Windows amd64 + Windows arm64" ;;
esac
cat > ack.md <<EOF
🔨 **开始编译**:${PLATFORMS}
- 来源提交:\`${REF:0:7}\`
- 目标:\`${TARGET}\`
- 版本:\`${VERSION}\`
- 实时日志:${RUN_URL}
编译完成后会在这里回复结果。
EOF
gh issue comment "$ISSUE" --body-file ack.md
build-mac:
needs: prepare
if: needs.prepare.outputs.ok == 'true' && (needs.prepare.outputs.target == 'mac' || needs.prepare.outputs.target == 'all')
runs-on: macos-14
steps:
- uses: actions/checkout@v4
with:
ref: ${{ needs.prepare.outputs.ref }}
- uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
# NuGet 包缓存:Avalonia / CommunityToolkit 等依赖每次冷下载要几分钟,
# 依赖没变时直接命中缓存。key 基于所有 csproj + .props。
- uses: actions/cache@v4
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/*.props', '**/packages.lock.json') }}
restore-keys: ${{ runner.os }}-nuget-
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: stable
cache: true
# CocoaPods:Pods/ 被 gitignore,Podfile.lock 没变时复用,省掉每次 pod install
- uses: actions/cache@v4
with:
path: |
GC-UI/frontend/macos/Pods
~/Library/Caches/CocoaPods
key: ${{ runner.os }}-pods-${{ hashFiles('GC-UI/frontend/macos/Podfile.lock') }}
restore-keys: ${{ runner.os }}-pods-
- name: 编译 macOS
env:
GC_NO_PROGRESS: '1'
run: ./build.sh build --targets=mac -version=${{ needs.prepare.outputs.version }}
- uses: actions/upload-artifact@v4
with:
name: mac-zip
path: dist/mac-arm64/*.zip
if-no-files-found: error
retention-days: 3
build-win:
needs: prepare
if: needs.prepare.outputs.ok == 'true' && (needs.prepare.outputs.target == 'win-amd' || needs.prepare.outputs.target == 'win-arm' || needs.prepare.outputs.target == 'all')
runs-on: windows-latest
defaults:
run:
shell: pwsh
steps:
- uses: actions/checkout@v4
with:
ref: ${{ needs.prepare.outputs.ref }}
- uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: stable
cache: true
- name: 编译 Windows
run: ./build.ps1 build -Version ${{ needs.prepare.outputs.version }}
- uses: actions/upload-artifact@v4
with:
name: win-zip
path: |
dist/win-amd64/*.zip
dist/win-arm64/*.zip
if-no-files-found: error
retention-days: 3
publish:
needs: [prepare, build-mac, build-win]
if: |
always() &&
needs.prepare.outputs.ok == 'true' &&
(needs.build-mac.result == 'success' || needs.build-win.result == 'success')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
path: artifacts
- name: 汇总产物
env:
TARGET: ${{ needs.prepare.outputs.target }}
run: |
set -e
mkdir -p out
case "$TARGET" in
mac) PATTERN='*-mac-arm64.zip' ;;
win-amd) PATTERN='*-win-amd64.zip' ;;
win-arm) PATTERN='*-win-arm64.zip' ;;
*) PATTERN='*.zip' ;;
esac
# Windows 作业一次会编译 amd64 + arm64,这里只挑本次请求的平台
find artifacts -name '*.zip' | while read -r f; do
case "$f" in
$PATTERN) cp "$f" out/ ;;
esac
done
[ -n "$(ls -A out 2>/dev/null)" ] || { echo "没有匹配 $PATTERN 的产物"; exit 1; }
ls -lh out
- id: publish_step
name: 发布到 ip-prerelease
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VERSION: ${{ needs.prepare.outputs.version }}
TARGET: ${{ needs.prepare.outputs.target }}
REF: ${{ needs.prepare.outputs.ref }}
TAG: ${{ env.BOT_TAG }}
ACTOR: ${{ github.event.comment.user.login }}
ISSUE: ${{ github.event.issue.number }}
run: |
set -e
cat > notes.md <<EOF
手动触发构建(\`@build-bot build ${TARGET} version=${VERSION}\`)。
触发人:@${ACTOR}
来源:#${ISSUE}
提交:\`${REF:0:7}\`,版本号 ${VERSION}
> 预发布版本:仅供测试,不保证稳定。
EOF
if gh release view "$TAG" >/dev/null 2>&1; then
# 已有预发布:只覆盖本次编译出来的资产,别的平台保留
gh release upload "$TAG" out/*.zip --clobber
gh release edit "$TAG" --prerelease --notes-file notes.md
else
gh release create "$TAG" out/*.zip \
--prerelease \
--target "$REF" \
--title "Prerelease ${VERSION}" \
--notes-file notes.md
fi
echo "https://github.com/${{ github.repository }}/releases/tag/$TAG" >> "$GITHUB_STEP_SUMMARY"
# 结果回帖独立成一个 job:编译失败 / 发布失败也要有回音,
# 不能因为 publish 被跳过就静默。
report:
needs: [prepare, build-mac, build-win, publish]
if: always() && needs.prepare.outputs.ok == 'true'
runs-on: ubuntu-latest
steps:
- name: 回帖结果
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# 本 job 不 checkout(省时间),gh 需要显式指定仓库
GH_REPO: ${{ github.repository }}
ISSUE: ${{ github.event.issue.number }}
TARGET: ${{ needs.prepare.outputs.target }}
REF: ${{ needs.prepare.outputs.ref }}
MAC: ${{ needs.build-mac.result }}
WIN: ${{ needs.build-win.result }}
PUB: ${{ needs.publish.result }}
RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
run: |
set -e
REPO="${{ github.repository }}"
line() {
case "$2" in
success) echo "- $1:✅ 成功" ;;
skipped) echo "- $1:⏭ 未请求(跳过)" ;;
cancelled) echo "- $1:⛔ 已取消" ;;
*) echo "- $1:❌ 失败" ;;
esac
}
{
if [ "$PUB" = "success" ]; then
echo "✅ **编译完成**:\`${TARGET}\`"
else
echo "❌ **编译未完成**:\`${TARGET}\`"
fi
echo
line "macOS" "$MAC"
line "Windows" "$WIN"
echo
echo "- 来源提交:\`${REF:0:7}\`"
if [ "$PUB" = "success" ]; then
echo "- 产物:https://github.com/${REPO}/releases/tag/ip-prerelease"
else
echo "- 日志:${RUN_URL}"
fi
} > result.md
gh issue comment "$ISSUE" --body-file result.md
+309
View File
@@ -0,0 +1,309 @@
name: build-release
# 在 Issue / PR 里评论触发「编译 + 发布正式版本」:
# @build-release-bot build 1.1.3
#
# 与 build-bot 的区别:
# build-bot 只编译,产物丢进 ip-prerelease(预发布,反复覆盖)
# build-release 编译三平台,发一个 tag = 版本号的正式 Release(会更新 latest)
#
# 不会改动仓库里的 version.json:它由 GC-SAVEDOG 签名,CI 里没有签名私钥,
# 重新 stamp 会产出一份客户端拒绝接受的清单。清单更新请走本地 ./build.sh stamp。
on:
issue_comment:
types: [created]
concurrency:
group: release-manual
cancel-in-progress: false
permissions:
contents: write
issues: write
pull-requests: write
env:
TZ: Asia/Shanghai
DOTNET_VERSION: '8.0.x'
FLUTTER_VERSION: '3.24.5'
jobs:
prepare:
if: |
contains(github.event.comment.body, '@build-release-bot') &&
(github.event.comment.author_association == 'OWNER' ||
github.event.comment.author_association == 'MEMBER' ||
github.event.comment.author_association == 'COLLABORATOR')
runs-on: ubuntu-latest
outputs:
ok: ${{ steps.parse.outputs.ok }}
version: ${{ steps.parse.outputs.version }}
ref: ${{ steps.parse.outputs.ref }}
reason: ${{ steps.parse.outputs.reason }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- id: parse
name: 解析版本号并预检
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BODY: ${{ github.event.comment.body }}
run: |
set -e
# 只认 主.次.修订,其它写法直接忽略
VER=$(printf '%s' "$BODY" \
| grep -oiE '@build-release-bot[[:space:]]+build[[:space:]]+[0-9]+\.[0-9]+\.[0-9]+' \
| head -1 \
| awk '{print $NF}' || true)
if [ -z "$VER" ]; then
echo "ok=false" >> "$GITHUB_OUTPUT"
echo "reason=没有匹配到合法版本号(格式:@build-release-bot build 1.2.3)" >> "$GITHUB_OUTPUT"
echo "未匹配到版本号,忽略"
exit 0
fi
echo "version=$VER" >> "$GITHUB_OUTPUT"
echo "ref=${{ github.event.repository.default_branch }}" >> "$GITHUB_OUTPUT"
echo "版本号=$VER"
# tag 已存在就不能再发:重复 tag 会让客户端拿到两份不同内容
if gh api "repos/${{ github.repository }}/git/ref/tags/${VER}" >/dev/null 2>&1; then
echo "ok=false" >> "$GITHUB_OUTPUT"
echo "reason=tag ${VER} 已存在,请换一个版本号" >> "$GITHUB_OUTPUT"
echo "tag ${VER} 已存在"
exit 0
fi
echo "ok=true" >> "$GITHUB_OUTPUT"
echo "reason=" >> "$GITHUB_OUTPUT"
- name: 回复「开始编译并发布」
if: steps.parse.outputs.ok == 'true'
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_REPO: ${{ github.repository }}
ISSUE: ${{ github.event.issue.number }}
VER: ${{ steps.parse.outputs.version }}
RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
run: |
set -e
cat > ack.md <<EOF
🔨 **开始编译并发布 \`${VER}\`**
平台:macOS (arm64) + Windows (amd64 / arm64)
- 实时日志:${RUN_URL}
编译完成后会在这里回复结果。
EOF
gh issue comment "$ISSUE" --body-file ack.md
- name: 回复「忽略原因」
if: steps.parse.outputs.ok != 'true'
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_REPO: ${{ github.repository }}
ISSUE: ${{ github.event.issue.number }}
REASON: ${{ steps.parse.outputs.reason }}
run: |
set -e
gh issue comment "$ISSUE" --body "⏭ 未触发:${REASON}"
build-mac:
needs: prepare
if: needs.prepare.outputs.ok == 'true'
runs-on: macos-14
steps:
- uses: actions/checkout@v4
with:
ref: ${{ needs.prepare.outputs.ref }}
- uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
# NuGet 包缓存:依赖没变时省去冷下载
- uses: actions/cache@v4
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/*.props', '**/packages.lock.json') }}
restore-keys: ${{ runner.os }}-nuget-
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: stable
cache: true
# CocoaPods:Pods/ 被 gitignore,Podfile.lock 没变时复用,省掉 pod install
- uses: actions/cache@v4
with:
path: |
GC-UI/frontend/macos/Pods
~/Library/Caches/CocoaPods
key: ${{ runner.os }}-pods-${{ hashFiles('GC-UI/frontend/macos/Podfile.lock') }}
restore-keys: ${{ runner.os }}-pods-
- name: 环境信息
run: |
sw_vers
xcodebuild -version
flutter --version
- name: 编译 macOS
env:
GC_NO_PROGRESS: '1'
run: ./build.sh build --targets=mac -version=${{ needs.prepare.outputs.version }}
- uses: actions/upload-artifact@v4
with:
name: mac-zip
path: dist/mac-arm64/*.zip
if-no-files-found: error
retention-days: 5
build-win:
needs: prepare
if: needs.prepare.outputs.ok == 'true'
runs-on: windows-latest
defaults:
run:
shell: pwsh
steps:
- uses: actions/checkout@v4
with:
ref: ${{ needs.prepare.outputs.ref }}
- uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: stable
cache: true
- name: 编译 Windows(amd64 + arm64)
run: ./build.ps1 build -Version ${{ needs.prepare.outputs.version }}
- uses: actions/upload-artifact@v4
with:
name: win-zip
path: |
dist/win-amd64/*.zip
dist/win-arm64/*.zip
if-no-files-found: error
retention-days: 5
publish:
needs: [prepare, build-mac, build-win]
if: needs.prepare.outputs.ok == 'true' && needs.build-mac.result == 'success' && needs.build-win.result == 'success'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
path: artifacts
- name: 汇总产物
run: |
set -e
mkdir -p out
find artifacts -name '*.zip' -exec cp {} out/ \;
ls -lh out
- name: 生成 sha256 清单
working-directory: out
run: |
set -e
shasum -a 256 *.zip > SHA256SUMS.txt 2>/dev/null || sha256sum *.zip > SHA256SUMS.txt
cat SHA256SUMS.txt
- name: 发布 Release
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_REPO: ${{ github.repository }}
VER: ${{ needs.prepare.outputs.version }}
REF: ${{ needs.prepare.outputs.ref }}
ACTOR: ${{ github.event.comment.user.login }}
ISSUE: ${{ github.event.issue.number }}
run: |
set -e
cat > notes.md <<EOF
GC ${VER}
- macOS(arm64)
- Windows(amd64 / arm64)
触发人:@${ACTOR}(#${ISSUE})
构建来源:\`${REF}\`
各包 sha256 见 \`SHA256SUMS.txt\`。
> macOS 包为 ad-hoc 签名,首次打开需右键 →「打开」,或在「系统设置 → 隐私与安全性」里放行。
EOF
gh release create "$VER" out/* \
--target "$REF" \
--title "GC ${VER}" \
--notes-file notes.md
echo "https://github.com/${{ github.repository }}/releases/tag/$VER" >> "$GITHUB_STEP_SUMMARY"
report:
needs: [prepare, build-mac, build-win, publish]
if: always() && needs.prepare.outputs.ok == 'true'
runs-on: ubuntu-latest
steps:
- name: 回帖结果
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_REPO: ${{ github.repository }}
ISSUE: ${{ github.event.issue.number }}
VER: ${{ needs.prepare.outputs.version }}
MAC: ${{ needs.build-mac.result }}
WIN: ${{ needs.build-win.result }}
PUB: ${{ needs.publish.result }}
RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
run: |
set -e
REPO="${{ github.repository }}"
line() {
case "$2" in
success) echo "- $1:✅ 成功" ;;
skipped) echo "- $1:⏭ 跳过" ;;
cancelled) echo "- $1:⛔ 已取消" ;;
*) echo "- $1:❌ 失败" ;;
esac
}
if [ "$PUB" = "success" ]; then
HEADLINE="✅ **已发布 \`${VER}\`**"
elif [ "$MAC" = "success" ] || [ "$WIN" = "success" ]; then
HEADLINE="⚠️ **编译完成但未发布 \`${VER}\`**(需要两个平台都成功才会发 Release)"
else
HEADLINE="❌ **\`${VER}\` 编译失败**"
fi
{
echo "$HEADLINE"
echo
line "macOS" "$MAC"
line "Windows" "$WIN"
line "发布" "$PUB"
echo
if [ "$PUB" = "success" ]; then
echo "- Release:https://github.com/${REPO}/releases/tag/${VER}"
else
echo "- 日志:${RUN_URL}"
fi
} > result.md
gh issue comment "$ISSUE" --body-file result.md
+144
View File
@@ -0,0 +1,144 @@
name: nightly-prerelease
# 每晚 21:00(亚洲/上海)自动编译 macOS + Windows 并发布 nightly 预发布。
# 21:00 UTC+8 == 13:00 UTC。
# 注意:夜间构建发的是 `nightly`;`@build-bot` 手动触发的发 `ip-prerelease`。
on:
schedule:
- cron: '0 13 * * *'
workflow_dispatch:
concurrency:
group: release-nightly
cancel-in-progress: false
permissions:
contents: write
env:
TZ: Asia/Shanghai
NIGHTLY_TAG: nightly
DOTNET_VERSION: '8.0.x'
FLUTTER_VERSION: '3.24.5'
jobs:
meta:
runs-on: ubuntu-latest
outputs:
version: ${{ steps.ver.outputs.version }}
stamp: ${{ steps.ver.outputs.stamp }}
steps:
- uses: actions/checkout@v4
- id: ver
name: 读取版本号
run: |
VERSION=$(sed -n 's:.*<Version>\(.*\)</Version>.*:\1:p' Directory.Build.props | head -1)
[ -n "$VERSION" ] || VERSION=1.0.0
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
echo "stamp=$(date +%Y%m%d-%H%M)" >> "$GITHUB_OUTPUT"
echo "版本 $VERSION"
build-mac:
needs: meta
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: stable
cache: true
- name: 编译 macOS
env:
GC_TARGETS: mac
GC_NO_PROGRESS: '1'
run: ./build.sh build --targets=mac
- uses: actions/upload-artifact@v4
with:
name: mac-zip
path: dist/mac-arm64/*.zip
if-no-files-found: error
retention-days: 3
build-win:
needs: meta
runs-on: windows-latest
defaults:
run:
shell: pwsh
steps:
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: stable
cache: true
- name: 编译 Windows(amd64 + arm64)
run: ./build.ps1 build
- uses: actions/upload-artifact@v4
with:
name: win-zip
path: |
dist/win-amd64/*.zip
dist/win-arm64/*.zip
if-no-files-found: error
retention-days: 3
publish:
needs: [meta, build-mac, build-win]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
path: artifacts
- name: 汇总产物
run: |
mkdir -p out
find artifacts -name '*.zip' -exec cp {} out/ \;
ls -lh out
- name: 发布 nightly
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VERSION: ${{ needs.meta.outputs.version }}
STAMP: ${{ needs.meta.outputs.stamp }}
TAG: ${{ env.NIGHTLY_TAG }}
run: |
set -e
cat > notes.md <<EOF
每夜自动构建(${STAMP},Asia/Shanghai)。
基于提交 \`${GITHUB_SHA:0:7}\`,版本号 ${VERSION}。
- macOS(arm64)
- Windows(amd64 / arm64)
> 预发布版本:仅供测试,不保证稳定。
EOF
# 同一 tag 滚动更新:先删旧 release 与 tag,再按当前提交重建
gh release delete "$TAG" --yes --cleanup-tag 2>/dev/null || true
gh release create "$TAG" out/*.zip \
--prerelease \
--target "$GITHUB_SHA" \
--title "Nightly ${VERSION} (${STAMP})" \
--notes-file notes.md
+207
View File
@@ -0,0 +1,207 @@
name: pr-review
# PR 发起 / 有新提交时自动审查:
# 1) 是否能编译(.NET 全解决方案 + Flutter 静态分析)
# 2) 是否有编译错误 / 分析错误
# 3) 与目标分支是否有冲突
# 4) 是否落后目标分支提交
# 结果写进一条评论,重复运行只更新不刷屏。
on:
pull_request:
types: [opened, synchronize, reopened]
branches: [main]
concurrency:
group: pr-review-${{ github.event.pull_request.number }}
cancel-in-progress: true
permissions:
contents: read
pull-requests: write
issues: write
env:
DOTNET_VERSION: '8.0.x'
FLUTTER_VERSION: '3.24.5'
MARKER: '<!-- gc-pr-review -->'
jobs:
review:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: stable
cache: true
- id: branch
name: 检查冲突与落后提交
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PR: ${{ github.event.pull_request.number }}
BASE_REF: ${{ github.base_ref }}
run: |
set -e
BASE="origin/${BASE_REF}"
git fetch --no-tags origin "$BASE_REF" >/dev/null 2>&1 || true
BEHIND=$(git rev-list --count "HEAD..${BASE}" 2>/dev/null || echo 0)
AHEAD=$(git rev-list --count "${BASE}..HEAD" 2>/dev/null || echo 0)
echo "behind=$BEHIND" >> "$GITHUB_OUTPUT"
echo "ahead=$AHEAD" >> "$GITHUB_OUTPUT"
# GitHub 的 mergeable 字段是异步计算的,前几次可能为 null,重试几次
MERGEABLE="null"
STATE="unknown"
for i in 1 2 3 4 5 6 7 8; do
read -r MERGEABLE STATE <<< "$(gh api "repos/${{ github.repository }}/pulls/${PR}" \
--jq '"\(.mergeable | tostring) \(.mergeable_state // "unknown")"' 2>/dev/null || echo 'null unknown')"
# mergeable 只有 true / false 才是算完的结果,null 说明还在算
if [ "$MERGEABLE" = "true" ] || [ "$MERGEABLE" = "false" ]; then break; fi
sleep 4
done
# 注意语义:mergeable=true 表示「可以合并」,false 才是冲突
case "$MERGEABLE" in
true) echo "conflict=ok" >> "$GITHUB_OUTPUT" ;;
false) echo "conflict=conflict" >> "$GITHUB_OUTPUT" ;;
*) echo "conflict=unknown" >> "$GITHUB_OUTPUT" ;;
esac
echo "merge_state=$STATE" >> "$GITHUB_OUTPUT"
- id: dotnet
name: 编译 .NET
continue-on-error: true
run: |
set -o pipefail
dotnet restore GC.sln > "$GITHUB_WORKSPACE/dotnet-restore.log" 2>&1
dotnet build GC.sln -c Release --no-restore 2>&1 \
| tee "$GITHUB_WORKSPACE/dotnet-build.log"
exit ${PIPESTATUS[0]}
- id: flutter
name: Flutter 静态分析
continue-on-error: true
working-directory: GC-UI/frontend
run: |
set -o pipefail
# 日志统一写到仓库根目录:后面的汇总步骤在根目录读,路径必须一致
flutter pub get 2>&1 | tee "$GITHUB_WORKSPACE/flutter-pubget.log"
# 仓库里已有历史 warning / info,不应该让它们卡住合并;
# 只把真正的 error 当失败。
flutter analyze --no-fatal-infos --no-fatal-warnings 2>&1 \
| tee "$GITHUB_WORKSPACE/flutter-analyze.log"
exit ${PIPESTATUS[0]}
- id: summary
name: 生成审查结论
if: always()
env:
DOTNET_OUTCOME: ${{ steps.dotnet.outcome }}
FLUTTER_OUTCOME: ${{ steps.flutter.outcome }}
CONFLICT: ${{ steps.branch.outputs.conflict }}
BEHIND: ${{ steps.branch.outputs.behind }}
AHEAD: ${{ steps.branch.outputs.ahead }}
PR: ${{ github.event.pull_request.number }}
run: |
set -e
bad=0
# 静态分析结果分「错误」和「警告/提示」:只有错误才算不通过
FE=$(grep -cE '^ *error •' flutter-analyze.log 2>/dev/null || true); FE=${FE:-0}
FW=$(grep -cE '^ *(warning|info) •' flutter-analyze.log 2>/dev/null || true); FW=${FW:-0}
case "$DOTNET_OUTCOME" in
success) DOTNET_LINE="✅ .NET 编译通过" ;;
*) DOTNET_LINE="❌ .NET 编译失败"; bad=1 ;;
esac
case "$FLUTTER_OUTCOME" in
success)
if [ "$FW" -gt 0 ]; then
FLUTTER_LINE="✅ 无错误(另有 ${FW} 条历史 warning/info,未阻断)"
else
FLUTTER_LINE="✅ 无错误"
fi ;;
*) FLUTTER_LINE="❌ 有 ${FE} 个 error"; bad=1 ;;
esac
case "$CONFLICT" in
ok) CONFLICT_LINE="✅ 与目标分支无冲突" ;;
conflict) CONFLICT_LINE="❌ 与目标分支存在冲突,需要先解决"; bad=1 ;;
*) CONFLICT_LINE="⚠️ 冲突状态暂时无法判断(稍后重跑)" ;;
esac
if [ "${BEHIND:-0}" -gt 0 ] 2>/dev/null; then
BEHIND_LINE="⚠️ 落后目标分支 **${BEHIND}** 个提交,建议先 rebase / merge"
else
BEHIND_LINE="✅ 已包含目标分支最新提交"
fi
if [ "$bad" = 0 ]; then
HEAD="## ✅ PR 自动审查通过"
else
HEAD="## ❌ PR 自动审查未通过"
fi
{
echo "$HEAD"
echo
echo "| 检查项 | 结果 |"
echo "| --- | --- |"
echo "| 能否编译 | $DOTNET_LINE |"
echo "| 代码检查 | $FLUTTER_LINE |"
echo "| 合并冲突 | $CONFLICT_LINE |"
echo "| 分支同步 | $BEHIND_LINE |"
echo
echo "本次提交领先目标分支 ${AHEAD:-0} 个提交。"
echo
echo "<details><summary>详细日志</summary>"
echo
echo '```'
echo "== dotnet build(尾部 40 行)=="
tail -40 dotnet-build.log 2>/dev/null || echo "(日志缺失:编译步骤可能未执行)"
echo
echo "== flutter analyze(尾部 40 行)=="
if [ -f flutter-analyze.log ]; then
tail -40 flutter-analyze.log
elif [ -f flutter-pubget.log ]; then
echo "(analyze 未产生日志,pub get 输出如下)"
tail -20 flutter-pubget.log
else
echo "(日志缺失:Flutter 步骤可能未执行)"
fi
echo '```'
echo
echo "</details>"
echo
echo "_由 PR 自动审查生成;推送新提交后会更新本条评论。_"
echo
echo "$MARKER"
} > body.md
- name: 写入 / 更新 PR 评论
if: always()
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PR: ${{ github.event.pull_request.number }}
run: |
set -e
[ -f body.md ] || exit 0
CID=$(gh api "repos/${{ github.repository }}/issues/${PR}/comments" --paginate \
--jq ".[] | select(.body | contains(\"$MARKER\")) | .id" | head -1 || true)
if [ -n "$CID" ]; then
gh api -X PATCH "repos/${{ github.repository }}/issues/comments/${CID}" \
-F body=@body.md >/dev/null
else
gh api -X POST "repos/${{ github.repository }}/issues/${PR}/comments" \
-F body=@body.md >/dev/null
fi
+17
View File
@@ -51,3 +51,20 @@ GC-UI/frontend/**/DebugProfile.entitlements.bak
GC-UI/frontend/**/*.iml GC-UI/frontend/**/*.iml
GC-UI/frontend/test/shots/ GC-UI/frontend/test/shots/
# GC.Tests 离屏渲染输出(dotnet run ... GC.Tests 默认写到仓库根 screenshots/)
screenshots/
# 构建/发布临时文件(禁止入库)
decrypt.js
script_*.js
*.mp4
courseware/
.GC/UI/frontend/courseware/assets/*.png
.workbuddy/
# 课程离线课件的单文件产物(79MB,由构建生成,不入库)
等高线.html
# 工具链临时备份
buildsh/cross/*.cmake.bak
+122
View File
@@ -0,0 +1,122 @@
# 2026-11-19 工作日志
## GC 项目 Flutter 1.1.1 编译环境配置
### 项目结构关键发现
- 仓库有两个远程:`origin`(Avalonia 版,分支 `main`)和 `origin2`(**Flutter 版**,分支 `origin2/main`,tag `1.1.1`)。
- 用户口中的"C#+Flutter 项目"指 **origin2/main**:`GC-UI/` 是前后端分离实现——Flutter 前端(`GC-UI/frontend/`)+ .NET 8 后端(`GC-UI/backend/GC.UI.Server/`)。模型窗口仍由后端用 Avalonia 承载(契约不可变)。
- 当前 `main` 分支是纯 Avalonia 版,无 Flutter 代码。最初误判"没有 Flutter",实际在另一远程分支。
### 分支操作
- 原 `main` 有未提交改动(8 个文件,version.json 从 1.0.7 手改成 1.1.1),已 stash 到 `stash@{0}`(message: `backup-before-flutter-switch-20261119`)。
- 已新建本地分支 `flutter-1.1.1` 跟踪 `origin2/main`,HEAD 在 tag `1.1.1`(commit 3c74eff)。
### Flutter 环境(已完成)
- 工程锁定 Flutter **3.24.5**(Dart 3.5.4),依据是 `GC-UI/frontend/.metadata` 的 revision `dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668`,与官方 release hash 一致。
- SDK 安装在 `/Users/lixi/development/flutter`,zip 校验 sha256 `ca9624a6de7a1a8962f2f0a3e2a57b16434ca34f1137b8d9dc68c5ca1f187133`。
- 国内镜像(快 100 倍,8MB/s):`FLUTTER_STORAGE_BASE_URL=https://storage.flutter-io.cn`、`PUB_HOSTED_URL=https://pub.flutter-io.cn`。
- 已把 PATH 和两个镜像变量写入 `~/.zshrc`。
- `flutter pub get` 成功,`flutter analyze` 零问题(代码本身健康)。
- 注意:Flutter 构建命令需在无沙箱模式下运行(需写 SDK 缓存目录 `.pub-preload-cache`)。
### 编译阻塞(待用户处理)
- 目标 macOS 版,但本机**只有 Command Line Tools,无完整 Xcode**(`xcodebuild` 不存在)。
- `flutter build macos --release` 实测报错 exit 72:`xcrun: error: unable to find utility "xcodebuild"`。
- App Store 无 Apple ID 登录态(MobileMeAccounts / 钥匙串均无凭据),命令行无法无人值守安装 Xcode。
- 用户选择:**自己手动在 App Store 登录并安装 Xcode**,装完后再继续 `flutter build macos`。
- 备选方案(用户未选):本机可用 `buildsh/cross/build-ui-win-cross.sh` 走 mingw-w64 + wine 交叉编译 Windows 版(需 `brew install mingw-w64 cmake ninja` + `brew install --cask wine-stable`),Rosetta 2 已安装。
### 编译完成(Xcode 27.2 装好后)
用户手动装好 Xcode 27.2(`/Applications/Xcode.app`,xcode-select 已指向)。编译过程连破 3 个新 Xcode 兼容问题:
1. **部署目标过低**:`macos/Runner.xcodeproj/project.pbxproj` 三处 `MACOSX_DEPLOYMENT_TARGET = 10.14` → 改为 `12.0`(Xcode 27 最低支持 12.0)。这是对工程文件的持久化改动。
2. **lipo -verify_arch 参数解析变更**:Flutter 3.24.5 的 `packages/flutter_tools/lib/src/build_system/targets/macos.dart` 一次性传多个架构给 `-verify_arch`,Xcode 27 的 lipo 报 "requires exactly one input file"。改为逐个架构分别验证。改后需删 `bin/cache/flutter_tools.stamp` 强制重建 snapshot 才生效。
3. **假符号链接**:解压 Flutter SDK 时沙箱把 `.framework` 里的符号链接写成文本文件路径(内容是 `Versions/Current/...`),导致 SwiftPM 报 `Unable to resolve module 'FlutterMacOS'`。按「先 Versions/Current→A,再顶层 4 个链接」顺序修复,共 19 个(SDK artifacts 15 + build 目录 4)。修复脚本思路见 `/tmp/fix2.sh`(临时)。
**产物**:`GC-UI/frontend/build/macos/Build/Products/Release/GC-UI.app`(38MB,版本 1.1.1,universal x86_64+arm64,adhoc 签名,bundle id com.morris.gc.gcUi)。
交付 zip:`dist/GC-UI-1.1.1-mac-universal.zip`(16MB,sha256 `55f40c146e86cfed3adc1f02a72ab89944dd81ba8e9c8ba6cf929f7061573db5`)。
注意:这是 Flutter 前端外壳,需 .NET 后端(GC.UI.Server / GC-BOOT 进程内托管)配合才能完整工作。完整发布包 `GC.app` 需走 `build.sh build`,但该流程强制走 Windows 交叉编译(wine/mingw,本机装不了,Homebrew 被沙箱拦截),故未跑完整发布。
### "打开即连好"完整发布包(用户反馈单独 GC-UI.app 报"无法连接后端")
根因:Flutter 前端不含后端,靠 `GC_UI_PORT` 环境变量 / `.GC/ui-backend.json` 发现后端。正统入口是 `GC-BOOT`(产物 `GC`):`FlutterShell.TryRun` 在进程内起后端 → 选端口 → 拉起 `GC-UI.app/Contents/MacOS/GC-UI` 并传入 `GC_UI_PORT` → 前端自动连上。单独双击 GC-UI.app 必然连不上。
手动只构建 macOS 完整包(绕开装不了的 wine/mingw):
1. `dotnet publish GC-BOOT/GC-BOOT.csproj -c Release -r osx-arm64 --self-contained -p:... -o dist/mac-arm64`(GC-BOOT.csproj 已把后端作库引用,`FrameworkReference Microsoft.AspNetCore.App`,一个 exe 够用)
2. 同样 publish `GC-SAVEDOG`(裁剪)
3. 复制 GC-UI.app 到 dist/mac-arm64
4. 组装 GC.app:Info.plist(版本 1.1.1)+ Contents/MacOS 放 GC/GC.UI.Server.runtimeconfig.json/GC-UI.app,SAVEDOG 收进 `.GC/bin`,iconutil 从 icon-1024.png 生成 AppIcon.icns
5. `ditto -c -k --sequesterRsrc --keepParent` 打包
**验证通过**:`open GC.app` 后用 curl 查 `http://127.0.0.1:17890/api/health` 返回 `{"ok":true,"version":"1.1.1","platform":"osx-arm64"}`;frontend 进程 GC-UI 在跑;models/settings/about API 全部正常。测试完已 pkill 并清掉 .GC 运行数据。
最终交付:`dist/mac-arm64/GC-1.1.1-mac-arm64.zip`(72MB,sha256 `3bb4101fee9588b1a3b73dcf2e65bc081b83220e5fbbe18a433ee2af8ccfb5e3`),解压得 GC.app,双击即自动连好后端。旧的 `dist/GC-UI-1.1.1-mac-universal.zip` 只是纯前端,已被取代。
注意:dotnet publish 的 `-o dist/mac-arm64` 不会清旧文件;`rm -rf dist/mac-arm64` 会触发批量删除保护(156 文件)。发布包数据目录落在 dist/mac-arm64/.GC(AppPaths 回退逻辑),启动器日志里 SAVEDOG 显示"未找到"是因为它找的是同级而非 .GC/bin,不影响主流程。
### 真正根因:App Sandbox 缺 network.client(用户第二次反馈仍连不上)
上面的"验证通过"是**假阳性**:只 curl 了后端(后端在沙箱外,当然正常),从没让前端真发请求。前端报"无法连接后端(baseUrl)"是 api_client.dart:428 的 ApiException。
真因:`GC-UI/frontend/macos/Runner/Release.entitlements` 只开了 `com.apple.security.app-sandbox=true`,**没有 `com.apple.security.network.client`**。沙箱内进程向 127.0.0.1:17890 发起出站 HTTP 会被内核拒绝(EPERM),所以发布版前端连不上;DebugProfile.entitlements 有 network.server 所以开发时正常,掩盖了问题。用 `codesign -d --entitlements :- GC-UI.app` 可确认签名里只有 app-sandbox。
修复:给 Release.entitlements 加 `network.client` + `network.server` → 重新 `flutter build macos --release`(新签名自动嵌入)→ 替换 GC.app 内 GC-UI.app → 重打包。
**这次验证到位**:`open GC.app` 后 `lsof -nP -a -p <前端PID> -iTCP` 显示 `GC-UI ... TCP 127.0.0.1:60082->127.0.0.1:17890 (ESTABLISHED)`——前端真连上了。这才是"打开即连好"的硬证据。
最终交付覆盖更新:`dist/mac-arm64/GC-1.1.1-mac-arm64.zip`(72MB,sha256 `2b0f4c25ce4e52edf18a45ceb2fe2f91612757db5589f346ffd984665cab5172`),包内前端签名已含 network.client/server。
教训:验证桌面端"连后端"必须看**前端进程的网络连接**(lsof),不能只 curl 后端。无 GUI 会话时 screencapture/AppleScript 不可用。
### 恢复用户改动
回到 `main` 后执行 `git stash pop` 恢复 `stash@{0}` 的 8 个文件改动。
当前 checkout 分支:`flutter-1.1.1`(跟踪 origin2/main,tag 1.1.1)。
### 提交 PR 到 xhmcl(Gitea 28.1.0,git.xhmcl.com/Morris/GC)
分支 `fix/macos-release-sandbox-network`(commit 3efdf74),**只含本次修复两文件**:`Release.entitlements`、`project.pbxproj`。
严格排除了干扰项:`model/contour-map/*`(他人地貌改动)、`pubspec.lock`(配国内镜像 pub get 的副作用,不能提交)、未跟踪的 mp4/js/html 等。
PR #28:https://git.xhmcl.com/Morris/GC/pulls/28 (base main,state open,mergeable=true,+7/−3,2 files)。
**凭据/接口要点(踩坑记录)**:
- 该实例 git 协议与 API 认证分离。`gdt_...` 是 git 凭据(当密码用可 push),但调 API 全部 401(Authorization: token/Bearer、X-Token、PRIVATE-TOKEN、query 都试过)。
- 建 PR 必须用**账号登录密码**做 basic auth:`curl -u 'Morris:<密码>' -X POST .../api/v1/repos/Morris/GC/pulls -d @body.json`,返回 201。
- push 时若报 "unable to get credential storage lock: File exists",用 `git -c credential.helper= push` + `GIT_ASKPASS` 脚本绕过;其实首次已推成功,是误报。
- 临时凭据文件(netrc/askpass/pr.json)用完即删,不落盘留存。
- 注意:本机无图形会话时 screencapture/AppleScript 不可用;验证"前端连后端"必须用 `lsof -nP -a -p <PID> -iTCP` 看 ESTABLISHED。
### 模型无法启动 + 后端崩溃(PR #29)
**根因**:macOS 的 AppKit 要求 NSApplication 在**主线程**。Flutter 模式下 `FlutterShell` 用 `ui.WaitForExit()` 占住主线程,而 `AvaloniaHost` 在 `new Thread(...)` 副线程里跑 `StartWithClassicDesktopLifetime`。点「启动模型」时模型窗口在副线程触碰 AppKit → 进程级崩溃,后端随之消失(表现为"无法启动模型"+"后端容易崩溃")。纯 Avalonia 版不受影响,只在 Flutter 打包模式暴露。
**修复**(4 文件,+114/−51):
- `AvaloniaHost`:新增 `RunOnCurrentThread()`/`Shutdown()`,`EnsureStartedAsync()` 改为只等 `_ready`,不再自建线程。
- `BackendServer.Start(args, port, out AvaloniaHost)` 重载(out 参数不能在 lambda 里用,内部用局部 `host`)。
- `FlutterShell`:前端拉起后在主线程跑 Avalonia 事件循环,`ui.Exited` 时后台 `Shutdown()`;Avalonia 不可用时退化 `WaitForExit()`。
- `Program.cs`:`app.StartAsync()` 后主线程跑 Avalonia,失败则 `WaitForShutdown()`(需 `using Microsoft.Extensions.Hosting`)。
**验证**:`/api/health` → `uiAvailable:true`;前端 `ESTABLISHED →17890`;`POST launch` → `HTTP 200 {"ok":true,"message":"已启动模型 contour-map"}`;启动后后端存活。
**交付**:`dist/mac-arm64/GC-1.1.1-mac-arm64.zip`(72MB,sha256 `4b3978eab5cb8fba4e97a3a623cb532080b9e0e24dd6f3e28e69440966c510bb`)。
PR #29:https://git.xhmcl.com/Morris/GC/pulls/29
**坑**:`dist/mac-arm64/GC.app` 在清理 `.GC` 时被误删过;可从 `/tmp/gc-fresh-test/GC.app` 取 `GC-SAVEDOG` 与结构,配合 `/tmp/gc-new/GC`(publish 产物)+ build 目录新前端重建。组装脚本见上面的"打开即连好完整发布包"步骤。
## contour-map 模型重写(对照加密 HTML 课件移植)
**背景**:用户提供的 `~/Downloads/等高线及地形部位演示.html`(79MB)是授权壳 + AES-256-GCM + gzip 的课件,内含 Three.js 版五大地貌演示。已在本地用 node 复现解密(key = 两数组异或,AAD `QLAB|contour-landform-reading|...`),还原出 83MB 内部课件;其内容为「10 张内嵌 PNG + 切割视频 + 标注层」,并非可交互 3D。按用户要求改为在 `model/contour-map` 用 C#/Avalonia 重写。
**改动文件**(均在 `model/contour-map/src/`):
- `TerrainField.cs`:新增 `LandformKind`(Peak/Ridge/Valley/Saddle/Cliff)与五个高度场生成器。要点是地形要**宽阔**(穹状山体、宽脊、V 形谷、双峰垭口、台地陡崖),半径过小会变成“尖锥/薄墙”。
- `ContourView.cs`:重写为可交互 3D(拖动旋转、滚轮缩放),四步实验(切割/成线/投影/判坡),俯视/立体切换,自动取景 `UpdateCamera`(按包围盒八点投影铺满画布),法线光照,裙边侧壁,分层设色在 3D 用 `ColorForHeightSmooth` 平滑过渡、俯视仍用硬分档。
- `ContourPage.cs`:地貌标签移到画布上方(WrapPanel,窄屏自动换行);右侧栏 344px,<980px 自动隐藏;四步流程/观察面板/判读要点;底部播放、重置、视图切换、上色、实时读数;空格与 1–5 快捷键;全屏。
- `DefaultTexts.cs`:90 个键,中英各一套。
- `ContourMapRuntime.cs`:`LoadTexts` 改为「内置默认 + i18n/*.json 覆盖」,之前完全忽略语言包。
- 清单 `contour-map.json` 版本 1.1 → 1.2;`help.json` 同步新交互。
**修掉的真实 Bug**:
1. `ExtractContour` 的 `Chain()` 只向尾部延伸,一条等高线被切成大量短链 → 3D 里显示成**虚线等高线**。改为端点索引 + 双向延伸后,每层只剩 1 条 300+ 点的完整曲线。
2. `SlopeAt` 固定除以 450,导致山体坡度全饱和为 1(整片红),“疏密判坡”失效。改为按 `span*2.6` 自适应归一化。
3. 切割步骤原本只是叠一张半透明板,山尖仍在。改为把高度场压到切面 `min(h, lv)`,得到真实截面,并用 `ExtractContour(lv)` 精确求交线。
4. 切割时山峰标注悬在切面上方 → 高于切面的山峰不再标注。
**性能**:62×62 面片 + 画刷颜色缓存,1440×900 离屏单帧约 35ms(≈28fps),可接受。
**验证**:`dotnet build` 0 警告 0 错误;`dotnet run --project model/_engine/PreviewGen` 全模型离屏渲染通过并生成封面;自建 `/tmp/ccheck` 全尺寸渲染器逐状态出图核对(默认/俯视/五地貌/四步/中间帧)。
**交付**:PR #30 https://git.xhmcl.com/Morris/GC/pulls/30(`feat/contour-map-rewrite` → `main`,12 文件 +1903/-600,基于最新 main 单提交)。提交 PR 时注意:本地 `flutter-1.1.1` 落后 origin2/main 4 个提交,需先 stash 改动、从 `origin2/main` 建分支再 pop,否则 PR 会带上 48 个无关提交;gitcode(origin) 的 main 更旧且仍是 `NeoRF.*` 命名空间,不宜作为 PR 目标。推送用 `GIT_ASKPASS` 临时脚本传凭据,用完即删,不写 remote URL。
+330
View File
@@ -0,0 +1,330 @@
# 2026-11-21 工作日志
## 把加密 HTML 课件搬进 Flutter 前端(WebView 渲染)
**需求转变**:之前用 C# 重写 contour-map 模型,用户反馈"不够还原",改为直接把原课件搬进 Flutter,用 WebView 原样渲染(100% 还原),去验证 + 优化。
**去验证 / 拆资源**(产物在 `GC-UI/frontend/courseware/`):
- 原始 `~/Downloads/等高线及地形部位演示.html`(79MB)是授权壳(AES-GCM+gzip);解密后 83MB 单文件。
- 写出拆分脚本:CSS、视频、背景图、3 段 JS 抽成独立文件;app.js 里 10 张 data:image/png 抽成 `peak/ridge/valley/saddle/cliff-{3d,top}.png` 并改为相对路径。
- 生成纯净 index.html:去掉 QLAB 注释、零宽水印 span、授权声明 div+style;CSP 放宽为允许 self/data/blob(否则 WebView 加载不了本地资源)。
- 优化:11 张 PNG(全是不透明 RGB)用 sips 转 JPEG(q88),83MB → 27MB(HTML 本体 20KB);视频 17MB 保留原样(核心内容不劣化,且本机无 ffmpeg)。
- 验证无残留:0 个 base64 / QLAB / 授权声明;JS 引用的 42 个 DOM id 全部存在;16 个资源引用无缺失。
**Flutter 接入**:
- 依赖 `flutter_inappwebview: 6.1.5`(兼容 Flutter 3.24.5 / Dart 3.5.4;桌面 Win/mac/Linux 都支持;6.2-beta 要 Flutter 3.32 故不用)。
- 新增 `lib/pages/courseware.dart`:Dart 自带 `HttpServer.bind(loopbackIPv4, 0)` 静态服务器(端口自动分配、含 HTTP Range 支持供视频拖动、路径规范化防越界),把课件 assets 用 `AssetManifest.loadFromAssetBundle(rootBundle)` 解压到系统临时目录再提供给 WebView。
- **坑1**:`InAppLocalhostServer` 的 `port` 是 final,`port=0` 不会回写实际端口 → 弃用,改用 Dart 自带 HttpServer。
- **坑2**:打包后工作目录不固定,不能用相对路径读 assets → 必须解压到临时目录。
- **坑3**:AssetManifest 里的 key 是 `courseware/xxx`(不是 `assets/courseware/xxx`)→ 用 `flutter build bundle --asset-dir /tmp/xx` 检查实际 key。
- `shell.dart`:导航项插在 index=1(主页之后),_buildPage case 顺延;home.dart 的 `goTo(1)/(2)` 改为 `goTo(2)/(3)`;**课件页在 `_content` 里放到 backendReady 检查之前**(纯前端不依赖后端)。
- i18n 加 `nav.courseware`(等高线课件 / Contour Course);macOS Debug entitlements 补 `network.client`。
- pubspec assets 声明 `courseware/` + `courseware/assets/`。
**验证**:`flutter analyze` 零问题;`flutter build macos --debug` 成功;实际启动 app(临时把 `index=1` 后编译)截图确认 WebView 完整渲染出课件(标题、四步流程、地貌标签、播放按钮)——之后已恢复 `index=0` 并重编最终版。
**环境坑(本机 macOS)**:
- 系统 Ruby 2.6 装不了 CocoaPods(需 Ruby≥3)→ `brew install cocoapods`(brew 自带 Ruby 4)。
- brew auto-update 卡住 → `HOMEBREW_NO_AUTO_UPDATE=1`。
- CocoaPods CDN 走代理 SSL 证书校验失败 → `pod repo add trunk-git https://github.com/CocoaPods/Specs.git` + `GIT_SSL_NO_VERIFY=true`;完整 specs 约 3.4GB,clone 超时后目录保留,手动 `git checkout -f master` 完成展开,再 `pod install` 成功。
- GUI 自动化:System Events 的点击/置前被权限拒绝(-10004),但 `tell application "GC-UI" to activate` 可用;验证 GUI 靠 activate + screencapture。
## 提交 PR
- PR #30(C# 3D 模型重写)已合入 `main`(合并提交 `4ef2915`)。
- 从最新 `origin2/main` 新建独立分支 `feat/flutter-courseware`,只提交 Flutter 课件方案(30 文件,含 17MB 视频与 10 张 JPEG),与工作区里那批无关的 C# 安全改动隔离。
- 提交 `355ca89`;已推送到 `origin2` 并通过 Gitea API 创建 **PR #32**:https://git.xhmcl.com/Morris/GC/pulls/32 ,状态 open、mergeable=true。
- PR 草稿说明中注明「C# 重写已在 PR #30 合入 main」,避免与已合入内容混淆。
## 安全修复 PR #33(四类风险)
- 从 fetch 后的最新 `origin2/main`(`1dd3b40`,含 #32 课件)建隔离 worktree `/tmp/gc-security`,分支 `fix/security-hardening`,只应用 7 个安全文件补丁(ModelInstaller / DirectoryRemote / FlutterShell / BackendServer / ApiModels / api_client.dart / DownloadContracts),排除用户工作区里课件/构建副作用;`flutter pub get` 改了 pubspec.lock 已 checkout 还原后 amend。提交 `46ed844`(+305/−34)。
- 验证:dotnet build 0 错误、flutter analyze 0 问题;自建反射测试 32/32(恶意 Id 拒绝 14/14、合法放行 4/4、SafePath 符号链接 5/5、URL 9/9);实机 open GC.app 无/错 token 受保护接口 401、前端 ESTABLISHED→17890。
- 注意:`GC-DOWNLOAD/DirectoryRemote.cs` 验签是「记录 + SignatureTrust 上送,由 UpdateService/LauncherUpdater 统一闸门拒绝」,与 GiteaRemote/GitCodeRemote 设计一致,未在 DirectoryRemote 内直接 return null。
- `--update-test` 19 项失败是**既有测试夹具密钥不匹配**:`.signing/gc-signing.pem` 派生 gc-2026-11 公钥,但测试用 gc-2026-12 硬编码公钥验签,连正常签名清单都判 Invalid;与安全补丁无关(未碰签名文件),篡改相关断言通过。
- push 用邮箱 `chenmoyuan1214@qq.com` + rotated `gdt_` token(askpass)成功;API 建 PR 用登录名 `Morris` + 登录密码(Basic auth)。凭据用完即删。
- **PR #33**:https://git.xhmcl.com/Morris/GC/pulls/33 (base main,open、mergeable=true,7 文件 +305/−34)。
## 15 项优化与 bug 修复(PR 待创建)
- 用户提交 15 项优化/bug 反馈,在隔离 worktree `/tmp/gc-fixes` 分支 `fix/improvements`(tracking origin2/main)上逐一修复。
- 已修改 13 个文件:`+348/-42`。
- 关键修复:
- **#1** DirectoryRemote/GiteaRemote/GitCodeRemote 验签失败时 return null(不再静默传递不可信清单)
- **#2** LauncherUpdater 所有源失败时输出明确错误信息
- **#5** HealthInfo 新增 sessionProof 字段
- **#6** PortScanRange 10→30
- **#7** MemoryBudget 注释澄清 GC 托管内存 vs 物理内存
- **#9** GcLog RetentionDays 14→7
- **#11** SavedogLauncher 检查 Process.Start 返回值
- **#12** FlutterShell.IsHealthy → 异步 IsHealthyAsync,WaitHealthy → WaitHealthyAsync
- **#14** DirectoryRemote Walk 增加 IsIgnoredDir,与远端源一致
- 构建验证:dotnet build 0 错误,flutter analyze 0 问题。
- 已 push 到 `origin2/fix/improvements`,提交 `a407c93`。
- **冲突解决**:PR #33 已将 DirectoryRemote 验签改为"记录日志+上送状态"(不 return null),我们的分支原来改成 return null 与其冲突。rebase 到最新 main(4043ed5)后以 main 改动为基础,仅叠加增量(9 文件 +36/-9),提交 `9cd4fa6`,force push 成功。
- Git 服务器自动创建 **PR #34**:https://git.xhmcl.com/Morris/GC/pulls/34 (open、mergeable=true)
- PR #34 已合并到 main(提交 4043ed5)。
- 基于最新 main 重新推送 `fix/improvements`,创建 **PR #35**:https://git.xhmcl.com/Morris/GC/pulls/35 (open、mergeable=true,9 files +36/-9)
- 交付 zip `dist/mac-arm64/GC-1.1.1-mac-arm64.zip` 仍是 11-19 旧包;`GC.app` 已是安全构建,未重新打包(用户未要求)。
## 补充:1.1.2 编译错误修复(同日 10:20)
用户构建 osx-arm64 报 3 个编译错误,根因与修复:
1. `SharedHttpClientFactory.cs`:`DecompressionMethods` 属于 `System.Net` 命名空间,
原代码误写为 `System.IO.Compression.DecompressionMethods`。改为 `using System.Net`。
(曾误加 System.IO.Compression 4.3.0 NuGet 包,net8.0 上会遮蔽框架类型,已移除)
2. `ModelHost.cs`:`VersionUtil` 定义在 GC-DOWNLOAD,GC.Core 不能反向引用(会循环依赖)。
用 `git mv` 把 `GC-DOWNLOAD/VersionUtil.cs` 移到 `GC/src/Services/VersionUtil.cs`
(namespace GC.Services 不变,GC-DOWNLOAD 通过引用 GC.Core 仍可用)。
连带发现并修复(同一批 1.1.2 半成品重构):
3. `SourceSelector.cs:82`:双语日志 GcLog.Info 调用括号/引号写坏 → 修正
4. `ModelSourceClient.cs`:重构误删 `_paths` 字段+构造函数但代码仍在用 → 恢复
5. `FlutterShell.cs`:缺 `using GC.Services` → 补上
6. 构建脚本 `build_funcs.sh`/`check.sh`/`build-ui-win-cross.sh` 共 4 处 `$VAR(` 全角括号
紧跟变量导致 `set -u` 报 "DEST: unbound variable"(历史遗留 bug)→ 改为 `${VAR}`
编译结果:
- GC-BOOT single-file osx-arm64 + GC-SAVEDOG + Flutter GC-UI.app 全部成功
- 产物:`dist/mac-arm64/GCL-1.1.2-mac-arm64.zip`(99MB,arm64)
- 冒烟测试:`./GC` 后端正常监听 127.0.0.1:17890,版本 1.1.2
备注:build.sh 的清理阶段 `rm -rf dist` 会触发批量删除安全拦截,改为手动调用
publish_rid/build_flutter_ui/package_mac_app 函数完成,未绕过安全机制。
version.json 各平台 sha256/size 仍为空(等 release 上传后统一填),未单独填 macOS。
## 补充:贡献者归并把"远影科技"算入 Morris(10:29)
用户反馈"关于"页开发者列表里"远影科技"(4 次提交)应并入 Morris。
根因:ContributorsService.Aliases 未收录该 git 身份。
查明其身份:name=远影科技 / email=yuanying@yuanying.tech(无 login),
且有一条 Morris 提交共用 yuanying@yuanying.tech 邮箱。
修复:在 Aliases 增加两条映射("远影科技" 和 "yuanying@yuanying.tech" → "Morris")。
用真实 Gitea API 数据模拟归并验证:Morris 45 次(原 41 + 远影科技 4),正确。
已重新编译并打包 macOS 1.1.2(zip sha256 53130e63...4332a)。
## 补充:完整构建"没有出现 .app"问题(10:36)
用户跑完整 `build.sh build` 后没有 .app,贴的日志里有
`error: the following command failed with exit code 0 but produced no further output`
+ 大量 Swift warning(flutter_inappwebview 第三方库的弃用警告)。
澄清:那个 exit code 0 + 最后 `✓ Built GC-UI.app` 说明 Flutter 前端编译成功,是误导性输出。
真正原因:完整脚本在"编译 Windows 前端"步骤失败——flutter-win-cross.log 显示缺 cmake,
脚本 return 1 提前退出,没走到后面的 package_mac_app / pack_launcher 打包步骤。
解决:mac 三个组件都已编好(dist/mac-arm64/ 下 GC + GC-SAVEDOG + GC-UI.app),
手动调用脚本的 package_mac_app + pack_launcher 完成打包。
最终产物:dist/mac-arm64/GCL-1.1.2-mac-arm64.zip(99MB,含全部 122 文件)。
## 环境:为本机安装 Wine(12:25)
需求:在 Apple Silicon macOS 27.3 上安装 Wine。
过程要点(踩坑记录):
- Homebrew 的 wine-stable / wine@staging / wine@devel 三个 cask 全部被禁用
("does not pass the macOS Gatekeeper check",2026-09-01 起),brew 装不了。
- 官方 WineHQ macOS 包仍是 5.0/5.7(2020 年),太旧,不用。
- 采用 gcenx/wine tap 对应 GitHub 的 Gcenx/macOS_Wine_builds:wine-staging 11.21。
- 稳定版 11.0_1 资源下载仅 26 KB/s(brew 卡死 9 分钟的真正原因,非网络故障);
staging 11.21 直连约 78 KB/s,经 ghfast.top 镜像达 1.8 MB/s。
做法:镜像 curl 下载 → 校验 sha256 → 放入 Homebrew 缓存 → 仍不建议依赖 brew。
- 最终手动安装(包内自带 .app):
ditto 到 /Applications/Wine Staging.app → xattr -dr com.apple.quarantine
→ 把 wine/wineserver/wineboot/winecfg/regedit/msiexec/winepath 等软链到 /opt/homebrew/bin
→ WINEDLLOVERRIDES="mscoree,mshtml=" wineboot -u 初始化 ~/.wine(跳过 mono/gecko 弹窗)
结果:wine-11.21 (Staging),x86_64 经 Rosetta 2 运行;`wine cmd /c ver` 返回 Windows 10.0.19045。
体积:/Applications/Wine Staging.app 872MB,~/.wine 338MB。未签名(故被 brew 禁用),已清 quarantine。
## 五项功能改动(13:30)
1. 关于页「重新下载启动器」:新增 POST /api/launcher/redownload(复用 LauncherUpdater.DownloadAsync,
按清单 sha256 逐块校验,缺 sha256 直接拒绝)→ 下载后暂存 .GC/update,重启生效。
api_client._send 增加 timeout 参数(默认 POST 120s 不够下载 100MB)。
2. 下载页提速:源列表 / 任务列表 / 模型索引三个请求改为并发,源列表先渲染,
不再等三轮串行。
3. 模型下载按钮内联进度条:按 JobInfo.modelId 匹配模型,按钮位变成 百分比 + 进度条 + 取消。
4. macOS Dock 双图标:新增 GC-BOOT/MacDock.cs,在「确实要拉起 Flutter 前端」时
把本进程设为 NSApplicationActivationPolicyAccessory(隐藏 Dock);Avalonia 回退分支不受影响。
5. 自绘标题栏:MainFlutterWindow 隐藏系统标题栏(titleVisibility/.hidden、fullSizeContentView、
三个系统按钮隐藏),Flutter 侧 lib/window_chrome.dart 提供 gc/window 通道
(minimize/toggleMaximize/close/isMaximized/beginDrag),shell.dart 顶部挂 GcTitleBar。
坑:NSWindow 没有 unzoom(_:),zoom(_:) 自带切换语义。
## Avalonia 全量移除 + Dock 修复 + 标题栏配色(13:55)
1) Dock 双图标:运行期 setActivationPolicy 不生效,改为打包时给 GC.app 的 Info.plist 加
`LSUIElement=true`(启动器只是后端宿主);MacDock.cs 保留作双保险。实测 plist 已写入、包内无 Avalonia。
2) 移除 Avalonia(彻底):
- 删:GC/src/{App.axaml,App.axaml.cs,Views,ViewModels,Styles,Services/ModelHost.cs,
Services/LauncherUpdateFlow.cs}、GC-BOOT/AvaloniaHost.cs、GC-UI/backend/.../AvaloniaHost.cs、
GC-DRAW、model/_engine/src、model/_engine/PreviewGen、model/_sdk、5 个模型的 src、
GC/src/test/dotnet/GC.Tests(截图工程)
- csproj:GC.Core / GC-BOOT / GC.UI.Server 去掉 Avalonia 包与 ModelSdk 引用
- Localization:avares:// → 嵌入资源(EmbeddedResource GC.Core.Assets.i18n.*)
- 后端:删除 AvaloniaHost、launch 接口改为「客户端内渲染」,health 的 uiAvailable 恒 true
- 模型:新增 lib/models/lookup.dart(后端 id → Flutter 实现)、lib/pages/model_view.dart;
首页「启动模型」→ controller.openModel(id),壳内渲染,不再开窗口
- build_models 简化为只刷清单;check 改为「编译 + 产物」
- 体积:GC 单文件 58MB→44MB,zip 99MB→88MB
3) 标题栏配色:底色 = sideBg 叠 6% accent + 底部 line 描边,跟随主题与强调色。
4) 注意:model/*/*.model/ 里仍有旧的模型 dll(属于模型包内容),运行时不加载,未清理。
## 追加:Dock 三重保险 + 1.1.3(14:20)
用户反馈 Dock 仍是两个。分析:运行时 setActivationPolicy 单独不够,Info.plist LSUIElement 也可能被
LaunchServices 缓存/旧副本干扰。改为三重保险(MacDock.cs + package.sh):
1) Info.plist LSUIElement=true(打包时写入)
2) Carbon TransformProcessType(kProcessTransformToUIElementApplication=4)
3) [NSApp setActivationPolicy:accessory]
启动时打印 "[shell] 启动器以 UIElement 运行" 便于核对。
版本提到 1.1.3(侧栏/关于页可见),并删除旧的 1.1.2 zip 避免误拿。
标题栏底色改为 accent 16% 叠 sideBg,标题文字用 accent。
清理 Directory.Build.props 里已无引用的 AvaloniaVersion。
诊断命令(给用户):osascript -e 'tell application "System Events" to get {name, background only} of every process whose name contains "GC"'
## 修复无法连接后端 + 标题栏配色(14:52)
用户反馈「无法连接后端」。根因:后端写握手文件 `ui-backend.json` 时只写端口没写令牌,
前端在 Finder 直接打开(无环境变量)时就拿不到会话令牌 → 所有 /api 请求 401 → 界面显示「无法连接后端」。
修复:
1) 后端 WriteEndpointFile 把 sessionToken 一并写入
2) 前端 api_client.dart:
- 新增 _readEndpointFile() 从握手文件解析地址+令牌
- defaultBaseUrl 改为依次尝试:define → 环境变量 GC_UI_BASE_URL → GC_UI_PORT → 握手文件 → 兜底
- _sessionToken 改为动态读取(握手文件兜底)
- 新增 rediscover() 方法:后端换端口或握手文件更新时重新解析
- 重试前调用 rediscover() 获取最新地址
3) 设置页提示「令牌已就绪 / 缺少会话令牌」便于诊断
4) 标题栏配色:浅色主题纯白(不再叠强调色),深色主题跟随侧栏底色
同时清理 dist 下残留的 1.1.3 zip,版本号保持 1.1.2。
## 三项改动(16:51)
1. 标题栏颜色:代码已经是 `GcColors.sideBg`(亮色=白色),但用户说没生效——原因是旧构建缓存。
执行 `flutter clean` + 重新构建后打包,应该正常了。
2. 模型回退到 Avalonia:
- home.dart `_launch` 改为调 `api.launchModel(model.id)`(后端接口)
- shell.dart 去掉 activeModel 判断和 ModelViewPage 导入
- 删除 lib/models/lookup.dart、lib/pages/model_view.dart(不再需要)
3. 新增百宝箱页(nav.treasure):
- lib/pages/treasure.dart:今日人品(随机运势文案)+ 幸运颜色 + 幸运数字 + 刷新按钮
- 使用 Random() 生成,每次刷新重新计算
- shell.dart 侧栏添加导航项(Icons.auto_awesome_rounded)
- i18n 中英双语
- 页面路由 case 5
构建:87MB,版本号保持 1.1.2
## Windows 交叉编译问题(17:17)
mingw-w64 14.0.0_3 携带 GCC 16.2,与 Flutter 插件(flutter_inappwebview_windows)不兼容:
- C++20 三路比较(operator<=>)在 EncodableValue 上失败
- mingw 头文件缺少 <cstring> 包含
解决方案:
1. macOS 主机默认只构建 macOS(修改 buildsh/build.sh 的 _want 逻辑)
2. Windows 交叉编译需要在 GCC 13 环境下进行,或改用 Windows CI
已修改:
- buildsh/build.sh: macOS 默认 targets 改为 "mac"
- buildsh/cross/toolchain-mingw.cmake: 添加 C++17 标志和兼容性选项(为将来 GCC 13 准备)
- 临时修复了插件头文件路径问题(复制 .h 文件到 ephemeral 目录)
如需构建 Windows:
- 方法 A:在 Windows 机器上直接 `flutter build windows`
- 方法 B:安装 GCC 13 的 mingw-w64(brew install https://旧版公式 URL)
- 方法 C:设置 CI/CD 流水线在 Windows 上构建
## GitHub 源 + GitHub Actions(19:20)
### 下载源
- `GC/src/Services/SourcePreset.cs`:新增 `GitHub` preset(owner `Morris-morris-cloud`,ApiBase api.github.com,
RawBase raw.githubusercontent.com,RawStyle=`raw`);`All = { Xhmcl, GitHub }`;`Detect` 识别 github.com / 源名。
- `GC-DOWNLOAD/SourceSelector.cs`:单源探测超时改 **2 秒**(ProbeTimeout),CreateRemote 增加 `"github" => GiteaRemote`。
- `GC-DOWNLOAD/GiteaRemote.cs`:新增 `ContentsUrl()`(GitHub 需 `?ref=branch`)与 `ReleasesUrl()`(GitHub 需 `per_page=100`),
删掉不再使用的 `RepoRepoContentsUrl`。GitHub 的 contents/releases API 与 Gitea 同构,复用同一实现。
- 验证:GitHub raw/api 四个端点均 200;仓库目前 0 个 Release(代码已容错,退回仓库清单)。
### CI
- `.github/workflows/nightly-prerelease.yml`:cron `0 13 * * *`(=21:00 Asia/Shanghai),mac+win 两地并行编译,
产物滚动发布到 tag `ip-prerelease`(prerelease=true)。
- `.github/workflows/build-bot.yml`:issue_comment 触发,`@build-bot build mac|win-amd|win-arm|all`,
仅 OWNER/MEMBER/COLLABORATOR 生效;PR 编 head sha,Issue 编 main;用 `gh release upload --clobber` 合并资产。
- `.github/workflows/pr-review.yml`:PR 打开/推送时查 dotnet 编译、flutter analyze、mergeable 冲突、落后 main 提交数,
汇总成带 `<!-- gc-pr-review -->` 标记的单条评论(重复运行只更新)。
- `.github/CI.md`:三套流水线用法与前置设置说明。
- `buildsh/lib/flutter.sh`:新增 `GC_NO_CODESIGN=1` → macOS 加 `--no-codesign`(CI 无签名证书)。
### 其他
- 修了 Windows 交叉编译的「双层 cpp_client_wrapper 嵌套」:flutter-cpp-client-wrapper.zip 自带一层目录,
fetch_engine 的 dest 应到 `windows-x64`;引擎缓存与 ephemeral 里的双层目录已手工拉平。
### 修正(19:17)
- 夜间构建 tag 改为 **`nightly`**(concurrency 组 `release-nightly`);
`@build-bot` 手动触发仍是 **`ip-prerelease`**(组 `release-ip-prerelease`)。两个 tag 互不覆盖。
## 用户系统重做(20:30)
分支 `feat/user-system`,提交 ecb71ad。GitHub 直接推 main,XHGit 开 PR #39。
### 存储
- `.GC/user/<用户名>/pw.yaml`:username / pw_hash(sha512+salt) / points / last_sign_in / consecutive_days / theme_color / theme_paid / theme_paid_at
- `.GC/user/user.yaml`:username + session_token,后端启动自动登录(前端不需要自己找 .GC)
- 旧 `.GC/user/<用户名>.yaml` 启动时自动迁移
### 关键实现
- 验证码:`_captchas` 内存字典,算术题 5 分钟、一次性(TryRemove)
- 签到奖励:1-6:10 / 7:30 / 8-13:15 / 14:40 / 15-20:20 / 21:50 / 22-27:25 / 28:60 / 29:40 / 30:100
- 主题色:ThemeCost() 服务端算价(默认蓝 0 / 预置 50 / 其它 150);1 小时内换色退 floor(theme_paid*0.8)
- 前端:GcPalette.apply('#hex') 应用用户主题色;人品值纯客户端随机,不限次
### 踩坑
- `flutter build macos` 没有 --no-codesign(iOS 才有),已从 flutter.sh 与两个 workflow 移除
- `GcColors.appBg` 是 getter,不能放进 const Widget
- CaptchaInfo 在 api_client.dart,user_page 需要单独 import
## 删百宝箱 + 设置页去主题色(20:47,提交 38781c9)
- 删除 `pages/treasure.dart`、侧栏 `nav.treasure` 入口、`pages.dart` 导出、i18n 的 treasure.* 键
- 侧栏索引变化:user 从 6 → 5(download=2 / settings=3 不受影响,home.dart 里的 goTo 无需改)
- `settings.dart`:删掉主题色色板、自定义颜色对话、`_accentSwatch` / `_customAccentChip` / `_pickCustomAccent` / `_applyAccent`,以及 i18n 的 set.accent.*
- 强调色唯一来源改为用户账号:`controller._applySettings` 不再用 `settings.accentColor`;
启动 `_applyUserTheme()` 拉 `/api/user/me` 上色;退出登录回落 `GcPalette.defaultAccent`
- 注意:后端 SettingsInfo 仍保留 accentColor 字段(未删,避免破坏旧配置与 API 兼容)
## 模型回退 Avalonia + 积分计费改造(21:05–21:35)
### 1. 模型从 Flutter 回退 Avalonia(方案 B)
- 恢复源:5b62897(Flutter 重写前最后的 Avalonia 模型版本)→ `model/_sdk`、5 个模型的 `src/`、`GC-DRAW/PlayerWindow.cs`、`ModelHost.cs`、`AvaloniaHost.cs`
- `FlutterShell.cs`:主线程跑 Avalonia 事件循环(`uiHost.RunOnCurrentThread()`),修复 1.1.1 的 AppKit 主线程崩溃
- `BackendServer.cs`:`/api/models/{id}/launch` 走 `host.LaunchAsync(package)` 开 Avalonia 窗口
- `GC.Core.csproj` 重新引用 Avalonia/MVVM/GC.ModelSdk;`Directory.Build.props` 加 AvaloniaVersion
- 前端清理死代码:删 `pages/model_view.dart` + `lib/models/` 12 个 Flutter 模型文件(保留 user.dart),controller 删 `activeModelId/openModel/closeModel`
- GC.sln 全量编译通过;flutter analyze 0 error
### 2. 积分精确到 0.01
- `UserRecord.Points/ThemePaid`:int → decimal;pw.yaml 用 `ToString("0.##")` 写,decimal.TryParse 读(兼容旧整数)
- 主题色退款改 `Math.Floor(paid * 0.8 * 100) / 100` 保 2 位
- 前端 `points/themePaid` int → double,新增顶层 `formatPoints()`(整数不带小数、去尾零)
### 3. 人品值 / 二选一 后端计费(原先前端本地随机免费)
- pw.yaml 新增 `fortune_date/fortune_count/pick_date/pick_count`(UTC 日期跨天清零)
- 阶梯(按当日已付费次数):免费1次 → 0.1×5 → 0.2×5 → 0.5×15 → 1.0 起;二选一免费1次 → 0.5/次
- 端点 `POST /api/user/fortune`、`POST /api/user/pick`(服务端随机数);FortuneComment 评语后端生成
- 前端 `_rollFortune/_pickRandom` 改走 API,需登录,toast 显示本次消耗
### 端到端验证(GC_UI_PORT=18999)
- 注册→签到(10分)→连摇27次:费用 0/0.1×5/0.2×5/0.5×15/1.0,余额始终精确到 0.01,10 分花到 0
- 二选一首免、余额不足报「积分不足,本次需要 0.5 积分」(400)
- 重启进程后 user.yaml 自动登录 + 当日计数持久化生效;测试账号 billtest 已删
### 提交与推送(21:50,cfd6809)
- 单提交 57 文件(含 RELEASE-1.1.2.md 与工作日志),同时推:github → main、origin2(xhmcl) → feat/user-system(PR #39)
## 连接稳定性 + 签到日历日修复(11-22 07:30,用户反馈两项)
1. 「有时无法连接后端」根因:_send 连接失败直接抛错,运行中从不 rediscover/重试(睡眠唤醒断连、后端换端口后必现)
- 修:GET 连接失败自动 rediscover + 重试 1 次;POST 不自动重试(防签到/扣积分重复提交)
- 启动重试 5 次(31s) → 10 次、间隔封顶 8s(约 70s)
2. 签到用 DateTime.UtcNow.Date → 东八区早上 8 点才算新一天,7 点前可同日签到两次
- 修:UserService 4 处 + UserPayload 1 处改 DateTime.Today(本地日历日);人品值/二选一跨天计数一并修
- 实测(本地 07:33 / UTC 07-21):last_sign_in=2026-11-22,重复签到被拒,人品值按本地日重置
+6 -10
View File
@@ -13,17 +13,13 @@
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings> <ImplicitUsings>disable</ImplicitUsings>
<!--
Avalonia.BuildServices 的遥测任务会向用户目录写 buildtasks.log。
在只读用户目录 / CI / 沙箱里该写入抛 UnauthorizedAccessException(MSB4018),
直接让整个解决方案编译失败(实测)。官方开关是环境变量
AVALONIA_TELEMETRY_OPTOUT=1(MSBuild 属性对 11.3.2 无效),
build.sh / build.ps1 已默认导出;IDE 直接编译时无需此变量。
-->
<AvaloniaVersion>11.3.9</AvaloniaVersion>
<MvvmVersion>8.2.2</MvvmVersion> <MvvmVersion>8.2.2</MvvmVersion>
<Version>1.0.7</Version> <!-- 模型窗口仍由 Avalonia 承载(模型契约返回 Avalonia Control),
<Company>NeoRF</Company> 界面本身是 Flutter。Avalonia.BuildServices 的遥测会向用户目录写日志,
在只读目录 / CI 里会直接让编译失败,build.sh / build.ps1 已默认关闭。 -->
<AvaloniaVersion>11.3.9</AvaloniaVersion>
<Version>1.1.2</Version>
<Company>Morris</Company>
<Product>GC</Product> <Product>GC</Product>
<NeutralLanguage>zh-Hans</NeutralLanguage> <NeutralLanguage>zh-Hans</NeutralLanguage>
</PropertyGroup> </PropertyGroup>
+277
View File
@@ -0,0 +1,277 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using GC.Services;
using GC.UI.Server;
using Microsoft.AspNetCore.Builder;
namespace GC;
/// <summary>
/// 新界面启动壳。
///
/// 发布包带 <c>GC-UI</c>(Flutter 前端)时,启动器只做三件事:
/// 1. 在自己的进程里起后端(本地 HTTP API + 模型窗口宿主),等 <c>/api/health</c> 就绪;
/// 2. 拉起 Flutter 窗口;
/// 3. 界面退出后关掉后端。
///
/// 后端跑在进程内而不是单独一个 exe:两者用的是同一套 .NET 运行时,
/// 拆成两个自包含进程等于把 60MB 运行时复制两份,发布包会白白大一倍。
///
/// 缺 Flutter 前端时返回 <c>false</c>,由调用方提示用户安装完整发布包
/// (内置 Avalonia 界面已移除,界面只有 Flutter 一套)。
/// </summary>
internal static class FlutterShell
{
/// <summary>与前端、后端共用的默认端口(定义在 GC.Services.GcUiContract)。</summary>
private const int Port = Services.GcUiContract.DefaultPort;
// 使用共享 HttpClient(短超时,仅用于健康检查)
private static readonly HttpClient Http = SharedHttpClientFactory.GetDefault();
private static WebApplication? _backend;
public static bool TryRun(string[] args)
{
var dir = AppContext.BaseDirectory;
var uiPath = FindUi(dir);
if (uiPath == null) return false;
// 确定要用 Flutter 界面了:本进程只当后端宿主,不要另占一个 Dock 图标
// (否则「后端 + UI」会出现两个图标)。回退 Avalonia 的分支不会走到这里。
MacDock.HideFromDock();
if (OperatingSystem.IsMacOS())
Console.WriteLine("[shell] 启动器以 UIElement 运行(不占 Dock,界面由 GC-UI.app 显示)");
// 本次会话的一次性令牌:进程内后端与 Flutter 前端都从这里拿到同一个值。
// 只有我们拉起的后端才持有它,同机其他进程伪造的健康响应过不了 IsHealthy 的身份校验。
// 允许外部预设(自动化测试 / 高级部署固定令牌),未预设才现场生成随机值。
var token = Environment.GetEnvironmentVariable(Services.GcUiContract.TokenEnvVar);
if (string.IsNullOrEmpty(token)) token = Services.GcUiContract.NewSessionToken();
Environment.SetEnvironmentVariable(Services.GcUiContract.TokenEnvVar, token);
var port = Port;
AvaloniaHost? uiHost = null;
// 用户可能重复启动:只有当端口上已有一个「持有同一令牌」的后端时才复用。
// 同机其他程序即便占端口并返回 200,也没有令牌,会被 IsHealthy 拒绝,
// 于是我们改到下一个端口起自己的后端,绝不把前端交给伪装服务。
if (!IsHealthy(port, token))
{
// 端口可能被别的程序占用:17890 起向后试几个,选第一个能起来且健康的。
var start = Environment.GetEnvironmentVariable(Services.GcUiContract.PortEnvVar) is { Length: > 0 }
? Services.GcUiContract.PortFromEnvironment()
: Port;
for (var candidate = start; candidate < start + Services.GcUiContract.PortScanRange; candidate++)
{
var app = TryStartBackend(args, candidate, out var host);
if (app == null) continue;
if (WaitHealthy(candidate, token, TimeSpan.FromSeconds(25)))
{
port = candidate;
_backend = app;
uiHost = host;
break;
}
StopBackend(app);
}
if (_backend == null) return false;
}
AppDomain.CurrentDomain.ProcessExit += (_, _) => StopBackend(_backend);
var ui = Start(uiPath, dir, port, token);
if (ui == null)
{
StopBackend(_backend);
_backend = null;
return false;
}
// 前端窗口已拉起。模型窗口由 Avalonia 承载,而 macOS 的 AppKit 要求
// NSApplication 必须在**主线程**——所以事件循环要跑在这里(当前正是主线程),
// 不能丢到副线程,否则一点「启动模型」就会把整个后端带崩。
ui.EnableRaisingEvents = true;
var closed = 0;
void RequestClose()
{
if (Interlocked.Exchange(ref closed, 1) == 1) return;
uiHost?.Shutdown();
}
ui.Exited += (_, _) => RequestClose();
if (ui.HasExited) RequestClose();
if (!ui.HasExited && uiHost != null)
{
// 阻塞直到界面退出(或图形环境初始化失败)。
uiHost.RunOnCurrentThread();
}
// Avalonia 起不来(无桌面会话)时仍要等界面退出,避免后端被提前收掉。
if (!ui.HasExited) ui.WaitForExit();
StopBackend(_backend);
_backend = null;
return true;
}
/// <summary>
/// 找不到 Flutter 前端时的提示。
/// 已经没有任何内置界面可以回退,所以必须在终端/弹窗里说清楚,
/// 否则用户只会看到一个进程一闪而过。
/// </summary>
public static void ReportMissingUi()
{
const string message = "找不到 Flutter 前端(GC-UI.app / GC-UI.exe)。请使用完整发布包。";
Console.Error.WriteLine(message);
if (!OperatingSystem.IsMacOS()) return;
try
{
// 发布包是从 Finder 双击启动的,没有终端可看:用系统弹窗告知
var psi = new ProcessStartInfo("/usr/bin/osascript")
{
UseShellExecute = false,
RedirectStandardError = true,
};
psi.ArgumentList.Add("-e");
psi.ArgumentList.Add($"display alert \"{message}\" as critical");
Process.Start(psi);
}
catch
{
// 提示失败也不影响退出码
}
}
// ---------------------------------------------------------------- 产物定位
/// <summary>
/// Flutter 桌面产物。
/// macOS 是 <c>GC-UI.app/Contents/MacOS/GC-UI</c>;Windows 是 <c>GC-UI.exe</c>;
/// Linux 是 <c>GC-UI</c>。
/// </summary>
private static string? FindUi(string dir)
{
if (OperatingSystem.IsMacOS())
{
var exe = Path.Combine(dir, "GC-UI.app", "Contents", "MacOS", "GC-UI");
if (File.Exists(exe)) return exe;
}
foreach (var name in OperatingSystem.IsWindows() ? new[] { "GC-UI.exe" } : new[] { "GC-UI" })
{
var path = Path.Combine(dir, name);
if (File.Exists(path)) return path;
}
return null;
}
// ---------------------------------------------------------------- 进程管理
/// <summary>在本进程内启动后端;端口被占用等失败情况返回 null。</summary>
/// <param name="uiHost">成功时交出模型窗口宿主,由调用方在主线程跑事件循环。</param>
private static WebApplication? TryStartBackend(string[] args, int port, out AvaloniaHost? uiHost)
{
uiHost = null;
try
{
var app = BackendServer.Start(args, port, out var host);
uiHost = host;
app.StartAsync().GetAwaiter().GetResult();
return app;
}
catch (Exception ex)
{
uiHost = null;
Console.Error.WriteLine($"[shell] 后端启动失败(端口 {port}): {ex.Message}");
return null;
}
}
private static void StopBackend(WebApplication? app)
{
if (app == null) return;
try
{
using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(3));
app.StopAsync(cts.Token).GetAwaiter().GetResult();
}
catch (Exception ex)
{
Console.Error.WriteLine($"[shell] 关闭后端失败: {ex.Message}");
}
}
private static Process Start(string fileName, string workingDirectory, int port, string token)
{
var info = new ProcessStartInfo(fileName)
{
WorkingDirectory = workingDirectory,
UseShellExecute = false,
};
// 把实际端口传给前端:它读这个环境变量拼 baseUrl,换端口不需要重新编译界面。
info.Environment[Services.GcUiContract.PortEnvVar] = port.ToString();
// 同一个会话令牌也交给前端,作为每个 /api 请求的身份凭证。
info.Environment[Services.GcUiContract.TokenEnvVar] = token;
// macOS .app 内的二进制也需要可执行位;发布包由 zip 解开时可能丢失。
if (!OperatingSystem.IsWindows())
{
try { File.SetUnixFileMode(fileName, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute); }
catch { /* 权限不足时交给系统判断 */ }
}
return Process.Start(info)!;
}
// ---------------------------------------------------------------- 健康检查
/// <summary>
/// 健康探测必须带本次会话令牌:后端校验通过才说明这是「我们拉起的那个后端」。
/// 同机伪装进程即使返回 HTTP 200,也因为没有令牌而拿不到 200(后端会 401),
/// 但这里额外再比对响应体里的密钥指纹,双保险——即便对方原样回一个 200 也骗不过。
/// </summary>
private static bool IsHealthy(int port, string token)
{
try
{
using var request = new HttpRequestMessage(HttpMethod.Get, $"http://127.0.0.1:{port}/api/health");
request.Headers.TryAddWithoutValidation(Services.GcUiContract.TokenHeader, token);
using var response = Http.Send(request);
if (!response.IsSuccessStatusCode) return false;
// 状态码 200 还不够:伪装进程可能盲回一个 200。真正的后端会用会话令牌
// 派生指纹填进 health 响应,这里比对指纹确认对方确实持有同一个令牌。
var body = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
using var json = System.Text.Json.JsonDocument.Parse(body);
var proof = json.RootElement.TryGetProperty("sessionProof", out var p) ? p.GetString() : null;
var expected = Services.GcUiContract.DeriveSessionProof(token);
return string.Equals(proof, expected, StringComparison.OrdinalIgnoreCase);
}
catch
{
return false;
}
}
private static bool WaitHealthy(int port, string token, TimeSpan timeout)
{
var deadline = DateTime.UtcNow + timeout;
while (DateTime.UtcNow < deadline)
{
if (IsHealthy(port, token)) return true;
Thread.Sleep(250);
}
return false;
}
}
+3 -2
View File
@@ -13,13 +13,14 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" /> <!-- 后端以库的方式编进启动器:发布包只需要一个 exe,不用再带一份运行时 -->
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" /> <FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\GC\src\GC.Core.csproj" /> <ProjectReference Include="..\GC\src\GC.Core.csproj" />
<ProjectReference Include="..\GC-DOWNLOAD\GC-DOWNLOAD.csproj" /> <ProjectReference Include="..\GC-DOWNLOAD\GC-DOWNLOAD.csproj" />
<ProjectReference Include="..\GC-UI\backend\GC.UI.Server\GC.UI.Server.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>
+89
View File
@@ -0,0 +1,89 @@
using System;
using System.Runtime.InteropServices;
namespace GC;
/// <summary>
/// macOS Dock 图标控制。
///
/// 有 Flutter 前端时,启动器(GC.app 的主进程)只承担后端宿主,界面全在 GC-UI.app 里。
/// 两个 .app 各自带 Dock 图标 → 用户会看到两个图标。
///
/// 三重保险,任意一条生效就够了:
/// 1. 打包时 Info.plist 写 <c>LSUIElement=true</c>(buildsh/lib/package.sh);
/// 2. 运行期 <c>TransformProcessType</c> 转成 UIElement(Carbon 老 API,但对已启动的
/// 进程最可靠,不依赖 LaunchServices 缓存);
/// 3. 运行期 <c>[NSApp setActivationPolicy:accessory]</c>。
/// 只用其中一条都出现过「某些机器上仍是两个图标」,所以三条一起上。
/// </summary>
internal static class MacDock
{
private const string Objc = "/usr/lib/libobjc.dylib";
private const string Carbon =
"/System/Library/Frameworks/ApplicationServices.framework/ApplicationServices";
// NSApplicationActivationPolicy: Regular=0, Accessory=1, Prohibited=2
private const long ActivationPolicyAccessory = 1;
// ProcessApplicationTransformState: kProcessTransformToUIElementApplication = 4
private const int TransformToUIElement = 4;
[StructLayout(LayoutKind.Sequential)]
private struct ProcessSerialNumber
{
public uint HighLongOfPSN;
public uint LowLongOfPSN;
}
[DllImport(Objc)]
private static extern IntPtr objc_getClass(string name);
[DllImport(Objc)]
private static extern IntPtr sel_registerName(string name);
[DllImport(Objc, EntryPoint = "objc_msgSend")]
private static extern IntPtr objc_msgSend(IntPtr receiver, IntPtr selector);
[DllImport(Objc, EntryPoint = "objc_msgSend")]
private static extern IntPtr objc_msgSend_int(IntPtr receiver, IntPtr selector, long arg);
[DllImport(Carbon)]
private static extern int GetCurrentProcess(out ProcessSerialNumber psn);
[DllImport(Carbon)]
private static extern int TransformProcessType(ref ProcessSerialNumber psn, int transformState);
/// <summary>把当前进程从 Dock 隐藏掉(仅 macOS,其它平台空操作)。</summary>
public static void HideFromDock()
{
if (!OperatingSystem.IsMacOS()) return;
// 2. Carbon:对「已经在运行」的进程最直接
try
{
if (GetCurrentProcess(out var psn) == 0)
TransformProcessType(ref psn, TransformToUIElement);
}
catch
{
// 旧系统 / 沙箱下可能不可用,继续尝试下一条
}
// 3. AppKit:需要先有 NSApplication 实例
try
{
var cls = objc_getClass("NSApplication");
if (cls == IntPtr.Zero) return;
var app = objc_msgSend(cls, sel_registerName("sharedApplication"));
if (app == IntPtr.Zero) return;
objc_msgSend_int(app, sel_registerName("setActivationPolicy:"), ActivationPolicyAccessory);
}
catch
{
// 无窗口/沙箱环境下 NSApplication 不可用,忽略即可:
// 最多是多一个 Dock 图标,不影响功能。
}
}
}
+9 -7
View File
@@ -1,5 +1,4 @@
using System; using System;
using Avalonia;
using GC.Services; using GC.Services;
using GC.Download; using GC.Download;
@@ -15,14 +14,17 @@ internal static class Program
var paths = AppPaths.Discover(); var paths = AppPaths.Discover();
paths.EnsureCreated(); paths.EnsureCreated();
// 目录约定 + 双语日志 + 把包里的守护进程落到 .GC/safedog
RuntimeLayout.Ensure(paths);
// 上次下载的启动器新版,到这次启动才应用 // 上次下载的启动器新版,到这次启动才应用
if (DownloadModuleHost.Factory.TryApplyPending(paths)) return; if (DownloadModuleHost.Factory.TryApplyPending(paths)) return;
BuildAvaloniaApp().StartWithClassicDesktopLifetime(args); // 界面只有 Flutter 一套(内置 Avalonia 界面已移除)。
} if (FlutterShell.TryRun(args)) return;
public static AppBuilder BuildAvaloniaApp() // 找不到前端:给出明确提示后退出,不要静默启动一个没有界面的后端进程。
=> AppBuilder.Configure<App>() FlutterShell.ReportMissingUi();
.UsePlatformDetect() Environment.Exit(1);
.LogToTrace(); }
} }
+114 -8
View File
@@ -1,7 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Net.Sockets;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@@ -14,7 +17,8 @@ namespace GC.Services;
public sealed class DirectoryRemote : IModelRemote public sealed class DirectoryRemote : IModelRemote
{ {
private readonly string _root; private readonly string _root;
private static readonly HttpClient Http = new() { Timeout = TimeSpan.FromMinutes(5) }; // 使用共享 HttpClient(长超时版本)
private static readonly HttpClient Http = SharedHttpClientFactory.GetLongTimeout();
private string? _rawManifest; private string? _rawManifest;
private string _launcherVersion = ""; private string _launcherVersion = "";
@@ -29,10 +33,14 @@ public sealed class DirectoryRemote : IModelRemote
var file = File.Exists(primary) ? primary : fallback; var file = File.Exists(primary) ? primary : fallback;
if (!File.Exists(file)) return Task.FromResult<RepoVersion?>(null); if (!File.Exists(file)) return Task.FromResult<RepoVersion?>(null);
// 离线目录同样验签:U 盘 / 共享盘里的清单也可能是被替换过的 // 离线目录同样验签:U 盘 / 共享盘里的清单也可能是被替换过的。
// 验签结论随 version.SignatureTrust 一起上送,由 UpdateService 按策略裁决;
// 这里至少要把失败如实记下来,不能静默丢弃(与 GiteaRemote/GitCodeRemote 保持一致)。
var text = File.ReadAllText(file); var text = File.ReadAllText(file);
_rawManifest = text; _rawManifest = text;
var version = ManifestLoader.Parse(text, out _); var version = ManifestLoader.Parse(text, out var verification);
if (verification.Trust is ManifestTrust.Invalid or ManifestTrust.Unsigned)
Console.Error.WriteLine($"[directory] 清单验签失败({verification.Trust}): {verification.Error}");
if (version != null && !string.IsNullOrWhiteSpace(version.Launcher.Version)) if (version != null && !string.IsNullOrWhiteSpace(version.Launcher.Version))
_launcherVersion = version.Launcher.Version.Trim(); _launcherVersion = version.Launcher.Version.Trim();
return Task.FromResult(version); return Task.FromResult(version);
@@ -57,6 +65,8 @@ public sealed class DirectoryRemote : IModelRemote
if (depth > 8) return; if (depth > 8) return;
foreach (var sub in Directory.GetDirectories(dir)) foreach (var sub in Directory.GetDirectories(dir))
{ {
// 符号链接目录可能指向根目录之外:既不递归进去,也不作为条目暴露。
if (IsReparsePoint(sub)) continue;
var name = Path.GetFileName(sub); var name = Path.GetFileName(sub);
if (name.StartsWith('.')) continue; if (name.StartsWith('.')) continue;
var rel = Relative(baseDir, sub); var rel = Relative(baseDir, sub);
@@ -71,6 +81,7 @@ public sealed class DirectoryRemote : IModelRemote
} }
foreach (var file in Directory.GetFiles(dir)) foreach (var file in Directory.GetFiles(dir))
{ {
if (IsReparsePoint(file)) continue;
var name = Path.GetFileName(file); var name = Path.GetFileName(file);
if (name.StartsWith('.')) continue; if (name.StartsWith('.')) continue;
result.Add(new RepoEntry result.Add(new RepoEntry
@@ -106,16 +117,81 @@ public sealed class DirectoryRemote : IModelRemote
var url = package.Url; var url = package.Url;
if (string.IsNullOrWhiteSpace(url)) return null; if (string.IsNullOrWhiteSpace(url)) return null;
// 离线 U 盘源与 ./build.sh update-test 都会用本地 zip 路径,必须保持兼容。
// 清单里的 URL 属于外部输入,必须约束来源:
// · file:// 和绝对路径只允许读 _root 之内,杜绝任意本地文件读取;
// · 网络 URL 仅允许 http(s),且目标不能是环回/私有/链路本地/元数据地址,防 SSRF。
if (url!.StartsWith("file://", StringComparison.OrdinalIgnoreCase)) if (url!.StartsWith("file://", StringComparison.OrdinalIgnoreCase))
return await File.ReadAllBytesAsync(new Uri(url).LocalPath, ct); {
if (Path.IsPathRooted(url) && File.Exists(url)) var local = new Uri(url).LocalPath;
return await File.ReadAllBytesAsync(url, ct); return await File.ReadAllBytesAsync(SafePath(Path.GetRelativePath(_root, local)), ct);
if (Uri.TryCreate(url, UriKind.Absolute, out _)) }
if (Path.IsPathRooted(url))
{
if (File.Exists(url)) return await File.ReadAllBytesAsync(SafePath(Path.GetRelativePath(_root, url)), ct);
return null;
}
if (IsAllowedHttpUrl(url))
return await Http.GetByteArrayAsync(url, ct); return await Http.GetByteArrayAsync(url, ct);
return null; return null;
} }
/// <summary>
/// 仅允许 http/https:挡住 file: 导致的任意本地文件读取和 gopher: 之类的协议滥用。
/// IP 字面量直接判公网;主机名(清单里的正常发布 URL)允许,但拒绝 localhost 与
/// 常见本地后缀,避免指向本机。域名解析到内网的情况由 HttpClient 侧的实际连接地址
/// 兜底——本地目录源的主路径本就是本地文件,网络只是兜底。
/// </summary>
private static bool IsAllowedHttpUrl(string url)
{
if (!Uri.TryCreate(url, UriKind.Absolute, out var uri)) return false;
if (uri.Scheme != Uri.UriSchemeHttp && uri.Scheme != Uri.UriSchemeHttps) return false;
if (uri.HostNameType == UriHostNameType.IPv4 || uri.HostNameType == UriHostNameType.IPv6)
return IsPublicAddress(uri.Host);
var host = uri.Host;
if (string.IsNullOrEmpty(host)) return false;
if (host.Equals("localhost", StringComparison.OrdinalIgnoreCase)) return false;
// 仅允许含点、且各段是字母数字/连字符的常规域名;拒绝 .local/.internal 等本地域。
if (host.EndsWith(".local", StringComparison.OrdinalIgnoreCase) ||
host.EndsWith(".localhost", StringComparison.OrdinalIgnoreCase) ||
host.EndsWith(".internal", StringComparison.OrdinalIgnoreCase))
return false;
foreach (var label in host.Split('.'))
if (label.Length == 0 || label[0] == '-' || label[^1] == '-' ||
!label.All(c => char.IsAsciiLetterOrDigit(c) || c == '-'))
return false;
return true;
}
private static bool IsPublicAddress(string host)
{
if (!IPAddress.TryParse(host, out var ip)) return false;
if (IPAddress.IsLoopback(ip) || IPAddress.Any.Equals(ip) || IPAddress.IPv6Any.Equals(ip)) return false;
if (ip.AddressFamily == AddressFamily.InterNetwork)
{
var b = ip.GetAddressBytes();
if (b[0] == 10 || b[0] == 127 || b[0] == 0) return false; // 私有 / 环回 / 本网
if (b[0] == 169 && b[1] == 254) return false; // 链路本地 / 云元数据
if (b[0] == 172 && b[1] >= 16 && b[1] <= 31) return false; // 私有
if (b[0] == 192 && b[1] == 168) return false; // 私有
if (b[0] == 100 && b[1] >= 64 && b[1] <= 127) return false; // CGNAT (IPv4 共享地址)
if (b[0] == 192 && b[1] == 0) return false; // IETF 协议分配
if (b[0] == 198 && (b[1] == 18 || b[1] == 19)) return false; // 基准测试
if (b[0] >= 224) return false; // 组播 / 保留
}
else if (ip.AddressFamily == AddressFamily.InterNetworkV6)
{
if (ip.IsIPv6LinkLocal || ip.IsIPv6SiteLocal || ip.IsIPv6Multicast) return false;
var b = ip.GetAddressBytes();
if (b[0] == 0xfd || b[0] == 0xfc) return false; // 唯一本地地址
if (ip.IsIPv4MappedToIPv6) return IsPublicAddress(ip.MapToIPv4().ToString());
}
return true;
}
/// <summary>在 dist/&lt;系统&gt;-&lt;架构&gt;/ 里找这个平台的启动器包;找不到返回 null。</summary> /// <summary>在 dist/&lt;系统&gt;-&lt;架构&gt;/ 里找这个平台的启动器包;找不到返回 null。</summary>
private string? FindInDist(RepoPackage package) private string? FindInDist(RepoPackage package)
{ {
@@ -137,6 +213,7 @@ public sealed class DirectoryRemote : IModelRemote
return null; return null;
} }
/// <summary>把相对路径解析成 _root 内的真实路径:拒绝越界,且逐级拒绝符号链接。</summary>
private string SafePath(string relative) private string SafePath(string relative)
{ {
var full = Path.GetFullPath(Path.Combine(_root, relative)); var full = Path.GetFullPath(Path.Combine(_root, relative));
@@ -144,9 +221,38 @@ public sealed class DirectoryRemote : IModelRemote
if (!full.Equals(_root, StringComparison.OrdinalIgnoreCase) && if (!full.Equals(_root, StringComparison.OrdinalIgnoreCase) &&
!full.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) !full.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
throw new InvalidOperationException($"路径越界: {relative}"); throw new InvalidOperationException($"路径越界: {relative}");
// 词法校验之后还要解析符号链接:root 内的链接可能指向根目录之外。
// 逐级检查 _root 到 full 的每一段,任何重解析点都直接拒绝。
var rel = Path.GetRelativePath(_root, full);
if (rel != "." && rel != "")
{
var cursor = _root;
foreach (var segment in rel.Split(Path.DirectorySeparatorChar, StringSplitOptions.RemoveEmptyEntries))
{
if (segment == "..") throw new InvalidOperationException($"路径越界: {relative}");
cursor = Path.Combine(cursor, segment);
if (IsReparsePoint(cursor))
throw new InvalidOperationException($"路径含符号链接,已拒绝: {relative}");
}
}
return full; return full;
} }
private static bool IsReparsePoint(string path)
{
try
{
if (!File.Exists(path) && !Directory.Exists(path)) return false;
return (File.GetAttributes(path) & FileAttributes.ReparsePoint) != 0;
}
catch
{
// 取不到属性时按不可信处理,避免绕过符号链接检查。
return true;
}
}
private static string Relative(string baseDir, string file) => private static string Relative(string baseDir, string file) =>
Path.GetRelativePath(baseDir, file).Replace('\\', '/'); Path.GetRelativePath(baseDir, file).Replace('\\', '/');
} }
+4 -2
View File
@@ -56,12 +56,14 @@ public sealed partial class DownloadJob : ObservableObject, IDownloadJob
partial void OnErrorChanged(string? value) => RefreshText(); partial void OnErrorChanged(string? value) => RefreshText();
} }
/// <summary>下载中心:最多 2 个并发,任务在「后台列表」里折叠展示。</summary> /// <summary>下载中心:最多 4 个并发,任务在「后台列表」里折叠展示。</summary>
public sealed class DownloadCenter : IDownloadCenter public sealed class DownloadCenter : IDownloadCenter
{ {
private readonly ModelRepository _repository; private readonly ModelRepository _repository;
private readonly AppPaths _paths; private readonly AppPaths _paths;
private readonly SemaphoreSlim _slots = new(2); // 断点续传后单任务失败重来的代价小了很多,可以适当提高并发;
// 更新服务那边已是 6,模型下载保持 4,兼顾弱网吞吐与源站压力。
private readonly SemaphoreSlim _slots = new(4);
public ObservableCollection<IDownloadJob> Jobs { get; } = new(); public ObservableCollection<IDownloadJob> Jobs { get; } = new();
public event Action? Installed; public event Action? Installed;
+8 -15
View File
@@ -25,17 +25,8 @@ public sealed class GitCodeReleaseRemote : IModelRemote
private readonly string _releasesUrl; private readonly string _releasesUrl;
private readonly Dictionary<string, (string Url, string? Sha256, long Size, string Name)> _assets = new(); private readonly Dictionary<string, (string Url, string? Sha256, long Size, string Name)> _assets = new();
// 共享静态 HttpClient:避免每次检查更新都创建新实例导致端口耗尽; // 使用共享 HttpClient 工厂,统一连接池管理
// headers 只在一处设置,多个线程并发读取是线程安全的。 private static readonly HttpClient Http = SharedHttpClientFactory.GetDefault();
private static readonly HttpClient Http = CreateHttp();
private static HttpClient CreateHttp()
{
var client = new HttpClient { Timeout = TimeSpan.FromSeconds(15) };
client.DefaultRequestHeaders.UserAgent.ParseAdd("GC-Updater/1.0");
client.DefaultRequestHeaders.Accept.ParseAdd("application/json");
return client;
}
public GitCodeReleaseRemote(string? manifestUrl, string? repository) public GitCodeReleaseRemote(string? manifestUrl, string? repository)
{ {
@@ -80,7 +71,8 @@ public sealed class GitCodeReleaseRemote : IModelRemote
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.Error.WriteLine($"[gitcode] 读取 Release 失败: {ex.Message}"); GcLog.Warn($"读取 Release 失败: {ex.Message}",
$"Failed to read Release: {ex.Message}");
gotRelease = false; gotRelease = false;
} }
@@ -93,12 +85,13 @@ public sealed class GitCodeReleaseRemote : IModelRemote
var n = version?.Launcher.Packages.Count ?? 0; var n = version?.Launcher.Packages.Count ?? 0;
if (v.Length == 0 || n == 0) if (v.Length == 0 || n == 0)
{ {
Console.WriteLine($"[gitcode] {DisplayName}: 没有 Release,清单里也没有启动器包"); GcLog.Warn($"{DisplayName}: 没有 Release,清单里也没有启动器包",
$"{DisplayName}: No Release, no launcher packages in manifest");
} }
else else
{ {
Console.WriteLine( GcLog.Info($"没有 Release,改用清单声明的 v{v}({n} 个平台包,去 dist/ 找产物)",
$"[gitcode] {DisplayName}: 没有 Release,改用清单声明的 v{v}({n} 个平台包,去 dist/ 找产物)"); $"No Release; using manifest version v{v} ({n} platform packages, looking in dist/)");
} }
} }
return version; return version;
+21 -11
View File
@@ -42,9 +42,8 @@ public sealed class GitCodeRemote : IModelRemote
_displayName = string.IsNullOrWhiteSpace(repository) _displayName = string.IsNullOrWhiteSpace(repository)
? DefaultRepository : repository!.TrimEnd('/'); ? DefaultRepository : repository!.TrimEnd('/');
_http = new HttpClient { Timeout = TimeSpan.FromMinutes(2) }; // 使用共享 HttpClient,统一连接池管理
_http.DefaultRequestHeaders.UserAgent.ParseAdd("GC-Updater/1.0"); _http = SharedHttpClientFactory.GetDefault();
_http.DefaultRequestHeaders.Accept.ParseAdd("application/json");
if (string.IsNullOrWhiteSpace(manifestUrl)) if (string.IsNullOrWhiteSpace(manifestUrl))
{ {
@@ -135,7 +134,11 @@ public sealed class GitCodeRemote : IModelRemote
if (string.IsNullOrWhiteSpace(version.Generated)) return null; if (string.IsNullOrWhiteSpace(version.Generated)) return null;
if (verification.Trust == ManifestTrust.Invalid) if (verification.Trust == ManifestTrust.Invalid)
Console.Error.WriteLine($"[gitcode] 清单验签失败: {verification.Error}"); {
GcLog.Warn($"清单验签失败,已拒绝: {verification.Error}",
$"Manifest signature check failed: {verification.Error}");
return null;
}
if (version != null && !string.IsNullOrWhiteSpace(version.Generated)) if (version != null && !string.IsNullOrWhiteSpace(version.Generated))
_rawManifest = payload; _rawManifest = payload;
@@ -143,7 +146,8 @@ public sealed class GitCodeRemote : IModelRemote
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.Error.WriteLine($"版本清单解析失败 {url}: {ex.Message}"); GcLog.Warn($"版本清单解析失败 {url}: {ex.Message}",
$"Failed to parse version manifest {url}: {ex.Message}");
return null; return null;
} }
} }
@@ -176,7 +180,8 @@ public sealed class GitCodeRemote : IModelRemote
try { text = await GetWithRetryAsync(url, ct); } try { text = await GetWithRetryAsync(url, ct); }
catch (Exception ex) catch (Exception ex)
{ {
Console.Error.WriteLine($"列目录失败 {repoPath}: {ex.Message}"); GcLog.Warn($"列目录失败 {repoPath}: {ex.Message}",
$"Failed to list directory {repoPath}: {ex.Message}");
return; return;
} }
if (!text.TrimStart().StartsWith("[", StringComparison.Ordinal)) return; if (!text.TrimStart().StartsWith("[", StringComparison.Ordinal)) return;
@@ -335,7 +340,8 @@ public sealed class GitCodeRemote : IModelRemote
if (bytes != null) return bytes; if (bytes != null) return bytes;
} }
Console.Error.WriteLine("[gitcode] 找不到可用的启动器包(Release 附件与 dist 目录都没对上)"); GcLog.Warn("找不到可用的启动器包(Release 附件与 dist 目录都没对上)",
"Could not find a usable launcher package");
return null; return null;
} }
@@ -348,7 +354,8 @@ public sealed class GitCodeRemote : IModelRemote
try { bytes = await _http.GetByteArrayAsync(url!, ct); } try { bytes = await _http.GetByteArrayAsync(url!, ct); }
catch (Exception ex) catch (Exception ex)
{ {
Console.Error.WriteLine($"[gitcode] 下载失败 {Short(url!)}: {ex.Message}"); GcLog.Warn($"下载失败 {Short(url!)}: {ex.Message}",
$"Download failed {Short(url!)}: {ex.Message}");
return null; return null;
} }
if (bytes.Length == 0) return null; if (bytes.Length == 0) return null;
@@ -358,12 +365,14 @@ public sealed class GitCodeRemote : IModelRemote
var actual = Convert.ToHexString(SHA256.HashData(bytes)).ToLowerInvariant(); var actual = Convert.ToHexString(SHA256.HashData(bytes)).ToLowerInvariant();
if (!string.Equals(actual, sha256.Trim(), StringComparison.OrdinalIgnoreCase)) if (!string.Equals(actual, sha256.Trim(), StringComparison.OrdinalIgnoreCase))
{ {
Console.Error.WriteLine($"[gitcode] 包校验不符,换下一个来源: {Short(url!)}"); GcLog.Warn($"包校验不符,换下一个来源: {Short(url!)}",
$"Package hash mismatch, trying next source: {Short(url!)}");
return null; return null;
} }
} }
Console.WriteLine($"[gitcode] 启动器包来源: {Short(url!)}"); GcLog.Info($"启动器包来源: {Short(url!)}",
$"Launcher package source: {Short(url!)}");
return bytes; return bytes;
} }
@@ -428,7 +437,8 @@ public sealed class GitCodeRemote : IModelRemote
match = 0; match = 0;
} }
Console.WriteLine($"[gitcode] 在 {dir} 找到编译产物: {zips[match].Name}"); GcLog.Info($"在 {dir} 找到编译产物: {zips[match].Name}",
$"Found build artifact in {dir}: {zips[match].Name}");
return await ResolveFileUrlAsync(zips[match].Path, ct); return await ResolveFileUrlAsync(zips[match].Path, ct);
} }
catch (Exception) catch (Exception)
+36 -21
View File
@@ -22,17 +22,10 @@ namespace GC.Services;
public sealed class GiteaRemote : IModelRemote public sealed class GiteaRemote : IModelRemote
{ {
private readonly SourcePreset _preset; private readonly SourcePreset _preset;
private static readonly HttpClient Http = CreateHttp(); // 使用共享 HttpClient,统一连接池管理
private static readonly HttpClient Http = SharedHttpClientFactory.GetDefault();
private string? _rawManifest; private string? _rawManifest;
private static HttpClient CreateHttp()
{
var c = new HttpClient { Timeout = TimeSpan.FromSeconds(20) };
c.DefaultRequestHeaders.UserAgent.ParseAdd("GC-Updater/1.0");
c.DefaultRequestHeaders.Accept.ParseAdd("application/json");
return c;
}
public GiteaRemote(SourcePreset preset) public GiteaRemote(SourcePreset preset)
{ {
_preset = preset; _preset = preset;
@@ -44,6 +37,18 @@ public sealed class GiteaRemote : IModelRemote
private string RepoApi => $"{_preset.ApiBase}/repos/{_preset.Owner}/{_preset.Repo}"; private string RepoApi => $"{_preset.ApiBase}/repos/{_preset.Owner}/{_preset.Repo}";
/// <summary>GitHub 的 contents API 必须显式带 ref;Gitea 默认就读默认分支。</summary>
private string ContentsUrl(string path)
{
var p = path.Trim('/');
var head = string.IsNullOrEmpty(p) ? $"{RepoApi}/contents" : $"{RepoApi}/contents/{p}";
return _preset.Kind == "github" ? $"{head}?ref={_preset.Branch}" : head;
}
/// <summary>Releases 列表地址:GitHub 默认只返回 30 条,需要显式拉满一页。</summary>
private string ReleasesUrl() =>
_preset.Kind == "github" ? $"{RepoApi}/releases?per_page=100" : $"{RepoApi}/releases";
// ---------------------------------------------------------------- 清单 // ---------------------------------------------------------------- 清单
/// <summary> /// <summary>
@@ -86,7 +91,8 @@ public sealed class GiteaRemote : IModelRemote
} }
// 没有 Release:清空启动器版本,让上层知道"这个源没有可升级的启动器" // 没有 Release:清空启动器版本,让上层知道"这个源没有可升级的启动器"
Console.WriteLine($"[gitea] {_preset.Name}: Release 为空(模型清单仍可用)"); GcLog.Warn($"{_preset.Name}: Release 为空(模型清单仍可用)",
$"{_preset.Name}: No Release found (model manifest still available)");
result.Launcher.Version = ""; result.Launcher.Version = "";
result.Launcher.Packages.Clear(); result.Launcher.Packages.Clear();
@@ -107,8 +113,13 @@ public sealed class GiteaRemote : IModelRemote
var text = await Http.GetStringAsync(url, ct); var text = await Http.GetStringAsync(url, ct);
if (!text.TrimStart().StartsWith('{')) continue; // 可能返回 HTML if (!text.TrimStart().StartsWith('{')) continue; // 可能返回 HTML
var doc = ManifestLoader.Parse(text, out var verification); var doc = ManifestLoader.Parse(text, out var verification);
// 清单验签失败或格式不对时直接返回 null,不再把不可信清单交给上层
if (verification.Trust == ManifestTrust.Invalid) if (verification.Trust == ManifestTrust.Invalid)
Console.Error.WriteLine($"[gitea] 清单验签失败: {verification.Error}"); {
GcLog.Warn($"清单验签失败,已拒绝: {verification.Error}",
$"Manifest signature verification failed: {verification.Error}");
return null;
}
if (doc != null) if (doc != null)
{ {
_rawManifest = text; _rawManifest = text;
@@ -117,7 +128,8 @@ public sealed class GiteaRemote : IModelRemote
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.Error.WriteLine($"[gitea] version.json 读取失败 {url}: {ex.Message}"); GcLog.Warn($"version.json 读取失败 {url}: {ex.Message}",
$"Failed to read version.json {url}: {ex.Message}");
} }
} }
return null; return null;
@@ -131,7 +143,7 @@ public sealed class GiteaRemote : IModelRemote
{ {
try try
{ {
var json = await Http.GetStringAsync($"{RepoApi}/releases", ct); var json = await Http.GetStringAsync(ReleasesUrl(), ct);
using var doc = JsonDocument.Parse(json); using var doc = JsonDocument.Parse(json);
if (doc.RootElement.ValueKind != JsonValueKind.Array) return null; if (doc.RootElement.ValueKind != JsonValueKind.Array) return null;
@@ -148,7 +160,8 @@ public sealed class GiteaRemote : IModelRemote
if (candidates.Count == 0) if (candidates.Count == 0)
{ {
// 还没发布 Release 是正常状态:交给上层去问另一个源 // 还没发布 Release 是正常状态:交给上层去问另一个源
Console.WriteLine($"[gitea] {_preset.Name}: Release 列表为空"); GcLog.Info($"{_preset.Name}: Release 列表为空",
$"{_preset.Name}: Empty Release list");
return null; return null;
} }
@@ -190,7 +203,8 @@ public sealed class GiteaRemote : IModelRemote
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.Error.WriteLine($"[gitea] Release 读取失败({_preset.Name}): {ex.Message}"); GcLog.Warn($"Release 读取失败({_preset.Name}): {ex.Message}",
$"Failed to read Release ({_preset.Name}): {ex.Message}");
return null; return null;
} }
} }
@@ -222,12 +236,13 @@ public sealed class GiteaRemote : IModelRemote
{ {
if (depth > 8) return; if (depth > 8) return;
var url = $"{RepoRepoContentsUrl()}/{apiPath}"; var url = ContentsUrl(apiPath);
string json; string json;
try { json = await Http.GetStringAsync(url, ct); } try { json = await Http.GetStringAsync(url, ct); }
catch (Exception ex) catch (Exception ex)
{ {
Console.Error.WriteLine($"[gitea] 列目录失败 {apiPath}: {ex.Message}"); GcLog.Warn($"列目录失败 {apiPath}: {ex.Message}",
$"Failed to list directory {apiPath}: {ex.Message}");
return; return;
} }
@@ -264,8 +279,6 @@ public sealed class GiteaRemote : IModelRemote
await WalkAsync(p, rel, sink, ct, depth + 1); await WalkAsync(p, rel, sink, ct, depth + 1);
} }
private string RepoRepoContentsUrl() => $"{RepoApi}/contents";
private static void AddFile(JsonElement item, string relPrefix, List<RepoEntry> sink) private static void AddFile(JsonElement item, string relPrefix, List<RepoEntry> sink)
{ {
var name = item.TryGetProperty("name", out var n) ? n.GetString() ?? "" : ""; var name = item.TryGetProperty("name", out var n) ? n.GetString() ?? "" : "";
@@ -325,12 +338,14 @@ public sealed class GiteaRemote : IModelRemote
System.Security.Cryptography.SHA256.HashData(bytes)).ToLowerInvariant(); System.Security.Cryptography.SHA256.HashData(bytes)).ToLowerInvariant();
if (!string.Equals(actual, package.Sha256.Trim(), StringComparison.OrdinalIgnoreCase)) if (!string.Equals(actual, package.Sha256.Trim(), StringComparison.OrdinalIgnoreCase))
{ {
Console.Error.WriteLine($"[gitea] 包校验不符,换下一个来源: {candidate}"); GcLog.Warn($"包校验不符,换下一个来源: {candidate}",
$"Package hash mismatch, trying next source: {candidate}");
continue; continue;
} }
} }
Console.WriteLine($"[gitea] 启动器包来源: {candidate}"); GcLog.Info($"启动器包来源: {candidate}",
$"Launcher package source: {candidate}");
return bytes; return bytes;
} }
return null; return null;
+8 -4
View File
@@ -29,7 +29,8 @@ public static class LauncherArtifacts
"win-arm64" => "win-arm64", "win-arm64" => "win-arm64",
"osx-arm64" => "mac-arm64", "osx-arm64" => "mac-arm64",
"osx-x64" => "mac-x64", "osx-x64" => "mac-x64",
"linux-x64" => "linux-amd64", "linux-x64" => "linux-amd64", // 旧产物目录名,仍能读
"linux-arm64" => "linux-arm64",
_ => rid _ => rid
}; };
@@ -46,9 +47,9 @@ public static class LauncherArtifacts
return new[] { label, rid }; return new[] { label, rid };
} }
/// <summary>启动器包应有的文件名,如 <c>GC-1.0.7-mac-arm64.zip</c>。</summary> /// <summary>启动器包应有的文件名,如 <c>GCL-1.0.10-mac-arm64.zip</c>。</summary>
public static string PackageFileName(string version, string rid) public static string PackageFileName(string version, string rid)
=> $"GC-{version.Trim().TrimStart('v', 'V')}-{LabelOf(rid)}.zip"; => $"GCL-{version.Trim().TrimStart('v', 'V')}-{LabelOf(rid)}.zip";
/// <summary> /// <summary>
/// 判断某个 zip 名是不是「这个版本 + 这个平台」的启动器包。 /// 判断某个 zip 名是不是「这个版本 + 这个平台」的启动器包。
@@ -57,7 +58,10 @@ public static class LauncherArtifacts
public static bool LooksLikePackage(string fileName, string version, string rid) public static bool LooksLikePackage(string fileName, string version, string rid)
{ {
if (!fileName.EndsWith(".zip", StringComparison.OrdinalIgnoreCase)) return false; if (!fileName.EndsWith(".zip", StringComparison.OrdinalIgnoreCase)) return false;
if (!fileName.StartsWith("GC-", StringComparison.OrdinalIgnoreCase)) return false; // 1.0.10 起发布包统一叫 GCL-<版本>-<平台>.zip;GC- 是老命名,
// 一并认,装过 1.0.9 及更早版本的机器才不会把新包当成「不是启动器包」。
if (!fileName.StartsWith("GCL-", StringComparison.OrdinalIgnoreCase) &&
!fileName.StartsWith("GC-", StringComparison.OrdinalIgnoreCase)) return false;
var v = version.Trim().TrimStart('v', 'V'); var v = version.Trim().TrimStart('v', 'V');
if (v.Length > 0 && fileName.IndexOf(v, StringComparison.OrdinalIgnoreCase) < 0) return false; if (v.Length > 0 && fileName.IndexOf(v, StringComparison.OrdinalIgnoreCase) < 0) return false;
+72 -7
View File
@@ -90,7 +90,13 @@ public static class LauncherUpdater
} }
} }
if (candidates.Count == 0) return null; if (candidates.Count == 0)
{
// 两个源都连不上或都没发 Release:返回一个带明确语义的信号,
// 让上层能区分「检查失败」和「已是最新」。用 null 版本 + 特殊标记表达。
Console.WriteLine("[update] 所有源都不可达,无法检查启动器更新");
return null;
}
// 取版本号最高的(第 7 项) // 取版本号最高的(第 7 项)
var best = candidates.OrderByDescending(c => VersionUtil.Parse(c.Version)).First(); var best = candidates.OrderByDescending(c => VersionUtil.Parse(c.Version)).First();
@@ -194,8 +200,26 @@ public static class LauncherUpdater
{ {
using var ms = new MemoryStream(zip); using var ms = new MemoryStream(zip);
using var archive = new System.IO.Compression.ZipArchive(ms, System.IO.Compression.ZipArchiveMode.Read); using var archive = new System.IO.Compression.ZipArchive(ms, System.IO.Compression.ZipArchiveMode.Read);
// 找主程序:app 内的可执行文件 / GC.dll / 单文件 exe
var entry = archive.Entries.FirstOrDefault(e => // 发布包从 1.0.10 起改为 GCL 命名 + 单文件 + 单顶层目录,主程序是
// <顶层>/GCL-<版本>-<平台>.exe (Windows)
// <顶层>/GCL-<版本>-<平台> (Linux,无扩展名)
// <顶层>/GCL-<版本>-mac-arm64.app/... (macOS)
// 旧布局则是 GC.dll / GC / GC*.dll。先找新名,再退回旧名,兼容老发布包。
// 注意排除 GC-UI / GC-SAVEDOG / .GC/bin 里的附属程序,它们不是启动器本体。
bool IsLauncher(System.IO.Compression.ZipArchiveEntry e)
{
var n = e.Name;
if (n.Length == 0) return false; // 目录条目
if (n.StartsWith("GC-UI", StringComparison.OrdinalIgnoreCase) ||
n.StartsWith("GC-SAVEDOG", StringComparison.OrdinalIgnoreCase)) return false;
if (e.FullName.Replace('\\', '/').Contains("/.GC/")) return false;
if (n.StartsWith("GCL-", StringComparison.OrdinalIgnoreCase)) return true;
return false;
}
var entry = archive.Entries.FirstOrDefault(IsLauncher)
?? archive.Entries.FirstOrDefault(e =>
e.Name.Equals("GC.dll", StringComparison.OrdinalIgnoreCase)) e.Name.Equals("GC.dll", StringComparison.OrdinalIgnoreCase))
?? archive.Entries.FirstOrDefault(e => ?? archive.Entries.FirstOrDefault(e =>
e.Name.Equals("GC", StringComparison.OrdinalIgnoreCase)) e.Name.Equals("GC", StringComparison.OrdinalIgnoreCase))
@@ -367,8 +391,12 @@ public static class LauncherUpdater
else if (File.Exists(manifestCopy)) else if (File.Exists(manifestCopy))
File.Delete(manifestCopy); File.Delete(manifestCopy);
// 包名:GC-<版本>-<平台标签>.app/.exe(SAVEDOG 找不到时会自行扫描包内顶层) // 包名:GCL-<版本>-<平台标签>.app/.exe(SAVEDOG 找不到时会自行扫描包内顶层)。
var packageName = $"GC-{latest}-{PlatformLabel}" + (OperatingSystem.IsMacOS() ? ".app" : ".exe"); // Linux 的启动器没有扩展名,别硬加 .exe —— 那会让按包名查找永远落空。
var packageName = $"GCL-{latest}-{PlatformLabel}" +
(OperatingSystem.IsMacOS() ? ".app"
: OperatingSystem.IsWindows() ? ".exe"
: "");
var request = new SavedogRequest var request = new SavedogRequest
{ {
@@ -447,7 +475,8 @@ public static class LauncherUpdater
/// 找不到 SAVEDOG 时退回旧脚本流程(只用于从老版本升级的过渡)。 /// 找不到 SAVEDOG 时退回旧脚本流程(只用于从老版本升级的过渡)。
/// 返回 true 表示调用方应立即退出进程。 /// 返回 true 表示调用方应立即退出进程。
/// </summary> /// </summary>
public static bool ScheduleApply(AppPaths paths, string packageName) /// <param name="execute">只写脚本不执行(测试用,避免真的搬动文件)。</param>
public static bool ScheduleApply(AppPaths paths, string packageName, bool execute = true)
{ {
// 安全阀:绝不在源码目录执行替换(防止误删源码) // 安全阀:绝不在源码目录执行替换(防止误删源码)
if (File.Exists(Path.Combine(paths.InstallDirectory, "GC.sln"))) if (File.Exists(Path.Combine(paths.InstallDirectory, "GC.sln")))
@@ -484,6 +513,8 @@ public static class LauncherUpdater
catch { } catch { }
} }
if (!execute) return true;
var psi = isWin var psi = isWin
? new System.Diagnostics.ProcessStartInfo("cmd.exe") ? new System.Diagnostics.ProcessStartInfo("cmd.exe")
{ UseShellExecute = false, CreateNoWindow = true } { UseShellExecute = false, CreateNoWindow = true }
@@ -576,7 +607,10 @@ public static class LauncherUpdater
s.AppendLine(); s.AppendLine();
s.AppendLine("# delete old GC-* files: SAME platform only, version != latest"); s.AppendLine("# delete old GC-* files: SAME platform only, version != latest");
s.AppendLine("# files of OTHER platforms are NEVER touched"); s.AppendLine("# files of OTHER platforms are NEVER touched");
s.AppendLine("for item in \"$DST\"/GC-*.app \"$DST\"/GC-*.exe; do"); // Linux 的启动器没有扩展名(GC-1.0.9-linux-amd64),只匹配 *.app/*.exe 会漏掉,
// 结果是每次更新都在安装目录里多留一个旧版本。这里统一按 GC- 前缀扫,
// 再用「版本号-平台」的形态兜底,避免误删同目录的其它文件。
s.AppendLine("for item in \"$DST\"/GC-*; do");
s.AppendLine(" [ -e \"$item\" ] || continue"); s.AppendLine(" [ -e \"$item\" ] || continue");
s.AppendLine(" [ \"$item\" = \"$NEW\" ] && continue"); s.AppendLine(" [ \"$item\" = \"$NEW\" ] && continue");
s.AppendLine(" base=$(basename \"$item\")"); s.AppendLine(" base=$(basename \"$item\")");
@@ -584,6 +618,10 @@ public static class LauncherUpdater
s.AppendLine(" case \"$base\" in"); s.AppendLine(" case \"$base\" in");
s.AppendLine(" *.app) stem=${stem%.app} ;;"); s.AppendLine(" *.app) stem=${stem%.app} ;;");
s.AppendLine(" *.exe) stem=${stem%.exe} ;;"); s.AppendLine(" *.exe) stem=${stem%.exe} ;;");
s.AppendLine(" esac");
s.AppendLine(" # 只认 <版本>-<系统>-<架构>,其它名字一律不动");
s.AppendLine(" case \"$stem\" in");
s.AppendLine(" [0-9]*-*-*) ;;");
s.AppendLine(" *) continue ;;"); s.AppendLine(" *) continue ;;");
s.AppendLine(" esac"); s.AppendLine(" esac");
s.AppendLine(" ver=${stem%%-*}"); s.AppendLine(" ver=${stem%%-*}");
@@ -711,6 +749,17 @@ public static class LauncherUpdater
return name; return name;
} }
if (name.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)) return name; if (name.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)) return name;
// Linux 的启动器没有扩展名(GC-1.0.9-linux-amd64),以前只认 .app/.exe,
// 结果解压完判定「没找到新版启动器」,Linux 更新永远失败。
// 注意不能用 Path.HasExtension:版本号 9.9.9 里的点会让它误判成有扩展名。
if ((name.StartsWith("GC-", StringComparison.OrdinalIgnoreCase) ||
name.StartsWith("GCL-", StringComparison.OrdinalIgnoreCase)) &&
name.EndsWith("-" + PlatformLabel, StringComparison.OrdinalIgnoreCase))
{
TryMarkExecutable(dest);
return name;
}
} }
} }
catch (Exception ex) catch (Exception ex)
@@ -720,6 +769,22 @@ public static class LauncherUpdater
return null; return null;
} }
/// <summary>给 Linux/macOS 上的可执行文件补上执行位(zip 不保留权限)。</summary>
private static void TryMarkExecutable(string path)
{
if (OperatingSystem.IsWindows() || !File.Exists(path)) return;
try
{
var mode = File.GetUnixFileMode(path);
File.SetUnixFileMode(path, mode | UnixFileMode.UserExecute |
UnixFileMode.GroupExecute | UnixFileMode.OtherExecute);
}
catch
{
// 权限设置失败不影响后续流程,用户可手动 chmod
}
}
private static string? ReadMarker(string file, string key) private static string? ReadMarker(string file, string key)
{ {
try try
+63 -9
View File
@@ -1,5 +1,6 @@
using System; using System;
using System.IO; using System.IO;
using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using GC.Models; using GC.Models;
@@ -8,17 +9,43 @@ namespace GC.Services;
public static class ModelInstaller public static class ModelInstaller
{ {
// 与后端 /api/models/{id} 的白名单保持一致:单段名称,首字符必须字母或数字。
// 拒绝 . / .. / 路径分隔符 / 盘符 / 绝对路径,杜绝把 model.Id 当成路径来用。
private static readonly Regex SafeId = new(
"^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$", RegexOptions.Compiled);
/// <summary>把源里的模型目录复制进本地模型库(先写临时目录再原子替换)。</summary> /// <summary>把源里的模型目录复制进本地模型库(先写临时目录再原子替换)。</summary>
public static async Task<string> InstallAsync(RemoteModel model, string modelRoot, public static async Task<string> InstallAsync(RemoteModel model, string modelRoot,
IProgress<(long Done, long Total)>? progress, CancellationToken ct) IProgress<(long Done, long Total)>? progress, CancellationToken ct)
{ {
var target = Path.Combine(modelRoot, model.Id); ArgumentNullException.ThrowIfNull(model);
var staging = target + ".installing"; if (string.IsNullOrWhiteSpace(modelRoot))
throw new InvalidOperationException("模型根目录未配置");
// ---- 1. 模型标识必须是单段安全名称,且解析后仍在模型根目录内 ----
var target = SafeChildPath(modelRoot, model.Id);
var rootFull = Path.GetFullPath(modelRoot);
var staging = VerifyUnderRoot(target + ".installing", rootFull);
var backup = VerifyUnderRoot(target + ".old", rootFull);
// ---- 2. 源目录与三个目标路径都不能是符号链接/重解析点 ----
EnsureNoLink(model.Directory);
foreach (var p in new[] { target, staging, backup }) EnsureNoLink(p);
if (Directory.Exists(staging)) Directory.Delete(staging, true); if (Directory.Exists(staging)) Directory.Delete(staging, true);
Directory.CreateDirectory(staging); Directory.CreateDirectory(staging);
// 枚举时跳过符号链接/重解析点:源目录里若有人放了指向外部的链接,
// 绝不能顺着它把模型库外的文件读进来。
var enumeration = new EnumerationOptions
{
RecurseSubdirectories = true,
AttributesToSkip = FileAttributes.ReparsePoint,
IgnoreInaccessible = false
};
var files = Directory.GetFiles(model.Directory, "*", enumeration);
long total = 0; long total = 0;
var files = Directory.GetFiles(model.Directory, "*", SearchOption.AllDirectories);
foreach (var file in files) foreach (var file in files)
{ {
try { total += new FileInfo(file).Length; } catch { } try { total += new FileInfo(file).Length; } catch { }
@@ -32,11 +59,7 @@ public static class ModelInstaller
ct.ThrowIfCancellationRequested(); ct.ThrowIfCancellationRequested();
var relative = Path.GetRelativePath(model.Directory, file); var relative = Path.GetRelativePath(model.Directory, file);
// 路径穿越防护:相对路径必须完整落在 staging 目录内 // 路径穿越防护:相对路径必须完整落在 staging 目录内
var dest = Path.GetFullPath(Path.Combine(staging, relative)); var dest = VerifyUnderRoot(Path.Combine(staging, relative), Path.GetFullPath(staging));
var stagingFull = Path.GetFullPath(staging)
.TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar;
if (!dest.StartsWith(stagingFull, StringComparison.OrdinalIgnoreCase))
throw new InvalidOperationException($"非法的模型文件路径: {relative}");
var destDir = Path.GetDirectoryName(dest); var destDir = Path.GetDirectoryName(dest);
if (!string.IsNullOrEmpty(destDir)) Directory.CreateDirectory(destDir); if (!string.IsNullOrEmpty(destDir)) Directory.CreateDirectory(destDir);
@@ -52,7 +75,6 @@ public static class ModelInstaller
} }
// 原子替换:先备份旧目录,第二次 Move 失败时完整回滚,绝不把模型库清空 // 原子替换:先备份旧目录,第二次 Move 失败时完整回滚,绝不把模型库清空
var backup = target + ".old";
if (Directory.Exists(backup)) Directory.Delete(backup, true); if (Directory.Exists(backup)) Directory.Delete(backup, true);
var hasBackup = false; var hasBackup = false;
try try
@@ -85,4 +107,36 @@ public static class ModelInstaller
throw; throw;
} }
} }
/// <summary>把 id 限定为单段安全名称,并确认拼出来的路径仍在 root 内。</summary>
private static string SafeChildPath(string root, string? id)
{
if (string.IsNullOrWhiteSpace(id) ||
id == "." || id == ".." ||
id.IndexOfAny(new[] { '/', '\\', ':' }) >= 0 ||
Path.IsPathRooted(id) ||
!SafeId.IsMatch(id))
throw new InvalidOperationException($"非法的模型标识: {id}");
var rootFull = Path.GetFullPath(root);
return VerifyUnderRoot(Path.Combine(rootFull, id), rootFull);
}
/// <summary>解析绝对路径并确认 candidate 位于 root 之内。</summary>
private static string VerifyUnderRoot(string candidate, string rootFull)
{
var full = Path.GetFullPath(candidate);
var prefix = rootFull.TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar;
if (!full.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
throw new InvalidOperationException($"路径越界: {candidate}");
return full;
}
/// <summary>拒绝符号链接 / junction / 重解析点,避免顺着链接写到模型库外。</summary>
private static void EnsureNoLink(string path)
{
if (!File.Exists(path) && !Directory.Exists(path)) return;
if ((File.GetAttributes(path) & FileAttributes.ReparsePoint) != 0)
throw new InvalidOperationException($"拒绝符号链接路径: {path}");
}
} }
+21 -15
View File
@@ -5,6 +5,8 @@ using System.IO;
using System.IO.Compression; using System.IO.Compression;
using System.Linq; using System.Linq;
using System.Net.Http; using System.Net.Http;
using System.Security.Cryptography;
using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using GC.Models; using GC.Models;
@@ -19,16 +21,11 @@ namespace GC.Services;
public sealed class ModelSourceClient : IModelSourceClient public sealed class ModelSourceClient : IModelSourceClient
{ {
private readonly AppPaths _paths; private readonly AppPaths _paths;
private static readonly HttpClient Http = CreateHttp();
public ModelSourceClient(AppPaths paths) => _paths = paths; public ModelSourceClient(AppPaths paths) => _paths = paths;
private static HttpClient CreateHttp() // 使用共享 HttpClient(长超时版本用于大文件下载)
{ private static readonly HttpClient Http = SharedHttpClientFactory.GetLongTimeout();
var client = new HttpClient { Timeout = TimeSpan.FromMinutes(5) };
client.DefaultRequestHeaders.UserAgent.ParseAdd("GC/1.0 (+model-source)");
return client;
}
public async Task<SourceIndex> FetchAsync(ModelSource source, bool force, IProgress<string>? log, CancellationToken ct) public async Task<SourceIndex> FetchAsync(ModelSource source, bool force, IProgress<string>? log, CancellationToken ct)
{ {
@@ -152,24 +149,33 @@ public sealed class ModelSourceClient : IModelSourceClient
else if (host.Contains("gitee.com")) else if (host.Contains("gitee.com"))
yield return $"https://gitee.com/{owner}/{repo}/repository/archive/{b}.zip"; yield return $"https://gitee.com/{owner}/{repo}/repository/archive/{b}.zip";
else else
yield break; {
// 自托管 Gitea(如 git.xhmcl.com):用 archive/<branch>.zip 拉源码归档。
// 关键:不能在这里 yield break —— 那样就只剩 git clone 一条路,
// 用户机器没装 git 时「检测模型 / 下载 / 自动更新」会全部失效。
// 归档下载走 ResumableDownloader,无需系统 git。
yield return $"{uri.GetLeftPart(UriPartial.Authority)}/{owner}/{repo}/archive/{b}.zip";
}
} }
} }
private async Task DownloadZipAsync(string url, string cacheDir, CancellationToken ct) private async Task DownloadZipAsync(string url, string cacheDir, CancellationToken ct)
{ {
// .part 用 URL 哈希做稳定文件名:同一个源重试时命中同一份半成品,
// 断点续传才有意义(用 GUID 的话每次重试都是新文件,等于从零开始)。
// 解压目录仍用 GUID —— 它只是中间产物,成功后整块移走或失败即删。
var key = Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(url)))[..16].ToLowerInvariant();
var partPath = Path.Combine(_paths.CacheRoot, "tmp", "downloads", key + ".part");
var tmpRoot = Path.Combine(_paths.CacheRoot, "tmp", Guid.NewGuid().ToString("N")); var tmpRoot = Path.Combine(_paths.CacheRoot, "tmp", Guid.NewGuid().ToString("N"));
Directory.CreateDirectory(tmpRoot); Directory.CreateDirectory(tmpRoot);
var zipPath = Path.Combine(tmpRoot, "source.zip"); var zipPath = Path.Combine(tmpRoot, "source.zip");
try try
{ {
using (var response = await Http.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, ct)) // 带断点续传的流式下载;网络中断时 .part 保留,下次从这里接上。
{ await ResumableDownloader.DownloadAsync(Http, url, partPath, null, ct)
response.EnsureSuccessStatusCode(); .ConfigureAwait(false);
await using var input = await response.Content.ReadAsStreamAsync(ct); // 下载完整,.part 转正。转正成功即代表这份 zip 已完整,删掉 .part 避免重复下载。
await using var output = File.Create(zipPath); File.Move(partPath, zipPath, overwrite: true);
await input.CopyToAsync(output, 81920, ct);
}
var extractDir = Path.Combine(tmpRoot, "extract"); var extractDir = Path.Combine(tmpRoot, "extract");
Directory.CreateDirectory(extractDir); Directory.CreateDirectory(extractDir);
+100
View File
@@ -0,0 +1,100 @@
using System;
using System.IO;
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading;
using System.Threading.Tasks;
namespace GC.Services;
/// <summary>
/// 带断点续传的流式下载器。已下载的部分写在 <c>*.part</c> 文件里,
/// 完整下载后由调用方把 .part 改成正式文件名。
///
/// 为什么需要它:模型源码 zip 可能有上百 MB,弱网中断后如果每次都从头下,
/// 用户会反复卡在同一个地方。这里用 HTTP Range 从已下载的字节接着下。
///
/// 兼容性:服务器不支持 Range(忽略请求、返回 200)时自动退化为整段下载,
/// 不会卡死或拿到半截文件。<see cref="Content-Range"/> 起始位置不符时也从头下。
///
/// .part 文件只有在"续传"场景才复用;一旦下载完整、调用方改名为正式文件,
/// 下次就是全新下载,不会把旧内容接在新内容后面。
/// </summary>
public static class ResumableDownloader
{
/// <summary>
/// 下载 <paramref name="url"/>,数据写入 <paramref name="partPath"/>。
/// 返回最终 .part 文件的字节数。下载完整后由调用方负责改名 / 校验。
/// </summary>
public static async Task<long> DownloadAsync(
HttpClient http,
string url,
string partPath,
IProgress<(long Done, long Total)>? progress,
CancellationToken ct)
{
// 已有 .part 就尝试从断点续传;没有则从头下
long resumeFrom = 0;
if (File.Exists(partPath))
{
try { resumeFrom = new FileInfo(partPath).Length; }
catch { resumeFrom = 0; }
}
using var req = new HttpRequestMessage(HttpMethod.Get, url);
if (resumeFrom > 0)
req.Headers.Range = new RangeHeaderValue(resumeFrom, null);
using var response = await http.SendAsync(req, HttpCompletionOption.ResponseHeadersRead, ct)
.ConfigureAwait(false);
response.EnsureSuccessStatusCode();
var canResume = response.StatusCode == HttpStatusCode.PartialContent && resumeFrom > 0;
long? total = response.Content.Headers.ContentLength;
if (canResume)
{
// 校验服务器确实从我们要的位置开始返回:Content-Range: bytes START-END/TOTAL
var range = response.Content.Headers.ContentRange;
if (range?.HasRange == true && range.From == resumeFrom && range.Length.HasValue)
{
total = range.Length.Value;
}
else
{
// 服务器忽略了 Range 或给出的范围对不上:从头覆盖,避免拼接出损坏的文件
canResume = false;
resumeFrom = 0;
}
}
var mode = canResume ? FileMode.Append : FileMode.Create;
var dir = Path.GetDirectoryName(partPath);
if (!string.IsNullOrEmpty(dir)) Directory.CreateDirectory(dir);
await using (var input = await response.Content.ReadAsStreamAsync(ct).ConfigureAwait(false))
await using (var output = new FileStream(partPath, mode, FileAccess.Write, FileShare.Read,
81920, useAsync: true))
{
var buffer = new byte[81920];
long done = resumeFrom;
int read;
while ((read = await input.ReadAsync(buffer.AsMemory(), ct).ConfigureAwait(false)) > 0)
{
await output.WriteAsync(buffer.AsMemory(0, read), ct).ConfigureAwait(false);
done += read;
// Total 未知时用已下载量当分母,进度条会停在 100% 之前但不报错
progress?.Report((done, total ?? done));
}
}
return SafeLength(partPath);
}
private static long SafeLength(string path)
{
try { return new FileInfo(path).Length; }
catch { return 0; }
}
}
+19 -2
View File
@@ -20,9 +20,21 @@ public static class SavedogLauncher
var name = SavedogFiles.ExecutableName; var name = SavedogFiles.ExecutableName;
var install = paths.InstallDirectory; var install = paths.InstallDirectory;
// 首选 .GC/safedog:更新时整目录替换不会碰这里,正在运行的守护进程也安全。
var home = Path.Combine(paths.SafedogRoot, name);
if (File.Exists(home)) return home;
// 包内 payload:非本体文件统一收在 .GC/bin
var payload = Path.Combine(install, ".GC", "bin", name);
if (File.Exists(payload)) return payload;
var direct = Path.Combine(install, name); var direct = Path.Combine(install, name);
if (File.Exists(direct)) return direct; if (File.Exists(direct)) return direct;
// 1.0.10 及更早的包把守护进程放在 safedog/ 子目录
var packaged = Path.Combine(install, "safedog", name);
if (File.Exists(packaged)) return packaged;
// macOS:可能放在 .app 内部 // macOS:可能放在 .app 内部
try try
{ {
@@ -100,8 +112,13 @@ public static class SavedogLauncher
catch { } catch { }
} }
Process.Start(psi); var process = Process.Start(psi);
Console.WriteLine($"[update] GC-SAVEDOG 已启动: {exe}"); if (process == null)
{
error = "无法启动 GC-SAVEDOG:Process.Start 返回 null(参数或路径问题)";
return false;
}
Console.WriteLine($"[update] GC-SAVEDOG 已启动: {exe}(PID {process.Id})");
return true; return true;
} }
catch (Exception ex) catch (Exception ex)
+32 -21
View File
@@ -9,22 +9,18 @@ using System.Threading.Tasks;
namespace GC.Services; namespace GC.Services;
/// <summary> /// <summary>
/// 双源选择:Xhmcl 与 GitCode 是同一份仓库的两个镜像。 /// 多源选择:Xhmcl 与 GitHub 是同一份仓库的两个镜像。
/// ///
/// 启动更新 / 下载页面 / 检查更新时,先并发探测两边的 version.json 响应时间, /// 启动更新 / 下载页面 / 检查更新时,先并发探测各源的 version.json 响应时间,
/// 取**最快且内容可用**的那个作为本次下载源;探测结果缓存一段时间, /// 取**最快且内容可用**的那个作为本次下载源;探测结果缓存一段时间,
/// 避免每次点下载都重新测速。 /// 避免每次点下载都重新测速。单个源探测超时 2 秒,慢源不会拖住整体。
/// </summary> /// </summary>
public sealed class SourceSelector : ISourceSelector public sealed class SourceSelector : ISourceSelector
{ {
private static readonly HttpClient Http = CreateHttp(); /// <summary>单源探测超时:超过 2 秒视为不可用(用户可见的「ping 2s」)。</summary>
private static readonly TimeSpan ProbeTimeout = TimeSpan.FromSeconds(2);
private static HttpClient CreateHttp() // 使用共享 HttpClient 工厂,统一连接管理,避免端口耗尽
{ private static readonly HttpClient Http = SharedHttpClientFactory.GetDefault();
var c = new HttpClient { Timeout = TimeSpan.FromSeconds(6) };
c.DefaultRequestHeaders.UserAgent.ParseAdd("GC-Probe/1.0");
return c;
}
private readonly object _lock = new(); private readonly object _lock = new();
private SourcePreset? _cached; private SourcePreset? _cached;
@@ -40,7 +36,8 @@ public sealed class SourceSelector : ISourceSelector
/// <summary> /// <summary>
/// 探测两个源并返回最快的。force=true 时忽略缓存。 /// 探测两个源并返回最快的。force=true 时忽略缓存。
/// 两个都失败时返回 GitCode(默认源)。 /// 两个都失败时退回主源(Xhmcl):GitCode 镜像已停更,用它兜底只会拿到过期的
/// version.json —— 反而让人以为「没有更新」。
/// </summary> /// </summary>
public async Task<SourcePreset> PickFastestAsync(bool force = false, CancellationToken ct = default) public async Task<SourcePreset> PickFastestAsync(bool force = false, CancellationToken ct = default)
{ {
@@ -64,25 +61,36 @@ public sealed class SourceSelector : ISourceSelector
LastLatency = latencies; LastLatency = latencies;
var usable = results.Where(r => r.Ok).OrderBy(r => r.Ms).ToList(); var usable = results.Where(r => r.Ok).OrderBy(r => r.Ms).ToList();
var chosen = usable.Count > 0 ? usable[0].Preset : SourcePreset.GitCode; // 全部探测失败时退回主源(SourcePreset.All 的第一项 = Xhmcl),
// 不要退回已停更的 GitCode 镜像。
var fallback = SourcePreset.All.Length > 0 ? SourcePreset.All[0] : SourcePreset.Xhmcl;
var chosen = usable.Count > 0 ? usable[0].Preset : fallback;
if (usable.Count == 0)
GcLog.Warn($"所有源探测失败,退回主源 {chosen.Name}",
$"All probes failed, fallback to {chosen.Name}");
lock (_lock) lock (_lock)
{ {
_cached = chosen; _cached = chosen;
_cachedAt = DateTime.UtcNow; // 全部探测失败的结果不缓存:网络刚恢复时应该立刻重新测速,
// 而不是被一次失败的探测锁住 3 分钟。
_cachedAt = usable.Count > 0 ? DateTime.UtcNow : DateTime.MinValue;
} }
Console.WriteLine("[selector] 测速:" + string.Join(" ", GcLog.Info($"测速结果:{string.Join(" ",
results.Select(r => $"{r.Preset.Name}={r.Ms}ms{(r.Ok ? "" : "(不可用)")}")) results.Select(r => $"{r.Preset.Name}={r.Ms}ms{(r.Ok ? "" : "(不可用)")}"))} → 选择 {chosen.Name}",
+ $" → 选择 {chosen.Name}"); $"Probe results: {string.Join(", ",
results.Select(r => $"{r.Preset.Name}={r.Ms}ms{(r.Ok ? "" : "(unavailable)")}"))} -> chosen: {chosen.Name}");
return chosen; return chosen;
} }
/// <summary> /// <summary>
/// 探测:能拿到合法 JSON 才算可用。 /// 探测:能拿到合法 JSON 才算可用。
/// 注意两个平台取文件的方式不同: /// 注意各平台取文件的方式不同:
/// · Gitea(Xhmcl):raw/branch/{b}/{path} 直接返回文件内容 /// · Gitea(Xhmcl):raw/branch/{b}/{path} 直接返回文件内容
/// · GitHub:raw.githubusercontent.com/{b}/{path} 直接返回文件内容
/// · GitCode:raw 地址返回的是 HTML 页面,必须走 API(内容为 base64) /// · GitCode:raw 地址返回的是 HTML 页面,必须走 API(内容为 base64)
/// 因此 GitCode 用 api/v5 contents + Accept: application/json 探测。 /// 因此 GitCode 用 api/v5 contents + Accept: application/json 探测。
/// </summary> /// </summary>
@@ -93,7 +101,7 @@ public sealed class SourceSelector : ISourceSelector
try try
{ {
using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct); using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct);
cts.CancelAfter(TimeSpan.FromSeconds(5)); cts.CancelAfter(ProbeTimeout);
var api = $"{preset.ApiBase}/repos/{preset.Owner}/{preset.Repo}/contents/version.json?ref={preset.Branch}"; var api = $"{preset.ApiBase}/repos/{preset.Owner}/{preset.Repo}/contents/version.json?ref={preset.Branch}";
using var req = new HttpRequestMessage(HttpMethod.Get, api); using var req = new HttpRequestMessage(HttpMethod.Get, api);
req.Headers.Accept.ParseAdd("application/json"); req.Headers.Accept.ParseAdd("application/json");
@@ -112,7 +120,7 @@ public sealed class SourceSelector : ISourceSelector
try try
{ {
using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct); using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct);
cts.CancelAfter(TimeSpan.FromSeconds(5)); cts.CancelAfter(ProbeTimeout);
var text = await Http.GetStringAsync(url, cts.Token); var text = await Http.GetStringAsync(url, cts.Token);
if (text.TrimStart().StartsWith('{')) return true; if (text.TrimStart().StartsWith('{')) return true;
} }
@@ -125,6 +133,9 @@ public sealed class SourceSelector : ISourceSelector
public static IModelRemote CreateRemote(SourcePreset preset) => preset.Kind switch public static IModelRemote CreateRemote(SourcePreset preset) => preset.Kind switch
{ {
"gitea" => new GiteaRemote(preset), "gitea" => new GiteaRemote(preset),
_ => new GitCodeReleaseRemote(null, preset.HomeUrl) // GitHub 的 contents / releases API 与 Gitea 同构,复用同一实现
"github" => new GiteaRemote(preset),
"gitcode" => new GitCodeReleaseRemote(null, preset.HomeUrl),
_ => throw new InvalidOperationException($"未知的源类型: {preset.Kind}")
}; };
} }
+390 -104
View File
@@ -26,13 +26,14 @@ internal sealed class ApplyOptions
/// </summary> /// </summary>
internal sealed class Applier internal sealed class Applier
{ {
private static readonly Regex ArtifactPattern = new(
@"^GC-(?<ver>.+?)-(?<plat>[^\-]+-[^\-]+)\.(app|exe)$",
RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
private readonly ApplyOptions _options; private readonly ApplyOptions _options;
private readonly Log _log; private readonly Log _log;
/// <summary>发布包里的启动器文件名:GC-1.0.9-win-amd64.exe。</summary>
private static readonly Regex VersionedExePattern = new(
@"^(?:GC|GCL)-\d+(?:\.\d+)+-[A-Za-z0-9]+-[A-Za-z0-9]+\.exe$",
RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Compiled);
public Applier(ApplyOptions options, Log log) public Applier(ApplyOptions options, Log log)
{ {
_options = options; _options = options;
@@ -45,20 +46,24 @@ internal sealed class Applier
var requestPath = Path.Combine(updateDir, SavedogFiles.ApplyRequest); var requestPath = Path.Combine(updateDir, SavedogFiles.ApplyRequest);
if (!File.Exists(requestPath)) if (!File.Exists(requestPath))
return Fail(updateDir, "找不到更新申请 " + SavedogFiles.ApplyRequest, 3); return Fail(updateDir, "找不到更新申请 " + SavedogFiles.ApplyRequest, 3,
"Update request not found: " + SavedogFiles.ApplyRequest);
var request = Json.Read<SavedogRequest>(requestPath); var request = Json.Read<SavedogRequest>(requestPath);
if (request == null || string.IsNullOrWhiteSpace(request.Version)) if (request == null || string.IsNullOrWhiteSpace(request.Version))
return Fail(updateDir, "更新申请内容不完整", 3); return Fail(updateDir, "更新申请内容不完整", 3, "The update request is incomplete");
if (!ValidName(request.PackageName)) if (!ValidName(request.PackageName))
return Fail(updateDir, "更新包名不合法: " + request.PackageName, 3); return Fail(updateDir, "更新包名不合法: " + request.PackageName, 3,
"Invalid package name: " + request.PackageName);
_log.Info($"开始应用 v{request.Version}({request.Rid},{request.PackageName})"); _log.Info($"开始应用 v{request.Version}({request.Rid},{request.PackageName})",
$"Starting apply of v{request.Version} ({request.Rid}, {request.PackageName})");
// 1. 等旧进程退出(否则 Windows 上文件还被占用) // 1. 等旧进程退出(否则 Windows 上文件还被占用)
if (_options.WaitPid > 0 && !WaitForExit(_options.WaitPid, TimeSpan.FromSeconds(60))) if (_options.WaitPid > 0 && !WaitForExit(_options.WaitPid, TimeSpan.FromSeconds(60)))
_log.Warn($"等待进程 {_options.WaitPid} 退出超时,继续尝试"); _log.Warn($"等待进程 {_options.WaitPid} 退出超时,继续尝试",
$"Timed out waiting for process {_options.WaitPid} to exit; continuing anyway");
// 2. 安装目录定位与安全检查 // 2. 安装目录定位与安全检查
var installDir = string.IsNullOrWhiteSpace(_options.InstallDir) var installDir = string.IsNullOrWhiteSpace(_options.InstallDir)
@@ -66,10 +71,12 @@ internal sealed class Applier
: Path.GetFullPath(_options.InstallDir!); : Path.GetFullPath(_options.InstallDir!);
if (!Directory.Exists(installDir)) if (!Directory.Exists(installDir))
return Fail(updateDir, "安装目录不存在: " + installDir, 4); return Fail(updateDir, "安装目录不存在: " + installDir, 4,
"Install directory does not exist: " + installDir);
if (!_options.Force && File.Exists(Path.Combine(installDir, "GC.sln"))) if (!_options.Force && File.Exists(Path.Combine(installDir, "GC.sln")))
return Fail(updateDir, "检测到源码目录,拒绝在源码树里替换程序", 4); return Fail(updateDir, "检测到源码目录,拒绝在源码树里替换程序", 4,
"Source tree detected; refusing to replace files inside it");
// 3. 二次验签:不信任「启动器说它验过了」 // 3. 二次验签:不信任「启动器说它验过了」
var require = request.RequireSignature && SignatureKeyring.Enforced; var require = request.RequireSignature && SignatureKeyring.Enforced;
@@ -77,42 +84,61 @@ internal sealed class Applier
var manifestText = File.Exists(manifestPath) ? File.ReadAllText(manifestPath) : null; var manifestText = File.Exists(manifestPath) ? File.ReadAllText(manifestPath) : null;
var verification = ManifestSignature.Verify(manifestText, require); var verification = ManifestSignature.Verify(manifestText, require);
if (verification.IsRejected) // 签名不对(被改过 / 密钥不认识)永远拒绝;仅「没有签名」在明确不强制时放行。
// 之前这里不看 require:即使调用方声明 requireSignature=false(开发态、测试),
// 未签名清单也会被当成验签失败直接拒掉。
var hostile = verification.Trust == ManifestTrust.Invalid;
if (hostile || (verification.IsRejected && require))
{ {
_log.Error($"清单验签失败({verification.Trust}):{verification.Error}"); _log.Error($"清单验签失败({verification.Trust}):{verification.Error}",
$"Manifest signature check failed ({verification.Trust}): {verification.Error}");
return Refuse(updateDir, request, verification); return Refuse(updateDir, request, verification);
} }
if (verification.IsRejected)
{
_log.Warn($"清单未签名,按调用方要求放行:{verification.Error}",
$"Manifest is unsigned; continuing as requested: {verification.Error}");
}
_log.Info($"清单可信度:{verification.Trust}" + _log.Info($"清单可信度:{verification.Trust}" +
(verification.KeyId != null ? $"({verification.KeyId})" : "")); (verification.KeyId != null ? $"({verification.KeyId})" : ""),
$"Manifest trust: {verification.Trust}" +
(verification.KeyId != null ? $" ({verification.KeyId})" : ""));
// 4. 校验更新包 // 4. 校验更新包
var zipPath = Path.Combine(updateDir, request.PackageZip); var zipPath = Path.Combine(updateDir, request.PackageZip);
if (!File.Exists(zipPath)) if (!File.Exists(zipPath))
return Fail(updateDir, "更新包不存在: " + request.PackageZip, 5); return Fail(updateDir, "更新包不存在: " + request.PackageZip, 5,
"Package not found: " + request.PackageZip);
var zipInfo = new FileInfo(zipPath); var zipInfo = new FileInfo(zipPath);
if (request.PackageSize > 0 && zipInfo.Length != request.PackageSize) if (request.PackageSize > 0 && zipInfo.Length != request.PackageSize)
return Fail(updateDir, $"更新包体积不符(期望 {request.PackageSize},实际 {zipInfo.Length})", 5); return Fail(updateDir, $"更新包体积不符(期望 {request.PackageSize},实际 {zipInfo.Length})", 5,
$"Package size mismatch (expected {request.PackageSize}, got {zipInfo.Length})");
var actualSha = ContentHash.Sha256File(zipPath); var actualSha = ContentHash.Sha256File(zipPath);
if (!string.IsNullOrWhiteSpace(request.PackageSha256) && if (!string.IsNullOrWhiteSpace(request.PackageSha256) &&
!string.Equals(actualSha, request.PackageSha256, StringComparison.OrdinalIgnoreCase)) !string.Equals(actualSha, request.PackageSha256, StringComparison.OrdinalIgnoreCase))
{ {
return Fail(updateDir, "更新包 sha256 与清单不符,已丢弃", 5); return Fail(updateDir, "更新包 sha256 与清单不符,已丢弃", 5,
"Package sha256 does not match the manifest; discarded");
} }
if (string.IsNullOrWhiteSpace(request.PackageSha256)) if (string.IsNullOrWhiteSpace(request.PackageSha256))
_log.Warn("清单没有提供 sha256,仅依赖签名与解压校验"); _log.Warn("清单没有提供 sha256,仅依赖签名与解压校验",
"Manifest has no sha256; relying on the signature and extraction checks only");
SafeArchive.Inspection inspection; SafeArchive.Inspection inspection;
try try
{ {
inspection = SafeArchive.Inspect(zipPath); inspection = SafeArchive.Inspect(zipPath);
_log.Info($"更新包检查通过:{inspection.Entries} 个条目," + _log.Info($"更新包检查通过:{inspection.Entries} 个条目," +
$"{inspection.UncompressedBytes / 1024 / 1024} MB,压缩比 {inspection.Ratio:0.0}:1"); $"{inspection.UncompressedBytes / 1024 / 1024} MB,压缩比 {inspection.Ratio:0.0}:1",
$"Package inspection passed: {inspection.Entries} entries, " +
$"{inspection.UncompressedBytes / 1024 / 1024} MB, ratio {inspection.Ratio:0.0}:1");
} }
catch (Exception ex) catch (Exception ex)
{ {
return Fail(updateDir, "更新包安全性检查失败: " + ex.Message, 5); return Fail(updateDir, "更新包安全性检查失败: " + ex.Message, 5,
"Package safety check failed: " + ex.Message);
} }
// 5. 解压到暂存区(与安装目录同卷,后续 rename 才是原子的) // 5. 解压到暂存区(与安装目录同卷,后续 rename 才是原子的)
@@ -126,30 +152,39 @@ internal sealed class Applier
catch (Exception ex) catch (Exception ex)
{ {
ClearDirectory(stage); ClearDirectory(stage);
return Fail(updateDir, "解压失败: " + ex.Message, 6); return Fail(updateDir, "解压失败: " + ex.Message, 6, "Extraction failed: " + ex.Message);
} }
var artifact = FindArtifact(stage, request.PackageName); var artifact = FindArtifact(stage, request.PackageName);
if (artifact == null) if (artifact == null)
{ {
ClearDirectory(stage); ClearDirectory(stage);
return Fail(updateDir, "更新包里没有找到新版程序(" + request.PackageName + ")", 6); return Fail(updateDir, "更新包里没有找到新版程序(" + request.PackageName + ")", 6,
"No new launcher found in the package (" + request.PackageName + ")");
} }
var target = Path.Combine(installDir, Path.GetFileName(artifact)); // 主程序:优先用清单里的包名,否则按已知名字挑一个(发布包是整目录,
var alreadyInstalled = File.Exists(target) || Directory.Exists(target); // 里面同时有 GC-UI.exe / GC.UI.Server.exe / GC-SAVEDOG.exe,不能瞎猜第一个)。
var mainName = Path.GetFileName(artifact);
var mainTarget = Path.Combine(installDir, mainName);
if (_options.DryRun) if (_options.DryRun)
{ {
_log.Info($"[dry-run] 校验全部通过,将安装到 {target}"); _log.Info($"[dry-run] 校验全部通过,将整目录安装到 {installDir}" +
$"({Directory.GetFileSystemEntries(stage).Length} 个顶层条目)",
$"[dry-run] All checks passed; would install the whole directory to {installDir} " +
$"({Directory.GetFileSystemEntries(stage).Length} top-level entries)");
ClearDirectory(stage); ClearDirectory(stage);
return 0; return 0;
} }
if (alreadyInstalled) var previous = ReadLastGood(updateDir);
if (previous != null && SameVersion(previous.Version, request.Version) &&
(File.Exists(mainTarget) || Directory.Exists(mainTarget)))
{ {
// 同一版本重复下发:当成已安装,避免反复覆盖正在运行的文件 // 同一版本重复下发:当成已安装,避免反复覆盖正在运行的文件
_log.Info("目标版本已存在,视为已安装"); _log.Info($"v{request.Version} 已安装且上次启动正常,视为已安装",
$"v{request.Version} is already installed and started fine last time; treating as installed");
ClearDirectory(stage); ClearDirectory(stage);
TryDelete(zipPath); TryDelete(zipPath);
TryDelete(requestPath); TryDelete(requestPath);
@@ -157,40 +192,38 @@ internal sealed class Applier
{ {
Status = "applied", Status = "applied",
Version = request.Version, Version = request.Version,
PackageName = Path.GetFileName(artifact), PackageName = mainName,
Verified = true, Verified = true,
Message = "目标版本已存在,无需替换" Message = "目标版本已存在,无需替换"
}); });
return 0; return 0;
} }
// 6. 移入安装目录(不覆盖任何已有文件) // 6. 整目录替换:旧内容先搬到 backup,新内容就位;失败可原样还原。
try // 只动程序文件,.GC(模型库 / 设置 / 更新目录)永远不碰。
{ var replaced = new List<(string Name, string? BackupPath)>();
Directory.CreateDirectory(installDir); if (!ReplaceInstallDirectory(stage, installDir, updateDir, replaced, out var replaceError))
if (Directory.Exists(artifact)) Directory.Move(artifact, target);
else File.Move(artifact, target);
_log.Info("新版已就位: " + Path.GetFileName(target));
}
catch (Exception ex)
{ {
RestoreFromBackup(installDir, replaced);
ClearDirectory(stage); ClearDirectory(stage);
return Fail(updateDir, "移动到安装目录失败: " + ex.Message, 7); return Fail(updateDir, "安装失败: " + replaceError, 7, "Installation failed: " + replaceError);
} }
_log.Info($"新版已就位:{mainName}(替换 {replaced.Count} 个条目)",
$"New version in place: {mainName} (replaced {replaced.Count} entries)");
// 7. 启动并看护 // 7. 启动并看护
var previous = ReadLastGood(updateDir);
StartupHealth.Clear(updateDir); StartupHealth.Clear(updateDir);
Process? child; Process? child;
try try
{ {
child = Launch(target); child = Launch(mainTarget);
} }
catch (Exception ex) catch (Exception ex)
{ {
child = null; child = null;
_log.Error("启动新版失败: " + ex.Message); _log.Error("启动新版失败: " + ex.Message,
"Failed to start the new version: " + ex.Message);
} }
var healthy = child != null && WaitForHealth(updateDir, request.Version, child, var healthy = child != null && WaitForHealth(updateDir, request.Version, child,
@@ -198,15 +231,16 @@ internal sealed class Applier
if (healthy) if (healthy)
{ {
_log.Info($"v{request.Version} 启动正常,更新完成"); _log.Info($"v{request.Version} 启动正常,更新完成",
CleanupOldVersions(installDir, Path.GetFileName(target), request.PlatformLabel); $"v{request.Version} started successfully; update complete");
WriteLastGood(updateDir, request.Version, Path.GetFileName(target)); CleanupBackup(updateDir);
WriteLastGood(updateDir, request.Version, mainName);
WriteState(updateDir, new SavedogState WriteState(updateDir, new SavedogState
{ {
Status = "applied", Status = "applied",
Version = request.Version, Version = request.Version,
PreviousVersion = previous?.Version, PreviousVersion = previous?.Version,
PackageName = Path.GetFileName(target), PackageName = mainName,
Verified = true, Verified = true,
Message = "更新已应用" Message = "更新已应用"
}); });
@@ -216,21 +250,23 @@ internal sealed class Applier
return 0; return 0;
} }
// 8. 回滚 // 8. 回滚:撤掉新装的文件,把备份原样搬回
_log.Error($"v{request.Version} 启动后未通过健康检查({_options.TimeoutSeconds}s),开始回滚"); _log.Error($"v{request.Version} 启动后未通过健康检查({_options.TimeoutSeconds}s),开始回滚",
$"v{request.Version} did not pass the health check after {_options.TimeoutSeconds}s; rolling back");
TryKill(child); TryKill(child);
var removed = RemoveNewVersion(target); var restored = RestoreFromBackup(installDir, replaced);
_log.Info(removed ? "已移除未通过检查的新版" : "新版文件被占用,未能完全移除"); _log.Info(restored ? "已还原为更新前的文件" : "部分文件未能还原,请手动重新安装",
restored ? "Restored the pre-update files" : "Some files could not be restored; please reinstall manually");
var restored = TryLaunchPrevious(installDir, updateDir, previous, request.PlatformLabel); var relaunched = restored && TryLaunchPrevious(installDir, updateDir, previous, request.PlatformLabel);
WriteState(updateDir, new SavedogState WriteState(updateDir, new SavedogState
{ {
Status = "rolledback", Status = "rolledback",
Version = request.Version, Version = request.Version,
PreviousVersion = previous?.Version, PreviousVersion = previous?.Version,
PackageName = Path.GetFileName(target), PackageName = mainName,
Verified = true, Verified = true,
Message = restored Message = relaunched
? "新版本未通过启动检查,已回滚到上一个版本" ? "新版本未通过启动检查,已回滚到上一个版本"
: "新版本未通过启动检查,已移除;未找到可回滚的旧版本,请手动重新安装" : "新版本未通过启动检查,已移除;未找到可回滚的旧版本,请手动重新安装"
}); });
@@ -243,11 +279,18 @@ internal sealed class Applier
// ------------------------------------------------------------------ 校验辅助 // ------------------------------------------------------------------ 校验辅助
/// <summary>
/// 包名合法性:只允许「一个文件名」,杜绝 `../` 之类的路径穿越。
///
/// 不能只认 .app / .exe —— Linux 的启动器没有扩展名
/// (GC-1.0.9-linux-amd64),按旧规则会被直接判成非法包名、更新永远失败。
/// </summary>
private static bool ValidName(string name) private static bool ValidName(string name)
=> name.Length > 0 && name.Length < 200 && => SafeNamePattern.IsMatch(name);
name.IndexOfAny(new[] { '/', '\\', ':', '\0' }) < 0 &&
(name.EndsWith(".app", StringComparison.OrdinalIgnoreCase) || private static readonly Regex SafeNamePattern = new(
name.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)); @"^[A-Za-z0-9][A-Za-z0-9._-]{0,198}$",
RegexOptions.CultureInvariant | RegexOptions.Compiled);
private static bool WaitForExit(int pid, TimeSpan timeout) private static bool WaitForExit(int pid, TimeSpan timeout)
{ {
@@ -280,22 +323,64 @@ internal sealed class Applier
Directory.Move(temp, stage); Directory.Move(temp, stage);
} }
/// <summary>
/// 在解压结果里找主程序。
///
/// 发布包是「整目录」结构(exe + dll + data/),同一层可能有好几个 exe
/// (GC-UI / GC.UI.Server / GC-SAVEDOG / createdump),必须按固定优先级挑,
/// 不能取第一个 —— 否则会把守护进程或调试辅助程序当成启动器拉起来。
/// </summary>
private static string? FindArtifact(string stage, string packageName) private static string? FindArtifact(string stage, string packageName)
{ {
var direct = Path.Combine(stage, packageName); if (!string.IsNullOrWhiteSpace(packageName))
if (File.Exists(direct) || Directory.Exists(direct)) return direct;
foreach (var entry in Directory.GetFileSystemEntries(stage))
{ {
var name = Path.GetFileName(entry); var named = Path.Combine(stage, packageName);
if (name.EndsWith(".app", StringComparison.OrdinalIgnoreCase) && Directory.Exists(entry)) if (File.Exists(named) || Directory.Exists(named)) return named;
return entry; }
if (name.EndsWith(".exe", StringComparison.OrdinalIgnoreCase) && File.Exists(entry))
var entries = Directory.GetFileSystemEntries(stage);
var byName = entries
.Where(e => File.Exists(e))
.OrderByDescending(e => MainExecutablePriority(Path.GetFileName(e)))
.ThenBy(e => Path.GetFileName(e), StringComparer.OrdinalIgnoreCase)
.ToList();
var best = byName.FirstOrDefault(e => MainExecutablePriority(Path.GetFileName(e)) > 0);
if (best != null) return best;
// macOS:.app 目录本身就是「可执行单元」
foreach (var entry in entries)
{
if (Directory.Exists(entry) &&
Path.GetFileName(entry).EndsWith(".app", StringComparison.OrdinalIgnoreCase))
return entry; return entry;
} }
return null; return null;
} }
/// <summary>主程序优先级:数字越大越优先,0 表示不是主程序。</summary>
private static int MainExecutablePriority(string fileName)
{
if (!fileName.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)) return 0;
// 发布包把启动器改名成 GCL-<版本>-<系统>-<架构>.exe(旧包是 GC-),先按这个模式认出来。
if (VersionedExePattern.IsMatch(fileName)) return 110;
var name = Path.GetFileNameWithoutExtension(fileName);
return name switch
{
"GC-UI" => 100,
"GC" => 90,
"GC.UI.Server" => 80,
// 守护进程 / 调试辅助 / 运行时工具:永远不当主程序
"GC-SAVEDOG" => 0,
"createdump" => 0,
"singlefilehost" => 0,
_ => 10
};
}
// ------------------------------------------------------------------ 启动与看护 // ------------------------------------------------------------------ 启动与看护
private Process? Launch(string target) private Process? Launch(string target)
@@ -362,13 +447,14 @@ internal sealed class Applier
var health = StartupHealth.Read(updateDir); var health = StartupHealth.Read(updateDir);
if (health != null && health.Ok && SameVersion(health.Version, version)) if (health != null && health.Ok && SameVersion(health.Version, version))
{ {
_log.Info($"收到健康标记(pid {health.Pid})"); _log.Info($"收到健康标记(pid {health.Pid})", $"Health marker received (pid {health.Pid})");
return true; return true;
} }
if (child.HasExited) if (child.HasExited)
{ {
_log.Error($"新版进程已退出(退出码 {child.ExitCode})"); _log.Error($"新版进程已退出(退出码 {child.ExitCode})",
$"The new process exited (code {child.ExitCode})");
return false; return false;
} }
Thread.Sleep(250); Thread.Sleep(250);
@@ -377,7 +463,8 @@ internal sealed class Applier
// 超时但进程还活着:可能是尚未写入健康标记的旧构建,谨慎放行 // 超时但进程还活着:可能是尚未写入健康标记的旧构建,谨慎放行
if (!child.HasExited) if (!child.HasExited)
{ {
_log.Warn("未收到健康标记,但进程仍在运行,按成功处理"); _log.Warn("未收到健康标记,但进程仍在运行,按成功处理",
"No health marker, but the process is still running; treating as success");
return true; return true;
} }
return false; return false;
@@ -410,57 +497,254 @@ internal sealed class Applier
catch { } catch { }
} }
// ------------------------------------------------------------------ 清理 / 回滚 // ------------------------------------------------------------------ 整目录安装 / 回滚
private void CleanupOldVersions(string installDir, string keepName, string platformLabel) /// <summary>
/// 把 <paramref name="stage"/> 的内容替换进 <paramref name="installDir"/>。
///
/// 发布包是「整目录」(启动器 + 后端运行时 + Flutter 前端资源),只搬一个 exe 会留下
/// 旧后端 / 旧界面,所以这里按目录整体替换:
/// 1. 安装目录里「新版没有」的条目 → 移到 backup(旧版本残留,如上一版的旧文件名);
/// 2. 与新版同名的条目 → 先移到 backup,再把新版放进来(覆盖正在被占用的文件会失败,
/// 这种情况直接报错并还原,绝不留下半新半旧的目录);
/// 3. `.GC` 只合并 `bin/`(非本体文件),其余子目录与更新目录自身一律跳过。
///
/// 返回 false 时调用方应调用 <see cref="RestoreFromBackup"/> 还原。
/// </summary>
private bool ReplaceInstallDirectory(string stage, string installDir, string updateDir,
List<(string Name, string? BackupPath)> replaced, out string? error)
{ {
error = null;
var backupDir = Path.Combine(updateDir, "backup");
try
{
Directory.CreateDirectory(installDir);
ClearDirectory(backupDir);
Directory.CreateDirectory(backupDir);
var incoming = new List<string>();
foreach (var entry in Directory.GetFileSystemEntries(stage))
{
var name = Path.GetFileName(entry);
if (string.Equals(name, ".GC", StringComparison.OrdinalIgnoreCase))
{
// .GC 里只有 bin/ 属于程序本体(守护进程这类「非本体」文件),
// 其余(config / model / cache / update / logs / safedog)是用户数据,
// 整目录替换时必须原地不动。
MergeGcBin(entry, installDir, backupDir, replaced);
continue;
}
if (IsProtected(name))
{
// 例如 GC-SAVEDOG.exe:本进程正在运行,Windows 上无法替换。
// 保留旧版守护进程即可,它下次启动会随包里的新版本一起被更新。
_log.Warn($"跳过受保护文件,保留旧版本:{name}",
$"Skipping protected file, keeping the old one: {name}");
continue;
}
incoming.Add(entry);
}
var incomingNames = new HashSet<string>(
incoming.Select(e => Path.GetFileName(e)), StringComparer.OrdinalIgnoreCase);
// 1. 旧版独有的条目先清走(保留在 backup 里以便回滚)
foreach (var entry in Directory.GetFileSystemEntries(installDir)) foreach (var entry in Directory.GetFileSystemEntries(installDir))
{ {
var name = Path.GetFileName(entry); var name = Path.GetFileName(entry);
if (string.Equals(name, keepName, StringComparison.OrdinalIgnoreCase)) continue; if (incomingNames.Contains(name)) continue;
if (IsProtected(name)) continue;
if (IsSameOrInside(entry, updateDir)) continue;
var match = ArtifactPattern.Match(name); var target = Path.Combine(backupDir, name);
if (!match.Success) continue; MoveEntry(entry, target);
replaced.Add((name, target));
var platform = match.Groups["plat"].Value; _log.Info("旧版残留已备份: " + name, "Old leftover backed up: " + name);
if (!string.Equals(platform, platformLabel, StringComparison.OrdinalIgnoreCase))
{
_log.Info($"保留其它平台版本: {name}");
continue;
} }
try // 2. 同名条目:旧 → backup,新 → 安装目录
foreach (var entry in incoming)
{ {
if (Directory.Exists(entry)) Directory.Delete(entry, true); var name = Path.GetFileName(entry);
else File.Delete(entry); var target = Path.Combine(installDir, name);
_log.Info("清理旧版本: " + name); var backup = Path.Combine(backupDir, name);
}
catch (Exception ex) if (File.Exists(target) || Directory.Exists(target))
{ {
_log.Warn($"清理旧版本失败 {name}: {ex.Message}"); MoveEntry(target, backup);
} replaced.Add((name, backup));
} }
else
{
// 纯新增:回滚时直接删掉,没有备份可还原
replaced.Add((name, null));
}
MoveEntry(entry, target);
} }
private bool RemoveNewVersion(string target)
{
try
{
if (Directory.Exists(target)) Directory.Delete(target, true);
else if (File.Exists(target)) File.Delete(target);
return true; return true;
} }
catch (Exception ex) catch (Exception ex)
{ {
_log.Warn("移除新版失败: " + ex.Message); error = ex.Message;
return false; return false;
} }
} }
/// <summary>
/// 合并新包里的 <c>.GC/bin</c>:只搬这一层文件,不动 .GC 下的用户数据。
///
/// 守护进程放在这里(而不是安装目录根)是为了「非本体文件全部收进 .GC/bin」;
/// 但正在运行的是 <c>.GC/safedog</c> 里的副本,所以这里的文件可以安全替换。
/// </summary>
private void MergeGcBin(string stageGc, string installDir, string backupDir,
List<(string Name, string? BackupPath)> replaced)
{
try
{
var bin = Path.Combine(stageGc, "bin");
if (!Directory.Exists(bin)) return;
var relBin = Path.Combine(".GC", "bin");
var targetBin = Path.Combine(installDir, relBin);
Directory.CreateDirectory(targetBin);
foreach (var file in Directory.GetFiles(bin))
{
var name = Path.GetFileName(file);
var rel = Path.Combine(relBin, name);
var target = Path.Combine(targetBin, name);
var backup = Path.Combine(backupDir, ".GC-bin", name);
if (File.Exists(target))
{
MoveEntry(target, backup);
replaced.Add((rel, backup));
}
else
{
replaced.Add((rel, null));
}
MoveEntry(file, target);
_log.Info("已更新非本体文件: " + rel, "Updated non-core file: " + rel);
}
}
catch (Exception ex)
{
_log.Warn($"合并 .GC/bin 失败(继续使用已有版本):{ex.Message}",
$"Failed to merge .GC/bin (keeping the existing one): {ex.Message}");
}
}
/// <summary>
/// 把备份里的条目原样搬回安装目录,撤掉新装的内容。
/// <paramref name="BackupPath"/> 为 null 表示这一项是新包里独有的(没有旧版本),
/// 回滚时只需要删掉。
/// </summary>
private bool RestoreFromBackup(string installDir, List<(string Name, string? BackupPath)> replaced)
{
var ok = true;
foreach (var (name, backup) in replaced)
{
var target = Path.Combine(installDir, name);
try
{
// 先撤掉新版(新包里独有的文件也要删干净,否则回滚后目录里新旧混杂)
DeleteEntry(target);
if (string.IsNullOrWhiteSpace(backup) ||
(!File.Exists(backup) && !Directory.Exists(backup)))
continue;
MoveEntry(backup, target);
_log.Info("已还原: " + name, "Restored: " + name);
}
catch (Exception ex)
{
ok = false;
_log.Warn($"还原 {name} 失败: {ex.Message}", $"Failed to restore {name}: {ex.Message}");
}
}
return ok;
}
/// <summary>更新成功:删掉整份备份,不再占用磁盘。</summary>
private void CleanupBackup(string updateDir)
{
var backupDir = Path.Combine(updateDir, "backup");
try
{
if (Directory.Exists(backupDir)) Directory.Delete(backupDir, true);
}
catch (Exception ex)
{
_log.Warn("清理备份失败: " + ex.Message, "Failed to clean up the backup: " + ex.Message);
}
}
/// <summary>
/// 安装目录里不该被更新碰的东西:
/// · .GC —— 模型库、设置、日志、更新目录本身都在这里(只有 bin/ 由 MergeGcBin 单独处理);
/// · GC-SAVEDOG.exe —— 本进程正在运行,Windows 上无法替换。
/// </summary>
private static bool IsProtected(string name)
{
if (string.Equals(name, ".GC", StringComparison.OrdinalIgnoreCase)) return true;
var self = Environment.ProcessPath;
if (!string.IsNullOrWhiteSpace(self) &&
string.Equals(name, Path.GetFileName(self!), StringComparison.OrdinalIgnoreCase))
return true;
return string.Equals(name, "backup", StringComparison.OrdinalIgnoreCase);
}
private static bool IsSameOrInside(string path, string root)
{
try
{
var full = Path.GetFullPath(path).TrimEnd(Path.DirectorySeparatorChar);
var rootFull = Path.GetFullPath(root).TrimEnd(Path.DirectorySeparatorChar);
return full.Equals(rootFull, StringComparison.OrdinalIgnoreCase) ||
full.StartsWith(rootFull + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase);
}
catch { return false; }
}
/// <summary>移动条目;跨卷或目标占用时退回「复制 + 删除」。</summary>
private static void MoveEntry(string from, string to)
{
var parent = Path.GetDirectoryName(to);
if (!string.IsNullOrWhiteSpace(parent)) Directory.CreateDirectory(parent);
if (Directory.Exists(from))
{
Directory.Move(from, to);
return;
}
try
{
File.Move(from, to, overwrite: true);
}
catch (IOException)
{
File.Copy(from, to, overwrite: true);
File.Delete(from);
}
}
/// <summary>删除文件或目录,失败时抛出(由调用方决定是否回滚)。</summary>
private static void DeleteEntry(string path)
{
if (Directory.Exists(path)) Directory.Delete(path, true);
else if (File.Exists(path)) File.Delete(path);
}
private bool TryLaunchPrevious(string installDir, string updateDir, LastGoodVersion? lastGood, private bool TryLaunchPrevious(string installDir, string updateDir, LastGoodVersion? lastGood,
string platformLabel) string platformLabel)
{ {
// 优先用上次成功的版本;否则挑一个同平台的其它版本 // 优先用上次成功启动的主程序;否则按优先级在安装目录里找
var candidates = new List<string>(); var candidates = new List<string>();
if (lastGood != null && !string.IsNullOrWhiteSpace(lastGood.PackageName)) if (lastGood != null && !string.IsNullOrWhiteSpace(lastGood.PackageName))
candidates.Add(Path.Combine(installDir, lastGood.PackageName)); candidates.Add(Path.Combine(installDir, lastGood.PackageName));
@@ -468,25 +752,27 @@ internal sealed class Applier
foreach (var entry in Directory.GetFileSystemEntries(installDir)) foreach (var entry in Directory.GetFileSystemEntries(installDir))
{ {
var name = Path.GetFileName(entry); var name = Path.GetFileName(entry);
var match = ArtifactPattern.Match(name); if (IsProtected(name)) continue;
if (!match.Success) continue; if (MainExecutablePriority(name) > 0) candidates.Add(entry);
if (!string.Equals(match.Groups["plat"].Value, platformLabel, StringComparison.OrdinalIgnoreCase)) else if (Directory.Exists(entry) &&
continue; name.EndsWith(".app", StringComparison.OrdinalIgnoreCase))
candidates.Add(entry); candidates.Add(entry);
} }
foreach (var candidate in candidates) foreach (var candidate in candidates.Distinct(StringComparer.OrdinalIgnoreCase))
{ {
if (!File.Exists(candidate) && !Directory.Exists(candidate)) continue; if (!File.Exists(candidate) && !Directory.Exists(candidate)) continue;
try try
{ {
Launch(candidate); Launch(candidate);
_log.Info("已回滚启动: " + Path.GetFileName(candidate)); _log.Info("已回滚启动: " + Path.GetFileName(candidate),
"Rolled back and started: " + Path.GetFileName(candidate));
return true; return true;
} }
catch (Exception ex) catch (Exception ex)
{ {
_log.Warn($"回滚启动失败 {Path.GetFileName(candidate)}: {ex.Message}"); _log.Warn($"回滚启动失败 {Path.GetFileName(candidate)}: {ex.Message}",
$"Failed to start rollback candidate {Path.GetFileName(candidate)}: {ex.Message}");
} }
} }
return false; return false;
@@ -497,12 +783,12 @@ internal sealed class Applier
private void WriteState(string updateDir, SavedogState state) private void WriteState(string updateDir, SavedogState state)
{ {
try { Json.Write(Path.Combine(updateDir, SavedogFiles.State), state); } try { Json.Write(Path.Combine(updateDir, SavedogFiles.State), state); }
catch (Exception ex) { _log.Warn("写状态失败: " + ex.Message); } catch (Exception ex) { _log.Warn("写状态失败: " + ex.Message, "Failed to write state: " + ex.Message); }
} }
private int Fail(string updateDir, string message, int code) private int Fail(string updateDir, string message, int code, string? messageEn = null)
{ {
_log.Error(message); _log.Error(message, messageEn ?? message);
WriteState(updateDir, new SavedogState { Status = "failed", Message = message }); WriteState(updateDir, new SavedogState { Status = "failed", Message = message });
return code; return code;
} }
+7
View File
@@ -37,11 +37,18 @@
<DebugType>none</DebugType> <DebugType>none</DebugType>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<!-- 应用器测试要直接构造 Applier(internal):只对测试程序集放开可见性 -->
<InternalsVisibleTo Include="GC.Savedog.Tests" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<!-- 与启动器共用同一份安全实现,避免两套逻辑各说各话。 <!-- 与启动器共用同一份安全实现,避免两套逻辑各说各话。
ManifestLoader 依赖启动器的 RepoVersion 模型,守护进程不需要,排除。 --> ManifestLoader 依赖启动器的 RepoVersion 模型,守护进程不需要,排除。 -->
<Compile Include="..\GC\src\Security\**\*.cs" Exclude="..\GC\src\Security\ManifestLoader.cs" LinkBase="Security" /> <Compile Include="..\GC\src\Security\**\*.cs" Exclude="..\GC\src\Security\ManifestLoader.cs" LinkBase="Security" />
<Compile Include="..\GC\src\Services\Json.cs" Link="Shared\Json.cs" /> <Compile Include="..\GC\src\Services\Json.cs" Link="Shared\Json.cs" />
<!-- 与启动器共用同一份双语日志实现,保证 .GC/logs 里格式一致 -->
<Compile Include="..\GC\src\Services\GcLog.cs" Link="Shared\GcLog.cs" />
</ItemGroup> </ItemGroup>
</Project> </Project>
+13 -25
View File
@@ -1,34 +1,22 @@
using System; using System;
using System.IO; using GC.Services;
namespace GC.Savedog; namespace GC.Savedog;
/// <summary>同时写 stdout 与 .GC/update/savedog.log,便于用户离线排查。</summary> /// <summary>
/// 守护进程的日志入口,实际写入 <see cref="GcLog"/>:控制台 + <c>.GC/logs</c> 下的
/// <c>gc-YYYYMMDD.log</c>(中文)与 <c>gc-YYYYMMDD.en.log</c>(英文)。
///
/// 每条日志都必须同时给中英两份文案 —— 用户反馈问题时直接发对应语言的文件。
/// </summary>
internal sealed class Log internal sealed class Log
{ {
private readonly string? _path; public Log(string? dir)
private readonly object _gate = new();
public Log(string? path) => _path = path;
public void Info(string message) => Write("INFO ", message);
public void Warn(string message) => Write("WARN ", message);
public void Error(string message) => Write("ERROR", message);
private void Write(string level, string message)
{ {
var line = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss} [{level}] {message}"; if (!string.IsNullOrWhiteSpace(dir)) GcLog.Init(dir);
Console.WriteLine(line);
if (string.IsNullOrWhiteSpace(_path)) return;
try
{
lock (_gate)
{
var dir = Path.GetDirectoryName(_path!);
if (!string.IsNullOrEmpty(dir)) Directory.CreateDirectory(dir);
File.AppendAllText(_path!, line + "\n");
}
}
catch { /* 日志失败不能影响更新 */ }
} }
public void Info(string zh, string en) => GcLog.Info(zh, en);
public void Warn(string zh, string en) => GcLog.Warn(zh, en);
public void Error(string zh, string en) => GcLog.Error(zh, en);
} }
+5 -2
View File
@@ -23,7 +23,7 @@ namespace GC.Savedog;
/// </summary> /// </summary>
internal static class Program internal static class Program
{ {
private const string DefaultKeyId = "gc-2026-11"; private const string DefaultKeyId = "gc-2026-12";
private const string DefaultKeyPath = ".signing/gc-signing.pem"; private const string DefaultKeyPath = ".signing/gc-signing.pem";
private static int Main(string[] args) private static int Main(string[] args)
@@ -67,7 +67,10 @@ internal static class Program
return 3; return 3;
} }
var log = new Log(Path.Combine(Path.GetFullPath(updateDir), SavedogFiles.Log)); // 日志统一放 .GC/logs(update 目录的上一层),不再塞在 update/ 里
var updateRoot = Path.GetFullPath(updateDir);
var home = Path.GetDirectoryName(updateRoot) ?? updateRoot;
var log = new Log(Path.Combine(home, "logs"));
var applyOptions = new ApplyOptions var applyOptions = new ApplyOptions
{ {
UpdateDir = updateDir, UpdateDir = updateDir,
+92 -3
View File
@@ -1,6 +1,9 @@
# GC-UI 持续集成 # GC-UI 持续集成
夜间 alpha 构建的工作流在 [`.gitea/workflows/gc-ui-alpha.yml`](../.gitea/workflows/gc-ui-alpha.yml)。 alpha 构建的工作流在 [`.gitea/workflows/gc-ui-alpha.yml`](../.gitea/workflows/gc-ui-alpha.yml),
**只支持手动触发**(定时任务已取消:它绕开 build.sh,产出的包没有后端、没有前端,跑起来只是个空壳;
另外 `cron` 里的 `TZ=` 前缀在部分 Gitea 版本上是非法表达式)。
PR 审核流水线在 [`.gitea/workflows/pr-check.yml`](../.gitea/workflows/pr-check.yml)。
本仓库是自建 Gitea(不是 GitHub),所以目录是 `.gitea/workflows/`,语法与 GitHub Actions 基本一致, 本仓库是自建 Gitea(不是 GitHub),所以目录是 `.gitea/workflows/`,语法与 GitHub Actions 基本一致,
差异集中在 **runner 标签** 和 **API 前缀** 两处。 差异集中在 **runner 标签** 和 **API 前缀** 两处。
@@ -64,9 +67,95 @@ Windows 还需要 **VS Build Tools 的「使用 C++ 的桌面开发」工作负
## 本地构建(不经 CI) ## 本地构建(不经 CI)
```bash ```bash
# macOS # 按构建主机自动选目标,每条产物都带 Flutter 前端:
# macOS 主机 → mac-arm64(原生)+ win-amd64 / win-arm64(mingw 交叉)
# Linux 主机 → win-amd64 / win-arm64(mingw 交叉)
# Linux 产物默认不出:需 aarch64 主机 + GC_BUILD_LINUX=1
# Windows 主机 → win-amd64 / win-arm64(原生)
./build.sh build
# 前端是必需项:flutter 缺失或编译失败会直接中断,
# 确需降级成只有 Avalonia 回退界面的包时才用:
./build.sh build --allow-no-ui
# 只编 macOS 前端
./GC-UI/build-ui.sh macos ./GC-UI/build-ui.sh macos
# Windows # Windows 主机原生构建
GC-UI\build-ui.cmd GC-UI\build-ui.cmd
``` ```
### Linux 前端(原生)
Flutter 的 Linux 桌面端只能在 Linux 上编,需要 GTK3 开发库与 C++ 工具链:
```bash
sudo apt install clang cmake ninja-build pkg-config libgtk-3-dev libstdc++-14-dev
```
`libstdc++-14-dev` 容易漏:clang 18 会去 `/usr/lib/gcc/x86_64-linux-gnu/14/` 找
`-lstdc++`,系统只装了 gcc-13 的开发包时链接会失败,报 `cannot find -lstdc++`。
产物布局:`GC-UI` + `lib/libflutter_linux_gtk.so` + `data/`,与官方 `flutter build
linux` 的 bundle 一致,直接铺进 `dist/linux-arm64/`。
### Windows 前端交叉编译
Flutter 官方不支持在非 Windows 主机上 `flutter build windows`,但 Windows 嵌入层
(`windows/runner/*.cpp` + `cpp_client_wrapper`)是纯 Win32 + 标准 C++,只通过 C ABI
调用 `flutter_windows.dll`,所以 mingw-w64 就能编译。整条链路上唯一必须执行的
Windows 二进制是 AOT 快照生成器 `gen_snapshot.exe`,交给 wine 跑即可。
```bash
# 依赖
sudo apt install mingw-w64 cmake ninja-build wine # Linux
brew install mingw-w64 cmake ninja # macOS
brew install --cask wine-stable # macOS 的 wine
# 单独构建(默认输出到 GC-UI/frontend/build/windows/x64/runner/Release)
./buildsh/cross/build-ui-win-cross.sh [输出目录]
```
产物与官方 toolchain 完全一致,可直接拷到 Windows 运行:
```
GC-UI.exe flutter_windows.dll data/{icudtl.dat, app.so, flutter_assets/}
```
实现分三层:
| 文件 | 职责 |
|---|---|
| `buildsh/cross/toolchain-mingw.cmake` | CMake 交叉工具链(posix 线程模型,静态链接 libstdc++,产物只依赖系统 DLL) |
| `buildsh/cross/CMakeLists.txt` | 只编 C++ 外壳;绕开 `tool_backend.bat` 与 MSVC 专用参数 |
| `buildsh/cross/build-ui-win-cross.sh` | 拉引擎产物、装 `gen_snapshot` 的 wine 包装、生成 AOT 快照、组装 |
两个容易踩的坑,脚本里已处理:
- `flutter_tools` 会 exec 路径为 `.../windows-x64-release/gen_snapshot`(**没有 `.exe`**)
的文件,所以脚本在原 `.exe` 旁边放一个同名 shell 脚本转调 wine。
- `Runner.rc` 在 windres 下有两处不兼容:图标用反斜杠相对路径、`VERSION_AS_STRING`
依赖命令行传 `-D` 的转义字符串。脚本生成一份路径与宏都已规整的 rc 副本再编译。
### 交叉编译必须自己嵌 DPI 清单
`windows/runner/CMakeLists.txt` 把 `runner.exe.manifest` 当**源文件**列进 target,
Visual Studio 生成器会把它交给链接器(`/MANIFESTINPUT`)自动嵌入 exe;
但 `buildsh/cross/CMakeLists.txt` 只用 windres 编 `Runner.rc`,CMake 不会做这一步。
结果就是交叉编出来的 `GC-UI.exe` **完全没有清单**:Windows 认为它「DPI 不感知」,
在 125% / 150% 缩放的屏幕上把整块窗口当位图拉伸 —— 界面整体发虚,中文小字最明显。
现在两处都已加固,改这块代码时不要拆掉任何一处:
| 位置 | 做法 |
|---|---|
| `buildsh/cross/CMakeLists.txt` | 往 `Runner.cross.rc` 追加 `1 24 "<abs>/runner.exe.manifest"`(id 1 = CREATEPROCESS_MANIFEST_RESOURCE_ID,type 24 = RT_MANIFEST) |
| `windows/runner/main.cpp` | 建窗之前调 `SetProcessDpiAwarenessContext(PER_MONITOR_AWARE_V2)`,失败依次退到 `SetProcessDpiAwareness` / `SetProcessDPIAware` |
`main.cpp` 那层是兜底:即使清单因为工具链原因没嵌进去,程序自己也会声明 DPI 感知。
验证办法(Windows):`GC-UI.exe` 属性 →「兼容性」里不该出现「替代高 DPI 缩放行为」,
或在 125% 缩放下截图,文字边缘应是锐利的 1.25 倍像素,而不是模糊的插值。
`.gitea/workflows` 里的 `windows` 任务仍然跑在 `windows-latest` 上;若手头只有 macOS/Linux
构建机,可以把该任务的 `runs-on` 换成对应标签,直接复用这套交叉编译脚本,
不再需要 VS Build Tools。
+35 -6
View File
@@ -55,6 +55,10 @@ Windows 与 macOS 用**同一套 Flutter 代码 + 各自的原生 runner**:
### 1. 启动后端 ### 1. 启动后端
发布版里后端不走独立进程:`GC-BOOT` 直接引用本工程,调用
`BackendServer.Start(args, port)` 在自己进程内托管,发布包因此只有一个 exe
(两个自包含进程会把 60MB 运行时复制两份)。下面的独立运行方式只用于开发调试。
```bash ```bash
# 仓库根目录 # 仓库根目录
dotnet run --project GC-UI/backend/GC.UI.Server dotnet run --project GC-UI/backend/GC.UI.Server
@@ -65,7 +69,11 @@ dotnet run --project GC-UI/backend/GC.UI.Server -- --port 17890
GC_UI_PORT=17890 dotnet run --project GC-UI/backend/GC.UI.Server GC_UI_PORT=17890 dotnet run --project GC-UI/backend/GC.UI.Server
``` ```
启动后会在 `~/.GC/ui-backend.json` 写入 `{ port, pid, url, version, platform }`,前端可据此发现端口。 端口约定集中在 `GC.Services.GcUiContract`(`DefaultPort` / `PortEnvVar`):
正式启动时由 GC-BOOT 选端口(17890 被占用就往后试 9 个),再通过 `GC_UI_PORT`
环境变量同时传给后端和前端,所以**不需要为了换端口重新编译前端**。
启动后后端会在 `~/.GC/ui-backend.json` 写入 `{ port, pid, url, version, platform }`,
排查问题时可以据此确认实际端口。
### 2. 启动前端 ### 2. 启动前端
@@ -141,14 +149,35 @@ flutter test
# 前后端联调(需要后端正在运行;后端没起时自动跳过) # 前后端联调(需要后端正在运行;后端没起时自动跳过)
flutter test test/backend_contract_test.dart flutter test test/backend_contract_test.dart
# 生成界面截图到 test/shots/(视觉检查用) # 生成界面截图到 test/shots/(视觉检查用,不需要后端)
flutter test tool/render_shots_test.dart flutter test tool/render_shots_test.dart
``` ```
截图脚本覆盖四个页面(首页 / 下载 / 设置 / 关于)再加一整套外壳: 截图脚本覆盖四个页面(首页 / 下载 / 设置 / 关于),再加一整套外壳与 1024×680 小窗回归:
`test/shots/home.png`、`download.png`、`settings.png`、`about.png`、`shell.png`。 `test/shots/home.png`、`download.png`、`settings.png`、`about.png`、`shell.png`、
需要先在本机 17890 端口跑起后端;脚本用 `runAsync` 给真实 HTTP 留出时间, `home-small.png`、`download-small.png`、`settings-small.png`,以及浅色主题的
否则 `flutter_test` 的假时钟会让页面停在加载态。 `home-light.png`、`settings-light.png`。小窗用例会顺带抓布局溢出(RenderFlex overflow)。
四个页面都用预置数据(`initialModels` / `initialSources` / `initialAbout` 等)渲染,
所以**不需要先起后端**。测试环境的字体是 Ahem(所有字都是方块),脚本会显式加载
系统里的 Noto Sans SC / 微软雅黑 / 苹方,并顺带加载 Material 图标字体,中文和图标才正常。
截图必须放在 `runAsync` 里取像素(`toImage` / `toByteData` 走真实引擎管线),
否则 fake async 时钟不推进,每个用例会卡满 10 分钟才超时。
## 界面清晰度(DPI)
`GC-UI.exe` 必须在启动时就声明 DPI 感知,否则 Windows 在 125% / 150% 缩放下会把
整块窗口当位图拉伸,界面看起来「糊」—— 中文小字最先糊。两处保证:
- `windows/runner/runner.exe.manifest`:PerMonitorV2(原生 MSVC 构建由 CMake 自动嵌入)
- `windows/runner/main.cpp`:建窗前再声明一次,依次尝试
`SetProcessDpiAwarenessContext` → `SetProcessDpiAwareness` → `SetProcessDPIAware`
- `buildsh/cross/CMakeLists.txt`:交叉编译时把清单写进 `.rc`(windres 不会自动嵌入)
另外主题里做了两件跟「清晰」有关的事:字体族走
`Segoe UI + Microsoft YaHei UI`(macOS 走苹方)而不是让引擎随意回退;
正文最小 12px、行高固定,中文不再挤成一片。详见
[CI.md 的「交叉编译必须自己嵌 DPI 清单」](CI.md#交叉编译必须自己嵌-dpi-清单)。
## 「关于」页展示的技术栈 ## 「关于」页展示的技术栈
+38 -1
View File
@@ -12,7 +12,8 @@ public sealed record HealthDto(
string Version, string Version,
string Platform, string Platform,
bool UiAvailable, bool UiAvailable,
string? UiError); string? UiError,
string? SessionProof = null);
public sealed record ModelDto( public sealed record ModelDto(
string Id, string Id,
@@ -74,6 +75,7 @@ public sealed record LanguageDto(string Code, string Label);
public sealed record SettingsDto( public sealed record SettingsDto(
string Language, string Language,
string Theme, string Theme,
string AccentColor,
int RenderFps, int RenderFps,
int MemoryMb, int MemoryMb,
bool MemoryAuto, bool MemoryAuto,
@@ -96,6 +98,7 @@ public sealed record SettingsDto(
public sealed record SettingsPatch( public sealed record SettingsPatch(
string? Language, string? Language,
string? Theme, string? Theme,
string? AccentColor,
int? RenderFps, int? RenderFps,
int? MemoryMb, int? MemoryMb,
bool? MemoryAuto, bool? MemoryAuto,
@@ -120,6 +123,31 @@ public sealed record UpdateCheckDto(
public sealed record ContributorDto(string Name, int Contributions, string? AvatarUrl); public sealed record ContributorDto(string Name, int Contributions, string? AvatarUrl);
// ---- 用户 API DTO ----
public sealed record RegisterRequest(
string Username,
string Password,
string? CaptchaId = null,
string? Captcha = null);
public sealed record LoginRequest(string Username, string Password);
/// <summary>换主题色:只传颜色,价格由服务端按预置/自定义判定。</summary>
public sealed record ThemeRequest(string Color, int? Cost = null);
/// <summary>二选一:两个候选选项,服务端随机挑一个并计费。</summary>
public sealed record PickRequest(string OptionA, string OptionB);
public sealed record CaptchaDto(string Id, string Question);
/// <summary>「重新下载启动器」结果:State = Ready / UpToDate / Failed。</summary>
public sealed record LauncherRedownloadDto(
string State,
string Version,
string Message,
IReadOnlyList<string> Steps);
public sealed record AboutDto( public sealed record AboutDto(
string AppName, string AppName,
string Version, string Version,
@@ -131,6 +159,15 @@ public sealed record AboutDto(
public sealed record LaunchResultDto(bool Ok, string Message); public sealed record LaunchResultDto(bool Ok, string Message);
/// <summary>
/// 通用错误响应。限流 / 参数校验这类与具体业务无关的失败用它,
/// 不要复用 <see cref="LaunchResultDto"/> —— 那会让前端误以为「启动模型」有结果。
/// </summary>
public sealed record ErrorDto(bool Ok, string Message)
{
public static ErrorDto Of(string message) => new(false, message);
}
public sealed record DownloadRequest(string SourceId, string ModelId); public sealed record DownloadRequest(string SourceId, string ModelId);
public sealed record PathRequest(string Path); public sealed record PathRequest(string Path);
+69 -37
View File
@@ -28,8 +28,10 @@ public sealed class AvaloniaHost
{ {
private readonly AppServices _services; private readonly AppServices _services;
private readonly object _gate = new(); private readonly object _gate = new();
private readonly List<PlayerWindow> _windows = new(); private readonly Dictionary<string, PlayerWindow> _windows = new(StringComparer.OrdinalIgnoreCase);
private Task<bool>? _startTask; private readonly TaskCompletionSource<bool> _ready =
new(TaskCreationOptions.RunContinuationsAsynchronously);
private int _started;
public AvaloniaHost(AppServices services) => _services = services; public AvaloniaHost(AppServices services) => _services = services;
@@ -37,56 +39,60 @@ public sealed class AvaloniaHost
public string? LastError { get; private set; } public string? LastError { get; private set; }
public Task<bool> EnsureStartedAsync() /// <summary>
{ /// 后端线程调用:等待「主线程已把 Avalonia 事件循环跑起来」。
lock (_gate) ///
{ /// 关键点:macOS 的 AppKit 要求 NSApplication 在**主线程**。以前这里把
_startTask ??= Task.Run(StartCore); /// <c>StartWithClassicDesktopLifetime</c> 丢到一个新建的后台线程里跑,在 macOS 上
return _startTask; /// 会直接崩掉整个后端进程(表现为点「启动模型」界面无反应、随后后端消失)。
} /// 现在改为由启动器在主线程调用 <see cref="RunOnCurrentThread"/>,
} /// 这里只等待就绪信号。
/// </summary>
public Task<bool> EnsureStartedAsync() => _ready.Task;
private bool StartCore() /// <summary>
/// 必须在 UI 主线程调用。启动 Avalonia 桌面生命周期并阻塞,直到 <see cref="Shutdown"/>。
/// 返回后(或初始化失败后)调用方负责收尾。
/// </summary>
public void RunOnCurrentThread()
{ {
var ready = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously); if (Interlocked.Exchange(ref _started, 1) == 1) return;
var thread = new Thread(() =>
{
try try
{ {
AppBuilder.Configure<HostApp>() AppBuilder.Configure<HostApp>()
.UsePlatformDetect() .UsePlatformDetect()
.AfterSetup(_ => ready.TrySetResult(true)) .AfterSetup(_ =>
{
IsAvailable = true;
_ready.TrySetResult(true);
})
.StartWithClassicDesktopLifetime(Array.Empty<string>()); .StartWithClassicDesktopLifetime(Array.Empty<string>());
} }
catch (Exception ex) catch (Exception ex)
{ {
// 无桌面会话(CI / 无头环境):模型窗口不可用,但后端其余接口照常。
LastError = ex.Message; LastError = ex.Message;
ready.TrySetResult(false); _ready.TrySetResult(false);
} }
})
{
IsBackground = true,
Name = "gc-ui-avalonia"
};
// Windows 上 Avalonia 需要 STA 线程;macOS / Linux 不支持也不必要。
if (OperatingSystem.IsWindows())
{
try { thread.SetApartmentState(ApartmentState.STA); }
catch { /* 忽略:部分运行时不允许设置 */ }
} }
thread.Start(); /// <summary>从任意线程请求结束事件循环,使 <see cref="RunOnCurrentThread"/> 返回。</summary>
public void Shutdown()
if (!ready.Task.Wait(TimeSpan.FromSeconds(30)))
{ {
LastError = "图形环境初始化超时"; if (_started == 0) return;
return false; try
{
Dispatcher.UIThread.Post(() =>
{
if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
desktop.Shutdown();
});
}
catch
{
// 事件循环尚未建立或已退出:无需处理
} }
IsAvailable = ready.Task.Result;
return IsAvailable;
} }
/// <summary>在 Avalonia UI 线程上加载模型并打开它自己的窗口。</summary> /// <summary>在 Avalonia UI 线程上加载模型并打开它自己的窗口。</summary>
@@ -98,6 +104,27 @@ public sealed class AvaloniaHost
return await Dispatcher.UIThread.InvokeAsync<string>(async () => return await Dispatcher.UIThread.InvokeAsync<string>(async () =>
{ {
// 同一个模型已经在运行:把已有窗口提到前台,不再加载第二份实例
// (连点「启动模型」会各占一份内存与显存,低配机器直接卡死)。
lock (_gate)
{
if (_windows.TryGetValue(package.Id, out var existing))
{
try
{
if (existing.WindowState == WindowState.Minimized)
existing.WindowState = WindowState.Normal;
existing.Activate();
return $"模型 {package.Id} 已在运行";
}
catch
{
// 窗口已失效:清掉记录,按新窗口重新打开
_windows.Remove(package.Id);
}
}
}
PlayerWindow? window = null; PlayerWindow? window = null;
LoadedModel? loaded = null; LoadedModel? loaded = null;
try try
@@ -111,13 +138,18 @@ public sealed class AvaloniaHost
window = new PlayerWindow(package, loaded); window = new PlayerWindow(package, loaded);
var captured = loaded; var captured = loaded;
var id = package.Id;
window.Closed += (_, _) => window.Closed += (_, _) =>
{ {
try { captured.Dispose(); } catch { /* 释放失败不影响退出 */ } try { captured.Dispose(); } catch { /* 释放失败不影响退出 */ }
lock (_gate) _windows.Remove(window!); lock (_gate)
{
if (_windows.TryGetValue(id, out var current) && ReferenceEquals(current, window))
_windows.Remove(id);
}
}; };
lock (_gate) _windows.Add(window); lock (_gate) _windows[id] = window;
window.Show(); window.Show();
return $"已启动模型 {package.Id}"; return $"已启动模型 {package.Id}";
} }
+947
View File
@@ -0,0 +1,947 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using GC.Download;
using GC.Models;
using GC.Services;
using GC.UI.Server;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
namespace GC.UI.Server;
/// <summary>
/// GC-UI 后端(本地 HTTP 服务:模型扫描 / 下载 / 更新 / 设置 / 模型窗口宿主)。
///
/// 两种跑法共用同一份代码:
/// · 独立进程:<c>GC.UI.Server</c> 可执行文件(开发调试 / 旧包兼容);
/// · 进程内:启动器直接调用 <see cref="Start"/>,把后端跑在自己的进程里 ——
/// 发布包因此只需要一个 exe,不必再复制一份完整的 .NET 运行时。
/// </summary>
public static class BackendServer
{
/// <summary>按命令行 / GC_UI_PORT 解析端口并构建(未启动)的后端。</summary>
public static WebApplication StartFromCommandLine(string[] args)
=> Start(args, ResolvePort(args));
/// <summary>
/// 构建后端。返回的 <see cref="WebApplication"/> 尚未启动:
/// 独立进程直接 <c>Run()</c>,启动器用 <c>StartAsync()</c> 之后继续拉起界面。
///
/// 界面是 Flutter,但**模型窗口仍由 Avalonia 承载**(模型契约返回的是 Avalonia Control)。
/// </summary>
public static WebApplication Start(string[] args, int port)
=> Start(args, port, out _);
/// <summary>
/// 构建后端,并通过 <paramref name="uiHost"/> 交出模型窗口宿主。
///
/// 调用方(启动器)必须在**主线程**调用 <see cref="AvaloniaHost.RunOnCurrentThread"/>:
/// macOS 的 AppKit 要求 NSApplication 运行在主线程,否则打开模型窗口时整个进程会崩溃。
/// </summary>
public static WebApplication Start(string[] args, int port, out AvaloniaHost uiHost)
{
// 下载模块(GC-DOWNLOAD)通过宿主钩子注入,和 GC-BOOT 的做法一致。
DownloadModuleHost.Factory = new DownloadModuleFactory();
var services = AppServices.Create();
var userService = new UserService(services.Paths.HomeRoot);
var host = new AvaloniaHost(services);
uiHost = host;
var builder = WebApplication.CreateBuilder(new WebApplicationOptions { Args = args });
builder.Logging.ClearProviders();
builder.WebHost.UseUrls($"http://127.0.0.1:{port}");
// 本地伴随进程:限制请求体大小、关闭 Server 头、收紧超时,减少被本地恶意页面
// 或异常客户端拖垮的攻击面。
builder.WebHost.ConfigureKestrel(options =>
{
options.AddServerHeader = false;
options.Limits.MaxRequestBodySize = 2 * 1024 * 1024;
options.Limits.RequestHeadersTimeout = TimeSpan.FromSeconds(15);
options.Limits.KeepAliveTimeout = TimeSpan.FromMinutes(2);
options.Limits.MaxConcurrentConnections = 64;
});
// 桌面端(Windows/macOS)走原生 HTTP,不需要 CORS;
// 这里放开本机回环来源,方便用 `flutter run -d chrome` 调试界面。
builder.Services.AddCors(options => options.AddDefaultPolicy(policy => policy
.SetIsOriginAllowed(origin =>
Uri.TryCreate(origin, UriKind.Absolute, out var uri) &&
(uri.Host == "127.0.0.1" || uri.Host == "localhost" || uri.Host == "::1"))
.AllowAnyHeader()
.AllowAnyMethod()));
var app = builder.Build();
app.UseCors();
// 日志与启动器共用 .GC/logs,整条启动链路(启动器 → 后端 → 守护进程)都在同一组文件里。
var logPaths = AppPaths.Discover();
GcLog.Init(logPaths.LogsRoot);
GcLog.Info($"GC-UI 后端启动,监听 127.0.0.1:{port}",
$"GC-UI backend started on 127.0.0.1:{port}");
// 设置白名单 / 标识校验用到的规则(只在本进程内使用)。
var allowedLanguages = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
{ "auto", "zh-CN", "en" };
var allowedThemes = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
{ "light", "dark", "system" };
var accentHexRegex = new System.Text.RegularExpressions.Regex(
"^#(?:[0-9A-Fa-f]{6})$", System.Text.RegularExpressions.RegexOptions.Compiled);
var safeIdRegex = new System.Text.RegularExpressions.Regex(
"^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$", System.Text.RegularExpressions.RegexOptions.Compiled);
// 安全响应头 + Host/Origin 校验(抵御 DNS rebinding 与跨站调用)。
app.Use(async (context, next) =>
{
var headers = context.Response.Headers;
headers["X-Content-Type-Options"] = "nosniff";
headers["X-Frame-Options"] = "DENY";
headers["Referrer-Policy"] = "no-referrer";
headers["Content-Security-Policy"] = "default-src 'none'; frame-ancestors 'none'";
headers["Cache-Control"] = "no-store";
var host = context.Request.Host.Host;
if (!string.Equals(host, "127.0.0.1", StringComparison.OrdinalIgnoreCase) &&
!string.Equals(host, "localhost", StringComparison.OrdinalIgnoreCase) &&
!string.Equals(host, "::1", StringComparison.OrdinalIgnoreCase))
{
context.Response.StatusCode = StatusCodes.Status403Forbidden;
return;
}
var origin = context.Request.Headers.Origin.ToString();
if (!string.IsNullOrEmpty(origin) &&
!(Uri.TryCreate(origin, UriKind.Absolute, out var parsed) &&
(parsed.Host == "127.0.0.1" || parsed.Host == "localhost" || parsed.Host == "::1")))
{
context.Response.StatusCode = StatusCodes.Status403Forbidden;
return;
}
await next();
});
// 写入类接口做简单限流:单 IP 每秒最多 40 次,防止本地脚本刷爆下载/更新。
var writeBuckets =
new System.Collections.Concurrent.ConcurrentDictionary<string, (long Window, int Count)>();
app.Use(async (context, next) =>
{
if (HttpMethods.IsPost(context.Request.Method) ||
HttpMethods.IsDelete(context.Request.Method))
{
var key = context.Connection.RemoteIpAddress?.ToString() ?? "local";
var now = Environment.TickCount64;
// 定期丢弃过期窗口:本机连接数不多,但长时间运行后桶只增不减会缓慢泄漏。
if (writeBuckets.Count > 256)
{
foreach (var entry in writeBuckets)
{
if (now - entry.Value.Window > 60_000)
writeBuckets.TryRemove(entry.Key, out _);
}
}
var bucket = writeBuckets.AddOrUpdate(
key,
_ => (now, 1),
(_, old) => now - old.Window > 1000 ? (now, 1) : (old.Window, old.Count + 1));
if (bucket.Count > 40)
{
context.Response.StatusCode = StatusCodes.Status429TooManyRequests;
await context.Response.WriteAsJsonAsync(ErrorDto.Of("请求过于频繁,请稍后再试"));
return;
}
}
await next();
});
// 会话令牌校验:启动器拉起时经 GC_UI_TOKEN 注入一次性令牌,前端每个 /api 请求
// 都必须带回。这样同机其他进程即使占了端口、伪造 /api/health 返回 200,也过不了
// 这一关——它拿不到令牌。独立进程 / 调试模式未设置令牌时放行,保持兼容。
var sessionToken = Environment.GetEnvironmentVariable(GcUiContract.TokenEnvVar);
if (!string.IsNullOrEmpty(sessionToken))
{
var expected = System.Text.Encoding.UTF8.GetBytes(sessionToken);
app.Use(async (context, next) =>
{
if (context.Request.Path.StartsWithSegments("/api"))
{
// 正常请求从请求头取;封面图由 Image.network 发起、无法加自定义头,
// 用同名 query 参数携带(GET 只读资源,参数不会落到日志正文)。
var supplied = context.Request.Headers[GcUiContract.TokenHeader].ToString();
if (string.IsNullOrEmpty(supplied))
supplied = context.Request.Query[GcUiContract.TokenHeader].ToString();
var actual = System.Text.Encoding.UTF8.GetBytes(supplied);
// 长度不等时 CryptographicOperations 仍安全比较,但先比对长度省一次分支泄漏。
if (actual.Length != expected.Length ||
!System.Security.Cryptography.CryptographicOperations.FixedTimeEquals(actual, expected))
{
context.Response.StatusCode = StatusCodes.Status401Unauthorized;
return;
}
}
await next();
});
}
// ---- 健康检查 -------------------------------------------------------------
// ---- 用户系统 -----------------------------------------------------------------
// 简单 session 存储:key = username(lower), value = session token
var userSessions = new System.Collections.Concurrent.ConcurrentDictionary<string, string>();
// 中间件:从 header 提取当前用户;没有 token 时回退到 user.yaml 记住的用户(自动登录)
app.Use(async (context, next) =>
{
context.Items["user"] = null as string;
if (context.Request.Headers.TryGetValue("X-User-Token", out var tokens) && tokens.Count > 0)
{
var token = tokens[0];
foreach (var kv in userSessions)
{
if (kv.Value == token)
{
context.Items["user"] = kv.Key;
break;
}
}
}
if (context.Items["user"] is not string u || string.IsNullOrEmpty(u))
context.Items["user"] = userService.RestoredUser;
await next();
});
// 人品值评语(与前端 FortuneResult.commentFor 保持一致)
static string FortuneComment(int value)
{
if (value >= 96) return "欧皇附体,今天买彩票吧";
if (value >= 90) return "运气爆棚,适合干大事";
if (value >= 80) return "手气不错,稳";
if (value >= 65) return "中上水平,稍微努一下";
if (value >= 50) return "普普通通,够用";
if (value >= 35) return "有点背,低调点";
if (value >= 20) return "今天别赌任何东西";
if (value >= 8) return "极差,建议躺平";
return "非酋之王,明天再来";
}
// 统一的用户响应体:前端一次拿齐签到 / 主题色需要的所有字段
object UserPayload(UserRecord r)
{
// 与 UserService 保持一致:本地日历日,不能用 UTC
var today = DateTime.Today;
int nextConsecutive;
if (!r.LastSignIn.HasValue) nextConsecutive = 1;
else
{
var diff = (today - r.LastSignIn.Value.Date).Days;
nextConsecutive = diff <= 1 ? r.ConsecutiveDays + 1 : 1;
}
var refund = UserService.RefundRemaining(r);
return new
{
username = r.Username,
points = r.Points,
consecutive_days = r.ConsecutiveDays,
cycle_day = UserService.CycleDay(r.ConsecutiveDays),
cycle_days = UserService.SignInCycleDays,
today_signed = r.LastSignIn.HasValue && r.LastSignIn.Value.Date == today,
next_reward = UserService.GetSignInReward(UserService.CycleDay(nextConsecutive)),
last_sign_in = r.LastSignIn?.ToString("yyyy-MM-dd") ?? "",
theme_color = r.ThemeColor ?? UserService.DefaultThemeColor,
theme_paid = r.ThemePaid,
refund_seconds = refund.HasValue ? (int)refund.Value.TotalSeconds : 0
};
}
// 人机验证:算术题,5 分钟有效、一次性
app.MapGet("/api/user/captcha", () =>
{
var (id, question) = userService.IssueCaptcha();
return Results.Ok(new CaptchaDto(id, question));
});
app.MapPost("/api/user/register", (RegisterRequest? req) => {
if (req == null) return Results.BadRequest(new { error = "请求体为空" });
if (string.IsNullOrWhiteSpace(req.Username)) return Results.BadRequest(new { error = "用户名不能为空" });
if (string.IsNullOrWhiteSpace(req.Password)) return Results.BadRequest(new { error = "密码不能为空" });
var ok = userService.Register(req.Username, req.Password, req.CaptchaId, req.Captcha, out var err);
return ok ? Results.Ok(new { message = "注册成功" }) : Results.BadRequest(new { error = err });
});
app.MapPost("/api/user/login", (LoginRequest? req) => {
if (req == null) return Results.BadRequest(new { error = "请求体为空" });
var ok = userService.Login(req.Username, req.Password, out var err, out var rec);
if (!ok) return Results.BadRequest(new { error = err });
// 生成 session token
var sessionToken = Convert.ToBase64String(System.Security.Cryptography.RandomNumberGenerator.GetBytes(32)).Replace("/", "_").Replace("+", "-").Substring(0, 32);
userSessions[rec!.Username.ToLowerInvariant()] = sessionToken;
// 记住登录:写 .GC/user/user.yaml,下次启动自动登录
userService.SaveSession(rec.Username, sessionToken);
return Results.Ok(new {
username = rec.Username,
points = rec.Points,
consecutive_days = rec.ConsecutiveDays,
last_sign_in = rec.LastSignIn?.ToString("yyyy-MM-dd") ?? "",
theme_color = rec.ThemeColor ?? "",
session_token = sessionToken
});
});
app.MapPost("/api/user/logout", (HttpContext ctx) => {
var username = ctx.Items["user"] as string;
if (!string.IsNullOrEmpty(username)) userSessions.TryRemove(username, out _);
userService.ClearSession();
return Results.Ok(new { message = "已退出登录" });
});
app.MapGet("/api/user/me", (HttpContext ctx) =>
{
var username = ctx.Items["user"] as string;
if (string.IsNullOrEmpty(username) || !userService.TryGetUser(username, out var rec))
return Results.Json(new { error = "未登录" }, statusCode: 401);
return Results.Ok(UserPayload(rec));
});
app.MapPost("/api/user/signin", (HttpContext ctx) =>
{
var username = ctx.Items["user"] as string;
if (string.IsNullOrEmpty(username) || !userService.TryGetUser(username, out var rec))
return Results.Json(new { error = "未登录" }, statusCode: 401);
var ok = userService.UpdateSignIn(username, out var err, out var reward);
if (!ok)
{
if (err == "今日已签到")
return Results.Ok(new { message = err, user = UserPayload(rec) });
return Results.BadRequest(new { error = err });
}
return Results.Ok(new {
reward,
user = UserPayload(rec)
});
});
app.MapPost("/api/user/fortune", (HttpContext ctx) =>
{
var username = ctx.Items["user"] as string;
if (string.IsNullOrEmpty(username))
return Results.Json(new { error = "未登录" }, statusCode: 401);
var ok = userService.RollFortune(username, out var err, out var value,
out var cost, out var rec);
if (!ok) return Results.BadRequest(new { error = err });
return Results.Ok(new {
value,
cost,
comment = FortuneComment(value),
user = UserPayload(rec!)
});
});
app.MapPost("/api/user/pick", (HttpContext ctx, PickRequest? req) =>
{
var username = ctx.Items["user"] as string;
if (string.IsNullOrEmpty(username))
return Results.Json(new { error = "未登录" }, statusCode: 401);
if (req == null) return Results.BadRequest(new { error = "请求体为空" });
var ok = userService.PickOne(username, req.OptionA, req.OptionB, out var err,
out var choice, out var cost, out var rec);
if (!ok) return Results.BadRequest(new { error = err });
return Results.Ok(new {
choice,
cost,
user = UserPayload(rec!)
});
});
app.MapPost("/api/user/theme", (HttpContext ctx, ThemeRequest? req) =>
{
var username = ctx.Items["user"] as string;
if (string.IsNullOrEmpty(username) || !userService.TryGetUser(username, out var rec))
return Results.Json(new { error = "未登录" }, statusCode: 401);
if (req == null) return Results.BadRequest(new { error = "请求体为空" });
var ok = userService.ChangeThemeColor(username, req.Color, out var err, out var refunded);
if (!ok) return Results.BadRequest(new { error = err });
return Results.Ok(new {
message = "主题已更新",
refunded,
user = UserPayload(rec)
});
});
app.MapGet("/api/health", () => Results.Ok(new HealthDto(
true,
LauncherRuntimeInfo.CurrentLauncherVersion,
LauncherRuntimeInfo.CurrentRid,
// 界面在客户端内渲染,后端不存在「窗口宿主不可用」的状态
true,
(string?)null,
GcUiContract.DeriveSessionProof(sessionToken))));
// ---- 已安装模型 -----------------------------------------------------------
app.MapGet("/api/models", () =>
Results.Ok(services.Models.Scan().Select(ToModelDto).ToList()));
app.MapGet("/api/models/{id}/preview", (string id, HttpResponse response) =>
{
if (!IsSafeId(id)) return Results.BadRequest(ErrorDto.Of("模型标识无效"));
var package = services.Models.Find(id);
if (package == null || !File.Exists(package.PreviewPath)) return Results.NotFound();
// 封面是静态图,允许前端缓存:默认全局中间件写的 no-store 会让每次滚动都重新请求。
// 按扩展名给准确的 MIME —— 统一写 image/png 时,WebP / JPEG 封面在部分平台显示不出来。
response.Headers.CacheControl = "private, max-age=300";
return Results.File(package.PreviewPath, GuessImageContentType(package.PreviewPath));
});
// 模型改为客户端内渲染(Flutter):这里只确认模型存在并把 id 交回去,
// 不再拉起 Avalonia 窗口。保留接口是为了老客户端不至于 404。
app.MapPost("/api/models/{id}/launch", async (string id) =>
{
if (!IsSafeId(id)) return Results.BadRequest(new LaunchResultDto(false, "模型标识无效"));
var package = services.Models.Find(id);
if (package == null) return Results.NotFound(new LaunchResultDto(false, $"没有找到模型 {id}"));
try
{
services.Memory.Refresh();
var message = await host.LaunchAsync(package);
return Results.Ok(new LaunchResultDto(true, message));
}
catch (Exception ex)
{
Console.Error.WriteLine($"[launch] 启动模型 {id} 失败: {ex}");
return Results.Json(new LaunchResultDto(false, "模型启动失败,请查看后端日志"), statusCode: 503);
}
});
app.MapDelete("/api/models/{id}", (string id) =>
{
if (!IsSafeId(id)) return Results.BadRequest(ErrorDto.Of("模型标识无效"));
var ok = services.Models.Delete(id);
if (ok) services.Models.NotifyChanged();
return ok
? Results.Ok(new LaunchResultDto(true, $"已删除模型 {id}"))
: Results.NotFound(ErrorDto.Of($"没有找到模型 {id}"));
});
// ---- 设置 -----------------------------------------------------------------
app.MapGet("/api/settings", () => Results.Ok(ToSettingsDto()));
app.MapPost("/api/settings", (SettingsPatch? patch) =>
{
if (patch == null) return Results.BadRequest(ErrorDto.Of("缺少设置内容"));
// 白名单校验:设置项会写进磁盘并被前端直接使用,不接受任意字符串。
if (patch.Language != null && !allowedLanguages.Contains(patch.Language))
return Results.BadRequest(ErrorDto.Of("不支持的界面语言"));
if (patch.Theme != null && !allowedThemes.Contains(patch.Theme))
return Results.BadRequest(ErrorDto.Of("不支持的主题"));
if (patch.AccentColor != null && !accentHexRegex.IsMatch(patch.AccentColor))
return Results.BadRequest(ErrorDto.Of("主题色需为 #RRGGBB"));
if (patch.UpdateRepository != null && !IsAllowedRepository(patch.UpdateRepository))
return Results.BadRequest(ErrorDto.Of("更新仓库地址不受信任"));
services.Settings.Apply(s =>
{
if (patch.Language != null) s.Language = patch.Language;
if (patch.Theme != null) s.Theme = patch.Theme;
if (patch.AccentColor != null) s.AccentColor = patch.AccentColor.ToUpperInvariant();
if (patch.RenderFps.HasValue) s.RenderFps = Math.Clamp(patch.RenderFps.Value, 12, 120);
if (patch.MemoryMb.HasValue) s.MemoryMb = Math.Clamp(patch.MemoryMb.Value, 256, 16384);
if (patch.MemoryAuto.HasValue) s.MemoryAuto = patch.MemoryAuto.Value;
if (patch.AutoUpdateOnStartup.HasValue) s.AutoUpdateOnStartup = patch.AutoUpdateOnStartup.Value;
if (patch.RequireSignedManifest.HasValue) s.RequireSignedManifest = patch.RequireSignedManifest.Value;
if (patch.UpdateRepository != null) s.UpdateRepository = patch.UpdateRepository;
if (patch.UpdateLocalRoot != null) s.UpdateLocalRoot = patch.UpdateLocalRoot;
if (patch.ModelRootOverride != null) s.ModelRootOverride = patch.ModelRootOverride;
});
if (patch.Language != null) L.I.SetLanguage(patch.Language);
if (patch.MemoryMb.HasValue || patch.MemoryAuto.HasValue)
services.Memory.ApplyAuto(services.Settings.Current.MemoryAuto, services.Settings.Current.MemoryMb);
return Results.Ok(ToSettingsDto());
});
// ---- 模型源 ---------------------------------------------------------------
app.MapGet("/api/sources", () =>
Results.Ok(services.Settings.Current.Sources.Select(ToSourceDto).ToList()));
app.MapPost("/api/sources/select", async (ForceRequest? request) =>
{
var force = request?.Force ?? false;
try
{
var fastest = await services.Selector.PickFastestAsync(force, CancellationToken.None);
services.Updates.UseRemote(services.DownloadModule.CreateRemote(fastest));
return Results.Ok(new LatencyDto(
fastest.Id, fastest.Name,
services.Selector.LastLatency.TryGetValue(fastest.Id, out var ms) ? ms : 0));
}
catch (Exception ex)
{
Console.Error.WriteLine($"[sources] 切换模型源失败: {ex}");
return Results.Json(ErrorDto.Of("模型源切换失败"), statusCode: 503);
}
});
app.MapGet("/api/remote/models", async (string? sourceId, bool force) =>
{
var source = ResolveSource(sourceId);
if (source == null) return Results.NotFound(ErrorDto.Of("没有可用的模型源"));
var index = await services.Sources.FetchAsync(source, force, null, CancellationToken.None);
var installed = services.Models.Scan()
.ToDictionary(p => p.Id, p => p.Manifest.Version, StringComparer.OrdinalIgnoreCase);
return Results.Ok(new SourceIndexDto(
index.SourceId,
index.Root,
index.FromCache,
index.Error,
index.ResolvedFrom,
index.Models.Select(m => new RemoteModelDto(
m.Id,
m.LocalizedName,
m.LocalizedDescription,
m.Manifest.Version,
m.SizeBytes,
ModelScanner.HumanSize(m.SizeBytes),
m.SourceId,
installed.ContainsKey(m.Id),
installed.TryGetValue(m.Id, out var v) ? v : null)).ToList()));
});
// ---- 下载 -----------------------------------------------------------------
app.MapPost("/api/download", async (DownloadRequest? request) =>
{
if (request == null || string.IsNullOrWhiteSpace(request.ModelId))
return Results.BadRequest(ErrorDto.Of("缺少 modelId"));
var source = ResolveSource(request.SourceId);
if (source == null) return Results.NotFound(ErrorDto.Of("没有可用的模型源"));
var index = await services.Sources.FetchAsync(source, false, null, CancellationToken.None);
var model = index.Models.FirstOrDefault(m =>
m.Id.Equals(request.ModelId, StringComparison.OrdinalIgnoreCase));
if (model == null)
return Results.NotFound(ErrorDto.Of($"源里没有模型 {request.ModelId}"));
var job = services.Downloads.Enqueue(model);
return Results.Ok(ToJobDto(job));
});
app.MapGet("/api/download/jobs", () =>
Results.Ok(services.Downloads.Jobs.Select(ToJobDto).ToList()));
app.MapPost("/api/download/{id}/cancel", (string id) =>
ActOnJob(id, job => services.Downloads.Cancel(job)));
app.MapPost("/api/download/{id}/retry", (string id) =>
ActOnJob(id, job => services.Downloads.Retry(job)));
app.MapPost("/api/download/{id}/remove", (string id) =>
ActOnJob(id, job => services.Downloads.Remove(job)));
app.MapPost("/api/download/clear-finished", () =>
{
services.Downloads.ClearFinished();
return Results.Ok(new LaunchResultDto(true, "已清除完成的任务"));
});
// ---- 更新 -----------------------------------------------------------------
app.MapPost("/api/update/check", async (ForceRequest? request) =>
{
var force = request?.Force ?? true;
var messages = new List<string>();
try
{
var fastest = await services.Selector.PickFastestAsync(force, CancellationToken.None);
services.Updates.UseRemote(services.DownloadModule.CreateRemote(fastest));
}
catch (Exception ex)
{
Console.Error.WriteLine($"[update] 测速失败,沿用当前源: {ex.Message}");
}
string? launcherLatest = null;
try
{
launcherLatest = await services.LauncherUpdates.CheckAsync(
services.Updates.Remote, CancellationToken.None);
}
catch (Exception ex)
{
Console.Error.WriteLine($"[update] 启动器版本检查失败: {ex.Message}");
}
var progress = new Progress<UpdateProgress>(p =>
{
if (!string.IsNullOrWhiteSpace(p.Message)) messages.Add(p.Message);
});
var result = await services.Updates.RunAsync(force, progress, CancellationToken.None);
return Results.Ok(new UpdateCheckDto(
result.Outcome.ToString(),
result.Message,
result.UpdatedModels,
result.ModelNames,
result.LauncherMessage,
result.Error,
launcherLatest,
services.Updates.Remote.DisplayName,
services.Selector.LastLatency
.Select(kv => new LatencyDto(
kv.Key,
SourcePreset.Find(kv.Key)?.Name ?? kv.Key,
kv.Value))
.ToList()));
});
// ---- 重新下载启动器 -------------------------------------------------------
// 「关于」页的按钮:本地程序文件被误删 / 损坏后,重新拉一份发布包。
// DownloadAsync 内部会按清单里的 sha256 逐块校验,清单缺 sha256 直接拒绝下载,
// 所以「下载完确认完整性」是这条链路的固有动作,不是这里另加的一次比对。
app.MapPost("/api/launcher/redownload", async () =>
{
try
{
var fastest = await services.Selector.PickFastestAsync(false, CancellationToken.None);
services.Updates.UseRemote(services.DownloadModule.CreateRemote(fastest));
var steps = new List<string>();
var progress = new Progress<UpdateProgressInfo>(p =>
{
if (string.IsNullOrWhiteSpace(p.Stage)) return;
lock (steps) steps.Add(p.Stage);
});
var result = await services.LauncherUpdates.DownloadAsync(
services.Paths, services.Updates.Remote, progress, CancellationToken.None);
lock (steps)
{
return Results.Ok(new LauncherRedownloadDto(
result.State.ToString(),
result.Version,
result.Message,
steps.ToList()));
}
}
catch (Exception ex)
{
Console.Error.WriteLine($"[launcher] 重新下载失败: {ex}");
return Results.Json(
ErrorDto.Of($"重新下载启动器失败:{ex.Message}"),
statusCode: 503);
}
});
// ---- 关于 -----------------------------------------------------------------
app.MapGet("/api/about", async () =>
{
var repository = services.Settings.Current.UpdateRepository;
var contributors = new List<ContributorDto>();
try
{
foreach (var c in await ContributorsService.FetchAsync(repository, CancellationToken.None))
contributors.Add(new ContributorDto(c.DisplayName, c.Contributions, c.AvatarUrl));
}
catch (Exception ex)
{
Console.Error.WriteLine($"[about] 读取贡献者失败: {ex.Message}");
}
return Results.Ok(new AboutDto(
"Morris GC",
LauncherRuntimeInfo.CurrentLauncherVersion,
LauncherRuntimeInfo.CurrentRid,
repository,
contributors,
// 「关于」页展示的技术栈信息:源码语言与前端框架。
SourceLanguage: "C#",
Frontend: "Flutter"));
});
// ---- 系统集成 -------------------------------------------------------------
app.MapPost("/api/shell/open-folder", (PathRequest? request) =>
{
var path = request?.Path;
if (string.IsNullOrWhiteSpace(path))
return Results.BadRequest(ErrorDto.Of("缺少 path"));
// 只允许打开启动器自己的目录,避免前端被当成任意路径执行器
if (!IsInsideKnownRoot(path!))
return Results.BadRequest(ErrorDto.Of("只允许打开启动器自己的目录"));
Shell.OpenFolder(path!);
return Results.Ok(new LaunchResultDto(true, "已打开目录"));
});
app.MapPost("/api/shell/open-url", (UrlRequest? request) =>
{
var url = request?.Url;
if (string.IsNullOrWhiteSpace(url) || url.Length > 2048 ||
!Uri.TryCreate(url, UriKind.Absolute, out var uri))
return Results.BadRequest(ErrorDto.Of("URL 无效"));
if (uri.Scheme != Uri.UriSchemeHttp && uri.Scheme != Uri.UriSchemeHttps)
return Results.BadRequest(ErrorDto.Of("只允许 http/https 链接"));
if (!string.IsNullOrEmpty(uri.UserInfo))
return Results.BadRequest(ErrorDto.Of("URL 不允许携带账号密码"));
Shell.OpenUrl(url!);
return Results.Ok(new LaunchResultDto(true, "已打开链接"));
});
// ---- 启动 -----------------------------------------------------------------
WriteEndpointFile(services, port, sessionToken);
Console.WriteLine($"[GC-UI] 后端已启动: http://127.0.0.1:{port}");
Console.WriteLine($"[GC-UI] 模型库: {services.Paths.ModelRoot}");
return app;
// ---------------------------------------------------------------------------
// 局部辅助
// ---------------------------------------------------------------------------
static void WriteEndpointFile(AppServices services, int port, string? token)
{
try
{
var file = Path.Combine(services.Paths.HomeRoot, "ui-backend.json");
var payload = JsonSerializer.Serialize(new
{
port,
pid = Environment.ProcessId,
url = $"http://127.0.0.1:{port}",
version = LauncherRuntimeInfo.CurrentLauncherVersion,
platform = LauncherRuntimeInfo.CurrentRid,
startedAt = DateTimeOffset.UtcNow.ToString("o"),
// 令牌也写进来:前端如果是被 Finder 直接打开(没有继承环境变量),
// 只能从这里拿到会话令牌,否则每个 /api 都会 401 —— 表现为「无法连接后端」。
token
}, new JsonSerializerOptions { WriteIndented = true });
File.WriteAllText(file, payload);
if (!OperatingSystem.IsWindows())
{
// 同机其他用户不该读到会话令牌
try { File.SetUnixFileMode(file, UnixFileMode.UserRead | UnixFileMode.UserWrite); }
catch { /* 文件系统不支持时忽略 */ }
}
}
catch (Exception ex)
{
Console.Error.WriteLine($"[GC-UI] 写入端点文件失败: {ex.Message}");
}
}
/// <summary>按扩展名推断图片 MIME;模型封面允许 png / jpg / webp / gif。</summary>
static string GuessImageContentType(string path) => Path.GetExtension(path).ToLowerInvariant() switch
{
".jpg" or ".jpeg" => "image/jpeg",
".webp" => "image/webp",
".gif" => "image/gif",
".bmp" => "image/bmp",
".svg" => "image/svg+xml",
_ => "image/png"
};
ModelDto ToModelDto(ModelPackage package) => new( package.Id,
package.LocalizedName,
package.LocalizedDescription,
package.Manifest.Version,
package.Manifest.Author,
package.SizeBytes,
ModelScanner.HumanSize(package.SizeBytes),
package.Manifest.Tags ?? new List<string>(),
File.Exists(package.PreviewPath),
$"/api/models/{package.Id}/preview",
package.Directory,
package.DataDirectory);
SourceDto ToSourceDto(ModelSource source) => new(
source.Id,
string.IsNullOrWhiteSpace(source.Name) ? source.Id : source.Name,
source.Url,
source.Enabled,
source.BuiltIn,
source.DisplayHost);
SettingsDto ToSettingsDto() => new(
services.Settings.Current.Language,
services.Settings.Current.Theme,
services.Settings.Current.AccentColor,
services.Settings.Current.RenderFps,
services.Settings.Current.MemoryMb,
services.Settings.Current.MemoryAuto,
services.Settings.Current.AutoUpdateOnStartup,
services.Settings.Current.RequireSignedManifest,
services.Settings.Current.UpdateRepository,
services.Settings.Current.UpdateLocalRoot,
services.Settings.Current.ModelRootOverride,
services.Memory.BudgetMb,
services.Memory.UsageText,
services.Paths.ModelRoot,
services.Paths.DataRoot,
services.Paths.SettingsFile,
LauncherRuntimeInfo.CurrentLauncherVersion,
LauncherRuntimeInfo.CurrentRid,
services.Settings.Current.Sources.Select(ToSourceDto).ToList(),
L.Supported.Select(s => new LanguageDto(s.Code, s.Label)).ToList());
JobDto ToJobDto(IDownloadJob job) => new(
job.Id,
job.Model.Id,
job.Name,
job.Version,
job.State.ToString(),
job.Progress,
job.StatusText,
job.DetailText,
job.Error,
job.IsActive,
job.CanRetry,
job.IsDone);
ModelSource? ResolveSource(string? sourceId)
{
var sources = services.Settings.Current.Sources;
if (!string.IsNullOrWhiteSpace(sourceId))
{
var exact = sources.FirstOrDefault(s =>
s.Id.Equals(sourceId, StringComparison.OrdinalIgnoreCase));
if (exact != null) return exact;
}
return sources.FirstOrDefault(s => s.Enabled && !string.IsNullOrWhiteSpace(s.Url))
?? sources.FirstOrDefault();
}
IResult ActOnJob(string id, Action<IDownloadJob> action)
{
if (!IsSafeId(id)) return Results.BadRequest(ErrorDto.Of("任务标识无效"));
var job = services.Downloads.Jobs.FirstOrDefault(j =>
j.Id.Equals(id, StringComparison.OrdinalIgnoreCase));
if (job == null) return Results.NotFound(ErrorDto.Of($"没有找到任务 {id}"));
action(job);
return Results.Ok(ToJobDto(job));
}
bool IsInsideKnownRoot(string path)
{
try
{
var full = Path.GetFullPath(path);
var roots = new[]
{
services.Paths.ModelRoot,
services.Paths.DataRoot,
services.Paths.HomeRoot,
services.Paths.AppRoot
};
foreach (var root in roots)
{
if (string.IsNullOrWhiteSpace(root)) continue;
var rootFull = Path.GetFullPath(root);
if (full.Equals(rootFull, StringComparison.OrdinalIgnoreCase)) return true;
if (full.StartsWith(rootFull + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase))
return true;
}
}
catch
{
return false;
}
return false;
}
// 路由标识:只允许字母数字开头,后接字母数字/点/下划线/短横线,长度上限 64。
// 用于模型 id、任务 id,杜绝 `../` 之类的路径穿越尝试。
bool IsSafeId(string? id) => !string.IsNullOrEmpty(id) && safeIdRegex.IsMatch(id);
// 更新仓库地址:必须是 https、不带账号密码、不是回环/内网 IP。
// 防止把本地后端当成 SSRF 跳板去访问内网服务。
bool IsAllowedRepository(string value)
{
if (string.IsNullOrWhiteSpace(value)) return false;
if (!Uri.TryCreate(value, UriKind.Absolute, out var uri)) return false;
if (uri.Scheme != Uri.UriSchemeHttps) return false;
if (!string.IsNullOrEmpty(uri.UserInfo)) return false;
if (string.Equals(uri.Host, "localhost", StringComparison.OrdinalIgnoreCase)) return false;
if (System.Net.IPAddress.TryParse(uri.Host, out var ip) &&
(System.Net.IPAddress.IsLoopback(ip) || IsPrivateAddress(ip)))
return false;
return true;
}
static bool IsPrivateAddress(System.Net.IPAddress ip)
{
var bytes = ip.GetAddressBytes();
if (bytes.Length != 4) return false;
return bytes[0] == 10
|| (bytes[0] == 172 && bytes[1] >= 16 && bytes[1] <= 31)
|| (bytes[0] == 192 && bytes[1] == 168)
|| (bytes[0] == 169 && bytes[1] == 254);
}
}
public static int ResolvePort(string[] args)
{
// 优先用启动器传来的端口(GC_UI_PORT),保证前端拼出来的 baseUrl 和这里一致。
var env = Environment.GetEnvironmentVariable(GcUiContract.PortEnvVar);
if (int.TryParse(env, out var fromEnv) && fromEnv > 0 && fromEnv < 65536) return fromEnv;
for (var i = 0; i < args.Length; i++)
{
if (args[i] == "--port" && i + 1 < args.Length &&
int.TryParse(args[i + 1], out var next) && next > 0 && next < 65536)
return next;
const string prefix = "--port=";
if (args[i].StartsWith(prefix, StringComparison.Ordinal) &&
int.TryParse(args[i][prefix.Length..], out var inline) && inline > 0 && inline < 65536)
return inline;
}
return GcUiContract.DefaultPort;
}
}
@@ -5,8 +5,8 @@
· 后端(本工程):模型扫描 / 下载 / 更新 / 设置 / 模型窗口宿主,只暴露本地 HTTP API · 后端(本工程):模型扫描 / 下载 / 更新 / 设置 / 模型窗口宿主,只暴露本地 HTTP API
· 前端(GC-UI/frontend,Flutter):只做界面,通过 HTTP 调后端 · 前端(GC-UI/frontend,Flutter):只做界面,通过 HTTP 调后端
模型窗口仍然由 .NET 侧承载:模型 dll 返回的是 Avalonia Control, 模型渲染也已并入 Flutter(lib/models/):模型不再返回 Avalonia Control,
换掉渲染栈等于换掉模型契约,所以「渲染留在 .NET,界面交给 Flutter」是唯一不破坏模型生态的切法。 后端只剩纯 HTTP API,不再依赖任何 UI 框架。
--> -->
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
@@ -15,16 +15,10 @@
<RootNamespace>GC.UI.Server</RootNamespace> <RootNamespace>GC.UI.Server</RootNamespace>
<AssemblyName>GC.UI.Server</AssemblyName> <AssemblyName>GC.UI.Server</AssemblyName>
<InvariantGlobalization>false</InvariantGlobalization> <InvariantGlobalization>false</InvariantGlobalization>
<AvaloniaUseCompiledBindingsByDefault>false</AvaloniaUseCompiledBindingsByDefault>
<!-- 后端是本地伴随进程,不需要浏览器启动配置 / 静态文件 --> <!-- 后端是本地伴随进程,不需要浏览器启动配置 / 静态文件 -->
<GenerateDocumentationFile>false</GenerateDocumentationFile> <GenerateDocumentationFile>false</GenerateDocumentationFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\GC\src\GC.Core.csproj" /> <ProjectReference Include="..\..\..\GC\src\GC.Core.csproj" />
<ProjectReference Include="..\..\..\GC-DOWNLOAD\GC-DOWNLOAD.csproj" /> <ProjectReference Include="..\..\..\GC-DOWNLOAD\GC-DOWNLOAD.csproj" />
+4 -499
View File
@@ -1,503 +1,8 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using GC.Download;
using GC.Models;
using GC.Services;
using GC.UI.Server; using GC.UI.Server;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
// --------------------------------------------------------------------------- // 独立进程入口:`GC.UI.Server --port 17890`
// GC-UI 后端:本地 HTTP 服务(只监听 127.0.0.1)。 // 启动器在进程内直接调用 BackendServer.Start,不会走到这里。
// var app = BackendServer.StartFromCommandLine(args);
// 它把原来 GC 启动器里的服务层原样复用(GC.Core / GC-DOWNLOAD),
// 只是把「界面」从 Avalonia 换成 Flutter —— 前端通过下面这些接口驱动后端。
//
// GET /api/health 健康检查 + 图形环境是否可用
// GET /api/models 已安装模型
// GET /api/models/{id}/preview 模型封面图
// POST /api/models/{id}/launch 启动模型(打开模型自己的窗口)
// DELETE /api/models/{id} 删除模型
// GET /api/settings 读取设置
// POST /api/settings 修改设置(补丁式)
// GET /api/sources 模型源列表
// POST /api/sources/select 双源测速并切到最快
// GET /api/remote/models 远端可下载模型
// POST /api/download 入队下载
// GET /api/download/jobs 下载任务
// POST /api/download/{id}/cancel|retry|remove
// POST /api/download/clear-finished 清除已完成
// POST /api/update/check 检查模型 / 启动器更新
// GET /api/about 版本 + 贡献者
// POST /api/shell/open-folder|open-url 打开目录 / 链接
// ---------------------------------------------------------------------------
var port = ResolvePort(args);
// 下载模块(GC-DOWNLOAD)通过宿主钩子注入,和 GC-BOOT 的做法一致。
DownloadModuleHost.Factory = new DownloadModuleFactory();
var services = AppServices.Create();
var uiHost = new AvaloniaHost(services);
var builder = WebApplication.CreateBuilder(new WebApplicationOptions { Args = args });
builder.Logging.ClearProviders();
builder.WebHost.UseUrls($"http://127.0.0.1:{port}");
// 桌面端(Windows/macOS)走原生 HTTP,不需要 CORS;
// 这里放开本机回环来源,方便用 `flutter run -d chrome` 调试界面。
builder.Services.AddCors(options => options.AddDefaultPolicy(policy => policy
.SetIsOriginAllowed(origin =>
Uri.TryCreate(origin, UriKind.Absolute, out var uri) &&
(uri.Host == "127.0.0.1" || uri.Host == "localhost"))
.AllowAnyHeader()
.AllowAnyMethod()));
var app = builder.Build();
app.UseCors();
// ---- 健康检查 -------------------------------------------------------------
app.MapGet("/api/health", () => Results.Ok(new HealthDto(
true,
LauncherRuntimeInfo.CurrentLauncherVersion,
LauncherRuntimeInfo.CurrentRid,
uiHost.IsAvailable,
uiHost.LastError)));
// ---- 已安装模型 -----------------------------------------------------------
app.MapGet("/api/models", () =>
Results.Ok(services.Models.Scan().Select(ToModelDto).ToList()));
app.MapGet("/api/models/{id}/preview", (string id) =>
{
var package = services.Models.Find(id);
if (package == null || !File.Exists(package.PreviewPath)) return Results.NotFound();
return Results.File(package.PreviewPath, "image/png");
});
app.MapPost("/api/models/{id}/launch", async (string id) =>
{
var package = services.Models.Find(id);
if (package == null) return Results.NotFound(new LaunchResultDto(false, $"没有找到模型 {id}"));
try
{
services.Memory.Refresh();
var message = await uiHost.LaunchAsync(package);
return Results.Ok(new LaunchResultDto(true, message));
}
catch (Exception ex)
{
return Results.Json(new LaunchResultDto(false, ex.Message), statusCode: 503);
}
});
app.MapDelete("/api/models/{id}", (string id) =>
{
var ok = services.Models.Delete(id);
if (ok) services.Models.NotifyChanged();
return ok
? Results.Ok(new LaunchResultDto(true, $"已删除模型 {id}"))
: Results.NotFound(new LaunchResultDto(false, $"没有找到模型 {id}"));
});
// ---- 设置 -----------------------------------------------------------------
app.MapGet("/api/settings", () => Results.Ok(ToSettingsDto()));
app.MapPost("/api/settings", (SettingsPatch? patch) =>
{
if (patch == null) return Results.BadRequest(new LaunchResultDto(false, "缺少设置内容"));
services.Settings.Apply(s =>
{
if (patch.Language != null) s.Language = patch.Language;
if (patch.Theme != null) s.Theme = patch.Theme;
if (patch.RenderFps.HasValue) s.RenderFps = Math.Clamp(patch.RenderFps.Value, 12, 120);
if (patch.MemoryMb.HasValue) s.MemoryMb = Math.Clamp(patch.MemoryMb.Value, 256, 16384);
if (patch.MemoryAuto.HasValue) s.MemoryAuto = patch.MemoryAuto.Value;
if (patch.AutoUpdateOnStartup.HasValue) s.AutoUpdateOnStartup = patch.AutoUpdateOnStartup.Value;
if (patch.RequireSignedManifest.HasValue) s.RequireSignedManifest = patch.RequireSignedManifest.Value;
if (patch.UpdateRepository != null) s.UpdateRepository = patch.UpdateRepository;
if (patch.UpdateLocalRoot != null) s.UpdateLocalRoot = patch.UpdateLocalRoot;
if (patch.ModelRootOverride != null) s.ModelRootOverride = patch.ModelRootOverride;
});
if (patch.Language != null) L.I.SetLanguage(patch.Language);
if (patch.MemoryMb.HasValue || patch.MemoryAuto.HasValue)
services.Memory.ApplyAuto(services.Settings.Current.MemoryAuto, services.Settings.Current.MemoryMb);
return Results.Ok(ToSettingsDto());
});
// ---- 模型源 ---------------------------------------------------------------
app.MapGet("/api/sources", () =>
Results.Ok(services.Settings.Current.Sources.Select(ToSourceDto).ToList()));
app.MapPost("/api/sources/select", async (ForceRequest? request) =>
{
var force = request?.Force ?? false;
try
{
var fastest = await services.Selector.PickFastestAsync(force, CancellationToken.None);
services.Updates.UseRemote(services.DownloadModule.CreateRemote(fastest));
return Results.Ok(new LatencyDto(
fastest.Id, fastest.Name,
services.Selector.LastLatency.TryGetValue(fastest.Id, out var ms) ? ms : 0));
}
catch (Exception ex)
{
return Results.Json(new LaunchResultDto(false, ex.Message), statusCode: 503);
}
});
app.MapGet("/api/remote/models", async (string? sourceId, bool force) =>
{
var source = ResolveSource(sourceId);
if (source == null) return Results.NotFound(new LaunchResultDto(false, "没有可用的模型源"));
var index = await services.Sources.FetchAsync(source, force, null, CancellationToken.None);
var installed = services.Models.Scan()
.ToDictionary(p => p.Id, p => p.Manifest.Version, StringComparer.OrdinalIgnoreCase);
return Results.Ok(new SourceIndexDto(
index.SourceId,
index.Root,
index.FromCache,
index.Error,
index.ResolvedFrom,
index.Models.Select(m => new RemoteModelDto(
m.Id,
m.LocalizedName,
m.LocalizedDescription,
m.Manifest.Version,
m.SizeBytes,
ModelScanner.HumanSize(m.SizeBytes),
m.SourceId,
installed.ContainsKey(m.Id),
installed.TryGetValue(m.Id, out var v) ? v : null)).ToList()));
});
// ---- 下载 -----------------------------------------------------------------
app.MapPost("/api/download", async (DownloadRequest? request) =>
{
if (request == null || string.IsNullOrWhiteSpace(request.ModelId))
return Results.BadRequest(new LaunchResultDto(false, "缺少 modelId"));
var source = ResolveSource(request.SourceId);
if (source == null) return Results.NotFound(new LaunchResultDto(false, "没有可用的模型源"));
var index = await services.Sources.FetchAsync(source, false, null, CancellationToken.None);
var model = index.Models.FirstOrDefault(m =>
m.Id.Equals(request.ModelId, StringComparison.OrdinalIgnoreCase));
if (model == null)
return Results.NotFound(new LaunchResultDto(false, $"源里没有模型 {request.ModelId}"));
var job = services.Downloads.Enqueue(model);
return Results.Ok(ToJobDto(job));
});
app.MapGet("/api/download/jobs", () =>
Results.Ok(services.Downloads.Jobs.Select(ToJobDto).ToList()));
app.MapPost("/api/download/{id}/cancel", (string id) =>
ActOnJob(id, job => services.Downloads.Cancel(job)));
app.MapPost("/api/download/{id}/retry", (string id) =>
ActOnJob(id, job => services.Downloads.Retry(job)));
app.MapPost("/api/download/{id}/remove", (string id) =>
ActOnJob(id, job => services.Downloads.Remove(job)));
app.MapPost("/api/download/clear-finished", () =>
{
services.Downloads.ClearFinished();
return Results.Ok(new LaunchResultDto(true, "已清除完成的任务"));
});
// ---- 更新 -----------------------------------------------------------------
app.MapPost("/api/update/check", async (ForceRequest? request) =>
{
var force = request?.Force ?? true;
var messages = new List<string>();
try
{
var fastest = await services.Selector.PickFastestAsync(force, CancellationToken.None);
services.Updates.UseRemote(services.DownloadModule.CreateRemote(fastest));
}
catch (Exception ex)
{
Console.Error.WriteLine($"[update] 测速失败,沿用当前源: {ex.Message}");
}
string? launcherLatest = null;
try
{
launcherLatest = await services.LauncherUpdates.CheckAsync(
services.Updates.Remote, CancellationToken.None);
}
catch (Exception ex)
{
Console.Error.WriteLine($"[update] 启动器版本检查失败: {ex.Message}");
}
var progress = new Progress<UpdateProgress>(p =>
{
if (!string.IsNullOrWhiteSpace(p.Message)) messages.Add(p.Message);
});
var result = await services.Updates.RunAsync(force, progress, CancellationToken.None);
return Results.Ok(new UpdateCheckDto(
result.Outcome.ToString(),
result.Message,
result.UpdatedModels,
result.ModelNames,
result.LauncherMessage,
result.Error,
launcherLatest,
services.Updates.Remote.DisplayName,
services.Selector.LastLatency
.Select(kv => new LatencyDto(
kv.Key,
SourcePreset.Find(kv.Key)?.Name ?? kv.Key,
kv.Value))
.ToList()));
});
// ---- 关于 -----------------------------------------------------------------
app.MapGet("/api/about", async () =>
{
var repository = services.Settings.Current.UpdateRepository;
var contributors = new List<ContributorDto>();
try
{
foreach (var c in await ContributorsService.FetchAsync(repository, CancellationToken.None))
contributors.Add(new ContributorDto(c.DisplayName, c.Contributions, c.AvatarUrl));
}
catch (Exception ex)
{
Console.Error.WriteLine($"[about] 读取贡献者失败: {ex.Message}");
}
return Results.Ok(new AboutDto(
"Morris GC",
LauncherRuntimeInfo.CurrentLauncherVersion,
LauncherRuntimeInfo.CurrentRid,
repository,
contributors,
// 「关于」页展示的技术栈信息:源码语言与前端框架。
SourceLanguage: "C#",
Frontend: "Flutter"));
});
// ---- 系统集成 -------------------------------------------------------------
app.MapPost("/api/shell/open-folder", (PathRequest? request) =>
{
var path = request?.Path;
if (string.IsNullOrWhiteSpace(path))
return Results.BadRequest(new LaunchResultDto(false, "缺少 path"));
// 只允许打开启动器自己的目录,避免前端被当成任意路径执行器
if (!IsInsideKnownRoot(path!))
return Results.BadRequest(new LaunchResultDto(false, "只允许打开启动器自己的目录"));
Shell.OpenFolder(path!);
return Results.Ok(new LaunchResultDto(true, "已打开目录"));
});
app.MapPost("/api/shell/open-url", (UrlRequest? request) =>
{
var url = request?.Url;
if (string.IsNullOrWhiteSpace(url) || !Uri.TryCreate(url, UriKind.Absolute, out var uri))
return Results.BadRequest(new LaunchResultDto(false, "URL 无效"));
if (uri.Scheme != Uri.UriSchemeHttp && uri.Scheme != Uri.UriSchemeHttps)
return Results.BadRequest(new LaunchResultDto(false, "只允许 http/https 链接"));
Shell.OpenUrl(url!);
return Results.Ok(new LaunchResultDto(true, "已打开链接"));
});
// ---- 启动 -----------------------------------------------------------------
WriteEndpointFile(services, port);
Console.WriteLine($"[GC-UI] 后端已启动: http://127.0.0.1:{port}");
Console.WriteLine($"[GC-UI] 模型库: {services.Paths.ModelRoot}");
// 纯 HTTP 后端(模型渲染在 Flutter 客户端里),跑起来常驻即可。
app.Run(); app.Run();
// ---------------------------------------------------------------------------
// 局部辅助
// ---------------------------------------------------------------------------
static int ResolvePort(string[] args)
{
var env = Environment.GetEnvironmentVariable("GC_UI_PORT");
if (int.TryParse(env, out var fromEnv) && fromEnv > 0 && fromEnv < 65536) return fromEnv;
for (var i = 0; i < args.Length; i++)
{
if (args[i] == "--port" && i + 1 < args.Length &&
int.TryParse(args[i + 1], out var next) && next > 0 && next < 65536)
return next;
const string prefix = "--port=";
if (args[i].StartsWith(prefix, StringComparison.Ordinal) &&
int.TryParse(args[i][prefix.Length..], out var inline) && inline > 0 && inline < 65536)
return inline;
}
return 17890;
}
static void WriteEndpointFile(AppServices services, int port)
{
try
{
var file = Path.Combine(services.Paths.HomeRoot, "ui-backend.json");
var payload = JsonSerializer.Serialize(new
{
port,
pid = Environment.ProcessId,
url = $"http://127.0.0.1:{port}",
version = LauncherRuntimeInfo.CurrentLauncherVersion,
platform = LauncherRuntimeInfo.CurrentRid,
startedAt = DateTimeOffset.UtcNow.ToString("o")
}, new JsonSerializerOptions { WriteIndented = true });
File.WriteAllText(file, payload);
}
catch (Exception ex)
{
Console.Error.WriteLine($"[GC-UI] 写入端点文件失败: {ex.Message}");
}
}
ModelDto ToModelDto(ModelPackage package) => new(
package.Id,
package.LocalizedName,
package.LocalizedDescription,
package.Manifest.Version,
package.Manifest.Author,
package.SizeBytes,
ModelScanner.HumanSize(package.SizeBytes),
package.Manifest.Tags ?? new List<string>(),
File.Exists(package.PreviewPath),
$"/api/models/{package.Id}/preview",
package.Directory,
package.DataDirectory);
SourceDto ToSourceDto(ModelSource source) => new(
source.Id,
string.IsNullOrWhiteSpace(source.Name) ? source.Id : source.Name,
source.Url,
source.Enabled,
source.BuiltIn,
source.DisplayHost);
SettingsDto ToSettingsDto() => new(
services.Settings.Current.Language,
services.Settings.Current.Theme,
services.Settings.Current.RenderFps,
services.Settings.Current.MemoryMb,
services.Settings.Current.MemoryAuto,
services.Settings.Current.AutoUpdateOnStartup,
services.Settings.Current.RequireSignedManifest,
services.Settings.Current.UpdateRepository,
services.Settings.Current.UpdateLocalRoot,
services.Settings.Current.ModelRootOverride,
services.Memory.BudgetMb,
services.Memory.UsageText,
services.Paths.ModelRoot,
services.Paths.DataRoot,
services.Paths.SettingsFile,
LauncherRuntimeInfo.CurrentLauncherVersion,
LauncherRuntimeInfo.CurrentRid,
services.Settings.Current.Sources.Select(ToSourceDto).ToList(),
L.Supported.Select(s => new LanguageDto(s.Code, s.Label)).ToList());
JobDto ToJobDto(IDownloadJob job) => new(
job.Id,
job.Model.Id,
job.Name,
job.Version,
job.State.ToString(),
job.Progress,
job.StatusText,
job.DetailText,
job.Error,
job.IsActive,
job.CanRetry,
job.IsDone);
ModelSource? ResolveSource(string? sourceId)
{
var sources = services.Settings.Current.Sources;
if (!string.IsNullOrWhiteSpace(sourceId))
{
var exact = sources.FirstOrDefault(s =>
s.Id.Equals(sourceId, StringComparison.OrdinalIgnoreCase));
if (exact != null) return exact;
}
return sources.FirstOrDefault(s => s.Enabled && !string.IsNullOrWhiteSpace(s.Url))
?? sources.FirstOrDefault();
}
IResult ActOnJob(string id, Action<IDownloadJob> action)
{
var job = services.Downloads.Jobs.FirstOrDefault(j =>
j.Id.Equals(id, StringComparison.OrdinalIgnoreCase));
if (job == null) return Results.NotFound(new LaunchResultDto(false, $"没有找到任务 {id}"));
action(job);
return Results.Ok(ToJobDto(job));
}
bool IsInsideKnownRoot(string path)
{
try
{
var full = Path.GetFullPath(path);
var roots = new[]
{
services.Paths.ModelRoot,
services.Paths.DataRoot,
services.Paths.HomeRoot,
services.Paths.AppRoot
};
foreach (var root in roots)
{
if (string.IsNullOrWhiteSpace(root)) continue;
var rootFull = Path.GetFullPath(root);
if (full.Equals(rootFull, StringComparison.OrdinalIgnoreCase)) return true;
if (full.StartsWith(rootFull + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase))
return true;
}
}
catch
{
return false;
}
return false;
}
+696
View File
@@ -0,0 +1,696 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
namespace GC.UI.Server;
/// <summary>
/// 本地用户系统:注册 / 登录 / 签到 / 积分 / 主题色。
///
/// 目录结构(都在 .GC/user 下):
/// .GC/user/user.yaml 本地登录信息(当前用户 + session token)
/// .GC/user/&lt;用户名&gt;/pw.yaml 该用户的账号数据(用户名、积分、密码 sha512)
///
/// 密码只存 sha512(密码 + ":" + 随机盐),不存明文;盐单独一行保存。
/// </summary>
public sealed class UserService
{
/// <summary>默认主题色(蓝色):免费。</summary>
public const string DefaultThemeColor = "4A90D9";
/// <summary>预置颜色单价。</summary>
public const int PresetColorCost = 50;
/// <summary>自定义颜色单价。</summary>
public const int CustomColorCost = 150;
/// <summary>退款窗口:购买后 1 小时内换色可退 80%。</summary>
public static readonly TimeSpan RefundWindow = TimeSpan.FromHours(1);
/// <summary>退款比例。</summary>
public const double RefundRate = 0.8;
/// <summary>签到周期长度(天)。</summary>
public const int SignInCycleDays = 30;
private static readonly string[] PresetColors =
{
"4A90D9", "E74C3C", "27AE60", "9B59B6",
"F39C12", "1ABC9C", "E91E63", "2C3E50"
};
private readonly string _userDir;
private readonly string _sessionFile;
public readonly ConcurrentDictionary<string, UserRecord> _users = new();
/// <summary>验证码:id → (答案, 过期时间)。一次性,用后即删。</summary>
private readonly ConcurrentDictionary<string, (int Answer, DateTime Expires)> _captchas = new();
/// <summary>记住的登录用户(来自 user.yaml),没有显式 token 时用它。</summary>
private string? _restoredUser;
public UserService(string homeRoot)
{
_userDir = Path.Combine(homeRoot, "user");
_sessionFile = Path.Combine(_userDir, "user.yaml");
Directory.CreateDirectory(_userDir);
LoadAll();
LoadSession();
}
// ---------------------------------------------------------------- 读写磁盘
private void LoadAll()
{
foreach (var dir in Directory.GetDirectories(_userDir))
{
try
{
var file = Path.Combine(dir, "pw.yaml");
if (!File.Exists(file)) continue;
var rec = DeserializeUser(Path.GetFileName(dir), File.ReadAllText(file));
if (rec != null) _users[rec.Username.ToLowerInvariant()] = rec;
}
catch { /* 单个用户文件损坏不影响其他用户 */ }
}
// 兼容旧布局:.GC/user/<用户名>.yaml 直接放在根下(迁移到 <用户名>/pw.yaml)
foreach (var legacy in Directory.GetFiles(_userDir, "*.yaml"))
{
if (string.Equals(legacy, _sessionFile, StringComparison.OrdinalIgnoreCase)) continue;
try
{
var name = Path.GetFileNameWithoutExtension(legacy);
var rec = DeserializeUser(name, File.ReadAllText(legacy));
if (rec == null) continue;
_users[rec.Username.ToLowerInvariant()] = rec;
SaveUser(rec);
File.Delete(legacy);
}
catch { /* 忽略 */ }
}
}
private static UserRecord? DeserializeUser(string fallbackName, string yaml)
{
var lines = yaml.Split('\n', StringSplitOptions.RemoveEmptyEntries);
string? username = null, pwHash = null, pwSalt = null, themeColor = null;
decimal points = 0, themePaid = 0;
int consecutiveDays = 0, fortuneCount = 0, pickCount = 0;
DateTime? lastSignIn = null, themePaidAt = null, fortuneDate = null, pickDate = null;
foreach (var line in lines)
{
var parts = line.Split(':', 2);
if (parts.Length != 2) continue;
var key = parts[0].Trim();
var val = parts[1].Trim();
switch (key)
{
case "username": username = val; break;
case "pw_hash": pwHash = val; break;
case "pw_salt": pwSalt = val; break;
// 旧文件里积分是整数;decimal.TryParse 兼容读取
case "points": decimal.TryParse(val, out var p); points = p; break;
case "last_sign_in":
if (DateTime.TryParse(val, out var ls)) lastSignIn = ls;
break;
case "consecutive_days": int.TryParse(val, out var d); consecutiveDays = d; break;
case "theme_color": themeColor = val; break;
case "theme_paid": decimal.TryParse(val, out var tp); themePaid = tp; break;
case "theme_paid_at":
if (DateTime.TryParse(val, out var ta)) themePaidAt = ta;
break;
case "fortune_date":
if (DateTime.TryParse(val, out var fd)) fortuneDate = fd;
break;
case "fortune_count": int.TryParse(val, out var fc); fortuneCount = fc; break;
case "pick_date":
if (DateTime.TryParse(val, out var pd)) pickDate = pd;
break;
case "pick_count": int.TryParse(val, out var pc); pickCount = pc; break;
}
}
if (string.IsNullOrWhiteSpace(username)) username = fallbackName;
if (pwHash == null || pwSalt == null) return null;
return new UserRecord(username!, pwHash, pwSalt, points, lastSignIn, consecutiveDays,
string.IsNullOrWhiteSpace(themeColor) ? DefaultThemeColor : themeColor,
themePaid, themePaidAt)
{
FortuneDate = fortuneDate,
FortuneCount = fortuneCount,
PickDate = pickDate,
PickCount = pickCount
};
}
private void SaveUser(UserRecord rec)
{
try
{
var dir = Path.Combine(_userDir, SafeDirName(rec.Username));
Directory.CreateDirectory(dir);
var yaml = new StringBuilder()
.AppendLine($"username: {rec.Username}")
.AppendLine($"pw_hash: {rec.PwHash}")
.AppendLine($"pw_salt: {rec.PwSalt}")
.AppendLine($"points: {rec.Points.ToString("0.##")}")
.AppendLine($"last_sign_in: {rec.LastSignIn?.ToString("yyyy-MM-dd") ?? ""}")
.AppendLine($"consecutive_days: {rec.ConsecutiveDays}")
.AppendLine($"theme_color: {rec.ThemeColor ?? DefaultThemeColor}")
.AppendLine($"theme_paid: {rec.ThemePaid.ToString("0.##")}")
.AppendLine($"theme_paid_at: {rec.ThemePaidAt?.ToString("o") ?? ""}")
.AppendLine($"fortune_date: {rec.FortuneDate?.ToString("yyyy-MM-dd") ?? ""}")
.AppendLine($"fortune_count: {rec.FortuneCount}")
.AppendLine($"pick_date: {rec.PickDate?.ToString("yyyy-MM-dd") ?? ""}")
.AppendLine($"pick_count: {rec.PickCount}")
.ToString();
File.WriteAllText(Path.Combine(dir, "pw.yaml"), yaml);
}
catch { /* 写盘失败不影响内存状态 */ }
}
/// <summary>用户名做目录名时过滤掉路径分隔符与 Windows 保留字符。</summary>
private static string SafeDirName(string username)
{
var invalid = Path.GetInvalidFileNameChars();
var chars = username.Select(c => invalid.Contains(c) || c == '.' ? '_' : c).ToArray();
var name = new string(chars).Trim();
return string.IsNullOrEmpty(name) ? "_" : name;
}
// ---------------------------------------------------------------- 登录态
private void LoadSession()
{
try
{
if (!File.Exists(_sessionFile)) return;
foreach (var line in File.ReadAllLines(_sessionFile))
{
var parts = line.Split(':', 2);
if (parts.Length == 2 && parts[0].Trim() == "username")
{
var name = parts[1].Trim();
if (!string.IsNullOrEmpty(name) && _users.ContainsKey(name.ToLowerInvariant()))
_restoredUser = name.ToLowerInvariant();
}
}
}
catch { /* 忽略 */ }
}
public void SaveSession(string username, string token)
{
try
{
var lower = username.ToLowerInvariant();
_restoredUser = lower;
Directory.CreateDirectory(_userDir);
File.WriteAllText(_sessionFile,
$"username: {username}\nsession_token: {token}\n");
}
catch { /* 忽略 */ }
}
public void ClearSession()
{
_restoredUser = null;
try { if (File.Exists(_sessionFile)) File.Delete(_sessionFile); } catch { /* 忽略 */ }
}
/// <summary>没有携带 token 时,回退到 user.yaml 里记住的用户(自动登录)。</summary>
public string? RestoredUser => _restoredUser;
// ---------------------------------------------------------------- 验证码
/// <summary>签发一个算术验证码,5 分钟内有效,用后即焚。</summary>
public (string Id, string Question) IssueCaptcha()
{
var now = DateTime.UtcNow;
// 顺手清理过期项,避免长时间运行后字典无限增长
if (_captchas.Count > 128)
{
foreach (var kv in _captchas)
if (kv.Value.Expires < now) _captchas.TryRemove(kv.Key, out _);
}
var a = RandomNumberGenerator.GetInt32(2, 10);
var b = RandomNumberGenerator.GetInt32(2, 10);
var plus = RandomNumberGenerator.GetInt32(0, 2) == 0;
var answer = plus ? a + b : Math.Max(a, b) - Math.Min(a, b);
var id = Convert.ToHexString(RandomNumberGenerator.GetBytes(12)).ToLowerInvariant();
_captchas[id] = (answer, now.AddMinutes(5));
var question = plus ? $"{a} + {b} = ?" : $"{Math.Max(a, b)} - {Math.Min(a, b)} = ?";
return (id, question);
}
public bool VerifyCaptcha(string? id, string? answer, out string error)
{
error = "";
if (string.IsNullOrWhiteSpace(id) || string.IsNullOrWhiteSpace(answer))
{
error = "请先完成人机验证";
return false;
}
if (!_captchas.TryRemove(id, out var entry))
{
error = "验证码已失效,请重新获取";
return false;
}
if (entry.Expires < DateTime.UtcNow)
{
error = "验证码已过期,请重新获取";
return false;
}
if (!int.TryParse(answer.Trim(), out var value) || value != entry.Answer)
{
error = "验证码答案错误";
return false;
}
return true;
}
// ---------------------------------------------------------------- 账号
public bool Register(string username, string password, string? captchaId, string? captcha,
out string error)
{
if (!VerifyCaptcha(captchaId, captcha, out error)) return false;
if (string.IsNullOrWhiteSpace(username) || username.Length > 20)
{
error = "用户名需为 1–20 个字符";
return false;
}
if (username.Any(char.IsWhiteSpace))
{
error = "用户名不能包含空格";
return false;
}
if (_users.ContainsKey(username.Trim().ToLowerInvariant()))
{
error = "用户名已存在,请换一个";
return false;
}
if (string.IsNullOrWhiteSpace(password) || password.Length < 6)
{
error = "密码至少 6 位";
return false;
}
var name = username.Trim();
var salt = GenerateSalt();
var rec = new UserRecord(name, HashPassword(password, salt), salt,
0, null, 0, DefaultThemeColor, 0, null);
_users[name.ToLowerInvariant()] = rec;
SaveUser(rec);
return true;
}
public bool Login(string username, string password, out string error, out UserRecord? record)
{
error = "";
record = null;
if (!_users.TryGetValue(username.Trim().ToLowerInvariant(), out var rec))
{
error = "用户名或密码错误";
return false;
}
if (HashPassword(password, rec.PwSalt) != rec.PwHash)
{
error = "用户名或密码错误";
return false;
}
record = rec;
return true;
}
public bool TryGetUser(string username, out UserRecord? record)
=> _users.TryGetValue(username.Trim().ToLowerInvariant(), out record);
public UserRecord? GetFirstUser() => _users.Values.FirstOrDefault();
public bool UpdatePoints(string username, decimal deltaPoints, out string error)
{
error = "";
if (!_users.TryGetValue(username.Trim().ToLowerInvariant(), out var rec))
{
error = "用户不存在";
return false;
}
rec.Points = Math.Max(0, rec.Points + deltaPoints);
SaveUser(rec);
return true;
}
// ---------------------------------------------------------------- 签到
/// <summary>
/// 30 天一循环的签到奖励。第 7/14/21/28 天给「周奖励」,第 30 天给满月奖励。
/// </summary>
public static int GetSignInReward(int cycleDay)
{
if (cycleDay < 1) cycleDay = 1;
if (cycleDay > SignInCycleDays) cycleDay = ((cycleDay - 1) % SignInCycleDays) + 1;
return cycleDay switch
{
7 => 30,
14 => 40,
21 => 50,
28 => 60,
30 => 100,
<= 6 => 10,
<= 13 => 15,
<= 20 => 20,
<= 27 => 25,
_ => 40
};
}
public static int CycleDay(int consecutiveDays)
{
if (consecutiveDays < 1) return 1;
return ((consecutiveDays - 1) % SignInCycleDays) + 1;
}
public bool UpdateSignIn(string username, out string error, out int reward)
{
error = "";
reward = 0;
if (!_users.TryGetValue(username.Trim().ToLowerInvariant(), out var rec))
{
error = "用户不存在";
return false;
}
// 本地日历日:签到按用户机器上的「今天」算(0 点翻篇),不能用 UTC——
// 否则东八区用户要到早上 8 点才算新的一天,会出现同一天签到两次。
var today = DateTime.Today;
if (rec.LastSignIn.HasValue)
{
var diff = (today - rec.LastSignIn.Value.Date).Days;
if (diff == 0)
{
error = "今日已签到";
return false;
}
// 断签超过一天:连续天数重置(但 30 天周期按新的连续天数重新算)
rec.ConsecutiveDays = diff == 1 ? rec.ConsecutiveDays + 1 : 1;
}
else
{
rec.ConsecutiveDays = 1;
}
rec.LastSignIn = today;
reward = GetSignInReward(CycleDay(rec.ConsecutiveDays));
rec.Points += reward;
SaveUser(rec);
return true;
}
// ---------------------------------------------------------------- 主题色
/// <summary>某个颜色的价格:默认蓝免费,预置色 50,其它(自定义)150。</summary>
public static int ThemeCost(string hex)
{
var h = NormalizeHex(hex);
if (string.IsNullOrEmpty(h)) return -1;
if (string.Equals(h, DefaultThemeColor, StringComparison.OrdinalIgnoreCase)) return 0;
return PresetColors.Contains(h, StringComparer.OrdinalIgnoreCase)
? PresetColorCost
: CustomColorCost;
}
public static string NormalizeHex(string? hex)
{
if (string.IsNullOrWhiteSpace(hex)) return "";
var h = hex.Trim().TrimStart('#');
if (h.StartsWith("0x", StringComparison.OrdinalIgnoreCase)) h = h[2..];
if (h.Length != 6) return "";
return h.All(Uri.IsHexDigit) ? h.ToUpperInvariant() : "";
}
/// <summary>
/// 换主题色。服务端自己算价,不信客户端传的 cost。
/// 上次购买在 1 小时内,先按 80% 退还上次花费。
/// </summary>
public bool ChangeThemeColor(string username, string colorHex, out string error, out decimal refunded)
{
error = "";
refunded = 0;
if (!_users.TryGetValue(username.Trim().ToLowerInvariant(), out var rec))
{
error = "用户不存在";
return false;
}
var hex = NormalizeHex(colorHex);
if (string.IsNullOrEmpty(hex))
{
error = "颜色格式应为 #RRGGBB";
return false;
}
var cost = ThemeCost(hex);
if (cost < 0)
{
error = "颜色格式应为 #RRGGBB";
return false;
}
if (string.Equals(NormalizeHex(rec.ThemeColor), hex, StringComparison.OrdinalIgnoreCase))
{
error = "当前已经是这个颜色";
return false;
}
// 1 小时内换色:退回上次花费的 80%(保留 2 位小数)
var available = rec.Points;
if (rec.ThemePaid > 0 && rec.ThemePaidAt.HasValue &&
DateTime.UtcNow - rec.ThemePaidAt.Value <= RefundWindow)
{
refunded = Math.Floor(rec.ThemePaid * (decimal)RefundRate * 100) / 100;
available += refunded;
}
if (available < cost)
{
error = refunded > 0
? $"积分不足(含可退 {refunded},需 {cost})"
: $"积分不足,需要 {cost} 积分";
return false;
}
rec.Points = available - cost;
rec.ThemeColor = hex;
rec.ThemePaid = cost;
rec.ThemePaidAt = cost > 0 ? DateTime.UtcNow : null;
SaveUser(rec);
return true;
}
/// <summary>距离退款窗口关闭还剩多久;没有可退的就返回 null。</summary>
public static TimeSpan? RefundRemaining(UserRecord rec)
{
if (rec.ThemePaid <= 0 || !rec.ThemePaidAt.HasValue) return null;
var left = RefundWindow - (DateTime.UtcNow - rec.ThemePaidAt.Value);
return left > TimeSpan.Zero ? left : null;
}
// ---------------------------------------------------------------- 人品值 / 二选一
/// <summary>
/// 人品值当日费用。第一次免费;之后按当日已付费次数阶梯计费:
/// 第 1–5 次 0.1 / 第 6–10 次 0.2 / 第 11–25 次 0.5 / 第 26 次起 1。
/// </summary>
public static decimal FortuneCost(int paidIndexToday)
{
if (paidIndexToday <= 0) return 0m;
if (paidIndexToday <= 5) return 0.1m;
if (paidIndexToday <= 10) return 0.2m;
if (paidIndexToday <= 25) return 0.5m;
return 1m;
}
/// <summary>二选一当日费用:第一次免费,之后每次 0.5。</summary>
public static decimal PickCost(int paidIndexToday)
=> paidIndexToday <= 0 ? 0m : 0.5m;
/// <summary>算出当日费用并扣费;积分不足返回 false。成功后计数 +1。</summary>
private bool ChargeDailyFeature(UserRecord rec, Func<int, decimal> costFn,
DateTime? featureDate, int featureCount, out decimal cost, out string error)
{
error = "";
cost = 0;
// 本地日历日:签到按用户机器上的「今天」算(0 点翻篇),不能用 UTC——
// 否则东八区用户要到早上 8 点才算新的一天,会出现同一天签到两次。
var today = DateTime.Today;
// 跨天了先重置计数
if (featureDate.HasValue && featureDate.Value.Date != today)
featureCount = 0;
cost = costFn(featureCount);
if (rec.Points < cost)
{
error = cost > 0
? $"积分不足,本次需要 {cost.ToString("0.##")} 积分"
: "积分不足";
return false;
}
rec.Points = Math.Round(rec.Points - cost, 2);
return true;
}
/// <summary>
/// 摇一次人品值(服务端算随机数,客户端不信自己传的值)。
/// 当天第一次免费,之后按阶梯扣积分。
/// </summary>
public bool RollFortune(string username, out string error, out int value,
out decimal cost, out UserRecord? record)
{
error = "";
value = 0;
cost = 0;
record = null;
if (!_users.TryGetValue(username.Trim().ToLowerInvariant(), out var rec))
{
error = "用户不存在";
return false;
}
// 本地日历日:签到按用户机器上的「今天」算(0 点翻篇),不能用 UTC——
// 否则东八区用户要到早上 8 点才算新的一天,会出现同一天签到两次。
var today = DateTime.Today;
var count = rec.FortuneDate.HasValue && rec.FortuneDate.Value.Date == today
? rec.FortuneCount : 0;
if (!ChargeDailyFeature(rec, FortuneCost, rec.FortuneDate, count, out cost, out error))
return false;
rec.FortuneDate = today;
rec.FortuneCount = count + 1;
value = RandomNumberGenerator.GetInt32(0, 101);
record = rec;
SaveUser(rec);
return true;
}
/// <summary>二选一:服务端随机挑一个。当天第一次免费,之后每次 0.5。</summary>
public bool PickOne(string username, string optionA, string optionB, out string error,
out string choice, out decimal cost, out UserRecord? record)
{
error = "";
choice = "";
cost = 0;
record = null;
if (string.IsNullOrWhiteSpace(optionA) || string.IsNullOrWhiteSpace(optionB))
{
error = "两个选项都不能为空";
return false;
}
if (!_users.TryGetValue(username.Trim().ToLowerInvariant(), out var rec))
{
error = "用户不存在";
return false;
}
// 本地日历日:签到按用户机器上的「今天」算(0 点翻篇),不能用 UTC——
// 否则东八区用户要到早上 8 点才算新的一天,会出现同一天签到两次。
var today = DateTime.Today;
var count = rec.PickDate.HasValue && rec.PickDate.Value.Date == today
? rec.PickCount : 0;
if (!ChargeDailyFeature(rec, PickCost, rec.PickDate, count, out cost, out error))
return false;
rec.PickDate = today;
rec.PickCount = count + 1;
choice = RandomNumberGenerator.GetInt32(0, 2) == 0 ? optionA : optionB;
record = rec;
SaveUser(rec);
return true;
}
// ---------------------------------------------------------------- 散列
private static string GenerateSalt()
{
var bytes = new byte[16];
using var rng = RandomNumberGenerator.Create();
rng.GetBytes(bytes);
return Convert.ToBase64String(bytes);
}
private static string HashPassword(string password, string salt)
{
using var sha512 = SHA512.Create();
var hash = sha512.ComputeHash(Encoding.UTF8.GetBytes(password + ":" + salt));
return Convert.ToBase64String(hash);
}
}
public class UserRecord
{
public string Username { get; init; } = "";
public string PwHash { get; init; } = "";
public string PwSalt { get; init; } = "";
/// <summary>积分,精确到 0.01。</summary>
public decimal Points { get; set; }
public DateTime? LastSignIn { get; set; }
public int ConsecutiveDays { get; set; }
public string? ThemeColor { get; set; }
/// <summary>当前这个颜色实际花了多少分(用于 1 小时内退款)。</summary>
public decimal ThemePaid { get; set; }
/// <summary>购买该颜色的时间(UTC)。</summary>
public DateTime? ThemePaidAt { get; set; }
/// <summary>人品值当日最后计算日期(UTC),跨天计数清零。</summary>
public DateTime? FortuneDate { get; set; }
/// <summary>人品值当日已计算次数(含免费的那次)。</summary>
public int FortuneCount { get; set; }
/// <summary>二选一当日最后使用日期(UTC)。</summary>
public DateTime? PickDate { get; set; }
/// <summary>二选一当日已使用次数(含免费的那次)。</summary>
public int PickCount { get; set; }
public UserRecord(string username, string pwHash, string pwSalt, decimal points,
DateTime? lastSignIn, int consecutiveDays, string? themeColor = null,
decimal themePaid = 0, DateTime? themePaidAt = null)
{
Username = username;
PwHash = pwHash;
PwSalt = pwSalt;
Points = points;
LastSignIn = lastSignIn;
ConsecutiveDays = consecutiveDays;
ThemeColor = themeColor;
ThemePaid = themePaid;
ThemePaidAt = themePaidAt;
}
}
+3
View File
@@ -15,6 +15,9 @@ migration:
- platform: root - platform: root
create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
- platform: linux
create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
- platform: macos - platform: macos
create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
+663
View File
@@ -0,0 +1,663 @@
(function () {
"use strict";
const STEP_COPY = [
{ title: "等高切割", description: "观察水平面与山体在同一海拔相交,形成连续闭合线。" },
{ title: "形成交线", description: "每个水平切面都会留下同高交线,多层交线共同描述山体起伏。" },
{ title: "投影成图", description: "把各高度交线垂直投影到同一平面,得到完整等高线地形图。" },
{ title: "疏密判坡", description: "等高线越密,坡度越陡;等高线越疏,坡度越缓。" }
];
const DEFAULT_VIEW = {
title: "实验流程",
summary: "点击开始实验,在当前背景中观察等高切割与交线形成,再通过右侧图解理解垂直投影和疏密判坡。",
features: ["同一条等高线上海拔相等", "相邻等高线高差保持一致"],
hint: "点击“开始实验”,直接在当前画面播放形成交线视频"
};
const LANDFORMS = {
peak: {
name: "山峰",
subtitle: "闭合等高线",
image: "assets/peak-3d.jpg",
topImage: "assets/peak-top.jpg",
alt: "山峰立体示意图,蓝色等高线围绕山体逐级闭合",
topAlt: "山峰真实俯视图,多层近同心闭合等高线向中心收缩",
summary: "山峰四周较低、中心突起;等高线闭合成环,海拔数值由外向内逐渐升高。",
features: ["中心海拔高、四周海拔低", "闭合线越向内,数值越大", "若数值向内降低,则应判为洼地"],
hint: "山峰:闭合曲线,数值向中心升高"
},
ridge: {
name: "山脊",
subtitle: "凸低为脊",
image: "assets/ridge-3d.jpg",
topImage: "assets/ridge-top.jpg",
alt: "山脊立体示意图,蓝色等高线沿凸出的脊线向低处弯曲",
topAlt: "山脊真实俯视图,等高线沿狭长高地呈舌状延伸",
summary: "等高线弯曲部分向海拔低处凸出,脊线常成为两侧水系的分水岭。",
features: ["等高线凸向低值方向", "脊线由高处向低处延伸", "雨水沿脊线两侧分流"],
hint: "山脊:等高线向低处凸出,凸低为脊"
},
valley: {
name: "山谷",
subtitle: "凸高为谷",
image: "assets/valley-3d.jpg",
topImage: "assets/valley-top.jpg",
alt: "山谷立体示意图,两座山体之间的谷地有河流穿过",
topAlt: "山谷真实俯视图,两侧坡面夹持低槽,等高线形成 V 形凹入",
summary: "等高线弯曲部分向海拔高处凸出,谷底低洼并容易汇水形成河流。",
features: ["等高线凸向高值方向", "V 形尖端指向上游高处", "谷底常发育河流"],
hint: "山谷:等高线向高处凸出,凸高为谷"
},
saddle: {
name: "鞍部",
subtitle: "两峰之间",
image: "assets/saddle-3d.jpg",
topImage: "assets/saddle-top.jpg",
alt: "鞍部立体示意图,两座山峰之间形成马鞍状低地",
topAlt: "鞍部真实俯视图,两组峰顶闭合圈之间的等高线明显收腰",
summary: "鞍部位于相邻两座山峰之间,是沿山脊方向相对低洼的过渡地带。",
features: ["两组闭合等高线相邻", "中部线条收窄,形似马鞍", "常是翻越山岭的低垭口"],
hint: "鞍部:两峰之间相对低洼,俯视轮廓呈收腰形"
},
cliff: {
name: "陡崖",
subtitle: "密集或重合",
image: "assets/cliff-3d.jpg",
topImage: "assets/cliff-top.jpg",
alt: "陡崖立体示意图,崖壁处蓝色等高线高度密集",
topAlt: "陡崖真实俯视图,崖壁处大量等高线极密集并近似重合",
summary: "陡崖坡面近直立,不同高程的等高线会高度密集,局部可投影到同一位置而重合。",
features: ["密集表示陡坡,重合才是陡崖特征", "单位水平距离内高差很大", "n 条线重合时:(n−1)d ≤ ΔH < (n+1)d"],
hint: "陡崖:等高线密集或重合,坡度极陡"
}
};
const dom = {
app: document.getElementById("app-shell"),
experimentVideo: document.getElementById("experiment-video"),
densityBackground: document.getElementById("density-background"),
landformImage: document.getElementById("landform-image"),
landformTopImage: document.getElementById("landform-top-image"),
projectionDiagram: document.getElementById("projection-diagram"),
densityDiagram: document.getElementById("density-diagram"),
mediaLoading: document.getElementById("media-loading"),
mediaLabelKicker: document.getElementById("media-label-kicker"),
mediaLabelTitle: document.getElementById("media-label-title"),
mediaLabelCopy: document.getElementById("media-label-copy"),
progress: document.getElementById("video-progress-fill"),
playButton: document.getElementById("play-button"),
playIcon: document.getElementById("play-icon"),
playLabel: document.getElementById("play-label"),
resetButton: document.getElementById("reset-button"),
fullscreenButton: document.getElementById("fullscreen-button"),
fullscreenLabel: document.getElementById("fullscreen-label"),
workflowOpen: document.getElementById("workflow-open"),
flowSteps: Array.from(document.querySelectorAll(".flow-step[data-step]")),
flowCount: document.getElementById("flow-count"),
flowLineFill: document.getElementById("flow-line-fill"),
taskTitle: document.getElementById("task-title"),
taskDescription: document.getElementById("task-description"),
terrainTabs: Array.from(document.querySelectorAll(".terrain-tab[data-landform]")),
returnExperiment: document.getElementById("return-experiment"),
observationHeading: document.getElementById("observation-heading"),
observationSummary: document.getElementById("observation-summary"),
featureList: document.getElementById("feature-list"),
topViewToggle: document.getElementById("top-view-toggle"),
topViewToggleLabel: document.getElementById("top-view-toggle-label"),
topViewToggleHint: document.getElementById("top-view-toggle-hint"),
topViewThumbnail: document.getElementById("top-view-thumbnail"),
hintText: document.getElementById("hint-text"),
controlPanel: document.querySelector(".control-panel"),
panelClose: document.getElementById("panel-close"),
panelOpen: document.getElementById("panel-open"),
toast: document.getElementById("toast")
};
const state = {
selectedLandform: null,
pendingLandform: null,
viewMode: "perspective",
step: 0,
imageToken: 0,
scanTimer: 0,
annotationTimer: 0,
toastTimer: 0,
pendingStep: null,
workflowTimer: 0,
workflowRunToken: 0,
workflowAutoPlaying: false
};
const ICONS = {
play: '<svg viewBox="0 0 24 24"><path d="m9 6 9 6-9 6V6Z"/></svg>',
pause: '<svg viewBox="0 0 24 24"><path d="M7 6h4v12H7V6Zm6 0h4v12h-4V6Z"/></svg>'
};
function showToast(message) {
window.clearTimeout(state.toastTimer);
dom.toast.textContent = message;
dom.toast.classList.add("is-visible");
state.toastTimer = window.setTimeout(function () {
dom.toast.classList.remove("is-visible");
}, 2600);
}
function hideLoading() {
dom.mediaLoading.classList.add("is-hidden");
}
function cancelWorkflowSequence() {
window.clearTimeout(state.workflowTimer);
state.workflowTimer = 0;
state.workflowRunToken += 1;
state.workflowAutoPlaying = false;
}
function setWorkflowDiagram(element, active) {
element.toggleAttribute("hidden", !active);
element.classList.toggle("is-active", active);
}
function hideWorkflowVisuals() {
setWorkflowDiagram(dom.projectionDiagram, false);
setWorkflowDiagram(dom.densityDiagram, false);
dom.densityBackground.classList.remove("is-visible");
dom.app.classList.remove("has-workflow-visual");
}
function syncWorkflowPresentation(index) {
const safeIndex = Math.max(0, Math.min(3, Number(index) || 0));
const isExperiment = !state.selectedLandform;
const showProjection = isExperiment && safeIndex === 2;
const showDensity = isExperiment && safeIndex === 3;
const densityWasVisible = dom.densityBackground.classList.contains("is-visible");
setWorkflowDiagram(dom.projectionDiagram, showProjection);
setWorkflowDiagram(dom.densityDiagram, showDensity);
dom.densityBackground.classList.toggle("is-visible", showDensity);
dom.app.classList.toggle("has-workflow-visual", showProjection || showDensity);
if (isExperiment) dom.experimentVideo.classList.toggle("is-visible", !showDensity);
if (showDensity && !densityWasVisible) triggerScan(dom.densityBackground);
}
function beginStaticWorkflowSequence() {
cancelWorkflowSequence();
const token = state.workflowRunToken;
state.workflowAutoPlaying = true;
renderStep(2);
setPlayButton();
dom.hintText.textContent = "自动演示:" + STEP_COPY[2].description;
state.workflowTimer = window.setTimeout(function () {
if (token !== state.workflowRunToken) return;
renderStep(3);
dom.hintText.textContent = "自动演示:" + STEP_COPY[3].description;
state.workflowTimer = window.setTimeout(function () {
if (token !== state.workflowRunToken) return;
state.workflowTimer = 0;
state.workflowAutoPlaying = false;
setPlayButton();
dom.hintText.textContent = "实验流程播放完成 · 可重新实验或选择典型地貌观察";
}, 3600);
}, 3200);
}
function renderStep(index) {
const safeIndex = Math.max(0, Math.min(3, Number(index) || 0));
state.step = safeIndex;
const copy = STEP_COPY[safeIndex];
dom.flowCount.textContent = (safeIndex + 1) + "/4";
dom.flowLineFill.style.width = (safeIndex / 3) * 100 + "%";
dom.taskTitle.textContent = copy.title;
dom.taskDescription.textContent = copy.description;
dom.flowSteps.forEach(function (button, buttonIndex) {
button.classList.toggle("is-active", buttonIndex === safeIndex);
button.classList.toggle("is-complete", buttonIndex < safeIndex);
button.setAttribute("aria-current", buttonIndex === safeIndex ? "step" : "false");
});
syncWorkflowPresentation(safeIndex);
}
function renderObservation(view) {
dom.observationHeading.textContent = view.name || view.title;
dom.observationSummary.textContent = view.summary;
dom.featureList.replaceChildren();
view.features.forEach(function (feature) {
const item = document.createElement("li");
item.textContent = feature;
dom.featureList.appendChild(item);
});
}
function setPlayButton() {
const duration = dom.experimentVideo.duration;
const finished = dom.experimentVideo.ended || (Number.isFinite(duration) && duration > 0 && dom.experimentVideo.currentTime >= duration - 0.08);
if (!dom.experimentVideo.paused) {
dom.playLabel.textContent = "暂停实验";
dom.playIcon.innerHTML = ICONS.pause;
return;
}
dom.playIcon.innerHTML = ICONS.play;
if (!state.selectedLandform && state.step >= 2) {
dom.playLabel.textContent = "重新实验";
return;
}
if (finished) dom.playLabel.textContent = "重新实验";
else if (dom.experimentVideo.currentTime > 0.12) dom.playLabel.textContent = "继续实验";
else dom.playLabel.textContent = "开始实验";
}
function updateMediaLabel(view) {
if (view) {
dom.mediaLabelKicker.textContent = state.viewMode === "top" ? "典型地貌 · 真实俯视图" : "典型地貌 · 立体示意";
dom.mediaLabelTitle.textContent = view.name;
dom.mediaLabelCopy.textContent = state.viewMode === "top" ? view.subtitle + "|" + view.summary : view.summary;
return;
}
dom.mediaLabelKicker.textContent = "实验流程";
dom.mediaLabelTitle.textContent = "形成交线与垂直投影";
dom.mediaLabelCopy.textContent = dom.experimentVideo.paused
? "点击“开始实验”,直接在当前画面播放形成交线视频"
: STEP_COPY[state.step].description;
}
function updateViewToggle() {
const view = LANDFORMS[state.selectedLandform];
const hasLandform = Boolean(view);
const isTopView = hasLandform && state.viewMode === "top";
dom.topViewToggle.disabled = !hasLandform;
dom.topViewToggle.classList.toggle("is-active", isTopView);
dom.topViewToggle.setAttribute("aria-pressed", String(isTopView));
dom.topViewToggleLabel.textContent = isTopView ? "立体图" : "俯视图";
dom.topViewToggleHint.textContent = hasLandform ? "点击切换" : "选择地貌后切换";
dom.topViewToggle.setAttribute(
"aria-label",
hasLandform ? "切换为" + (isTopView ? "立体图" : "俯视图") : "请先选择一种典型地貌"
);
if (!view) {
dom.topViewThumbnail.hidden = true;
dom.topViewThumbnail.removeAttribute("src");
dom.topViewThumbnail.alt = "";
return;
}
dom.topViewThumbnail.src = isTopView ? view.image : view.topImage;
dom.topViewThumbnail.alt = isTopView ? view.name + "立体图预览" : view.name + "真实俯视图预览";
dom.topViewThumbnail.hidden = false;
}
function triggerScan(targetImage) {
window.clearTimeout(state.scanTimer);
dom.app.classList.remove("is-scanning");
dom.densityBackground.classList.remove("is-revealing");
dom.landformImage.classList.remove("is-revealing");
dom.landformTopImage.classList.remove("is-revealing");
void dom.app.offsetWidth;
dom.app.classList.add("is-scanning");
(targetImage || (state.viewMode === "top" ? dom.landformTopImage : dom.landformImage)).classList.add("is-revealing");
state.scanTimer = window.setTimeout(function () {
dom.app.classList.remove("is-scanning");
dom.densityBackground.classList.remove("is-revealing");
dom.landformImage.classList.remove("is-revealing");
dom.landformTopImage.classList.remove("is-revealing");
}, 1220);
}
async function decodeImage(image) {
if (typeof image.decode === "function") {
await image.decode();
return;
}
if (!image.complete) {
await new Promise(function (resolve, reject) {
image.addEventListener("load", resolve, { once: true });
image.addEventListener("error", reject, { once: true });
});
}
}
function hideTerrainAnnotation() {
window.clearTimeout(state.annotationTimer);
dom.app.classList.remove("is-landform");
if (window.TerrainAnnotation) window.TerrainAnnotation.hide();
}
function clearTerrainAnnotationNow() {
window.clearTimeout(state.annotationTimer);
state.annotationTimer = 0;
if (window.TerrainAnnotation) window.TerrainAnnotation.hide(true);
}
function scheduleTerrainAnnotation(withScan) {
window.clearTimeout(state.annotationTimer);
dom.app.classList.add("is-landform");
state.annotationTimer = window.setTimeout(function () {
if (!state.selectedLandform || !window.TerrainAnnotation) return;
window.TerrainAnnotation.show(state.selectedLandform, state.viewMode);
}, withScan ? 420 : 0);
}
function applyLandformView(view, withScan) {
const isTopView = state.viewMode === "top";
hideWorkflowVisuals();
dom.experimentVideo.classList.remove("is-visible");
dom.landformImage.classList.toggle("is-visible", !isTopView);
dom.landformTopImage.classList.toggle("is-visible", isTopView);
updateMediaLabel(view);
updateViewToggle();
dom.hintText.textContent = isTopView
? view.name + "俯视图:" + view.hint.replace(view.name + ":", "")
: view.hint;
if (withScan) triggerScan();
scheduleTerrainAnnotation(withScan);
}
function collapsePanelForCompactView() {
if (!window.matchMedia("(max-width: 680px)").matches) return;
dom.controlPanel.classList.add("is-collapsed");
dom.panelOpen.hidden = false;
}
async function selectLandform(key) {
const view = LANDFORMS[key];
if (!view) return;
const token = ++state.imageToken;
cancelWorkflowSequence();
state.pendingLandform = key;
clearTerrainAnnotationNow();
hideWorkflowVisuals();
const nextMode = state.selectedLandform ? state.viewMode : "perspective";
dom.experimentVideo.pause();
const perspectiveProbe = new Image();
const topProbe = new Image();
perspectiveProbe.src = view.image;
topProbe.src = view.topImage;
try {
await Promise.all([decodeImage(perspectiveProbe), decodeImage(topProbe)]);
} catch (error) {
if (token === state.imageToken) {
state.pendingLandform = null;
syncWorkflowPresentation(state.step);
showToast("地貌图片加载失败,请检查对应资源文件");
}
return;
}
if (token !== state.imageToken) return;
state.pendingLandform = null;
state.selectedLandform = key;
state.viewMode = nextMode;
dom.landformImage.src = view.image;
dom.landformImage.alt = view.alt;
dom.landformTopImage.src = view.topImage;
dom.landformTopImage.alt = view.topAlt;
dom.terrainTabs.forEach(function (button) {
const active = button.dataset.landform === key;
button.classList.toggle("is-active", active);
button.setAttribute("aria-pressed", String(active));
});
dom.returnExperiment.hidden = false;
renderObservation(view);
applyLandformView(view, true);
collapsePanelForCompactView();
setPlayButton();
}
async function toggleTopView() {
const view = LANDFORMS[state.selectedLandform];
if (!view) return;
const previousMode = state.viewMode;
const token = ++state.imageToken;
state.pendingLandform = null;
clearTerrainAnnotationNow();
state.viewMode = previousMode === "top" ? "perspective" : "top";
try {
await decodeImage(state.viewMode === "top" ? dom.landformTopImage : dom.landformImage);
} catch (error) {
state.viewMode = previousMode;
showToast("对应视图加载失败,请检查图片资源");
return;
}
if (token !== state.imageToken) return;
applyLandformView(view, true);
collapsePanelForCompactView();
}
function showExperiment() {
cancelWorkflowSequence();
state.imageToken += 1;
state.pendingLandform = null;
state.selectedLandform = null;
state.viewMode = "perspective";
dom.app.classList.remove("is-scanning");
hideWorkflowVisuals();
hideTerrainAnnotation();
dom.landformImage.classList.remove("is-visible", "is-revealing");
dom.landformTopImage.classList.remove("is-visible", "is-revealing");
dom.experimentVideo.classList.add("is-visible");
dom.terrainTabs.forEach(function (button) {
button.classList.remove("is-active");
button.setAttribute("aria-pressed", "false");
});
dom.returnExperiment.hidden = true;
renderObservation(DEFAULT_VIEW);
updateViewToggle();
updateMediaLabel(null);
}
function playVideo() {
dom.experimentVideo.play().then(function () {
setPlayButton();
updateMediaLabel(null);
dom.hintText.textContent = "实验播放中:" + STEP_COPY[state.step].description;
}).catch(function (error) {
if (error && error.name === "AbortError") return;
showToast("视频暂时无法播放,请检查浏览器媒体权限");
});
}
function toggleExperimentPlayback() {
if (state.selectedLandform || state.pendingLandform || state.step >= 2) {
showExperiment();
if (Number.isFinite(dom.experimentVideo.duration) && dom.experimentVideo.duration > 0) {
dom.experimentVideo.currentTime = 0;
} else {
state.pendingStep = 0;
}
renderStep(0);
playVideo();
return;
}
if (!dom.experimentVideo.paused) {
dom.experimentVideo.pause();
return;
}
const duration = dom.experimentVideo.duration;
if (dom.experimentVideo.ended || (Number.isFinite(duration) && dom.experimentVideo.currentTime >= duration - 0.08)) {
dom.experimentVideo.currentTime = 0;
renderStep(0);
}
playVideo();
}
function playFromBeginning() {
showExperiment();
renderStep(0);
if (Number.isFinite(dom.experimentVideo.duration) && dom.experimentVideo.duration > 0) {
dom.experimentVideo.currentTime = 0;
} else {
state.pendingStep = 0;
}
playVideo();
}
function playStep(index) {
const safeIndex = Math.max(0, Math.min(3, Number(index) || 0));
showExperiment();
renderStep(safeIndex);
if (safeIndex <= 1) {
if (Number.isFinite(dom.experimentVideo.duration) && dom.experimentVideo.duration > 0) {
dom.experimentVideo.currentTime = safeIndex === 0 ? 0 : dom.experimentVideo.duration / 2;
} else {
state.pendingStep = safeIndex;
}
playVideo();
return;
}
state.pendingStep = null;
dom.experimentVideo.pause();
setPlayButton();
updateMediaLabel(null);
dom.hintText.textContent = STEP_COPY[safeIndex].title + ":" + STEP_COPY[safeIndex].description;
}
function resetExperience() {
state.pendingStep = null;
dom.experimentVideo.pause();
showExperiment();
renderStep(0);
if (Number.isFinite(dom.experimentVideo.duration) && dom.experimentVideo.duration > 0) {
dom.experimentVideo.currentTime = 0;
} else {
state.pendingStep = 0;
}
dom.progress.style.width = "0%";
dom.hintText.textContent = DEFAULT_VIEW.hint;
setPlayButton();
showToast("已重置到视频首帧");
}
function toggleFullscreen() {
if (!document.fullscreenElement) {
if (!dom.app.requestFullscreen) {
showToast("当前浏览器不支持全屏");
return;
}
dom.app.requestFullscreen().catch(function () { showToast("当前浏览器未允许进入全屏"); });
return;
}
if (document.exitFullscreen) document.exitFullscreen().catch(function () {});
}
dom.experimentVideo.addEventListener("loadeddata", hideLoading, { once: true });
dom.experimentVideo.addEventListener("canplay", hideLoading, { once: true });
dom.experimentVideo.addEventListener("loadedmetadata", function () {
if (state.pendingStep === null) return;
const pending = state.pendingStep;
state.pendingStep = null;
const duration = dom.experimentVideo.duration;
if (Number.isFinite(duration) && duration > 0) {
dom.experimentVideo.currentTime = pending === 0 ? 0 : duration / 2;
renderStep(pending);
}
});
dom.experimentVideo.addEventListener("error", function () {
hideLoading();
showToast("形成交线视频加载失败,请确认“contour-formation.mp4”在当前目录");
});
dom.experimentVideo.addEventListener("play", function () {
setPlayButton();
updateMediaLabel(null);
dom.hintText.textContent = "实验播放中:" + STEP_COPY[state.step].description;
});
dom.experimentVideo.addEventListener("pause", function () {
setPlayButton();
updateMediaLabel(null);
if (!state.selectedLandform && state.step >= 2) {
dom.hintText.textContent = STEP_COPY[state.step].title + ":" + STEP_COPY[state.step].description;
return;
}
if (!dom.experimentVideo.ended && dom.experimentVideo.currentTime > 0.12 && !state.selectedLandform) {
dom.hintText.textContent = "实验已暂停 · 点击“继续实验”恢复播放";
}
});
dom.experimentVideo.addEventListener("ended", function () {
if (
state.selectedLandform ||
state.pendingLandform ||
state.step > 1 ||
!dom.experimentVideo.ended
) return;
dom.progress.style.width = "100%";
beginStaticWorkflowSequence();
});
dom.experimentVideo.addEventListener("timeupdate", function () {
const duration = dom.experimentVideo.duration;
const ratio = Number.isFinite(duration) && duration > 0 ? dom.experimentVideo.currentTime / duration : 0;
dom.progress.style.width = Math.max(0, Math.min(100, ratio * 100)) + "%";
if (!state.selectedLandform && state.step === 0 && ratio >= 0.5) {
renderStep(1);
dom.hintText.textContent = "实验播放中:" + STEP_COPY[1].description;
}
if (!dom.experimentVideo.paused) updateMediaLabel(null);
});
dom.playButton.addEventListener("click", toggleExperimentPlayback);
dom.workflowOpen.addEventListener("click", playFromBeginning);
dom.resetButton.addEventListener("click", resetExperience);
dom.returnExperiment.addEventListener("click", resetExperience);
dom.topViewToggle.addEventListener("click", toggleTopView);
dom.terrainTabs.forEach(function (button) {
button.addEventListener("click", function () { selectLandform(button.dataset.landform); });
});
dom.flowSteps.forEach(function (button) {
button.addEventListener("click", function () { playStep(Number(button.dataset.step)); });
});
dom.fullscreenButton.addEventListener("click", toggleFullscreen);
document.addEventListener("fullscreenchange", function () {
dom.fullscreenLabel.textContent = document.fullscreenElement ? "退出全屏" : "全屏";
});
dom.panelClose.addEventListener("click", function () {
dom.controlPanel.classList.add("is-collapsed");
dom.panelOpen.hidden = false;
});
dom.panelOpen.addEventListener("click", function () {
dom.controlPanel.classList.remove("is-collapsed");
dom.panelOpen.hidden = true;
});
document.addEventListener("keydown", function (event) {
if (event.code === "Space" && !/BUTTON|INPUT|VIDEO/.test(document.activeElement.tagName)) {
event.preventDefault();
toggleExperimentPlayback();
}
if (/^[1-5]$/.test(event.key) && !event.metaKey && !event.ctrlKey && !event.altKey) {
const keys = ["peak", "ridge", "valley", "saddle", "cliff"];
selectLandform(keys[Number(event.key) - 1]);
}
});
window.setTimeout(hideLoading, 7000);
renderStep(0);
renderObservation(DEFAULT_VIEW);
updateViewToggle();
updateMediaLabel(null);
setPlayButton();
window.__GEO_LAB_TEST__ = {
getState: function () {
return {
selectedLandform: state.selectedLandform,
pendingLandform: state.pendingLandform,
viewMode: state.viewMode,
step: state.step,
videoPlaying: !dom.experimentVideo.paused,
videoTime: dom.experimentVideo.currentTime,
videoSource: dom.experimentVideo.currentSrc || dom.experimentVideo.src,
workflowDiagram: !dom.projectionDiagram.hasAttribute("hidden") ? "projection" : !dom.densityDiagram.hasAttribute("hidden") ? "density" : null,
workflowAutoPlaying: state.workflowAutoPlaying,
densityBackground: dom.densityBackground.classList.contains("is-visible"),
scanning: dom.app.classList.contains("is-scanning"),
terrainAnnotation: window.TerrainAnnotation ? window.TerrainAnnotation.getState() : null,
fullscreen: Boolean(document.fullscreenElement)
};
},
selectLandform: selectLandform,
toggleTopView: toggleTopView,
showExperiment: showExperiment,
playStep: playStep,
reset: resetExperience
};
})();
Binary file not shown.

After

Width:  |  Height:  |  Size: 698 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 961 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 593 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 621 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 947 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 675 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 945 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 622 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 963 KiB

File diff suppressed because it is too large. Load diff
@@ -0,0 +1,671 @@
(function () {
"use strict";
const THREE = window.THREE;
const root = document.getElementById("terrain-annotation");
const canvas = document.getElementById("terrain-annotation-canvas");
const callout = document.getElementById("terrain-callout");
const calloutTitle = document.getElementById("terrain-callout-title");
const calloutCopy = document.getElementById("terrain-callout-copy");
const calloutConnector = document.getElementById("terrain-callout-connector");
const calloutConnectorShape = document.getElementById("terrain-callout-connector-shape");
const stage = document.querySelector(".media-stage");
if (!THREE || !root || !canvas || !callout || !calloutTitle || !calloutCopy || !calloutConnector || !calloutConnectorShape || !stage) return;
const reducedMotion = window.matchMedia("(prefers-reduced-motion: reduce)");
const compactLayout = window.matchMedia("(max-width: 680px)");
const SOURCE_ASPECT = 1586 / 992;
const GUIDE_COLOR = "#f6b21a";
const OUTLINE_COLOR = 0x082742;
const TARGET_OUTER_RADIUS = 20;
const ROLE_STYLES = {
main: { width: 8, outline: 14, opacity: 1, dashed: 0, dashCount: 1, dashRatio: 1, dashSpeed: 0 },
branch: { width: 6.5, outline: 11.5, opacity: 1, dashed: 1, dashCount: 4, dashRatio: 0.62, dashSpeed: 0 },
ring: { width: 6, outline: 10.5, opacity: 1, dashed: 0, dashCount: 1, dashRatio: 1, dashSpeed: 0 },
contour: { width: 4.5, outline: 8.5, opacity: 1, dashed: 0, dashCount: 1, dashRatio: 1, dashSpeed: 0 },
bracket: { width: 5.5, outline: 10, opacity: 1, dashed: 1, dashCount: 4, dashRatio: 0.62, dashSpeed: 0 }
};
const ANNOTATIONS = {
peak: {
title: "山峰 · 最高中心",
copy: "闭合等高线由外向内数值升高,中心位置为山峰。",
color: GUIDE_COLOR,
perspective: {
traces: [
{ role: "main", arrow: true, points: [[0.628, 0.575], [0.650, 0.455], [0.670, 0.280], [0.709, 0.143]] }
],
target: [0.709, 0.143],
placement: { side: "right", dx: 34, dy: 24 }
},
top: {
traces: [
{ role: "main", arrow: true, points: [[0.575, 0.645], [0.610, 0.555], [0.645, 0.485], [0.668, 0.449]] }
],
target: [0.668, 0.449],
placement: { side: "right", dx: 34, dy: -10 }
}
},
ridge: {
title: "山脊 · 分水脊线",
copy: "等高线向低处凸出,脊线两侧水流向外分开。",
color: GUIDE_COLOR,
perspective: {
traces: [
{ role: "main", arrow: true, points: [[0.765, 0.245], [0.720, 0.365], [0.675, 0.500], [0.625, 0.645]] },
{ role: "branch", arrow: true, points: [[0.675, 0.500], [0.635, 0.535], [0.595, 0.565]] },
{ role: "branch", arrow: true, points: [[0.675, 0.500], [0.715, 0.535], [0.755, 0.570]] }
],
target: [0.675, 0.500],
placement: { side: "left", dx: -34, dy: -85 }
},
top: {
traces: [
{ role: "main", arrow: true, points: [[0.690, 0.270], [0.655, 0.395], [0.620, 0.520], [0.590, 0.650]] },
{ role: "branch", arrow: true, points: [[0.620, 0.520], [0.582, 0.545], [0.548, 0.575]] },
{ role: "branch", arrow: true, points: [[0.620, 0.520], [0.658, 0.548], [0.695, 0.580]] }
],
target: [0.620, 0.520],
placement: { side: "left", dx: -34, dy: -85 }
}
},
valley: {
title: "山谷 · 汇水谷线",
copy: "V形尖端指向上游,水流沿谷底向下游汇集。",
color: GUIDE_COLOR,
perspective: {
traces: [
{ role: "main", arrow: true, points: [[0.690, 0.410], [0.678, 0.520], [0.676, 0.550], [0.660, 0.650], [0.640, 0.790]] },
{ role: "branch", arrow: true, points: [[0.590, 0.560], [0.630, 0.560], [0.676, 0.550]] },
{ role: "branch", arrow: true, points: [[0.750, 0.560], [0.710, 0.560], [0.676, 0.550]] }
],
target: [0.676, 0.550],
placement: { side: "right", dx: 34, dy: -80 }
},
top: {
traces: [
{ role: "main", arrow: true, points: [[0.600, 0.355], [0.565, 0.470], [0.525, 0.585], [0.470, 0.690]] },
{ role: "branch", arrow: true, points: [[0.455, 0.520], [0.490, 0.555], [0.525, 0.585]] },
{ role: "branch", arrow: true, points: [[0.600, 0.510], [0.565, 0.550], [0.525, 0.585]] }
],
target: [0.525, 0.585],
placement: { side: "right", dx: 34, dy: 70 }
}
},
saddle: {
title: "鞍部 · 两峰低口",
copy: "两组闭合等高线之间的低口,就是鞍部。",
color: GUIDE_COLOR,
perspective: {
traces: [
{ role: "main", points: [[0.625, 0.425], [0.675, 0.465], [0.725, 0.420]] }
],
target: [0.675, 0.465],
placement: { side: "below", dx: 0, dy: 38 }
},
top: {
traces: [
{ role: "main", points: [[0.515, 0.475], [0.560, 0.505], [0.610, 0.475]] }
],
target: [0.560, 0.505],
placement: { side: "below", dx: 0, dy: 38 }
}
},
cliff: {
title: "陡崖 · 密集重合带",
copy: "等高线极密集或重合,表示此处坡度陡峭。",
color: GUIDE_COLOR,
perspective: {
traces: [
{ role: "contour", points: [[0.535, 0.345], [0.565, 0.352], [0.590, 0.360]] },
{ role: "contour", points: [[0.532, 0.390], [0.562, 0.398], [0.590, 0.405]] },
{ role: "contour", points: [[0.530, 0.435], [0.560, 0.443], [0.590, 0.452]] },
{ role: "main", arrow: true, points: [[0.595, 0.305], [0.590, 0.405], [0.598, 0.510]] }
],
target: [0.590, 0.405],
placement: { side: "right", dx: 34, dy: 0 }
},
top: {
traces: [
{ role: "main", arrow: true, points: [[0.535, 0.560], [0.585, 0.520], [0.635, 0.480]] },
{ role: "contour", points: [[0.555, 0.455], [0.575, 0.515], [0.595, 0.575]] },
{ role: "contour", points: [[0.590, 0.435], [0.610, 0.495], [0.630, 0.555]] }
],
target: [0.585, 0.520],
placement: { side: "below", dx: 0, dy: 70 }
}
}
};
let renderer;
let scene;
let camera;
let annotationGroup;
let aspect = 1;
let stageHeight = 1;
let animationFrame = 0;
let revealStart = 0;
let calloutTimer = 0;
let hideTimer = 0;
let currentKey = null;
let currentMode = "perspective";
let buildToken = 0;
let animatedMaterials = [];
let revealGeometries = [];
let pulseMeshes = [];
let delayedMarkers = [];
let runnerDots = [];
try {
renderer = new THREE.WebGLRenderer({ canvas: canvas, alpha: true, antialias: true, powerPreference: "high-performance" });
renderer.setClearColor(0x000000, 0);
renderer.setPixelRatio(Math.min(window.devicePixelRatio || 1, 1.75));
scene = new THREE.Scene();
camera = new THREE.OrthographicCamera(-1, 1, 1, -1, 0.1, 10);
camera.position.z = 4;
} catch (error) {
root.dataset.renderer = "unavailable";
return;
}
function sourceToScreen(point) {
let renderedWidth = 1;
let renderedHeight = 1;
let offsetX = 0;
let offsetY = 0;
if (compactLayout.matches) {
if (aspect >= SOURCE_ASPECT) {
renderedWidth = SOURCE_ASPECT / aspect;
offsetX = (1 - renderedWidth) / 2;
} else {
renderedHeight = aspect / SOURCE_ASPECT;
offsetY = (1 - renderedHeight) / 2;
}
} else {
if (aspect >= SOURCE_ASPECT) {
renderedHeight = aspect / SOURCE_ASPECT;
offsetY = (1 - renderedHeight) / 2;
} else {
renderedWidth = SOURCE_ASPECT / aspect;
offsetX = (1 - renderedWidth) / 2;
}
}
return [offsetX + point[0] * renderedWidth, offsetY + point[1] * renderedHeight];
}
function toWorld(point) {
const screenPoint = sourceToScreen(point);
return new THREE.Vector3((screenPoint[0] - 0.5) * 2 * aspect, (0.5 - screenPoint[1]) * 2, 0);
}
function getVisualScale() {
return Math.max(0.72, Math.min(1, stage.clientWidth / 1200));
}
function disposeMaterial(material) {
if (Array.isArray(material)) material.forEach(disposeMaterial);
else if (material && typeof material.dispose === "function") material.dispose();
}
function clearAnnotation() {
if (!annotationGroup) return;
annotationGroup.traverse(function (object) {
if (object.geometry) object.geometry.dispose();
if (object.material) disposeMaterial(object.material);
});
scene.remove(annotationGroup);
annotationGroup = null;
animatedMaterials = [];
revealGeometries = [];
pulseMeshes = [];
delayedMarkers = [];
runnerDots = [];
}
function createRibbonGeometry(samples, widthInPixels) {
const positions = [];
const uvs = [];
const indices = [];
const halfWidth = widthInPixels / Math.max(1, stageHeight);
samples.forEach(function (point, index) {
const previous = samples[Math.max(0, index - 1)];
const next = samples[Math.min(samples.length - 1, index + 1)];
const tangentX = next.x - previous.x;
const tangentY = next.y - previous.y;
const length = Math.hypot(tangentX, tangentY) || 1;
const normalX = -tangentY / length;
const normalY = tangentX / length;
const progress = index / Math.max(1, samples.length - 1);
positions.push(point.x + normalX * halfWidth, point.y + normalY * halfWidth, point.z);
positions.push(point.x - normalX * halfWidth, point.y - normalY * halfWidth, point.z);
uvs.push(progress, 0, progress, 1);
if (index < samples.length - 1) {
const base = index * 2;
indices.push(base, base + 1, base + 2, base + 1, base + 3, base + 2);
}
});
const geometry = new THREE.BufferGeometry();
geometry.setAttribute("position", new THREE.Float32BufferAttribute(positions, 3));
geometry.setAttribute("uv", new THREE.Float32BufferAttribute(uvs, 2));
geometry.setIndex(indices);
geometry.computeBoundingSphere();
return geometry;
}
function makeLineMaterial(color, style) {
return new THREE.ShaderMaterial({
uniforms: {
uTime: { value: 0 },
uColor: { value: new THREE.Color(color) },
uOpacity: { value: style.opacity },
uMotion: { value: reducedMotion.matches ? 0 : 1 },
uDashed: { value: style.dashed },
uDashCount: { value: style.dashCount },
uDashRatio: { value: style.dashRatio },
uDashSpeed: { value: style.dashSpeed }
},
vertexShader: [
"varying vec2 vUv;",
"void main() {",
" vUv = uv;",
" gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);",
"}"
].join("\n"),
fragmentShader: [
"uniform float uTime;",
"uniform vec3 uColor;",
"uniform float uOpacity;",
"uniform float uMotion;",
"uniform float uDashed;",
"uniform float uDashCount;",
"uniform float uDashRatio;",
"uniform float uDashSpeed;",
"varying vec2 vUv;",
"void main() {",
" float edge = 1.0 - smoothstep(0.43, 0.50, abs(vUv.y - 0.5));",
" float dashPhase = fract(vUv.x * uDashCount - uTime * uDashSpeed * uMotion);",
" float dash = 1.0 - smoothstep(uDashRatio - 0.04, uDashRatio + 0.04, dashPhase);",
" float pattern = mix(1.0, dash, uDashed);",
" float alpha = uOpacity * edge * pattern;",
" gl_FragColor = vec4(uColor, alpha);",
"}"
].join("\n"),
transparent: true,
depthTest: false,
depthWrite: false,
blending: THREE.NormalBlending
});
}
function createArrow(points, color, sizeInPixels, delay, stopBeforePixels) {
const end = toWorld(points[points.length - 1]);
const before = toWorld(points[points.length - 2]);
const direction = end.clone().sub(before).normalize();
const angle = Math.atan2(direction.y, direction.x);
const unit = 2 / Math.max(1, stageHeight);
const visualScale = getVisualScale();
const scaledSize = sizeInPixels * visualScale;
const arrowPosition = end.clone().addScaledVector(direction, -(stopBeforePixels || 0) * visualScale * unit);
function createArrowGeometry(pixelSize) {
const size = pixelSize * unit;
const geometry = new THREE.BufferGeometry();
geometry.setAttribute("position", new THREE.Float32BufferAttribute([
0, 0, 0,
-size * 1.90, size * 0.88, 0,
-size * 1.90, -size * 0.88, 0
], 3));
return geometry;
}
const outlineMaterial = new THREE.MeshBasicMaterial({ color: OUTLINE_COLOR, transparent: true, opacity: 1, depthTest: false, depthWrite: false });
const material = new THREE.MeshBasicMaterial({ color: color, transparent: true, opacity: 1, depthTest: false, depthWrite: false });
const outline = new THREE.Mesh(createArrowGeometry(scaledSize + 2.5 * visualScale), outlineMaterial);
const arrow = new THREE.Mesh(createArrowGeometry(scaledSize), material);
outline.position.copy(arrowPosition).addScaledVector(direction, 1.25 * visualScale * unit);
arrow.position.copy(arrowPosition);
outline.rotation.z = angle;
arrow.rotation.z = angle;
outline.renderOrder = 40;
arrow.renderOrder = 41;
annotationGroup.add(outline, arrow);
delayedMarkers.push({ mesh: outline, delay: delay + 0.46 });
delayedMarkers.push({ mesh: arrow, delay: delay + 0.46 });
}
function createRunnerDots(curve, delay, count) {
const pixelUnit = 2 / Math.max(1, stageHeight);
const visualScale = getVisualScale();
const phases = count === 1 ? [0.18] : count === 2 ? [0.18, 0.70] : [0.12, 0.45, 0.78];
phases.forEach(function (phase, index) {
const glowMaterial = new THREE.MeshBasicMaterial({
color: 0xffffff,
transparent: true,
opacity: 0.28,
depthTest: false,
depthWrite: false,
blending: THREE.AdditiveBlending
});
const dotMaterial = new THREE.MeshBasicMaterial({ color: 0xffffff, transparent: true, opacity: 1, depthTest: false, depthWrite: false });
const glow = new THREE.Mesh(new THREE.CircleGeometry(11 * visualScale * pixelUnit, 40), glowMaterial);
const dot = new THREE.Mesh(new THREE.CircleGeometry(7.5 * visualScale * pixelUnit, 40), dotMaterial);
const position = curve.getPointAt(phase);
glow.position.copy(position);
dot.position.copy(position);
glow.renderOrder = 44;
dot.renderOrder = 45;
glow.visible = false;
dot.visible = false;
annotationGroup.add(glow, dot);
runnerDots.push({ glow: glow, dot: dot, curve: curve, phase: phase, delay: delay + 0.18, pulseOffset: index * 1.8 });
});
}
function createTrace(trace, color, index, target) {
const style = ROLE_STYLES[trace.role] || ROLE_STYLES.main;
const worldPoints = trace.points.map(toWorld);
const curve = new THREE.CatmullRomCurve3(worldPoints, Boolean(trace.closed), "centripetal", 0.5);
const pathLengthPixels = curve.getLength() * stageHeight / 2;
const samples = curve.getSpacedPoints(Math.max(36, trace.points.length * 12));
const visualScale = getVisualScale();
const outlineGeometry = createRibbonGeometry(samples, style.outline * visualScale);
const lineGeometry = createRibbonGeometry(samples, style.width * visualScale);
const outlineMaterial = makeLineMaterial(OUTLINE_COLOR, style);
const lineMaterial = makeLineMaterial(color, style);
const outline = new THREE.Mesh(outlineGeometry, outlineMaterial);
const line = new THREE.Mesh(lineGeometry, lineMaterial);
const isMain = trace.role === "main";
outline.renderOrder = isMain ? 30 : 20;
line.renderOrder = isMain ? 31 : 21;
annotationGroup.add(outline, line);
animatedMaterials.push(outlineMaterial, lineMaterial);
const delay = index * 0.075;
if (trace.role === "main") createRunnerDots(curve, delay, pathLengthPixels < 180 ? 1 : pathLengthPixels < 320 ? 2 : 3);
revealGeometries.push({ geometry: outlineGeometry, count: outlineGeometry.index.count, delay: delay });
revealGeometries.push({ geometry: lineGeometry, count: lineGeometry.index.count, delay: delay });
if (trace.arrow && !trace.closed) {
const endPoint = trace.points[trace.points.length - 1];
const endsAtTarget = target && Math.hypot(endPoint[0] - target[0], endPoint[1] - target[1]) < 0.002;
const arrowScale = Math.max(0.82, Math.min(1, pathLengthPixels / 240));
createArrow(trace.points, color, (trace.role === "branch" ? 14 : 15) * arrowScale, delay, endsAtTarget ? TARGET_OUTER_RADIUS + 4 : 0);
}
}
function createTarget(point, color) {
const position = toWorld(point);
const pixelUnit = 2 / Math.max(1, stageHeight);
const visualScale = getVisualScale();
const halo = new THREE.Mesh(
new THREE.CircleGeometry(25 * visualScale * pixelUnit, 64),
new THREE.MeshBasicMaterial({ color: color, transparent: true, opacity: 0.20, depthTest: false, depthWrite: false, blending: THREE.AdditiveBlending })
);
const outer = new THREE.Mesh(
new THREE.CircleGeometry(TARGET_OUTER_RADIUS * visualScale * pixelUnit, 64),
new THREE.MeshBasicMaterial({ color: OUTLINE_COLOR, transparent: true, opacity: 1, depthTest: false, depthWrite: false })
);
const gold = new THREE.Mesh(
new THREE.CircleGeometry(17.5 * visualScale * pixelUnit, 64),
new THREE.MeshBasicMaterial({ color: color, transparent: true, opacity: 1, depthTest: false, depthWrite: false })
);
const white = new THREE.Mesh(
new THREE.CircleGeometry(13.5 * visualScale * pixelUnit, 64),
new THREE.MeshBasicMaterial({ color: 0xffffff, transparent: true, opacity: 1, depthTest: false, depthWrite: false })
);
const inner = new THREE.Mesh(
new THREE.CircleGeometry(10 * visualScale * pixelUnit, 56),
new THREE.MeshBasicMaterial({ color: OUTLINE_COLOR, transparent: true, opacity: 1, depthTest: false, depthWrite: false })
);
const core = new THREE.Mesh(
new THREE.CircleGeometry(7.5 * visualScale * pixelUnit, 56),
new THREE.MeshBasicMaterial({ color: color, transparent: true, opacity: 1, depthTest: false, depthWrite: false })
);
[halo, outer, gold, white, inner, core].forEach(function (mesh, index) {
mesh.position.copy(position);
mesh.renderOrder = 49 + index;
annotationGroup.add(mesh);
});
pulseMeshes.push(halo);
}
function updateCallout(definition, view) {
const targetScreen = sourceToScreen(view.target);
const placement = view.placement;
calloutTitle.textContent = definition.title + (currentMode === "top" ? " · 俯视判读" : "");
calloutCopy.textContent = definition.copy;
const width = stage.clientWidth;
const height = stage.clientHeight;
const targetX = targetScreen[0] * width;
const targetY = targetScreen[1] * height;
const cardWidth = callout.offsetWidth || Math.min(width <= 680 ? 210 : width <= 920 ? 250 : 280, width - 28);
const cardHeight = callout.offsetHeight || 88;
let side = placement.side;
let x = targetX + placement.dx;
let y = targetY + placement.dy;
const targetGap = TARGET_OUTER_RADIUS * getVisualScale() + 18;
const horizontalGap = Math.max(Math.abs(placement.dx), targetGap);
const verticalGap = Math.max(Math.abs(placement.dy), targetGap);
if (side === "right") x = targetX + horizontalGap;
else if (side === "left") x = targetX - horizontalGap;
else if (side === "below") y = targetY + verticalGap;
else if (side === "above") y = targetY - verticalGap;
if (side === "right" && x + cardWidth > width - 14) {
side = "left";
x = targetX - horizontalGap;
} else if (side === "left" && x - cardWidth < 14) {
side = "right";
x = targetX + horizontalGap;
} else if (side === "below" && y + cardHeight > height - 14) {
side = "above";
y = targetY - verticalGap;
} else if (side === "above" && y - cardHeight < 14) {
side = "below";
y = targetY + verticalGap;
}
if (side === "right" || side === "left") {
const horizontalMargin = compactLayout.matches ? 0 : 14;
if (side === "right") x = Math.max(horizontalMargin, Math.min(width - cardWidth - horizontalMargin, x));
else x = Math.max(cardWidth + horizontalMargin, Math.min(width - horizontalMargin, x));
y = Math.max(cardHeight / 2 + 14, Math.min(height - cardHeight / 2 - 14, y));
} else {
x = Math.max(cardWidth / 2 + 14, Math.min(width - cardWidth / 2 - 14, x));
}
const connectorBaseHalf = 28 * getVisualScale();
let anchorX = x;
let anchorY = y;
let baseOne;
let baseTwo;
if (side === "right" || side === "left") {
const verticalLimit = Math.max(0, cardHeight / 2 - connectorBaseHalf - 4);
anchorY = y + Math.max(-verticalLimit, Math.min(verticalLimit, targetY - y));
baseOne = [anchorX, anchorY - connectorBaseHalf];
baseTwo = [anchorX, anchorY + connectorBaseHalf];
} else {
const horizontalLimit = Math.max(0, cardWidth / 2 - connectorBaseHalf - 4);
anchorX = x + Math.max(-horizontalLimit, Math.min(horizontalLimit, targetX - x));
baseOne = [anchorX - connectorBaseHalf, anchorY];
baseTwo = [anchorX + connectorBaseHalf, anchorY];
}
const connectorX = anchorX - targetX;
const connectorY = anchorY - targetY;
const connectorLength = Math.hypot(connectorX, connectorY) || 1;
const tipRadius = TARGET_OUTER_RADIUS * getVisualScale() * 0.72;
const tipX = targetX + connectorX / connectorLength * tipRadius;
const tipY = targetY + connectorY / connectorLength * tipRadius;
calloutConnector.setAttribute("viewBox", "0 0 " + width + " " + height);
calloutConnectorShape.setAttribute(
"points",
tipX.toFixed(1) + "," + tipY.toFixed(1) + " " +
baseOne[0].toFixed(1) + "," + baseOne[1].toFixed(1) + " " +
baseTwo[0].toFixed(1) + "," + baseTwo[1].toFixed(1)
);
const pointerInset = 32;
const pointerOffsetX = Math.max(-cardWidth / 2 + pointerInset, Math.min(cardWidth / 2 - pointerInset, targetX - x));
const pointerOffsetY = Math.max(-cardHeight / 2 + pointerInset, Math.min(cardHeight / 2 - pointerInset, targetY - y));
root.style.setProperty("--callout-x", x + "px");
root.style.setProperty("--callout-y", y + "px");
root.style.setProperty("--pointer-offset-x", pointerOffsetX + "px");
root.style.setProperty("--pointer-offset-y", pointerOffsetY + "px");
root.dataset.side = side;
root.dataset.tone = currentKey === "cliff" ? "warning" : "default";
}
function buildAnnotation(key, mode, animate) {
const definition = ANNOTATIONS[key];
if (!definition) return;
const view = definition[mode === "top" ? "top" : "perspective"];
clearAnnotation();
annotationGroup = new THREE.Group();
scene.add(annotationGroup);
view.traces.forEach(function (trace, index) { createTrace(trace, definition.color, index, view.target); });
createTarget(view.target, definition.color);
updateCallout(definition, view);
revealGeometries.forEach(function (item) {
item.geometry.setDrawRange(0, animate && !reducedMotion.matches ? 0 : item.count);
});
delayedMarkers.forEach(function (item) { item.mesh.visible = !animate || reducedMotion.matches; });
runnerDots.forEach(function (item) {
const position = item.curve.getPointAt(item.phase);
item.glow.position.copy(position);
item.dot.position.copy(position);
item.glow.visible = !animate || reducedMotion.matches;
item.dot.visible = !animate || reducedMotion.matches;
});
revealStart = performance.now() - (animate && !reducedMotion.matches ? 0 : 760);
}
function resize() {
const width = Math.max(1, stage.clientWidth);
const height = Math.max(1, stage.clientHeight);
const nextAspect = width / height;
const sizeChanged = Math.abs(nextAspect - aspect) > 0.001 || Math.abs(height - stageHeight) > 1;
aspect = nextAspect;
stageHeight = height;
renderer.setSize(width, height, false);
camera.left = -nextAspect;
camera.right = nextAspect;
camera.top = 1;
camera.bottom = -1;
camera.updateProjectionMatrix();
if (sizeChanged && currentKey && !root.hidden) buildAnnotation(currentKey, currentMode, false);
renderer.render(scene, camera);
}
function renderFrame(now) {
if (!currentKey || root.hidden || document.hidden) {
animationFrame = 0;
return;
}
const seconds = now * 0.001;
const elapsed = (now - revealStart) / 760;
animatedMaterials.forEach(function (material) {
material.uniforms.uTime.value = seconds;
material.uniforms.uMotion.value = reducedMotion.matches ? 0 : 1;
});
if (!reducedMotion.matches) {
revealGeometries.forEach(function (item) {
const progress = Math.max(0, Math.min(1, (elapsed - item.delay) / 0.62));
const eased = 1 - Math.pow(1 - progress, 3);
const count = Math.floor(item.count * eased / 6) * 6;
item.geometry.setDrawRange(0, Math.max(0, count));
});
delayedMarkers.forEach(function (item) { item.mesh.visible = elapsed >= item.delay; });
const motionSeconds = Math.max(0, (now - revealStart) * 0.001);
runnerDots.forEach(function (item) {
const visible = elapsed >= item.delay;
item.glow.visible = visible;
item.dot.visible = visible;
if (!visible) return;
const position = item.curve.getPointAt((item.phase + motionSeconds * 0.065) % 1);
item.glow.position.copy(position);
item.dot.position.copy(position);
item.glow.scale.setScalar(1 + Math.sin(seconds * 3.6 + item.pulseOffset) * 0.14);
});
const pulse = 1 + Math.sin(seconds * 3.2) * 0.10;
pulseMeshes.forEach(function (mesh) { mesh.scale.setScalar(pulse); });
}
renderer.render(scene, camera);
if (reducedMotion.matches) {
animationFrame = 0;
return;
}
animationFrame = window.requestAnimationFrame(renderFrame);
}
function startRendering() {
if (!animationFrame) animationFrame = window.requestAnimationFrame(renderFrame);
}
function show(key, mode) {
if (!ANNOTATIONS[key]) return;
window.clearTimeout(calloutTimer);
window.clearTimeout(hideTimer);
buildToken += 1;
currentKey = key;
currentMode = mode === "top" ? "top" : "perspective";
root.hidden = false;
root.classList.remove("is-visible", "is-callout-visible");
resize();
buildAnnotation(currentKey, currentMode, true);
const token = buildToken;
window.requestAnimationFrame(function () {
if (token === buildToken) root.classList.add("is-visible");
});
calloutTimer = window.setTimeout(function () {
if (token === buildToken) root.classList.add("is-callout-visible");
}, reducedMotion.matches ? 0 : 430);
startRendering();
}
function hide(immediate) {
buildToken += 1;
currentKey = null;
window.clearTimeout(calloutTimer);
window.clearTimeout(hideTimer);
root.classList.remove("is-visible", "is-callout-visible");
if (immediate) {
root.hidden = true;
clearAnnotation();
if (animationFrame) {
window.cancelAnimationFrame(animationFrame);
animationFrame = 0;
}
return;
}
hideTimer = window.setTimeout(function () {
if (!currentKey) {
root.hidden = true;
clearAnnotation();
}
}, 220);
}
if (typeof ResizeObserver === "function") {
const observer = new ResizeObserver(resize);
observer.observe(stage);
} else {
window.addEventListener("resize", resize, { passive: true });
}
const handleMotionPreference = function () {
if (currentKey) {
buildAnnotation(currentKey, currentMode, false);
startRendering();
}
};
if (typeof reducedMotion.addEventListener === "function") reducedMotion.addEventListener("change", handleMotionPreference);
else if (typeof reducedMotion.addListener === "function") reducedMotion.addListener(handleMotionPreference);
document.addEventListener("visibilitychange", function () {
if (!document.hidden && currentKey) startRendering();
});
window.TerrainAnnotation = {
show: show,
hide: hide,
getState: function () {
return { key: currentKey, mode: currentMode, renderer: "three-r" + THREE.REVISION, side: root.dataset.side || null };
}
};
})();
File diff suppressed because it is too large. Load diff
Binary file not shown.

After

Width:  |  Height:  |  Size: 701 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

+333
View File
@@ -0,0 +1,333 @@
<!doctype html>
<html lang="zh-CN">
<head><meta http-equiv="Content-Security-Policy" content="default-src 'self' file: data: blob:; connect-src 'self' file: data: blob:; img-src 'self' file: data: blob:; media-src 'self' file: data: blob:; font-src 'self' data:; style-src 'unsafe-inline' 'self' file: data:; script-src 'unsafe-inline' 'self' file: data: blob:; base-uri 'none'; form-action 'none'; frame-src 'none'; object-src 'none'; worker-src 'none'">
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
<meta name="theme-color" content="#d7ecff">
<title>等高线地形——五大典型地貌判读</title>
<link rel="stylesheet" href="assets/style.css">
</head>
<body>
<main class="app-shell" id="app-shell">
<section class="media-stage" aria-label="等高线实验观察区">
<video
class="stage-media stage-video is-visible"
id="experiment-video"
src="assets/contour-formation.mp4"
preload="auto"
playsinline
aria-label="等高线形成交线实验视频"
></video>
<img
class="stage-media stage-image workflow-step-background"
id="density-background"
src="assets/density-background.jpg"
alt="山体两侧以疏密不同的等高线对比坡度"
decoding="async"
>
<img class="stage-media stage-image" id="landform-image" alt="" decoding="async">
<img class="stage-media stage-image stage-top-image" id="landform-top-image" alt="" decoding="async">
<div class="media-shade" aria-hidden="true"></div>
<div class="scan-effect" id="scan-effect" aria-hidden="true">
<span class="scan-grid"></span>
<span class="scan-beam"></span>
</div>
<svg
class="workflow-diagram workflow-diagram--projection"
id="projection-diagram"
viewBox="0 0 300 455"
role="img"
aria-labelledby="projection-diagram-title projection-diagram-description"
hidden
>
<title id="projection-diagram-title">垂直投影</title>
<desc id="projection-diagram-description">立体山体上的多层等高交线沿垂线投影到同一平面,形成平面等高线。</desc>
<defs>
<linearGradient id="projection-card-fill" x1="0" y1="0" x2="1" y2="1">
<stop offset="0" stop-color="#ffffff" stop-opacity=".94"/>
<stop offset="1" stop-color="#edf7ff" stop-opacity=".88"/>
</linearGradient>
<linearGradient id="projection-beam" gradientUnits="userSpaceOnUse" x1="0" y1="60" x2="0" y2="340">
<stop offset="0" stop-color="#26c7ff" stop-opacity=".18"/>
<stop offset=".42" stop-color="#1089ff" stop-opacity=".72"/>
<stop offset="1" stop-color="#126fff" stop-opacity=".96"/>
</linearGradient>
<linearGradient id="projection-layer-stroke" x1="0" y1="0" x2="1" y2="0">
<stop offset="0" stop-color="#3a7fff"/>
<stop offset=".5" stop-color="#31d8ff"/>
<stop offset="1" stop-color="#3a7fff"/>
</linearGradient>
<linearGradient id="projection-plane-fill" x1="0" y1="0" x2="0" y2="1">
<stop offset="0" stop-color="#eaf7ff" stop-opacity=".64"/>
<stop offset="1" stop-color="#b9ddff" stop-opacity=".20"/>
</linearGradient>
<filter id="projection-card-shadow" x="-30%" y="-20%" width="160%" height="160%">
<feDropShadow dx="0" dy="14" stdDeviation="14" flood-color="#052b50" flood-opacity=".20"/>
</filter>
<filter id="projection-glow" x="-80%" y="-80%" width="260%" height="260%">
<feGaussianBlur stdDeviation="2.6" result="blur"/>
<feMerge><feMergeNode in="blur"/><feMergeNode in="SourceGraphic"/></feMerge>
</filter>
<marker id="projection-arrow" viewBox="0 0 8 8" refX="7" refY="4" markerWidth="6" markerHeight="6" orient="auto">
<path d="M1 1 7 4 1 7" fill="none" stroke="#147dff" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/>
</marker>
</defs>
<rect class="diagram-card" x="3" y="3" width="294" height="449" rx="17" fill="url(#projection-card-fill)" filter="url(#projection-card-shadow)"/>
<text class="diagram-heading" x="20" y="38">垂直投影</text>
<g class="projection-stack" filter="url(#projection-glow)">
<ellipse class="projection-layer" style="--i:0" cx="150" cy="64" rx="43" ry="10"/>
<ellipse class="projection-layer" style="--i:1" cx="150" cy="84" rx="58" ry="12"/>
<ellipse class="projection-layer" style="--i:2" cx="150" cy="105" rx="75" ry="13"/>
<ellipse class="projection-layer" style="--i:3" cx="150" cy="126" rx="94" ry="15"/>
<ellipse class="projection-layer" style="--i:4" cx="150" cy="148" rx="111" ry="16"/>
<ellipse class="projection-layer" style="--i:5" cx="150" cy="170" rx="126" ry="18"/>
</g>
<g class="projection-columns">
<line class="projection-column" x1="49" y1="166" x2="49" y2="347" marker-end="url(#projection-arrow)"/>
<line class="projection-column" x1="65" y1="154" x2="65" y2="331" marker-end="url(#projection-arrow)"/>
<line class="projection-column" x1="83" y1="139" x2="83" y2="323" marker-end="url(#projection-arrow)"/>
<line class="projection-column" x1="103" y1="121" x2="103" y2="331" marker-end="url(#projection-arrow)"/>
<line class="projection-column" x1="125" y1="101" x2="125" y2="338" marker-end="url(#projection-arrow)"/>
<line class="projection-column" x1="150" y1="73" x2="150" y2="347" marker-end="url(#projection-arrow)"/>
<line class="projection-column" x1="175" y1="101" x2="175" y2="338" marker-end="url(#projection-arrow)"/>
<line class="projection-column" x1="197" y1="121" x2="197" y2="331" marker-end="url(#projection-arrow)"/>
<line class="projection-column" x1="217" y1="139" x2="217" y2="323" marker-end="url(#projection-arrow)"/>
<line class="projection-column" x1="235" y1="154" x2="235" y2="331" marker-end="url(#projection-arrow)"/>
<line class="projection-column" x1="251" y1="166" x2="251" y2="347" marker-end="url(#projection-arrow)"/>
<g class="projection-crossings" filter="url(#projection-glow)">
<circle cx="65" cy="154" r="2.4"/><circle cx="83" cy="139" r="2.4"/><circle cx="103" cy="121" r="2.4"/>
<circle cx="125" cy="101" r="2.4"/><circle cx="150" cy="73" r="2.4"/><circle cx="175" cy="101" r="2.4"/>
<circle cx="197" cy="121" r="2.4"/><circle cx="217" cy="139" r="2.4"/><circle cx="235" cy="154" r="2.4"/>
</g>
</g>
<g class="projection-plane">
<polygon points="34,300 266,300 285,395 15,395" fill="url(#projection-plane-fill)" stroke="#7fa6d4" stroke-width="1.1"/>
<path class="projection-grid" d="M30 318h240M26 340h248M22 365h256M19 383h262M63 300 48 395M91 300l-8 95M121 300l-3 95M150 300v95M179 300l3 95M209 300l8 95M237 300l15 95"/>
<ellipse class="projection-contour" style="--i:0" cx="150" cy="347" rx="101" ry="43"/>
<ellipse class="projection-contour" style="--i:1" cx="150" cy="347" rx="79" ry="34"/>
<ellipse class="projection-contour" style="--i:2" cx="150" cy="347" rx="59" ry="27"/>
<ellipse class="projection-contour" style="--i:3" cx="150" cy="347" rx="42" ry="20"/>
<ellipse class="projection-contour" style="--i:4" cx="150" cy="347" rx="24" ry="12"/>
<ellipse class="projection-contour" style="--i:5" cx="150" cy="347" rx="11" ry="6"/>
<g class="projection-landings" filter="url(#projection-glow)">
<circle cx="49" cy="347" r="2.8"/><circle cx="65" cy="331" r="2.8"/><circle cx="83" cy="323" r="2.8"/>
<circle cx="103" cy="331" r="2.8"/><circle cx="125" cy="338" r="2.8"/><circle cx="150" cy="347" r="2.8"/>
<circle cx="175" cy="338" r="2.8"/><circle cx="197" cy="331" r="2.8"/><circle cx="217" cy="323" r="2.8"/>
<circle cx="235" cy="331" r="2.8"/><circle cx="251" cy="347" r="2.8"/>
</g>
</g>
<text class="diagram-footer" x="150" y="431" text-anchor="middle">立体交线 → 平面等高线</text>
</svg>
<svg
class="workflow-diagram workflow-diagram--density"
id="density-diagram"
viewBox="0 0 368 283"
role="img"
aria-labelledby="density-diagram-title density-diagram-description"
hidden
>
<title id="density-diagram-title">疏密判坡</title>
<desc id="density-diagram-description">等高线稀疏的一侧坡缓,等高线密集的一侧坡陡。</desc>
<defs>
<linearGradient id="density-card-fill" x1="0" y1="0" x2="1" y2="1">
<stop offset="0" stop-color="#ffffff" stop-opacity=".94"/>
<stop offset="1" stop-color="#edf7ff" stop-opacity=".88"/>
</linearGradient>
<linearGradient id="density-contour-stroke" gradientUnits="userSpaceOnUse" x1="95" y1="0" x2="320" y2="0">
<stop offset="0" stop-color="#1587ff"/>
<stop offset=".50" stop-color="#3e95ff"/>
<stop offset=".64" stop-color="#f0a43d"/>
<stop offset="1" stop-color="#ff8517"/>
</linearGradient>
<filter id="density-card-shadow" x="-30%" y="-35%" width="160%" height="180%">
<feDropShadow dx="0" dy="14" stdDeviation="14" flood-color="#052b50" flood-opacity=".20"/>
</filter>
<filter id="density-dot-glow" x="-120%" y="-120%" width="340%" height="340%">
<feGaussianBlur stdDeviation="3" result="blur"/>
<feMerge><feMergeNode in="blur"/><feMergeNode in="SourceGraphic"/></feMerge>
</filter>
<path id="density-contour-shape" d="M342 164C342 111 309 75 258 65c-32-6-49-3-80-12-27-7-45 8-67 13-27 6-47 4-64 18-21 17-29 41-24 67 5 23 25 33 53 33 29 1 42 24 67 42 25 19 59 29 107 27 55-2 90-35 92-89Z"/>
</defs>
<rect class="diagram-card" x="3" y="3" width="362" height="277" rx="17" fill="url(#density-card-fill)" filter="url(#density-card-shadow)"/>
<text class="diagram-heading" x="20" y="38">疏密判坡</text>
<g class="density-contours">
<use class="density-contour" style="--i:0" href="#density-contour-shape"/>
<use class="density-contour" style="--i:1" href="#density-contour-shape" transform="translate(273 164) scale(.84) translate(-273 -164)"/>
<use class="density-contour" style="--i:2" href="#density-contour-shape" transform="translate(273 164) scale(.70) translate(-273 -164)"/>
<use class="density-contour" style="--i:3" href="#density-contour-shape" transform="translate(273 164) scale(.58) translate(-273 -164)"/>
<use class="density-contour" style="--i:4" href="#density-contour-shape" transform="translate(273 164) scale(.47) translate(-273 -164)"/>
<use class="density-contour" style="--i:5" href="#density-contour-shape" transform="translate(273 164) scale(.37) translate(-273 -164)"/>
<use class="density-contour" style="--i:6" href="#density-contour-shape" transform="translate(273 164) scale(.29) translate(-273 -164)"/>
<use class="density-contour" style="--i:7" href="#density-contour-shape" transform="translate(273 164) scale(.22) translate(-273 -164)"/>
<use class="density-contour" style="--i:8" href="#density-contour-shape" transform="translate(273 164) scale(.15) translate(-273 -164)"/>
</g>
<g class="density-callout density-callout--gentle">
<rect x="14" y="211" width="116" height="37" rx="8"/>
<path d="M60 190 52 207"/>
<circle cx="60" cy="190" r="7"/>
<text x="22" y="236">线疏 · 坡缓</text>
</g>
<g class="density-callout density-callout--steep">
<rect x="257" y="50" width="100" height="37" rx="8"/>
<path d="M293 125 307 88"/>
<circle cx="293" cy="125" r="7"/>
<text x="266" y="75">线密 · 坡陡</text>
</g>
</svg>
<div class="terrain-annotation" id="terrain-annotation" hidden>
<canvas id="terrain-annotation-canvas" aria-hidden="true"></canvas>
<svg class="terrain-callout-connector" id="terrain-callout-connector" aria-hidden="true" preserveAspectRatio="none">
<polygon id="terrain-callout-connector-shape"></polygon>
</svg>
<div class="terrain-callout" id="terrain-callout" role="status" aria-live="polite">
<span class="terrain-callout-kicker">动态判读</span>
<strong id="terrain-callout-title"></strong>
<p id="terrain-callout-copy"></p>
</div>
</div>
<div class="media-loading" id="media-loading" role="status">
<span class="loading-ring"></span>
<span>实验影像加载中</span>
</div>
<div class="media-label" id="media-label" aria-live="polite">
<span class="media-label-kicker" id="media-label-kicker">实验流程</span>
<strong id="media-label-title">形成交线与垂直投影</strong>
<small id="media-label-copy">点击“开始实验”,直接在当前画面播放形成交线视频</small>
</div>
<div class="video-progress" aria-hidden="true"><span id="video-progress-fill"></span></div>
</section>
<header class="topbar">
<div class="heading-group">
<span class="subject-chip">高中地理</span>
<div class="heading-copy">
<h1>等高线地形——五大典型地貌判读</h1>
<p>观察水平切割、垂直投影与等高线地貌特征</p>
</div>
</div>
<div class="top-actions">
<button class="glass-button" id="workflow-open" type="button">
<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M4 5.5A3.5 3.5 0 0 1 7.5 2H11v17H7.5A3.5 3.5 0 0 0 4 22V5.5Zm16 0A3.5 3.5 0 0 0 16.5 2H13v17h3.5a3.5 3.5 0 0 1 3.5 3V5.5Z"/></svg>
<span>实验流程</span>
</button>
<button class="glass-button" id="fullscreen-button" type="button">
<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M8 3H3v5M16 3h5v5M21 16v5h-5M8 21H3v-5"/></svg>
<span id="fullscreen-label">全屏</span>
</button>
</div>
</header>
<aside class="control-panel" aria-labelledby="panel-title">
<div class="panel-scroll">
<section class="flow-section">
<div class="section-heading">
<h2 id="panel-title">实验流程 · <span id="flow-count">1/4</span></h2>
<button class="panel-close" id="panel-close" type="button" aria-label="收起观察面板">×</button>
</div>
<div class="flow-track" id="flow-track">
<span class="flow-line" aria-hidden="true"><i id="flow-line-fill"></i></span>
<button class="flow-step is-active" type="button" data-step="0" aria-label="查看步骤一:等高切割">
<span class="step-dot">1</span><span class="step-name">等高切割</span>
</button>
<button class="flow-step" type="button" data-step="1" aria-label="查看步骤二:形成交线">
<span class="step-dot">2</span><span class="step-name">形成交线</span>
</button>
<button class="flow-step" type="button" data-step="2" aria-label="查看步骤三:投影成图">
<span class="step-dot">3</span><span class="step-name">投影成图</span>
</button>
<button class="flow-step" type="button" data-step="3" aria-label="查看步骤四:疏密判坡">
<span class="step-dot">4</span><span class="step-name">疏密判坡</span>
</button>
</div>
</section>
<section class="glass-card task-card" aria-labelledby="task-title">
<span class="card-eyebrow">当前步骤</span>
<h3 id="task-title">等高切割</h3>
<p id="task-description">观察水平面与山体在同一海拔相交,形成连续闭合线。</p>
<div class="fixed-condition" aria-label="实验固定条件">
<span><i></i>水平切面</span>
<strong>等高距 d = 10 m</strong>
</div>
</section>
<section class="glass-card terrain-card" aria-labelledby="terrain-title">
<div class="card-title-row">
<span class="card-eyebrow" id="terrain-title">典型地貌</span>
<button class="text-action" id="return-experiment" type="button" hidden>返回实验</button>
</div>
<div class="terrain-tabs" id="terrain-tabs" role="list" aria-label="五大典型地貌">
<button class="terrain-tab" type="button" data-landform="peak" aria-pressed="false">
<svg viewBox="0 0 42 34" aria-hidden="true"><path d="M4 29 16 9l5 8 5-12 12 24H4Z"/><path d="m20 19 4 6h-8l4-6Z" class="solid"/></svg>
<span>山峰</span>
</button>
<button class="terrain-tab" type="button" data-landform="ridge" aria-pressed="false">
<svg viewBox="0 0 42 34" aria-hidden="true"><path d="M3 29 12 9l7 5 7-10 13 25"/><path d="M10 28c5-7 9-10 14-11"/></svg>
<span>山脊</span>
</button>
<button class="terrain-tab" type="button" data-landform="valley" aria-pressed="false">
<svg viewBox="0 0 42 34" aria-hidden="true"><path d="M4 6c8 4 12 12 17 24C26 18 30 10 38 6"/><path d="M21 11v19" class="accent"/></svg>
<span>山谷</span>
</button>
<button class="terrain-tab" type="button" data-landform="saddle" aria-pressed="false">
<svg viewBox="0 0 42 34" aria-hidden="true"><path d="M4 25V8h10l7 8 7-8h10v17"/><path d="M14 9c0 6 2 9 7 9s7-3 7-9"/></svg>
<span>鞍部</span>
</button>
<button class="terrain-tab" type="button" data-landform="cliff" aria-pressed="false">
<svg viewBox="0 0 42 34" aria-hidden="true"><path d="M7 29V5h17l10 8v16"/><path d="M11 11h18M11 16h21M11 21h22"/></svg>
<span>陡崖</span>
</button>
</div>
</section>
<section class="glass-card observation-card" aria-labelledby="observation-heading">
<div class="observation-copy">
<span class="card-eyebrow">当前观察</span>
<h3 id="observation-heading">实验演示</h3>
<p id="observation-summary">点击开始实验,在当前背景中观察等高切割、交线形成与垂直投影。</p>
<ul class="feature-list" id="feature-list">
<li>同一条等高线上海拔相等</li>
<li>相邻等高线高差保持一致</li>
</ul>
</div>
<button class="top-view-card" id="top-view-toggle" type="button" disabled aria-pressed="false">
<span id="top-view-toggle-label">俯视图</span>
<small id="top-view-toggle-hint">选择地貌后切换</small>
<img id="top-view-thumbnail" alt="" decoding="async" hidden>
</button>
</section>
</div>
</aside>
<button class="panel-open" id="panel-open" type="button" aria-label="展开观察面板" hidden>
<span></span><span></span><span></span>
</button>
<div class="experiment-actions">
<button class="primary-button" id="play-button" type="button">
<span class="round-icon" id="play-icon" aria-hidden="true">
<svg viewBox="0 0 24 24"><path d="m9 6 9 6-9 6V6Z"/></svg>
</span>
<span id="play-label">开始实验</span>
</button>
<button class="glass-button reset-button" id="reset-button" type="button">
<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M4 4v6h6M5.4 15.5A8 8 0 1 0 6 7"/></svg>
<span>重置</span>
</button>
</div>
<div class="hint-bar" id="hint-bar">
<svg viewBox="0 0 24 24" aria-hidden="true"><circle cx="12" cy="12" r="9"/><path d="M12 10v6M12 7h.01"/></svg>
<span id="hint-text">点击“开始实验”,观看形成交线视频</span>
</div>
<div class="toast" id="toast" role="status" aria-live="polite"></div>
</main>
<script src="assets/three.min.js"></script>
<script src="assets/terrain-annotation.js"></script>
<script src="assets/app.js"></script>
</body>
</html>
+328 -16
View File
@@ -1,4 +1,5 @@
import 'dart:convert'; import 'dart:convert';
import 'dart:io';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
@@ -137,6 +138,26 @@ class JobInfo {
final bool isDone; final bool isDone;
} }
/// 「重新下载启动器」的结果。
///
/// State: Ready(已下载并通过 sha256 校验)/ UpToDate(已是最新,无需重下)/ Failed。
class LauncherRedownloadInfo {
LauncherRedownloadInfo.fromJson(Map<String, dynamic> json)
: state = json['state'] as String? ?? '',
version = json['version'] as String? ?? '',
message = json['message'] as String? ?? '',
steps = ((json['steps'] as List<dynamic>?) ?? const <dynamic>[])
.map((e) => e.toString())
.toList();
final String state;
final String version;
final String message;
final List<String> steps;
bool get ok => state == 'Ready' || state == 'UpToDate';
}
/// 界面语言选项。 /// 界面语言选项。
class LanguageInfo { class LanguageInfo {
LanguageInfo.fromJson(Map<String, dynamic> json) LanguageInfo.fromJson(Map<String, dynamic> json)
@@ -152,6 +173,7 @@ class SettingsInfo {
SettingsInfo.fromJson(Map<String, dynamic> json) SettingsInfo.fromJson(Map<String, dynamic> json)
: language = json['language'] as String? ?? 'auto', : language = json['language'] as String? ?? 'auto',
theme = json['theme'] as String? ?? 'light', theme = json['theme'] as String? ?? 'light',
accentColor = json['accentColor'] as String? ?? '#8FB6FF',
renderFps = (json['renderFps'] as num?)?.toInt() ?? 120, renderFps = (json['renderFps'] as num?)?.toInt() ?? 120,
memoryMb = (json['memoryMb'] as num?)?.toInt() ?? 2048, memoryMb = (json['memoryMb'] as num?)?.toInt() ?? 2048,
memoryAuto = json['memoryAuto'] as bool? ?? true, memoryAuto = json['memoryAuto'] as bool? ?? true,
@@ -176,6 +198,7 @@ class SettingsInfo {
final String language; final String language;
final String theme; final String theme;
final String accentColor;
final int renderFps; final int renderFps;
final int memoryMb; final int memoryMb;
final bool memoryAuto; final bool memoryAuto;
@@ -200,6 +223,7 @@ class SettingsPatch {
const SettingsPatch({ const SettingsPatch({
this.language, this.language,
this.theme, this.theme,
this.accentColor,
this.renderFps, this.renderFps,
this.memoryMb, this.memoryMb,
this.memoryAuto, this.memoryAuto,
@@ -212,6 +236,7 @@ class SettingsPatch {
final String? language; final String? language;
final String? theme; final String? theme;
final String? accentColor;
final int? renderFps; final int? renderFps;
final int? memoryMb; final int? memoryMb;
final bool? memoryAuto; final bool? memoryAuto;
@@ -225,6 +250,7 @@ class SettingsPatch {
final map = <String, dynamic>{}; final map = <String, dynamic>{};
if (language != null) map['language'] = language; if (language != null) map['language'] = language;
if (theme != null) map['theme'] = theme; if (theme != null) map['theme'] = theme;
if (accentColor != null) map['accentColor'] = accentColor;
if (renderFps != null) map['renderFps'] = renderFps; if (renderFps != null) map['renderFps'] = renderFps;
if (memoryMb != null) map['memoryMb'] = memoryMb; if (memoryMb != null) map['memoryMb'] = memoryMb;
if (memoryAuto != null) map['memoryAuto'] = memoryAuto; if (memoryAuto != null) map['memoryAuto'] = memoryAuto;
@@ -244,13 +270,16 @@ class HealthInfo {
version = json['version'] as String? ?? '', version = json['version'] as String? ?? '',
platform = json['platform'] as String? ?? '', platform = json['platform'] as String? ?? '',
uiAvailable = json['uiAvailable'] as bool? ?? false, uiAvailable = json['uiAvailable'] as bool? ?? false,
uiError = json['uiError'] as String?; uiError = json['uiError'] as String?,
sessionProof = json['sessionProof'] as String?;
final bool ok; final bool ok;
final String version; final String version;
final String platform; final String platform;
final bool uiAvailable; final bool uiAvailable;
final String? uiError; final String? uiError;
/// 后端会话令牌的指纹;前端可用于诊断「是否连到了正确的后端」。
final String? sessionProof;
} }
/// 一次更新检查的结果。 /// 一次更新检查的结果。
@@ -327,42 +356,222 @@ class ActionResult {
List<String> _stringList(dynamic value) => List<String> _stringList(dynamic value) =>
(value as List<dynamic>? ?? const []).map((e) => e.toString()).toList(); (value as List<dynamic>? ?? const []).map((e) => e.toString()).toList();
/// 握手文件内容。
class _Endpoint {
const _Endpoint(this.url, this.token);
final String url;
final String? token;
}
/// GC-UI 后端客户端。 /// GC-UI 后端客户端。
/// ///
/// 后端是本地伴随进程,默认监听 127.0.0.1:17890;端口可用 /// 后端是本地伴随进程,端口由启动器(GC-BOOT)选定后通过 `GC_UI_PORT`
/// `--dart-define=GC_UI_BASE_URL=http://127.0.0.1:12345` 覆盖。 /// 环境变量传进来 —— 这样端口被占用时换端口不用重新编译前端。
/// 也可用 `--dart-define=GC_UI_BASE_URL=http://127.0.0.1:12345` 强制指定。
class GcApi { class GcApi {
GcApi({String? baseUrl}) GcApi({String? baseUrl})
: baseUrl = baseUrl ?? defaultBaseUrl; : baseUrl = baseUrl ?? defaultBaseUrl;
static const String defaultBaseUrl = String.fromEnvironment( /// 后端地址。可被 [rediscover] 更新(后端换端口 / 首次靠握手文件发现)。
'GC_UI_BASE_URL', String baseUrl;
defaultValue: 'http://127.0.0.1:17890',
);
final String baseUrl; /// 复用同一个 HTTP 连接:轮询(下载任务每秒一次)时每次都新建连接
/// 会不断握手,桌面端也能明显看到延迟抖动。
static final http.Client _client = http.Client();
/// 兜底默认端口,与后端 GC.Services.GcUiContract.DefaultPort 保持一致。
static const int fallbackPort = 17890;
static String get defaultBaseUrl {
const fromDefine = String.fromEnvironment('GC_UI_BASE_URL');
if (fromDefine.isNotEmpty) return fromDefine;
final fromEnvUrl = Platform.environment['GC_UI_BASE_URL'];
if (fromEnvUrl != null && fromEnvUrl.isNotEmpty) return fromEnvUrl;
// 启动器通过 GC_UI_PORT 传端口(主路径)。
final port = int.tryParse(Platform.environment['GC_UI_PORT'] ?? '');
if (port != null) return 'http://127.0.0.1:$port';
// 没有环境变量(例如直接从 Finder 打开 GC-UI.app):读后端写的握手文件。
final discovered = _readEndpointFile();
if (discovered != null) return discovered.url;
return 'http://127.0.0.1:$fallbackPort';
}
/// 后端启动时写的握手文件:地址 + 会话令牌。
static _Endpoint? _endpoint;
/// 依次尝试的运行目录。打包后 GC-UI.app 在 GC.app/Contents/MacOS/ 下,
/// 直接 Finder 打开时 Directory.current 可能是 `/`,所以要把可执行文件周围都试一遍。
static List<String> _candidateRoots() {
final roots = <String>[];
void add(String path) {
if (path.isEmpty) return;
final root = path.endsWith('/') ? path.substring(0, path.length - 1) : path;
if (!roots.contains(root)) roots.add(root);
}
add(Platform.environment['GC_UI_HOME'] ?? '');
try {
add(Directory.current.path);
} catch (_) {}
try {
var dir = File(Platform.resolvedExecutable).parent;
// GC-UI.app/Contents/MacOS -> 逐级向上都可能是 .GC 所在目录
for (var i = 0; i < 4; i++) {
add(dir.path);
if (dir.parent.path == dir.path) break;
dir = dir.parent;
}
} catch (_) {}
return roots;
}
static _Endpoint? _readEndpointFile({bool refresh = false}) {
if (!refresh && _endpoint != null) return _endpoint;
for (final root in _candidateRoots()) {
try {
final file = File('$root/.GC/ui-backend.json');
try {
final logFile = File('${Directory.systemTemp.path}/gc-api-debug.log');
logFile.writeAsStringSync('[api] 检查: $root/.GC/ui-backend.json (exists=${file.existsSync()})\n', mode: FileMode.append);
} catch (_) {}
if (!file.existsSync()) continue;
// 只认 24 小时内的记录:更早的多半是上次遗留,连过去只会得到「无法连接」
final age = DateTime.now().difference(file.lastModifiedSync());
if (age.inHours >= 24) continue;
final decoded = jsonDecode(file.readAsStringSync());
if (decoded is! Map<String, dynamic>) continue;
String? url;
final rawUrl = decoded['url'];
if (rawUrl is String && rawUrl.startsWith('http://127.0.0.1:')) {
url = rawUrl;
} else {
final port = (decoded['port'] as num?)?.toInt();
if (port != null && port > 0 && port < 65536) {
url = 'http://127.0.0.1:$port';
}
}
if (url == null) continue;
final token = decoded['token'];
return _endpoint = _Endpoint(url, token is String && token.isNotEmpty ? token : null);
} catch (_) {
// 文件损坏 / 无权限:试下一个候选目录
}
}
return _endpoint = null;
}
/// 重新解析后端地址与令牌(后端重启换端口、或环境变量缺失时用)。
/// 返回 true 表示地址或令牌发生了变化,值得重试一次。
bool rediscover() {
final before = (_endpoint?.url, _sessionToken);
_endpoint = null;
final endpoint = _readEndpointFile(refresh: true);
if (endpoint?.token != null && endpoint!.token != _sessionToken) {
_sessionToken = endpoint.token;
}
final envUrl = Platform.environment['GC_UI_BASE_URL'];
final envPort = int.tryParse(Platform.environment['GC_UI_PORT'] ?? '');
final resolved = (envUrl != null && envUrl.isNotEmpty)
? envUrl
: (envPort != null
? 'http://127.0.0.1:$envPort'
: (endpoint?.url ?? 'http://127.0.0.1:$fallbackPort'));
if (resolved != baseUrl) {
baseUrl = resolved;
return true;
}
return (before.$1 != _endpoint?.url) || (before.$2 != _sessionToken);
}
/// 启动器注入的一次性会话令牌:环境变量优先,其次握手文件。
/// 后端在发布包模式下校验它,防止前端连到同机伪造的「后端」。
static String? _sessionToken = _readSessionToken();
static String? _readSessionToken() {
const fromDefine = String.fromEnvironment('GC_UI_TOKEN');
if (fromDefine.isNotEmpty) return fromDefine;
final fromEnv = Platform.environment['GC_UI_TOKEN'];
if (fromEnv != null && fromEnv.isNotEmpty) return fromEnv;
// 环境变量没传进来(Finder 直接打开 GC-UI.app):用握手文件里的令牌
return _readEndpointFile()?.token;
}
/// 是否拿到了会话令牌(诊断用)。
bool get hasSessionToken => _sessionToken != null;
/// 用户 session token:登录时后端返回,只放内存。
/// 持久化由后端负责(写 .GC/user/user.yaml),下次启动后端会用它自动登录,
/// 前端不需要自己去猜 .GC 在哪。
static String? _userToken;
static String? get userToken => _userToken;
/// 带会话令牌的请求头;没有令牌时返回 const 空 map(调试/独立后端模式)。
Map<String, String> get _authHeaders => {
if (_sessionToken != null) 'X-GC-UI-Token': _sessionToken!,
if (_userToken != null) 'X-User-Token': _userToken!,
};
Uri _uri(String path, [Map<String, String>? query]) => Uri _uri(String path, [Map<String, String>? query]) =>
Uri.parse('$baseUrl$path').replace(queryParameters: query); Uri.parse('$baseUrl$path').replace(queryParameters: query);
Future<dynamic> _send(String method, String path, Future<dynamic> _send(String method, String path,
{Map<String, String>? query, Object? body}) async { {Map<String, String>? query,
Object? body,
Duration? timeout}) async {
try {
return await _sendOnce(method, path,
query: query, body: body, timeout: timeout);
} on ApiException catch (e) {
// HTTP 层错误(后端明确回了 4xx/5xx)不是连接问题,直接抛。
if (e.statusCode != null) rethrow;
// 连接层失败:可能是电脑睡眠唤醒后旧连接已死,或后端换了端口。
// 重新解析地址后重试一次。只对 GET 自动重试——POST(签到/扣积分)
// 在连接不确定的情况下重发可能重复计费,宁可让用户手动再点。
if (method != 'GET') rethrow;
if (!rediscover()) rethrow;
return await _sendOnce(method, path,
query: query, body: body, timeout: timeout);
}
}
Future<dynamic> _sendOnce(String method, String path,
{Map<String, String>? query,
Object? body,
Duration? timeout}) async {
final uri = _uri(path, query); final uri = _uri(path, query);
final auth = _authHeaders;
late http.Response response; late http.Response response;
try { try {
switch (method) { switch (method) {
case 'GET': case 'GET':
response = await http.get(uri).timeout(const Duration(seconds: 30)); response = await _client.get(uri, headers: auth)
.timeout(timeout ?? const Duration(seconds: 30));
break; break;
case 'POST': case 'POST':
response = await http response = await _client
.post(uri, .post(uri,
headers: const {'Content-Type': 'application/json'}, headers: <String, String>{...auth, 'Content-Type': 'application/json'},
body: body == null ? null : jsonEncode(body)) body: body == null ? null : jsonEncode(body))
.timeout(const Duration(seconds: 120)); .timeout(timeout ?? const Duration(seconds: 120));
break; break;
case 'DELETE': case 'DELETE':
response = await http.delete(uri).timeout(const Duration(seconds: 30)); response = await _client.delete(uri, headers: auth)
.timeout(timeout ?? const Duration(seconds: 30));
break; break;
default: default:
throw ApiException('不支持的方法 $method'); throw ApiException('不支持的方法 $method');
@@ -426,6 +635,14 @@ class GcApi {
'force': force.toString(), 'force': force.toString(),
}) as Map<String, dynamic>); }) as Map<String, dynamic>);
/// 重新下载本机启动器包,返回时后端已完成 sha256 完整性校验。
Future<LauncherRedownloadInfo> redownloadLauncher() async =>
LauncherRedownloadInfo.fromJson(await _send(
'POST',
'/api/launcher/redownload',
timeout: const Duration(minutes: 10),
) as Map<String, dynamic>);
Future<List<JobInfo>> jobs() async => Future<List<JobInfo>> jobs() async =>
_asList(await _send('GET', '/api/download/jobs')).map(JobInfo.fromJson).toList(); _asList(await _send('GET', '/api/download/jobs')).map(JobInfo.fromJson).toList();
@@ -461,6 +678,101 @@ class GcApi {
await _send('POST', '/api/shell/open-url', body: {'url': url}) await _send('POST', '/api/shell/open-url', body: {'url': url})
as Map<String, dynamic>); as Map<String, dynamic>);
/// 模型封面图地址(直接给 Image.network 用)。 /// 模型封面图地址(直接给 Image.network 用,带不上自定义头,令牌走 query 参数)。
String previewUrl(ModelInfo model) => '$baseUrl${model.previewUrl}'; String previewUrl(ModelInfo model) {
if (_sessionToken == null) return '$baseUrl${model.previewUrl}';
final uri = Uri.parse('$baseUrl${model.previewUrl}');
return uri.replace(queryParameters: {
...uri.queryParameters,
'X-GC-UI-Token': _sessionToken!,
}).toString();
}
// ==================== 用户系统 ====================
/// 取一个人机验证题(算术题,5 分钟内有效、一次性)。
Future<CaptchaInfo> captcha() async {
final r = await _send('GET', '/api/user/captcha');
return CaptchaInfo.fromJson(r as Map<String, dynamic>);
}
/// 当前登录用户;未登录返回 null(后端会用 .GC/user/user.yaml 自动登录)。
Future<Map<String, dynamic>?> me() async {
try {
final r = await _send('GET', '/api/user/me');
return r as Map<String, dynamic>?;
} on ApiException catch (e) {
if (e.statusCode == 401 || e.statusCode == 403) {
_userToken = null;
return null;
}
rethrow;
}
}
Future<Map<String, dynamic>> register(String username, String password,
{required String captchaId, required String captchaAnswer}) async {
final r = await _send('POST', '/api/user/register', body: {
'username': username,
'password': password,
'captchaId': captchaId,
'captcha': captchaAnswer,
});
return r as Map<String, dynamic>;
}
Future<Map<String, dynamic>> login(String username, String password) async {
final r = await _send('POST', '/api/user/login',
body: {'username': username, 'password': password});
final result = r as Map<String, dynamic>;
_userToken = result['session_token'] as String?;
return result;
}
/// 退出登录:清掉后端的 user.yaml 与内存 token。
Future<void> logout() async {
try {
await _send('POST', '/api/user/logout');
} catch (_) {
// 后端连不上也要让界面退出
}
_userToken = null;
}
Future<Map<String, dynamic>> signin() async {
final r = await _send('POST', '/api/user/signin');
return r as Map<String, dynamic>;
}
/// 换主题色:只传颜色,价格由后端判定(预置 50 / 自定义 150)。
Future<Map<String, dynamic>> changeTheme(String color) async {
final r = await _send('POST', '/api/user/theme', body: {'color': color});
return r as Map<String, dynamic>;
}
/// 摇人品值。价格由后端算:当天第一次免费,之后按当日次数阶梯计费。
Future<Map<String, dynamic>> rollFortune() async {
final r = await _send('POST', '/api/user/fortune');
return r as Map<String, dynamic>;
}
/// 二选一。当天第一次免费,之后每次 0.5 积分。
Future<Map<String, dynamic>> pickOne(String optionA, String optionB) async {
final r = await _send('POST', '/api/user/pick',
body: {'optionA': optionA, 'optionB': optionB});
return r as Map<String, dynamic>;
}
}
/// 人机验证题
class CaptchaInfo {
const CaptchaInfo({required this.id, required this.question});
final String id;
final String question;
factory CaptchaInfo.fromJson(Map<String, dynamic> json) => CaptchaInfo(
id: json['id'] as String? ?? '',
question: json['question'] as String? ?? '',
);
} }
+103 -7
View File
@@ -1,7 +1,10 @@
import 'dart:async';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'api_client.dart'; import 'api_client.dart';
import 'i18n.dart'; import 'i18n.dart';
import 'theme.dart';
/// 外壳状态:后端客户端 + 设置 + 健康状态 + 更新状态条。 /// 外壳状态:后端客户端 + 设置 + 健康状态 + 更新状态条。
/// ///
@@ -23,31 +26,117 @@ class ShellController extends ChangeNotifier {
String updateDetail = ''; String updateDetail = '';
String launcherNotice = ''; String launcherNotice = '';
/// 模型库版本号:安装 / 删除 / 下载完成后自增,首页据此重新拉列表。
///
/// 首页被 `Offstage` 保活,切走再切回不会重建;没有这个信号时,
/// 下载完模型回到首页仍然显示旧的空列表。
int modelsRevision = 0;
Timer? _retryTimer;
int _retryAttempt = 0;
bool get backendReady => settings != null; bool get backendReady => settings != null;
Future<void> bootstrap() async { Future<void> bootstrap() async {
_retryTimer?.cancel();
HealthInfo? healthResult;
SettingsInfo? settingsResult;
Object? firstError;
// 两个请求互不依赖,并行发;各自捕获异常,避免一方失败时
// 另一个的 Future 抛成未处理异常(Flutter 会在控制台打出恶性警告)。
await Future.wait<void>(<Future<void>>[
() async {
try { try {
health = await api.health(); healthResult = await api.health();
settings = await api.settings();
loadError = null;
I18n.setLanguage(settings!.language);
} catch (error) { } catch (error) {
loadError = error.toString(); firstError ??= error;
} }
}(),
() async {
try {
settingsResult = await api.settings();
} catch (error) {
firstError ??= error;
}
}(),
]);
if (healthResult != null) health = healthResult;
if (settingsResult != null) {
settings = settingsResult;
_applySettings(settingsResult!);
// 主题色现在归用户账号所有(设置页不再提供),启动时按当前用户恢复
unawaited(_applyUserTheme());
}
if (firstError != null && settingsResult == null) {
loadError = firstError.toString();
_scheduleRetry();
} else {
loadError = null;
_retryAttempt = 0;
}
notifyListeners(); notifyListeners();
} }
/// 后端没起来时自动重试(1s、2s、4s、之后每次 8s,共 10 次 ≈ 70 秒),
/// 不必让用户手动点。重试前 rediscover() 重新解析地址与令牌。
void _scheduleRetry() {
if (_retryAttempt >= 10) return;
final seconds = 1 << _retryAttempt.clamp(0, 3); // 1,2,4,8,8,8…(封顶 8s)
_retryAttempt++;
_retryTimer?.cancel();
_retryTimer = Timer(Duration(seconds: seconds), () {
if (settings == null) {
// 后端可能刚换端口(端口占用)或刚写好握手文件:重试前重新解析一次
api.rediscover();
bootstrap();
}
});
}
void _applySettings(SettingsInfo value) {
I18n.setLanguage(value.language);
// 强调色不再来自设置:由用户账号的 theme_color 决定(见 _applyUserTheme)
GcPalette.applyTheme(value.theme);
}
/// 按当前登录用户的 theme_color 应用强调色;未登录时保持默认。
Future<void> applyUserTheme() => _applyUserTheme();
Future<void> _applyUserTheme() async {
try {
final resp = await api.me();
final hex = resp?['theme_color'] as String?;
if (hex != null && hex.isNotEmpty) GcPalette.apply('#$hex');
} catch (_) {
// 后端没起来或未登录:保持当前颜色即可
}
}
void goTo(int value) { void goTo(int value) {
if (index == value) return; if (index == value) return;
index = value; index = value;
notifyListeners(); notifyListeners();
} }
// 模型视图已回退为后端开 Avalonia 独立窗口(见 AvaloniaHost),
// Flutter 内嵌的 activeModelId / openModel / ModelViewPage 一套已移除。
/// 模型库有变化(安装 / 删除 / 下载完成):通知首页刷新。
void modelsChanged() {
modelsRevision++;
notifyListeners();
}
Future<void> reloadSettings() async { Future<void> reloadSettings() async {
try { try {
settings = await api.settings(); settings = await api.settings();
loadError = null; loadError = null;
I18n.setLanguage(settings!.language); _applySettings(settings!);
} catch (error) { } catch (error) {
loadError = error.toString(); loadError = error.toString();
} }
@@ -58,7 +147,7 @@ class ShellController extends ChangeNotifier {
try { try {
settings = await api.saveSettings(patch); settings = await api.saveSettings(patch);
loadError = null; loadError = null;
I18n.setLanguage(settings!.language); _applySettings(settings!);
} catch (error) { } catch (error) {
loadError = error.toString(); loadError = error.toString();
} }
@@ -103,6 +192,7 @@ class ShellController extends ChangeNotifier {
detail: result.error ?? '', detail: result.error ?? '',
notice: result.launcherMessage ?? '', notice: result.launcherMessage ?? '',
); );
if (result.updatedModels > 0) modelsChanged();
} catch (error) { } catch (error) {
setUpdateStatus( setUpdateStatus(
busy: false, busy: false,
@@ -111,4 +201,10 @@ class ShellController extends ChangeNotifier {
); );
} }
} }
@override
void dispose() {
_retryTimer?.cancel();
super.dispose();
}
} }
+158 -2
View File
@@ -13,9 +13,11 @@ class I18n {
'app.name': 'Morris GC', 'app.name': 'Morris GC',
'app.tagline': '天文教学模型 · 可视化启动器', 'app.tagline': '天文教学模型 · 可视化启动器',
'nav.home': '主页', 'nav.home': '主页',
'nav.courseware': '等高线课件',
'nav.download': '下载', 'nav.download': '下载',
'nav.settings': '设置', 'nav.settings': '设置',
'nav.about': '关于', 'nav.about': '关于',
'nav.user': '用户',
'home.title': '模型库', 'home.title': '模型库',
'home.subtitle': '选择模型,用可交互的三维演示讲清自转、公转与四季成因。', 'home.subtitle': '选择模型,用可交互的三维演示讲清自转、公转与四季成因。',
'home.launch': '启动模型', 'home.launch': '启动模型',
@@ -23,6 +25,7 @@ class I18n {
'home.settings': '设置', 'home.settings': '设置',
'home.installed': '已安装模型', 'home.installed': '已安装模型',
'home.count': '{0} 个模型', 'home.count': '{0} 个模型',
'home.noDescription': '暂无简介',
'home.empty': '模型库还是空的', 'home.empty': '模型库还是空的',
'home.emptyHint': '启动时会自动检查并下载模型。若当前断网:可把模型文件夹放进 .GC/model/ 后重新打开,或联网后在「下载」页点重试。', 'home.emptyHint': '启动时会自动检查并下载模型。若当前断网:可把模型文件夹放进 .GC/model/ 后重新打开,或联网后在「下载」页点重试。',
'home.emptyAction': '去下载模型', 'home.emptyAction': '去下载模型',
@@ -33,7 +36,11 @@ class I18n {
'home.stats.sources': '模型源', 'home.stats.sources': '模型源',
'home.stats.memory': '内存预算', 'home.stats.memory': '内存预算',
'home.recent': '选择模型后点击「启动模型」', 'home.recent': '选择模型后点击「启动模型」',
'home.launchHint': '模型在自己的窗口里运行,可播放/暂停、切换视角并使用教学要点。', 'home.noBuiltin': '「{0}」暂时没有内置渲染实现',
'model.back': '返回',
'model.missing': '这个模型还没有 Flutter 实现',
'model.missingHint': '模型窗口已全部改为应用内渲染,该模型暂未迁移。',
'home.launchHint': '模型直接在应用内运行,可播放/暂停、切换视角并使用教学要点。',
'dl.title': '下载模型', 'dl.title': '下载模型',
'dl.subtitle': '从内置模型源读取可下载模型;模型源在「设置」里查看。', 'dl.subtitle': '从内置模型源读取可下载模型;模型源在「设置」里查看。',
'dl.sources': '模型源', 'dl.sources': '模型源',
@@ -62,6 +69,12 @@ class I18n {
'set.title': '设置', 'set.title': '设置',
'set.subtitle': '模型源、启动时内存分配与本地存储。', 'set.subtitle': '模型源、启动时内存分配与本地存储。',
'set.general': '通用', 'set.general': '通用',
'set.appearance': '外观',
'set.theme': '主题模式',
'set.theme.desc': '深色、浅色,或跟随系统设置。',
'set.theme.dark': '深色',
'set.theme.light': '浅色',
'set.theme.system': '跟随系统',
'set.language': '界面语言', 'set.language': '界面语言',
'set.language.auto': '跟随系统', 'set.language.auto': '跟随系统',
'set.fps': '渲染帧率', 'set.fps': '渲染帧率',
@@ -117,22 +130,89 @@ class I18n {
'common.error': '出错了', 'common.error': '出错了',
'common.refresh': '刷新', 'common.refresh': '刷新',
'about.developers': '开发者', 'about.developers': '开发者',
'about.contributorsHint': '来自仓库提交记录',
'about.repository': '仓库', 'about.repository': '仓库',
'about.openRepository': '打开仓库', 'about.openRepository': '打开仓库',
'about.redownload': '重新下载启动器',
'about.redownloading': '正在下载并校验…',
'about.redownloadOk': '已下载 v{0},完整性校验通过(sha256 一致),重启后生效',
'about.redownloadFail': '重新下载失败',
'about.contributions': '{0} 次提交', 'about.contributions': '{0} 次提交',
'about.noContributors': '暂无贡献者信息', 'about.noContributors': '暂无贡献者信息',
'about.architecture': '架构', 'about.architecture': '架构',
'about.architectureValue': 'Flutter 前端 + .NET 后端(本地 HTTP)', 'about.architectureValue': 'Flutter 前端 + .NET 后端(本地 HTTP)',
'about.sourceLanguage': '源码语言', 'about.sourceLanguage': '源码语言',
'about.frontend': '前端', 'about.frontend': '前端',
'about.gitService': 'Git 服务',
'about.thanks': '感谢',
'about.thanksHint': '特别感谢以下朋友的支持',
'about.thanksGit': 'Git 服务与部署支持',
'about.thanksGeo': '地理学科内容指导',
'user.points': '积分',
'user.days': '连续签到',
'user.signin': '签到',
'user.login': '登录',
'user.register': '注册',
'user.pick': '二选一',
'user.themeColor': '主题颜色',
'user.username': '用户名',
'user.password': '密码',
'user.option1': '选项一',
'user.option2': '选项二',
'user.pickRandom': '随机选择',
'user.switchToRegister': '没有账号?去注册',
'user.switchToLogin': '已有账号?去登录',
'user.loginSuccess': '登录成功',
'user.registerSuccess': '注册成功',
'user.signinSuccess': '签到成功',
'user.alreadySigned': '今天已经签到过了',
'user.fillAll': '请填写用户名和密码',
'user.fillOptions': '请填写两个选项',
'user.loginFirst': '请先登录',
'user.notLoggedIn': '未登录',
'user.loginHint': '登录后可签到攒积分、解锁主题色',
'user.logout': '退出登录',
'user.logoutDone': '已退出登录',
'user.cycleDay': '第 {0} / {1} 天',
'user.signedToday': '今天已签到,明天再来',
'user.signedTodayShort': '已签到',
'user.nextReward': '现在签到可得 {0} 积分',
'user.refunded': '已退回',
'user.usernameRule': '1–20 个字符,不能有空格,不能与他人重复',
'user.captcha': '人机验证',
'user.captchaMissing': '请先获取人机验证题',
'user.captchaAnswer': '验证码答案',
'user.fillCaptcha': '请填写验证码答案',
'user.refreshCaptcha': '换一题',
'user.noRecharge': '积分只能通过每日签到获得,不提供任何充值渠道。',
'user.fortune': '人品值',
'user.fortuneDesc': '每天可以无限次计算,纯属娱乐,不影响积分。',
'user.fortuneIdle': '点一下,看看今天手气',
'user.fortuneRoll': '开始计算',
'user.fortuneAgain': '再算一次',
'user.pickDesc': '填两个选项,随机帮你选一个。',
'user.pickResult': '结果:',
'user.themeDesc': '默认蓝色免费;预置色 50 积分一个,自定义色 150 积分一个。',
'user.custom': '自定义',
'user.customColor': '自定义颜色',
'user.customColorCost': '自定义颜色需要 {0} 积分。',
'user.confirmBuy': '购买并应用',
'user.hexInvalid': '格式应为 #RRGGBB',
'user.free': '免费',
'user.themeUpdated': '主题色已更新',
'user.refundHint': '1 小时内换色可退 80%,当前可退(剩余 {0})',
'user.minutes': '分钟',
'user.seconds': '秒',
}, },
'en': <String, String>{ 'en': <String, String>{
'app.name': 'Morris GC', 'app.name': 'Morris GC',
'app.tagline': 'Astronomy teaching models · visual launcher', 'app.tagline': 'Astronomy teaching models · visual launcher',
'nav.home': 'Home', 'nav.home': 'Home',
'nav.courseware': 'Contour Course',
'nav.download': 'Download', 'nav.download': 'Download',
'nav.settings': 'Settings', 'nav.settings': 'Settings',
'nav.about': 'About', 'nav.about': 'About',
'nav.user': 'User',
'home.title': 'Model library', 'home.title': 'Model library',
'home.subtitle': 'Pick a model and explain rotation, revolution and the seasons with an interactive 3D scene.', 'home.subtitle': 'Pick a model and explain rotation, revolution and the seasons with an interactive 3D scene.',
'home.launch': 'Launch model', 'home.launch': 'Launch model',
@@ -140,6 +220,7 @@ class I18n {
'home.settings': 'Settings', 'home.settings': 'Settings',
'home.installed': 'Installed models', 'home.installed': 'Installed models',
'home.count': '{0} models', 'home.count': '{0} models',
'home.noDescription': 'No description',
'home.empty': 'No models yet', 'home.empty': 'No models yet',
'home.emptyHint': 'Models are checked and downloaded on startup. Offline: drop model folders into .GC/model/ and reopen, or retry from the Download page once online.', 'home.emptyHint': 'Models are checked and downloaded on startup. Offline: drop model folders into .GC/model/ and reopen, or retry from the Download page once online.',
'home.emptyAction': 'Get models', 'home.emptyAction': 'Get models',
@@ -150,7 +231,11 @@ class I18n {
'home.stats.sources': 'Sources', 'home.stats.sources': 'Sources',
'home.stats.memory': 'Memory budget', 'home.stats.memory': 'Memory budget',
'home.recent': 'Select a model, then press Launch', 'home.recent': 'Select a model, then press Launch',
'home.launchHint': 'Models open in their own window with play/pause, view controls and teaching notes.', 'home.noBuiltin': '"{0}" has no built-in renderer yet',
'model.back': 'Back',
'model.missing': 'No Flutter renderer for this model',
'model.missingHint': 'Model windows are rendered in-app now; this model has not been migrated yet.',
'home.launchHint': 'Models render inside the app with play/pause, view controls and teaching notes.',
'dl.title': 'Download', 'dl.title': 'Download',
'dl.subtitle': 'Read downloadable models from the built-in sources; manage sources in Settings.', 'dl.subtitle': 'Read downloadable models from the built-in sources; manage sources in Settings.',
'dl.sources': 'Sources', 'dl.sources': 'Sources',
@@ -179,6 +264,12 @@ class I18n {
'set.title': 'Settings', 'set.title': 'Settings',
'set.subtitle': 'Model sources, startup memory allocation and local storage.', 'set.subtitle': 'Model sources, startup memory allocation and local storage.',
'set.general': 'General', 'set.general': 'General',
'set.appearance': 'Appearance',
'set.theme': 'Theme mode',
'set.theme.desc': 'Dark, light, or follow the system setting.',
'set.theme.dark': 'Dark',
'set.theme.light': 'Light',
'set.theme.system': 'System',
'set.language': 'Language', 'set.language': 'Language',
'set.language.auto': 'System', 'set.language.auto': 'System',
'set.fps': 'Render frame rate', 'set.fps': 'Render frame rate',
@@ -234,14 +325,79 @@ class I18n {
'common.error': 'Something went wrong', 'common.error': 'Something went wrong',
'common.refresh': 'Refresh', 'common.refresh': 'Refresh',
'about.developers': 'Developers', 'about.developers': 'Developers',
'about.contributorsHint': 'From repository commits',
'about.repository': 'Repository', 'about.repository': 'Repository',
'about.openRepository': 'Open repository', 'about.openRepository': 'Open repository',
'about.redownload': 'Re-download launcher',
'about.redownloading': 'Downloading and verifying…',
'about.redownloadOk': 'Downloaded v{0}, integrity verified (sha256 matched); applies after restart',
'about.redownloadFail': 'Re-download failed',
'about.contributions': '{0} commits', 'about.contributions': '{0} commits',
'about.noContributors': 'No contributor information', 'about.noContributors': 'No contributor information',
'about.architecture': 'Architecture', 'about.architecture': 'Architecture',
'about.architectureValue': 'Flutter frontend + .NET backend (local HTTP)', 'about.architectureValue': 'Flutter frontend + .NET backend (local HTTP)',
'about.sourceLanguage': 'Source language', 'about.sourceLanguage': 'Source language',
'about.frontend': 'Frontend', 'about.frontend': 'Frontend',
'about.gitService': 'Git hosting',
'about.thanks': 'Thanks',
'about.thanksHint': 'Special thanks to',
'about.thanksGit': 'Git hosting and deployment',
'about.thanksGeo': 'Geography content guidance',
'user.points': 'Points',
'user.days': 'Streak',
'user.signin': 'Sign In',
'user.login': 'Login',
'user.register': 'Register',
'user.pick': 'Pick One',
'user.themeColor': 'Theme Color',
'user.username': 'Username',
'user.password': 'Password',
'user.option1': 'Option A',
'user.option2': 'Option B',
'user.pickRandom': 'Random',
'user.switchToRegister': 'No account? Register',
'user.switchToLogin': 'Have account? Login',
'user.loginSuccess': 'Login successful',
'user.registerSuccess': 'Registration successful',
'user.signinSuccess': 'Signed in',
'user.alreadySigned': 'Already signed in today',
'user.fillAll': 'Please fill in username and password',
'user.fillOptions': 'Please fill in both options',
'user.loginFirst': 'Please login first',
'user.notLoggedIn': 'Not signed in',
'user.loginHint': 'Sign in to earn points and unlock theme colors',
'user.logout': 'Sign out',
'user.logoutDone': 'Signed out',
'user.cycleDay': 'Day {0} / {1}',
'user.signedToday': 'Signed in today, come back tomorrow',
'user.signedTodayShort': 'Signed',
'user.nextReward': 'Sign in now for {0} points',
'user.refunded': 'refunded',
'user.usernameRule': '1–20 chars, no spaces, must be unique',
'user.captcha': 'Verification',
'user.captchaMissing': 'Please load the verification question first',
'user.captchaAnswer': 'Answer',
'user.fillCaptcha': 'Please answer the verification question',
'user.refreshCaptcha': 'New question',
'user.noRecharge': 'Points come from daily check-ins only. There is no way to buy points.',
'user.fortune': 'Luck Meter',
'user.fortuneDesc': 'Unlimited rolls per day. Just for fun — no points involved.',
'user.fortuneIdle': 'Tap to see how lucky you are today',
'user.fortuneRoll': 'Roll',
'user.fortuneAgain': 'Roll again',
'user.pickDesc': 'Two options, one random pick.',
'user.pickResult': 'Result:',
'user.themeDesc': 'Default blue is free; preset colors cost 50, custom colors 150.',
'user.custom': 'Custom',
'user.customColor': 'Custom color',
'user.customColorCost': 'A custom color costs {0} points.',
'user.confirmBuy': 'Buy & apply',
'user.hexInvalid': 'Format must be #RRGGBB',
'user.free': 'Free',
'user.themeUpdated': 'Theme color updated',
'user.refundHint': 'Change within 1 hour for a 80% refund (left {0})',
'user.minutes': 'min',
'user.seconds': 's',
}, },
}; };
+31 -2
View File
@@ -6,10 +6,13 @@ import 'shell.dart';
import 'theme.dart'; import 'theme.dart';
void main() { void main() {
// 桌面端无需异步初始化外部插件:尽早绑定并直接渲染首帧,
// 让窗口在引擎就绪后立刻出现,后端探测在外壳里异步进行。
WidgetsFlutterBinding.ensureInitialized();
runApp(const GcUiApp()); runApp(const GcUiApp());
} }
/// GC-UI 前端:Flutter 桌面应用(Windows / macOS)。 /// GC-UI 前端:Flutter 桌面应用(Windows / macOS / Linux)。
/// ///
/// 界面全部在这里;模型扫描、下载、更新、设置、模型窗口宿主都在后端 /// 界面全部在这里;模型扫描、下载、更新、设置、模型窗口宿主都在后端
/// (GC-UI/backend/GC.UI.Server,本地 HTTP 服务)。 /// (GC-UI/backend/GC.UI.Server,本地 HTTP 服务)。
@@ -25,16 +28,42 @@ class _GcUiAppState extends State<GcUiApp> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// 语言、强调色、主题模式都会触发重建:只重建 MaterialApp 的主题层,
// 不触碰页面状态(页面由 ShellPage 自己持有)。
return ValueListenableBuilder<String>( return ValueListenableBuilder<String>(
valueListenable: I18n.language, valueListenable: I18n.language,
builder: (context, language, _) { builder: (context, language, _) {
return ValueListenableBuilder<Color>(
valueListenable: GcPalette.accent,
builder: (context, accent, _) {
return ValueListenableBuilder<ThemeMode>(
valueListenable: GcPalette.mode,
builder: (context, mode, _) {
return MaterialApp( return MaterialApp(
title: 'Morris GC', title: 'Morris GC',
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
theme: buildGcTheme(), // 桌面端不要移动端那套拉伸回弹和边缘光晕。
scrollBehavior: const GcScrollBehavior(),
theme: buildGcTheme(Brightness.light),
darkTheme: buildGcTheme(Brightness.dark),
themeMode: mode,
// GcColors 是静态取值,必须按当前实际亮度(含跟随系统)绑定,
// 再用 key 强制子树重建,否则切主题后颜色仍是上一套。
builder: (context, child) {
final brightness = Theme.of(context).brightness;
GcColors.bind(brightness);
return KeyedSubtree(
key: ValueKey<bool>(brightness == Brightness.dark),
child: child ?? const SizedBox.shrink(),
);
},
home: ShellPage(controller: _controller), home: ShellPage(controller: _controller),
); );
}, },
); );
},
);
},
);
} }
} }
+164
View File
@@ -0,0 +1,164 @@
/// 用户记录(对应后端 UserPayload)
class UserRecord {
const UserRecord({
required this.username,
required this.points,
required this.consecutiveDays,
required this.cycleDay,
required this.cycleDays,
required this.todaySigned,
required this.nextReward,
this.lastSignIn,
this.themeColor,
this.themePaid = 0,
this.refundSeconds = 0,
});
final String username;
/// 积分,精确到 0.01
final double points;
/// 连续签到天数(断签会重置)
final int consecutiveDays;
/// 当前处在 30 天周期的第几天(1–30)
final int cycleDay;
/// 周期长度,固定 30
final int cycleDays;
/// 今天是否已签到
final bool todaySigned;
/// 下一次签到能拿多少分
final int nextReward;
final String? lastSignIn;
/// 形如 `4A90D9`(不带 #)
final String? themeColor;
/// 当前这个颜色实际花了多少分
final double themePaid;
/// 退款窗口剩余秒数(0 表示没有可退的)
final int refundSeconds;
factory UserRecord.fromJson(Map<String, dynamic> json) {
return UserRecord(
username: json['username'] as String? ?? '',
points: (json['points'] as num?)?.toDouble() ?? 0,
consecutiveDays: (json['consecutive_days'] as num?)?.toInt() ?? 0,
cycleDay: (json['cycle_day'] as num?)?.toInt() ?? 1,
cycleDays: (json['cycle_days'] as num?)?.toInt() ?? 30,
todaySigned: json['today_signed'] as bool? ?? false,
nextReward: (json['next_reward'] as num?)?.toInt() ?? 10,
lastSignIn: json['last_sign_in'] as String?,
themeColor: json['theme_color'] as String?,
themePaid: (json['theme_paid'] as num?)?.toDouble() ?? 0,
refundSeconds: (json['refund_seconds'] as num?)?.toInt() ?? 0,
);
}
}
/// 签到奖励:30 天一循环,第 7/14/21/28 天给周奖励,第 30 天给满月奖励。
/// 与后端 `UserService.GetSignInReward` 保持一致。
class SignInRewards {
static const int cycleDays = 30;
static int getReward(int day) {
var d = day;
if (d < 1) d = 1;
if (d > cycleDays) d = ((d - 1) % cycleDays) + 1;
switch (d) {
case 7:
return 30;
case 14:
return 40;
case 21:
return 50;
case 28:
return 60;
case 30:
return 100;
}
if (d <= 6) return 10;
if (d <= 13) return 15;
if (d <= 20) return 20;
if (d <= 27) return 25;
return 40;
}
}
/// 主题颜色:预置色 50 分一个,自定义色 150 分一个,默认蓝免费。
class ThemeColor {
const ThemeColor({required this.name, required this.hex, required this.cost});
final String name;
final String hex;
final int cost;
/// 默认色(免费)
static const String defaultHex = '4A90D9';
/// 预置色单价
static const int presetCost = 50;
/// 自定义色单价
static const int customCost = 150;
/// 购买后 1 小时内换色可退 80%
static const Duration refundWindow = Duration(hours: 1);
static const double refundRate = 0.8;
static const List<ThemeColor> predefined = <ThemeColor>[
ThemeColor(name: '蓝色', hex: defaultHex, cost: 0),
ThemeColor(name: '红色', hex: 'E74C3C', cost: presetCost),
ThemeColor(name: '绿色', hex: '27AE60', cost: presetCost),
ThemeColor(name: '紫色', hex: '9B59B6', cost: presetCost),
ThemeColor(name: '橙色', hex: 'F39C12', cost: presetCost),
ThemeColor(name: '青色', hex: '1ABC9C', cost: presetCost),
ThemeColor(name: '粉色', hex: 'E91E63', cost: presetCost),
ThemeColor(name: '深蓝', hex: '2C3E50', cost: presetCost),
];
/// 某个十六进制颜色的价格;默认蓝 0,预置色 50,其它 150。
static int costOf(String hex) {
final h = hex.replaceAll('#', '').toUpperCase();
if (h == defaultHex) return 0;
for (final c in predefined) {
if (c.hex.toUpperCase() == h) return presetCost;
}
return customCost;
}
}
/// 积分显示:整数不带小数位,小数保留到 0.01(去掉多余的 0)。
String formatPoints(double v) {
var s = v.toStringAsFixed(2);
if (s.endsWith('.00')) return s.substring(0, s.length - 3);
if (s.endsWith('0')) return s.substring(0, s.length - 1);
return s;
}
/// 人品值结果
class FortuneResult {
const FortuneResult(this.value, this.comment);
final int value;
final String comment;
/// 0–100,越高越「人品爆发」
static String commentFor(int value) {
if (value >= 96) return '欧皇附体,今天买彩票吧';
if (value >= 90) return '运气爆棚,适合干大事';
if (value >= 80) return '手气不错,稳';
if (value >= 65) return '中上水平,稍微努一下';
if (value >= 50) return '普普通通,够用';
if (value >= 35) return '有点背,低调点';
if (value >= 20) return '今天别赌任何东西';
if (value >= 8) return '极差,建议躺平';
return '非酋之王,明天再来';
}
}
File diff suppressed because it is too large. Load diff
+487
View File
@@ -0,0 +1,487 @@
import 'dart:async';
import 'package:flutter/material.dart';
import '../api_client.dart';
import '../controller.dart';
import '../i18n.dart';
import '../theme.dart';
// ---------------------------------------------------------------------------
// 关于页(从原 pages.dart 拆出,公开类名不变)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// 关于页
// ---------------------------------------------------------------------------
class AboutPageView extends StatefulWidget {
const AboutPageView({super.key, required this.controller, this.initialAbout});
final ShellController controller;
/// 预置数据(仅用于测试 / 截图,正常运行时为 null,由后端提供)。
final AboutInfo? initialAbout;
@override
State<AboutPageView> createState() => _AboutPageViewState();
}
class _AboutPageViewState extends State<AboutPageView> {
AboutInfo? _about;
bool _loading = true;
String? _error;
/// 重新下载启动器的进行状态与结果
bool _redownloading = false;
String? _redownloadMsg;
bool? _redownloadOk;
@override
void initState() {
super.initState();
final preset = widget.initialAbout;
if (preset != null) {
_about = preset;
_loading = false;
return;
}
_load();
}
Future<void> _load() async {
setState(() {
_loading = true;
_error = null;
});
try {
final about = await widget.controller.api.about();
if (!mounted) return;
setState(() {
_about = about;
_loading = false;
});
} catch (error) {
if (!mounted) return;
setState(() {
_error = error.toString();
_loading = false;
});
}
}
/// 重新下载启动器包:后端下完会用清单里的 sha256 逐块校验,
/// 校验不过会直接返回失败,不会留下半个坏包。
Future<void> _redownloadLauncher() async {
setState(() {
_redownloading = true;
_redownloadMsg = null;
_redownloadOk = null;
});
try {
final result = await widget.controller.api.redownloadLauncher();
if (!mounted) return;
setState(() {
_redownloading = false;
_redownloadOk = result.ok;
_redownloadMsg = result.ok
? T('about.redownloadOk', <Object?>[result.version])
: (result.message.isEmpty ? T('about.redownloadFail') : result.message);
});
} catch (error) {
if (!mounted) return;
setState(() {
_redownloading = false;
_redownloadOk = false;
_redownloadMsg = error.toString();
});
}
}
@override
Widget build(BuildContext context) {
return ListView(
padding: const EdgeInsets.fromLTRB(
GcSpace.xxl,
GcSpace.xxl,
GcSpace.xxl,
GcSpace.xxxl,
),
children: <Widget>[
GcPageHeader(
title: T('nav.about'),
subtitle: T('app.tagline'),
),
const SizedBox(height: GcSpace.xxl),
if (_loading)
const Padding(
padding: EdgeInsets.symmetric(vertical: 48),
child: Center(
child: SizedBox(
width: 22,
height: 22,
child: CircularProgressIndicator(strokeWidth: 2),
),
),
)
else if (_error != null)
GcMessage(
title: T('common.error'),
message: _error,
icon: Icons.error_outline_rounded,
color: GcColors.danger,
action: OutlinedButton(
onPressed: _load,
child: Text(T('common.retry')),
),
)
else ...<Widget>[
_versionCard(),
const SizedBox(height: GcSpace.lg),
_contributorsCard(),
const SizedBox(height: GcSpace.lg),
_thanksCard(),
],
],
);
}
Widget _versionCard() {
final about = _about;
// 左边身份卡、右边信息表:宽屏两栏,窄屏自动堆叠。
final identity = Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Row(
children: <Widget>[
Container(
width: 44,
height: 44,
alignment: Alignment.center,
decoration: BoxDecoration(
color: GcColors.accentSoft,
borderRadius: BorderRadius.circular(GcRadius.card),
),
child: Text(
'◎',
style: TextStyle(
fontSize: 22, height: 1.1, color: GcColors.accent),
),
),
const SizedBox(width: GcSpace.lg),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(
about?.appName ?? 'Morris GC',
style: TextStyle(
fontSize: 20,
height: 1.3,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
const SizedBox(height: 2),
Text(
T('app.tagline'),
style: TextStyle(
fontSize: 12.5,
height: 1.5,
color: GcColors.faint,
),
),
],
),
),
],
),
const SizedBox(height: GcSpace.lg),
Wrap(
spacing: GcSpace.sm,
runSpacing: GcSpace.sm,
children: <Widget>[
GcPill('v${about?.version ?? '—'}', color: GcColors.accent),
],
),
const SizedBox(height: GcSpace.lg),
Wrap(
spacing: GcSpace.sm,
runSpacing: GcSpace.sm,
children: <Widget>[
OutlinedButton(
onPressed: () async {
final url = about?.repository;
if (url == null || url.isEmpty) return;
try {
await widget.controller.api.openUrl(url);
} catch (_) {
// 忽略
}
},
child: Text(T('about.openRepository')),
),
OutlinedButton.icon(
onPressed: _redownloading ? null : _redownloadLauncher,
icon: _redownloading
? const SizedBox(
width: 14,
height: 14,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Icon(Icons.refresh_rounded, size: 16),
label: Text(
_redownloading
? T('about.redownloading')
: T('about.redownload'),
),
),
],
),
if (_redownloadMsg != null) ...<Widget>[
const SizedBox(height: GcSpace.md),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Icon(
_redownloadOk == true
? Icons.verified_rounded
: Icons.error_outline_rounded,
size: 16,
color: _redownloadOk == true ? GcColors.ok : GcColors.danger,
),
const SizedBox(width: GcSpace.xs + 2),
Expanded(
child: Text(
_redownloadMsg!,
style: TextStyle(
fontSize: 12,
height: 1.45,
color: _redownloadOk == true
? GcColors.muted
: GcColors.danger,
),
),
),
],
),
],
],
);
final details = Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
GcFieldRow(
label: T('set.platform'),
value: about?.platform ?? '—',
),
GcFieldRow(
label: T('about.architecture'),
value: T('about.architectureValue'),
),
GcFieldRow(
label: T('about.sourceLanguage'),
value: about?.sourceLanguage ?? 'C#',
),
GcFieldRow(
label: T('about.frontend'),
value: about?.frontend ?? 'Flutter',
),
GcFieldRow(
label: T('about.gitService'),
value: 'itxiaohui',
),
GcFieldRow(
label: T('set.license'),
value: T('set.licenseValue'),
),
],
);
return GcCard(
padding: const EdgeInsets.all(GcSpace.xxl),
child: LayoutBuilder(
builder: (context, constraints) {
if (constraints.maxWidth < 720) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
identity,
const GcDivider(verticalPadding: GcSpace.lg),
details,
],
);
}
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Expanded(flex: 4, child: identity),
const SizedBox(width: GcSpace.xxxl),
Expanded(flex: 5, child: details),
],
);
},
),
);
}
Widget _contributorsCard() {
final contributors = _about?.contributors ?? const <ContributorInfo>[];
return GcCard(
padding: const EdgeInsets.all(GcSpace.xxl),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(
T('about.developers'),
subtitle: T('about.contributorsHint'),
),
const SizedBox(height: GcSpace.lg),
if (contributors.isEmpty)
GcHint(T('about.noContributors'))
else
Wrap(
spacing: GcSpace.xl,
runSpacing: GcSpace.md,
children: <Widget>[
for (final contributor in contributors)
SizedBox(
width: 220,
child: Row(
children: <Widget>[
CircleAvatar(
radius: 18,
backgroundColor: GcColors.surfaceAlt,
backgroundImage: contributor.avatarUrl == null
? null
: NetworkImage(contributor.avatarUrl!),
child: contributor.avatarUrl == null
? Text(
'◎',
style: TextStyle(
fontSize: 14,
color: GcColors.accent,
),
)
: null,
),
const SizedBox(width: GcSpace.md),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(
contributor.name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 13,
height: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
Text(
T(
'about.contributions',
<Object?>[contributor.contributions],
),
style: TextStyle(
fontSize: 11.5,
height: 1.4,
color: GcColors.faint,
),
),
],
),
),
],
),
),
],
),
],
),
);
}
/// 特别感谢:与「开发者」分开列 —— 提供 Git 服务不等于往仓库提交代码,
/// 混进贡献者列表会让提交数失去意义。
Widget _thanksCard() {
return GcCard(
padding: const EdgeInsets.all(GcSpace.xxl),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(
T('about.thanks'),
subtitle: T('about.thanksHint'),
),
const SizedBox(height: GcSpace.lg),
Wrap(
spacing: GcSpace.xl,
runSpacing: GcSpace.md,
children: <Widget>[
_creditTile('地理洪老师', 'about.thanksGeo'),
_creditTile('itxiaohui', 'about.thanksGit'),
],
),
],
),
);
}
Widget _creditTile(String name, String roleKey) {
return SizedBox(
width: 220,
child: Row(
children: <Widget>[
CircleAvatar(
radius: 18,
backgroundColor: GcColors.surfaceAlt,
child: Text(
'◎',
style: TextStyle(fontSize: 14, color: GcColors.accent),
),
),
const SizedBox(width: GcSpace.md),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(
name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 13,
height: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
Text(
T(roleKey),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 11.5,
height: 1.4,
color: GcColors.faint,
),
),
],
),
),
],
),
);
}
}
+294
View File
@@ -0,0 +1,294 @@
import 'dart:async';
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
import '../theme.dart';
/// 等高线课件页:用 WebView 承载去除授权验证后的离线 HTML 课件。
///
/// 资源(index.html + assets/)作为 Flutter assets 打包。桌面 WebView 不能直接
/// 读 flutter assets,因此用一个仅监听 127.0.0.1 的静态服务器(端口 0 自动分配,
/// 不与后端/其他进程冲突)把 assets 暴露成 http://127.0.0.1:<port>/ 再交给
/// WebView 加载。图片、视频、Three.js 与全部交互都保持原课件原样。
class CoursewarePage extends StatefulWidget {
const CoursewarePage({super.key});
@override
State<CoursewarePage> createState() => _CoursewarePageState();
}
class _CoursewarePageState extends State<CoursewarePage>
with AutomaticKeepAliveClientMixin {
@override
bool get wantKeepAlive => true;
HttpServer? _server;
int? _port;
InAppWebViewController? _controller;
double _progress = 0;
String? _error;
Directory? _extractDir;
/// 打包后的 app 工作目录不固定,不能直接用相对路径读 flutter assets。
/// 首次进入时把课件资源解压到临时目录,服务器再从这里提供文件。
Future<Directory> _extractAssets() async {
final dir = await Directory.systemTemp.createTemp('gc-courseware-');
final manifest = await AssetManifest.loadFromAssetBundle(rootBundle);
const prefix = 'courseware/';
for (final key in manifest.listAssets()) {
if (!key.startsWith(prefix)) continue;
final rel = key.substring(prefix.length);
if (rel.isEmpty) continue;
final data = await rootBundle.load(key);
final out = File('${dir.path}/$rel');
await out.parent.create(recursive: true);
await out.writeAsBytes(data.buffer.asUint8List(
data.offsetInBytes, data.lengthInBytes));
}
return dir;
}
@override
void initState() {
super.initState();
_start();
}
Future<void> _start() async {
try {
_extractDir = await _extractAssets();
final server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0);
_server = server;
_port = server.port;
server.listen(_handleRequest);
if (mounted) setState(() {});
} catch (e) {
if (mounted) setState(() => _error = e.toString());
}
}
/// 只服务课件目录内的文件,路径做规范化防止越界。
Future<void> _handleRequest(HttpRequest req) async {
var path = Uri.decodeFull(req.uri.path);
if (path == '/' || path.isEmpty) path = '/index.html';
// 去掉开头斜杠,拼到资源根目录
final rel = path.replaceFirst(RegExp(r'^/+'), '');
final normalized = _normalize(rel);
final file = File('${_extractDir?.path ?? "."}/$normalized');
try {
if (!await file.exists()) {
req.response.statusCode = HttpStatus.notFound;
req.response.write('404 $rel');
await req.response.close();
return;
}
final length = await file.length();
// _mimeOf 返回完整 MIME(含主/子类型);charset 由 HTML 的 meta 声明。
req.response.headers.contentType = ContentType.parse(_mimeOf(rel));
req.response.headers.set('Accept-Ranges', 'bytes');
// 视频拖动依赖 HTTP Range;解析 "bytes=start-end" 返回 206。
final range = req.headers.value('range');
if (range != null && range.startsWith('bytes=')) {
final span = range.substring(6).split('-');
var start = int.tryParse(span.first) ?? 0;
var end = span.length > 1 ? int.tryParse(span.last) : null;
if (start < 0) start = 0;
if (start >= length) {
req.response.statusCode = HttpStatus.requestedRangeNotSatisfiable;
req.response.headers.set('Content-Range', 'bytes */$length');
await req.response.close();
return;
}
end ??= length - 1;
if (end >= length) end = length - 1;
if (end < start) end = start;
req.response.statusCode = HttpStatus.partialContent;
req.response.headers.set('Content-Range', 'bytes $start-$end/$length');
req.response.headers.set('Content-Length', '${end - start + 1}');
await req.response.addStream(
file.openRead(start, end + 1).cast<List<int>>());
await req.response.close();
return;
}
req.response.headers.set('Content-Length', '$length');
await req.response.addStream(file.openRead().cast<List<int>>());
await req.response.close();
} catch (e) {
req.response.statusCode = HttpStatus.internalServerError;
await req.response.close();
}
}
/// 折叠 .. 与 .,防止 ../ 越界读取其他文件。
static String _normalize(String path) {
final parts = <String>[];
for (final seg in path.split('/')) {
if (seg.isEmpty || seg == '.') continue;
if (seg == '..') {
if (parts.isNotEmpty) parts.removeLast();
continue;
}
parts.add(seg);
}
return parts.join('/');
}
static String _mimeOf(String path) {
final ext = path.split('.').last.toLowerCase();
switch (ext) {
case 'html':
case 'htm':
return 'text/html';
case 'css':
return 'text/css';
case 'js':
return 'text/javascript';
case 'json':
return 'application/json';
case 'png':
return 'image/png';
case 'jpg':
case 'jpeg':
return 'image/jpeg';
case 'gif':
return 'image/gif';
case 'svg':
return 'image/svg+xml';
case 'mp4':
return 'video/mp4';
case 'webm':
return 'video/webm';
case 'ico':
return 'image/x-icon';
default:
return 'application/octet-stream';
}
}
Future<void> _reload() async {
if (_port == null) return;
await _controller?.loadUrl(
urlRequest: URLRequest(
url: WebUri('http://127.0.0.1:$_port/index.html'),
),
);
}
@override
void dispose() {
unawaited(() async {
await _server?.close();
try {
await _extractDir?.delete(recursive: true);
} catch (_) {
// 临时目录清理失败无需影响页面销毁。
}
}());
super.dispose();
}
@override
Widget build(BuildContext context) {
super.build(context);
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
_toolbar(),
Expanded(child: _body()),
],
);
}
Widget _toolbar() {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
decoration: BoxDecoration(
color: GcColors.surface,
border: Border(bottom: BorderSide(color: GcColors.line)),
),
child: Row(
children: <Widget>[
const Icon(Icons.terrain_rounded, size: 20),
const SizedBox(width: 10),
const Text(
'等高线地形 · 五大典型地貌判读',
style: TextStyle(fontSize: 15, fontWeight: FontWeight.w600),
),
const Spacer(),
IconButton(
tooltip: '刷新',
icon: const Icon(Icons.refresh_rounded, size: 18),
onPressed: _reload,
),
IconButton(
tooltip: '全屏',
icon: const Icon(Icons.fullscreen_rounded, size: 18),
onPressed: () => _controller?.evaluateJavascript(
source: 'document.documentElement.requestFullscreen?.();',
),
),
],
),
);
}
Widget _body() {
if (_error != null) {
return Center(child: Text('课件加载失败:$_error'));
}
if (_port == null) {
return const Center(child: CircularProgressIndicator(strokeWidth: 2));
}
return _webview();
}
Widget _webview() {
return Stack(
children: <Widget>[
InAppWebView(
initialUrlRequest: URLRequest(
url: WebUri('http://127.0.0.1:$_port/index.html'),
),
initialSettings: InAppWebViewSettings(
javaScriptEnabled: true,
mediaPlaybackRequiresUserGesture: false,
allowsInlineMediaPlayback: true,
supportZoom: false,
clearCache: false,
// 本地可信内容,允许混合加载。
mixedContentMode: MixedContentMode.MIXED_CONTENT_ALWAYS_ALLOW,
),
onWebViewCreated: (controller) => _controller = controller,
onProgressChanged: (_, progress) {
if (mounted && progress < 100) {
setState(() => _progress = progress / 100);
}
},
onLoadStop: (_, __) {
if (mounted) setState(() => _progress = 1);
},
onReceivedError: (_, request, error) {
if (mounted) {
setState(() => _error = '${error.type} ${error.description}');
}
},
),
if (_progress < 1)
Positioned(
top: 0,
left: 0,
right: 0,
child: SizedBox(
height: 2,
child: LinearProgressIndicator(value: _progress),
),
),
],
);
}
}
+676
View File
@@ -0,0 +1,676 @@
import 'dart:async';
import 'package:flutter/material.dart';
import '../api_client.dart';
import '../controller.dart';
import '../i18n.dart';
import '../theme.dart';
// ---------------------------------------------------------------------------
// 下载页(从原 pages.dart 拆出,公开类名不变)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// 下载页
// ---------------------------------------------------------------------------
class DownloadPageView extends StatefulWidget {
const DownloadPageView({
super.key,
required this.controller,
this.initialSources,
this.initialIndex,
this.initialJobs,
});
final ShellController controller;
/// 预置数据(仅用于测试 / 截图,正常运行时为 null,由后端提供)。
final List<SourceInfo>? initialSources;
final SourceIndexInfo? initialIndex;
final List<JobInfo>? initialJobs;
@override
State<DownloadPageView> createState() => _DownloadPageViewState();
}
class _DownloadPageViewState extends State<DownloadPageView> {
List<SourceInfo> _sources = const <SourceInfo>[];
SourceIndexInfo? _index;
List<JobInfo> _jobs = const <JobInfo>[];
String? _selectedSourceId;
bool _loading = true;
String? _error;
Timer? _poll;
/// 页面是否可见(被切走后仍保活,但没必要继续请求后端)。
bool _visible = true;
/// 上一次轮询时是否有活跃任务,用来判断「刚刚全部结束」。
bool _hadActive = false;
@override
void initState() {
super.initState();
final presetSources = widget.initialSources;
if (presetSources != null) {
_sources = presetSources;
_index = widget.initialIndex;
_jobs = widget.initialJobs ?? const <JobInfo>[];
_selectedSourceId = presetSources.isEmpty ? null : presetSources.first.id;
_loading = false;
return;
}
_load();
_schedulePoll(const Duration(seconds: 2));
}
@override
void didChangeDependencies() {
super.didChangeDependencies();
// TickerMode 由外壳的 Offstage 控制:切到别的页时变 false。
_visible = TickerMode.of(context);
}
@override
void dispose() {
_poll?.cancel();
super.dispose();
}
/// 单次 Timer 链:有活跃任务时 1 秒一次,空闲时降到 5 秒,不可见时 10 秒。
///
/// 以前是 `Timer.periodic(1s)` 且永不停止 —— 只要进过下载页,之后每秒都
/// 在请求 `/api/download/jobs`,哪怕没有任何任务、页面也早就切走了。
void _schedulePoll(Duration delay) {
_poll?.cancel();
_poll = Timer(delay, _pollOnce);
}
Future<void> _pollOnce() async {
if (!mounted) return;
if (!_visible) {
_schedulePoll(const Duration(seconds: 10));
return;
}
_hadActive = _jobs.any((job) => job.isActive);
await _refreshJobs();
if (!mounted) return;
final active = _jobs.any((job) => job.isActive);
// 活跃 → 空闲:这一轮里下载结束了,首页的模型列表已经过期。
if (_hadActive && !active) widget.controller.modelsChanged();
_hadActive = active;
_schedulePoll(Duration(seconds: active ? 1 : 5));
}
Future<void> _load() async {
setState(() {
_loading = true;
_error = null;
});
try {
// 三个请求互不依赖,一起发出去:
// 源列表(本地,几乎即时)、任务列表、模型索引(要打远端,最慢)
// 以前是 sources → models → jobs 串行等三轮,进页面白等多一秒。
final sourcesFuture = widget.controller.api.sources();
final jobsFuture = widget.controller.api.jobs();
final indexFuture = widget.controller.api.remoteModels(
sourceId: _selectedSourceId,
);
final sources = await sourcesFuture;
final preferred = sources.where((s) => s.enabled).toList();
final selected = _selectedSourceId ??
(preferred.isNotEmpty
? preferred.first.id
: (sources.isNotEmpty ? sources.first.id : ''));
// 源列表是本地的,先画出来:右侧模型列表还在等远端索引,左侧不必陪着转圈
if (mounted) {
setState(() {
_sources = sources;
_selectedSourceId = selected;
});
}
final index = await indexFuture;
final jobs = await jobsFuture;
if (!mounted) return;
setState(() {
_sources = sources;
_selectedSourceId = selected;
_index = index;
_jobs = jobs;
_loading = false;
});
} catch (error) {
if (!mounted) return;
setState(() {
_error = error.toString();
_loading = false;
});
}
}
Future<void> _refreshJobs() async {
try {
final jobs = await widget.controller.api.jobs();
if (!mounted) return;
setState(() => _jobs = jobs);
} catch (_) {
// 轮询失败不打扰用户,下一次再试
}
}
Future<void> _selectSource(String id) async {
setState(() {
_selectedSourceId = id;
_loading = true;
_error = null;
});
try {
final index = await widget.controller.api.remoteModels(sourceId: id);
if (!mounted) return;
setState(() {
_index = index;
_loading = false;
});
} catch (error) {
if (!mounted) return;
setState(() {
_error = error.toString();
_loading = false;
});
}
}
Future<void> _download(RemoteModelInfo model) async {
final sourceId = _selectedSourceId;
if (sourceId == null) return;
try {
await widget.controller.api.startDownload(sourceId, model.id);
await _refreshJobs();
} catch (error) {
if (!mounted) return;
setState(() => _error = error.toString());
}
}
Future<void> _jobAction(
Future<JobInfo> Function(String id) action, String id) async {
try {
await action(id);
await _refreshJobs();
} catch (error) {
if (!mounted) return;
setState(() => _error = error.toString());
}
}
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.fromLTRB(
GcSpace.xxl, GcSpace.xxl, GcSpace.xxl, GcSpace.xl),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
SizedBox(width: 268, child: _sourcePanel()),
const SizedBox(width: GcSpace.xl),
Expanded(child: _modelPanel()),
],
),
);
}
Widget _sourcePanel() {
return GcCard(
padding: const EdgeInsets.all(GcSpace.lg),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
GcSectionTitle(T('dl.sources')),
const SizedBox(height: GcSpace.xs + 2),
GcHint(T('dl.subtitle')),
const SizedBox(height: GcSpace.md),
for (final source in _sources)
Padding(
padding: const EdgeInsets.only(bottom: GcSpace.xs + 2),
child: _sourceTile(source),
),
const SizedBox(height: GcSpace.sm),
SizedBox(
width: double.infinity,
child: OutlinedButton.icon(
onPressed: _load,
icon: const Icon(Icons.refresh_rounded, size: 18),
label: Text(T('dl.refresh')),
),
),
],
),
);
}
Widget _sourceTile(SourceInfo source) {
final selected = source.id == _selectedSourceId;
return Material(
color: selected ? GcColors.accentSoft : Colors.transparent,
borderRadius: BorderRadius.circular(GcRadius.control),
child: InkWell(
borderRadius: BorderRadius.circular(GcRadius.control),
hoverColor: GcColors.surfaceAlt,
onTap: () => _selectSource(source.id),
child: Container(
padding: const EdgeInsets.symmetric(
horizontal: GcSpace.md,
vertical: GcSpace.md - 2,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(GcRadius.control),
border: Border.all(
color: selected
? GcColors.accent.withOpacity(0.45)
: Colors.transparent,
),
),
child: Row(
children: <Widget>[
Icon(
selected
? Icons.radio_button_checked_rounded
: Icons.radio_button_unchecked_rounded,
size: 16,
color: selected ? GcColors.accent : GcColors.ghost,
),
const SizedBox(width: GcSpace.sm + 2),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(
source.name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 13,
height: 1.35,
fontWeight: FontWeight.w600,
color: selected ? GcColors.accent : GcColors.ink,
),
),
const SizedBox(height: 1),
Text(
source.host,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 11.5,
height: 1.35,
color: GcColors.faint,
),
),
],
),
),
if (!source.enabled) const GcPill('off', subtle: true),
],
),
),
),
);
}
Widget _modelPanel() {
final models = _index?.models ?? const <RemoteModelInfo>[];
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcPageHeader(
title: T('dl.available'),
subtitle: _index == null
? null
: (_index!.fromCache
? '${T('dl.ready', <Object?>[
models.length
])} · ${T('dl.fromCache')}'
: T('dl.ready', <Object?>[models.length])),
trailing: IconButton(
tooltip: T('common.refresh'),
onPressed: _load,
icon: const Icon(Icons.refresh_rounded, size: 18),
),
),
const SizedBox(height: GcSpace.lg),
Expanded(
child: ListView(
padding: const EdgeInsets.only(bottom: GcSpace.sm),
children: <Widget>[
if (_loading)
const Padding(
padding: EdgeInsets.symmetric(vertical: 48),
child: Center(
child: SizedBox(
width: 22,
height: 22,
child: CircularProgressIndicator(strokeWidth: 2),
),
),
)
else if (_error != null)
GcMessage(
title: T('common.error'),
message: _error,
icon: Icons.cloud_off_rounded,
color: GcColors.danger,
action: OutlinedButton(
onPressed: _load,
child: Text(T('common.retry')),
),
)
else if (models.isEmpty)
GcMessage(
title: T('dl.empty'),
message: T('dl.emptyHint'),
icon: Icons.inbox_rounded,
)
else
for (final model in models)
Padding(
padding: const EdgeInsets.only(bottom: GcSpace.md),
child: _remoteRow(model),
),
const SizedBox(height: GcSpace.sm),
_jobsPanel(),
],
),
),
],
);
}
Widget _remoteRow(RemoteModelInfo model) {
return GcCard(
padding: const EdgeInsets.fromLTRB(
GcSpace.lg,
GcSpace.md + 2,
GcSpace.lg,
GcSpace.md + 2,
),
child: Row(
children: <Widget>[
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
children: <Widget>[
Flexible(
child: Text(
model.name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14,
height: 1.35,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
),
const SizedBox(width: GcSpace.sm),
Text(
'v${model.version} · ${model.sizeText}',
style: TextStyle(
fontSize: 12,
height: 1.35,
color: GcColors.faint,
),
),
if (model.installed) ...<Widget>[
const SizedBox(width: GcSpace.sm),
GcPill(T('dl.installed'), color: GcColors.ok),
],
],
),
const SizedBox(height: GcSpace.xs + 1),
Text(
model.description,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 12.5,
height: 1.5,
color: GcColors.muted,
),
),
],
),
),
const SizedBox(width: GcSpace.lg),
_downloadAction(model),
],
),
);
}
/// 该模型是否有进行中的下载任务。
JobInfo? _activeJobFor(String modelId) {
for (final job in _jobs) {
if (job.isActive && job.modelId == modelId) return job;
}
return null;
}
/// 按钮位:空闲时是「下载 / 重新下载」,下载中就变成这一行的进度条。
Widget _downloadAction(RemoteModelInfo model) {
final job = _activeJobFor(model.id);
if (job == null) {
if (model.installed) {
return OutlinedButton(
onPressed: () => _download(model),
child: Text(T('dl.reinstall')),
);
}
return FilledButton(
onPressed: () => _download(model),
child: Text(T('dl.download')),
);
}
final value = job.progress.clamp(0.0, 1.0).toDouble();
final percent = (value * 100).round();
final detail = job.detailText.isNotEmpty ? job.detailText : job.statusText;
return SizedBox(
width: 148,
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
Row(
children: <Widget>[
Text(
'$percent%',
style: TextStyle(
fontSize: 12.5,
height: 1.2,
fontWeight: FontWeight.w600,
color: GcColors.accent,
),
),
const SizedBox(width: GcSpace.xs + 2),
if (detail.isNotEmpty)
Expanded(
child: Text(
detail,
maxLines: 1,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.right,
style: TextStyle(
fontSize: 11,
height: 1.2,
color: GcColors.faint,
),
),
),
TextButton(
onPressed: () =>
_jobAction(widget.controller.api.cancelJob, job.id),
style: TextButton.styleFrom(
minimumSize: const Size(0, 22),
padding: const EdgeInsets.symmetric(horizontal: GcSpace.sm),
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
child: Text(
T('dl.cancel'),
style: const TextStyle(fontSize: 11.5),
),
),
],
),
const SizedBox(height: 3),
ClipRRect(
borderRadius: BorderRadius.circular(3),
child: LinearProgressIndicator(
// 还没拿到进度时走不确定态,避免显示 0% 让人以为卡住
value: value > 0 ? value : null,
minHeight: 6,
backgroundColor: GcColors.surfaceAlt,
),
),
],
),
);
}
Widget _jobsPanel() {
return GcCard(
padding: const EdgeInsets.all(GcSpace.lg),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(
T('dl.background'),
trailing: TextButton(
onPressed: () async {
try {
await widget.controller.api.clearFinished();
await _refreshJobs();
} catch (_) {
// 忽略
}
},
child: Text(T('dl.clearDone')),
),
),
const SizedBox(height: GcSpace.md),
if (_jobs.isEmpty)
GcHint(T('dl.bgEmpty'))
else
for (final job in _jobs)
Padding(
padding: const EdgeInsets.only(bottom: GcSpace.md),
child: _jobRow(job),
),
],
),
);
}
Widget _jobRow(JobInfo job) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
children: <Widget>[
Expanded(
child: Text(
'${job.name} v${job.version}',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 13,
height: 1.35,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
),
GcPill(
_stateLabel(job.state),
color: job.state == 'Failed'
? GcColors.danger
: job.state == 'Completed'
? GcColors.ok
: GcColors.accent,
),
const SizedBox(width: GcSpace.sm),
if (job.isActive)
TextButton(
onPressed: () =>
_jobAction(widget.controller.api.cancelJob, job.id),
child: Text(T('dl.cancel')),
)
else if (job.canRetry)
TextButton(
onPressed: () =>
_jobAction(widget.controller.api.retryJob, job.id),
child: Text(T('dl.retry')),
)
else
TextButton(
onPressed: () =>
_jobAction(widget.controller.api.removeJob, job.id),
child: Text(T('dl.removeTask')),
),
],
),
const SizedBox(height: GcSpace.sm - 2),
ClipRRect(
borderRadius: BorderRadius.circular(2),
child: LinearProgressIndicator(
value: job.progress.clamp(0, 1).toDouble(),
minHeight: 4,
backgroundColor: GcColors.surfaceAlt,
),
),
const SizedBox(height: GcSpace.xs + 1),
Text(
job.error ?? job.detailText,
style: TextStyle(
fontSize: 11.5,
height: 1.4,
color: GcColors.faint,
),
),
],
);
}
String _stateLabel(String state) {
switch (state) {
case 'Queued':
return T('dl.status.queued');
case 'Running':
case 'Downloading':
return T('dl.status.downloading');
case 'Completed':
return T('dl.status.done');
case 'Failed':
return T('dl.status.failed');
case 'Canceled':
return T('dl.status.canceled');
default:
return state;
}
}
}
+692
View File
@@ -0,0 +1,692 @@
import 'dart:async';
import 'package:flutter/material.dart';
import '../api_client.dart';
import '../controller.dart';
import '../i18n.dart';
import '../theme.dart';
// ---------------------------------------------------------------------------
// 首页:模型库(从原 pages.dart 拆出,公开类名不变)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// 首页:模型库
// ---------------------------------------------------------------------------
class HomePageView extends StatefulWidget {
const HomePageView({super.key, required this.controller, this.initialModels});
final ShellController controller;
/// 预置模型列表(仅用于测试 / 截图,正常运行时为 null,由后端提供)。
final List<ModelInfo>? initialModels;
@override
State<HomePageView> createState() => _HomePageViewState();
}
class _HomePageViewState extends State<HomePageView> {
List<ModelInfo> _models = const <ModelInfo>[];
bool _loading = true;
String? _error;
String? _notice;
int _lastRevision = 0;
@override
void initState() {
super.initState();
widget.controller.addListener(_onControllerChanged);
_lastRevision = widget.controller.modelsRevision;
final preset = widget.initialModels;
if (preset != null) {
_models = preset;
_loading = false;
} else {
_load();
}
}
@override
void dispose() {
widget.controller.removeListener(_onControllerChanged);
super.dispose();
}
/// 下载完成 / 删除模型后重新拉列表:页面被 Offstage 保活,不会自己重建。
void _onControllerChanged() {
if (!mounted) return;
final revision = widget.controller.modelsRevision;
if (revision == _lastRevision) return;
_lastRevision = revision;
if (widget.initialModels != null) return; // 截图 / 测试用的预置数据
_load();
}
Future<void> _load() async {
setState(() {
_loading = true;
_error = null;
});
try {
final models = await widget.controller.api.models();
if (!mounted) return;
setState(() {
_models = models;
_loading = false;
});
} catch (error) {
if (!mounted) return;
setState(() {
_error = error.toString();
_loading = false;
});
}
}
Future<void> _launch(ModelInfo model) async {
setState(() => _notice = null);
try {
// 模型窗口由后端用 Avalonia 打开(模型契约返回的是 Avalonia Control),
// 前端只负责发这条指令并显示结果。
final result = await widget.controller.api.launchModel(model.id);
if (!mounted) return;
setState(() => _notice = result.message);
} catch (error) {
if (!mounted) return;
setState(() => _notice = error.toString());
}
}
Future<void> _delete(ModelInfo model) async {
final confirmed = await showDialog<bool>(
context: context,
builder: (context) => AlertDialog(
backgroundColor: GcColors.surface,
title: Text(T('common.confirmTitle')),
content: Text(T('home.deleteConfirm', <Object?>[model.name])),
actions: <Widget>[
TextButton(
onPressed: () => Navigator.of(context).pop(false),
child: Text(T('common.cancel')),
),
FilledButton(
onPressed: () => Navigator.of(context).pop(true),
child: Text(T('common.delete')),
),
],
),
);
if (confirmed != true) return;
try {
await widget.controller.api.deleteModel(model.id);
await _load();
} catch (error) {
if (!mounted) return;
setState(() => _notice = error.toString());
}
}
Future<void> _openFolder(String path) async {
try {
await widget.controller.api.openFolder(path);
} catch (error) {
if (!mounted) return;
setState(() => _notice = error.toString());
}
}
@override
Widget build(BuildContext context) {
final settings = widget.controller.settings;
return RefreshIndicator(
onRefresh: _load,
color: GcColors.accent,
backgroundColor: GcColors.surface,
child: ListView(
physics: const AlwaysScrollableScrollPhysics(),
padding: const EdgeInsets.fromLTRB(
GcSpace.xxl, GcSpace.xxl, GcSpace.xxl, GcSpace.xxxl),
children: <Widget>[
_hero(settings),
const SizedBox(height: GcSpace.xxl),
_sectionHeader(),
if (_notice != null) ...<Widget>[
const SizedBox(height: GcSpace.md),
GcMessage(
title: _notice!,
icon: Icons.info_outline_rounded,
color: GcColors.warn,
),
],
const SizedBox(height: GcSpace.lg),
if (_loading)
const Padding(
padding: EdgeInsets.symmetric(vertical: 48),
child: Center(
child: SizedBox(
width: 22,
height: 22,
child: CircularProgressIndicator(strokeWidth: 2),
),
),
)
else if (_error != null)
GcMessage(
title: T('common.error'),
message: _error,
icon: Icons.cloud_off_rounded,
color: GcColors.danger,
action: OutlinedButton(
onPressed: _load,
child: Text(T('common.retry')),
),
)
else if (_models.isEmpty)
_emptyState()
else
LayoutBuilder(
builder: (context, constraints) {
const spacing = GcSpace.lg;
final columns =
(constraints.maxWidth / 320).floor().clamp(1, 4);
final cardWidth =
(constraints.maxWidth - spacing * (columns - 1)) / columns;
return Wrap(
spacing: spacing,
runSpacing: spacing,
children: <Widget>[
for (final model in _models)
SizedBox(
width: cardWidth,
child: _ModelCard(
model: model,
previewUrl: widget.controller.api.previewUrl(model),
onLaunch: () => _launch(model),
onOpenFolder: () => _openFolder(model.directory),
onDelete: () => _delete(model),
),
),
],
);
},
),
],
),
);
}
/// 顶部横幅:产品定位 + 主操作 + 关键指标。
///
/// 不用渐变:深色主题下的低对比渐变会让整块区域发灰,看起来就是「糊」。
Widget _hero(SettingsInfo? settings) {
final enabledSources =
settings?.sources.where((s) => s.enabled).length ?? 0;
return GcCard(
padding: const EdgeInsets.all(GcSpace.xxl + 2),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
'MODEL LIBRARY',
style: TextStyle(
fontSize: 11,
height: 1.2,
letterSpacing: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.accent,
),
),
const SizedBox(height: GcSpace.md),
Text(
T('home.title'),
style: TextStyle(
fontSize: 26,
height: 1.25,
fontWeight: FontWeight.w600,
letterSpacing: -0.2,
color: GcColors.ink,
),
),
const SizedBox(height: GcSpace.sm),
ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 460),
child: Text(
T('home.subtitle'),
style: TextStyle(
fontSize: 13,
height: 1.65,
color: GcColors.muted,
),
),
),
const SizedBox(height: GcSpace.xl),
Row(
children: <Widget>[
FilledButton.icon(
onPressed:
_models.isEmpty ? null : () => _launch(_models.first),
icon: const Icon(Icons.play_arrow_rounded, size: 18),
label: Text(T('home.launch')),
),
const SizedBox(width: GcSpace.md),
OutlinedButton(
onPressed: () => widget.controller.goTo(2),
child: Text(T('home.download')),
),
const SizedBox(width: GcSpace.xs),
TextButton(
onPressed: () => widget.controller.goTo(3),
child: Text(T('home.settings')),
),
],
),
const SizedBox(height: GcSpace.md),
Text(
T('home.launchHint'),
style: TextStyle(
fontSize: 12,
height: 1.55,
color: GcColors.faint,
),
),
],
),
),
const SizedBox(width: GcSpace.xxl),
Container(
padding: const EdgeInsets.symmetric(
horizontal: GcSpace.xl,
vertical: GcSpace.lg,
),
decoration: BoxDecoration(
color: GcColors.surfaceAlt,
borderRadius: BorderRadius.circular(GcRadius.control),
border: Border.all(color: GcColors.line),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
GcMetric(
value: '${_models.length}',
label: T('home.stats.models'),
),
_metricDivider(),
GcMetric(
value: '$enabledSources',
label: T('home.stats.sources'),
),
_metricDivider(),
GcMetric(
value: '${settings?.memoryBudgetMb ?? 0}',
label: T('home.stats.memory'),
),
],
),
),
],
),
);
}
Widget _metricDivider() {
return Container(
width: 1,
height: 34,
margin: const EdgeInsets.symmetric(horizontal: GcSpace.xl),
color: GcColors.line,
);
}
Widget _sectionHeader() {
return Row(
children: <Widget>[
Text(
T('home.installed'),
style: TextStyle(
fontSize: 16,
height: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
const SizedBox(width: GcSpace.sm),
GcPill(T('home.count', <Object?>[_models.length]), subtle: true),
const Spacer(),
IconButton(
tooltip: T('common.refresh'),
onPressed: _load,
icon: const Icon(Icons.refresh_rounded, size: 18),
),
],
);
}
Widget _emptyState() {
return GcCard(
padding: const EdgeInsets.symmetric(
horizontal: GcSpace.xxxl,
vertical: 40,
),
child: Column(
children: <Widget>[
Container(
width: 52,
height: 52,
alignment: Alignment.center,
decoration: BoxDecoration(
color: GcColors.accentSoft,
borderRadius: BorderRadius.circular(GcRadius.panel),
),
child: Icon(
Icons.travel_explore_rounded,
size: 26,
color: GcColors.accent,
),
),
const SizedBox(height: GcSpace.lg),
Text(
T('home.empty'),
style: TextStyle(
fontSize: 16,
height: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
const SizedBox(height: GcSpace.sm),
ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 420),
child: Text(
T('home.emptyHint'),
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 12.5,
height: 1.7,
color: GcColors.muted,
),
),
),
const SizedBox(height: GcSpace.xl),
FilledButton(
onPressed: () => widget.controller.goTo(2),
child: Text(T('home.emptyAction')),
),
],
),
);
}
}
class _ModelCard extends StatefulWidget {
const _ModelCard({
required this.model,
required this.previewUrl,
required this.onLaunch,
required this.onOpenFolder,
required this.onDelete,
});
final ModelInfo model;
final String previewUrl;
final VoidCallback onLaunch;
final VoidCallback onOpenFolder;
final VoidCallback onDelete;
@override
State<_ModelCard> createState() => _ModelCardState();
}
class _ModelCardState extends State<_ModelCard> {
bool _hover = false;
@override
Widget build(BuildContext context) {
final model = widget.model;
return MouseRegion(
onEnter: (_) => setState(() => _hover = true),
onExit: (_) => setState(() => _hover = false),
cursor: SystemMouseCursors.click,
child: GcCard(
padding: EdgeInsets.zero,
clip: true,
borderColor: _hover ? GcColors.lineStrong : GcColors.line,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
_cover(model),
Padding(
padding: const EdgeInsets.fromLTRB(
GcSpace.lg,
GcSpace.md + 2,
GcSpace.lg,
GcSpace.md,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
children: <Widget>[
Expanded(
child: Text(
model.name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14.5,
height: 1.35,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
),
const SizedBox(width: GcSpace.sm),
Text(
model.sizeText,
style: TextStyle(
fontSize: 12,
height: 1.35,
color: GcColors.faint,
),
),
],
),
const SizedBox(height: GcSpace.sm - 2),
SizedBox(
height: 36,
child: Text(
model.description.isEmpty
? T('home.noDescription')
: model.description,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 12.5,
height: 1.45,
color: model.description.isEmpty
? GcColors.faint
: GcColors.muted,
),
),
),
if (model.tags.isNotEmpty) ...<Widget>[
const SizedBox(height: GcSpace.sm + 2),
SizedBox(
height: 20,
child: Wrap(
spacing: 6,
runSpacing: 6,
children: <Widget>[
for (final tag in model.tags.take(3))
GcPill(tag, subtle: true),
],
),
),
],
const SizedBox(height: GcSpace.md + 2),
Row(
children: <Widget>[
FilledButton.icon(
onPressed: widget.onLaunch,
icon: const Icon(Icons.play_arrow_rounded, size: 18),
label: Text(T('home.launch')),
),
const Spacer(),
IconButton(
tooltip: T('home.open'),
onPressed: widget.onOpenFolder,
icon: const Icon(Icons.folder_open_rounded, size: 18),
),
IconButton(
tooltip: T('home.delete'),
onPressed: widget.onDelete,
icon:
const Icon(Icons.delete_outline_rounded, size: 18),
),
],
),
],
),
),
],
),
),
);
}
/// 封面:按卡片宽度和屏幕像素比解码,避免被放大后发虚。
Widget _cover(ModelInfo model) {
final dpr = MediaQuery.devicePixelRatioOf(context);
final decodeWidth =
(MediaQuery.sizeOf(context).width * dpr).clamp(320, 900).round();
return SizedBox(
height: 156,
width: double.infinity,
child: Stack(
fit: StackFit.expand,
children: <Widget>[
_PreviewFallback(model: model),
if (model.hasPreview)
Image.network(
widget.previewUrl,
fit: BoxFit.cover,
cacheWidth: decodeWidth,
filterQuality: FilterQuality.medium,
gaplessPlayback: true,
errorBuilder: (context, error, stack) => const SizedBox.shrink(),
),
DecoratedBox(
decoration: BoxDecoration(
// 只用「透明 → 深色」的遮罩,别用 alphaBlend:叠加不透明底色
// 会把整张封面盖平,占位字母也跟着消失。
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: <Color>[
GcColors.appBg.withOpacity(0.0),
GcColors.appBg.withOpacity(0.32),
GcColors.appBg.withOpacity(0.88),
],
stops: const <double>[0.42, 0.72, 1.0],
),
),
),
Positioned(
left: GcSpace.md,
right: GcSpace.sm,
bottom: GcSpace.sm,
child: Row(
children: <Widget>[
if (model.version.isNotEmpty)
GcPill('v${model.version}', color: GcColors.accent),
if (model.author.isNotEmpty) ...<Widget>[
const SizedBox(width: GcSpace.sm),
Flexible(
child: Text(
model.author,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 11.5,
height: 1.3,
color: GcColors.muted,
),
),
),
],
const Spacer(),
AnimatedOpacity(
opacity: _hover ? 1 : 0,
duration: const Duration(milliseconds: 140),
child: Container(
width: 26,
height: 26,
decoration: BoxDecoration(
color: GcColors.accentFill,
shape: BoxShape.circle,
),
child: Icon(
Icons.play_arrow_rounded,
size: 18,
color: GcColors.onAccent,
),
),
),
],
),
),
],
),
);
}
}
/// 没有封面时的占位:型号首字 + 淡淡的网格感,比一个大「◎」更像封面。
class _PreviewFallback extends StatelessWidget {
const _PreviewFallback({this.model});
final ModelInfo? model;
@override
Widget build(BuildContext context) {
final label = (model?.name ?? '').characters.isEmpty
? '◎'
: model!.name.characters.first;
return DecoratedBox(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: <Color>[
Color.alphaBlend(
GcColors.accent.withOpacity(0.22),
GcColors.surfaceAlt,
),
GcColors.surfaceAlt,
],
),
),
child: Center(
child: Text(
label,
style: TextStyle(
fontSize: 46,
height: 1.0,
fontWeight: FontWeight.w600,
color: Color.alphaBlend(
GcColors.accent.withOpacity(0.55),
GcColors.surfaceAlt,
),
),
),
),
);
}
}
+562
View File
@@ -0,0 +1,562 @@
import 'package:flutter/material.dart';
import '../api_client.dart';
import '../controller.dart';
import '../i18n.dart';
import '../theme.dart';
// ---------------------------------------------------------------------------
// 设置页(从原 pages.dart 拆出,公开类名不变)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// 设置页
// ---------------------------------------------------------------------------
class SettingsPageView extends StatefulWidget {
const SettingsPageView({super.key, required this.controller});
final ShellController controller;
@override
State<SettingsPageView> createState() => _SettingsPageViewState();
}
class _SettingsPageViewState extends State<SettingsPageView> {
double _memory = 2048;
bool _memoryAuto = true;
int _fps = 120;
bool _autoUpdate = true;
String _language = 'auto';
ThemeMode _themeMode = ThemeMode.dark;
/// 上一次同步所用的设置对象。以前用的是 `bool _synced` —— 只同步一次,
/// 之后外部(更新状态条、其它页面)改了设置,本页仍显示旧值。
SettingsInfo? _syncedFrom;
String? _status;
@override
void initState() {
super.initState();
widget.controller.reloadSettings();
}
void _syncFrom(SettingsInfo settings) {
if (identical(_syncedFrom, settings)) return;
_syncedFrom = settings;
_memory = settings.memoryMb.toDouble();
_memoryAuto = settings.memoryAuto;
_fps = settings.renderFps;
_autoUpdate = settings.autoUpdateOnStartup;
_language = settings.language;
_themeMode = GcPalette.parseMode(settings.theme);
}
@override
Widget build(BuildContext context) {
final settings = widget.controller.settings;
if (settings == null) {
return const Center(
child: SizedBox(
width: 22,
height: 22,
child: CircularProgressIndicator(strokeWidth: 2),
),
);
}
_syncFrom(settings);
return LayoutBuilder(
builder: (context, constraints) {
final twoColumns = constraints.maxWidth >= 960;
final cards = <Widget>[
_generalCard(settings),
_appearanceCard(settings),
_memoryCard(settings),
_sourcesCard(settings),
_storageCard(settings),
_updateCard(settings),
_backendCard(settings),
];
Widget column(List<Widget> items) => Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
for (var i = 0; i < items.length; i++) ...<Widget>[
if (i > 0) const SizedBox(height: GcSpace.lg),
items[i],
],
],
);
final left = <Widget>[];
final right = <Widget>[];
for (var i = 0; i < cards.length; i++) {
if (twoColumns && i.isOdd) {
right.add(cards[i]);
} else {
left.add(cards[i]);
}
}
return SingleChildScrollView(
padding: const EdgeInsets.fromLTRB(
GcSpace.xxl,
GcSpace.xxl,
GcSpace.xxl,
GcSpace.xxxl,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
GcPageHeader(
title: T('set.title'),
subtitle: T('set.subtitle'),
trailing: _status == null
? null
: GcPill(
_status!,
color: GcColors.ok,
icon: Icons.check_rounded,
),
),
const SizedBox(height: GcSpace.xxl),
if (twoColumns)
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Expanded(child: column(left)),
const SizedBox(width: GcSpace.lg),
Expanded(child: column(right)),
],
)
else
column(cards),
],
),
);
},
);
}
Widget _label(String text) {
return Text(
text,
style: TextStyle(fontSize: 13, height: 1.5, color: GcColors.muted),
);
}
Widget _cardRow(String label, Widget control) {
return Padding(
padding: const EdgeInsets.symmetric(vertical: GcSpace.sm),
child: Row(
children: <Widget>[
SizedBox(width: 124, child: _label(label)),
Expanded(child: control),
],
),
);
}
Widget _generalCard(SettingsInfo settings) {
return GcCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(T('set.general')),
const SizedBox(height: GcSpace.lg),
_cardRow(
T('set.language'),
Align(
alignment: Alignment.centerLeft,
child: DropdownButton<String>(
value: _language,
dropdownColor: GcColors.surfaceAlt,
underline: const SizedBox.shrink(),
borderRadius: BorderRadius.circular(GcRadius.control),
// 从主题样式派生,才能继承字体族(自建 TextStyle 会丢掉
// fontFamily,中文就回退成系统兜底字体)。
style: Theme.of(context).textTheme.bodyLarge!.copyWith(
fontSize: 13,
height: 1.4,
fontWeight: FontWeight.w400,
color: GcColors.ink,
),
items: <DropdownMenuItem<String>>[
DropdownMenuItem<String>(
value: 'auto',
child: Text(T('set.language.auto')),
),
for (final language in settings.languages)
DropdownMenuItem<String>(
value: language.code,
child: Text(language.label),
),
],
onChanged: (value) async {
if (value == null) return;
setState(() => _language = value);
await widget.controller
.saveSettings(SettingsPatch(language: value));
},
),
),
),
_cardRow(
T('set.fps'),
Row(
children: <Widget>[
Expanded(
child: Slider(
value: _fps.toDouble(),
min: 24,
max: 120,
divisions: 4,
label: '$_fps',
onChanged: (value) => setState(() => _fps = value.round()),
onChangeEnd: (value) async {
await widget.controller.saveSettings(
SettingsPatch(renderFps: value.round()));
if (mounted) {
setState(() => _status = T('common.applied'));
}
},
),
),
SizedBox(
width: 48,
child: Text(
'$_fps',
textAlign: TextAlign.end,
style: TextStyle(
fontSize: 13,
height: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
),
],
),
),
GcHint(T('set.fps.desc')),
],
),
);
}
Widget _appearanceCard(SettingsInfo settings) {
return GcCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(T('set.appearance')),
const SizedBox(height: GcSpace.md),
GcHint(T('set.theme.desc')),
const SizedBox(height: GcSpace.md),
SegmentedButton<ThemeMode>(
segments: <ButtonSegment<ThemeMode>>[
ButtonSegment<ThemeMode>(
value: ThemeMode.dark,
label: Text(T('set.theme.dark')),
icon: const Icon(Icons.dark_mode_outlined, size: 16),
),
ButtonSegment<ThemeMode>(
value: ThemeMode.light,
label: Text(T('set.theme.light')),
icon: const Icon(Icons.light_mode_outlined, size: 16),
),
ButtonSegment<ThemeMode>(
value: ThemeMode.system,
label: Text(T('set.theme.system')),
icon: const Icon(Icons.brightness_auto_outlined, size: 16),
),
],
selected: <ThemeMode>{_themeMode},
showSelectedIcon: false,
onSelectionChanged: (selection) async {
final mode = selection.first;
setState(() => _themeMode = mode);
GcPalette.mode.value = mode; // 立即预览
await widget.controller.saveSettings(
SettingsPatch(theme: GcPalette.modeToName(mode)));
if (mounted) setState(() => _status = T('common.applied'));
},
),
],
),
);
}
Widget _memoryCard(SettingsInfo settings) {
return GcCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(T('set.memory')),
const SizedBox(height: GcSpace.md),
GcHint(T('set.memory.desc')),
const SizedBox(height: GcSpace.lg),
Row(
children: <Widget>[
Switch(
value: _memoryAuto,
onChanged: (value) async {
setState(() => _memoryAuto = value);
await widget.controller
.saveSettings(SettingsPatch(memoryAuto: value));
},
),
const SizedBox(width: GcSpace.md),
Expanded(
child: Text(
T('set.memory.auto'),
style: TextStyle(
fontSize: 13,
height: 1.5,
color: GcColors.muted,
),
),
),
],
),
const SizedBox(height: GcSpace.xs),
Row(
children: <Widget>[
Expanded(
child: Slider(
value: _memory,
min: 512,
max: 16384,
divisions: 62,
label: '${_memory.round()} MB',
onChanged: _memoryAuto
? null
: (value) => setState(() => _memory = value),
onChangeEnd: (value) async {
await widget.controller
.saveSettings(SettingsPatch(memoryMb: value.round()));
if (mounted) setState(() => _status = T('common.applied'));
},
),
),
SizedBox(
width: 104,
child: Text(
'${_memory.round()} MB',
textAlign: TextAlign.end,
style: TextStyle(
fontSize: 13,
height: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
),
],
),
const SizedBox(height: GcSpace.xs),
GcHint('${T('set.memory.current')}: ${settings.memoryUsageText}'),
const SizedBox(height: GcSpace.xs),
GcHint(T('set.memory.hint')),
],
),
);
}
Widget _sourcesCard(SettingsInfo settings) {
return GcCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(T('set.sources')),
const SizedBox(height: GcSpace.md),
GcHint(T('set.sources.desc')),
const SizedBox(height: GcSpace.md),
for (final source in settings.sources)
Padding(
padding: const EdgeInsets.only(bottom: GcSpace.md),
child: Row(
children: <Widget>[
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(
source.name,
style: TextStyle(
fontSize: 13,
height: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
const SizedBox(height: 1),
Text(
source.url,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 11.5,
height: 1.4,
color: GcColors.faint,
),
),
],
),
),
const SizedBox(width: GcSpace.sm),
if (source.enabled)
GcPill(T('set.sourceEnabled'), color: GcColors.ok)
else
const GcPill('—', subtle: true),
],
),
),
],
),
);
}
Widget _storageCard(SettingsInfo settings) {
return GcCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(T('set.storage')),
const SizedBox(height: GcSpace.md),
GcFieldRow(
label: T('set.modelDir'),
value: settings.modelRoot,
selectable: true,
valueColor: GcColors.muted,
),
GcFieldRow(
label: T('set.dataDir'),
value: settings.dataRoot,
selectable: true,
valueColor: GcColors.muted,
),
const SizedBox(height: GcSpace.md),
Wrap(
spacing: GcSpace.sm + 2,
runSpacing: GcSpace.sm + 2,
children: <Widget>[
OutlinedButton(
onPressed: () async {
try {
await widget.controller.api.openFolder(settings.modelRoot);
} catch (error) {
if (mounted) setState(() => _status = error.toString());
}
},
child: Text(T('set.openFolder')),
),
OutlinedButton(
onPressed: () async {
await widget.controller.checkUpdate(force: true);
if (mounted) setState(() => _status = T('set.cacheCleared'));
},
child: Text(T('set.clearCache')),
),
],
),
],
),
);
}
Widget _updateCard(SettingsInfo settings) {
return GcCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(T('update.title')),
const SizedBox(height: GcSpace.md),
GcHint(T('set.checkUpdate.desc')),
const SizedBox(height: GcSpace.md),
Row(
children: <Widget>[
Switch(
value: _autoUpdate,
onChanged: (value) async {
setState(() => _autoUpdate = value);
await widget.controller
.saveSettings(SettingsPatch(autoUpdateOnStartup: value));
},
),
const SizedBox(width: GcSpace.md),
Expanded(
child: Text(
T('update.auto'),
style: TextStyle(
fontSize: 13,
height: 1.5,
color: GcColors.muted,
),
),
),
],
),
const SizedBox(height: GcSpace.sm),
GcFieldRow(
label: T('update.source'),
value: settings.updateRepository,
selectable: true,
valueColor: GcColors.muted,
),
const SizedBox(height: GcSpace.md),
FilledButton(
onPressed: () => widget.controller.checkUpdate(force: true),
child: Text(T('update.checkNow')),
),
],
),
);
}
Widget _backendCard(SettingsInfo settings) {
final health = widget.controller.health;
return GcCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(T('set.backend')),
const SizedBox(height: GcSpace.md),
GcHint(T('set.backend.desc')),
const SizedBox(height: GcSpace.md),
GcFieldRow(
label: 'API',
value: widget.controller.api.baseUrl,
selectable: true,
valueColor: GcColors.muted,
),
GcFieldRow(
label: T('set.version'),
value: settings.version,
valueColor: GcColors.muted,
),
GcFieldRow(
label: T('set.platform'),
value: settings.platform,
valueColor: GcColors.muted,
),
GcFieldRow(
label: T('set.backend.ui'),
value: health == null
? '—'
: health.uiAvailable
? T('set.backend.uiOk')
: '${T('set.backend.uiBad')}${health.uiError == null ? '' : ' · ${health.uiError}'}',
valueColor: health == null
? GcColors.muted
: health.uiAvailable
? GcColors.ok
: GcColors.danger,
),
],
),
);
}
}
+903
View File
@@ -0,0 +1,903 @@
import 'package:flutter/material.dart';
import '../controller.dart';
import '../api_client.dart';
import '../i18n.dart';
import '../theme.dart';
import '../models/user.dart';
/// 用户页面:账号(注册/登录/人机验证)、签到、人品值、二选一、主题色
class UserPage extends StatefulWidget {
const UserPage({super.key, required this.controller});
final ShellController controller;
@override
State<UserPage> createState() => _UserPageState();
}
class _UserPageState extends State<UserPage> {
UserRecord? _user;
bool _loading = true;
String? _error;
// 登录 / 注册
final _usernameCtrl = TextEditingController();
final _passwordCtrl = TextEditingController();
final _captchaCtrl = TextEditingController();
bool _isLogin = true;
CaptchaInfo? _captcha;
bool _captchaLoading = false;
bool _submitting = false;
// 人品值
FortuneResult? _fortune;
bool _rolling = false;
// 二选一
final _option1Ctrl = TextEditingController();
final _option2Ctrl = TextEditingController();
String? _randomResult;
@override
void initState() {
super.initState();
_loadUser();
}
@override
void dispose() {
_usernameCtrl.dispose();
_passwordCtrl.dispose();
_captchaCtrl.dispose();
_option1Ctrl.dispose();
_option2Ctrl.dispose();
super.dispose();
}
// ---------------------------------------------------------------- 账号
Future<void> _loadUser() async {
setState(() {
_loading = true;
_error = null;
});
try {
final resp = await widget.controller.api.me();
if (!mounted) return;
setState(() {
_user = resp == null ? null : UserRecord.fromJson(resp);
_loading = false;
});
_applyTheme();
} catch (e) {
if (!mounted) return;
setState(() {
_loading = false;
_error = e.toString();
});
}
}
/// 用户买的主题色覆盖全局强调色
void _applyTheme() {
final hex = _user?.themeColor;
if (hex == null || hex.isEmpty) return;
GcPalette.apply('#$hex');
}
Future<void> _refreshCaptcha() async {
setState(() => _captchaLoading = true);
try {
final c = await widget.controller.api.captcha();
if (!mounted) return;
setState(() {
_captcha = c;
_captchaLoading = false;
_captchaCtrl.clear();
});
} catch (e) {
if (!mounted) return;
setState(() => _captchaLoading = false);
_toast(e.toString());
}
}
Future<void> _submit() async {
final username = _usernameCtrl.text.trim();
final password = _passwordCtrl.text;
if (username.isEmpty || password.isEmpty) {
_toast(T('user.fillAll'));
return;
}
if (!_isLogin) {
if (_captcha == null) {
_toast(T('user.captchaMissing'));
return;
}
if (_captchaCtrl.text.trim().isEmpty) {
_toast(T('user.fillCaptcha'));
return;
}
}
setState(() => _submitting = true);
try {
if (_isLogin) {
await widget.controller.api.login(username, password);
} else {
await widget.controller.api.register(
username,
password,
captchaId: _captcha!.id,
captchaAnswer: _captchaCtrl.text.trim(),
);
await widget.controller.api.login(username, password);
}
final resp = await widget.controller.api.me();
if (!mounted) return;
setState(() {
_user = resp == null ? null : UserRecord.fromJson(resp);
_usernameCtrl.clear();
_passwordCtrl.clear();
_captchaCtrl.clear();
_captcha = null;
_submitting = false;
});
_applyTheme();
_toast(_isLogin ? T('user.loginSuccess') : T('user.registerSuccess'));
} catch (e) {
if (!mounted) return;
setState(() => _submitting = false);
// 注册失败时换一题:验证码是一次性的
if (!_isLogin) _refreshCaptcha();
_toast(e.toString());
}
}
Future<void> _logout() async {
await widget.controller.api.logout();
if (!mounted) return;
setState(() {
_user = null;
_fortune = null;
});
GcPalette.accent.value = GcPalette.defaultAccent;
_toast(T('user.logoutDone'));
}
Future<void> _signin() async {
try {
final resp = await widget.controller.api.signin();
if (!mounted) return;
if (resp['message'] == '今日已签到') {
_toast(T('user.alreadySigned'));
return;
}
final payload = resp['user'] as Map<String, dynamic>?;
final reward = (resp['reward'] as num?)?.toInt() ?? 0;
setState(() {
if (payload != null) _user = UserRecord.fromJson(payload);
});
_toast('${T('user.signinSuccess')} +$reward ${T('user.points')}');
} catch (e) {
if (!mounted) return;
_toast(e.toString());
}
}
// ---------------------------------------------------------------- 人品值
Future<void> _rollFortune() async {
if (_user == null) {
_toast(T('user.loginFirst'));
return;
}
setState(() => _rolling = true);
try {
// 服务端算随机数和价格:当天第一次免费,之后按当日次数阶梯计费
final resp = await widget.controller.api.rollFortune();
if (!mounted) return;
final value = (resp['value'] as num?)?.toInt() ?? 0;
final cost = (resp['cost'] as num?)?.toDouble() ?? 0;
setState(() {
_fortune = FortuneResult(value, resp['comment'] as String? ?? FortuneResult.commentFor(value));
final payload = resp['user'] as Map<String, dynamic>?;
if (payload != null) _user = UserRecord.fromJson(payload);
_rolling = false;
});
_toast(cost > 0 ? '本次消耗 ${formatPoints(cost)} 积分' : '今日首次免费');
} catch (e) {
if (!mounted) return;
setState(() => _rolling = false);
_toast(e.toString());
}
}
// ---------------------------------------------------------------- 二选一
Future<void> _pickRandom() async {
final a = _option1Ctrl.text.trim();
final b = _option2Ctrl.text.trim();
if (a.isEmpty || b.isEmpty) {
_toast(T('user.fillOptions'));
return;
}
if (_user == null) {
_toast(T('user.loginFirst'));
return;
}
try {
// 服务端随机 + 计费:当天第一次免费,之后每次 0.5 积分
final resp = await widget.controller.api.pickOne(a, b);
if (!mounted) return;
final cost = (resp['cost'] as num?)?.toDouble() ?? 0;
setState(() {
_randomResult = resp['choice'] as String?;
final payload = resp['user'] as Map<String, dynamic>?;
if (payload != null) _user = UserRecord.fromJson(payload);
});
_toast(cost > 0 ? '本次消耗 ${formatPoints(cost)} 积分' : '今日首次免费');
} catch (e) {
if (!mounted) return;
_toast(e.toString());
}
}
// ---------------------------------------------------------------- 主题色
Future<void> _changeTheme(String hex) async {
if (_user == null) {
_toast(T('user.loginFirst'));
return;
}
try {
final resp = await widget.controller.api.changeTheme(hex);
if (!mounted) return;
final payload = resp['user'] as Map<String, dynamic>?;
setState(() {
if (payload != null) _user = UserRecord.fromJson(payload);
});
_applyTheme();
final refunded = (resp['refunded'] as num?)?.toInt() ?? 0;
_toast(refunded > 0
? '${T('user.themeUpdated')},${T('user.refunded')} +$refunded'
: T('user.themeUpdated'));
} catch (e) {
if (!mounted) return;
_toast(e.toString());
}
}
Future<void> _pickCustomColor() async {
if (_user == null) {
_toast(T('user.loginFirst'));
return;
}
final controller = TextEditingController(text: '#7C6CFF');
final hex = await showDialog<String>(
context: context,
builder: (ctx) => StatefulBuilder(
builder: (ctx, setLocal) {
final raw = controller.text.replaceAll('#', '').trim();
final valid = raw.length == 6 && int.tryParse(raw, radix: 16) != null;
final preview = valid
? Color(0xFF000000 | int.parse(raw, radix: 16))
: GcColors.surface;
return AlertDialog(
title: Text(T('user.customColor')),
content: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
T('user.customColorCost', <Object?>['${ThemeColor.customCost}']),
style: TextStyle(color: GcColors.muted, fontSize: 13),
),
const SizedBox(height: GcSpace.md),
TextField(
controller: controller,
autofocus: true,
decoration: InputDecoration(
labelText: '#RRGGBB',
border: const OutlineInputBorder(),
errorText: valid || raw.isEmpty ? null : T('user.hexInvalid'),
),
onChanged: (_) => setLocal(() {}),
),
const SizedBox(height: GcSpace.md),
Row(
children: <Widget>[
Container(
width: 44,
height: 44,
decoration: BoxDecoration(
color: preview,
borderRadius: BorderRadius.circular(GcRadius.control),
border: Border.all(color: GcColors.line),
),
),
const SizedBox(width: GcSpace.md),
Expanded(
child: Text(
valid ? '#${raw.toUpperCase()}' : '—',
style: TextStyle(color: GcColors.muted),
),
),
],
),
],
),
actions: <Widget>[
TextButton(
onPressed: () => Navigator.of(ctx).pop(),
child: Text(T('common.cancel')),
),
FilledButton(
onPressed:
valid ? () => Navigator.of(ctx).pop(raw.toUpperCase()) : null,
child: Text(T('user.confirmBuy')),
),
],
);
},
),
);
controller.dispose();
if (hex != null) await _changeTheme(hex);
}
// ---------------------------------------------------------------- 工具
void _toast(String message) {
if (!mounted) return;
ScaffoldMessenger.of(context)
..hideCurrentSnackBar()
..showSnackBar(SnackBar(content: Text(message)));
}
String _formatRefund(int seconds) {
if (seconds >= 60) return '${seconds ~/ 60} ${T('user.minutes')}';
return '$seconds ${T('user.seconds')}';
}
// ---------------------------------------------------------------- UI
@override
Widget build(BuildContext context) {
if (_loading) {
return Scaffold(
backgroundColor: GcColors.appBg,
body: const Center(child: CircularProgressIndicator()),
);
}
return Scaffold(
backgroundColor: GcColors.appBg,
body: SingleChildScrollView(
padding: const EdgeInsets.all(GcSpace.xxl),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
_header(),
const SizedBox(height: GcSpace.lg),
if (_user == null) ...[
_authCard(),
const SizedBox(height: GcSpace.lg),
],
_fortuneCard(),
const SizedBox(height: GcSpace.lg),
_pickCard(),
const SizedBox(height: GcSpace.lg),
_themeCard(),
if (_error != null) ...[
const SizedBox(height: GcSpace.md),
Text(_error!, style: TextStyle(color: GcColors.danger)),
],
],
),
),
);
}
Widget _header() {
final user = _user;
return GcCard(
padding: const EdgeInsets.all(GcSpace.lg),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
children: <Widget>[
CircleAvatar(
radius: 22,
backgroundColor: GcColors.accentSoft,
child: Icon(Icons.person_rounded, color: GcColors.accent),
),
const SizedBox(width: GcSpace.md),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
user?.username ?? T('user.notLoggedIn'),
style: const TextStyle(
fontSize: 18, fontWeight: FontWeight.w700),
),
const SizedBox(height: 2),
Text(
user == null
? T('user.loginHint')
: '${T('user.points')} ${formatPoints(user.points)} · '
'${T('user.days')} ${user.consecutiveDays}',
style: TextStyle(color: GcColors.muted, fontSize: 13),
),
],
),
),
if (user != null)
OutlinedButton(
onPressed: _logout,
child: Text(T('user.logout')),
),
],
),
if (user != null) ...[
const SizedBox(height: GcSpace.lg),
Row(
children: <Widget>[
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
T('user.cycleDay',
<Object?>['${user.cycleDay}', '${user.cycleDays}']),
style: TextStyle(color: GcColors.muted, fontSize: 13),
),
const SizedBox(height: 6),
ClipRRect(
borderRadius: BorderRadius.circular(GcRadius.pill),
child: LinearProgressIndicator(
value: user.cycleDay / user.cycleDays,
minHeight: 6,
backgroundColor: GcColors.surfaceAlt,
),
),
const SizedBox(height: 6),
Text(
user.todaySigned
? T('user.signedToday')
: T('user.nextReward', <Object?>['${user.nextReward}']),
style: TextStyle(color: GcColors.faint, fontSize: 12),
),
],
),
),
const SizedBox(width: GcSpace.lg),
FilledButton(
onPressed: user.todaySigned ? null : _signin,
child: Text(user.todaySigned
? T('user.signedTodayShort')
: T('user.signin')),
),
],
),
],
],
),
);
}
Widget _authCard() {
return GcCard(
padding: const EdgeInsets.all(GcSpace.lg),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
children: <Widget>[
Text(
_isLogin ? T('user.login') : T('user.register'),
style:
const TextStyle(fontSize: 16, fontWeight: FontWeight.w600),
),
const Spacer(),
TextButton(
onPressed: () {
setState(() {
_isLogin = !_isLogin;
_captcha = null;
_captchaCtrl.clear();
});
if (!_isLogin) _refreshCaptcha();
},
child: Text(_isLogin
? T('user.switchToRegister')
: T('user.switchToLogin')),
),
],
),
const SizedBox(height: GcSpace.md),
TextField(
controller: _usernameCtrl,
decoration: InputDecoration(
labelText: T('user.username'),
helperText: _isLogin ? null : T('user.usernameRule'),
border: const OutlineInputBorder(),
),
),
const SizedBox(height: GcSpace.md),
TextField(
controller: _passwordCtrl,
obscureText: true,
decoration: InputDecoration(
labelText: T('user.password'),
border: const OutlineInputBorder(),
),
onSubmitted: (_) => _submit(),
),
// 注册才需要人机验证
if (!_isLogin) ...[
const SizedBox(height: GcSpace.lg),
Row(
children: <Widget>[
Expanded(
child: Container(
padding: const EdgeInsets.symmetric(
horizontal: GcSpace.md, vertical: GcSpace.md),
decoration: BoxDecoration(
color: GcColors.surfaceAlt,
borderRadius: BorderRadius.circular(GcRadius.control),
border: Border.all(color: GcColors.line),
),
child: Row(
children: <Widget>[
Icon(Icons.shield_outlined,
size: 18, color: GcColors.muted),
const SizedBox(width: GcSpace.sm),
Text(
_captchaLoading
? T('common.loading')
: (_captcha?.question ?? T('user.captcha')),
style: const TextStyle(
fontSize: 15,
fontWeight: FontWeight.w600,
letterSpacing: 1),
),
],
),
),
),
IconButton(
tooltip: T('user.refreshCaptcha'),
onPressed: _captchaLoading ? null : _refreshCaptcha,
icon: const Icon(Icons.refresh_rounded),
),
],
),
const SizedBox(height: GcSpace.md),
TextField(
controller: _captchaCtrl,
keyboardType: TextInputType.number,
decoration: InputDecoration(
labelText: T('user.captchaAnswer'),
border: const OutlineInputBorder(),
),
onSubmitted: (_) => _submit(),
),
],
const SizedBox(height: GcSpace.lg),
SizedBox(
height: GcSize.control,
child: FilledButton(
onPressed: _submitting ? null : _submit,
child: _submitting
? const SizedBox(
width: 18,
height: 18,
child: CircularProgressIndicator(strokeWidth: 2))
: Text(_isLogin ? T('user.login') : T('user.register')),
),
),
const SizedBox(height: GcSpace.sm),
Text(
T('user.noRecharge'),
style: TextStyle(color: GcColors.faint, fontSize: 12),
),
],
),
);
}
Widget _fortuneCard() {
return GcCard(
padding: const EdgeInsets.all(GcSpace.lg),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(T('user.fortune'),
style:
const TextStyle(fontSize: 16, fontWeight: FontWeight.w600)),
const SizedBox(height: 4),
Text(T('user.fortuneDesc'),
style: TextStyle(color: GcColors.muted, fontSize: 13)),
const SizedBox(height: GcSpace.lg),
Row(
children: <Widget>[
Container(
width: 96,
height: 96,
alignment: Alignment.center,
decoration: BoxDecoration(
color: GcColors.accentSoft,
shape: BoxShape.circle,
border: Border.all(color: GcColors.accent, width: 2),
),
child: Text(
_rolling ? '…' : (_fortune?.value.toString() ?? '?'),
style: const TextStyle(
fontSize: 34, fontWeight: FontWeight.w700, height: 1.0),
),
),
const SizedBox(width: GcSpace.lg),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
_fortune?.comment ?? T('user.fortuneIdle'),
style: const TextStyle(
fontSize: 14, fontWeight: FontWeight.w600),
),
const SizedBox(height: GcSpace.md),
FilledButton(
onPressed: _rolling ? null : _rollFortune,
child: Text(_fortune == null
? T('user.fortuneRoll')
: T('user.fortuneAgain')),
),
],
),
),
],
),
],
),
);
}
Widget _pickCard() {
return GcCard(
padding: const EdgeInsets.all(GcSpace.lg),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(T('user.pick'),
style:
const TextStyle(fontSize: 16, fontWeight: FontWeight.w600)),
const SizedBox(height: 4),
Text(T('user.pickDesc'),
style: TextStyle(color: GcColors.muted, fontSize: 13)),
const SizedBox(height: GcSpace.md),
Row(
children: <Widget>[
Expanded(
child: TextField(
controller: _option1Ctrl,
decoration: InputDecoration(
labelText: T('user.option1'),
border: const OutlineInputBorder(),
),
),
),
const SizedBox(width: GcSpace.md),
Expanded(
child: TextField(
controller: _option2Ctrl,
decoration: InputDecoration(
labelText: T('user.option2'),
border: const OutlineInputBorder(),
),
),
),
],
),
const SizedBox(height: GcSpace.md),
Row(
children: <Widget>[
FilledButton(
onPressed: _pickRandom,
child: Text(T('user.pickRandom')),
),
if (_randomResult != null) ...[
const SizedBox(width: GcSpace.lg),
Expanded(
child: Container(
padding: const EdgeInsets.symmetric(
horizontal: GcSpace.md, vertical: GcSpace.sm),
decoration: BoxDecoration(
color: GcColors.accentSoft,
borderRadius: BorderRadius.circular(GcRadius.control),
),
child: Text(
'${T('user.pickResult')} ${_randomResult!}',
style: const TextStyle(
fontSize: 15, fontWeight: FontWeight.w600),
),
),
),
],
],
),
],
),
);
}
Widget _themeCard() {
final user = _user;
final current = user?.themeColor?.toUpperCase();
final canRefund = (user?.refundSeconds ?? 0) > 0;
return GcCard(
padding: const EdgeInsets.all(GcSpace.lg),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(T('user.themeColor'),
style:
const TextStyle(fontSize: 16, fontWeight: FontWeight.w600)),
const SizedBox(height: 4),
Text(T('user.themeDesc'),
style: TextStyle(color: GcColors.muted, fontSize: 13)),
if (canRefund) ...[
const SizedBox(height: 6),
Text(
T('user.refundHint', <Object?>[_formatRefund(user!.refundSeconds)]),
style: TextStyle(color: GcColors.ok, fontSize: 12),
),
],
const SizedBox(height: GcSpace.lg),
Wrap(
spacing: GcSpace.md,
runSpacing: GcSpace.md,
children: <Widget>[
...ThemeColor.predefined.map((c) => _swatch(
name: c.name,
hex: c.hex,
cost: c.cost,
selected: current == c.hex.toUpperCase(),
)),
_customSwatch(
selected: current != null &&
ThemeColor.costOf(current) == ThemeColor.customCost,
),
],
),
],
),
);
}
Widget _swatch({
required String name,
required String hex,
required int cost,
required bool selected,
}) {
final points = _user?.points ?? 0;
final affordable = cost == 0 || points >= cost;
return InkWell(
onTap: () => _changeTheme(hex),
borderRadius: BorderRadius.circular(GcRadius.control),
child: Column(
children: <Widget>[
Stack(
children: <Widget>[
Container(
width: 56,
height: 56,
decoration: BoxDecoration(
color: Color(0xFF000000 | int.parse(hex, radix: 16)),
borderRadius: BorderRadius.circular(GcRadius.control),
border: Border.all(
color: selected ? GcColors.accent : GcColors.line,
width: selected ? 2.5 : 1,
),
),
),
if (selected)
const Positioned(
right: 3,
bottom: 3,
child: Icon(Icons.check_circle_rounded,
size: 16, color: Colors.white),
),
if (!affordable)
Positioned.fill(
child: Container(
decoration: BoxDecoration(
// ignore: deprecated_member_use
color: Colors.black.withOpacity(0.45),
borderRadius: BorderRadius.circular(GcRadius.control),
),
child: const Icon(Icons.lock_outline,
size: 18, color: Colors.white),
),
),
],
),
const SizedBox(height: 4),
Text(name, style: TextStyle(fontSize: 11, color: GcColors.muted)),
Text(
cost == 0 ? T('user.free') : '$cost',
style: TextStyle(
fontSize: 11,
color: affordable ? GcColors.faint : GcColors.danger,
),
),
],
),
);
}
Widget _customSwatch({required bool selected}) {
final canAfford = (_user?.points ?? 0) >= ThemeColor.customCost;
return InkWell(
onTap: _pickCustomColor,
borderRadius: BorderRadius.circular(GcRadius.control),
child: Column(
children: <Widget>[
Container(
width: 56,
height: 56,
decoration: BoxDecoration(
gradient: const SweepGradient(
colors: <Color>[
Color(0xFFFF7A7A),
Color(0xFFFFC46B),
Color(0xFF6BE3A2),
Color(0xFF4FD1C5),
Color(0xFF7C6CFF),
Color(0xFFFF8FB1),
Color(0xFFFF7A7A),
],
),
borderRadius: BorderRadius.circular(GcRadius.control),
border: Border.all(
color: selected ? GcColors.accent : GcColors.line,
width: selected ? 2.5 : 1,
),
),
child: Icon(Icons.colorize_rounded,
size: 20, color: canAfford ? Colors.white : Colors.white70),
),
const SizedBox(height: 4),
Text(T('user.custom'),
style: TextStyle(fontSize: 11, color: GcColors.muted)),
Text(
'${ThemeColor.customCost}',
style: TextStyle(
fontSize: 11,
color: canAfford ? GcColors.faint : GcColors.danger,
),
),
],
),
);
}
}
+226 -83
View File
@@ -4,6 +4,7 @@ import 'controller.dart';
import 'i18n.dart'; import 'i18n.dart';
import 'pages.dart'; import 'pages.dart';
import 'theme.dart'; import 'theme.dart';
import 'window_chrome.dart';
/// 侧边栏导航项。 /// 侧边栏导航项。
class _NavItem { class _NavItem {
@@ -14,12 +15,33 @@ class _NavItem {
} }
const List<_NavItem> _navItems = <_NavItem>[ const List<_NavItem> _navItems = <_NavItem>[
_NavItem(Icons.grid_view_rounded, 'nav.home'), _NavItem(Icons.dashboard_rounded, 'nav.home'),
_NavItem(Icons.terrain_rounded, 'nav.courseware'),
_NavItem(Icons.download_rounded, 'nav.download'), _NavItem(Icons.download_rounded, 'nav.download'),
_NavItem(Icons.tune_rounded, 'nav.settings'), _NavItem(Icons.tune_rounded, 'nav.settings'),
_NavItem(Icons.info_outline_rounded, 'nav.about'), _NavItem(Icons.info_outline_rounded, 'nav.about'),
_NavItem(Icons.person_rounded, 'nav.user'),
]; ];
/// 桌面端滚动行为:去掉移动端的拉伸回弹和边缘光晕,滚轮更跟手。
class GcScrollBehavior extends MaterialScrollBehavior {
const GcScrollBehavior();
@override
Widget buildOverscrollIndicator(
BuildContext context,
Widget child,
ScrollableDetails details,
) {
return child;
}
@override
ScrollPhysics getScrollPhysics(BuildContext context) {
return const ClampingScrollPhysics(parent: AlwaysScrollableScrollPhysics());
}
}
/// 应用外壳:左侧导航 + 右侧内容 + 底部更新状态条。 /// 应用外壳:左侧导航 + 右侧内容 + 底部更新状态条。
class ShellPage extends StatefulWidget { class ShellPage extends StatefulWidget {
const ShellPage({super.key, required this.controller}); const ShellPage({super.key, required this.controller});
@@ -31,6 +53,10 @@ class ShellPage extends StatefulWidget {
} }
class _ShellPageState extends State<ShellPage> { class _ShellPageState extends State<ShellPage> {
/// 页面缓存:键为「索引:语言」。同一个页面只构建一次,切走时用
/// [Offstage] 保活(不参与布局/绘制),切回来无需重建、状态也不丢。
final Map<String, Widget> _pages = <String, Widget>{};
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@@ -45,9 +71,15 @@ class _ShellPageState extends State<ShellPage> {
final controller = widget.controller; final controller = widget.controller;
return Scaffold( return Scaffold(
backgroundColor: GcColors.appBg, backgroundColor: GcColors.appBg,
body: Row( body: Column(
children: <Widget>[
// 自绘标题栏(macOS):系统标题栏已隐藏,最小化/最大化/关闭在这里画
const GcTitleBar(),
Expanded(
child: Row(
children: <Widget>[ children: <Widget>[
_Sidebar(controller: controller), _Sidebar(controller: controller),
Container(width: 1, color: GcColors.line),
Expanded( Expanded(
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
@@ -59,32 +91,63 @@ class _ShellPageState extends State<ShellPage> {
), ),
], ],
), ),
),
],
),
); );
}, },
); );
} }
Widget _content(ShellController controller) { Widget _content(ShellController controller) {
if (!controller.backendReady) { // 课件页是纯前端资源,不依赖后端:即使后端未就绪也可打开。
// 注意 _buildPage 内部对 index 1 返回课件页,这里单独放行它。
final courseware = controller.index == 1;
if (!courseware && !controller.backendReady) {
if (controller.loadError != null) { if (controller.loadError != null) {
return _BackendDown(controller: controller); return _BackendDown(controller: controller);
} }
return const Center( return const Center(
child: SizedBox( child: SizedBox(
width: 26, width: 22,
height: 26, height: 22,
child: CircularProgressIndicator(strokeWidth: 2.4), child: CircularProgressIndicator(strokeWidth: 2),
), ),
); );
} }
switch (controller.index) { // 只构建当前页;其余已访问页面保留在树上但处于 Offstage。
final key = '${controller.index}:${I18n.language.value}';
_pages.putIfAbsent(key, () => _buildPage(controller, controller.index));
final visibleKey = key;
return Stack(
children: <Widget>[
for (final entry in _pages.entries)
Offstage(
offstage: entry.key != visibleKey,
child: TickerMode(
enabled: entry.key == visibleKey,
child: entry.value,
),
),
],
);
}
Widget _buildPage(ShellController controller, int index) {
switch (index) {
case 1: case 1:
return DownloadPageView(controller: controller); // 课件页自持有 WebView 状态,不需要 controller。
return const CoursewarePage();
case 2: case 2:
return SettingsPageView(controller: controller); return DownloadPageView(controller: controller);
case 3: case 3:
return SettingsPageView(controller: controller);
case 4:
return AboutPageView(controller: controller); return AboutPageView(controller: controller);
case 5:
return UserPage(controller: controller);
default: default:
return HomePageView(controller: controller); return HomePageView(controller: controller);
} }
@@ -100,52 +163,25 @@ class _Sidebar extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final settings = controller.settings; final settings = controller.settings;
return Container( return Container(
width: 236, width: GcSize.sidebar,
color: GcColors.sideBg, color: GcColors.sideBg,
padding: const EdgeInsets.fromLTRB(16, 20, 16, 18), padding: const EdgeInsets.fromLTRB(
GcSpace.xl, GcSpace.xxl, GcSpace.lg, GcSpace.lg),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( _brand(),
children: <Widget>[ const SizedBox(height: GcSpace.xxxl),
Container(
width: 26,
height: 26,
decoration: BoxDecoration(
color: GcColors.surfaceAlt,
borderRadius: BorderRadius.circular(8),
),
alignment: Alignment.center,
child: const Text(
'◎',
style: TextStyle(fontSize: 14, color: GcColors.accent),
),
),
const SizedBox(width: 10),
const Expanded(
child: Text(
'Morris GC',
style: TextStyle(
fontSize: 13,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
),
],
),
const SizedBox(height: 6),
GcHint(T('app.tagline')),
const SizedBox(height: 26),
const Padding( const Padding(
padding: EdgeInsets.only(left: 14, bottom: 6), padding: EdgeInsets.only(left: 10, bottom: GcSpace.sm),
child: Text( child: Text(
'MENU', 'MENU',
style: TextStyle( style: TextStyle(
fontSize: 9.5, fontSize: 11,
letterSpacing: 1.2, height: 1.2,
letterSpacing: 1.4,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Color(0xFF4C5F80), color: Color(0xFF5C6A80),
), ),
), ),
), ),
@@ -157,23 +193,89 @@ class _Sidebar extends StatelessWidget {
), ),
const Spacer(), const Spacer(),
Container(height: 1, color: GcColors.line), Container(height: 1, color: GcColors.line),
const SizedBox(height: 10), const SizedBox(height: GcSpace.md),
Padding( Padding(
padding: const EdgeInsets.only(left: 14), padding: const EdgeInsets.only(left: 10),
child: Text( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
'v${settings?.version ?? '—'}', 'v${settings?.version ?? '—'}',
style: const TextStyle(fontSize: 10.5, color: GcColors.faint), style: TextStyle(
fontSize: 12,
height: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.muted,
), ),
), ),
Padding( const SizedBox(height: 2),
padding: const EdgeInsets.only(left: 14, top: 2), Text(
child: Text(
settings?.platform ?? '—', settings?.platform ?? '—',
style: const TextStyle(fontSize: 10, color: Color(0xFF4F6080)), style: TextStyle(
fontSize: 11.5,
height: 1.4,
color: GcColors.ghost,
), ),
), ),
], ],
), ),
),
],
),
);
}
/// 品牌区:一个渐变圆角标 + 名称 + 一句定位。
Widget _brand() {
return Row(
children: <Widget>[
Container(
width: 32,
height: 32,
alignment: Alignment.center,
decoration: BoxDecoration(
color: GcColors.accentSoft,
borderRadius: BorderRadius.circular(9),
border: Border.all(
color: Color.alphaBlend(
GcColors.accent.withOpacity(0.35), GcColors.sideBg),
),
),
child: Text(
'◎',
style: TextStyle(fontSize: 16, height: 1.1, color: GcColors.accent),
),
),
const SizedBox(width: GcSpace.md),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(
'Morris GC',
style: TextStyle(
fontSize: 14,
height: 1.3,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
const SizedBox(height: 1),
Text(
'SCIENCE · CLASSROOM',
style: TextStyle(
fontSize: 10,
height: 1.3,
letterSpacing: 0.9,
fontWeight: FontWeight.w600,
color: GcColors.ghost,
),
),
],
),
),
],
); );
} }
} }
@@ -192,29 +294,34 @@ class _NavButton extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Padding( return Padding(
padding: const EdgeInsets.only(bottom: 4), padding: const EdgeInsets.only(bottom: GcSpace.xs),
child: Material( child: Material(
color: active ? GcColors.surfaceAlt : Colors.transparent, color: active ? GcColors.accentSoft : Colors.transparent,
borderRadius: BorderRadius.circular(9), borderRadius: BorderRadius.circular(GcRadius.control),
child: InkWell( child: InkWell(
borderRadius: BorderRadius.circular(9), borderRadius: BorderRadius.circular(GcRadius.control),
onTap: onTap, onTap: onTap,
hoverColor: GcColors.surfaceHover,
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10), padding: const EdgeInsets.symmetric(
horizontal: GcSpace.md,
vertical: 11,
),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Icon( Icon(
item.icon, item.icon,
size: 16, size: 17,
color: active ? GcColors.accent : GcColors.faint, color: active ? GcColors.accent : GcColors.faint,
), ),
const SizedBox(width: 10), const SizedBox(width: GcSpace.md),
Text( Text(
T(item.labelKey), T(item.labelKey),
style: TextStyle( style: TextStyle(
fontSize: 12.5, fontSize: 13.5,
height: 1.2,
fontWeight: active ? FontWeight.w600 : FontWeight.w400, fontWeight: active ? FontWeight.w600 : FontWeight.w400,
color: active ? GcColors.ink : GcColors.muted, color: active ? GcColors.accent : GcColors.muted,
), ),
), ),
], ],
@@ -234,23 +341,32 @@ class _UpdateBar extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
decoration: const BoxDecoration( decoration: BoxDecoration(
color: GcColors.surface, color: GcColors.surface,
border: Border(top: BorderSide(color: GcColors.line)), border: Border(top: BorderSide(color: GcColors.line)),
), ),
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 9), padding: const EdgeInsets.symmetric(
horizontal: GcSpace.xxl,
vertical: GcSpace.md,
),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
const Text('⟳', style: TextStyle(fontSize: 16, color: GcColors.accent)), Icon(
const SizedBox(width: 12), Icons.sync_rounded,
size: 18,
color: GcColors.accent,
),
const SizedBox(width: GcSpace.md),
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
Text( Text(
controller.updateStatus, controller.updateStatus,
style: const TextStyle( style: TextStyle(
fontSize: 12.5, fontSize: 13,
height: 1.35,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: GcColors.ink, color: GcColors.ink,
), ),
@@ -259,23 +375,41 @@ class _UpdateBar extends StatelessWidget {
if (controller.updateDetail.isNotEmpty) if (controller.updateDetail.isNotEmpty)
Text( Text(
controller.updateDetail, controller.updateDetail,
style: const TextStyle(fontSize: 11, color: GcColors.faint), style: TextStyle(
fontSize: 12,
height: 1.4,
color: GcColors.faint,
),
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
if (controller.launcherNotice.isNotEmpty) if (controller.launcherNotice.isNotEmpty)
Text( Text(
controller.launcherNotice, controller.launcherNotice,
style: const TextStyle(fontSize: 11, color: GcColors.warn), style: TextStyle(
fontSize: 12,
height: 1.4,
color: GcColors.warn,
),
), ),
], ],
), ),
), ),
if (controller.updateBusy) if (controller.updateBusy) ...<Widget>[
const SizedBox( const SizedBox(width: GcSpace.lg),
width: 130, SizedBox(
child: LinearProgressIndicator(minHeight: 4), width: 140,
child: ClipRRect(
borderRadius: BorderRadius.circular(3),
child: LinearProgressIndicator(
value: controller.updateProgress > 0
? controller.updateProgress.clamp(0, 1).toDouble()
: null,
minHeight: 4,
), ),
const SizedBox(width: 14), ),
),
],
const SizedBox(width: GcSpace.lg),
TextButton( TextButton(
onPressed: controller.updateBusy onPressed: controller.updateBusy
? null ? null
@@ -299,24 +433,33 @@ class _BackendDown extends StatelessWidget {
child: ConstrainedBox( child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 520), constraints: const BoxConstraints(maxWidth: 520),
child: GcCard( child: GcCard(
padding: const EdgeInsets.all(28), padding: const EdgeInsets.all(GcSpace.xxl),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row(
children: <Widget>[
Icon(Icons.error_outline_rounded,
size: 20, color: GcColors.danger),
const SizedBox(width: GcSpace.sm),
Text( Text(
T('common.error'), T('common.error'),
style: const TextStyle( style: TextStyle(
fontSize: 17, fontSize: 16,
height: 1.35,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: GcColors.ink, color: GcColors.ink,
), ),
), ),
const SizedBox(height: 10), ],
),
const SizedBox(height: GcSpace.md),
GcHint(controller.loadError ?? ''), GcHint(controller.loadError ?? ''),
const SizedBox(height: 6), const SizedBox(height: GcSpace.xs),
GcHint('后端地址:${controller.api.baseUrl}'), GcHint('${T('set.backend')}: ${controller.api.baseUrl}'
const SizedBox(height: 16), ' · ${controller.api.hasSessionToken ? '令牌已就绪' : '缺少会话令牌'}'),
const SizedBox(height: GcSpace.lg),
FilledButton( FilledButton(
onPressed: controller.bootstrap, onPressed: controller.bootstrap,
child: Text(T('common.retry')), child: Text(T('common.retry')),
File diff suppressed because it is too large. Load diff
+164
View File
@@ -0,0 +1,164 @@
import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'theme.dart';
/// 自绘窗口按钮的通道(macOS 侧在 macos/Runner/MainFlutterWindow.swift 实现)。
///
/// 系统标题栏已去掉(titleVisibility = .hidden + fullSizeContentView),
/// 最小化 / 最大化 / 关闭 全部由 Flutter 画,外观跟界面统一。
class GcWindow {
GcWindow._();
static const MethodChannel _channel = MethodChannel('gc/window');
/// 只有 macOS 走了自绘标题栏;其它平台保留系统标题栏,不显示自绘按钮。
static bool get supported => !kIsWeb && Platform.isMacOS;
static Future<void> minimize() => _invoke('minimize');
static Future<void> close() => _invoke('close');
static Future<void> toggleMaximize() => _invoke('toggleMaximize');
/// 开始拖拽窗口。用原生 performDrag,比在 Flutter 里模拟位置更跟手。
static Future<void> beginDrag() => _invoke('beginDrag');
static Future<bool> isMaximized() async {
if (!supported) return false;
try {
return await _channel.invokeMethod<bool>('isMaximized') ?? false;
} catch (_) {
return false;
}
}
static Future<void> _invoke(String method) async {
if (!supported) return;
try {
await _channel.invokeMethod<void>(method);
} catch (_) {
// 通道不可用(例如截图测试环境)时静默忽略
}
}
}
/// 顶部标题栏:左侧应用名 + 右侧自绘的最小化 / 最大化 / 关闭。
///
/// 只在 macOS 显示;其它平台系统标题栏还在,这里返回零高度占位。
class GcTitleBar extends StatelessWidget {
const GcTitleBar({super.key, this.title = 'Morris GC'});
final String title;
static const double height = 38;
@override
Widget build(BuildContext context) {
if (!GcWindow.supported) return const SizedBox.shrink();
return GestureDetector(
behavior: HitTestBehavior.opaque,
onPanStart: (_) => GcWindow.beginDrag(),
child: Container(
height: height,
// 与主题底色保持一致:浅色主题是纯白,深色主题是深色面板色。
// 不叠强调色 —— 标题栏属于窗口底色,染色会显得和内容区不是一套。
decoration: BoxDecoration(
color: GcColors.sideBg,
border: Border(bottom: BorderSide(color: GcColors.line)),
),
padding: const EdgeInsets.only(left: GcSpace.xl, right: GcSpace.sm),
child: Row(
children: <Widget>[
Text(
title,
style: TextStyle(
fontSize: 12.5,
height: 1.2,
fontWeight: FontWeight.w600,
letterSpacing: 0.2,
color: GcColors.faint,
),
),
const Spacer(),
_WindowButton(
icon: Icons.remove_rounded,
tooltip: '最小化',
onTap: GcWindow.minimize,
),
_WindowButton(
icon: Icons.crop_square_rounded,
tooltip: '最大化',
onTap: GcWindow.toggleMaximize,
),
_WindowButton(
icon: Icons.close_rounded,
tooltip: '关闭',
danger: true,
onTap: GcWindow.close,
),
],
),
),
);
}
}
class _WindowButton extends StatefulWidget {
const _WindowButton({
required this.icon,
required this.tooltip,
required this.onTap,
this.danger = false,
});
final IconData icon;
final String tooltip;
final Future<void> Function() onTap;
final bool danger;
@override
State<_WindowButton> createState() => _WindowButtonState();
}
class _WindowButtonState extends State<_WindowButton> {
bool _hover = false;
@override
Widget build(BuildContext context) {
final Color bg = _hover
? (widget.danger
? GcColors.danger.withOpacity(0.16)
: GcColors.surfaceHover)
: Colors.transparent;
return Tooltip(
message: widget.tooltip,
waitDuration: const Duration(milliseconds: 500),
child: MouseRegion(
cursor: SystemMouseCursors.basic,
onEnter: (_) => setState(() => _hover = true),
onExit: (_) => setState(() => _hover = false),
child: GestureDetector(
onTap: () => widget.onTap(),
child: AnimatedContainer(
duration: const Duration(milliseconds: 110),
width: 40,
height: GcTitleBar.height,
alignment: Alignment.center,
color: bg,
child: Icon(
widget.icon,
size: 15,
color: _hover
? (widget.danger ? GcColors.danger : GcColors.ink)
: GcColors.faint,
),
),
),
),
);
}
}
+1
View File
@@ -0,0 +1 @@
flutter/ephemeral
+146
View File
@@ -0,0 +1,146 @@
# Project-level configuration.
cmake_minimum_required(VERSION 3.10)
project(runner LANGUAGES CXX)
# The name of the executable created for the application. Change this to change
# the on-disk name of your application.
set(BINARY_NAME "GC-UI")
# The unique GTK application identifier for this application. See:
# https://wiki.gnome.org/HowDoI/ChooseApplicationID
set(APPLICATION_ID "com.xhmcl.GC")
# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
# versions of CMake.
cmake_policy(SET CMP0063 NEW)
# Load bundled libraries from the lib/ directory relative to the binary.
set(CMAKE_INSTALL_RPATH "$ORIGIN/lib")
# Root filesystem for cross-building.
if(FLUTTER_TARGET_PLATFORM_SYSROOT)
set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT})
set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT})
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
endif()
# Define build configuration options.
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
set(CMAKE_BUILD_TYPE "Debug" CACHE
STRING "Flutter build mode" FORCE)
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
"Debug" "Profile" "Release")
endif()
# Compilation settings that should be applied to most targets.
#
# Be cautious about adding new options here, as plugins use this function by
# default. In most cases, you should add new options to specific targets instead
# of modifying this function.
function(APPLY_STANDARD_SETTINGS TARGET)
target_compile_features(${TARGET} PUBLIC cxx_std_14)
target_compile_options(${TARGET} PRIVATE -Wall -Werror)
target_compile_options(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O3>")
target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
endfunction()
# Flutter library and tool build rules.
set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
add_subdirectory(${FLUTTER_MANAGED_DIR})
# System-level dependencies.
find_package(PkgConfig REQUIRED)
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
# Define the application target. To change its name, change BINARY_NAME above,
# not the value here, or `flutter run` will no longer work.
#
# Any new source files that you add to the application should be added here.
add_executable(${BINARY_NAME}
"main.cc"
"my_application.cc"
"${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
)
# Apply the standard set of build settings. This can be removed for applications
# that need different build settings.
apply_standard_settings(${BINARY_NAME})
# Add dependency libraries. Add any application-specific dependencies here.
target_link_libraries(${BINARY_NAME} PRIVATE flutter)
target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
# Run the Flutter tool portions of the build. This must not be removed.
add_dependencies(${BINARY_NAME} flutter_assemble)
# Only the install-generated bundle's copy of the executable will launch
# correctly, since the resources must in the right relative locations. To avoid
# people trying to run the unbundled copy, put it in a subdirectory instead of
# the default top-level location.
set_target_properties(${BINARY_NAME}
PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run"
)
# Generated plugin build rules, which manage building the plugins and adding
# them to the application.
include(flutter/generated_plugins.cmake)
# === Installation ===
# By default, "installing" just makes a relocatable bundle in the build
# directory.
set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle")
# 无条件强制安装到 build 目录下的 bundle:某些环境下 CMAKE_INSTALL_PREFIX
# 会被初始化成 /usr/local,导致 flutter build linux 声称成功、却把产物装进
# 系统目录,build/.../bundle 是空的。
set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "Flutter bundle 输出目录" FORCE)
# Start with a clean build bundle directory every time.
install(CODE "
file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\")
" COMPONENT Runtime)
set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
COMPONENT Runtime)
install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
COMPONENT Runtime)
install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
COMPONENT Runtime)
foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES})
install(FILES "${bundled_library}"
DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
COMPONENT Runtime)
endforeach(bundled_library)
# Copy the native assets provided by the build.dart from all packages.
set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/")
install(DIRECTORY "${NATIVE_ASSETS_DIR}"
DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
COMPONENT Runtime)
# Fully re-copy the assets directory on each build to avoid having stale files
# from a previous install.
set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
install(CODE "
file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\")
" COMPONENT Runtime)
install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}"
DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime)
# Install the AOT library on non-Debug builds only.
if(NOT CMAKE_BUILD_TYPE MATCHES "Debug")
install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
COMPONENT Runtime)
endif()
@@ -0,0 +1,88 @@
# This file controls Flutter-level build steps. It should not be edited.
cmake_minimum_required(VERSION 3.10)
set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral")
# Configuration provided via flutter tool.
include(${EPHEMERAL_DIR}/generated_config.cmake)
# TODO: Move the rest of this into files in ephemeral. See
# https://github.com/flutter/flutter/issues/57146.
# Serves the same purpose as list(TRANSFORM ... PREPEND ...),
# which isn't available in 3.10.
function(list_prepend LIST_NAME PREFIX)
set(NEW_LIST "")
foreach(element ${${LIST_NAME}})
list(APPEND NEW_LIST "${PREFIX}${element}")
endforeach(element)
set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE)
endfunction()
# === Flutter Library ===
# System-level dependencies.
find_package(PkgConfig REQUIRED)
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so")
# Published to parent scope for install step.
set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE)
set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE)
set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE)
set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE)
list(APPEND FLUTTER_LIBRARY_HEADERS
"fl_basic_message_channel.h"
"fl_binary_codec.h"
"fl_binary_messenger.h"
"fl_dart_project.h"
"fl_engine.h"
"fl_json_message_codec.h"
"fl_json_method_codec.h"
"fl_message_codec.h"
"fl_method_call.h"
"fl_method_channel.h"
"fl_method_codec.h"
"fl_method_response.h"
"fl_plugin_registrar.h"
"fl_plugin_registry.h"
"fl_standard_message_codec.h"
"fl_standard_method_codec.h"
"fl_string_codec.h"
"fl_value.h"
"fl_view.h"
"flutter_linux.h"
)
list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/")
add_library(flutter INTERFACE)
target_include_directories(flutter INTERFACE
"${EPHEMERAL_DIR}"
)
target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}")
target_link_libraries(flutter INTERFACE
PkgConfig::GTK
PkgConfig::GLIB
PkgConfig::GIO
)
add_dependencies(flutter flutter_assemble)
# === Flutter tool backend ===
# _phony_ is a non-existent file to force this command to run every time,
# since currently there's no way to get a full input/output list from the
# flutter tool.
add_custom_command(
OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/_phony_
COMMAND ${CMAKE_COMMAND} -E env
${FLUTTER_TOOL_ENVIRONMENT}
"${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh"
${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE}
VERBATIM
)
add_custom_target(flutter_assemble DEPENDS
"${FLUTTER_LIBRARY}"
${FLUTTER_LIBRARY_HEADERS}
)
+6
View File
@@ -0,0 +1,6 @@
#include "my_application.h"
int main(int argc, char** argv) {
g_autoptr(MyApplication) app = my_application_new();
return g_application_run(G_APPLICATION(app), argc, argv);
}
+124
View File
@@ -0,0 +1,124 @@
#include "my_application.h"
#include <flutter_linux/flutter_linux.h>
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#endif
#include "flutter/generated_plugin_registrant.h"
struct _MyApplication {
GtkApplication parent_instance;
char** dart_entrypoint_arguments;
};
G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
// Implements GApplication::activate.
static void my_application_activate(GApplication* application) {
MyApplication* self = MY_APPLICATION(application);
GtkWindow* window =
GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
// Use a header bar when running in GNOME as this is the common style used
// by applications and is the setup most users will be using (e.g. Ubuntu
// desktop).
// If running on X and not using GNOME then just use a traditional title bar
// in case the window manager does more exotic layout, e.g. tiling.
// If running on Wayland assume the header bar will work (may need changing
// if future cases occur).
gboolean use_header_bar = TRUE;
#ifdef GDK_WINDOWING_X11
GdkScreen* screen = gtk_window_get_screen(window);
if (GDK_IS_X11_SCREEN(screen)) {
const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
use_header_bar = FALSE;
}
}
#endif
if (use_header_bar) {
GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
gtk_widget_show(GTK_WIDGET(header_bar));
gtk_header_bar_set_title(header_bar, "Morris GC");
gtk_header_bar_set_show_close_button(header_bar, TRUE);
gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
} else {
gtk_window_set_title(window, "Morris GC");
}
gtk_window_set_default_size(window, 1280, 720);
gtk_widget_show(GTK_WIDGET(window));
g_autoptr(FlDartProject) project = fl_dart_project_new();
fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
FlView* view = fl_view_new(project);
gtk_widget_show(GTK_WIDGET(view));
gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
fl_register_plugins(FL_PLUGIN_REGISTRY(view));
gtk_widget_grab_focus(GTK_WIDGET(view));
}
// Implements GApplication::local_command_line.
static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
MyApplication* self = MY_APPLICATION(application);
// Strip out the first argument as it is the binary name.
self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
g_autoptr(GError) error = nullptr;
if (!g_application_register(application, nullptr, &error)) {
g_warning("Failed to register: %s", error->message);
*exit_status = 1;
return TRUE;
}
g_application_activate(application);
*exit_status = 0;
return TRUE;
}
// Implements GApplication::startup.
static void my_application_startup(GApplication* application) {
//MyApplication* self = MY_APPLICATION(object);
// Perform any actions required at application startup.
G_APPLICATION_CLASS(my_application_parent_class)->startup(application);
}
// Implements GApplication::shutdown.
static void my_application_shutdown(GApplication* application) {
//MyApplication* self = MY_APPLICATION(object);
// Perform any actions required at application shutdown.
G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application);
}
// Implements GObject::dispose.
static void my_application_dispose(GObject* object) {
MyApplication* self = MY_APPLICATION(object);
g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev);
G_OBJECT_CLASS(my_application_parent_class)->dispose(object);
}
static void my_application_class_init(MyApplicationClass* klass) {
G_APPLICATION_CLASS(klass)->activate = my_application_activate;
G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
G_APPLICATION_CLASS(klass)->startup = my_application_startup;
G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown;
G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
}
static void my_application_init(MyApplication* self) {}
MyApplication* my_application_new() {
return MY_APPLICATION(g_object_new(my_application_get_type(),
"application-id", APPLICATION_ID,
"flags", G_APPLICATION_NON_UNIQUE,
nullptr));
}
+18
View File
@@ -0,0 +1,18 @@
#ifndef FLUTTER_MY_APPLICATION_H_
#define FLUTTER_MY_APPLICATION_H_
#include <gtk/gtk.h>
G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION,
GtkApplication)
/**
* my_application_new:
*
* Creates a new Flutter-based application.
*
* Returns: a new #MyApplication.
*/
MyApplication* my_application_new();
#endif // FLUTTER_MY_APPLICATION_H_
@@ -1 +1,2 @@
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
#include "ephemeral/Flutter-Generated.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig"
@@ -1 +1,2 @@
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
#include "ephemeral/Flutter-Generated.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig"
+47
View File
@@ -0,0 +1,47 @@
platform :osx, '12.0'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
project 'Runner', {
'Debug' => :debug,
'Profile' => :release,
'Release' => :release,
}
def flutter_root
generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
unless File.exist?(generated_xcode_build_settings_path)
raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
end
File.foreach(generated_xcode_build_settings_path) do |line|
matches = line.match(/FLUTTER_ROOT\=(.*)/)
return matches[1].strip if matches
end
raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
end
require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
flutter_macos_podfile_setup
target 'Runner' do
use_frameworks!
use_modular_headers!
flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
target 'RunnerTests' do
inherit! :search_paths
end
end
post_install do |installer|
installer.pods_project.targets.each do |target|
flutter_additional_macos_build_settings(target)
# Xcode 27 起最低部署目标为 12.0;逐个 pod 提升,避免旧 pod 的 10.13/10.14 报错。
target.build_configurations.each do |config|
config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '12.0'
end
end
end
@@ -27,6 +27,8 @@
33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
6115A3AA09C0554E004627A7 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8206FEA4073335056184BFE7 /* Pods_RunnerTests.framework */; };
D97968A61668AD5CB0F4AD81 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A3E308B8A5C9BFB85DE87E1A /* Pods_Runner.framework */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
@@ -60,11 +62,13 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
182DFB26FB114E38C6E212AD /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
280B76C220FC1F5F9A19A983 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
33CC10ED2044A3C60003C045 /* gc_ui.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "gc_ui.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10ED2044A3C60003C045 /* gc_ui.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = gc_ui.app; sourceTree = BUILT_PRODUCTS_DIR; };
33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; }; 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -76,8 +80,14 @@
33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; }; 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
41137AAB2DF4C73772AD6680 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
75F404C3BC9A85A0940A1E7A /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
8206FEA4073335056184BFE7 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8892D008E4FA6821A291BE17 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
8EFF00FDE3D0667C00609F10 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
A3E308B8A5C9BFB85DE87E1A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
@@ -85,6 +95,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
6115A3AA09C0554E004627A7 /* Pods_RunnerTests.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@@ -92,6 +103,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
D97968A61668AD5CB0F4AD81 /* Pods_Runner.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@@ -125,6 +137,7 @@
331C80D6294CF71000263BE5 /* RunnerTests */, 331C80D6294CF71000263BE5 /* RunnerTests */,
33CC10EE2044A3C60003C045 /* Products */, 33CC10EE2044A3C60003C045 /* Products */,
D73912EC22F37F3D000D13A0 /* Frameworks */, D73912EC22F37F3D000D13A0 /* Frameworks */,
A82E8A367D68D5C69E25C9BA /* Pods */,
); );
sourceTree = "<group>"; sourceTree = "<group>";
}; };
@@ -172,9 +185,25 @@
path = Runner; path = Runner;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
A82E8A367D68D5C69E25C9BA /* Pods */ = {
isa = PBXGroup;
children = (
280B76C220FC1F5F9A19A983 /* Pods-Runner.debug.xcconfig */,
8EFF00FDE3D0667C00609F10 /* Pods-Runner.release.xcconfig */,
41137AAB2DF4C73772AD6680 /* Pods-Runner.profile.xcconfig */,
75F404C3BC9A85A0940A1E7A /* Pods-RunnerTests.debug.xcconfig */,
8892D008E4FA6821A291BE17 /* Pods-RunnerTests.release.xcconfig */,
182DFB26FB114E38C6E212AD /* Pods-RunnerTests.profile.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
D73912EC22F37F3D000D13A0 /* Frameworks */ = { D73912EC22F37F3D000D13A0 /* Frameworks */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
A3E308B8A5C9BFB85DE87E1A /* Pods_Runner.framework */,
8206FEA4073335056184BFE7 /* Pods_RunnerTests.framework */,
); );
name = Frameworks; name = Frameworks;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -186,6 +215,7 @@
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
buildPhases = ( buildPhases = (
EBEBA5BB2F5B8B60B8CBB8D2 /* [CP] Check Pods Manifest.lock */,
331C80D1294CF70F00263BE5 /* Sources */, 331C80D1294CF70F00263BE5 /* Sources */,
331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D2294CF70F00263BE5 /* Frameworks */,
331C80D3294CF70F00263BE5 /* Resources */, 331C80D3294CF70F00263BE5 /* Resources */,
@@ -204,11 +234,13 @@
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
buildPhases = ( buildPhases = (
6098269FDFAA15D26448E434 /* [CP] Check Pods Manifest.lock */,
33CC10E92044A3C60003C045 /* Sources */, 33CC10E92044A3C60003C045 /* Sources */,
33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EA2044A3C60003C045 /* Frameworks */,
33CC10EB2044A3C60003C045 /* Resources */, 33CC10EB2044A3C60003C045 /* Resources */,
33CC110E2044A8840003C045 /* Bundle Framework */, 33CC110E2044A8840003C045 /* Bundle Framework */,
3399D490228B24CF009A79C7 /* ShellScript */, 3399D490228B24CF009A79C7 /* ShellScript */,
A1BACCAA4E3E0600DECC8167 /* [CP] Embed Pods Frameworks */,
); );
buildRules = ( buildRules = (
); );
@@ -329,6 +361,67 @@
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
}; };
6098269FDFAA15D26448E434 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
A1BACCAA4E3E0600DECC8167 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
EBEBA5BB2F5B8B60B8CBB8D2 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */
@@ -380,6 +473,7 @@
/* Begin XCBuildConfiguration section */ /* Begin XCBuildConfiguration section */
331C80DB294CF71000263BE5 /* Debug */ = { 331C80DB294CF71000263BE5 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 75F404C3BC9A85A0940A1E7A /* Pods-RunnerTests.debug.xcconfig */;
buildSettings = { buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)"; BUNDLE_LOADER = "$(TEST_HOST)";
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
@@ -394,6 +488,7 @@
}; };
331C80DC294CF71000263BE5 /* Release */ = { 331C80DC294CF71000263BE5 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 8892D008E4FA6821A291BE17 /* Pods-RunnerTests.release.xcconfig */;
buildSettings = { buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)"; BUNDLE_LOADER = "$(TEST_HOST)";
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
@@ -408,6 +503,7 @@
}; };
331C80DD294CF71000263BE5 /* Profile */ = { 331C80DD294CF71000263BE5 /* Profile */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 182DFB26FB114E38C6E212AD /* Pods-RunnerTests.profile.xcconfig */;
buildSettings = { buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)"; BUNDLE_LOADER = "$(TEST_HOST)";
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
@@ -461,7 +557,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.14; MACOSX_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx; SDKROOT = macosx;
SWIFT_COMPILATION_MODE = wholemodule; SWIFT_COMPILATION_MODE = wholemodule;
@@ -543,7 +639,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.14; MACOSX_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx; SDKROOT = macosx;
@@ -593,7 +689,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.14; MACOSX_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx; SDKROOT = macosx;
SWIFT_COMPILATION_MODE = wholemodule; SWIFT_COMPILATION_MODE = wholemodule;
@@ -4,4 +4,7 @@
<FileRef <FileRef
location = "group:Runner.xcodeproj"> location = "group:Runner.xcodeproj">
</FileRef> </FileRef>
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
</Workspace> </Workspace>
@@ -5,10 +5,10 @@
// 'flutter create' template. // 'flutter create' template.
// The application's name. By default this is also the title of the Flutter window. // The application's name. By default this is also the title of the Flutter window.
PRODUCT_NAME = gc_ui PRODUCT_NAME = GC-UI
// The application's bundle identifier // The application's bundle identifier
PRODUCT_BUNDLE_IDENTIFIER = com.morris.gc.gcUi PRODUCT_BUNDLE_IDENTIFIER = com.morris.gc.gcUi
// The copyright displayed in application information // The copyright displayed in application information
PRODUCT_COPYRIGHT = Copyright © 2026 com.morris.gc. All rights reserved. PRODUCT_COPYRIGHT = Copyright © 2026 Morris. All rights reserved.
@@ -6,6 +6,8 @@
<true/> <true/>
<key>com.apple.security.cs.allow-jit</key> <key>com.apple.security.cs.allow-jit</key>
<true/> <true/>
<key>com.apple.security.network.client</key>
<true/>
<key>com.apple.security.network.server</key> <key>com.apple.security.network.server</key>
<true/> <true/>
</dict> </dict>
@@ -8,6 +8,52 @@ class MainFlutterWindow: NSWindow {
self.contentViewController = flutterViewController self.contentViewController = flutterViewController
self.setFrame(windowFrame, display: true) self.setFrame(windowFrame, display: true)
// 去掉系统标题栏(应用名 + 红绿灯按钮),改由 Flutter 自绘:
// fullSizeContentView 让内容铺满整窗,titlebarAppearsTransparent + titleVisibility
// 隐藏标题栏文字与背景,三个系统按钮一并隐藏。
// 注意:不要动 styleMask 里的 .resizable,否则窗口无法缩放。
self.titleVisibility = .hidden
self.titlebarAppearsTransparent = true
self.styleMask.insert(.fullSizeContentView)
self.standardWindowButton(.closeButton)?.isHidden = true
self.standardWindowButton(.miniaturizeButton)?.isHidden = true
self.standardWindowButton(.zoomButton)?.isHidden = true
self.isMovableByWindowBackground = true
// 自绘按钮 -> 原生窗口操作
let channel = FlutterMethodChannel(
name: "gc/window",
binaryMessenger: flutterViewController.engine.binaryMessenger
)
channel.setMethodCallHandler { [weak self] call, result in
guard let self = self else {
result(FlutterMethodNotImplemented)
return
}
switch call.method {
case "minimize":
self.miniaturize(nil)
result(nil)
case "toggleMaximize":
// NSWindow.zoom(_:) 自带切换语义:放大状态下再调即还原
self.zoom(nil)
result(nil)
case "close":
self.close()
result(nil)
case "isMaximized":
result(self.isZoomed)
case "beginDrag":
// 拖拽整窗:用系统拖拽,比在 Dart 里逐帧挪窗口平滑
if let event = NSApp.currentEvent {
self.performDrag(with: event)
}
result(nil)
default:
result(FlutterMethodNotImplemented)
}
}
RegisterGeneratedPlugins(registry: flutterViewController) RegisterGeneratedPlugins(registry: flutterViewController)
super.awakeFromNib() super.awakeFromNib()
@@ -4,5 +4,9 @@
<dict> <dict>
<key>com.apple.security.app-sandbox</key> <key>com.apple.security.app-sandbox</key>
<true/> <true/>
<key>com.apple.security.network.client</key>
<true/>
<key>com.apple.security.network.server</key>
<true/>
</dict> </dict>
</plist> </plist>
+106 -29
View File
@@ -6,7 +6,7 @@ packages:
description: description:
name: async name: async
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.11.0" version: "2.11.0"
boolean_selector: boolean_selector:
@@ -14,7 +14,7 @@ packages:
description: description:
name: boolean_selector name: boolean_selector
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.1.1" version: "2.1.1"
characters: characters:
@@ -22,7 +22,7 @@ packages:
description: description:
name: characters name: characters
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.3.0" version: "1.3.0"
clock: clock:
@@ -30,7 +30,7 @@ packages:
description: description:
name: clock name: clock
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.1.1" version: "1.1.1"
collection: collection:
@@ -38,7 +38,7 @@ packages:
description: description:
name: collection name: collection
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.18.0" version: "1.18.0"
cupertino_icons: cupertino_icons:
@@ -46,7 +46,7 @@ packages:
description: description:
name: cupertino_icons name: cupertino_icons
sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.0.8" version: "1.0.8"
fake_async: fake_async:
@@ -54,7 +54,7 @@ packages:
description: description:
name: fake_async name: fake_async
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.3.1" version: "1.3.1"
flutter: flutter:
@@ -62,12 +62,76 @@ packages:
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" version: "0.0.0"
flutter_inappwebview:
dependency: "direct main"
description:
name: flutter_inappwebview
sha256: "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5"
url: "https://pub.flutter-io.cn"
source: hosted
version: "6.1.5"
flutter_inappwebview_android:
dependency: transitive
description:
name: flutter_inappwebview_android
sha256: "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.3"
flutter_inappwebview_internal_annotations:
dependency: transitive
description:
name: flutter_inappwebview_internal_annotations
sha256: "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.2.0"
flutter_inappwebview_ios:
dependency: transitive
description:
name: flutter_inappwebview_ios
sha256: "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.2"
flutter_inappwebview_macos:
dependency: transitive
description:
name: flutter_inappwebview_macos
sha256: c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.2"
flutter_inappwebview_platform_interface:
dependency: transitive
description:
name: flutter_inappwebview_platform_interface
sha256: cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.3.0+1"
flutter_inappwebview_web:
dependency: transitive
description:
name: flutter_inappwebview_web
sha256: "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.2"
flutter_inappwebview_windows:
dependency: transitive
description:
name: flutter_inappwebview_windows
sha256: "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.6.0"
flutter_lints: flutter_lints:
dependency: "direct dev" dependency: "direct dev"
description: description:
name: flutter_lints name: flutter_lints
sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "4.0.0" version: "4.0.0"
flutter_test: flutter_test:
@@ -75,12 +139,17 @@ packages:
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" version: "0.0.0"
flutter_web_plugins:
dependency: transitive
description: flutter
source: sdk
version: "0.0.0"
http: http:
dependency: "direct main" dependency: "direct main"
description: description:
name: http name: http
sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412" sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.6.0" version: "1.6.0"
http_parser: http_parser:
@@ -88,7 +157,7 @@ packages:
description: description:
name: http_parser name: http_parser
sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "4.0.2" version: "4.0.2"
leak_tracker: leak_tracker:
@@ -96,7 +165,7 @@ packages:
description: description:
name: leak_tracker name: leak_tracker
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "10.0.5" version: "10.0.5"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
@@ -104,7 +173,7 @@ packages:
description: description:
name: leak_tracker_flutter_testing name: leak_tracker_flutter_testing
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "3.0.5" version: "3.0.5"
leak_tracker_testing: leak_tracker_testing:
@@ -112,7 +181,7 @@ packages:
description: description:
name: leak_tracker_testing name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "3.0.1" version: "3.0.1"
lints: lints:
@@ -120,7 +189,7 @@ packages:
description: description:
name: lints name: lints
sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "4.0.0" version: "4.0.0"
matcher: matcher:
@@ -128,7 +197,7 @@ packages:
description: description:
name: matcher name: matcher
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.12.16+1" version: "0.12.16+1"
material_color_utilities: material_color_utilities:
@@ -136,7 +205,7 @@ packages:
description: description:
name: material_color_utilities name: material_color_utilities
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.11.1" version: "0.11.1"
meta: meta:
@@ -144,7 +213,7 @@ packages:
description: description:
name: meta name: meta
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.15.0" version: "1.15.0"
path: path:
@@ -152,9 +221,17 @@ packages:
description: description:
name: path name: path
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.9.0" version: "1.9.0"
plugin_platform_interface:
dependency: transitive
description:
name: plugin_platform_interface
sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.8"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
@@ -165,7 +242,7 @@ packages:
description: description:
name: source_span name: source_span
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.10.0" version: "1.10.0"
stack_trace: stack_trace:
@@ -173,7 +250,7 @@ packages:
description: description:
name: stack_trace name: stack_trace
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.11.1" version: "1.11.1"
stream_channel: stream_channel:
@@ -181,7 +258,7 @@ packages:
description: description:
name: stream_channel name: stream_channel
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.1.2" version: "2.1.2"
string_scanner: string_scanner:
@@ -189,7 +266,7 @@ packages:
description: description:
name: string_scanner name: string_scanner
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.2.0" version: "1.2.0"
term_glyph: term_glyph:
@@ -197,7 +274,7 @@ packages:
description: description:
name: term_glyph name: term_glyph
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.2.1" version: "1.2.1"
test_api: test_api:
@@ -205,7 +282,7 @@ packages:
description: description:
name: test_api name: test_api
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.7.2" version: "0.7.2"
typed_data: typed_data:
@@ -213,7 +290,7 @@ packages:
description: description:
name: typed_data name: typed_data
sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.4.0" version: "1.4.0"
vector_math: vector_math:
@@ -221,7 +298,7 @@ packages:
description: description:
name: vector_math name: vector_math
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.1.4" version: "2.1.4"
vm_service: vm_service:
@@ -229,7 +306,7 @@ packages:
description: description:
name: vm_service name: vm_service
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "14.2.5" version: "14.2.5"
web: web:
@@ -237,9 +314,9 @@ packages:
description: description:
name: web name: web
sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
url: "https://pub.dev" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.1.1" version: "1.1.1"
sdks: sdks:
dart: ">=3.5.4 <4.0.0" dart: ">=3.5.4 <4.0.0"
flutter: ">=3.18.0-18.0.pre.54" flutter: ">=3.24.0"
+8 -5
View File
@@ -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 # 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 # 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. # of the product and file versions while build-number is used as the build suffix.
version: 1.0.0+1 version: 1.1.1+1
environment: environment:
sdk: ^3.5.4 sdk: ^3.5.4
@@ -34,6 +34,9 @@ dependencies:
# 与 GC-UI 后端(本地 HTTP 服务)通信 # 与 GC-UI 后端(本地 HTTP 服务)通信
http: ^1.2.2 http: ^1.2.2
# 桌面 WebView:承载离线等高线课件(Win/macOS/Linux)
flutter_inappwebview: 6.1.5
# The following adds the Cupertino Icons font to your application. # The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons. # Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.8 cupertino_icons: ^1.0.8
@@ -60,10 +63,10 @@ flutter:
# the material Icons class. # the material Icons class.
uses-material-design: true uses-material-design: true
# To add assets to your application, add an assets section, like this: assets:
# assets: # 离线等高线课件(去除授权验证后的纯净版),整体作为目录打包。
# - images/a_dot_burr.jpeg - courseware/
# - images/a_dot_ham.jpeg - courseware/assets/
# An image asset can refer to one or more resolution-specific "variants", see # An image asset can refer to one or more resolution-specific "variants", see
# https://flutter.dev/to/resolution-aware-images # https://flutter.dev/to/resolution-aware-images
+1 -1
View File
@@ -73,7 +73,7 @@ void main() {
testWidgets('renders a card with its child', (tester) async { testWidgets('renders a card with its child', (tester) async {
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(
theme: buildGcTheme(), theme: buildGcTheme(Brightness.dark),
home: const Scaffold( home: const Scaffold(
body: GcCard(child: Text('hello')), body: GcCard(child: Text('hello')),
), ),
+172 -22
View File
@@ -21,9 +21,18 @@ import 'package:gc_ui/theme.dart';
/// flutter test tool/render_shots_test.dart /// flutter test tool/render_shots_test.dart
void main() { void main() {
setUpAll(() async { setUpAll(() async {
HttpOverrides.global = null; // 不要设置 HttpOverrides.global = null:那会打开真实网络,
// flutter_test 的假时钟下 HTTP 定时器永远悬着,用例结束时
// 会撞上「!timersPending」断言。保持 flutter_test 默认的 FakeHttpClient
// (所有请求立即返回 400),页面本身都用预置数据渲染,不需要后端。
// 测试环境默认用 Ahem 占位字体(所有字都是方块),必须显式加载一套真字体:
// Linux CI 用 Noto CJK,Windows 本机用 Noto Sans SC / 微软雅黑,macOS 用苹方。
const candidates = <String>[ const candidates = <String>[
r'C:\Windows\Fonts\Deng.ttf',
r'C:\Windows\Fonts\NotoSansSC-VF.ttf',
r'C:\Windows\Fonts\msyh.ttc',
r'C:\Windows\Fonts\simhei.ttf',
'/System/Library/Fonts/PingFang.ttc',
'/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc', '/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc',
'/usr/share/fonts/truetype/noto/NotoSansCJK-Regular.ttc', '/usr/share/fonts/truetype/noto/NotoSansCJK-Regular.ttc',
]; ];
@@ -36,6 +45,22 @@ void main() {
await loader.load(); await loader.load();
break; break;
} }
// Material 图标字体:flutter_test 不会自动加载,不加载的话所有 Icon
// 都是方框,截图就没法检查图标。SDK 缓存里那份由 flutter test 通过
// FLUTTER_ROOT 指过来。
final flutterRoot = Platform.environment['FLUTTER_ROOT'];
if (flutterRoot != null) {
final icons = File(
'$flutterRoot/bin/cache/artifacts/material_fonts/materialicons-regular.otf',
);
if (icons.existsSync()) {
final bytes = icons.readAsBytesSync();
final loader = FontLoader('MaterialIcons')
..addFont(Future<ByteData>.value(ByteData.view(bytes.buffer)));
await loader.load();
}
}
}); });
SettingsInfo sampleSettings() => SettingsInfo.fromJson(<String, dynamic>{ SettingsInfo sampleSettings() => SettingsInfo.fromJson(<String, dynamic>{
@@ -123,19 +148,43 @@ void main() {
'uiAvailable': true, 'uiAvailable': true,
}); });
Future<void> shoot(WidgetTester tester, String name, Widget page) async { /// 外壳用的 controller:bootstrap 直接返回,不去连后端。
tester.view.physicalSize = const Size(1280, 820); ///
/// 真 ShellPage 会在 initState 里 bootstrap,后端不在时会挂重试定时器,
/// 用例结束时报「!timersPending」。这里只把 bootstrap 换成空实现,
/// 页面里的数据请求仍会走 flutter_test 的假 HTTP(立即 400)。
ShellController shellController() => _StubShellController()
..settings = sampleSettings()
..health = HealthInfo.fromJson(<String, dynamic>{
'ok': true,
'version': '1.0.7',
'platform': 'osx-arm64',
'uiAvailable': true,
});
Future<void> shoot(WidgetTester tester, String name, Widget page,
{Brightness brightness = Brightness.dark,
Size size = const Size(1280, 860)}) async {
// 1280×860:与发布包窗口默认尺寸(1280×720)接近,再多留一点高度看得到
// 底部状态条。像素比 1.0,方便逐像素检查描边和文字。
tester.view.physicalSize = size;
tester.view.devicePixelRatio = 1.0; tester.view.devicePixelRatio = 1.0;
addTearDown(tester.view.reset); addTearDown(tester.view.reset);
// GcColors 是静态取值,截图前先按目标亮度绑定,否则浅色截图仍是深色配色。
GcColors.bind(brightness);
final key = GlobalKey(); final key = GlobalKey();
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
theme: buildGcTheme().copyWith( // 四个页面都用预置数据渲染,不需要后端;字体统一换成测试里加载的
textTheme: buildGcTheme().textTheme.apply( // 那一套,并且清空 fallback —— 否则主题里的按钮 / 输入框样式会去
// 找系统字体(测试环境没有),缺字处就画成方块。
theme: buildGcTheme(
brightness,
fontFamily: 'Noto Sans CJK SC', fontFamily: 'Noto Sans CJK SC',
), fontFamilyFallback: const <String>[],
), ),
home: RepaintBoundary( home: RepaintBoundary(
key: key, key: key,
@@ -144,25 +193,27 @@ void main() {
), ),
); );
await tester.pump(const Duration(milliseconds: 200)); await tester.pump(const Duration(milliseconds: 200));
// 页面里的数据来自真实后端(/api/about、/api/sources 等)。
// flutter_test 默认用假时钟,真实 HTTP 永远不会完成,所以这里用 runAsync
// 让出真实时间,等请求回来后再 pump 出最终画面。
await tester.runAsync(() async {
await Future<void>.delayed(const Duration(milliseconds: 1200));
});
await tester.pump(const Duration(milliseconds: 300));
await tester.runAsync(() async {
await Future<void>.delayed(const Duration(milliseconds: 600));
});
await tester.pump(const Duration(milliseconds: 300)); await tester.pump(const Duration(milliseconds: 300));
final boundary = final boundary =
key.currentContext!.findRenderObject()! as RenderRepaintBoundary; key.currentContext!.findRenderObject()! as RenderRepaintBoundary;
final image = await boundary.toImage(pixelRatio: 1.0); // toImage / toByteData 要走真实引擎的异步管线,必须放在 runAsync 里,
final bytes = await image.toByteData(format: ui.ImageByteFormat.png); // 否则 fake async 时钟不会推进,Future 一直不完成(表现为每个用例卡
// 满 10 分钟超时才返回)。
final stopwatch = Stopwatch()..start();
final image = await tester.runAsync(
() => boundary.toImage(pixelRatio: 1.0),
);
final bytes = await tester.runAsync(
() => image!.toByteData(format: ui.ImageByteFormat.png),
);
final dir = Directory('test/shots')..createSync(recursive: true); final dir = Directory('test/shots')..createSync(recursive: true);
File('${dir.path}/$name.png').writeAsBytesSync(bytes!.buffer.asUint8List()); File('${dir.path}/$name.png').writeAsBytesSync(bytes!.buffer.asUint8List());
stopwatch.stop();
// ignore: avoid_print
print(
'[shots] $name (${brightness.name}) 耗时 ${stopwatch.elapsedMilliseconds} ms');
} }
testWidgets('home', (tester) async { testWidgets('home', (tester) async {
@@ -170,7 +221,8 @@ void main() {
await shoot( await shoot(
tester, tester,
'home', 'home',
HomePageView(controller: sampleController(), initialModels: sampleModels()), HomePageView(
controller: sampleController(), initialModels: sampleModels()),
); );
}); });
@@ -257,7 +309,8 @@ void main() {
testWidgets('settings', (tester) async { testWidgets('settings', (tester) async {
I18n.language.value = 'zh-CN'; I18n.language.value = 'zh-CN';
await shoot(tester, 'settings', SettingsPageView(controller: sampleController())); await shoot(
tester, 'settings', SettingsPageView(controller: sampleController()));
}); });
testWidgets('about', (tester) async { testWidgets('about', (tester) async {
@@ -288,6 +341,103 @@ void main() {
testWidgets('shell', (tester) async { testWidgets('shell', (tester) async {
I18n.language.value = 'zh-CN'; I18n.language.value = 'zh-CN';
await shoot(tester, 'shell', ShellPage(controller: sampleController())); final controller = shellController()
..setUpdateStatus(
visible: true,
busy: false,
progress: 1,
status: '已更新 2 个模型,立即生效',
detail: '模型与启动器均为最新版',
notice: '',
);
await shoot(tester, 'shell', ShellPage(controller: controller));
});
/// 小窗口回归:1024×680 下不应出现溢出条纹或卡片挤压。
testWidgets('home-small', (tester) async {
I18n.language.value = 'zh-CN';
await shoot(
tester,
'home-small',
HomePageView(
controller: sampleController(), initialModels: sampleModels()),
size: const Size(1024, 680),
);
});
testWidgets('download-small', (tester) async {
I18n.language.value = 'zh-CN';
await shoot(
tester,
'download-small',
DownloadPageView(
controller: sampleController(),
initialSources: <SourceInfo>[
SourceInfo.fromJson(<String, dynamic>{
'id': 'github',
'name': 'GitHub',
'url': 'https://github.com/Morris-GC/GC',
'enabled': true,
'builtIn': true,
'host': 'github.com',
}),
],
initialIndex: SourceIndexInfo.fromJson(<String, dynamic>{
'sourceId': 'github',
'root': 'https://github.com/Morris-GC/GC',
'fromCache': false,
'resolvedFrom': 'version.json',
'models': <dynamic>[
<String, dynamic>{
'id': 'sun',
'name': '太阳系',
'description': '观察八大行星的公转轨道与相对大小。',
'version': '1.2',
'sizeText': '2.3 MB',
'installed': true,
},
],
}),
initialJobs: const <JobInfo>[],
),
size: const Size(1024, 680),
);
});
testWidgets('settings-small', (tester) async {
I18n.language.value = 'zh-CN';
await shoot(
tester,
'settings-small',
SettingsPageView(controller: sampleController()),
size: const Size(1024, 680),
);
});
testWidgets('home-light', (tester) async {
I18n.language.value = 'zh-CN';
await shoot(
tester,
'home-light',
HomePageView(
controller: sampleController(), initialModels: sampleModels()),
brightness: Brightness.light,
);
});
testWidgets('settings-light', (tester) async {
I18n.language.value = 'zh-CN';
await shoot(
tester,
'settings-light',
SettingsPageView(controller: sampleController()),
brightness: Brightness.light,
);
}); });
} }
/// 只用于截图的 controller:不连后端,避免挂上重试定时器。
class _StubShellController extends ShellController {
@override
Future<void> bootstrap() async {}
}
+1 -1
View File
@@ -4,7 +4,7 @@ project(gc_ui LANGUAGES CXX)
# The name of the executable created for the application. Change this to change # The name of the executable created for the application. Change this to change
# the on-disk name of your application. # the on-disk name of your application.
set(BINARY_NAME "gc_ui") set(BINARY_NAME "GC-UI")
# Explicitly opt in to modern CMake behaviors to avoid warnings with recent # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
# versions of CMake. # versions of CMake.
+6 -6
View File
@@ -89,13 +89,13 @@ BEGIN
BEGIN BEGIN
BLOCK "040904e4" BLOCK "040904e4"
BEGIN BEGIN
VALUE "CompanyName", "com.morris.gc" "\0" VALUE "CompanyName", "Morris" "\0"
VALUE "FileDescription", "gc_ui" "\0" VALUE "FileDescription", "GC UI" "\0"
VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "FileVersion", VERSION_AS_STRING "\0"
VALUE "InternalName", "gc_ui" "\0" VALUE "InternalName", "GC-UI" "\0"
VALUE "LegalCopyright", "Copyright (C) 2026 com.morris.gc. All rights reserved." "\0" VALUE "LegalCopyright", "Copyright (C) 2026 Morris. All rights reserved." "\0"
VALUE "OriginalFilename", "gc_ui.exe" "\0" VALUE "OriginalFilename", "GC-UI.exe" "\0"
VALUE "ProductName", "gc_ui" "\0" VALUE "ProductName", "Morris GC" "\0"
VALUE "ProductVersion", VERSION_AS_STRING "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0"
END END
END END
+74 -1
View File
@@ -5,8 +5,81 @@
#include "flutter_window.h" #include "flutter_window.h"
#include "utils.h" #include "utils.h"
namespace {
// Enable DPI awareness (Per-Monitor V2 when available).
//
// The runner.exe.manifest normally declares this, but the mingw/windres cross
// build does not embed the manifest the way the Visual Studio generator does.
// A DPI-unaware process gets bitmap-stretched by Windows on a 125% / 150%
// scaled display, which makes the whole UI (especially small CJK text) look
// blurry. Declaring it again before any window exists costs nothing and does
// not depend on the manifest being present.
//
// Every API is resolved through GetProcAddress: it keeps the binary working on
// older systems and does not require the current SDK / mingw headers to declare
// DPI_AWARENESS_CONTEXT.
#if defined(_MSC_VER)
#pragma warning(push)
#pragma warning(disable : 4191) // FARPROC to typed function pointer, on purpose
#endif
BOOL TryPerMonitorV2() {
// DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 == (HANDLE)-4
using Fn = BOOL(WINAPI*)(HANDLE);
HMODULE user32 = ::GetModuleHandleW(L"user32.dll");
if (user32 == nullptr) return FALSE;
auto set_context = reinterpret_cast<Fn>(
::GetProcAddress(user32, "SetProcessDpiAwarenessContext"));
if (set_context == nullptr) return FALSE;
// Cast through INT_PTR: plain -4 to pointer is C4312 at /W4.
return set_context(reinterpret_cast<HANDLE>(static_cast<INT_PTR>(-4)));
}
void TryPerMonitor() {
// Windows 8.1+: PROCESS_PER_MONITOR_DPI_AWARE == 2
using Fn = HRESULT(WINAPI*)(int);
HMODULE shcore = ::LoadLibraryW(L"shcore.dll");
if (shcore == nullptr) return;
auto set_awareness =
reinterpret_cast<Fn>(::GetProcAddress(shcore, "SetProcessDpiAwareness"));
if (set_awareness != nullptr) {
// E_ACCESSDENIED means the manifest already set awareness: still fine.
set_awareness(2);
}
::FreeLibrary(shcore);
}
void TrySystemDpiAware() {
// Windows Vista+: system DPI awareness, better than nothing.
using Fn = BOOL(WINAPI*)();
HMODULE user32 = ::GetModuleHandleW(L"user32.dll");
if (user32 == nullptr) return;
auto set_aware =
reinterpret_cast<Fn>(::GetProcAddress(user32, "SetProcessDPIAware"));
if (set_aware != nullptr) set_aware();
}
#if defined(_MSC_VER)
#pragma warning(pop)
#endif
void EnableDpiAwareness() {
// When the manifest already declared awareness, SetProcessDpiAwarenessContext
// returns FALSE; fall back to the 8.1 and Vista entry points. All three
// failing is harmless: the app still starts, it just scales blurrily.
if (TryPerMonitorV2()) return;
TryPerMonitor();
TrySystemDpiAware();
}
} // namespace
int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
_In_ wchar_t *command_line, _In_ int show_command) { _In_ wchar_t *command_line, _In_ int show_command) {
// Must run before the first window is created to take effect.
EnableDpiAwareness();
// Attach to console when present (e.g., 'flutter run') or create a // Attach to console when present (e.g., 'flutter run') or create a
// new console when running with a debugger. // new console when running with a debugger.
if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) {
@@ -27,7 +100,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
FlutterWindow window(project); FlutterWindow window(project);
Win32Window::Point origin(10, 10); Win32Window::Point origin(10, 10);
Win32Window::Size size(1280, 720); Win32Window::Size size(1280, 720);
if (!window.Create(L"gc_ui", origin, size)) { if (!window.Create(L"Morris GC", origin, size)) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
window.SetQuitOnClose(true); window.SetQuitOnClose(true);
+18 -2
View File
@@ -134,11 +134,27 @@ bool Win32Window::Create(const std::wstring& title,
UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); UINT dpi = FlutterDesktopGetDpiForMonitor(monitor);
double scale_factor = dpi / 96.0; double scale_factor = dpi / 96.0;
// Cap the initial size to the monitor work area. 1280x720 logical is
// 1920x1080 physical at 150% scaling, which no longer fits on a 1080p
// screen; clamping keeps the window usable instead of hanging off-screen.
int physical_width = Scale(size.width, scale_factor);
int physical_height = Scale(size.height, scale_factor);
MONITORINFO monitor_info{};
monitor_info.cbSize = sizeof(MONITORINFO);
if (::GetMonitorInfoW(monitor, &monitor_info)) {
const int max_width =
(monitor_info.rcWork.right - monitor_info.rcWork.left) * 92 / 100;
const int max_height =
(monitor_info.rcWork.bottom - monitor_info.rcWork.top) * 92 / 100;
if (physical_width > max_width) physical_width = max_width;
if (physical_height > max_height) physical_height = max_height;
}
HWND window = CreateWindow( HWND window = CreateWindow(
window_class, title.c_str(), WS_OVERLAPPEDWINDOW, window_class, title.c_str(), WS_OVERLAPPEDWINDOW,
Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), Scale(origin.x, scale_factor), Scale(origin.y, scale_factor),
Scale(size.width, scale_factor), Scale(size.height, scale_factor), physical_width, physical_height, nullptr, nullptr,
nullptr, nullptr, GetModuleHandle(nullptr), this); GetModuleHandle(nullptr), this);
if (!window) { if (!window) {
return false; return false;
-79
View File
@@ -13,30 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GC", "GC", "{3E72BF5C-0B5E-
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{09578AA7-0862-3E52-D2AA-D8F7E863B74B}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{09578AA7-0862-3E52-D2AA-D8F7E863B74B}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC.Tests", "GC\src\test\dotnet\GC.Tests\GC.Tests.csproj", "{D15CB92F-5E5C-4516-8D07-C244FC0CD113}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_sdk", "_sdk", "{26AABC0C-8B8D-F9B8-86B4-01B1A96D59F4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC.ModelSdk", "model\_sdk\GC.ModelSdk\GC.ModelSdk.csproj", "{C8FAB8D5-CAB7-42D7-8A1F-4B79771A2CE0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "model", "model", "{62B8A37E-7066-D91A-6443-87D4E6CE63FE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "earth-rotation", "earth-rotation", "{EBCD2737-5E64-9C5F-5D8B-D0375EC50F43}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{13F93445-B061-AC9E-97CA-8C4FA55DC418}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EarthRotationModel", "model\earth-rotation\src\EarthRotationModel.csproj", "{64556F71-7456-43B2-890C-CF01AD29D386}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "earth-revolution", "earth-revolution", "{0B92F86C-37C2-3C12-904C-85123CE34F4C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EADF0841-BEC2-9A74-4322-069D7B5A6EBB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EarthRevolutionModel", "model\earth-revolution\src\EarthRevolutionModel.csproj", "{6BD9C21B-8F06-4F60-A087-696B6F03CC25}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC.Core", "GC\src\GC.Core.csproj", "{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC.Core", "GC\src\GC.Core.csproj", "{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_sdk", "_sdk", "{6C38EF76-7D14-0C76-0B88-84F29EAA96CD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC-DOWNLOAD", "GC-DOWNLOAD\GC-DOWNLOAD.csproj", "{98F52FEA-43B5-4FE1-97A9-AF644AAFEFA3}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC-DOWNLOAD", "GC-DOWNLOAD\GC-DOWNLOAD.csproj", "{98F52FEA-43B5-4FE1-97A9-AF644AAFEFA3}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC-SAVEDOG", "GC-SAVEDOG\GC-SAVEDOG.csproj", "{B169F2BF-9E60-40BF-824E-0486573DA65E}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC-SAVEDOG", "GC-SAVEDOG\GC-SAVEDOG.csproj", "{B169F2BF-9E60-40BF-824E-0486573DA65E}"
@@ -69,54 +47,6 @@ Global
{2E3BE2DB-1C4B-4EA0-9523-43EE910BD54C}.Release|x64.Build.0 = Release|Any CPU {2E3BE2DB-1C4B-4EA0-9523-43EE910BD54C}.Release|x64.Build.0 = Release|Any CPU
{2E3BE2DB-1C4B-4EA0-9523-43EE910BD54C}.Release|x86.ActiveCfg = Release|Any CPU {2E3BE2DB-1C4B-4EA0-9523-43EE910BD54C}.Release|x86.ActiveCfg = Release|Any CPU
{2E3BE2DB-1C4B-4EA0-9523-43EE910BD54C}.Release|x86.Build.0 = Release|Any CPU {2E3BE2DB-1C4B-4EA0-9523-43EE910BD54C}.Release|x86.Build.0 = Release|Any CPU
{D15CB92F-5E5C-4516-8D07-C244FC0CD113}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D15CB92F-5E5C-4516-8D07-C244FC0CD113}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D15CB92F-5E5C-4516-8D07-C244FC0CD113}.Debug|x64.ActiveCfg = Debug|Any CPU
{D15CB92F-5E5C-4516-8D07-C244FC0CD113}.Debug|x64.Build.0 = Debug|Any CPU
{D15CB92F-5E5C-4516-8D07-C244FC0CD113}.Debug|x86.ActiveCfg = Debug|Any CPU
{D15CB92F-5E5C-4516-8D07-C244FC0CD113}.Debug|x86.Build.0 = Debug|Any CPU
{D15CB92F-5E5C-4516-8D07-C244FC0CD113}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D15CB92F-5E5C-4516-8D07-C244FC0CD113}.Release|Any CPU.Build.0 = Release|Any CPU
{D15CB92F-5E5C-4516-8D07-C244FC0CD113}.Release|x64.ActiveCfg = Release|Any CPU
{D15CB92F-5E5C-4516-8D07-C244FC0CD113}.Release|x64.Build.0 = Release|Any CPU
{D15CB92F-5E5C-4516-8D07-C244FC0CD113}.Release|x86.ActiveCfg = Release|Any CPU
{D15CB92F-5E5C-4516-8D07-C244FC0CD113}.Release|x86.Build.0 = Release|Any CPU
{C8FAB8D5-CAB7-42D7-8A1F-4B79771A2CE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C8FAB8D5-CAB7-42D7-8A1F-4B79771A2CE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C8FAB8D5-CAB7-42D7-8A1F-4B79771A2CE0}.Debug|x64.ActiveCfg = Debug|Any CPU
{C8FAB8D5-CAB7-42D7-8A1F-4B79771A2CE0}.Debug|x64.Build.0 = Debug|Any CPU
{C8FAB8D5-CAB7-42D7-8A1F-4B79771A2CE0}.Debug|x86.ActiveCfg = Debug|Any CPU
{C8FAB8D5-CAB7-42D7-8A1F-4B79771A2CE0}.Debug|x86.Build.0 = Debug|Any CPU
{C8FAB8D5-CAB7-42D7-8A1F-4B79771A2CE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C8FAB8D5-CAB7-42D7-8A1F-4B79771A2CE0}.Release|Any CPU.Build.0 = Release|Any CPU
{C8FAB8D5-CAB7-42D7-8A1F-4B79771A2CE0}.Release|x64.ActiveCfg = Release|Any CPU
{C8FAB8D5-CAB7-42D7-8A1F-4B79771A2CE0}.Release|x64.Build.0 = Release|Any CPU
{C8FAB8D5-CAB7-42D7-8A1F-4B79771A2CE0}.Release|x86.ActiveCfg = Release|Any CPU
{C8FAB8D5-CAB7-42D7-8A1F-4B79771A2CE0}.Release|x86.Build.0 = Release|Any CPU
{64556F71-7456-43B2-890C-CF01AD29D386}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{64556F71-7456-43B2-890C-CF01AD29D386}.Debug|Any CPU.Build.0 = Debug|Any CPU
{64556F71-7456-43B2-890C-CF01AD29D386}.Debug|x64.ActiveCfg = Debug|Any CPU
{64556F71-7456-43B2-890C-CF01AD29D386}.Debug|x64.Build.0 = Debug|Any CPU
{64556F71-7456-43B2-890C-CF01AD29D386}.Debug|x86.ActiveCfg = Debug|Any CPU
{64556F71-7456-43B2-890C-CF01AD29D386}.Debug|x86.Build.0 = Debug|Any CPU
{64556F71-7456-43B2-890C-CF01AD29D386}.Release|Any CPU.ActiveCfg = Release|Any CPU
{64556F71-7456-43B2-890C-CF01AD29D386}.Release|Any CPU.Build.0 = Release|Any CPU
{64556F71-7456-43B2-890C-CF01AD29D386}.Release|x64.ActiveCfg = Release|Any CPU
{64556F71-7456-43B2-890C-CF01AD29D386}.Release|x64.Build.0 = Release|Any CPU
{64556F71-7456-43B2-890C-CF01AD29D386}.Release|x86.ActiveCfg = Release|Any CPU
{64556F71-7456-43B2-890C-CF01AD29D386}.Release|x86.Build.0 = Release|Any CPU
{6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Debug|x64.ActiveCfg = Debug|Any CPU
{6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Debug|x64.Build.0 = Debug|Any CPU
{6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Debug|x86.ActiveCfg = Debug|Any CPU
{6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Debug|x86.Build.0 = Debug|Any CPU
{6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Release|Any CPU.Build.0 = Release|Any CPU
{6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Release|x64.ActiveCfg = Release|Any CPU
{6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Release|x64.Build.0 = Release|Any CPU
{6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Release|x86.ActiveCfg = Release|Any CPU
{6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Release|x86.Build.0 = Release|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|Any CPU.Build.0 = Debug|Any CPU {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x64.ActiveCfg = Debug|Any CPU {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -172,16 +102,7 @@ Global
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{2E3BE2DB-1C4B-4EA0-9523-43EE910BD54C} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} {2E3BE2DB-1C4B-4EA0-9523-43EE910BD54C} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
{09578AA7-0862-3E52-D2AA-D8F7E863B74B} = {3E72BF5C-0B5E-D5BD-DCAE-6B991004B4A5} {09578AA7-0862-3E52-D2AA-D8F7E863B74B} = {3E72BF5C-0B5E-D5BD-DCAE-6B991004B4A5}
{D15CB92F-5E5C-4516-8D07-C244FC0CD113} = {09578AA7-0862-3E52-D2AA-D8F7E863B74B}
{C8FAB8D5-CAB7-42D7-8A1F-4B79771A2CE0} = {26AABC0C-8B8D-F9B8-86B4-01B1A96D59F4}
{EBCD2737-5E64-9C5F-5D8B-D0375EC50F43} = {62B8A37E-7066-D91A-6443-87D4E6CE63FE}
{13F93445-B061-AC9E-97CA-8C4FA55DC418} = {EBCD2737-5E64-9C5F-5D8B-D0375EC50F43}
{64556F71-7456-43B2-890C-CF01AD29D386} = {13F93445-B061-AC9E-97CA-8C4FA55DC418}
{0B92F86C-37C2-3C12-904C-85123CE34F4C} = {62B8A37E-7066-D91A-6443-87D4E6CE63FE}
{EADF0841-BEC2-9A74-4322-069D7B5A6EBB} = {0B92F86C-37C2-3C12-904C-85123CE34F4C}
{6BD9C21B-8F06-4F60-A087-696B6F03CC25} = {EADF0841-BEC2-9A74-4322-069D7B5A6EBB}
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC} = {09578AA7-0862-3E52-D2AA-D8F7E863B74B} {AB63C416-5783-4FB9-A162-5BBA32E8BFCC} = {09578AA7-0862-3E52-D2AA-D8F7E863B74B}
{6C38EF76-7D14-0C76-0B88-84F29EAA96CD} = {62B8A37E-7066-D91A-6443-87D4E6CE63FE}
{98F52FEA-43B5-4FE1-97A9-AF644AAFEFA3} = {BCA2AA3E-F98F-43A1-9D31-239103C303F7} {98F52FEA-43B5-4FE1-97A9-AF644AAFEFA3} = {BCA2AA3E-F98F-43A1-9D31-239103C303F7}
{59BED32E-68DD-4FA2-9A8E-89C71966F30E} = {560E034A-28FD-4D82-ABD0-FBD0C1B0F553} {59BED32E-68DD-4FA2-9A8E-89C71966F30E} = {560E034A-28FD-4D82-ABD0-FBD0C1B0F553}
{33EA353C-FD81-4288-872E-D9404D9E50AF} = {59BED32E-68DD-4FA2-9A8E-89C71966F30E} {33EA353C-FD81-4288-872E-D9404D9E50AF} = {59BED32E-68DD-4FA2-9A8E-89C71966F30E}
-48
View File
@@ -1,48 +0,0 @@
<Application xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:GC.ViewModels"
xmlns:views="using:GC.Views"
x:Class="GC.App"
RequestedThemeVariant="Light">
<Application.DataTemplates>
<DataTemplate DataType="{x:Type vm:HomeViewModel}">
<views:HomeView />
</DataTemplate>
<DataTemplate DataType="{x:Type vm:DownloadViewModel}">
<views:DownloadView />
</DataTemplate>
<DataTemplate DataType="{x:Type vm:SettingsViewModel}">
<views:SettingsView />
</DataTemplate>
<DataTemplate DataType="{x:Type vm:AboutViewModel}">
<views:AboutView />
</DataTemplate>
</Application.DataTemplates>
<Application.Resources>
<Color x:Key="SystemAccentColor">#2F6BFF</Color>
<!--
FluentTheme 的按钮模板在 :pointerover / :pressed 时会用这些主题资源
覆盖 ContentPresenter 的画刷。若与 AppTheme.axaml 里通过 Button 属性
设置的 hover 颜色不一致,两套机制会互相覆盖,导致光标移动时渲染错乱。
这里把它们统一指向与按钮样式相同的颜色。
-->
<SolidColorBrush x:Key="ButtonBackgroundPointerOver">#EDF2FC</SolidColorBrush>
<SolidColorBrush x:Key="ButtonBackgroundPressed">#DDE7F8</SolidColorBrush>
<SolidColorBrush x:Key="ButtonBorderBrushPointerOver">#BAC9E6</SolidColorBrush>
<SolidColorBrush x:Key="ButtonBorderBrushPressed">#9FB4DD</SolidColorBrush>
<SolidColorBrush x:Key="ButtonForegroundPointerOver">#111A2E</SolidColorBrush>
<SolidColorBrush x:Key="ButtonForegroundPressed">#111A2E</SolidColorBrush>
<SolidColorBrush x:Key="AccentButtonBackground">#2F6BFF</SolidColorBrush>
<SolidColorBrush x:Key="AccentButtonBackgroundPointerOver">#1F4FD0</SolidColorBrush>
<SolidColorBrush x:Key="AccentButtonBackgroundPressed">#183FA8</SolidColorBrush>
</Application.Resources>
<Application.Styles>
<FluentTheme />
<StyleInclude Source="avares://GC.Core/Styles/AppTheme.axaml" />
</Application.Styles>
</Application>
-134
View File
@@ -1,134 +0,0 @@
using System;
using System.Threading.Tasks;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using GC.Services;
using GC.ViewModels;
using GC.Views;
namespace GC;
public partial class App : Application
{
public override void Initialize() => AvaloniaXamlLoader.Load(this);
public override void OnFrameworkInitializationCompleted()
{
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{
var services = AppServices.Create();
// 诊断模式:只验证模型程序集能否加载(发布包里也用它做冒烟测试)
if (Environment.GetEnvironmentVariable("EMS_SELFTEST") == "1")
{
var code = SelfTest(services);
Avalonia.Threading.Dispatcher.UIThread.Post(
() => desktop.Shutdown(code), Avalonia.Threading.DispatcherPriority.Background);
return;
}
// 启动加速:先建空窗口并显示,再在首帧之后构造 ViewModel。
// MainViewModel 会扫描模型、加载封面、读设置,同步做会让
// 「双击到看见窗口」明显变慢;先出窗口,内容随后填充。
var window = new MainWindow();
window.Show();
// 健康标记:GC-SAVEDOG 正在等这个文件。主窗口能显示出来,
// 就说明「新版本确实能启动」,它据此决定保留新版还是回滚。
StartupHealth.MarkHealthy(services.Paths.UpdateRoot,
LauncherRuntimeInfo.CurrentLauncherVersion);
// 首帧之后再构造 ViewModel:Post 而非依赖 Opened,
// 因为 Opened 在某些情况下不触发(headless / 部分平台),
// 会导致 DataContext 一直是 null、主页面白屏。
// 扫描模型 / 加载封面在后台线程做,UI 线程只负责赋值,
// 这样窗口能立刻响应,不会卡在白屏。
MainViewModel vm = null!;
Task.Run(() => new MainViewModel(services))
.ContinueWith(t =>
{
vm = t.Result;
Avalonia.Threading.Dispatcher.UIThread.Post(() =>
{
window.DataContext = vm;
WireMainViewModel(vm, window, services, desktop);
}, Avalonia.Threading.DispatcherPriority.Background);
}, System.Threading.Tasks.TaskScheduler.Default);
// 应用图标不依赖 ViewModel,先设好让窗口一出现就有图标
try
{
using var iconStream = Avalonia.Platform.AssetLoader.Open(
new Uri("avares://GC.Core/Assets/icon.png"));
window.Icon = new Avalonia.Controls.WindowIcon(iconStream);
}
catch { /* 图标缺失不影响启动 */ }
desktop.MainWindow = window;
desktop.ShutdownMode = ShutdownMode.OnMainWindowClose;
}
base.OnFrameworkInitializationCompleted();
}
/// <summary>
/// 主窗口显示后再接上 ViewModel:绑定对话框、启动后台更新检查。
/// 拆出来是为了让窗口先出现,模型扫描不影响「双击到出窗口」。
/// </summary>
private static void WireMainViewModel(MainViewModel vm, MainWindow window,
AppServices services, IClassicDesktopStyleApplicationLifetime desktop)
{
_ = desktop;
vm.ConfirmHandler = async message =>
{
var dialog = new ConfirmWindow(message);
return await dialog.ShowDialog<bool>(window);
};
// 发现启动器新版本:弹窗询问,用户选「更新」才下载并安排替换
vm.LauncherUpdateHandler = async newVersion =>
{
var dialog = new ConfirmWindow(
title: "发现新版本",
message: $"启动器有新版本 v{newVersion},是否立即更新?\n\n" +
"更新会下载新版程序,下次启动时自动替换当前版本;" +
"选择取消则继续使用当前版本,但模型仍会更新到最新。",
confirmText: "更新",
cancelText: "取消");
return await dialog.ShowDialog<bool>(window);
};
// 主窗口已显示,后台检查模型 / 启动器更新,不阻塞界面
if (Environment.GetEnvironmentVariable("EMS_NO_UPDATE") != "1")
{
Avalonia.Threading.Dispatcher.UIThread.Post(
() => _ = vm.RunStartupUpdateAsync(),
Avalonia.Threading.DispatcherPriority.Background);
}
}
/// <summary>逐个加载模型,打印结果;返回退出码(0 = 全部成功)。</summary>
private static int SelfTest(AppServices services)
{
var packages = services.Models.Scan();
Console.WriteLine($"模型库: {services.Paths.ModelRoot}");
Console.WriteLine($"模型数: {packages.Count}");
var failed = 0;
foreach (var package in packages)
{
try
{
using var loaded = services.ModelHost.Load(package, () => { });
Console.WriteLine($"OK {package.Id} -> {loaded.View.GetType().FullName}");
}
catch (Exception ex)
{
failed++;
Console.WriteLine($"FAIL {package.Id}: {ex.Message}");
}
}
return failed == 0 ? 0 : 1;
}
}
+6 -2
View File
@@ -5,14 +5,18 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<RootNamespace>GC</RootNamespace> <RootNamespace>GC</RootNamespace>
<AssemblyName>GC.Core</AssemblyName> <AssemblyName>GC.Core</AssemblyName>
<AvaloniaUseCompiledBindingsByDefault>false</AvaloniaUseCompiledBindingsByDefault>
<InvariantGlobalization>false</InvariantGlobalization> <InvariantGlobalization>false</InvariantGlobalization>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<AvaloniaResource Include="Assets\**" /> <!-- 界面仍是 Flutter,但模型由 Avalonia 承载(模型契约返回 Avalonia Control),
所以核心库需要 Avalonia + 模型 SDK,并把 GC-DRAW 的窗口一起编译进来。 -->
<Compile Include="..\..\GC-DRAW\PlayerWindow.cs" /> <Compile Include="..\..\GC-DRAW\PlayerWindow.cs" />
<Compile Remove="test\**\*.cs" /> <Compile Remove="test\**\*.cs" />
<AvaloniaResource Include="Assets\**" />
<!-- 多语言表原先通过 Avalonia 的 avares:// 读取,改为嵌入资源 -->
<EmbeddedResource Include="Assets\i18n\*.json"
LogicalName="GC.Core.Assets.i18n.%(Filename)%(Extension)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
Loaded 100 of 218 files, more files were not shown because too many files have changed in this diff. Show more