30 Commits
Author SHA1 Message Date
Morris 4043ed5e72 Merge pull request 'fix(security): 加固模型安装与本地目录源,防止同机后端伪装' (#33) from fix/security-hardening into main
Reviewed-on: #33
2026-11-20 23:58:13 +00:00
Morris 46ed84475d fix(security): 加固模型安装与本地目录源,防止同机后端伪装
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- 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: #32
2026-11-20 23:39:00 +00:00
远影科技 355ca89a68 feat(courseware): Flutter WebView 还原等高线课件并去除授权验证
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- 原课件 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: #30
2026-11-19 12:45:58 +00:00
Morris 5b628971a9 feat(contour-map): 重写为可交互 3D 等高线模型,新增五大地貌专题
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- 新增 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: #29
2026-11-19 12:25:32 +00:00
Morris ead63e8ffe fix(macos): 模型窗口改由主线程承载,修复启动模型失败与后端崩溃
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
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: #28
2026-11-19 11:59:03 +00:00
Morris 3efdf74258 fix(macos): Release 版补 network 权限,修复启动后无法连接后端
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- 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: #25
2026-11-19 05:48:49 +00:00
Morris 023e9468db fix: 修复模型检测/自动下载与启动器更新
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- 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: #24
2026-11-19 04:37:16 +00:00
Morris b4724d7ca0 perf: 前端页面拆分 + 模型下载断点续传
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- 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: #23
2026-11-18 22:46:00 +00:00
Morris 4bdfb49600 refactor(build): 末次签名去重、删死代码、zip 可复现
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
构建脚本对齐与清理(追加到发布校验 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: 发布一致性校验、日志轮转与构建脚本对齐
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- 新增发布校验脚本(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: #19
2026-11-18 15:13:00 +00:00
Morris fcaacf3b33 1.1.0:版本号同步,关于页补 Git 服务与感谢
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- 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 修复的正式版本号
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
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: #17
2026-11-18 14:18:00 +00:00
lead e67cc63998 feat(ui): 重做启动器界面并修复 DPI 发糊
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- 交叉编译补嵌 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: #16
2026-11-18 13:50:30 +00:00
Morris 22baa6fda9 macOS 的 .GC/bin 也随包分发:守护进程不再落在 .app 根
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- 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: #15
2026-11-18 13:10:16 +00:00
Morris daf218ce71 1.0.11:发布包改为单文件,非本体文件收进 .GC/bin
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- 启动器改成 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 产物改为默认不构建(云端可显式开启)
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- 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
99 changed files with 15902 additions and 3834 deletions

No files matched your search

+4 -1
View File
@@ -57,9 +57,12 @@ jobs:
with: with:
dotnet-version: '8.0.x' dotnet-version: '8.0.x'
- name: 运行 GC.Tests(含离屏渲染 / 清单校验) - name: 运行 GC.Tests(含离屏渲染 / 清单校验 / 日志用例)
run: dotnet run --project GC/src/test/dotnet/GC.Tests/GC.Tests.csproj -c Release 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: frontend:
name: 前端检查(Flutter) name: 前端检查(Flutter)
runs-on: ubuntu-latest runs-on: ubuntu-latest
+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
+1 -1
View File
@@ -22,7 +22,7 @@
--> -->
<AvaloniaVersion>11.3.9</AvaloniaVersion> <AvaloniaVersion>11.3.9</AvaloniaVersion>
<MvvmVersion>8.2.2</MvvmVersion> <MvvmVersion>8.2.2</MvvmVersion>
<Version>1.0.10</Version> <Version>1.1.1</Version>
<Company>Morris</Company> <Company>Morris</Company>
<Product>GC</Product> <Product>GC</Product>
<NeutralLanguage>zh-Hans</NeutralLanguage> <NeutralLanguage>zh-Hans</NeutralLanguage>
+111 -69
View File
@@ -4,20 +4,24 @@ using System.IO;
using System.Net.Http; using System.Net.Http;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using GC.UI.Server;
using Microsoft.AspNetCore.Builder;
namespace GC; namespace GC;
/// <summary> /// <summary>
/// 新界面启动壳。 /// 新界面启动壳。
/// ///
/// 发布包同时带 <c>GC.UI.Server</c>(本地 HTTP 后端 + 模型窗口宿主)和 /// 发布包带 <c>GC-UI</c>(Flutter 前端)时,启动器只做三件事:
/// <c>GC-UI</c>(Flutter 前端)时,启动器只做三件事: /// 1. 在自己的进程里起后端(本地 HTTP API + 模型窗口宿主),等 <c>/api/health</c> 就绪;
/// 1. 拉起后端并等 <c>/api/health</c> 就绪;
/// 2. 拉起 Flutter 窗口; /// 2. 拉起 Flutter 窗口;
/// 3. 界面退出后关掉后端。 /// 3. 界面退出后关掉后端。
/// ///
/// 两个产物缺任意一个就返回 <c>false</c>,由调用方回退到内置 Avalonia 界面—— /// 后端跑在进程内而不是单独一个 exe:两者用的是同一套 .NET 运行时,
/// 这样 `dotnet run`、只编了启动器的开发场景、以及交叉编译缺前端产物的包都能正常打开。 /// 拆成两个自包含进程等于把 60MB 运行时复制两份,发布包会白白大一倍。
///
/// 缺 Flutter 前端时返回 <c>false</c>,由调用方回退到内置 Avalonia 界面——
/// 这样 `dotnet run`、只编了启动器的开发场景都能正常打开。
/// </summary> /// </summary>
internal static class FlutterShell internal static class FlutterShell
{ {
@@ -25,19 +29,29 @@ internal static class FlutterShell
private const int Port = Services.GcUiContract.DefaultPort; private const int Port = Services.GcUiContract.DefaultPort;
private static readonly HttpClient Http = new() { Timeout = TimeSpan.FromSeconds(1.5) }; private static readonly HttpClient Http = new() { Timeout = TimeSpan.FromSeconds(1.5) };
private static Process? _backend;
private static WebApplication? _backend;
public static bool TryRun(string[] args) public static bool TryRun(string[] args)
{ {
var dir = AppContext.BaseDirectory; var dir = AppContext.BaseDirectory;
var backendPath = FindBackend(dir);
var uiPath = FindUi(dir); var uiPath = FindUi(dir);
if (backendPath == null || uiPath == null) return false; if (uiPath == null) return false;
// 本次会话的一次性令牌:进程内后端与 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; var port = Port;
AvaloniaHost? uiHost = null;
if (!IsHealthy(port)) // 用户可能重复启动:只有当端口上已有一个「持有同一令牌」的后端时才复用。
// 同机其他程序即便占端口并返回 200,也没有令牌,会被 IsHealthy 拒绝,
// 于是我们改到下一个端口起自己的后端,绝不把前端交给伪装服务。
if (!IsHealthy(port, token))
{ {
// 端口可能被别的程序占用:17890 起向后试几个,选第一个能起来且健康的。 // 端口可能被别的程序占用:17890 起向后试几个,选第一个能起来且健康的。
var start = Environment.GetEnvironmentVariable(Services.GcUiContract.PortEnvVar) is { Length: > 0 } var start = Environment.GetEnvironmentVariable(Services.GcUiContract.PortEnvVar) is { Length: > 0 }
@@ -46,52 +60,63 @@ internal static class FlutterShell
for (var candidate = start; candidate < start + Services.GcUiContract.PortScanRange; candidate++) for (var candidate = start; candidate < start + Services.GcUiContract.PortScanRange; candidate++)
{ {
var process = Start(backendPath, $"--port {candidate}", dir); var app = TryStartBackend(args, candidate, out var host);
if (process == null) continue; if (app == null) continue;
if (WaitHealthy(candidate, process, TimeSpan.FromSeconds(25))) if (WaitHealthy(candidate, token, TimeSpan.FromSeconds(25)))
{ {
port = candidate; port = candidate;
_backend = process; _backend = app;
uiHost = host;
break; break;
} }
Stop(process); StopBackend(app);
} }
if (_backend == null) return false; if (_backend == null) return false;
} }
AppDomain.CurrentDomain.ProcessExit += (_, _) => Stop(_backend); AppDomain.CurrentDomain.ProcessExit += (_, _) => StopBackend(_backend);
var ui = Start(uiPath, null, dir, port); var ui = Start(uiPath, dir, port, token);
if (ui == null) if (ui == null)
{ {
Stop(_backend); StopBackend(_backend);
_backend = null; _backend = null;
return false; return false;
} }
ui.WaitForExit(); // 前端窗口已拉起。模型窗口由 Avalonia 承载,而 macOS 的 AppKit 要求
Stop(_backend); // 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; _backend = null;
return true; return true;
} }
// ---------------------------------------------------------------- 产物定位 // ---------------------------------------------------------------- 产物定位
private static string? FindBackend(string dir)
{
foreach (var name in OperatingSystem.IsWindows()
? new[] { "GC.UI.Server.exe", "GC.UI.Server" }
: new[] { "GC.UI.Server", "GC.UI.Server.exe" })
{
var path = Path.Combine(dir, name);
if (File.Exists(path)) return path;
}
return null;
}
/// <summary> /// <summary>
/// Flutter 桌面产物。 /// Flutter 桌面产物。
/// macOS 是 <c>GC-UI.app/Contents/MacOS/GC-UI</c>;Windows 是 <c>GC-UI.exe</c>; /// macOS 是 <c>GC-UI.app/Contents/MacOS/GC-UI</c>;Windows 是 <c>GC-UI.exe</c>;
@@ -115,65 +140,85 @@ internal static class FlutterShell
// ---------------------------------------------------------------- 进程管理 // ---------------------------------------------------------------- 进程管理
private static Process? Start(string fileName, string? arguments, string workingDirectory, int port = 0) /// <summary>在本进程内启动后端;端口被占用等失败情况返回 null。</summary>
/// <param name="uiHost">成功时交出模型窗口宿主,由调用方在主线程跑事件循环。</param>
private static WebApplication? TryStartBackend(string[] args, int port, out AvaloniaHost? uiHost)
{ {
uiHost = null;
try try
{ {
var info = new ProcessStartInfo(fileName) var app = BackendServer.Start(args, port, out var host);
{ uiHost = host;
WorkingDirectory = workingDirectory, app.StartAsync().GetAwaiter().GetResult();
UseShellExecute = false, return app;
CreateNoWindow = true,
};
if (!string.IsNullOrEmpty(arguments)) info.Arguments = arguments;
// 把实际端口传给子进程:后端读它监听,前端读它拼 baseUrl。
// 这样换端口不需要重新编译前端。
if (port > 0)
info.Environment[Services.GcUiContract.PortEnvVar] = port.ToString();
// macOS .app 内的二进制也需要可执行位;发布包由 zip 解开时可能丢失。
if (!OperatingSystem.IsWindows())
{
try { File.SetUnixFileMode(fileName, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute); }
catch { /* 权限不足时交给系统判断 */ }
}
return Process.Start(info);
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.Error.WriteLine($"[shell] 启动失败 {fileName}: {ex.Message}"); Console.Error.WriteLine($"[shell] 后端启动失败(端口 {port}): {ex.Message}");
return null; return null;
} }
} }
private static void Stop(Process? process) private static void StopBackend(WebApplication? app)
{ {
if (process == null) return; if (app == null) return;
try try
{ {
if (!process.HasExited) process.Kill(entireProcessTree: true); using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(3));
app.StopAsync(cts.Token).GetAwaiter().GetResult();
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.Error.WriteLine($"[shell] 关闭后端失败: {ex.Message}"); Console.Error.WriteLine($"[shell] 关闭后端失败: {ex.Message}");
} }
finally }
private static Process Start(string fileName, string workingDirectory, int port, string token)
{
var info = new ProcessStartInfo(fileName)
{ {
process.Dispose(); 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)!;
} }
// ---------------------------------------------------------------- 健康检查 // ---------------------------------------------------------------- 健康检查
private static bool IsHealthy(int port) /// <summary>
/// 健康探测必须带本次会话令牌:后端校验通过才说明这是「我们拉起的那个后端」。
/// 同机伪装进程即使返回 HTTP 200,也因为没有令牌而拿不到 200(后端会 401),
/// 但这里额外再比对响应体里的密钥指纹,双保险——即便对方原样回一个 200 也骗不过。
/// </summary>
private static bool IsHealthy(int port, string token)
{ {
try try
{ {
using var response = Http.GetAsync($"http://127.0.0.1:{port}/api/health") using var request = new HttpRequestMessage(HttpMethod.Get, $"http://127.0.0.1:{port}/api/health");
.GetAwaiter().GetResult(); request.Headers.TryAddWithoutValidation(Services.GcUiContract.TokenHeader, token);
return response.IsSuccessStatusCode; 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 catch
{ {
@@ -181,15 +226,12 @@ internal static class FlutterShell
} }
} }
private static bool WaitHealthy(int port, Process backend, TimeSpan timeout) private static bool WaitHealthy(int port, string token, TimeSpan timeout)
{ {
var deadline = DateTime.UtcNow + timeout; var deadline = DateTime.UtcNow + timeout;
while (DateTime.UtcNow < deadline) while (DateTime.UtcNow < deadline)
{ {
// 后端进程已经退出就没必要再等:端口被占、依赖缺失都会走这里。 if (IsHealthy(port, token)) return true;
if (backend.HasExited) return false;
if (IsHealthy(port)) return true;
Thread.Sleep(250); Thread.Sleep(250);
} }
return false; return false;
+6
View File
@@ -17,9 +17,15 @@
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" /> <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<!-- 后端以库的方式编进启动器:发布包只需要一个 exe,不用再带一份运行时 -->
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</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>
+112 -7
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;
@@ -29,10 +32,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 按策略裁决;
// 这里至少要把失败如实记下来,不能静默丢弃(与其他远程源行为一致)。
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 +64,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 +80,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 +116,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 +212,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 +220,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;
+20 -2
View File
@@ -194,8 +194,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))
+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}");
}
} }
+19 -8
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;
@@ -152,24 +154,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; }
}
}
+5 -1
View File
@@ -24,10 +24,14 @@ public static class SavedogLauncher
var home = Path.Combine(paths.SafedogRoot, name); var home = Path.Combine(paths.SafedogRoot, name);
if (File.Exists(home)) return home; 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;
// 新包把守护进程放在 safedog/ 子目录 // 1.0.10 及更早的包把守护进程放在 safedog/ 子目录
var packaged = Path.Combine(install, "safedog", name); var packaged = Path.Combine(install, "safedog", name);
if (File.Exists(packaged)) return packaged; if (File.Exists(packaged)) return packaged;
+66 -3
View File
@@ -84,12 +84,21 @@ 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}"); $"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}" + $"Manifest trust: {verification.Trust}" +
@@ -498,7 +507,7 @@ internal sealed class Applier
/// 1. 安装目录里「新版没有」的条目 → 移到 backup(旧版本残留,如上一版的旧文件名); /// 1. 安装目录里「新版没有」的条目 → 移到 backup(旧版本残留,如上一版的旧文件名);
/// 2. 与新版同名的条目 → 先移到 backup,再把新版放进来(覆盖正在被占用的文件会失败, /// 2. 与新版同名的条目 → 先移到 backup,再把新版放进来(覆盖正在被占用的文件会失败,
/// 这种情况直接报错并还原,绝不留下半新半旧的目录); /// 这种情况直接报错并还原,绝不留下半新半旧的目录);
/// 3. `.GC`、更新目录自身、正在运行的 GC-SAVEDOG.exe 一律跳过。 /// 3. `.GC` 只合并 `bin/`(非本体文件),其余子目录与更新目录自身一律跳过。
/// ///
/// 返回 false 时调用方应调用 <see cref="RestoreFromBackup"/> 还原。 /// 返回 false 时调用方应调用 <see cref="RestoreFromBackup"/> 还原。
/// </summary> /// </summary>
@@ -518,6 +527,14 @@ internal sealed class Applier
foreach (var entry in Directory.GetFileSystemEntries(stage)) foreach (var entry in Directory.GetFileSystemEntries(stage))
{ {
var name = Path.GetFileName(entry); 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)) if (IsProtected(name))
{ {
// 例如 GC-SAVEDOG.exe:本进程正在运行,Windows 上无法替换。 // 例如 GC-SAVEDOG.exe:本进程正在运行,Windows 上无法替换。
@@ -575,6 +592,52 @@ internal sealed class Applier
} }
} }
/// <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> /// <summary>
/// 把备份里的条目原样搬回安装目录,撤掉新装的内容。 /// 把备份里的条目原样搬回安装目录,撤掉新装的内容。
/// <paramref name="BackupPath"/> 为 null 表示这一项是新包里独有的(没有旧版本), /// <paramref name="BackupPath"/> 为 null 表示这一项是新包里独有的(没有旧版本),
@@ -623,7 +686,7 @@ internal sealed class Applier
/// <summary> /// <summary>
/// 安装目录里不该被更新碰的东西: /// 安装目录里不该被更新碰的东西:
/// · .GC —— 模型库、设置、日志、更新目录本身都在这里; /// · .GC —— 模型库、设置、日志、更新目录本身都在这里(只有 bin/ 由 MergeGcBin 单独处理);
/// · GC-SAVEDOG.exe —— 本进程正在运行,Windows 上无法替换。 /// · GC-SAVEDOG.exe —— 本进程正在运行,Windows 上无法替换。
/// </summary> /// </summary>
private static bool IsProtected(string name) private static bool IsProtected(string name)
+5
View File
@@ -37,6 +37,11 @@
<DebugType>none</DebugType> <DebugType>none</DebugType>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<!-- 应用器测试要直接构造 Applier(internal):只对测试程序集放开可见性 -->
<InternalsVisibleTo Include="GC.Savedog.Tests" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<!-- 与启动器共用同一份安全实现,避免两套逻辑各说各话。 <!-- 与启动器共用同一份安全实现,避免两套逻辑各说各话。
ManifestLoader 依赖启动器的 RepoVersion 模型,守护进程不需要,排除。 --> ManifestLoader 依赖启动器的 RepoVersion 模型,守护进程不需要,排除。 -->
+21 -1
View File
@@ -69,7 +69,8 @@ Windows 还需要 **VS Build Tools 的「使用 C++ 的桌面开发」工作负
```bash ```bash
# 按构建主机自动选目标,每条产物都带 Flutter 前端: # 按构建主机自动选目标,每条产物都带 Flutter 前端:
# macOS 主机 → mac-arm64(原生)+ win-amd64 / win-arm64(mingw 交叉) # macOS 主机 → mac-arm64(原生)+ win-amd64 / win-arm64(mingw 交叉)
# Linux 主机 → linux-arm64(仅 aarch64 主机)+ win-amd64 / win-arm64(mingw 交叉) # Linux 主机 → win-amd64 / win-arm64(mingw 交叉)
# Linux 产物默认不出:需 aarch64 主机 + GC_BUILD_LINUX=1
# Windows 主机 → win-amd64 / win-arm64(原生) # Windows 主机 → win-amd64 / win-arm64(原生)
./build.sh build ./build.sh build
@@ -136,6 +137,25 @@ GC-UI.exe flutter_windows.dll data/{icudtl.dat, app.so, flutter_assets/}
- `Runner.rc` 在 windres 下有两处不兼容:图标用反斜杠相对路径、`VERSION_AS_STRING` - `Runner.rc` 在 windres 下有两处不兼容:图标用反斜杠相对路径、`VERSION_AS_STRING`
依赖命令行传 `-D` 的转义字符串。脚本生成一份路径与宏都已规整的 rc 副本再编译。 依赖命令行传 `-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 `.gitea/workflows` 里的 `windows` 任务仍然跑在 `windows-latest` 上;若手头只有 macOS/Linux
构建机,可以把该任务的 `runs-on` 换成对应标签,直接复用这套交叉编译脚本, 构建机,可以把该任务的 `runs-on` 换成对应标签,直接复用这套交叉编译脚本,
不再需要 VS Build Tools。 不再需要 VS Build Tools。
+30 -5
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
@@ -145,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-清单)。
## 「关于」页展示的技术栈 ## 「关于」页展示的技术栈
+2 -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,
+46 -40
View File
@@ -29,7 +29,9 @@ public sealed class AvaloniaHost
private readonly AppServices _services; private readonly AppServices _services;
private readonly object _gate = new(); private readonly object _gate = new();
private readonly Dictionary<string, PlayerWindow> _windows = new(StringComparer.OrdinalIgnoreCase); 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 事件循环跑起来」。
///
/// 关键点:macOS 的 AppKit 要求 NSApplication 在**主线程**。以前这里把
/// <c>StartWithClassicDesktopLifetime</c> 丢到一个新建的后台线程里跑,在 macOS 上
/// 会直接崩掉整个后端进程(表现为点「启动模型」界面无反应、随后后端消失)。
/// 现在改为由启动器在主线程调用 <see cref="RunOnCurrentThread"/>,
/// 这里只等待就绪信号。
/// </summary>
public Task<bool> EnsureStartedAsync() => _ready.Task;
/// <summary>
/// 必须在 UI 主线程调用。启动 Avalonia 桌面生命周期并阻塞,直到 <see cref="Shutdown"/>。
/// 返回后(或初始化失败后)调用方负责收尾。
/// </summary>
public void RunOnCurrentThread()
{ {
lock (_gate) if (Interlocked.Exchange(ref _started, 1) == 1) return;
try
{ {
_startTask ??= Task.Run(StartCore); AppBuilder.Configure<HostApp>()
return _startTask; .UsePlatformDetect()
.AfterSetup(_ =>
{
IsAvailable = true;
_ready.TrySetResult(true);
})
.StartWithClassicDesktopLifetime(Array.Empty<string>());
}
catch (Exception ex)
{
// 无桌面会话(CI / 无头环境):模型窗口不可用,但后端其余接口照常。
LastError = ex.Message;
_ready.TrySetResult(false);
} }
} }
private bool StartCore() /// <summary>从任意线程请求结束事件循环,使 <see cref="RunOnCurrentThread"/> 返回。</summary>
public void Shutdown()
{ {
var ready = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously); if (_started == 0) return;
try
var thread = new Thread(() =>
{ {
try Dispatcher.UIThread.Post(() =>
{ {
AppBuilder.Configure<HostApp>() if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
.UsePlatformDetect() desktop.Shutdown();
.AfterSetup(_ => ready.TrySetResult(true)) });
.StartWithClassicDesktopLifetime(Array.Empty<string>());
}
catch (Exception ex)
{
LastError = ex.Message;
ready.TrySetResult(false);
}
})
{
IsBackground = true,
Name = "gc-ui-avalonia"
};
// Windows 上 Avalonia 需要 STA 线程;macOS / Linux 不支持也不必要。
if (OperatingSystem.IsWindows())
{
try { thread.SetApartmentState(ApartmentState.STA); }
catch { /* 忽略:部分运行时不允许设置 */ }
} }
catch
thread.Start();
if (!ready.Task.Wait(TimeSpan.FromSeconds(30)))
{ {
LastError = "图形环境初始化超时"; // 事件循环尚未建立或已退出:无需处理
return false;
} }
IsAvailable = ready.Task.Result;
return IsAvailable;
} }
/// <summary>在 Avalonia UI 线程上加载模型并打开它自己的窗口。</summary> /// <summary>在 Avalonia UI 线程上加载模型并打开它自己的窗口。</summary>
+708
View File
@@ -0,0 +1,708 @@
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), out _);
/// <summary>同上,并交出模型窗口宿主(独立进程入口用:主线程留给 Avalonia)。</summary>
public static WebApplication StartFromCommandLine(string[] args, out AvaloniaHost uiHost)
=> Start(args, ResolvePort(args), out uiHost);
/// <summary>
/// 构建后端。返回的 <see cref="WebApplication"/> 尚未启动:
/// 独立进程直接 <c>Run()</c>,启动器用 <c>StartAsync()</c> 之后继续拉起界面。
/// </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 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();
});
}
// ---- 健康检查 -------------------------------------------------------------
app.MapGet("/api/health", () => Results.Ok(new HealthDto(
true,
LauncherRuntimeInfo.CurrentLauncherVersion,
LauncherRuntimeInfo.CurrentRid,
host.IsAvailable,
host.LastError,
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));
});
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()));
});
// ---- 关于 -----------------------------------------------------------------
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);
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)
{
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}");
}
}
/// <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;
}
}
+13 -656
View File
@@ -1,665 +1,22 @@
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.Hosting;
using Microsoft.Extensions.Logging;
// --------------------------------------------------------------------------- // 独立进程入口:`GC.UI.Server --port 17890`
// GC-UI 后端:本地 HTTP 服务(只监听 127.0.0.1)。 // 启动器在进程内直接调用 BackendServer.Start,不会走到这里。
// var app = BackendServer.StartFromCommandLine(args, out var host);
// 它把原来 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); // 模型窗口由 Avalonia 承载,macOS 的 AppKit 要求 NSApplication 在主线程。
// 所以后端交给 Kestrel 自己的线程池在后台跑,主线程留给 Avalonia 事件循环。
app.StartAsync().GetAwaiter().GetResult();
host.RunOnCurrentThread();
// 下载模块(GC-DOWNLOAD)通过宿主钩子注入,和 GC-BOOT 的做法一致。 if (host.IsAvailable)
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}");
// 本地伴随进程:限制请求体大小、关闭 Server 头、收紧超时,减少被本地恶意页面
// 或异常客户端拖垮的攻击面。
builder.WebHost.ConfigureKestrel(options =>
{ {
options.AddServerHeader = false; // 事件循环结束 → 收尾后端
options.Limits.MaxRequestBodySize = 2 * 1024 * 1024; app.StopAsync().GetAwaiter().GetResult();
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();
});
// ---- 健康检查 -------------------------------------------------------------
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, 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));
});
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 uiHost.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()));
});
// ---- 关于 -----------------------------------------------------------------
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);
Console.WriteLine($"[GC-UI] 后端已启动: http://127.0.0.1:{port}");
Console.WriteLine($"[GC-UI] 模型库: {services.Paths.ModelRoot}");
app.Run();
// ---------------------------------------------------------------------------
// 局部辅助
// ---------------------------------------------------------------------------
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;
} }
else
static void WriteEndpointFile(AppServices services, int port)
{ {
try // 无图形环境(无头调试):退化为纯后端常驻
{ app.WaitForShutdown();
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}");
}
}
/// <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);
} }
+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>
+30 -5
View File
@@ -397,27 +397,45 @@ class GcApi {
final String baseUrl; final String baseUrl;
/// 启动器注入的一次性会话令牌。后端在发布包模式下会校验它,
/// 防止前端误连到同机其他进程伪造的「后端」。
static final 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'];
return (fromEnv != null && fromEnv.isNotEmpty) ? fromEnv : null;
}
/// 带会话令牌的请求头;没有令牌时返回 const 空 map(调试/独立后端模式)。
Map<String, String> get _authHeaders =>
_sessionToken == null ? const {} : {'X-GC-UI-Token': _sessionToken!};
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}) 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 _client.get(uri).timeout(const Duration(seconds: 30)); response = await _client.get(uri, headers: auth)
.timeout(const Duration(seconds: 30));
break; break;
case 'POST': case 'POST':
response = await _client 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(const Duration(seconds: 120));
break; break;
case 'DELETE': case 'DELETE':
response = await _client.delete(uri).timeout(const Duration(seconds: 30)); response = await _client.delete(uri, headers: auth)
.timeout(const Duration(seconds: 30));
break; break;
default: default:
throw ApiException('不支持的方法 $method'); throw ApiException('不支持的方法 $method');
@@ -516,6 +534,13 @@ 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();
}
} }
+12
View File
@@ -13,6 +13,7 @@ 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': '关于',
@@ -138,11 +139,17 @@ class I18n {
'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': '地理学科内容指导',
}, },
'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',
@@ -268,6 +275,11 @@ class I18n {
'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',
}, },
}; };
+2
View File
@@ -42,6 +42,8 @@ class _GcUiAppState extends State<GcUiApp> {
return MaterialApp( return MaterialApp(
title: 'Morris GC', title: 'Morris GC',
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
// 桌面端不要移动端那套拉伸回弹和边缘光晕。
scrollBehavior: const GcScrollBehavior(),
theme: buildGcTheme(Brightness.light), theme: buildGcTheme(Brightness.light),
darkTheme: buildGcTheme(Brightness.dark), darkTheme: buildGcTheme(Brightness.dark),
themeMode: mode, themeMode: mode,
File diff suppressed because it is too large. Load diff
+405
View File
@@ -0,0 +1,405 @@
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;
@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;
});
}
}
@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),
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')),
),
],
);
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),
),
),
],
);
}
}
+579
View File
@@ -0,0 +1,579 @@
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 {
final sources = await widget.controller.api.sources();
final preferred = sources.where((s) => s.enabled).toList();
final selected = _selectedSourceId ??
(preferred.isNotEmpty
? preferred.first.id
: (sources.isNotEmpty ? sources.first.id : ''));
final index = selected.isEmpty
? null
: await widget.controller.api.remoteModels(sourceId: selected);
if (!mounted) return;
setState(() {
_sources = sources;
_selectedSourceId = selected;
_index = index;
_loading = false;
});
await _refreshJobs();
} 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),
if (model.installed)
OutlinedButton(
onPressed: () => _download(model),
child: Text(T('dl.reinstall')),
)
else
FilledButton(
onPressed: () => _download(model),
child: Text(T('dl.download')),
),
],
),
);
}
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;
}
}
}
+690
View File
@@ -0,0 +1,690 @@
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 {
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,
),
),
),
),
);
}
}
+699
View File
@@ -0,0 +1,699 @@
import 'dart:async';
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) {
final current =
GcPalette.parseHex(settings.accentColor) ?? GcPalette.defaultAccent;
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'));
},
),
const SizedBox(height: GcSpace.xl),
GcHint(T('set.accent.desc')),
const SizedBox(height: GcSpace.md + 2),
Wrap(
spacing: GcSpace.sm + 2,
runSpacing: GcSpace.sm + 2,
children: <Widget>[
for (final color in GcPalette.presets)
_accentSwatch(color, current),
_customAccentChip(),
],
),
const SizedBox(height: GcSpace.md),
Text(
'${T('set.accent')}: ${GcPalette.toHex(current)}',
style: TextStyle(
fontSize: 11.5,
height: 1.4,
color: GcColors.faint,
),
),
],
),
);
}
Widget _accentSwatch(Color color, Color current) {
final selected = color.value == current.value;
return Tooltip(
message: GcPalette.toHex(color),
child: GestureDetector(
onTap: () => _applyAccent(GcPalette.toHex(color)),
child: Container(
width: 34,
height: 34,
decoration: BoxDecoration(
color: color,
borderRadius: BorderRadius.circular(GcRadius.control),
border: Border.all(
color: selected ? GcColors.ink : Colors.transparent,
width: 2,
),
),
child: selected
? Icon(
Icons.check_rounded,
size: 18,
color: color.computeLuminance() > 0.42
? const Color(0xFF0A1226)
: Colors.white,
)
: null,
),
),
);
}
Widget _customAccentChip() {
return MouseRegion(
cursor: SystemMouseCursors.click,
child: GestureDetector(
onTap: _pickCustomAccent,
child: Container(
height: 34,
padding: const EdgeInsets.symmetric(horizontal: GcSpace.md),
decoration: BoxDecoration(
color: GcColors.surfaceAlt,
borderRadius: BorderRadius.circular(GcRadius.control),
border: Border.all(color: GcColors.line),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Icon(Icons.colorize_rounded, size: 16, color: GcColors.faint),
const SizedBox(width: GcSpace.xs + 2),
Text(
T('set.accent.custom'),
style: TextStyle(
fontSize: 12,
height: 1.3,
color: GcColors.muted,
),
),
],
),
),
),
);
}
Future<void> _pickCustomAccent() async {
final controller = TextEditingController(
text: GcPalette.toHex(GcPalette.accent.value),
);
final hex = await showDialog<String>(
context: context,
builder: (context) => AlertDialog(
backgroundColor: GcColors.surface,
title: Text(T('set.accent.custom')),
content: TextField(
controller: controller,
autofocus: true,
style: Theme.of(context).textTheme.bodyLarge!.copyWith(fontSize: 13),
decoration: InputDecoration(
hintText: '#8FB6FF',
helperText: T('set.accent.hexHint'),
),
onSubmitted: (value) => Navigator.of(context).pop(value),
),
actions: <Widget>[
TextButton(
onPressed: () => Navigator.of(context).pop(),
child: Text(T('common.cancel')),
),
FilledButton(
onPressed: () => Navigator.of(context).pop(controller.text),
child: Text(T('common.confirm')),
),
],
),
);
controller.dispose();
if (hex != null) await _applyAccent(hex);
}
Future<void> _applyAccent(String hex) async {
final parsed = GcPalette.parseHex(hex);
if (parsed == null) {
if (mounted) setState(() => _status = T('set.accent.invalid'));
return;
}
final normalized = GcPalette.toHex(parsed);
GcPalette.apply(normalized); // 立即预览
await widget.controller
.saveSettings(SettingsPatch(accentColor: normalized));
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,
),
],
),
);
}
}
+194 -89
View File
@@ -14,12 +14,32 @@ 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'),
]; ];
/// 桌面端滚动行为:去掉移动端的拉伸回弹和边缘光晕,滚轮更跟手。
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});
@@ -52,6 +72,7 @@ class _ShellPageState extends State<ShellPage> {
body: Row( body: 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>[
@@ -69,15 +90,18 @@ 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),
), ),
); );
} }
@@ -104,10 +128,13 @@ class _ShellPageState extends State<ShellPage> {
Widget _buildPage(ShellController controller, int index) { Widget _buildPage(ShellController controller, int index) {
switch (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);
default: default:
return HomePageView(controller: controller); return HomePageView(controller: controller);
@@ -124,52 +151,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: Text(
'◎',
style: TextStyle(fontSize: 14, color: GcColors.accent),
),
),
const SizedBox(width: 10),
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),
), ),
), ),
), ),
@@ -181,25 +181,91 @@ 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(
'v${settings?.version ?? '—'}', crossAxisAlignment: CrossAxisAlignment.start,
style: TextStyle(fontSize: 10.5, color: GcColors.faint), children: <Widget>[
), Text(
), 'v${settings?.version ?? '—'}',
Padding( style: TextStyle(
padding: const EdgeInsets.only(left: 14, top: 2), fontSize: 12,
child: Text( height: 1.4,
settings?.platform ?? '—', fontWeight: FontWeight.w600,
style: const TextStyle(fontSize: 10, color: Color(0xFF4F6080)), color: GcColors.muted,
),
),
const SizedBox(height: 2),
Text(
settings?.platform ?? '—',
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,
),
),
],
),
),
],
);
}
} }
class _NavButton extends StatelessWidget { class _NavButton extends StatelessWidget {
@@ -216,29 +282,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,
), ),
), ),
], ],
@@ -262,20 +333,28 @@ class _UpdateBar extends StatelessWidget {
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>[
Text('⟳', Icon(
style: TextStyle(fontSize: 16, color: GcColors.accent)), Icons.sync_rounded,
const SizedBox(width: 12), 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: TextStyle( style: TextStyle(
fontSize: 12.5, fontSize: 13,
height: 1.35,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: GcColors.ink, color: GcColors.ink,
), ),
@@ -284,23 +363,41 @@ class _UpdateBar extends StatelessWidget {
if (controller.updateDetail.isNotEmpty) if (controller.updateDetail.isNotEmpty)
Text( Text(
controller.updateDetail, controller.updateDetail,
style: 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: 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
@@ -324,24 +421,32 @@ 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>[
Text( Row(
T('common.error'), children: <Widget>[
style: TextStyle( Icon(Icons.error_outline_rounded,
fontSize: 17, size: 20, color: GcColors.danger),
fontWeight: FontWeight.w600, const SizedBox(width: GcSpace.sm),
color: GcColors.ink, Text(
), T('common.error'),
style: TextStyle(
fontSize: 16,
height: 1.35,
fontWeight: FontWeight.w600,
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), 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
@@ -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>
@@ -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>
@@ -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>
+78 -1
View File
@@ -62,6 +62,70 @@ 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.dev"
source: hosted
version: "6.1.5"
flutter_inappwebview_android:
dependency: transitive
description:
name: flutter_inappwebview_android
sha256: "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba"
url: "https://pub.dev"
source: hosted
version: "1.1.3"
flutter_inappwebview_internal_annotations:
dependency: transitive
description:
name: flutter_inappwebview_internal_annotations
sha256: "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd"
url: "https://pub.dev"
source: hosted
version: "1.2.0"
flutter_inappwebview_ios:
dependency: transitive
description:
name: flutter_inappwebview_ios
sha256: "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d"
url: "https://pub.dev"
source: hosted
version: "1.1.2"
flutter_inappwebview_macos:
dependency: transitive
description:
name: flutter_inappwebview_macos
sha256: c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1
url: "https://pub.dev"
source: hosted
version: "1.1.2"
flutter_inappwebview_platform_interface:
dependency: transitive
description:
name: flutter_inappwebview_platform_interface
sha256: cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500
url: "https://pub.dev"
source: hosted
version: "1.3.0+1"
flutter_inappwebview_web:
dependency: transitive
description:
name: flutter_inappwebview_web
sha256: "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598"
url: "https://pub.dev"
source: hosted
version: "1.1.2"
flutter_inappwebview_windows:
dependency: transitive
description:
name: flutter_inappwebview_windows
sha256: "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055"
url: "https://pub.dev"
source: hosted
version: "0.6.0"
flutter_lints: flutter_lints:
dependency: "direct dev" dependency: "direct dev"
description: description:
@@ -75,6 +139,11 @@ 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:
@@ -155,6 +224,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
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.dev"
source: hosted
version: "2.1.8"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
@@ -242,4 +319,4 @@ packages:
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
+150 -24
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,9 +148,26 @@ void main() {
'uiAvailable': true, 'uiAvailable': true,
}); });
/// 外壳用的 controller:bootstrap 直接返回,不去连后端。
///
/// 真 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, Future<void> shoot(WidgetTester tester, String name, Widget page,
{Brightness brightness = Brightness.dark}) async { {Brightness brightness = Brightness.dark,
tester.view.physicalSize = const Size(1280, 820); 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);
@@ -136,10 +178,13 @@ void main() {
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
theme: buildGcTheme(brightness).copyWith( // 四个页面都用预置数据渲染,不需要后端;字体统一换成测试里加载的
textTheme: buildGcTheme(brightness).textTheme.apply( // 那一套,并且清空 fallback —— 否则主题里的按钮 / 输入框样式会去
fontFamily: 'Noto Sans CJK SC', // 找系统字体(测试环境没有),缺字处就画成方块。
), theme: buildGcTheme(
brightness,
fontFamily: 'Noto Sans CJK SC',
fontFamilyFallback: const <String>[],
), ),
home: RepaintBoundary( home: RepaintBoundary(
key: key, key: key,
@@ -148,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 {
@@ -174,7 +221,8 @@ void main() {
await shoot( await shoot(
tester, tester,
'home', 'home',
HomePageView(controller: sampleController(), initialModels: sampleModels()), HomePageView(
controller: sampleController(), initialModels: sampleModels()),
); );
}); });
@@ -261,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 {
@@ -292,7 +341,77 @@ 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 { testWidgets('home-light', (tester) async {
@@ -300,7 +419,8 @@ void main() {
await shoot( await shoot(
tester, tester,
'home-light', 'home-light',
HomePageView(controller: sampleController(), initialModels: sampleModels()), HomePageView(
controller: sampleController(), initialModels: sampleModels()),
brightness: Brightness.light, brightness: Brightness.light,
); );
}); });
@@ -315,3 +435,9 @@ void main() {
); );
}); });
} }
/// 只用于截图的 controller:不连后端,避免挂上重试定时器。
class _StubShellController extends ShellController {
@override
Future<void> bootstrap() async {}
}
+73
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()) {
+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;
+3 -2
View File
@@ -10,11 +10,12 @@ namespace GC.Services;
/// &lt;安装目录&gt;/ /// &lt;安装目录&gt;/
/// GCL(.exe | .app/...) /// GCL(.exe | .app/...)
/// .GC/ /// .GC/
/// settings.json 设置与已安装版本记录 /// bin/ 非本体文件(守护进程等,随包分发,更新时整目录替换)
/// config/ 设置与已安装版本记录(settings.json)
/// model/ 模型(启动时下载) /// model/ 模型(启动时下载)
/// cache/ 下载缓存 / 原子替换暂存 /// cache/ 下载缓存 / 原子替换暂存
/// update/ 待下次启动应用的启动器更新包 /// update/ 待下次启动应用的启动器更新包
/// safedog/ 更新守护进程(首次启动从安装包复制过来) /// safedog/ 更新守护进程的运行副本(首次启动从 .GC/bin 复制过来)
/// logs/ 日志,按天分中英两份:gc-YYYYMMDD.log / .en.log /// logs/ 日志,按天分中英两份:gc-YYYYMMDD.log / .en.log
/// </code> /// </code>
/// 开发态同样使用仓库根 .GC/model,并自动同步仓库 model/ 的可分发部分。 /// 开发态同样使用仓库根 .GC/model,并自动同步仓库 model/ 的可分发部分。
+3
View File
@@ -61,6 +61,9 @@ public static class ContributorsService
["2509_92447106"] = "Morris", ["2509_92447106"] = "Morris",
["chenmoyuan1214@qq.com"] = "Morris", ["chenmoyuan1214@qq.com"] = "Morris",
["morris@xhmcl.com"] = "Morris", ["morris@xhmcl.com"] = "Morris",
// 早期提交用的是 xhgit 这个账号,展示名统一成 itxiaohui
["xhgit"] = "itxiaohui",
["itxiaohui"] = "itxiaohui",
}; };
/// <summary>自动化提交(CI / 助手账号),不计入开发者。</summary> /// <summary>自动化提交(CI / 助手账号),不计入开发者。</summary>
+31
View File
@@ -172,6 +172,16 @@ public static class GcUiContract
/// <summary>传给后端与前端的环境变量名。</summary> /// <summary>传给后端与前端的环境变量名。</summary>
public const string PortEnvVar = "GC_UI_PORT"; public const string PortEnvVar = "GC_UI_PORT";
/// <summary>
/// 启动器为本次会话生成的一次性令牌,经环境变量同时传给进程内后端与 Flutter 前端。
/// 前端每个请求都要带该令牌,后端据此确认对方是自己拉起的那个前端;
/// 同机伪装进程即便占了端口,也没有令牌,无法被前端当成后端复用。
/// </summary>
public const string TokenEnvVar = "GC_UI_TOKEN";
/// <summary>前端携带一次性令牌的请求头。</summary>
public const string TokenHeader = "X-GC-UI-Token";
/// <summary>读取环境变量里指定的端口;非法或未设置时返回 <see cref="DefaultPort"/>。</summary> /// <summary>读取环境变量里指定的端口;非法或未设置时返回 <see cref="DefaultPort"/>。</summary>
public static int PortFromEnvironment() public static int PortFromEnvironment()
{ {
@@ -180,4 +190,25 @@ public static class GcUiContract
? port ? port
: DefaultPort; : DefaultPort;
} }
/// <summary>生成 256 位会话令牌(hex);cryptographically random,无法预测。</summary>
public static string NewSessionToken()
{
var bytes = new byte[32];
System.Security.Cryptography.RandomNumberGenerator.Fill(bytes);
return Convert.ToHexString(bytes).ToLowerInvariant();
}
/// <summary>
/// 由令牌派生一段短指纹,后端在 /api/health 里回给启动器用于身份确认。
/// 回指纹而非令牌本身,避免会话令牌出现在明文 HTTP 响应体里;启动器用同一函数
/// 算期望值比对,不匹配的「健康」响应一律视为伪装服务。
/// </summary>
public static string DeriveSessionProof(string? token)
{
if (string.IsNullOrEmpty(token)) return "";
var bytes = System.Text.Encoding.UTF8.GetBytes("gc-health-proof:" + token);
var hash = System.Security.Cryptography.SHA256.HashData(bytes);
return Convert.ToHexString(hash.AsSpan(0, 16)).ToLowerInvariant();
}
} }
+124 -12
View File
@@ -1,4 +1,5 @@
using System; using System;
using System.Globalization;
using System.IO; using System.IO;
using System.Text; using System.Text;
@@ -15,15 +16,30 @@ namespace GC.Services;
/// 中英分开而不是写在一个文件里:用户排查时不用在一行里找自己看得懂的那半句; /// 中英分开而不是写在一个文件里:用户排查时不用在一行里找自己看得懂的那半句;
/// 也给反馈问题时直接发对应语言的文件即可。 /// 也给反馈问题时直接发对应语言的文件即可。
/// ///
/// 写入方式:常驻 <see cref="StreamWriter"/>(<c>AutoFlush</c> 打开,崩溃也不丢最后几行),
/// 不再每行 open/append/close 一遍 —— 那条路径每写一行要开两个文件句柄,
/// 在下载 / 启动高峰期会明显拖慢调用方。
///
/// 保留策略:<see cref="RetentionDays"/> 天之前的日志在初始化与跨天滚动时删除;
/// 总量超过 <see cref="MaxTotalBytes"/> 时从最旧的开始删。日志目录不会无限长。
///
/// 日志失败绝不影响主流程(磁盘满、只读目录都只是少一份日志)。 /// 日志失败绝不影响主流程(磁盘满、只读目录都只是少一份日志)。
/// </summary> /// </summary>
public static class GcLog public static class GcLog
{ {
/// <summary>日志保留天数。</summary>
public const int RetentionDays = 14;
/// <summary>日志目录总量上限(中英两份合计)。</summary>
public const long MaxTotalBytes = 64L * 1024 * 1024;
private static readonly object Gate = new(); private static readonly object Gate = new();
private const string FilePrefix = "gc-";
private static string? _dir; private static string? _dir;
private static string _day = ""; private static string _day = "";
private static string _zhPath = ""; private static StreamWriter? _zh;
private static string _enPath = ""; private static StreamWriter? _en;
public static bool Enabled public static bool Enabled
{ {
@@ -45,8 +61,10 @@ public static class GcLog
lock (Gate) lock (Gate)
{ {
CloseWriters();
_dir = dir; _dir = dir;
_day = ""; _day = "";
PruneOldFiles(dir);
} }
} }
@@ -58,10 +76,8 @@ public static class GcLog
{ {
var now = DateTime.Now; var now = DateTime.Now;
var prefix = $"{now:yyyy-MM-dd HH:mm:ss} [{level}] "; var prefix = $"{now:yyyy-MM-dd HH:mm:ss} [{level}] ";
var lineZh = prefix + zh;
var lineEn = prefix + en;
try { Console.WriteLine(lineZh); } catch { /* 无控制台 */ } try { Console.WriteLine(prefix + zh); } catch { /* 无控制台 */ }
lock (Gate) lock (Gate)
{ {
@@ -70,25 +86,121 @@ public static class GcLog
var day = now.ToString("yyyyMMdd"); var day = now.ToString("yyyyMMdd");
if (day != _day) if (day != _day)
{ {
// 跨天换文件;顺便清一次旧日志,长时间挂机的进程也不会攒满磁盘
CloseWriters();
_day = day; _day = day;
_zhPath = Path.Combine(_dir, $"gc-{day}.log"); PruneOldFiles(_dir);
_enPath = Path.Combine(_dir, $"gc-{day}.en.log");
} }
Append(_zhPath, lineZh); if (_zh == null)
Append(_enPath, lineEn); {
_zh = OpenWriter(Path.Combine(_dir, $"{FilePrefix}{day}.log"));
_en = OpenWriter(Path.Combine(_dir, $"{FilePrefix}{day}.en.log"));
}
Append(_zh, prefix + zh);
Append(_en, prefix + en);
} }
} }
private static void Append(string path, string line) private static StreamWriter? OpenWriter(string path)
{ {
try try
{ {
File.AppendAllText(path, line + Environment.NewLine, new UTF8Encoding(false)); var stream = new FileStream(path, FileMode.Append, FileAccess.Write, FileShare.ReadWrite);
return new StreamWriter(stream, new UTF8Encoding(false)) { AutoFlush = true };
} }
catch catch
{ {
// 日志失败不能影响程序 // 写不了就不写;下一次跨天会再试一次
return null;
} }
} }
private static void Append(StreamWriter? writer, string line)
{
if (writer == null) return;
try
{
writer.WriteLine(line);
}
catch
{
// 磁盘满 / 文件被删:关掉写入器,下次跨天重建
try { writer.Dispose(); } catch { }
if (ReferenceEquals(writer, _zh)) _zh = null; else _en = null;
}
}
private static void CloseWriters()
{
try { _zh?.Dispose(); } catch { }
try { _en?.Dispose(); } catch { }
_zh = null;
_en = null;
}
/// <summary>
/// 清理过期与超量日志。只动本模块自己写的 <c>gc-YYYYMMDD[.en].log</c>,
/// 目录里用户放的其他文件一概不碰。
/// </summary>
private static void PruneOldFiles(string dir)
{
try
{
var files = new DirectoryInfo(dir).GetFiles(FilePrefix + "*.log");
if (files.Length == 0) return;
var cutoff = DateTime.Now.Date.AddDays(-RetentionDays);
var alive = new System.Collections.Generic.List<FileInfo>(files.Length);
foreach (var file in files)
{
if (!TryReadDate(file.Name, out var date))
{
// 名字不是我们的格式,忽略(既不删也不计入配额)
continue;
}
if (date < cutoff)
{
try { file.Delete(); } catch { }
continue;
}
alive.Add(file);
}
long total = 0;
foreach (var file in alive) total += file.Length;
if (total <= MaxTotalBytes) return;
alive.Sort((a, b) => a.LastWriteTimeUtc.CompareTo(b.LastWriteTimeUtc));
foreach (var file in alive)
{
if (total <= MaxTotalBytes) break;
try
{
total -= file.Length;
file.Delete();
}
catch { }
}
}
catch
{
// 清理失败不影响写日志
}
}
private static bool TryReadDate(string name, out DateTime date)
{
date = default;
// gc-20261118.log / gc-20261118.en.log
if (!name.StartsWith(FilePrefix, StringComparison.Ordinal)) return false;
var rest = name.Substring(FilePrefix.Length);
var dot = rest.IndexOf('.');
if (dot != 8) return false;
return DateTime.TryParseExact(rest.Substring(0, 8), "yyyyMMdd",
CultureInfo.InvariantCulture, DateTimeStyles.None, out date);
}
} }
+6 -2
View File
@@ -7,7 +7,7 @@ namespace GC.Services;
/// 运行期目录准备: /// 运行期目录准备:
/// <list type="number"> /// <list type="number">
/// <item>创建 <c>.GC/logs</c> 与 <c>.GC/safedog</c>;</item> /// <item>创建 <c>.GC/logs</c> 与 <c>.GC/safedog</c>;</item>
/// <item>把安装包里的守护进程复制到 <c>.GC/safedog</c>(程序本体与用户数据分开);</item> /// <item>把包内 <c>.GC/bin</c> 里的守护进程复制到 <c>.GC/safedog</c>(非本体文件不散落在安装目录);</item>
/// <item>初始化双语日志并写一条启动记录。</item> /// <item>初始化双语日志并写一条启动记录。</item>
/// </list> /// </list>
/// ///
@@ -36,7 +36,7 @@ public static class RuntimeLayout
return safedog; return safedog;
} }
/// <summary>把包内守护进程同步到 <c>.GC/safedog</c>。已是最新则不动。</summary> /// <summary>把包内 <c>.GC/bin</c> 的守护进程同步到 <c>.GC/safedog</c>。已是最新则不动。</summary>
private static string? InstallSafedog(AppPaths paths) private static string? InstallSafedog(AppPaths paths)
{ {
var name = SavedogFiles.ExecutableName; var name = SavedogFiles.ExecutableName;
@@ -64,10 +64,14 @@ public static class RuntimeLayout
private static string? FindPackaged(AppPaths paths, string name) private static string? FindPackaged(AppPaths paths, string name)
{ {
// 包内非本体文件统一收在 .GC/bin;后面几项兼容 1.0.10 及更早的包布局
var candidates = new[] var candidates = new[]
{ {
Path.Combine(paths.HomeRoot, "bin", name),
Path.Combine(paths.InstallDirectory, ".GC", "bin", name),
Path.Combine(paths.InstallDirectory, "safedog", name), Path.Combine(paths.InstallDirectory, "safedog", name),
Path.Combine(paths.InstallDirectory, name), Path.Combine(paths.InstallDirectory, name),
Path.Combine(paths.AppRoot, ".GC", "bin", name),
Path.Combine(paths.AppRoot, "safedog", name), Path.Combine(paths.AppRoot, "safedog", name),
Path.Combine(paths.AppRoot, name), Path.Combine(paths.AppRoot, name),
}; };
+21 -1
View File
@@ -28,7 +28,7 @@
<TextBlock Classes="faint" Text="{Binding PlatformText}" /> <TextBlock Classes="faint" Text="{Binding PlatformText}" />
</StackPanel> </StackPanel>
<Grid ColumnDefinitions="96,*" RowDefinitions="Auto,Auto"> <Grid ColumnDefinitions="96,*" RowDefinitions="Auto,Auto,Auto">
<TextBlock Classes="h3" Text="版本" /> <TextBlock Classes="h3" Text="版本" />
<TextBlock Grid.Column="1" Classes="muted" Text="{Binding VersionText}" <TextBlock Grid.Column="1" Classes="muted" Text="{Binding VersionText}"
FontWeight="SemiBold" /> FontWeight="SemiBold" />
@@ -38,6 +38,10 @@
HorizontalAlignment="Left" Padding="0" HorizontalAlignment="Left" Padding="0"
Command="{Binding OpenRepositoryCommand}" Command="{Binding OpenRepositoryCommand}"
Content="{Binding RepositoryText}" /> Content="{Binding RepositoryText}" />
<TextBlock Grid.Row="2" Classes="h3" Text="Git 服务" Margin="0,8,0,0" />
<TextBlock Grid.Row="2" Grid.Column="1" Classes="muted" Text="itxiaohui"
FontWeight="SemiBold" Margin="0,8,0,0" />
</Grid> </Grid>
</StackPanel> </StackPanel>
</Grid> </Grid>
@@ -76,6 +80,22 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</Border> </Border>
<Border Background="{DynamicResource SurfaceAlt}"
BorderBrush="{DynamicResource Line}" BorderThickness="1"
CornerRadius="12" Padding="12,10" MinWidth="190">
<StackPanel Orientation="Horizontal" Spacing="10">
<Border Width="34" Height="34" CornerRadius="17"
Background="{DynamicResource AccentSoft}">
<TextBlock Text="◉" FontSize="15" Foreground="{DynamicResource Accent}"
HorizontalAlignment="Center" VerticalAlignment="Center" />
</Border>
<StackPanel VerticalAlignment="Center" Spacing="1">
<TextBlock Text="itxiaohui" FontSize="12.5" FontWeight="SemiBold" />
<TextBlock Classes="faint" Text="Git 服务与部署支持" />
</StackPanel>
</StackPanel>
</Border>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</Border> </Border>
@@ -0,0 +1,293 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using GC.Savedog;
namespace GC.Savedog.Tests;
/// <summary>
/// GC-SAVEDOG 的应用器测试:更新真正落盘的那一段(整目录替换 / .GC/bin 合并 / 失败回滚)。
///
/// 为什么单独一个工程:<c>GC.Tests</c> 引用的是启动器程序集,而 GC-SAVEDOG 为了保持
/// 「安全逻辑只有一份实现」把 <c>GC/src/Security</c> 与 <c>Json.cs</c> 以源码链接的方式
/// 编进了自己 —— 两个程序集里存在同名类型。同一个测试工程里同时引用两者会撞类型,
/// 所以应用器测试单独放这里,只引用守护进程。
///
/// 为什么需要这组用例:<c>--update-test</c> 覆盖的是「怎么判断该不该更新」,
/// <see cref="Applier"/> 才是会动用户安装目录的代码 —— 它出错就是用户目录被删空。
/// 全部在临时目录里跑,不碰真实安装、不联网。
/// </summary>
internal static class ApplierTests
{
private static int _failed;
private static string _root = "";
public static int Main()
{
_root = Path.Combine(Path.GetTempPath(), "gc-applier-" + Guid.NewGuid().ToString("N")[..8]);
Directory.CreateDirectory(_root);
Console.WriteLine("Applier 测试目录: " + _root);
try
{
CaseRefusesTraversalPackageName();
CaseRefusesShaMismatch();
CaseRefusesSourceTree();
CaseDryRunKeepsInstallUntouched();
CaseRollbackRestoresOldFiles();
CaseSuccessMergesGcBinAndKeepsUserData();
}
finally
{
try { Directory.Delete(_root, true); } catch { }
}
Console.WriteLine(_failed == 0
? "Applier 测试全部通过"
: $"Applier 测试失败 {_failed} 项");
return _failed == 0 ? 0 : 1;
}
// ------------------------------------------------------------------ 用例
/// <summary>包名带 ../ 时必须拒绝(路径穿越的第一道闸)。</summary>
private static void CaseRefusesTraversalPackageName()
{
var (install, update) = Sandbox("traversal");
WritePackage(update, new Dictionary<string, string>
{
["GCL-9.9.9-test-amd64.exe"] = "new"
});
WriteRequest(update, "../evil.exe", sha: null);
var code = Apply(update, install, dryRun: true);
Check("路径穿越的包名被拒绝", code == 3, $"exit={code}(期望 3)");
}
/// <summary>zip 内容与清单 sha256 不符时必须丢弃。</summary>
private static void CaseRefusesShaMismatch()
{
var (install, update) = Sandbox("sha");
WritePackage(update, new Dictionary<string, string>
{
["GCL-9.9.9-test-amd64.exe"] = "new"
});
WriteRequest(update, "GCL-9.9.9-test-amd64.exe", sha: new string('a', 64));
var code = Apply(update, install, dryRun: true);
Check("sha256 不符的包被丢弃", code == 5, $"exit={code}(期望 5)");
}
/// <summary>安装目录里有 GC.sln 时拒绝替换 —— 防止误在源码树里跑更新。</summary>
private static void CaseRefusesSourceTree()
{
var (install, update) = Sandbox("srctree");
File.WriteAllText(Path.Combine(install, "GC.sln"), "fake solution");
var zip = WritePackage(update, new Dictionary<string, string>
{
["GCL-9.9.9-test-amd64.exe"] = "new"
});
WriteRequest(update, "GCL-9.9.9-test-amd64.exe", Sha256File(zip));
var code = Apply(update, install, dryRun: false);
Check("源码目录被拒绝替换", code == 4, $"exit={code}(期望 4)");
Check("源码目录里的文件没被动过",
File.ReadAllText(Path.Combine(install, "GC.sln")) == "fake solution",
"GC.sln 内容变了");
}
/// <summary>dry-run 只校验不落盘:安装目录必须一个字节都不变。</summary>
private static void CaseDryRunKeepsInstallUntouched()
{
var (install, update) = Sandbox("dryrun");
File.WriteAllText(Path.Combine(install, "GCL-1.0.0-test-amd64.exe"), "old");
File.WriteAllText(Path.Combine(install, "only-in-old.txt"), "keep me");
var zip = WritePackage(update, new Dictionary<string, string>
{
["GCL-9.9.9-test-amd64.exe"] = "new",
["GC-UI.exe"] = "ui"
});
WriteRequest(update, "GCL-9.9.9-test-amd64.exe", Sha256File(zip));
var code = Apply(update, install, dryRun: true);
var names = Directory.GetFileSystemEntries(install).Select(Path.GetFileName).OrderBy(n => n).ToArray();
Check("dry-run 返回 0", code == 0, $"exit={code}");
Check("dry-run 不改安装目录",
names.SequenceEqual(new[] { "GCL-1.0.0-test-amd64.exe", "only-in-old.txt" }),
"安装目录变成: " + string.Join(", ", names));
}
/// <summary>
/// 新版本启动不健康 → 回滚:旧文件原样回来,新包独有的文件被删掉,zip 与申请被清理。
/// </summary>
private static void CaseRollbackRestoresOldFiles()
{
var (install, update) = Sandbox("rollback");
var oldExe = Path.Combine(install, "GCL-1.0.0-test-amd64.exe");
var oldOnly = Path.Combine(install, "only-in-old.txt");
File.WriteAllText(oldExe, "old-binary");
File.WriteAllText(oldOnly, "old-only");
// 新版什么都不做直接退出:健康标记不会出现,必然回滚
var zip = WritePackage(update, new Dictionary<string, string>
{
["GCL-9.9.9-test-amd64.exe"] = "#!/bin/sh\nexit 1\n",
["only-in-new.txt"] = "new-only"
});
WriteRequest(update, "GCL-9.9.9-test-amd64.exe", Sha256File(zip));
var code = Apply(update, install, dryRun: false, timeoutSeconds: 5);
Check("启动失败后回滚(exit=8)", code == 8, $"exit={code}(期望 8)");
Check("旧启动器被还原",
File.Exists(oldExe) && File.ReadAllText(oldExe) == "old-binary",
"旧启动器没回来");
Check("旧版独有文件被还原",
File.Exists(oldOnly) && File.ReadAllText(oldOnly) == "old-only",
"旧版独有文件没回来");
Check("新包独有文件被删除", !File.Exists(Path.Combine(install, "only-in-new.txt")),
"only-in-new.txt 残留");
Check("更新包与申请已清理",
!File.Exists(Path.Combine(update, "package.zip")) &&
!File.Exists(Path.Combine(update, "apply-request.json")),
"update 目录里还有残留");
}
/// <summary>正常路径:新文件就位、.GC/bin 被合并、.GC 下的用户数据原地不动。</summary>
private static void CaseSuccessMergesGcBinAndKeepsUserData()
{
var (install, update) = Sandbox("success");
var updateDirFull = Path.GetFullPath(update);
// 用户数据:设置、模型、守护进程源文件
Directory.CreateDirectory(Path.Combine(install, ".GC", "config"));
Directory.CreateDirectory(Path.Combine(install, ".GC", "model", "earth-rotation"));
Directory.CreateDirectory(Path.Combine(install, ".GC", "bin"));
File.WriteAllText(Path.Combine(install, ".GC", "config", "settings.json"), "{\"theme\":\"dark\"}");
File.WriteAllText(Path.Combine(install, ".GC", "model", "earth-rotation", "a.bin"), "model");
File.WriteAllText(Path.Combine(install, ".GC", "bin", "GC-SAVEDOG.exe"), "old-savedog");
// 假启动器:写健康标记后退出,模拟「新版本起来了」
var launcher =
"#!/bin/sh\n" +
"cat > '" + Path.Combine(updateDirFull, "health.json") + "' <<'JSON'\n" +
"{\"version\":\"9.9.9\",\"pid\":4242,\"at\":\"2026-01-01T00:00:00Z\",\"ok\":true}\n" +
"JSON\n" +
"exit 0\n";
var zip = WritePackage(update, new Dictionary<string, string>
{
["GCL-9.9.9-test-amd64.exe"] = launcher,
[".GC/bin/GC-SAVEDOG.exe"] = "new-savedog",
["GC-UI.exe"] = "ui"
});
WriteRequest(update, "GCL-9.9.9-test-amd64.exe", Sha256File(zip));
var code = Apply(update, install, dryRun: false, timeoutSeconds: 10);
Check("启动健康后更新成功(exit=0)", code == 0, $"exit={code}");
Check("新启动器就位",
File.Exists(Path.Combine(install, "GCL-9.9.9-test-amd64.exe")), "新启动器缺失");
Check("新前端就位", File.Exists(Path.Combine(install, "GC-UI.exe")), "GC-UI.exe 缺失");
Check(".GC/bin 被合并",
File.ReadAllText(Path.Combine(install, ".GC", "bin", "GC-SAVEDOG.exe")) == "new-savedog",
".GC/bin/GC-SAVEDOG.exe 没被替换");
Check("用户设置原样保留",
File.ReadAllText(Path.Combine(install, ".GC", "config", "settings.json")) == "{\"theme\":\"dark\"}",
"settings.json 被覆盖");
Check("模型目录原样保留",
File.Exists(Path.Combine(install, ".GC", "model", "earth-rotation", "a.bin")),
"模型文件被删除");
}
// ------------------------------------------------------------------ 辅助
private static int Apply(string updateDir, string installDir, bool dryRun, int timeoutSeconds = 10)
{
var log = new Log(Path.Combine(updateDir, "logs"));
var applier = new Applier(new ApplyOptions
{
UpdateDir = updateDir,
InstallDir = installDir,
DryRun = dryRun,
TimeoutSeconds = timeoutSeconds,
RequireSignature = false, // 用例不生成签名清单;验签本身由 --update-test 覆盖
Force = false
}, log);
return applier.Run();
}
private static (string Install, string Update) Sandbox(string name)
{
var baseDir = Path.Combine(_root, name);
var install = Path.Combine(baseDir, "app");
var update = Path.Combine(baseDir, "update");
Directory.CreateDirectory(install);
Directory.CreateDirectory(update);
File.WriteAllText(Path.Combine(update, "version.json"), "{\"launcher\":{\"version\":\"9.9.9\"}}");
return (install, update);
}
private static string WritePackage(string updateDir, IDictionary<string, string> files)
{
var zipPath = Path.Combine(updateDir, "package.zip");
try { File.Delete(zipPath); } catch { }
using (var archive = ZipFile.Open(zipPath, ZipArchiveMode.Create))
{
foreach (var (name, text) in files)
{
var entry = archive.CreateEntry(name.Replace('\\', '/'), CompressionLevel.Fastest);
using var stream = entry.Open();
var bytes = Encoding.UTF8.GetBytes(text);
stream.Write(bytes, 0, bytes.Length);
}
}
return zipPath;
}
/// <summary>手写申请文件:不引用 Json 序列化助手(同名类型在两个程序集里都有)。</summary>
private static void WriteRequest(string updateDir, string packageName, string? sha)
{
var zipPath = Path.Combine(updateDir, "package.zip");
var size = File.Exists(zipPath) ? new FileInfo(zipPath).Length : 0;
var json = new StringBuilder()
.Append("{\n")
.Append(" \"schema\": 1,\n")
.Append(" \"version\": \"9.9.9\",\n")
.Append(" \"rid\": \"test-amd64\",\n")
.Append(" \"platformLabel\": \"test-amd64\",\n")
.Append(" \"packageName\": ").Append(Quote(packageName)).Append(",\n")
.Append(" \"payloadDir\": \"payload\",\n")
.Append(" \"installRelative\": \"../app\",\n")
.Append(" \"manifestPath\": \"version.json\",\n")
.Append(" \"packageZip\": \"package.zip\",\n")
.Append(" \"packageSha256\": ").Append(sha == null ? "null" : Quote(sha)).Append(",\n")
.Append(" \"packageSize\": ").Append(size).Append(",\n")
.Append(" \"requireSignature\": false\n")
.Append("}\n")
.ToString();
File.WriteAllText(Path.Combine(updateDir, "apply-request.json"), json);
}
private static string Quote(string value) => "\"" + value.Replace("\\", "\\\\").Replace("\"", "\\\"") + "\"";
private static string Sha256File(string path)
{
using var stream = File.OpenRead(path);
return Convert.ToHexString(SHA256.HashData(stream)).ToLowerInvariant();
}
private static void Check(string label, bool ok, string detail)
{
if (ok)
{
Console.WriteLine(" ✓ " + label);
return;
}
_failed++;
Console.WriteLine($" ✗ {label} —— {detail}");
}
}
@@ -0,0 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<!--
应用器测试:只引用 GC-SAVEDOG。
不并入 GC.Tests 的原因见 ApplierTests.cs 顶部注释 —— 守护进程把 GC/src/Security
以源码链接编进了自己,与启动器程序集存在同名类型,同一工程内同时引用会撞类型。
-->
<PropertyGroup>
<OutputType>Exe</OutputType>
<Nullable>enable</Nullable>
<RootNamespace>GC.Savedog.Tests</RootNamespace>
<AssemblyName>GC.Savedog.Tests</AssemblyName>
<InvariantGlobalization>true</InvariantGlobalization>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="../../../../../GC-SAVEDOG/GC-SAVEDOG.csproj" />
</ItemGroup>
</Project>
+67
View File
@@ -0,0 +1,67 @@
using System;
using System.IO;
using System.Linq;
using GC.Services;
namespace GC.Tests;
/// <summary>
/// 日志模块的用例:双语写入、跨天文件命名、旧日志清理、不误删用户文件。
///
/// 这些看起来是小事,但 <c>.GC/logs</c> 会随程序跑很久:写入路径每行开两个文件句柄,
/// 或者完全不清理,都会在几个月后变成用户磁盘上的几 GB。用例锁住这两个行为。
/// </summary>
internal static class LogTests
{
private static int _failed;
public static int Run()
{
var dir = Path.Combine(Path.GetTempPath(), "gc-log-" + Guid.NewGuid().ToString("N")[..8]);
Directory.CreateDirectory(dir);
try
{
// 过期日志(2000 年)+ 用户自己的文件
var oldZh = Path.Combine(dir, "gc-20000101.log");
var oldEn = Path.Combine(dir, "gc-20000101.en.log");
var userFile = Path.Combine(dir, "keep-me.txt");
File.WriteAllText(oldZh, "old");
File.WriteAllText(oldEn, "old");
File.WriteAllText(userFile, "user data");
GcLog.Init(dir);
GcLog.Info("测试中文", "test english");
var day = DateTime.Now.ToString("yyyyMMdd");
var zhPath = Path.Combine(dir, $"gc-{day}.log");
var enPath = Path.Combine(dir, $"gc-{day}.en.log");
Check("中文日志写入", File.Exists(zhPath) && File.ReadAllText(zhPath).Contains("测试中文"), "中文日志缺失");
Check("英文日志写入", File.Exists(enPath) && File.ReadAllText(enPath).Contains("test english"), "英文日志缺失");
Check("过期日志被清理", !File.Exists(oldZh) && !File.Exists(oldEn), "2000 年的日志还在");
Check("目录里的用户文件不被误删", File.Exists(userFile), "keep-me.txt 被删了");
var names = Directory.GetFiles(dir).Select(Path.GetFileName).OrderBy(n => n).ToArray();
Check("日志目录只剩当天两份 + 用户文件",
names.Length == 3, "目录内容: " + string.Join(", ", names));
}
finally
{
try { Directory.Delete(dir, true); } catch { }
}
Console.WriteLine(_failed == 0 ? "日志测试全部通过" : $"日志测试失败 {_failed} 项");
return _failed;
}
private static void Check(string label, bool ok, string detail)
{
if (ok)
{
Console.WriteLine(" ✓ " + label);
return;
}
_failed++;
Console.WriteLine($" ✗ {label} —— {detail}");
}
}
+3 -1
View File
@@ -51,7 +51,9 @@ internal static class Program
RenderPages(services); RenderPages(services);
Console.WriteLine("截图输出: " + Path.GetFullPath(_outDir)); Console.WriteLine("截图输出: " + Path.GetFullPath(_outDir));
return 0;
// 日志模块的用例放在渲染之后:它会切换 GcLog 的输出目录
return LogTests.Run() == 0 ? 0 : 1;
} }
/// <summary> /// <summary>
+32 -18
View File
@@ -59,23 +59,36 @@ Windows 用 `.\build.ps1`,参数相同(`build / check / models / stamp / run
## 运行目录(发布包里就长这样) ## 运行目录(发布包里就长这样)
``` ```
<解压出来的目录>/ ← 压缩包里只有这一个文件夹 <解压出来的目录>/ ← 压缩包里只有这一个文件夹
GCL-<版本>-<平台>(.exe | .app/) 启动器 GCL-<版本>-<平台>.exe 启动器(单文件:服务层 + 本地后端 + .NET 运行时都在里面)
GC-UI(.exe) Flutter 前端 GC-UI.exe Flutter 前端
safedog/GC-SAVEDOG[.exe] 更新守护进程(运行时复制到 .GC/safedog) flutter_windows.dll Flutter 引擎(引擎自带,不在 .NET 单文件里)
data/ lib/ *.dll 后端与 Flutter 运行时 data/app.so, data/flutter_assets/ Flutter 资源与 AOT 快照
.GC/ 首次启动自动生成 .GC/bin/GC-SAVEDOG[.exe] 非本体文件:更新守护进程
config/settings.json 用户设置(与缓存分开:删 cache 不会丢配置)
model/ 启动时下载的模型
cache/ 下载暂存 / 原子替换
update/ 待应用的启动器更新(apply-request.json + package.zip)
safedog/GC-SAVEDOG[.exe] 实际运行的守护进程(不随整目录替换被覆盖)
logs/gc-YYYYMMDD.log 日志(中文)
logs/gc-YYYYMMDD.en.log 日志(English)
``` ```
压缩包内只有一个顶层目录,解压后不会散落一屏 dll;主程序、后端、前端、守护进程都在 就这些,没有一屏 dll。安装目录根只放 GC 本体,非本体文件(守护进程)一律收在 `.GC/bin`。
这个目录里。`.GC` 紧挨着主程序,装在哪都便携 —— 整个目录复制走,模型、设置、日志跟着走。 macOS 是同一个单文件启动器,只是被放进 `GCL-<版本>-mac-arm64.app/Contents/MacOS/`,
Flutter 前端作为 `GC-UI.app` 放在同一层;`.GC` 位置不变,仍在启动器同级
(`.app/Contents/MacOS/`),守护进程同样收在 `.app/Contents/MacOS/.GC/bin/`。
首次启动后 `.GC` 补齐成:
```
.GC/
bin/ 非本体文件(随包分发,更新时按文件替换)
config/settings.json 用户设置(与缓存分开:删 cache 不会丢配置)
model/ 启动时下载的模型
cache/ 下载暂存 / 原子替换
update/ 待应用的启动器更新(apply-request.json + package.zip)
safedog/GC-SAVEDOG[.exe] 守护进程的运行副本(首次启动从 .GC/bin 复制)
logs/gc-YYYYMMDD.log 日志(中文)
logs/gc-YYYYMMDD.en.log 日志(English)
```
`.GC` 紧挨着主程序,装在哪都便携 —— 整个目录复制走,模型、设置、日志跟着走。
守护进程「`.GC/bin` 放源、`.GC/safedog` 放运行副本」是因为更新要整目录替换:
正在运行的 exe 在 Windows 上换不掉,所以跑副本、换源文件,下次启动再同步。
**发布包不含任何模型**。首次启动联网检查后把模型下载到 `.GC/model/` 并立刻显示; **发布包不含任何模型**。首次启动联网检查后把模型下载到 `.GC/model/` 并立刻显示;
安装目录不可写时自动退回用户数据目录。`.GC/cache` 与 `.GC/model` 随时可删,程序会重新下载; 安装目录不可写时自动退回用户数据目录。`.GC/cache` 与 `.GC/model` 随时可删,程序会重新下载;
@@ -93,7 +106,8 @@ Windows 用 `.\build.ps1`,参数相同(`build / check / models / stamp / run
``` ```
启动器下载 zip -> 校验 sha256 -> 写 apply-request.json -> 启动 .GC/safedog/GC-SAVEDOG -> 自己退出 启动器下载 zip -> 校验 sha256 -> 写 apply-request.json -> 启动 .GC/safedog/GC-SAVEDOG -> 自己退出
GC-SAVEDOG: 二次验签 -> 检查 zip 安全性 -> 解压到 .GC/update/stage GC-SAVEDOG: 二次验签 -> 检查 zip 安全性 -> 解压到 .GC/update/stage
-> 整目录替换:旧文件搬到 .GC/update/backup,新文件就位(保留 .GC 不动) -> 整目录替换:旧文件搬到 .GC/update/backup,新文件就位
(.GC 只合并 bin/,config/model/cache/update/logs/safedog 原地不动)
-> 启动新版,等 .GC/update/health.json -> 启动新版,等 .GC/update/health.json
-> 收到:删备份、写 last-good.json -> 收到:删备份、写 last-good.json
-> 没收到/进程退出:撤掉新文件、把备份搬回、重启旧版,写 state.json = rolledback -> 没收到/进程退出:撤掉新文件、把备份搬回、重启旧版,写 state.json = rolledback
@@ -253,9 +267,9 @@ Repository/
| 产物 | 平台 | | 产物 | 平台 |
| --- | --- | | --- | --- |
| `dist/mac-arm64/GCL-<版本>-mac-arm64.zip` | macOS Apple Silicon(单顶层 `GCL-….app`) | | `dist/mac-arm64/GCL-<版本>-mac-arm64.zip` | macOS Apple Silicon(单顶层 `GCL-….app`) |
| `dist/win-amd64/GCL-<版本>-win-amd64.zip` | Windows x64(单顶层 `GCL-…/`,含 Flutter 前端与 `safedog/`) | | `dist/win-amd64/GCL-<版本>-win-amd64.zip` | Windows x64(单顶层 `GCL-…/`,含 Flutter 前端,非本体文件在 `.GC/bin/`) |
| `dist/win-arm64/GCL-<版本>-win-arm64.zip` | Windows on ARM 同上 | | `dist/win-arm64/GCL-<版本>-win-arm64.zip` | Windows on ARM 同上 |
| `dist/linux-arm64/GCL-<版本>-linux-arm64.zip` | Linux ARM64 同上(启动器无扩展名,需在 aarch64 主机构建) | | `dist/linux-arm64/GCL-<版本>-linux-arm64.zip` | Linux ARM64 同上(启动器无扩展名;默认不构建,需 aarch64 主机 + `GC_BUILD_LINUX=1`) |
平台目录就是「该平台的编译产物目录」:打包完成后只留最终 zip(原始 `.app` / `.exe` 平台目录就是「该平台的编译产物目录」:打包完成后只留最终 zip(原始 `.app` / `.exe`
会被挪到 `build/trash/`,下次构建时移出,不做递归删除)。 会被挪到 `build/trash/`,下次构建时移出,不做递归删除)。
+4 -2
View File
@@ -59,9 +59,11 @@ mkdir -p "$ROOT_DIR/build/logs"
. "$ROOT_DIR/buildsh/build.sh" . "$ROOT_DIR/buildsh/build.sh"
. "$ROOT_DIR/buildsh/check.sh" . "$ROOT_DIR/buildsh/check.sh"
. "$ROOT_DIR/buildsh/tools.sh" . "$ROOT_DIR/buildsh/tools.sh"
. "$ROOT_DIR/buildsh/release.sh"
case "$TASK" in case "$TASK" in
build) bs_build "$ROOT_DIR" ;; build) bs_build "$ROOT_DIR" ;;
check) bs_check "$ROOT_DIR" ;; check) bs_check "$ROOT_DIR" ;;
release-verify) bs_verify_release "$ROOT_DIR" "$@" ;;
*) bs_tools "$ROOT_DIR" "$TASK" ;; *) bs_tools "$ROOT_DIR" "$TASK" ;;
esac esac
+6 -1
View File
@@ -6,7 +6,12 @@ function Invoke-BuildTool {
'pack-models' { Build-Models; Pack-Models } 'pack-models' { Build-Models; Pack-Models }
'pack-launcher'{ Pack-Launcher } 'pack-launcher'{ Pack-Launcher }
'run' { & dotnet run --project $script:AppProject -c Debug; if ($LASTEXITCODE -ne 0) { throw "dotnet run 失败,退出码 $LASTEXITCODE" } } 'run' { & dotnet run --project $script:AppProject -c Debug; if ($LASTEXITCODE -ne 0) { throw "dotnet run 失败,退出码 $LASTEXITCODE" } }
'test' { & dotnet run --project $script:TestProject -c Debug -- (Join-Path $script:BuildRoot 'build/screenshots'); if ($LASTEXITCODE -ne 0) { throw "测试失败,退出码 $LASTEXITCODE" } } 'test' {
& dotnet run --project $script:TestProject -c Debug -- (Join-Path $script:BuildRoot 'build/screenshots')
if ($LASTEXITCODE -ne 0) { throw "测试失败,退出码 $LASTEXITCODE" }
# 与 pr-check.yml 一致:应用器测试单独跑(它与启动器有同名类型,不能并入 GC.Tests)
Invoke-SavedogTests
}
'update-test' { & dotnet run --project $script:TestProject -c Debug -- --update-test $script:BuildRoot; if ($LASTEXITCODE -ne 0) { throw "更新测试失败,退出码 $LASTEXITCODE" } } 'update-test' { & dotnet run --project $script:TestProject -c Debug -- --update-test $script:BuildRoot; if ($LASTEXITCODE -ne 0) { throw "更新测试失败,退出码 $LASTEXITCODE" } }
'clean' { 'clean' {
Remove-Item (Join-Path $script:BuildRoot 'build'), (Join-Path $script:BuildRoot 'dist') -Recurse -Force -ErrorAction SilentlyContinue Remove-Item (Join-Path $script:BuildRoot 'build'), (Join-Path $script:BuildRoot 'dist') -Recurse -Force -ErrorAction SilentlyContinue
+7 -5
View File
@@ -1,7 +1,7 @@
param( param(
[Parameter(Position = 0)] [Parameter(Position = 0)]
[ValidateSet('build','check','models','stamp','pack-models','pack-launcher', [ValidateSet('build','check','models','stamp','pack-models','pack-launcher',
'run','test','update-test','clean','doctor','dist')] 'release-verify','run','test','update-test','clean','doctor','dist')]
[string]$Task = 'build', [string]$Task = 'build',
[string]$Version = '' [string]$Version = ''
) )
@@ -23,7 +23,8 @@ try {
if (-not $Version) { $Version = '1.0.0' } if (-not $Version) { $Version = '1.0.0' }
$script:BuildVersion = $Version $script:BuildVersion = $Version
if ($PSBoundParameters.ContainsKey('Version')) { # release-verify 的 -Version 是「要核对的 tag」,不是改版本号:绝不能改写清单
if ($PSBoundParameters.ContainsKey('Version') -and $Task -ne 'release-verify') {
if ($null -eq $versionNode) { throw 'Directory.Build.props 中找不到 Version 节点。' } if ($null -eq $versionNode) { throw 'Directory.Build.props 中找不到 Version 节点。' }
$versionNode.InnerText = $Version $versionNode.InnerText = $Version
$props.Save((Join-Path $script:BuildRoot 'Directory.Build.props')) $props.Save((Join-Path $script:BuildRoot 'Directory.Build.props'))
@@ -37,9 +38,10 @@ try {
. (Join-Path $PSScriptRoot 'Build-Tools.ps1') . (Join-Path $PSScriptRoot 'Build-Tools.ps1')
switch ($Task) { switch ($Task) {
'build' { Invoke-FullBuild } 'build' { Invoke-FullBuild }
'check' { Invoke-BuildCheck } 'check' { Invoke-BuildCheck }
default { Invoke-BuildTool $Task } 'release-verify' { Invoke-ReleaseVerify -Tag $Version }
default { Invoke-BuildTool $Task }
} }
} }
finally { finally {
+145 -73
View File
@@ -18,7 +18,9 @@ function Invoke-ManifestSign {
Write-Host '!! 未找到签名私钥 .signing/gc-signing.pem,version.json 未签名(客户端会拒绝更新)' Write-Host '!! 未找到签名私钥 .signing/gc-signing.pem,version.json 未签名(客户端会拒绝更新)'
return return
} }
$keyId = if ($env:GC_SIGNING_KEY_ID) { $env:GC_SIGNING_KEY_ID } else { 'gc-2026-11' } # 与 buildsh/lib/build_funcs.sh 保持一致:当前生效的密钥是 gc-2026-12。
# gc-2026-11 的私钥没有留存,用它签出来的清单客户端永远验不过。
$keyId = if ($env:GC_SIGNING_KEY_ID) { $env:GC_SIGNING_KEY_ID } else { 'gc-2026-12' }
Write-Host "==> 签名 version.json ($keyId)" Write-Host "==> 签名 version.json ($keyId)"
Invoke-LoggedDotNet -Name 'sign' -Arguments @( Invoke-LoggedDotNet -Name 'sign' -Arguments @(
'run', '--project', (Join-Path $script:BuildRoot 'GC-SAVEDOG/GC-SAVEDOG.csproj'), 'run', '--project', (Join-Path $script:BuildRoot 'GC-SAVEDOG/GC-SAVEDOG.csproj'),
@@ -30,7 +32,7 @@ function Invoke-ManifestSign {
} }
function Invoke-VersionStamp { function Invoke-VersionStamp {
param([switch]$LauncherOnly) param([switch]$LauncherOnly, [switch]$NoSign)
if ($LauncherOnly) { if ($LauncherOnly) {
Write-Host '==> 刷新启动器包信息(sha256 / 体积 / dist 路径)' Write-Host '==> 刷新启动器包信息(sha256 / 体积 / dist 路径)'
Invoke-LoggedDotNet -Name 'stamp' -Arguments @( Invoke-LoggedDotNet -Name 'stamp' -Arguments @(
@@ -45,7 +47,14 @@ function Invoke-VersionStamp {
$script:BuildRoot, $script:BuildVersion $script:BuildRoot, $script:BuildVersion
) )
} }
Invoke-ManifestSign # 完整 build 末尾 Pack-Launcher 会统一签一次(末次签名);中间这次是浪费的。
# 单独的 stamp / models 工具没有后续打包,仍走默认签名。
if ($NoSign) {
Write-Host ' (跳过签名,打包结束后统一签一次)'
}
else {
Invoke-ManifestSign
}
} }
function Build-Models { function Build-Models {
@@ -78,44 +87,41 @@ function Prepare-RuntimeLayout {
$destination = Join-Path $script:BuildRoot $RelativePath $destination = Join-Path $script:BuildRoot $RelativePath
if (-not (Test-Path $destination)) { return } if (-not (Test-Path $destination)) { return }
Remove-Item (Join-Path $destination 'model'), (Join-Path $destination 'examples') -Recurse -Force -ErrorAction SilentlyContinue # 与 buildsh/lib/build_funcs.sh 一致:发布目录只放程序本体,不预置 .GC。
New-Item -ItemType Directory -Force -Path (Join-Path $destination '.GC/model'), (Join-Path $destination '.GC/cache'), (Join-Path $destination '.GC/update'), (Join-Path $destination '.GC/config') | Out-Null # .GC(config / model / cache / update / safedog / logs)一律在首次启动时
Set-Content -Path (Join-Path $destination '.GC/model/README.txt') -Encoding UTF8 -Value @' # 由 AppPaths.EnsureCreated + RuntimeLayout 创建,压缩包里只有 GC 本体。
模型库目录(.GC/model/) Remove-Item (Join-Path $destination 'model'), (Join-Path $destination 'examples'), (Join-Path $destination '.GC') -Recurse -Force -ErrorAction SilentlyContinue
启动时程序会读取 GitCode 仓库的 version.json,把最新版模型下载到这里。 Write-Host " 运行目录 -> $RelativePath(首次启动后生成 .GC/:config model cache update safedog logs)"
离线使用也可以手动放入 <模型id>/<模型id>.json + <模型id>/<模型id>.model/。
运行目录:
<可执行文件>
GC-SAVEDOG 更新守护进程(验签 + 原子替换 + 失败回滚)
.GC/config/settings.json 用户设置(删 .GC/cache 不会丢配置)
.GC/model/ 本目录(下载的模型)
.GC/cache/ 下载暂存
.GC/update/ 待下次启动应用的启动器更新
'@
$settingsPath = Join-Path $destination '.GC/config/settings.json'
if (-not (Test-Path $settingsPath)) {
Set-Content -Path $settingsPath -Encoding UTF8 -Value @'
{
"language": "auto",
"theme": "light",
"renderFps": 30,
"memoryMb": 2048,
"autoUpdateOnStartup": true,
"requireSignedManifest": true,
"updateRepository": "https://gitcode.com/Morris_1/GC",
"updateManifestUrl": "",
"updateLocalRoot": "",
"installedModelVersions": {},
"launcherVersion": "",
"pendingLauncherVersion": "",
"lastUpdateCheck": "",
"sources": [],
"recentModels": []
} }
'@
function Prune-Package {
param(
[Parameter(Mandatory)][string]$Destination,
[Parameter(Mandatory)][ValidateSet('win', 'linux')][string]$Platform
)
if (-not (Test-Path $Destination)) { return }
$junk = @(
'mscordaccore.dll', 'mscordbi.dll', 'web.config',
'aspnetcorev2_inprocess.dll',
'Microsoft.AspNetCore.Server.IIS.dll',
'Microsoft.AspNetCore.Server.IISIntegration.dll',
'Microsoft.AspNetCore.Server.HttpSys.dll',
'Microsoft.DiaSymReader.Native.dll'
)
if ($Platform -eq 'win') {
# 后端已编入启动器,ProjectReference 残留的独立 exe / runtimeconfig 没有用
$junk += @('GC.UI.Server.exe', 'GC.UI.Server.dll', 'GC.UI.Server.deps.json', 'GC.UI.Server.runtimeconfig.json')
$junk += @('Avalonia.X11.dll', 'Avalonia.Native.dll', 'Avalonia.FreeDesktop.dll', 'Tmds.DBus.Protocol.dll')
} }
Write-Host " 运行目录 -> $RelativePath/.GC" else {
$junk += @('Avalonia.Win32.dll', 'Avalonia.Win32.Automation.dll')
}
foreach ($name in $junk) {
Get-ChildItem $Destination -Filter $name -File -ErrorAction SilentlyContinue | Remove-Item -Force -ErrorAction SilentlyContinue
}
# mscordaccore*.dll / Microsoft.DiaSymReader.Native*.dll 是带版本号通配的
Get-ChildItem $Destination -Filter 'mscordaccore*.dll' -File -ErrorAction SilentlyContinue | Remove-Item -Force -ErrorAction SilentlyContinue
Get-ChildItem $Destination -Filter 'Microsoft.DiaSymReader.Native*.dll' -File -ErrorAction SilentlyContinue | Remove-Item -Force -ErrorAction SilentlyContinue
} }
function Publish-Rid { function Publish-Rid {
@@ -132,18 +138,22 @@ function Publish-Rid {
'publish', $script:AppProject, '-c', 'Release', '-r', $Rid, 'publish', $script:AppProject, '-c', 'Release', '-r', $Rid,
'--self-contained', 'true', "-p:Version=$script:BuildVersion", '-p:DebugType=none', '--self-contained', 'true', "-p:Version=$script:BuildVersion", '-p:DebugType=none',
"-p:PublishSingleFile=$singleValue", "-p:IncludeNativeLibrariesForSelfExtract=$singleValue", "-p:PublishSingleFile=$singleValue", "-p:IncludeNativeLibrariesForSelfExtract=$singleValue",
"-p:EnableCompressionInSingleFile=$singleValue",
'-p:PublishTrimmed=false', '-o', $outputPath '-p:PublishTrimmed=false', '-o', $outputPath
) )
# 更新守护进程:与主程序同目录(裁剪单文件,70MB -> 14MB) # 更新守护进程:与主程序同目录(裁剪 + 压缩单文件,70MB -> 14MB)
# 裁剪的前提是 JSON 全部走源生成上下文(GC-SAVEDOG/SavedogJson.cs) # 裁剪的前提是 JSON 全部走源生成上下文(GC-SAVEDOG/SavedogJson.cs)。
# EnableCompressionInSingleFile:守护进程不常驻,只在更新时跑一次,
# 解压一次换来更小的包,对「只在更新时下载」的场景很划算。
$savedogProj = Join-Path $script:BuildRoot 'GC-SAVEDOG/GC-SAVEDOG.csproj' $savedogProj = Join-Path $script:BuildRoot 'GC-SAVEDOG/GC-SAVEDOG.csproj'
if (Test-Path $savedogProj) { if (Test-Path $savedogProj) {
Write-Host "==> 编译 GC-SAVEDOG ($Rid)(裁剪单文件)" Write-Host "==> 编译 GC-SAVEDOG ($Rid)(裁剪 + 压缩单文件)"
Invoke-LoggedDotNet -Name "savedog-$($Rid -replace '-', '')" -Arguments @( Invoke-LoggedDotNet -Name "savedog-$($Rid -replace '-', '')" -Arguments @(
'publish', $savedogProj, '-c', 'Release', '-r', $Rid, 'publish', $savedogProj, '-c', 'Release', '-r', $Rid,
'--self-contained', 'true', "-p:Version=$script:BuildVersion", '-p:DebugType=none', '--self-contained', 'true', "-p:Version=$script:BuildVersion", '-p:DebugType=none',
'-p:PublishSingleFile=true', '-p:IncludeNativeLibrariesForSelfExtract=true', '-p:PublishSingleFile=true', '-p:IncludeNativeLibrariesForSelfExtract=true',
'-p:EnableCompressionInSingleFile=true',
'-p:PublishTrimmed=true', '-p:TrimMode=full', '-p:PublishTrimmed=true', '-p:TrimMode=full',
'-p:JsonSerializerIsReflectionEnabledByDefault=false', '-o', $outputPath '-p:JsonSerializerIsReflectionEnabledByDefault=false', '-o', $outputPath
) )
@@ -178,35 +188,60 @@ function Pack-Models {
function Pack-Launcher { function Pack-Launcher {
$dist = Join-Path $script:BuildRoot 'dist' $dist = Join-Path $script:BuildRoot 'dist'
Write-Host "==> 生成启动器产物(GC-$script:BuildVersion-<平台>)" Write-Host "==> 生成启动器产物(GCL-$script:BuildVersion-<系统>-<架构>)"
# 与 buildsh/lib/build_funcs.sh 的 pack_launcher 对齐:
# 1) 包名统一 GCL- 前缀;
# 2) zip 内只有一个顶层目录(GCL-<版本>-<平台>),不散落一屏 dll;
# 3) 非本体文件(守护进程)收进 .GC/bin,安装目录根只留 GC 本体;
# 4) 剔除调试 / 无关平台的组件(prune)。
# --- Windows:启动器 + 守护进程 + 前端,整目录打进单顶层目录 ---
foreach ($platform in @(@{ Rid = 'win-x64'; Label = 'win-amd64' }, @{ Rid = 'win-arm64'; Label = 'win-arm64' })) { foreach ($platform in @(@{ Rid = 'win-x64'; Label = 'win-amd64' }, @{ Rid = 'win-arm64'; Label = 'win-arm64' })) {
# 产物落点 dist/<系统>-<架构>/,与 dist/mac-arm64 一致
$sourceDir = Join-Path $dist $platform.Label $sourceDir = Join-Path $dist $platform.Label
if (-not (Test-Path $sourceDir)) { $sourceDir = Join-Path $dist $platform.Rid } if (-not (Test-Path $sourceDir)) { $sourceDir = Join-Path $dist $platform.Rid }
if (-not (Test-Path $sourceDir)) { continue } if (-not (Test-Path $sourceDir)) { continue }
# 注意排除守护进程:GC-SAVEDOG.exe 在字典序里排在 GC.exe 前面
$executable = Get-ChildItem $sourceDir -Filter '*.exe' |
Where-Object { $_.Name -notlike 'GC-SAVEDOG*' } | Select-Object -First 1
if ($null -eq $executable) { continue }
# 启动器固定是 GC.exe;后端与前端是可选的随包产物,不能当成启动器
$exe = Join-Path $sourceDir 'GC.exe'
if (-not (Test-Path $exe)) {
$exe = (Get-ChildItem $sourceDir -Filter '*.exe' | Where-Object {
$_.Name -notlike 'GC-SAVEDOG*' -and $_.Name -notlike 'GC.UI.Server*' -and $_.Name -notlike 'GC-UI*'
} | Select-Object -First 1).FullName
}
if (-not $exe) { continue }
$pkgName = "GCL-$script:BuildVersion-$($platform.Label)"
$temp = Join-Path $dist ".winpkg-$($platform.Label)" $temp = Join-Path $dist ".winpkg-$($platform.Label)"
$pkg = Join-Path $temp $pkgName
Remove-Item $temp -Recurse -Force -ErrorAction SilentlyContinue Remove-Item $temp -Recurse -Force -ErrorAction SilentlyContinue
New-Item -ItemType Directory -Force -Path $temp | Out-Null New-Item -ItemType Directory -Force -Path $pkg | Out-Null
Copy-Item $executable.FullName (Join-Path $temp "GC-$script:BuildVersion-$($platform.Label).exe") -Force Get-ChildItem $sourceDir -Force | Where-Object { $_.Extension -ne '.zip' } | Copy-Item -Destination $pkg -Recurse -Force
$savedogExe = Join-Path $sourceDir 'GC-SAVEDOG.exe' Prune-Package -Destination $pkg -Platform 'win'
if (Test-Path $savedogExe) { Copy-Item $savedogExe (Join-Path $temp 'GC-SAVEDOG.exe') -Force } Move-Item (Join-Path $pkg (Split-Path $exe -Leaf)) (Join-Path $pkg "$pkgName.exe") -Force
if (Get-Command chmod -ErrorAction SilentlyContinue) { & chmod +x (Join-Path $pkg "$pkgName.exe") 2>$null }
$zipPath = Join-Path $dist "$($platform.Label)/GC-$script:BuildVersion-$($platform.Label).zip" $savedogExe = Join-Path $pkg 'GC-SAVEDOG.exe'
if (Test-Path $savedogExe) {
$binDir = Join-Path $pkg '.GC/bin'
New-Item -ItemType Directory -Force -Path $binDir | Out-Null
Move-Item $savedogExe (Join-Path $binDir 'GC-SAVEDOG.exe') -Force
}
else {
Write-Host " !! 缺少 GC-SAVEDOG.exe,该平台将退回旧脚本更新"
}
$zipPath = Join-Path $dist "$($platform.Label)/$pkgName.zip"
Remove-Item $zipPath -Force -ErrorAction SilentlyContinue Remove-Item $zipPath -Force -ErrorAction SilentlyContinue
Compress-Archive -Path (Join-Path $temp '*') -DestinationPath $zipPath -CompressionLevel Optimal Compress-Archive -Path $pkg -DestinationPath $zipPath -CompressionLevel Optimal
Remove-Item $temp -Recurse -Force -ErrorAction SilentlyContinue Remove-Item $temp -Recurse -Force -ErrorAction SilentlyContinue
Write-Host " -> dist/$($platform.Label)/GC-$script:BuildVersion-$($platform.Label).zip" Write-Host " -> dist/$($platform.Label)/$pkgName.zip"
} }
# --- macOS:先得到真实 .app 目录(改名 + 同步 Info.plist + 守护进程入 .GC/bin) ---
$macApp = Join-Path $dist 'mac-arm64/GC.app' $macApp = Join-Path $dist 'mac-arm64/GC.app'
if (Test-Path $macApp) { if (Test-Path $macApp) {
$finalApp = Join-Path $dist "GC-$script:BuildVersion-mac-arm64.app" $finalApp = Join-Path $dist "GCL-$script:BuildVersion-mac-arm64.app"
Remove-Item $finalApp -Recurse -Force -ErrorAction SilentlyContinue Remove-Item $finalApp -Recurse -Force -ErrorAction SilentlyContinue
Move-Item $macApp $finalApp Move-Item $macApp $finalApp
$binary = Join-Path $finalApp 'Contents/MacOS/GC' $binary = Join-Path $finalApp 'Contents/MacOS/GC'
@@ -216,20 +251,25 @@ function Pack-Launcher {
& /usr/libexec/PlistBuddy -c 'Set :CFBundleName Morris GC' $plist 2>$null & /usr/libexec/PlistBuddy -c 'Set :CFBundleName Morris GC' $plist 2>$null
& /usr/libexec/PlistBuddy -c 'Set :CFBundleDisplayName Morris GC' $plist 2>$null & /usr/libexec/PlistBuddy -c 'Set :CFBundleDisplayName Morris GC' $plist 2>$null
} }
# 非本体文件收进 .GC/bin(与 Windows 布局一致):.GC 位置不变,仍在 .app/Contents/MacOS/
$savedog = Join-Path $finalApp 'Contents/MacOS/GC-SAVEDOG'
if (Test-Path $savedog) {
$binDir = Join-Path $finalApp 'Contents/MacOS/.GC/bin'
New-Item -ItemType Directory -Force -Path $binDir | Out-Null
Move-Item $savedog (Join-Path $binDir 'GC-SAVEDOG') -Force
if (Get-Command chmod -ErrorAction SilentlyContinue) { & chmod +x (Join-Path $binDir 'GC-SAVEDOG') 2>$null }
}
if (Get-Command xattr -ErrorAction SilentlyContinue) { & xattr -cr $finalApp 2>$null } if (Get-Command xattr -ErrorAction SilentlyContinue) { & xattr -cr $finalApp 2>$null }
} }
# Windows 的 zip 已在上面的循环里生成(含 GC-SAVEDOG.exe),这里只处理 .app # --- 统一压缩:.app -> 同名 .zip,放进平台目录 ---
Get-ChildItem $dist | Where-Object { $_.Name -like "GC-$script:BuildVersion-*.app" } | ForEach-Object { Get-ChildItem $dist | Where-Object { $_.Name -like "GCL-$script:BuildVersion-*.app" } | ForEach-Object {
$label = $_.BaseName -replace "^GC-$([regex]::Escape($script:BuildVersion))-", '' $label = $_.BaseName -replace "^GCL-$([regex]::Escape($script:BuildVersion))-", ''
$targetDir = Join-Path $dist $label $targetDir = Join-Path $dist $label
New-Item -ItemType Directory -Force -Path $targetDir | Out-Null New-Item -ItemType Directory -Force -Path $targetDir | Out-Null
$zipPath = Join-Path $targetDir ($_.BaseName + '.zip') $zipPath = Join-Path $targetDir ($_.BaseName + '.zip')
Remove-Item $zipPath -Force -ErrorAction SilentlyContinue Remove-Item $zipPath -Force -ErrorAction SilentlyContinue
if ($_.PSIsContainer) { if (Get-Command ditto -ErrorAction SilentlyContinue) {
Remove-Item (Join-Path $_.FullName 'Contents/MacOS/.GC') -Recurse -Force -ErrorAction SilentlyContinue
}
if ($_.PSIsContainer -and (Get-Command ditto -ErrorAction SilentlyContinue)) {
& ditto -c -k --sequesterRsrc --keepParent $_.FullName $zipPath & ditto -c -k --sequesterRsrc --keepParent $_.FullName $zipPath
if ($LASTEXITCODE -ne 0) { throw "ditto 压缩失败:$($_.Name)" } if ($LASTEXITCODE -ne 0) { throw "ditto 压缩失败:$($_.Name)" }
} }
@@ -239,26 +279,26 @@ function Pack-Launcher {
Write-Host " -> dist/$label/$($_.BaseName).zip" Write-Host " -> dist/$label/$($_.BaseName).zip"
} }
# 原始产物(.exe / .app 目录)不再保留:只发布 zip # 原始产物(.exe / .app 目录)不再保留:只发布 zip(移入暂存区,不做递归删除)
$trash = Join-Path $script:BuildRoot 'build/trash' $trash = Join-Path $script:BuildRoot 'build/trash'
New-Item -ItemType Directory -Force -Path $trash | Out-Null New-Item -ItemType Directory -Force -Path $trash | Out-Null
Get-ChildItem $dist -Force | Where-Object { Get-ChildItem $dist -Force | Where-Object {
$_.Name -like "GC-$script:BuildVersion-*.exe" -or $_.Name -like "GC-$script:BuildVersion-*.app" $_.Name -like "GCL-$script:BuildVersion-*.exe" -or $_.Name -like "GCL-$script:BuildVersion-*.app"
} | ForEach-Object { } | ForEach-Object {
Move-Item $_.FullName (Join-Path $trash "$($_.Name)-$([DateTime]::Now.Ticks)") -Force -ErrorAction SilentlyContinue Move-Item $_.FullName (Join-Path $trash "$($_.Name)-$([DateTime]::Now.Ticks)") -Force -ErrorAction SilentlyContinue
} }
Remove-IntermediateDirectories Remove-IntermediateDirectories
Invoke-VersionStamp -LauncherOnly Invoke-VersionStamp -LauncherOnly
Write-Host '==> dist 可发布 zip:' Write-Host '==> dist 可发布 zip:'
Get-ChildItem $dist -Recurse -Filter "GC-$script:BuildVersion-*.zip" | Select-Object FullName, Length Get-ChildItem $dist -Recurse -Filter "GCL-$script:BuildVersion-*.zip" | Select-Object FullName, Length
} }
function Remove-IntermediateDirectories { function Remove-IntermediateDirectories {
# 平台目录里只留最终 zip(其它都是 publish 中间产物) # 平台目录里只留最终 zip(其它都是 publish 中间产物)
foreach ($name in @('win-amd64', 'win-x64', 'win-arm64', 'mac-arm64')) { foreach ($name in @('win-amd64', 'win-x64', 'win-arm64', 'mac-arm64', 'linux-arm64', 'linux-x64')) {
$dir = Join-Path $script:BuildRoot "dist/$name" $dir = Join-Path $script:BuildRoot "dist/$name"
if (-not (Test-Path $dir)) { continue } if (-not (Test-Path $dir)) { continue }
Get-ChildItem $dir -Force | Where-Object { $_.Name -notlike "GC-$script:BuildVersion-*.zip" } | Get-ChildItem $dir -Force | Where-Object { $_.Name -notlike "GCL-$script:BuildVersion-*.zip" } |
Remove-Item -Recurse -Force -ErrorAction SilentlyContinue Remove-Item -Recurse -Force -ErrorAction SilentlyContinue
} }
Get-ChildItem (Join-Path $script:BuildRoot 'dist') -Filter '.DS_Store' -Recurse -Force -ErrorAction SilentlyContinue | Remove-Item -Force Get-ChildItem (Join-Path $script:BuildRoot 'dist') -Filter '.DS_Store' -Recurse -Force -ErrorAction SilentlyContinue | Remove-Item -Force
@@ -314,6 +354,36 @@ function New-MacAppBundle {
Write-Host "==> 已打包 $app" Write-Host "==> 已打包 $app"
} }
function Invoke-SavedogTests {
$proj = Join-Path $script:BuildRoot 'GC/src/test/dotnet/GC.Savedog.Tests/GC.Savedog.Tests.csproj'
Write-Host '==> 运行应用器测试(整目录替换 / .GC/bin 合并 / 回滚)'
& dotnet run --project $proj -c Debug
if ($LASTEXITCODE -ne 0) { throw "应用器测试失败,退出码 $LASTEXITCODE" }
}
function Invoke-ReleaseVerify {
param([string]$Tag = '')
$root = $script:BuildRoot
$verifyTag = if ($Tag) { $Tag } else { $script:BuildVersion }
$work = Join-Path $root 'build/release-verify'
New-Item -ItemType Directory -Force -Path $work | Out-Null
Write-Host "==> 核对 Release $verifyTag"
$dump = Join-Path $work "$verifyTag.json"
& python3 (Join-Path $root 'buildsh/lib/verify_release.py') `
--tag $verifyTag `
--manifest (Join-Path $root 'version.json') `
--dump-manifest $dump
if ($LASTEXITCODE -ne 0) { throw "发布一致性核对未通过(tag $verifyTag)" }
Write-Host ''
Write-Host '==> 校验 tag 清单签名'
& dotnet run --project (Join-Path $root 'GC-SAVEDOG/GC-SAVEDOG.csproj') -c Release -- `
verify --manifest $dump
if ($LASTEXITCODE -ne 0) { throw '清单签名校验未通过,客户端会拒绝这次更新' }
Write-Host '结论: 签名可信,可以发布 / 已经发布正确'
}
function Invoke-FullBuild { function Invoke-FullBuild {
Initialize-BuildProgress @('清理旧产物', '版本戳', '编译 Mac', '编译 Win-x64', '编译 Win-arm64', '运行骨架', '打包 zip', '收尾') Initialize-BuildProgress @('清理旧产物', '版本戳', '编译 Mac', '编译 Win-x64', '编译 Win-arm64', '运行骨架', '打包 zip', '收尾')
try { try {
@@ -322,10 +392,12 @@ function Invoke-FullBuild {
New-Item -ItemType Directory -Force -Path (Join-Path $script:BuildRoot 'dist') | Out-Null New-Item -ItemType Directory -Force -Path (Join-Path $script:BuildRoot 'dist') | Out-Null
Complete-BuildStep Complete-BuildStep
Start-BuildStep '版本戳'; Invoke-VersionStamp; Complete-BuildStep # 末次签名:这里只生成清单不签名,Pack-Launcher 打完包后统一签一次
Start-BuildStep '编译 Mac'; Publish-Rid 'osx-arm64' 'dist/mac-arm64' $false; Complete-BuildStep Start-BuildStep '版本戳'; Invoke-VersionStamp -NoSign; Complete-BuildStep
Start-BuildStep '编译 Win-x64'; Publish-Rid 'win-x64' 'dist/win-amd64' $false; Complete-BuildStep # 与 buildsh 一致:启动器与守护进程都发布为压缩单文件,非本体文件在打包时收进 .GC/bin
Start-BuildStep '编译 Win-arm64'; Publish-Rid 'win-arm64' 'dist/win-arm64' $false; Complete-BuildStep Start-BuildStep '编译 Mac'; Publish-Rid 'osx-arm64' 'dist/mac-arm64' $true; Complete-BuildStep
Start-BuildStep '编译 Win-x64'; Publish-Rid 'win-x64' 'dist/win-amd64' $true; Complete-BuildStep
Start-BuildStep '编译 Win-arm64'; Publish-Rid 'win-arm64' 'dist/win-arm64' $true; Complete-BuildStep
Start-BuildStep '运行骨架' Start-BuildStep '运行骨架'
New-MacAppBundle New-MacAppBundle
@@ -337,7 +409,7 @@ function Invoke-FullBuild {
Start-BuildStep '打包 zip'; Pack-Launcher; Complete-BuildStep Start-BuildStep '打包 zip'; Pack-Launcher; Complete-BuildStep
Start-BuildStep '收尾'; Complete-BuildStep Start-BuildStep '收尾'; Complete-BuildStep
Write-Host '==> 完成,产物:' Write-Host '==> 完成,产物:'
Get-ChildItem (Join-Path $script:BuildRoot 'dist') -Recurse -Filter "GC-$script:BuildVersion-*.zip" | Select-Object FullName, Length Get-ChildItem (Join-Path $script:BuildRoot 'dist') -Recurse -Filter "GCL-$script:BuildVersion-*.zip" | Select-Object FullName, Length
} }
finally { Complete-BuildProgress } finally { Complete-BuildProgress }
} }
+27 -19
View File
@@ -3,7 +3,10 @@
# #
# 目标平台按构建主机决定,每条产物都带 Flutter 前端: # 目标平台按构建主机决定,每条产物都带 Flutter 前端:
# macOS 主机 : mac-arm64(原生)+ win-amd64 / win-arm64(mingw 交叉) # macOS 主机 : mac-arm64(原生)+ win-amd64 / win-arm64(mingw 交叉)
# Linux 主机 : linux-arm64(原生 / 交叉)+ win-amd64 / win-arm64(mingw 交叉) # Linux 主机 : win-amd64 / win-arm64(mingw 交叉)
# Linux 产物默认不构建:目标为 linux-arm64,官方 Flutter 引擎只有
# x64 产物,必须在 aarch64 主机上编。需要时用 GC_BUILD_LINUX=1 显式开启
# (云端 aarch64 runner 就是这么用的)。
# Windows 主机: win-amd64 / win-arm64(原生) # Windows 主机: win-amd64 / win-arm64(原生)
# #
# 前端是默认必需项:flutter 缺失或编译失败一律中断,不再悄悄产出只带 Avalonia # 前端是默认必需项:flutter 缺失或编译失败一律中断,不再悄悄产出只带 Avalonia
@@ -23,16 +26,24 @@ bs_build() {
MINGW*|MSYS*|CYGWIN*) : ;; # Windows 主机只能编 Windows MINGW*|MSYS*|CYGWIN*) : ;; # Windows 主机只能编 Windows
*) BUILD_LINUX=1 ;; *) BUILD_LINUX=1 ;;
esac esac
# Linux 目标已切成 arm64:Flutter 的 Linux 前端必须用 aarch64 主机自带的 # Linux 产物默认不出:目标平台是 linux-arm64,而官方 Flutter 引擎只发 x64 产物,
# engine 产物(官方只发 x64 版),x64 主机上强行编出来的是 x64 二进制, # x64 主机上编出来的是 x64 二进制,装到 arm 机器上跑不起来。
# 装到 arm 机器上跑不起来。这里直接跳过,并说明原因,不当成构建失败。 # 需要时显式开启(云端 aarch64 runner):GC_BUILD_LINUX=1 ./build.sh build
if [ "$BUILD_LINUX" = 1 ]; then if [ "$BUILD_LINUX" = 1 ]; then
case "$(uname -m)" in case "${GC_BUILD_LINUX:-0}" in
aarch64|arm64) ;; 1|true|yes)
case "$(uname -m)" in
aarch64|arm64) ;;
*)
BUILD_LINUX=0
echo "!! 已请求 Linux 产物,但当前主机是 $(uname -m)"
echo " (linux-arm64 需要有 aarch64 主机,Flutter 引擎只有 x64 官方产物)"
;;
esac
;;
*) *)
BUILD_LINUX=0 BUILD_LINUX=0
echo "!! 跳过 Linux 产物:目标为 linux-arm64,当前主机是 $(uname -m)" echo "==> 跳过 Linux 产物(默认不构建;需要时用 GC_BUILD_LINUX=1 显式开启)"
echo " (Flutter Linux 引擎只有 x64 官方产物,需在 aarch64 主机上构建)"
;; ;;
esac esac
fi fi
@@ -60,7 +71,9 @@ bs_build() {
fi fi
progress_step "版本戳"; progress_tick 100 progress_step "版本戳"; progress_tick 100
stamp_versions # 末次签名:这里只生成清单不签名,等 pack_launcher 打完 zip、刷新完包信息后统一签一次。
# 避免 ECDSA 随机签名 + 时间戳导致清单在中间反复变化。
stamp_versions --no-sign
# 每个 publish 用后台任务包裹,边跑边按「已用时/预估用时」推进当前步骤进度 # 每个 publish 用后台任务包裹,边跑边按「已用时/预估用时」推进当前步骤进度
_run_publish() { _run_publish() {
@@ -81,8 +94,7 @@ bs_build() {
if [ "$BUILD_MAC" = 1 ]; then if [ "$BUILD_MAC" = 1 ]; then
progress_step "编译 Mac" progress_step "编译 Mac"
_run_publish mac 90 publish_rid "osx-arm64" "dist/mac-arm64" false || return 1 _run_publish mac 90 publish_rid "osx-arm64" "dist/mac-arm64" true || return 1
publish_backend "osx-arm64" "dist/mac-arm64" || return 1
# Flutter 的 macOS 产物必须用 Xcode 在本机编,Linux 上无法替代 # Flutter 的 macOS 产物必须用 Xcode 在本机编,Linux 上无法替代
build_flutter_ui macos "dist/mac-arm64" || { build_flutter_ui macos "dist/mac-arm64" || {
echo "!! macOS 前端编译失败。macOS 版 Flutter 只能在 macOS 上编。" echo "!! macOS 前端编译失败。macOS 版 Flutter 只能在 macOS 上编。"
@@ -90,23 +102,19 @@ bs_build() {
} }
elif [ "$ALLOW_NO_UI" = 1 ]; then elif [ "$ALLOW_NO_UI" = 1 ]; then
progress_step "编译 Mac" progress_step "编译 Mac"
_run_publish mac 90 publish_rid "osx-arm64" "dist/mac-arm64" false || return 1 _run_publish mac 90 publish_rid "osx-arm64" "dist/mac-arm64" true || return 1
publish_backend "osx-arm64" "dist/mac-arm64" || return 1
echo "!! --allow-no-ui:macOS 包内不含 Flutter 前端,启动器将回退 Avalonia" echo "!! --allow-no-ui:macOS 包内不含 Flutter 前端,启动器将回退 Avalonia"
fi fi
progress_step "编译 Win-x64" progress_step "编译 Win-x64"
_run_publish winx64 70 publish_rid "win-x64" "dist/win-amd64" false || return 1 _run_publish winx64 70 publish_rid "win-x64" "dist/win-amd64" true || return 1
publish_backend "win-x64" "dist/win-amd64" || return 1
progress_step "编译 Win-arm64" progress_step "编译 Win-arm64"
_run_publish winarm 70 publish_rid "win-arm64" "dist/win-arm64" false || return 1 _run_publish winarm 70 publish_rid "win-arm64" "dist/win-arm64" true || return 1
publish_backend "win-arm64" "dist/win-arm64" || return 1
if [ "$BUILD_LINUX" = 1 ]; then if [ "$BUILD_LINUX" = 1 ]; then
progress_step "编译 Linux" progress_step "编译 Linux"
_run_publish linux 70 publish_rid "linux-arm64" "dist/linux-arm64" false || return 1 _run_publish linux 70 publish_rid "linux-arm64" "dist/linux-arm64" true || return 1
publish_backend "linux-arm64" "dist/linux-arm64" || return 1
build_flutter_ui linux "dist/linux-arm64" || return 1 build_flutter_ui linux "dist/linux-arm64" || return 1
fi fi
+13
View File
@@ -44,6 +44,19 @@ string(REPLACE "#define VERSION_AS_STRING FLUTTER_VERSION"
_rc_text "${_rc_text}") _rc_text "${_rc_text}")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/Runner.cross.rc" "${_rc_text}") file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/Runner.cross.rc" "${_rc_text}")
# ★ DPI 清单必须自己嵌进去。
#
# windows/runner/CMakeLists.txt 把 runner.exe.manifest 当源文件列进 target,
# Visual Studio 生成器会把它交给链接器(/MANIFESTINPUT)自动嵌入;
# 但这里的交叉编译只用 windres 编 Runner.rc,CMake 不会做这一步,
# 编出来的 GC-UI.exe 就完全没有清单 —— Windows 当它「DPI 不感知」,
# 在 125% / 150% 缩放的屏幕上整体位图拉伸,界面全是糊的。
#
# 因此把清单直接写成资源条目:id 1 = CREATEPROCESS_MANIFEST_RESOURCE_ID,
# type 24 = RT_MANIFEST。windres 不按相对路径解析,这里给绝对路径。
file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/Runner.cross.rc"
"\n1 24 \"${RUN_DIR}/runner.exe.manifest\"\n")
add_executable(${BINARY_NAME} WIN32 add_executable(${BINARY_NAME} WIN32
"${RUN_DIR}/main.cpp" "${RUN_DIR}/main.cpp"
"${RUN_DIR}/flutter_window.cpp" "${RUN_DIR}/flutter_window.cpp"
+83 -68
View File
@@ -6,10 +6,17 @@
if ! type step >/dev/null 2>&1; then step() { echo "==> $1"; }; fi if ! type step >/dev/null 2>&1; then step() { echo "==> $1"; }; fi
if ! type progress >/dev/null 2>&1; then progress() { :; }; fi if ! type progress >/dev/null 2>&1; then progress() { :; }; fi
# $1=--no-sign 时只生成清单、不签名。
# 完整 build 会在 pack_launcher 末尾统一签一次(末次签名),中间这次签名是浪费的:
# ECDSA 用随机 nonce + signedAt 时间戳,每次签名字节都不同,白白多一次全量签名,
# 也让中间产物反复抖动。单独的 stamp / models 工具没有后续打包,仍走默认签名。
stamp_versions() { stamp_versions() {
echo "==> 自动计算模型版本并生成 version.json" echo "==> 自动计算模型版本并生成 version.json"
dotnet run --project "$STAMP_PROJ" -c Release -- "$ROOT_DIR" "$VERSION" dotnet run --project "$STAMP_PROJ" -c Release -- "$ROOT_DIR" "$VERSION"
sign_manifest case "${1:-}" in
--no-sign) echo " (跳过签名,打包结束后统一签一次)" ;;
*) sign_manifest ;;
esac
} }
# 打完 zip 之后刷新 launcher.packages(写入 path / dir / name / sha256 / size)。 # 打完 zip 之后刷新 launcher.packages(写入 path / dir / name / sha256 / size)。
@@ -65,48 +72,56 @@ build_models() {
stamp_versions stamp_versions
} }
# 发布目录只放启动器 + 空的 .GC 运行骨架,绝不放模型 # 发布目录只放程序本体:不预置 .GC,也不放模型。
# .GC(config / model / cache / update / safedog / logs)一律在首次启动时
# 由 AppPaths.EnsureCreated + RuntimeLayout 创建,压缩包里只有 GC 本体。
prepare_runtime_layout() { prepare_runtime_layout() {
REL="$1" REL="$1"
DEST="$ROOT_DIR/$REL" DEST="$ROOT_DIR/$REL"
[ -d "$DEST" ] || return 0 [ -d "$DEST" ] || return 0
rm -rf "$DEST/model" "$DEST/examples" rm -rf "$DEST/model" "$DEST/examples" "$DEST/.GC"
mkdir -p "$DEST/.GC/model" "$DEST/.GC/cache" "$DEST/.GC/update" "$DEST/.GC/config" echo " 运行目录 -> $REL(首次启动后生成 .GC/:config model cache update safedog logs)"
cat > "$DEST/.GC/model/README.txt" <<'TXT'
模型库目录(.GC/model/)
启动时程序会读取 GitCode 仓库的 version.json,把最新版模型下载到这里。
离线使用也可以手动放入 <模型id>/<模型id>.json + <模型id>/<模型id>.model/。
运行目录:
<可执行文件>
GC-SAVEDOG 更新守护进程(验签 + 原子替换 + 失败回滚)
.GC/config/settings.json 用户设置(删 .GC/cache 不会丢配置)
.GC/model/ 本目录(下载的模型)
.GC/cache/ 下载暂存
.GC/update/ 待下次启动应用的启动器更新
TXT
if [ ! -f "$DEST/.GC/config/settings.json" ]; then
cat > "$DEST/.GC/config/settings.json" <<'JSON'
{
"language": "auto",
"theme": "light",
"renderFps": 30,
"memoryMb": 2048,
"autoUpdateOnStartup": true,
"requireSignedManifest": true,
"updateRepository": "https://git.xhmcl.com/Morris/GC",
"updateManifestUrl": "",
"updateLocalRoot": "",
"installedModelVersions": {},
"launcherVersion": "",
"pendingLauncherVersion": "",
"lastUpdateCheck": "",
"sources": [],
"recentModels": []
} }
JSON
fi # 剔除与目标平台无关 / 只在调试诊断时才会加载的组件。
echo " 运行目录 -> $REL/.GC (config/settings.json + model/ + cache/ + update/)" # 判定依据:Windows 包用 Kestrel 自托管,不经过 IIS/HttpSys;Avalonia 在 Windows
# 上只用 Win32 后端;DAC/DBI/DiaSymReader 只有调试器与读 PDB 时才需要,
# 而发布包 DebugType=none、不带 PDB。全都不在启动与正常运行路径上。
prune_package() {
DEST="$1"; PLAT="$2"
[ -d "$DEST" ] || return 0
case "$PLAT" in
win)
# ProjectReference 会把后端 exe 的 runtimeconfig 一起拷过来;后端已编入启动器,
# 这些残留没有用。
rm -f "$DEST"/GC.UI.Server.exe "$DEST"/GC.UI.Server.dll \
"$DEST"/GC.UI.Server.deps.json "$DEST"/GC.UI.Server.runtimeconfig.json
rm -f "$DEST"/mscordaccore*.dll \
"$DEST"/mscordbi.dll \
"$DEST"/Microsoft.DiaSymReader.Native*.dll \
"$DEST"/web.config \
"$DEST"/aspnetcorev2_inprocess.dll \
"$DEST"/Microsoft.AspNetCore.Server.IIS.dll \
"$DEST"/Microsoft.AspNetCore.Server.IISIntegration.dll \
"$DEST"/Microsoft.AspNetCore.Server.HttpSys.dll \
"$DEST"/Avalonia.X11.dll \
"$DEST"/Avalonia.Native.dll \
"$DEST"/Avalonia.FreeDesktop.dll \
"$DEST"/Tmds.DBus.Protocol.dll
;;
linux)
rm -f "$DEST"/mscordaccore*.dll \
"$DEST"/mscordbi.dll \
"$DEST"/Microsoft.DiaSymReader.Native*.dll \
"$DEST"/web.config \
"$DEST"/aspnetcorev2_inprocess.dll \
"$DEST"/Microsoft.AspNetCore.Server.IIS.dll \
"$DEST"/Microsoft.AspNetCore.Server.IISIntegration.dll \
"$DEST"/Microsoft.AspNetCore.Server.HttpSys.dll \
"$DEST"/Avalonia.Win32.dll \
"$DEST"/Avalonia.Win32.Automation.dll
;;
esac
} }
# $1=RID $2=输出目录 $3=singlefile(true/false) # $1=RID $2=输出目录 $3=singlefile(true/false)
@@ -124,15 +139,18 @@ publish_rid() {
-p:DebugType=none \ -p:DebugType=none \
-p:PublishSingleFile="$SINGLE" \ -p:PublishSingleFile="$SINGLE" \
-p:IncludeNativeLibrariesForSelfExtract="$SINGLE" \ -p:IncludeNativeLibrariesForSelfExtract="$SINGLE" \
-p:EnableCompressionInSingleFile="$SINGLE" \
-p:PublishTrimmed=false \ -p:PublishTrimmed=false \
-o "$ROOT_DIR/$OUT" -o "$ROOT_DIR/$OUT" || return 1
# 更新守护进程:与主程序同目录(macOS 打包时会被一起移入 Contents/MacOS) # 更新守护进程:与主程序同目录(macOS 打包时会被一起移入 Contents/MacOS)
if [ -n "${SAVEDOG_PROJ:-}" ] && [ -f "$ROOT_DIR/$SAVEDOG_PROJ" ]; then if [ -n "${SAVEDOG_PROJ:-}" ] && [ -f "$ROOT_DIR/$SAVEDOG_PROJ" ]; then
echo "==> 编译 GC-SAVEDOG (${RID}) -> ${OUT}(裁剪单文件)" echo "==> 编译 GC-SAVEDOG (${RID}) -> ${OUT}(裁剪 + 压缩单文件)"
# 守护进程不引用 Avalonia,可以安全裁剪:70MB -> 14MB。 # 守护进程不引用 Avalonia,可以安全裁剪:70MB -> 14MB。
# 前提是 JSON 全部走源生成上下文(GC-SAVEDOG/SavedogJson.cs),新增 JSON 类型 # 前提是 JSON 全部走源生成上下文(GC-SAVEDOG/SavedogJson.cs),新增 JSON 类型
# 忘了注册只会在发布产物里炸,所以 update-test 会跑一次真实 apply 兜底。 # 忘了注册只会在发布产物里炸,所以 update-test 会跑一次真实 apply 兜底。
# EnableCompressionInSingleFile:运行时不常驻,启动时解压一次即可,
# 换来包内少 4MB 左右,对「下载一次、只在更新时跑」的守护进程很划算。
dotnet publish "$SAVEDOG_PROJ" \ dotnet publish "$SAVEDOG_PROJ" \
-c Release \ -c Release \
-r "$RID" \ -r "$RID" \
@@ -141,6 +159,7 @@ publish_rid() {
-p:DebugType=none \ -p:DebugType=none \
-p:PublishSingleFile=true \ -p:PublishSingleFile=true \
-p:IncludeNativeLibrariesForSelfExtract=true \ -p:IncludeNativeLibrariesForSelfExtract=true \
-p:EnableCompressionInSingleFile=true \
-p:PublishTrimmed=true \ -p:PublishTrimmed=true \
-p:TrimMode=full \ -p:TrimMode=full \
-p:JsonSerializerIsReflectionEnabledByDefault=false \ -p:JsonSerializerIsReflectionEnabledByDefault=false \
@@ -156,12 +175,13 @@ pack_models() {
ZIP="$ROOT_DIR/dist/models-$VERSION.zip" ZIP="$ROOT_DIR/dist/models-$VERSION.zip"
rm -f "$ZIP" rm -f "$ZIP"
echo "==> 打包模型数据 -> dist/models-$VERSION.zip" echo "==> 打包模型数据 -> dist/models-$VERSION.zip"
( cd "$ROOT_DIR" && zip -qr "$ZIP" model \ ( cd "$ROOT_DIR" && zip -qrX "$ZIP" model \
-x "*.DS_Store" "*/bin/*" "*/obj/*" "*.user" ) -x "*.DS_Store" "*/bin/*" "*/obj/*" "*.user" )
du -sh "$ZIP" du -sh "$ZIP"
} }
# 启动器更新包:只包含程序文件,排除 .GC(否则会覆盖用户已下载的模型与设置) # 启动器更新包:安装目录根只放 GC 本体;非本体文件(守护进程等)收进 .GC/bin。
# .GC 下的用户数据(config / model / cache / update / logs / safedog)不进包。
# #
# 产物落点遵循「仓库 dist/<系统>-<架构>/」布局: # 产物落点遵循「仓库 dist/<系统>-<架构>/」布局:
# dist/mac-arm64/GCL-<版本>-mac-arm64.zip # dist/mac-arm64/GCL-<版本>-mac-arm64.zip
@@ -175,22 +195,6 @@ pack_models() {
# macOS: .app 必须打成 zip 才能作为单文件分发;文件名用 .app.zip, # macOS: .app 必须打成 zip 才能作为单文件分发;文件名用 .app.zip,
# 这样 macOS 双击会用归档工具解压出可运行的 .app。 # 这样 macOS 双击会用归档工具解压出可运行的 .app。
# 若直接命名 .app,系统会把 zip 当成应用包解析 => 报「已损坏/打不开」。 # 若直接命名 .app,系统会把 zip 当成应用包解析 => 报「已损坏/打不开」。
# 发布本地 UI 后端(GC.UI.Server)。启动器会拉起它并等待 /api/health,
# 模型窗口也由它承载,所以必须和启动器放在同一目录。
publish_backend() {
RID="$1"; OUT="$2"
echo "==> 编译 UI 后端 (${RID}) -> ${OUT}"
dotnet publish "$ROOT_DIR/GC-UI/backend/GC.UI.Server/GC.UI.Server.csproj" \
-c Release \
-r "$RID" \
--self-contained true \
-p:Version="$VERSION" \
-p:DebugType=none \
-p:PublishSingleFile=false \
-p:PublishTrimmed=false \
-o "$ROOT_DIR/$OUT" || return 1
}
# 当前主机原生构建 Flutter 前端(Windows 主机编 Windows,macOS 主机编 macOS, # 当前主机原生构建 Flutter 前端(Windows 主机编 Windows,macOS 主机编 macOS,
# Linux 主机编 Linux)。跨平台的 Windows 版由 build_flutter_ui_cross 负责。 # Linux 主机编 Linux)。跨平台的 Windows 版由 build_flutter_ui_cross 负责。
# #
@@ -307,14 +311,16 @@ pack_launcher() {
rm -rf "$TMP"; mkdir -p "$PKG" rm -rf "$TMP"; mkdir -p "$PKG"
cp -R "$SRC"/. "$PKG"/ cp -R "$SRC"/. "$PKG"/
rm -f "$PKG"/*.zip rm -f "$PKG"/*.zip
prune_package "$PKG" win
mv "$PKG/$(basename "$EXE")" "$PKG/$PKGNAME.exe" mv "$PKG/$(basename "$EXE")" "$PKG/$PKGNAME.exe"
chmod +x "$PKG/$PKGNAME.exe" 2>/dev/null || true chmod +x "$PKG/$PKGNAME.exe" 2>/dev/null || true
if [ ! -f "$PKG/GC-SAVEDOG.exe" ]; then if [ ! -f "$PKG/GC-SAVEDOG.exe" ]; then
echo " !! 缺少 GC-SAVEDOG.exe,该平台将退回旧脚本更新" echo " !! 缺少 GC-SAVEDOG.exe,该平台将退回旧脚本更新"
else else
# 守护进程放 safedog/:首次启动复制到 .GC/safedog,更新替换不再动它 # 非本体文件统一收进 .GC/bin:安装目录根只留 GC 本体。
mkdir -p "$PKG/safedog" # 首次启动复制到 .GC/safedog 再运行,所以这里的源文件更新时可安全替换。
mv "$PKG/GC-SAVEDOG.exe" "$PKG/safedog/" mkdir -p "$PKG/.GC/bin"
mv "$PKG/GC-SAVEDOG.exe" "$PKG/.GC/bin/"
fi fi
if [ ! -f "$PKG/GC-UI.exe" ]; then if [ ! -f "$PKG/GC-UI.exe" ]; then
echo " !! 包内没有 Flutter 前端,启动器将使用内置 Avalonia 界面" echo " !! 包内没有 Flutter 前端,启动器将使用内置 Avalonia 界面"
@@ -322,7 +328,7 @@ pack_launcher() {
ZIP="$ROOT_DIR/dist/$LABEL/$PKGNAME.zip" ZIP="$ROOT_DIR/dist/$LABEL/$PKGNAME.zip"
rm -f "$ZIP" rm -f "$ZIP"
( cd "$TMP" && zip -qr "$ZIP" "$PKGNAME" ) ( cd "$TMP" && zip -qrX "$ZIP" "$PKGNAME" )
rm -rf "$TMP" rm -rf "$TMP"
echo " -> dist/$LABEL/$PKGNAME.zip" echo " -> dist/$LABEL/$PKGNAME.zip"
done done
@@ -336,20 +342,21 @@ pack_launcher() {
rm -rf "$TMP"; mkdir -p "$PKG" rm -rf "$TMP"; mkdir -p "$PKG"
cp -R "$SRC"/. "$PKG"/ cp -R "$SRC"/. "$PKG"/
rm -f "$PKG"/*.zip rm -f "$PKG"/*.zip
prune_package "$PKG" linux
if [ -f "$PKG/GC" ]; then if [ -f "$PKG/GC" ]; then
mv "$PKG/GC" "$PKG/$PKGNAME" mv "$PKG/GC" "$PKG/$PKGNAME"
chmod +x "$PKG/$PKGNAME" 2>/dev/null || true chmod +x "$PKG/$PKGNAME" 2>/dev/null || true
fi fi
if [ -f "$PKG/GC-SAVEDOG" ]; then if [ -f "$PKG/GC-SAVEDOG" ]; then
mkdir -p "$PKG/safedog" mkdir -p "$PKG/.GC/bin"
mv "$PKG/GC-SAVEDOG" "$PKG/safedog/" mv "$PKG/GC-SAVEDOG" "$PKG/.GC/bin/"
fi fi
if [ ! -f "$PKG/GC-UI" ]; then if [ ! -f "$PKG/GC-UI" ]; then
echo " !! 包内没有 Flutter 前端,启动器将使用内置 Avalonia 界面" echo " !! 包内没有 Flutter 前端,启动器将使用内置 Avalonia 界面"
fi fi
ZIP="$ROOT_DIR/dist/linux-arm64/$PKGNAME.zip" ZIP="$ROOT_DIR/dist/linux-arm64/$PKGNAME.zip"
rm -f "$ZIP" rm -f "$ZIP"
( cd "$TMP" && zip -qry "$ZIP" "$PKGNAME" ) ( cd "$TMP" && zip -qryX "$ZIP" "$PKGNAME" )
rm -rf "$TMP" rm -rf "$TMP"
echo " -> dist/linux-arm64/$PKGNAME.zip" echo " -> dist/linux-arm64/$PKGNAME.zip"
fi fi
@@ -366,6 +373,13 @@ pack_launcher() {
/usr/libexec/PlistBuddy -c "Set :CFBundleName Morris GC" "$PLIST" 2>/dev/null || true /usr/libexec/PlistBuddy -c "Set :CFBundleName Morris GC" "$PLIST" 2>/dev/null || true
/usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName Morris GC" "$PLIST" 2>/dev/null || true /usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName Morris GC" "$PLIST" 2>/dev/null || true
fi fi
# 非本体文件收进 .GC/bin(与 Windows 布局一致):.GC 位置不变,仍在启动器同级
# (也就是 .app/Contents/MacOS/),首次启动复制到 .GC/safedog 再运行。
if [ -f "$FINAL/Contents/MacOS/GC-SAVEDOG" ]; then
mkdir -p "$FINAL/Contents/MacOS/.GC/bin"
mv "$FINAL/Contents/MacOS/GC-SAVEDOG" "$FINAL/Contents/MacOS/.GC/bin/"
chmod +x "$FINAL/Contents/MacOS/.GC/bin/GC-SAVEDOG" 2>/dev/null || true
fi
xattr -cr "$FINAL" 2>/dev/null || true xattr -cr "$FINAL" 2>/dev/null || true
echo " -> $(basename "$FINAL")/" echo " -> $(basename "$FINAL")/"
fi fi
@@ -387,10 +401,10 @@ pack_launcher() {
if command -v ditto >/dev/null 2>&1; then if command -v ditto >/dev/null 2>&1; then
ditto -c -k --sequesterRsrc --keepParent "$art" "$ZIP" ditto -c -k --sequesterRsrc --keepParent "$art" "$ZIP"
else else
( cd "$(dirname "$art")" && zip -qry "$ZIP" "$base" -x "*.DS_Store" ) ( cd "$(dirname "$art")" && zip -qryX "$ZIP" "$base" -x "*.DS_Store" )
fi fi
else else
( cd "$(dirname "$art")" && zip -q "$ZIP" "$base" ) ( cd "$(dirname "$art")" && zip -qX "$ZIP" "$base" )
fi fi
echo " -> dist/${label}/${name}.zip" echo " -> dist/${label}/${name}.zip"
done done
@@ -471,7 +485,8 @@ PLIST
fi fi
fi fi
# 发布包不带 .GC 运行骨架(用户首次启动自行创建),避免覆盖用户数据 # 清掉模板类 .GC(config / model / cache / update / logs):首次启动自行创建,
# 包里只保留 .GC/bin 这一个由 pack_launcher 补上的非本体文件目录。
rm -rf "$APP/Contents/MacOS/.GC" rm -rf "$APP/Contents/MacOS/.GC"
chmod +x "$APP/Contents/MacOS/GC" chmod +x "$APP/Contents/MacOS/GC"
echo "==> 已打包 $APP" echo "==> 已打包 $APP"
+211
View File
@@ -0,0 +1,211 @@
#!/usr/bin/env python3
"""核对「仓库清单 ↔ Release 资产」是否对得上。
为什么需要它:清单里的 sha256 是客户端验证下载包的唯一依据。一旦 Release 上的资产
和清单不是同一份(换过一次构建、上传了别的产物、tag 指到了旧提交),客户端会验签
失败或直接回滚 —— 用户看到的是「更新失败了」,而服务端一切正常。
检查项:
1. tag 指向的 version.json 里的 launcher.version 等于 tag 名;
2. 清单里带 sha256 的平台,Release 上有同名资产,且体积 / sha256 完全一致;
3. 清单里没有 sha256 的平台(本次没构建)不要求有资产,但会列出;
4. Release 上多出来的资产(清单里没有)单独提示;
5. 本地清单与 tag 上的清单是否字节一致。
只用标准库,Linux / macOS / Windows 上都能跑。
"""
from __future__ import annotations
import argparse
import hashlib
import json
import os
import sys
import urllib.error
import urllib.request
DEFAULT_BASE = os.environ.get("GC_GITEA_URL", "https://git.xhmcl.com")
DEFAULT_REPO = os.environ.get("GC_GITEA_REPO", "Morris/GC")
def log(msg: str = "") -> None:
print(msg, flush=True)
def http_json(url: str, token: str | None) -> dict:
req = urllib.request.Request(url)
req.add_header("Accept", "application/json")
if token:
req.add_header("Authorization", "token " + token)
with urllib.request.urlopen(req, timeout=60) as resp:
return json.loads(resp.read().decode("utf-8"))
def download_sha256(url: str, token: str | None, dest: str) -> tuple[int, str]:
req = urllib.request.Request(url)
if token:
req.add_header("Authorization", "token " + token)
digest = hashlib.sha256()
size = 0
with urllib.request.urlopen(req, timeout=600) as resp, open(dest, "wb") as out:
while True:
chunk = resp.read(1 << 20)
if not chunk:
break
size += len(chunk)
digest.update(chunk)
out.write(chunk)
return size, digest.hexdigest()
def main() -> int:
parser = argparse.ArgumentParser(description="核对清单与 Release 资产")
parser.add_argument("--tag", required=True, help="要核对的 tag,例如 1.1.0")
parser.add_argument("--manifest", default="version.json", help="本地清单路径(用于对比)")
parser.add_argument("--base-url", default=DEFAULT_BASE)
parser.add_argument("--repo", default=DEFAULT_REPO)
parser.add_argument("--token", default=os.environ.get("GC_GITEA_TOKEN"))
parser.add_argument("--workdir", default=None, help="下载临时目录(默认系统临时目录)")
parser.add_argument("--skip-download", action="store_true",
help="只核对清单体积与资产列表,不下载算哈希")
parser.add_argument("--dump-manifest", default=None,
help="把 tag 上的清单原样写到这个路径(供 GC-SAVEDOG verify 验签)")
args = parser.parse_args()
tag = args.tag.strip()
if tag.startswith("v"):
tag = tag[1:]
api = f"{args.base_url}/api/v1/repos/{args.repo}"
workdir = args.workdir or os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "..", "build", "release-verify")
workdir = os.path.abspath(workdir)
os.makedirs(workdir, exist_ok=True)
failures: list[str] = []
warnings: list[str] = []
# ---- 1. tag 上的清单 ----
try:
remote = http_json(f"{api}/raw/version.json?ref={tag}", args.token)
except urllib.error.HTTPError as exc:
log(f"!! 取不到 tag {tag} 的 version.json(HTTP {exc.code})")
return 1
if args.dump_manifest:
os.makedirs(os.path.dirname(os.path.abspath(args.dump_manifest)), exist_ok=True)
with open(args.dump_manifest, "w", encoding="utf-8") as fh:
json.dump(remote, fh, ensure_ascii=False, indent=2)
launcher = remote.get("launcher") or {}
remote_version = str(launcher.get("version") or "")
log(f"tag : {tag}")
log(f"清单版本 : {remote_version or '(空)'}")
if remote_version != tag:
failures.append(f"tag 指向的清单版本是 {remote_version!r},与 tag {tag} 不一致")
# 签名状态:交给 GC-SAVEDOG verify 判定(这里只提示有没有签名段)
if not remote.get("signature"):
failures.append("tag 上的清单没有签名段")
else:
log(f"清单签名 : {remote['signature'].get('keyId', '?')}")
# ---- 2. Release 与资产 ----
try:
release = http_json(f"{api}/releases/tags/{tag}", args.token)
except urllib.error.HTTPError as exc:
log(f"!! 取不到 Release {tag}(HTTP {exc.code})")
return 1
assets = {a["name"]: a for a in release.get("assets") or []}
log(f"Release : id={release.get('id')} prerelease={release.get('prerelease')}")
log(f"资产数量 : {len(assets)}")
packages = launcher.get("packages") or {}
declared: set[str] = set()
log("")
log(f"{'平台':<12} {'包':<32} {'结果'}")
log("-" * 78)
for rid, pkg in packages.items():
name = str(pkg.get("name") or "")
want_sha = str(pkg.get("sha256") or "")
want_size = int(pkg.get("size") or 0)
if not name:
warnings.append(f"{rid}: 清单条目没有 name")
continue
declared.add(name)
asset = assets.get(name)
if not want_sha:
log(f"{rid:<12} {name:<32} 未构建(清单无 sha256)")
if asset:
warnings.append(f"{rid}: 清单没记录哈希,但 Release 上有 {name}")
continue
if not asset:
log(f"{rid:<12} {name:<32} ✗ 资产缺失")
failures.append(f"{rid}: Release 上找不到 {name}")
continue
if int(asset.get("size") or 0) != want_size:
log(f"{rid:<12} {name:<32} ✗ 体积不符 {asset.get('size')} != {want_size}")
failures.append(f"{rid}: {name} 体积 {asset.get('size')},清单 {want_size}")
continue
if args.skip_download:
log(f"{rid:<12} {name:<32} ✓ 体积一致(未下载)")
continue
url = asset.get("browser_download_url") or f"{args.base_url}/{args.repo}/releases/download/{tag}/{name}"
dest = os.path.join(workdir, name)
try:
size, sha = download_sha256(url, args.token, dest)
os.remove(dest)
except Exception as exc: # noqa: BLE001 - 下载失败一律按失败上报
log(f"{rid:<12} {name:<32} ✗ 下载失败: {exc}")
failures.append(f"{rid}: 下载 {name} 失败: {exc}")
continue
if size != want_size or sha != want_sha:
log(f"{rid:<12} {name:<32} ✗ sha256 不符")
log(f" 期望 {want_sha}")
log(f" 实际 {sha}")
failures.append(f"{rid}: {name} sha256 与清单不符")
else:
log(f"{rid:<12} {name:<32} ✓ {size:,} B sha {sha[:16]}…")
extra = sorted(set(assets) - declared)
if extra:
warnings.append("Release 上有清单未声明的资产: " + ", ".join(extra))
# ---- 3. 本地清单对比 ----
if os.path.isfile(args.manifest):
with open(args.manifest, "rb") as fh:
local_raw = fh.read()
local = json.loads(local_raw.decode("utf-8"))
local_packages = (local.get("launcher") or {}).get("packages") or {}
if local_packages != packages:
warnings.append("本地清单的 packages 与 tag 上的不一致(本地可能是未发布的构建)")
else:
log("")
log("本地清单与 tag 上的 packages 一致")
# ---- 汇总 ----
log("")
for w in warnings:
log("警告: " + w)
if failures:
for f in failures:
log("失败: " + f)
log("")
log("结论: 不一致 —— 客户端会拒绝或回滚这次更新")
return 1
log("结论: 一致 —— 清单、tag、资产三者对得上")
return 0
if __name__ == "__main__":
sys.exit(main())
+42
View File
@@ -0,0 +1,42 @@
#!/bin/sh
# buildsh/release.sh —— 发布一致性核对
#
# ./build.sh release-verify # 核对当前版本号对应的 tag
# ./build.sh release-verify 1.1.0 # 核对指定 tag
# ./build.sh release-verify 1.1.0 --skip-download # 只看体积,不下载
#
# 检查的是「tag 指向的清单 / Release 上的资产 / 清单里的 sha256」三者是否互相对得上。
# 客户端的升级判断完全依赖这三者:任何一处错位,用户侧就是验签失败或安全回滚。
bs_verify_release() {
ROOT_DIR="$1"; shift
TAG="${1:-$VERSION}"
if [ "$#" -gt 0 ]; then shift; fi
WORK="$ROOT_DIR/build/release-verify"
mkdir -p "$WORK"
echo "==> 核对 Release ${TAG}"
rc=0
python3 "$ROOT_DIR/buildsh/lib/verify_release.py" \
--tag "$TAG" \
--manifest "$ROOT_DIR/version.json" \
--dump-manifest "$WORK/$TAG.json" \
"$@" || rc=$?
if [ "$rc" -ne 0 ]; then
return "$rc"
fi
# 资产对得上还不够:清单本身必须是我签的,否则客户端一样会拒
echo ""
echo "==> 校验 tag 清单签名"
if dotnet run --project "$ROOT_DIR/GC-SAVEDOG/GC-SAVEDOG.csproj" -c Release -- \
verify --manifest "$WORK/$TAG.json"; then
echo "结论: 签名可信,可以发布 / 已经发布正确"
return 0
fi
echo "!! 签名校验未通过,客户端会拒绝这次更新"
return 1
}
+1 -1
View File
@@ -26,7 +26,7 @@ bs_tools() {
dotnet --info | head -20 ;; dotnet --info | head -20 ;;
dist) dist)
echo "==> dist 产物:" echo "==> dist 产物:"
ls -lh "$ROOT_DIR"/dist/*/GC-*.zip 2>/dev/null || ls -lh "$ROOT_DIR"/dist 2>/dev/null || true ;; ls -lh "$ROOT_DIR"/dist/*/GCL-*.zip 2>/dev/null || ls -lh "$ROOT_DIR"/dist 2>/dev/null || true ;;
*) *)
echo "未知工具: $TASK"; return 1 ;; echo "未知工具: $TASK"; return 1 ;;
esac esac
+4 -4
View File
@@ -5,8 +5,8 @@
"en": "Contour Map" "en": "Contour Map"
}, },
"descriptionI18n": { "descriptionI18n": {
"zh-CN": "立体地形与平面等高线联动,判读山峰、山脊、山谷、鞍部、陡崖五种部位。", "zh-CN": "可旋转 3D 地形 + 等高切割/交线/投影/判坡四步动画,判读山峰、山脊、山谷、鞍部、陡崖五大典型地貌。",
"en": "Link 3D relief with contour lines; identify peaks, ridges, valleys, saddles and cliffs." "en": "Rotatable 3D terrain with a four-step animation of contour cutting, lines, projection and slope; identify five classic landforms."
}, },
"author": "Morris GC", "author": "Morris GC",
"tags": [ "tags": [
@@ -17,7 +17,7 @@
], ],
"assembly": "ContourMapModel.dll", "assembly": "ContourMapModel.dll",
"type": "GC.ContourMap.ContourMapFactory", "type": "GC.ContourMap.ContourMapFactory",
"version": "1.1", "version": "1.2",
"chrome": { "chrome": {
"titleBar": "#0C1828", "titleBar": "#0C1828",
"titleBorder": "#1B2740", "titleBorder": "#1B2740",
@@ -26,5 +26,5 @@
"frame": "#0A1524" "frame": "#0A1524"
}, },
"build": "773ab2161d", "build": "773ab2161d",
"updatedAt": "2026-11-18T10:16:41Z" "updatedAt": "2026-11-19T10:20:00Z"
} }
+58 -72
View File
@@ -1,130 +1,116 @@
{ {
"zh-CN": { "zh-CN": {
"title": "如何使用 · 等高线地形图", "title": "如何使用 · 等高线地形与五大典型地貌",
"sections": [ "sections": [
{ {
"h": "开始使用(跟着做)", "h": "开始使用(跟着做)",
"lines": [ "lines": [
"第 1 步:顶部选一种地形(山地 / 盆地 / 丘陵 / 高原 / 平原),画面会换成对应的等高线图。", "第 1 步:点右下角「开始实验」,在立体地形里观察水平切面下降、交线形成、垂直投影与疏密判坡四步动画。",
"第 2 步:把鼠标移到图上任意位置,底部会显示该点的海拔、相对高度和地形部位。", "第 2 步:在立体地形上按住鼠标拖动可旋转视角,滚轮缩放;这是可交互的 3D 地形。",
"第 3 步:观察左边的立体地形与右边的等高线图,找出同一个山峰,看它在两张图上分别长什么样。", "第 3 步:点画布上方「五大典型地貌」标签(山峰/山脊/山谷/鞍部/陡崖),画面换成对应的专门地形并叠加完整等高线,观察各自的等高线特征。",
"第 4 步:点右下角「取消上色」,只留等高线;再点一次恢复分层设色,对比哪种更便于判读。", "第 4 步:点底部「俯视图 / 立体图」在等高线地图与 3D 地形间切换;鼠标悬停任意位置,底部显示该点海拔与地形部位。",
"第 5 步:对着右侧的判读要点,依次在图上找出一个山峰、一条山脊、一条山谷、一处鞍部和一处陡崖。" "第 5 步:点「上色 / 取消上色」对比分层设色与纯等高线;点「全屏」进入全屏演示。"
] ]
}, },
{ {
"h": "等高线是什么", "h": "键盘快捷键",
"lines": [ "lines": [
"在地图上,把海拔相同的点用线连起来,这条线就叫等高线。", "空格:播放 / 暂停实验。",
"相邻两条等高线之间的高差叫等高距:本图山地、高原、盆地用 100 米,丘陵用 10 米,平原用 5 米。", "数字 1 – 5:依次切换到山峰、山脊、山谷、鞍部、陡崖。"
"等高线的闭合圈,数值由中心向四周递减的是山峰;四周高中间低的是盆地。",
"等高线向海拔低处凸出的是山脊(分水线);向海拔高处凸出的是山谷(集水线)。",
"两个山峰之间低下去的地方叫鞍部;等高线重叠或挤成一团的地方是陡崖。",
"等高线越密,坡度越陡;越疏,坡度越缓。",
"每 5 条等高线加粗一条叫计曲线,上面标着海拔,方便读数。"
] ]
}, },
{ {
"h": "海拔与相对高度", "h": "四步实验流程",
"lines": [ "lines": [
"海拔:地面某一点高出海平面的垂直距离。", "等高切割:一个水平面从山顶向下移动,与山体在同一海拔相交。",
"相对高度:两个地点海拔的差值,也就是图上两点的落差。", "形成交线:每个水平切面留下一条闭合交线,多层交线共同描述山体起伏。",
"底部读数里的「相对高度」是本图最低点到该点的高差。" "投影成图:各高度的交线沿垂线投影到同一平面,累积成完整等高线图。",
"疏密判坡:坡度着色叠加等高线,陡处线密、缓处线疏。"
] ]
}, },
{ {
"h": "五种地体的等高线特征", "h": "五大典型地貌的判读",
"lines": [ "lines": [
"山地:海拔高、起伏大,等高线密集且数值跨度大。", "山峰:等高线闭合,数值由中心向四周递减(若向内降低则为洼地)。",
"盆地:四周高、中间低,等高线由外向内数值递减,常有河流发育。", "山脊:等高线向海拔低处凸出(凸低为脊),脊线是分水线。",
"丘陵:海拔不高、坡度和缓,等高线稀疏弯曲。", "山谷:等高线向海拔高处凸出(凸高为谷),谷线是集水线,常发育河流。",
"高原:海拔高而顶面平坦,等高线中部稀疏、边缘密集。", "鞍部:两座山峰之间相对低洼,俯视轮廓呈马鞍状收腰。",
"平原:海拔低、地面平坦,等高线很少甚至没有。" "陡崖:等高线密集甚至重合,近乎垂直;n 条线重合时 (n−1)d ≤ ΔH < (n+1)d。"
] ]
}, },
{ {
"h": "地图上的教科书符号", "h": "等高线基础",
"lines": [ "lines": [
"分层设色:按固定高程档位套固定色阶(深绿→浅绿→绿→浅黄→黄→浅褐→褐→白),同一档内颜色完全相同。", "同一条等高线上各点海拔相等;相邻等高线之间的高差叫等高距(本图 100 米)。",
"山峰用 ▲ 加高程数字标注。", "等高线越密坡越陡,越疏坡越缓。",
"河流用蓝色线表示,沿谷底(等高线凸向高处的一侧)流。", "每 5 条加粗一条叫计曲线,标注海拔便于读数。",
"陡崖用红色锯齿线表示。", "海拔:某地高出海平面的垂直距离;相对高度:两点海拔之差。"
"指北针在图幅右上角,比例尺在左下角,分层设色图例在右下角。",
"地形剖面图在图幅底部:沿南北中线剖开地面,标出各点海拔,看清起伏。"
] ]
}, },
{ {
"h": "容易出错的地方", "h": "地图符号",
"lines": [ "lines": [
"把「等高线密集 = 陡」记反:密集是陡,稀疏是缓。", "分层设色按固定高程档位套固定色阶(深绿→浅绿→绿→浅黄→黄→浅褐→褐→白)。",
"把山脊和山谷看反:看凸出的方向 —— 凸向低处是山脊,凸向高处是山谷。", "山峰用 ▲ 加高程数字标注;河流用蓝色线沿谷底绘制;陡崖用红色锯齿线表示。",
"忽视等高距:等高距变了,同样的等高线密度代表的坡度就不同。", "指北针在图幅右上,比例尺在左下,分层设色图例在右下,地形剖面图在底部。"
"把计曲线当成普通等高线:计曲线加粗并标了数值,读高程要看它。"
] ]
} }
] ]
}, },
"en": { "en": {
"title": "How to use · Contour Map", "title": "How to use · Contour Lines & Five Landforms",
"sections": [ "sections": [
{ {
"h": "Getting started (follow along)", "h": "Getting started (follow along)",
"lines": [ "lines": [
"Step 1: pick a terrain type at the top (mountains / basin / hills / plateau / plain) — the map switches to its contour map.", "Step 1: press Start to watch the four-step animation — contour cutting, line formation, vertical projection and slope reading.",
"Step 2: move the pointer anywhere on the map; the footer shows elevation, relative height and the terrain feature.", "Step 2: drag with the mouse to rotate the 3D terrain, scroll to zoom; it is fully interactive.",
"Step 3: compare the 3D block on the left with the contour map on the right — find the same peak in both.", "Step 3: click a landform tab above the canvas (peak / ridge / valley / saddle / cliff) to load its dedicated terrain with its full contour pattern.",
"Step 4: click “No colour” at the bottom right to keep only the contour lines; click again to restore the colour fill.", "Step 4: toggle Top view / 3D view at the bottom; hover anywhere to read elevation and terrain feature.",
"Step 5: using the panel on the right, find one peak, one ridge, one valley, one saddle and one cliff." "Step 5: use Colour / No colour to compare hypsometric tint with pure contour lines; use Fullscreen for presentation."
] ]
}, },
{ {
"h": "What contour lines are", "h": "Keyboard shortcuts",
"lines": [ "lines": [
"Connect points of equal elevation on a map and you get a contour line.", "Space: play / pause the experiment.",
"The height gap between neighbouring contours is the contour interval: 100 m for mountains, plateau and basin; 10 m for hills; 5 m for plain.", "Numbers 1 – 5: switch to peak, ridge, valley, saddle, cliff."
"A closed loop whose values decrease outward is a peak; high ground around a low centre is a basin.",
"Contours bulging toward lower ground form a ridge (watershed); bulging toward higher ground form a valley (drainage).",
"The low ground between two peaks is a saddle; overlapping or tightly crowded contours mark a cliff.",
"The closer the contours, the steeper the slope; the wider apart, the gentler.",
"Every 5th contour is bolded as an index contour and labelled with its elevation."
] ]
}, },
{ {
"h": "Elevation and relative height", "h": "The four experiment steps",
"lines": [ "lines": [
"Elevation is the vertical height of a point above sea level.", "Contour cutting: a horizontal plane descends from the summit and intersects the mountain at one elevation.",
"Relative height is the difference between two elevations — the drop between two points on the map.", "Forming lines: each slice leaves a closed intersection line; stacked lines describe the relief.",
"The relative height in the footer is measured from the lowest point of this map." "Projection: intersection lines are projected vertically onto one plane, building the contour map.",
"Slope density: slope shading over contours — dense lines mean steep, sparse lines mean gentle."
] ]
}, },
{ {
"h": "Contour patterns of the five terrains", "h": "Reading the five landforms",
"lines": [ "lines": [
"Mountains: high elevation, large relief, dense contours over a wide value range.", "Peak: closed contours, values decrease outward (if they decrease inward it is a depression).",
"Basin: high rim, low centre; values decrease inward, often with a river.", "Ridge: contours bulge toward lower ground; a watershed line.",
"Hills: low elevation, gentle slopes, sparse winding contours.", "Valley: contours bulge toward higher ground; a drainage line, often a stream.",
"Plateau: high but flat on top — contours sparse in the middle and crowded at the edges.", "Saddle: low ground between two peaks, pinched like a saddle in plan view.",
"Plain: low and flat — few or no contour lines at all." "Cliff: contours crowd or overlap, nearly vertical; n overlapping lines: (n−1)d ≤ ΔH < (n+1)d."
] ]
}, },
{ {
"h": "Textbook map symbols", "h": "Contour basics",
"lines": [ "lines": [
"Hypsometric tint: fixed colour bands by elevation (dark green → light green → green → pale yellow → yellow → light brown → brown → white); each band is a flat colour.", "All points on one contour share the same elevation; the gap between neighbours is the contour interval (100 m here).",
"Peaks are marked with a ▲ and their elevation.", "Closer contours mean steeper slopes; wider spacing means gentler slopes.",
"Rivers are drawn in blue along the valley floor (where contours bulge uphill).", "Every 5th contour is bolded as an index contour and labelled with elevation.",
"Cliffs are marked with a red saw-tooth line.", "Elevation is height above sea level; relative height is the difference between two elevations."
"A north arrow sits top-right, a scale bar bottom-left, and the tint legend bottom-right.",
"The terrain profile along the bottom cuts the ground open and labels elevations, showing the relief at a glance."
] ]
}, },
{ {
"h": "Common mistakes", "h": "Map symbols",
"lines": [ "lines": [
"Reversing dense and sparse: dense means steep, sparse means gentle.", "Hypsometric tint uses fixed colour bands (dark green → light green → green → pale yellow → yellow → light brown → brown → white).",
"Mixing up ridge and valley — look which way the bulge points: toward lower ground is a ridge, toward higher ground is a valley.", "Peaks are marked with ▲ plus elevation; rivers are blue lines along valleys; cliffs use a red saw-tooth line.",
"Ignoring the contour interval: change it and the same spacing means a different slope.", "North arrow top-right, scale bar bottom-left, tint legend bottom-right, terrain profile along the bottom."
"Treating index contours as ordinary ones — they are bold and labelled, so read elevations off them."
] ]
} }
] ]
@@ -1,4 +1,4 @@
{ {
"app.title": "Contour Map", "app.title": "Contour Lines · Five Classic Landforms",
"app.subtitle": "Grade 7 · Reading terrain maps: from 3D relief to contour lines" "app.subtitle": "Grade 7 · From 3D relief to contour maps: peaks, ridges, valleys, saddles and cliffs"
} }
@@ -1,4 +1,4 @@
{ {
"app.title": "等高线地形图", "app.title": "等高线地形 · 五大典型地貌判读",
"app.subtitle": "七年级上册 · 地形图的判读:从立体地形到平面等高线" "app.subtitle": "七年级上册 · 从立体地形到平面等高线,判读山峰/山脊/山谷/鞍部/陡崖"
} }
Binary file not shown.

Before

Width:  |  Height:  |  Size: 90 KiB

After

Width:  |  Height:  |  Size: 65 KiB

+37 -3
View File
@@ -24,6 +24,7 @@ public sealed class ContourMapRuntime : IModelRuntime
{ {
private TerrainField? _field; private TerrainField? _field;
private Dictionary<string, string>? _texts; private Dictionary<string, string>? _texts;
private ContourPage? _page;
public void Prepare(IModelContext context) public void Prepare(IModelContext context)
{ {
@@ -41,22 +42,55 @@ public sealed class ContourMapRuntime : IModelRuntime
public Control CreateView(IModelContext context) public Control CreateView(IModelContext context)
{ {
_texts ??= LoadTexts(context.DataDirectory, context.Language); _texts ??= LoadTexts(context.DataDirectory, context.Language);
// 五种地体都在界面里现场生成(切换很快,不必预先生成全部) // 实验地形 + 五大地貌都在界面里现场生成(切换很快,不必预先生成全部)
return new ContourPage(_texts).Build(); _page = new ContourPage(_texts);
return _page.Build();
} }
public void Dispose() public void Dispose()
{ {
_page?.Dispose();
_page = null;
_field = null; _field = null;
_texts = null; _texts = null;
System.GC.SuppressFinalize(this); System.GC.SuppressFinalize(this);
} }
/// <summary>
/// 文案 = 内置默认(保证任何语言都有词)+ dataDir/i18n/&lt;lang&gt;.json 覆盖。
/// 语言包缺失或某条没翻译时自动退回内置默认,不会露出裸 key。
/// </summary>
private static Dictionary<string, string> LoadTexts(string dataDir, string language) private static Dictionary<string, string> LoadTexts(string dataDir, string language)
{ {
var map = new Dictionary<string, string>(DefaultTexts.Zh);
var isEn = language.StartsWith("en", StringComparison.OrdinalIgnoreCase); var isEn = language.StartsWith("en", StringComparison.OrdinalIgnoreCase);
var map = new Dictionary<string, string>(DefaultTexts.Zh);
if (isEn) foreach (var kv in DefaultTexts.En) map[kv.Key] = kv.Value; if (isEn) foreach (var kv in DefaultTexts.En) map[kv.Key] = kv.Value;
var candidates = new List<string>();
if (!string.IsNullOrWhiteSpace(language)) candidates.Add(language);
candidates.Add(isEn ? "en" : "zh-CN");
foreach (var lang in candidates)
{
var path = System.IO.Path.Combine(dataDir, "i18n", lang + ".json");
if (!System.IO.File.Exists(path)) continue;
try
{
using var doc = System.Text.Json.JsonDocument.Parse(System.IO.File.ReadAllText(path));
if (doc.RootElement.ValueKind != System.Text.Json.JsonValueKind.Object) continue;
foreach (var p in doc.RootElement.EnumerateObject())
{
if (p.Value.ValueKind != System.Text.Json.JsonValueKind.String) continue;
var v = p.Value.GetString();
if (!string.IsNullOrWhiteSpace(v)) map[p.Name] = v!;
}
break;
}
catch
{
// 语言包损坏不影响开课,继续用内置默认
}
}
return map; return map;
} }
} }
+527 -175
View File
@@ -2,16 +2,22 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Layout; using Avalonia.Layout;
using Avalonia.Media; using Avalonia.Media;
namespace GC.ContourMap; namespace GC.ContourMap;
/// <summary>等高线模型的界面:顶部标题、中间双图联动、右侧判读要点、底部实时读数。</summary> /// <summary>
/// 等高线模型界面(完整复刻 HTML 课件功能):
/// 顶部标题 + 全屏;左侧可交互 3D 画布;右侧实验流程/五大地貌/判读要点观察面板;
/// 底部播放控制、俯视切换、上色开关、实时读数;支持键盘 1-5 / 空格快捷键。
/// </summary>
public sealed class ContourPage public sealed class ContourPage
{ {
private static readonly Color CAppBg = Color.Parse("#0B1524"); private static readonly Color CAppBg = Color.Parse("#0B1524");
private static readonly Color CPanel = Color.Parse("#101E31"); private static readonly Color CPanel = Color.Parse("#101E31");
private static readonly Color CPanel2 = Color.Parse("#16263C");
private static readonly Color CLine = Color.Parse("#1E3350"); private static readonly Color CLine = Color.Parse("#1E3350");
private static readonly Color CInk = Color.Parse("#EAF2FF"); private static readonly Color CInk = Color.Parse("#EAF2FF");
private static readonly Color CInkDim = Color.Parse("#93A8C6"); private static readonly Color CInkDim = Color.Parse("#93A8C6");
@@ -20,37 +26,61 @@ public sealed class ContourPage
private static readonly Color CWarn = Color.Parse("#FFB454"); private static readonly Color CWarn = Color.Parse("#FFB454");
private static readonly Color CGood = Color.Parse("#5FD69B"); private static readonly Color CGood = Color.Parse("#5FD69B");
private TerrainField _field;
private readonly Dictionary<string, string> _texts; private readonly Dictionary<string, string> _texts;
private readonly Dictionary<TerrainKind, TerrainField> _cache = new(); private readonly Dictionary<LandformKind, TerrainField> _landformCache = new();
private Border? _colorBtn; private TerrainField _experimentField;
private TextBlock? _colorBtnText;
private TerrainKind _kind = TerrainKind.Mountain;
private ContourView? _view; private ContourView? _view;
private TextBlock? _readout; private TextBlock? _readout;
private TextBlock? _featureText; private TextBlock? _featureText;
private TextBlock? _hintText;
private TextBlock? _playLabel;
private TextBlock? _observeHeading;
private TextBlock? _observeSummary;
private StackPanel? _featureList;
private TextBlock? _viewToggleLabel;
private readonly List<Border> _flowButtons = new();
private readonly List<Border> _landformButtons = new();
private Border? _playBtn;
private Border? _backBtn;
private Border? _colorBtn;
private TextBlock? _colorBtnText;
private ProgressBar? _progress;
private int _step = 0;
private LandformKind? _selectedLandform;
private bool _disposed;
private TopLevel? _topLevel;
private static readonly LandformKind[] LandformOrder =
{ LandformKind.Peak, LandformKind.Ridge, LandformKind.Valley, LandformKind.Saddle, LandformKind.Cliff };
public ContourPage(Dictionary<string, string> texts) public ContourPage(Dictionary<string, string> texts)
{ {
_texts = texts; _texts = texts;
_field = GetField(TerrainKind.Mountain); _experimentField = new TerrainField(TerrainKind.Mountain, 192);
}
/// <summary>取(并缓存)某类地体的高度场,切换时不重复计算。</summary>
private TerrainField GetField(TerrainKind kind)
{
if (!_cache.TryGetValue(kind, out var f))
{
f = new TerrainField(kind, 192);
_cache[kind] = f;
}
return f;
} }
private string T(string key) => _texts.TryGetValue(key, out var v) ? v : key; private string T(string key) => _texts.TryGetValue(key, out var v) ? v : key;
private string T(string key, params object[] args)
{
var s = T(key);
try { return string.Format(System.Globalization.CultureInfo.InvariantCulture, s, args); }
catch { return s; }
}
private static SolidColorBrush B(Color c) => new(c); private static SolidColorBrush B(Color c) => new(c);
private TerrainField GetLandformField(LandformKind kind)
{
if (!_landformCache.TryGetValue(kind, out var f))
{
f = new TerrainField(kind, 192);
_landformCache[kind] = f;
}
return f;
}
public Control Build() public Control Build()
{ {
var root = new Grid { Background = B(CAppBg) }; var root = new Grid { Background = B(CAppBg) };
@@ -60,12 +90,18 @@ public sealed class ContourPage
root.Children.Add(BuildHeader()); root.Children.Add(BuildHeader());
var body = new Grid { Margin = new Thickness(14, 8, 14, 6) }; var body = new Grid { Margin = new Thickness(12, 8, 12, 6) };
body.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Star)); body.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Star));
body.ColumnDefinitions.Add(new ColumnDefinition(new GridLength(288))); body.ColumnDefinitions.Add(new ColumnDefinition(new GridLength(344)));
body.RowDefinitions.Add(new RowDefinition(GridLength.Auto));
body.RowDefinitions.Add(new RowDefinition(GridLength.Star));
_view = new ContourView(_field, T); _view = new ContourView(_experimentField, T);
_view.HoverChanged += OnHover; _view.HoverChanged += OnHover;
_view.StepChanged += OnStepChanged;
_view.ProgressChanged += OnProgressChanged;
_view.PlaybackFinished += OnPlaybackFinished;
var canvasHolder = new Border var canvasHolder = new Border
{ {
Background = B(Color.Parse("#08111E")), Background = B(Color.Parse("#08111E")),
@@ -75,66 +111,103 @@ public sealed class ContourPage
ClipToBounds = true, ClipToBounds = true,
Child = _view Child = _view
}; };
Grid.SetColumn(canvasHolder, 0); Grid.SetRow(canvasHolder, 1);
body.Children.Add(canvasHolder); body.Children.Add(canvasHolder);
// ── 五大典型地貌标签(横向,像课件的选项卡)──
var tabs = new WrapPanel
{
Orientation = Orientation.Horizontal,
Margin = new Thickness(0, 0, 0, 8)
};
_backBtn = MakePillButton(T("btn.backExperiment"), CAccent);
_backBtn.IsVisible = false;
_backBtn.PointerPressed += (_, _) => BackToExperiment();
tabs.Children.Add(_backBtn);
foreach (var kind in LandformOrder)
{
var btn = MakeLandformButton(kind);
_landformButtons.Add(btn);
tabs.Children.Add(btn);
}
body.Children.Add(tabs);
var side = BuildSidePanel(); var side = BuildSidePanel();
Grid.SetColumn(side, 1); Grid.SetColumn(side, 1);
Grid.SetRow(side, 0);
Grid.SetRowSpan(side, 2);
body.Children.Add(side); body.Children.Add(side);
// 窄窗口(封面缩略图、小屏)隐藏右侧栏,画布优先;宽窗口才展示流程与观察面板
void ApplyResponsive(double width)
{
var narrow = width < 980;
side.IsVisible = !narrow;
body.ColumnDefinitions[1].Width = narrow ? new GridLength(0) : new GridLength(344);
}
root.SizeChanged += (_, e) => ApplyResponsive(e.NewSize.Width);
Grid.SetRow(body, 1); Grid.SetRow(body, 1);
root.Children.Add(body); root.Children.Add(body);
root.Children.Add(BuildFooter()); var footer = BuildFooter();
Grid.SetRow(root.Children[^1], 2); Grid.SetRow(footer, 2);
root.Children.Add(footer);
root.AttachedToVisualTree += (_, _) =>
{
_topLevel = TopLevel.GetTopLevel(root);
};
root.KeyDown += OnKeyDown;
root.Focusable = true;
return root; return root;
} }
/// <summary>窗口关闭时释放视图计时器,避免持有控件。</summary>
public void Dispose()
{
if (_disposed) return;
_disposed = true;
_view?.DisposeView();
}
private Control BuildHeader() private Control BuildHeader()
{ {
var title = new TextBlock var title = new TextBlock
{ {
Text = T("app.title"), Text = T("app.title"),
Foreground = B(CInk), Foreground = B(CInk),
FontSize = 16, FontSize = 18,
FontWeight = FontWeight.SemiBold FontWeight = FontWeight.SemiBold
}; };
var sub = new TextBlock var sub = new TextBlock
{ {
Text = T("app.subtitle"), Text = T("app.subtitle"),
Foreground = B(CInkFaint), Foreground = B(CInkDim),
FontSize = 10.5 FontSize = 11.5
}; };
var stack = new StackPanel { Spacing = 2 }; var stack = new StackPanel { Spacing = 2 };
stack.Children.Add(title); stack.Children.Add(title);
stack.Children.Add(sub); stack.Children.Add(sub);
// 地体类型选择:教科书里的五种基本地形 var fsLabel = new TextBlock { Text = T("btn.fullscreen"), Foreground = B(CInk), FontSize = 11.5 };
var kinds = new (TerrainKind Kind, string Key)[] var fsBtn = new Border
{ {
(TerrainKind.Mountain, "kind.mountain"), Background = B(CPanel2),
(TerrainKind.Basin, "kind.basin"), BorderBrush = B(CLine),
(TerrainKind.Hill, "kind.hill"), BorderThickness = new Thickness(1),
(TerrainKind.Plateau, "kind.plateau"), CornerRadius = new CornerRadius(8),
(TerrainKind.Plain, "kind.plain"), Padding = new Thickness(12, 6),
Cursor = new Avalonia.Input.Cursor(Avalonia.Input.StandardCursorType.Hand),
Child = fsLabel
}; };
fsBtn.PointerPressed += (_, _) => ToggleFullscreen(fsLabel);
var tabs = new StackPanel var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") };
{ grid.Children.Add(stack);
Orientation = Orientation.Horizontal, Grid.SetColumn(fsBtn, 1);
Spacing = 6, grid.Children.Add(fsBtn);
Margin = new Thickness(0, 9, 0, 0)
};
foreach (var (kind, key) in kinds)
{
var btn = MakeKindTab(kind, T(key));
tabs.Children.Add(btn);
}
var header = new StackPanel();
header.Children.Add(stack);
header.Children.Add(tabs);
return new Border return new Border
{ {
@@ -142,70 +215,49 @@ public sealed class ContourPage
BorderBrush = B(CLine), BorderBrush = B(CLine),
BorderThickness = new Thickness(0, 0, 0, 1), BorderThickness = new Thickness(0, 0, 0, 1),
Padding = new Thickness(18, 11, 18, 12), Padding = new Thickness(18, 11, 18, 12),
Child = header Child = grid
}; };
} }
/// <summary>地体类型按钮:选中高亮。</summary>
private Button MakeKindTab(TerrainKind kind, string label)
{
var b = new Button
{
Content = label,
FontSize = 11.5,
Padding = new Thickness(13, 5),
CornerRadius = new CornerRadius(8),
BorderThickness = new Thickness(1),
Cursor = new Avalonia.Input.Cursor(Avalonia.Input.StandardCursorType.Hand),
Tag = kind
};
void Style()
{
var on = _kind == kind;
b.Background = B(on ? CAccent : Color.Parse("#16263C"));
b.BorderBrush = B(on ? CAccent : Color.Parse("#263A56"));
b.Foreground = B(on ? Colors.White : CInkDim);
}
Style();
b.Click += (_, _) =>
{
_kind = kind;
_field = GetField(kind);
_view?.SetField(_field);
// 重新刷新所有 tab 的选中态
if (b.Parent is StackPanel sp)
foreach (var c in sp.Children)
if (c is Button sib && sib.Tag is TerrainKind)
{
var on = (TerrainKind)sib.Tag == _kind;
sib.Background = B(on ? CAccent : Color.Parse("#16263C"));
sib.BorderBrush = B(on ? CAccent : Color.Parse("#263A56"));
sib.Foreground = B(on ? Colors.White : CInkDim);
}
};
return b;
}
private Control BuildSidePanel() private Control BuildSidePanel()
{ {
var panel = new StackPanel { Spacing = 10, Margin = new Thickness(12, 0, 0, 0) }; var panel = new StackPanel { Spacing = 8, Margin = new Thickness(12, 0, 0, 0) };
panel.Children.Add(Section(T("side.features"))); // ── 实验流程四步 ──
panel.Children.Add(Section(T("flow.title")));
foreach (var (titleKey, descKey) in new[] for (var i = 0; i < 4; i++)
{
("feature.peak", "feature.peakDesc"),
("feature.ridge", "feature.ridgeDesc"),
("feature.valley", "feature.valleyDesc"),
("feature.saddle", "feature.saddleDesc"),
("feature.cliff", "feature.cliffDesc")
})
{ {
panel.Children.Add(FeatureRow(T(titleKey), T(descKey))); var btn = MakeFlowButton(i);
_flowButtons.Add(btn);
panel.Children.Add(btn);
} }
panel.Children.Add(Divider());
// ── 观察面板 ──
_observeHeading = new TextBlock
{
Text = T("observe.title"),
Foreground = B(CWarn),
FontSize = 12.5,
FontWeight = FontWeight.SemiBold
};
_observeSummary = new TextBlock
{
Text = T("observe.default"),
Foreground = B(CInkDim),
FontSize = 10.5,
TextWrapping = TextWrapping.Wrap,
LineHeight = 16
};
_featureList = new StackPanel { Spacing = 3 };
RenderObservation(null);
panel.Children.Add(_observeHeading);
panel.Children.Add(_observeSummary);
panel.Children.Add(_featureList);
// ── 判读要点 ──
panel.Children.Add(Section(T("side.rules"))); panel.Children.Add(Section(T("side.rules")));
panel.Children.Add(Bullet(T("rule.interval"))); panel.Children.Add(Bullet(T("rule.interval")));
panel.Children.Add(Bullet(T("rule.dense"))); panel.Children.Add(Bullet(T("rule.dense")));
@@ -228,55 +280,221 @@ public sealed class ContourPage
return scroll; return scroll;
} }
private Control Section(string text) => new TextBlock private Border MakeFlowButton(int index)
{ {
Text = text, var name = new TextBlock
Foreground = B(CInkDim),
FontSize = 11.5,
FontWeight = FontWeight.SemiBold,
Margin = new Thickness(0, 4, 0, 0)
};
private Control Bullet(string text) => new TextBlock
{
Text = "• " + text,
Foreground = B(CInkDim),
FontSize = 11,
TextWrapping = TextWrapping.Wrap,
LineHeight = 17
};
private Control FeatureRow(string name, string desc)
{
var title = new TextBlock
{ {
Text = name, Text = $"{index + 1}. {T("flow.step." + index)}",
Foreground = B(CWarn), Foreground = B(CInk),
FontSize = 12, FontSize = 12.5,
FontWeight = FontWeight.SemiBold FontWeight = FontWeight.SemiBold
}; };
var d = new TextBlock var desc = new TextBlock
{ {
Text = desc, Text = T("flow.desc." + index),
Foreground = B(CInkFaint), Foreground = B(CInkFaint),
FontSize = 10.5, FontSize = 11,
TextWrapping = TextWrapping.Wrap, TextWrapping = TextWrapping.Wrap,
LineHeight = 16 LineHeight = 15
}; };
var stack = new StackPanel { Spacing = 1 }; var stack = new StackPanel { Spacing = 1 };
stack.Children.Add(title); stack.Children.Add(name);
stack.Children.Add(d); stack.Children.Add(desc);
return stack; var border = new Border
{
Background = B(CPanel2),
BorderBrush = B(CLine),
BorderThickness = new Thickness(1),
CornerRadius = new CornerRadius(8),
Padding = new Thickness(9, 6),
Cursor = new Avalonia.Input.Cursor(Avalonia.Input.StandardCursorType.Hand),
Child = stack,
Tag = index
};
border.PointerPressed += (_, _) =>
{
BackToExperiment();
_view?.SetStep((ExperimentStep)index);
UpdateFlowStyles();
};
return border;
}
private Border MakeLandformButton(LandformKind kind)
{
var key = kind.ToString().ToLowerInvariant();
var name = new TextBlock
{
Text = T("landform." + key),
Foreground = B(CInk),
FontSize = 12.5,
FontWeight = FontWeight.SemiBold
};
var sub = new TextBlock
{
Text = T("landform." + key + ".sub"),
Foreground = B(CInkFaint),
FontSize = 10.5,
VerticalAlignment = VerticalAlignment.Center
};
var stack = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 7 };
stack.Children.Add(name);
stack.Children.Add(sub);
var border = new Border
{
Background = B(CPanel2),
BorderBrush = B(CLine),
BorderThickness = new Thickness(1),
CornerRadius = new CornerRadius(18),
Padding = new Thickness(14, 7),
Margin = new Thickness(0, 0, 8, 4),
Cursor = new Avalonia.Input.Cursor(Avalonia.Input.StandardCursorType.Hand),
Child = stack,
Tag = kind
};
border.PointerPressed += (_, _) => SelectLandform(kind);
return border;
}
private void SelectLandform(LandformKind kind)
{
_selectedLandform = kind;
_view?.Pause();
_view?.SetField(GetLandformField(kind));
_view?.SetMode(ViewMode.Perspective);
_view?.ShowContourPattern(); // 地貌专题先看完整的等高线形态
UpdateLandformStyles();
UpdateViewToggleLabel();
var key = kind.ToString().ToLowerInvariant();
if (_observeHeading != null) _observeHeading.Text = T("landform." + key) + " · " + T("landform." + key + ".sub");
if (_observeSummary != null) _observeSummary.Text = T("landform." + key + ".summary");
RenderFeatureList(key);
if (_backBtn != null) _backBtn.IsVisible = true;
if (_hintText != null) _hintText.Text = T("landform." + key + ".hint");
SetPlayLabel(T("btn.replay"));
}
private void BackToExperiment()
{
if (_selectedLandform == null) return;
_selectedLandform = null;
_view?.SetField(_experimentField);
_view?.SetMode(ViewMode.Perspective);
_view?.Reset();
UpdateLandformStyles();
UpdateViewToggleLabel();
RenderObservation(null);
if (_backBtn != null) _backBtn.IsVisible = false;
if (_hintText != null) _hintText.Text = T("hint.play");
SetPlayLabel(T("btn.play"));
}
private void RenderObservation(LandformKind? kind)
{
if (_observeHeading == null || _observeSummary == null || _featureList == null) return;
if (kind == null)
{
_observeHeading.Text = T("observe.title");
_observeSummary.Text = T("observe.default");
_featureList.Children.Clear();
_featureList.Children.Add(Bullet(T("observe.default.f1")));
_featureList.Children.Add(Bullet(T("observe.default.f2")));
}
else
{
var key = kind.Value.ToString().ToLowerInvariant();
_observeHeading.Text = T("landform." + key) + " · " + T("landform." + key + ".sub");
_observeSummary.Text = T("landform." + key + ".summary");
RenderFeatureList(key);
}
}
private void RenderFeatureList(string key)
{
if (_featureList == null) return;
_featureList.Children.Clear();
for (var i = 1; i <= 3; i++)
{
var k = $"landform.{key}.f{i}";
if (_texts.ContainsKey(k)) _featureList.Children.Add(Bullet(T(k)));
}
} }
private Control BuildFooter() private Control BuildFooter()
{ {
_readout = new TextBlock // 播放 / 重置
_playLabel = new TextBlock { Text = T("btn.play"), Foreground = B(Colors.White), FontSize = 11.5, FontWeight = FontWeight.SemiBold };
_playBtn = new Border
{ {
Text = T("footer.hint"), Background = B(CAccent),
Foreground = B(CInkDim), CornerRadius = new CornerRadius(8),
FontSize = 11.5 Padding = new Thickness(14, 7),
Cursor = new Avalonia.Input.Cursor(Avalonia.Input.StandardCursorType.Hand),
Child = _playLabel
}; };
_playBtn.PointerPressed += (_, _) => TogglePlay();
var resetBtn = MakePillButton(T("btn.reset"), Color.Parse("#2A3B55"));
resetBtn.PointerPressed += (_, _) =>
{
BackToExperiment();
_view?.Reset();
if (_progress != null) _progress.Value = 0;
if (_hintText != null) _hintText.Text = T("hint.play");
SetPlayLabel(T("btn.play"));
};
// 俯视 / 立体切换
_viewToggleLabel = new TextBlock { Text = T("btn.viewTop"), Foreground = B(CInk), FontSize = 11.5 };
var viewBtn = new Border
{
Background = B(CPanel2),
BorderBrush = B(CLine),
BorderThickness = new Thickness(1),
CornerRadius = new CornerRadius(8),
Padding = new Thickness(11, 6),
Cursor = new Avalonia.Input.Cursor(Avalonia.Input.StandardCursorType.Hand),
Child = _viewToggleLabel
};
viewBtn.PointerPressed += (_, _) =>
{
_view?.ToggleMode();
UpdateViewToggleLabel();
};
// 上色开关
_colorBtnText = new TextBlock { Text = T("btn.colorOn"), Foreground = B(Colors.White), FontSize = 11.5 };
_colorBtn = new Border
{
Background = B(CAccent),
CornerRadius = new CornerRadius(8),
Padding = new Thickness(11, 6),
Cursor = new Avalonia.Input.Cursor(Avalonia.Input.StandardCursorType.Hand),
Child = _colorBtnText
};
_colorBtn.PointerPressed += (_, _) => ToggleColor();
var controls = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8 };
controls.Children.Add(_playBtn);
controls.Children.Add(resetBtn);
controls.Children.Add(viewBtn);
controls.Children.Add(_colorBtn);
_progress = new ProgressBar
{
Minimum = 0,
Maximum = 100,
Value = 0,
Height = 4,
VerticalAlignment = VerticalAlignment.Center,
Foreground = B(CAccent),
Background = B(Color.Parse("#1E3350"))
};
_hintText = new TextBlock { Text = T("hint.play"), Foreground = B(CInkDim), FontSize = 11.5 };
_readout = new TextBlock { Text = T("footer.hint"), Foreground = B(CInk), FontSize = 11.5 };
_featureText = new TextBlock _featureText = new TextBlock
{ {
Text = "", Text = "",
@@ -286,64 +504,115 @@ public sealed class ContourPage
HorizontalAlignment = HorizontalAlignment.Right HorizontalAlignment = HorizontalAlignment.Right
}; };
// 右下角「上色」开关:点击一次去掉分层设色,只显示线稿,再点恢复 var info = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") };
_colorBtnText = new TextBlock info.Children.Add(_readout);
{ Grid.SetColumn(_featureText, 1);
Text = T("btn.color"), info.Children.Add(_featureText);
FontSize = 11.5,
Foreground = B(Colors.White)
};
_colorBtn = new Border
{
Background = B(CAccent),
CornerRadius = new CornerRadius(8),
Padding = new Thickness(13, 6),
Margin = new Thickness(0, 0, 12, 0),
Cursor = new Avalonia.Input.Cursor(Avalonia.Input.StandardCursorType.Hand),
Child = _colorBtnText
};
_colorBtn.PointerPressed += (_, _) => ToggleColor();
var left = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") }; var leftStack = new StackPanel { Spacing = 4, VerticalAlignment = VerticalAlignment.Center };
left.Children.Add(_readout); leftStack.Children.Add(_hintText);
Grid.SetColumn(_colorBtn, 1); leftStack.Children.Add(info);
left.Children.Add(_colorBtn);
var progStack = new StackPanel { Spacing = 6, VerticalAlignment = VerticalAlignment.Center };
progStack.Children.Add(leftStack);
progStack.Children.Add(_progress);
var row = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") }; var row = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") };
row.Children.Add(left); row.Children.Add(progStack);
Grid.SetColumn(_featureText, 1); Grid.SetColumn(controls, 1);
row.Children.Add(_featureText); row.Children.Add(controls);
return new Border return new Border
{ {
Background = B(CPanel), Background = B(CPanel),
BorderBrush = B(CLine), BorderBrush = B(CLine),
BorderThickness = new Thickness(0, 1, 0, 0), BorderThickness = new Thickness(0, 1, 0, 0),
Padding = new Thickness(18, 9), Padding = new Thickness(16, 9),
Child = row Child = row
}; };
} }
/// <summary>切换分层设色。</summary> private void TogglePlay()
{
if (_view == null) return;
if (_selectedLandform != null) BackToExperiment();
_view.TogglePlay();
SetPlayLabel(_view.IsPlaying ? T("btn.pause") : T("btn.play"));
if (_hintText != null)
_hintText.Text = _view.IsPlaying ? T("hint.playing") : T("hint.paused");
}
private void ToggleColor() private void ToggleColor()
{ {
if (_view == null) return; if (_view == null) return;
_view.Colored = !_view.Colored; _view.Colored = !_view.Colored;
if (_colorBtn != null) if (_colorBtn != null) _colorBtn.Background = B(_view.Colored ? CAccent : Color.Parse("#2A3B55"));
_colorBtn.Background = B(_view.Colored ? CAccent : Color.Parse("#2A3B55")); if (_colorBtnText != null) _colorBtnText.Text = _view.Colored ? T("btn.colorOn") : T("btn.color");
if (_colorBtnText != null) }
_colorBtnText.Text = _view.Colored ? T("btn.colorOn") : T("btn.color");
private void SetPlayLabel(string text) { if (_playLabel != null) _playLabel.Text = text; }
private void UpdateViewToggleLabel()
{
if (_viewToggleLabel == null || _view == null) return;
_viewToggleLabel.Text = _view.Mode == ViewMode.Top ? T("btn.view3d") : T("btn.viewTop");
}
private void UpdateFlowStyles()
{
for (var i = 0; i < _flowButtons.Count; i++)
{
var b = _flowButtons[i];
var active = i == _step && _selectedLandform == null;
var done = i < _step && _selectedLandform == null;
StylePill(b, active ? CAccent : done ? Color.Parse("#1C3A5E") : CPanel2,
active ? Colors.White : done ? CGood : CInkDim);
}
}
private void UpdateLandformStyles()
{
for (var i = 0; i < _landformButtons.Count; i++)
{
var b = _landformButtons[i];
var kind = LandformOrder[i];
var active = _selectedLandform == kind;
StylePill(b, active ? CAccent : CPanel2, active ? Colors.White : CInkDim);
}
}
private static void StylePill(Border b, Color bg, Color fg)
{
b.Background = B(bg);
if (b.Child is TextBlock tb) tb.Foreground = B(fg);
else if (b.Child is StackPanel sp)
foreach (var c in sp.Children)
if (c is TextBlock t) t.Foreground = B(fg);
}
private void OnStepChanged(ExperimentStep step)
{
_step = (int)step;
UpdateFlowStyles();
if (_selectedLandform == null && _observeSummary != null)
_observeSummary.Text = T("flow.desc." + _step);
}
private void OnProgressChanged(ExperimentStep step, double value)
=> _progress?.Value = value * 100;
private void OnPlaybackFinished()
{
SetPlayLabel(T("btn.replay"));
if (_hintText != null) _hintText.Text = T("hint.done");
} }
private void OnHover(double u, double v, float height, TerrainFeature feature) private void OnHover(double u, double v, float height, TerrainFeature feature)
{ {
if (_readout == null || _featureText == null) return; if (_readout == null || _featureText == null) return;
var field = _view?.Field ?? _experimentField;
var relative = height - _field.MinHeight; var relative = height - field.MinHeight;
_readout.Text = string.Format( _readout.Text = T("footer.readout", (int)height, (int)relative);
System.Globalization.CultureInfo.InvariantCulture,
T("footer.readout"), (int)height, (int)relative);
_featureText.Text = FeatureName(feature); _featureText.Text = FeatureName(feature);
_featureText.Foreground = B(feature switch _featureText.Foreground = B(feature switch
{ {
@@ -366,4 +635,87 @@ public sealed class ContourPage
TerrainFeature.Slope => T("feature.slope"), TerrainFeature.Slope => T("feature.slope"),
_ => "" _ => ""
}; };
private void OnKeyDown(object? sender, KeyEventArgs e)
{
// 空格:播放/暂停
if (e.Key == Key.Space)
{
e.Handled = true;
TogglePlay();
return;
}
// 1-5:切换五大地貌
var idx = -1;
switch (e.Key)
{
case Key.D1: case Key.NumPad1: idx = 0; break;
case Key.D2: case Key.NumPad2: idx = 1; break;
case Key.D3: case Key.NumPad3: idx = 2; break;
case Key.D4: case Key.NumPad4: idx = 3; break;
case Key.D5: case Key.NumPad5: idx = 4; break;
}
if (idx >= 0 && idx < LandformOrder.Length)
{
e.Handled = true;
SelectLandform(LandformOrder[idx]);
}
}
private void ToggleFullscreen(TextBlock label)
{
if (_topLevel is not Window window) return;
if (window.WindowState == WindowState.FullScreen)
{
window.WindowState = WindowState.Normal;
label.Text = T("btn.fullscreen");
}
else
{
window.WindowState = WindowState.FullScreen;
label.Text = T("btn.exitFullscreen");
}
}
// ── 控件工厂
private static TextBlock Section(string text) => new()
{
Text = text,
Foreground = BConst(CInk),
FontSize = 12.5,
FontWeight = FontWeight.SemiBold,
Margin = new Thickness(0, 2, 0, 2)
};
private static Border Divider() => new()
{
Height = 1,
Background = BConst(CLine),
Margin = new Thickness(0, 4, 0, 2)
};
private static TextBlock Bullet(string text) => new()
{
Text = "• " + text,
Foreground = BConst(CInkDim),
FontSize = 11.5,
TextWrapping = TextWrapping.Wrap,
LineHeight = 17
};
private Border MakePillButton(string label, Color bg)
{
var tb = new TextBlock { Text = label, Foreground = B(Colors.White), FontSize = 11.5, HorizontalAlignment = HorizontalAlignment.Center };
return new Border
{
Background = B(bg),
CornerRadius = new CornerRadius(8),
Padding = new Thickness(11, 6),
Cursor = new Avalonia.Input.Cursor(Avalonia.Input.StandardCursorType.Hand),
Child = tb
};
}
private static SolidColorBrush BConst(Color c) => new(c);
} }
File diff suppressed because it is too large. Load diff
+165 -23
View File
@@ -2,24 +2,88 @@ using System.Collections.Generic;
namespace GC.ContourMap; namespace GC.ContourMap;
/// <summary>内置全量文案兜底:没有语言包也能完整显示。</summary> /// <summary>内置全量文案兜底:没有语言包也能完整显示(复刻 HTML 课件全部文案)。</summary>
internal static class DefaultTexts internal static class DefaultTexts
{ {
public static readonly Dictionary<string, string> Zh = new() public static readonly Dictionary<string, string> Zh = new()
{ {
["app.title"] = "等高线地形图", // 标题
["app.subtitle"] = "七年级上册 · 地形图的判读:从立体地形到平面等高线", ["app.title"] = "等高线地形 · 五大典型地貌判读",
["app.subtitle"] = "七年级上册 · 从立体地形到平面等高线,判读山峰/山脊/山谷/鞍部/陡崖",
["kind.mountain"] = "山地", // 实验流程四步
["kind.basin"] = "盆地", ["flow.title"] = "实验流程",
["kind.hill"] = "丘陵", ["flow.step.0"] = "等高切割",
["kind.plateau"] = "高原", ["flow.step.1"] = "形成交线",
["kind.plain"] = "平原", ["flow.step.2"] = "投影成图",
["legend.title"] = "分层设色", ["flow.step.3"] = "疏密判坡",
["profile.title"] = "地形剖面图", ["flow.desc.0"] = "观察水平面与山体在同一海拔相交,形成连续闭合线。",
["flow.desc.1"] = "每个水平切面都会留下同高交线,多层交线共同描述山体起伏。",
["flow.desc.2"] = "把各高度交线垂直投影到同一平面,得到完整等高线地形图。",
["flow.desc.3"] = "等高线越密,坡度越陡;等高线越疏,坡度越缓。",
// 观察面板
["observe.title"] = "实验演示",
["observe.default"] = "点击开始实验,在立体地形中观察等高切割与交线形成,再通过四步图解理解投影与判坡。",
["observe.features"] = "判读要点",
["observe.default.f1"] = "同一条等高线上海拔相等",
["observe.default.f2"] = "相邻等高线高差保持一致",
// 五大典型地貌
["side.landforms"] = "五大典型地貌",
["landform.peak"] = "山峰",
["landform.ridge"] = "山脊",
["landform.valley"] = "山谷",
["landform.saddle"] = "鞍部",
["landform.cliff"] = "陡崖",
["landform.peak.sub"] = "闭合等高线",
["landform.ridge.sub"] = "凸低为脊",
["landform.valley.sub"] = "凸高为谷",
["landform.saddle.sub"] = "两峰之间",
["landform.cliff.sub"] = "密集或重合",
["landform.peak.summary"] = "山峰四周较低、中心突起;等高线闭合成环,海拔数值由外向内逐渐升高。",
["landform.ridge.summary"] = "等高线弯曲部分向海拔低处凸出,脊线常成为两侧水系的分水岭。",
["landform.valley.summary"] = "等高线弯曲部分向海拔高处凸出,谷底低洼并容易汇水形成河流。",
["landform.saddle.summary"] = "鞍部位于相邻两座山峰之间,是沿山脊方向相对低洼的过渡地带。",
["landform.cliff.summary"] = "陡崖坡面近直立,不同高程的等高线会高度密集,局部可投影到同一位置而重合。",
["landform.peak.f1"] = "中心海拔高、四周海拔低",
["landform.peak.f2"] = "闭合线越向内,数值越大",
["landform.peak.f3"] = "若数值向内降低,则应判为洼地",
["landform.ridge.f1"] = "等高线凸向低值方向",
["landform.ridge.f2"] = "脊线由高处向低处延伸",
["landform.ridge.f3"] = "雨水沿脊线两侧分流",
["landform.valley.f1"] = "等高线凸向高值方向",
["landform.valley.f2"] = "V 形尖端指向上游高处",
["landform.valley.f3"] = "谷底常发育河流",
["landform.saddle.f1"] = "两组闭合等高线相邻",
["landform.saddle.f2"] = "中部线条收窄,形似马鞍",
["landform.saddle.f3"] = "常是翻越山岭的低垭口",
["landform.cliff.f1"] = "密集表示陡坡,重合才是陡崖特征",
["landform.cliff.f2"] = "单位水平距离内高差很大",
["landform.cliff.f3"] = "n 条线重合时:(n−1)d ≤ ΔH < (n+1)d",
["landform.peak.hint"] = "山峰:闭合曲线,数值向中心升高",
["landform.ridge.hint"] = "山脊:等高线向低处凸出,凸低为脊",
["landform.valley.hint"] = "山谷:等高线向高处凸出,凸高为谷",
["landform.saddle.hint"] = "鞍部:两峰之间相对低洼,俯视轮廓呈收腰形",
["landform.cliff.hint"] = "陡崖:等高线密集或重合,坡度极陡",
// 按钮
["btn.play"] = "开始实验",
["btn.pause"] = "暂停实验",
["btn.replay"] = "重新实验",
["btn.reset"] = "重置",
["btn.view3d"] = "立体图",
["btn.viewTop"] = "俯视图",
["btn.color"] = "上色", ["btn.color"] = "上色",
["btn.colorOn"] = "取消上色", ["btn.colorOn"] = "取消上色",
["btn.fullscreen"] = "全屏",
["btn.exitFullscreen"] = "退出全屏",
["btn.backExperiment"] = "返回实验",
// 侧栏判读要点(通用地形)
["side.features"] = "五种地形部位", ["side.features"] = "五种地形部位",
["feature.peak"] = "山峰", ["feature.peak"] = "山峰",
["feature.peakDesc"] = "等高线闭合,数值由中心向四周递减。", ["feature.peakDesc"] = "等高线闭合,数值由中心向四周递减。",
@@ -33,30 +97,99 @@ internal static class DefaultTexts
["feature.cliffDesc"] = "等高线重叠或非常密集,近乎垂直。", ["feature.cliffDesc"] = "等高线重叠或非常密集,近乎垂直。",
["feature.slope"] = "坡面", ["feature.slope"] = "坡面",
// 判读规则
["side.rules"] = "判读要点", ["side.rules"] = "判读要点",
["rule.interval"] = "等高距:相邻两条等高线的高度差,本图 100 米。", ["rule.interval"] = "等高距:相邻两条等高线的高度差,本图 100 米。",
["rule.dense"] = "等高线越密坡越陡,越疏坡越缓。", ["rule.dense"] = "等高线越密坡越陡,越疏坡越缓。",
["rule.index"] = "每 5 条加粗一条计曲线,标注海拔便于读数。", ["rule.index"] = "每 5 条加粗一条计曲线,标注海拔便于读数。",
["rule.height"] = "海拔:某地高出海平面的垂直距离;相对高度:两点海拔之差。", ["rule.height"] = "海拔:某地高出海平面的垂直距离;相对高度:两点海拔之差。",
["footer.hint"] = "把鼠标移到任意一侧,可查看该点的海拔与地形部位", // 底部读数 / 图例
["footer.readout"] = "海拔 {0} m 相对高度 {1} m" ["footer.hint"] = "拖动立体地形旋转、滚轮缩放;鼠标悬停可查看该点海拔与地形部位",
["footer.readout"] = "海拔 {0} m 相对高度 {1} m",
["legend.title"] = "分层设色",
["profile.title"] = "地形剖面图",
["slope.gentle"] = "缓坡(线疏)",
["slope.steep"] = "陡坡(线密)",
["hint.play"] = "点击“开始实验”,观察等高切割与交线形成",
["hint.playing"] = "实验播放中",
["hint.paused"] = "实验已暂停 · 点击继续恢复播放",
["hint.done"] = "实验流程播放完成 · 可重新实验或选择典型地貌观察"
}; };
public static readonly Dictionary<string, string> En = new() public static readonly Dictionary<string, string> En = new()
{ {
["app.title"] = "Contour Map", ["app.title"] = "Contour Lines · Five Classic Landforms",
["app.subtitle"] = "Grade 7 · Reading terrain maps: from 3D relief to contour lines", ["app.subtitle"] = "Grade 7 · From 3D relief to contour maps: peaks, ridges, valleys, saddles and cliffs",
["kind.mountain"] = "Mountains", ["flow.title"] = "Experiment flow",
["kind.basin"] = "Basin", ["flow.step.0"] = "Contour cutting",
["kind.hill"] = "Hills", ["flow.step.1"] = "Forming lines",
["kind.plateau"] = "Plateau", ["flow.step.2"] = "Projection",
["kind.plain"] = "Plain", ["flow.step.3"] = "Slope density",
["legend.title"] = "Hypsometric tint", ["flow.desc.0"] = "Watch a horizontal plane intersect the mountain at one elevation, forming closed lines.",
["profile.title"] = "Terrain profile", ["flow.desc.1"] = "Each horizontal slice leaves an equal-height line; stacked lines describe the relief.",
["flow.desc.2"] = "Project every intersection line vertically onto one plane to build the contour map.",
["flow.desc.3"] = "Contours closer together mean a steeper slope; wider apart mean a gentler one.",
["observe.title"] = "Experiment demo",
["observe.default"] = "Press play to watch contour cutting and line formation, then use the four steps to learn projection and slope reading.",
["observe.features"] = "Key points",
["observe.default.f1"] = "All points on one contour share the same elevation",
["observe.default.f2"] = "Neighbouring contours keep a constant height interval",
["side.landforms"] = "Five classic landforms",
["landform.peak"] = "Peak",
["landform.ridge"] = "Ridge",
["landform.valley"] = "Valley",
["landform.saddle"] = "Saddle",
["landform.cliff"] = "Cliff",
["landform.peak.sub"] = "Closed contours",
["landform.ridge.sub"] = "Bulges toward low ground",
["landform.valley.sub"] = "Bulges toward high ground",
["landform.saddle.sub"] = "Between two peaks",
["landform.cliff.sub"] = "Dense or overlapping",
["landform.peak.summary"] = "A peak rises in the centre with lower ground around it; contours close into rings and values increase inward.",
["landform.ridge.summary"] = "Contours bulge toward lower ground; a ridge line often divides two drainage systems.",
["landform.valley.summary"] = "Contours bulge toward higher ground; valleys are low and collect water into streams.",
["landform.saddle.summary"] = "A saddle lies between two adjacent peaks, a relatively low pass along the ridge.",
["landform.cliff.summary"] = "A cliff face is nearly vertical, so contours crowd tightly or even overlap.",
["landform.peak.f1"] = "High centre, low surroundings",
["landform.peak.f2"] = "Closed lines grow in value inward",
["landform.peak.f3"] = "If values drop inward, it is a depression",
["landform.ridge.f1"] = "Contours bulge toward lower values",
["landform.ridge.f2"] = "Ridge line runs from high to low",
["landform.ridge.f3"] = "Rain drains to either side of the ridge",
["landform.valley.f1"] = "Contours bulge toward higher values",
["landform.valley.f2"] = "V tip points upstream to high ground",
["landform.valley.f3"] = "Streams often form along the valley floor",
["landform.saddle.f1"] = "Two neighbouring closed contour groups",
["landform.saddle.f2"] = "Contours pinch in the middle like a saddle",
["landform.saddle.f3"] = "Often a low mountain pass",
["landform.cliff.f1"] = "Dense means steep; overlap means cliff",
["landform.cliff.f2"] = "Large elevation change over a short distance",
["landform.cliff.f3"] = "n overlapping lines: (n−1)d ≤ ΔH < (n+1)d",
["landform.peak.hint"] = "Peak: closed curves, values rise toward the centre",
["landform.ridge.hint"] = "Ridge: contours bulge toward low ground",
["landform.valley.hint"] = "Valley: contours bulge toward high ground",
["landform.saddle.hint"] = "Saddle: low ground between two peaks",
["landform.cliff.hint"] = "Cliff: contours dense or overlapping, very steep",
["btn.play"] = "Start experiment",
["btn.pause"] = "Pause experiment",
["btn.replay"] = "Replay experiment",
["btn.reset"] = "Reset",
["btn.view3d"] = "3D view",
["btn.viewTop"] = "Top view",
["btn.color"] = "Colour", ["btn.color"] = "Colour",
["btn.colorOn"] = "No colour", ["btn.colorOn"] = "No colour",
["btn.fullscreen"] = "Fullscreen",
["btn.exitFullscreen"] = "Exit fullscreen",
["btn.backExperiment"] = "Back to experiment",
["side.features"] = "Five terrain features", ["side.features"] = "Five terrain features",
["feature.peak"] = "Peak", ["feature.peak"] = "Peak",
@@ -77,7 +210,16 @@ internal static class DefaultTexts
["rule.index"] = "Every 5th contour is bolded and labelled as an index contour.", ["rule.index"] = "Every 5th contour is bolded and labelled as an index contour.",
["rule.height"] = "Elevation above sea level; relative height is the difference of two elevations.", ["rule.height"] = "Elevation above sea level; relative height is the difference of two elevations.",
["footer.hint"] = "Move the pointer over either side to read elevation and terrain feature", ["footer.hint"] = "Drag the 3D terrain to rotate, scroll to zoom; hover to read elevation and terrain feature",
["footer.readout"] = "Elevation {0} m Relative height {1} m" ["footer.readout"] = "Elevation {0} m Relative height {1} m",
["legend.title"] = "Hypsometric tint",
["profile.title"] = "Terrain profile",
["slope.gentle"] = "Gentle (sparse lines)",
["slope.steep"] = "Steep (dense lines)",
["hint.play"] = "Press start to watch contour cutting and line formation",
["hint.playing"] = "Experiment playing",
["hint.paused"] = "Experiment paused · press to resume",
["hint.done"] = "Experiment finished · replay or choose a landform"
}; };
} }
+41 -2
View File
@@ -123,8 +123,6 @@ public static class TerrainAnalyzer
public static (byte R, byte G, byte B) ColorForHeight(float h, float min, float max) public static (byte R, byte G, byte B) ColorForHeight(float h, float min, float max)
{ {
// 按绝对高程分档(教科书就是这么画的:看的是海拔,不是相对高度) // 按绝对高程分档(教科书就是这么画的:看的是海拔,不是相对高度)
const float band = 200f; // 每 200 米一档
if (h < 200) return (0x1E, 0x6B, 0x3A); // 深绿:< 200 m if (h < 200) return (0x1E, 0x6B, 0x3A); // 深绿:< 200 m
if (h < 400) return (0x4E, 0x9E, 0x4E); // 浅绿:200–400 if (h < 400) return (0x4E, 0x9E, 0x4E); // 浅绿:200–400
if (h < 600) return (0xA8, 0xC6, 0x66); // 绿:400–600 if (h < 600) return (0xA8, 0xC6, 0x66); // 绿:400–600
@@ -136,6 +134,31 @@ public static class TerrainAnalyzer
return (0xF5, 0xF5, 0xF0); // 白:> 1600(雪线以上) return (0xF5, 0xF5, 0xF0); // 白:> 1600(雪线以上)
} }
/// <summary>
/// 3D 立体视图用的连续设色:与俯视图同一套色阶,但在档位之间线性过渡。
/// 立体视图的色块是按三角面着色的,直接用硬分档会在坡面上切出锯齿状阶梯,
/// 看起来像渲染错误;俯视图仍保留硬分档(那才是课本的分层设色)。
/// </summary>
public static (byte R, byte G, byte B) ColorForHeightSmooth(float h)
{
// 每个档位的代表色(取档位中心),由低到高
(byte R, byte G, byte B)[] stops =
{
(0x1E, 0x6B, 0x3A), (0x4E, 0x9E, 0x4E), (0xA8, 0xC6, 0x66),
(0xE8, 0xE2, 0x9A), (0xE0, 0xC0, 0x5A), (0xC8, 0x9A, 0x63),
(0xA8, 0x74, 0x4C), (0xC8, 0xA8, 0x8C), (0xF5, 0xF5, 0xF0)
};
const float band = 200f;
var p = Math.Clamp(h / band - 0.5f, 0f, stops.Length - 1f); // 0 => 档心 100 m
var i = (int)Math.Floor(p);
var j = Math.Min(i + 1, stops.Length - 1);
var t = p - i;
t = t * t * (3 - 2 * t); // 平滑过渡
return (Lerp(stops[i].R, stops[j].R, t),
Lerp(stops[i].G, stops[j].G, t),
Lerp(stops[i].B, stops[j].B, t));
}
/// <summary>该颜色属于哪一档(用于图例)。</summary> /// <summary>该颜色属于哪一档(用于图例)。</summary>
public static string BandName(float h) => h switch public static string BandName(float h) => h switch
{ {
@@ -152,4 +175,20 @@ public static class TerrainAnalyzer
private static byte Lerp(byte a, byte b, double k) private static byte Lerp(byte a, byte b, double k)
=> (byte)Math.Clamp(a + (b - a) * k, 0, 255); => (byte)Math.Clamp(a + (b - a) * k, 0, 255);
/// <summary>
/// 归一化坡度(0=平缓,1=陡峭),用于「疏密判坡」着色。
/// 以有限差分求地面梯度,并按本模型的典型高差归一化。
/// </summary>
public static double SlopeAt(TerrainField f, double u, double v)
{
const double h = 0.006;
var du = (f.SampleSmooth(u + h, v) - f.SampleSmooth(u - h, v)) / (2 * h);
var dv = (f.SampleSmooth(u, v + h) - f.SampleSmooth(u, v - h)) / (2 * h);
var grad = Math.Sqrt(du * du + dv * dv); // 米 / 归一化距离
// 按本图实际起伏自适应归一化:跨度越大,同样的相对坡度对应更大的梯度。
// 固定阈值会让所有山体都顶到 1(整片红),判坡就失效了。
var span = Math.Max(60f, f.MaxHeight - f.MinHeight);
return Math.Clamp(grad / (span * 2.6), 0, 1);
}
} }
+228 -23
View File
@@ -13,6 +13,16 @@ public enum TerrainKind
Plain // 平原:海拔低、地面平坦 Plain // 平原:海拔低、地面平坦
} }
/// <summary>五大典型地貌部位(等高线判读的核心对象)。</summary>
public enum LandformKind
{
Peak, // 山峰:闭合等高线,数值向内升高
Ridge, // 山脊:等高线凸向低处,凸低为脊
Valley, // 山谷:等高线凸向高处,凸高为谷
Saddle, // 鞍部:两峰之间相对低洼,俯视收腰
Cliff // 陡崖:等高线密集甚至重合
}
/// <summary> /// <summary>
/// 地形高度场(等高线模型的数据核心)。 /// 地形高度场(等高线模型的数据核心)。
/// ///
@@ -42,6 +52,9 @@ public sealed class TerrainField
/// <summary>这块地形属于哪种类型(决定界面标题与说明)。</summary> /// <summary>这块地形属于哪种类型(决定界面标题与说明)。</summary>
public TerrainKind Kind { get; } public TerrainKind Kind { get; }
/// <summary>若这块地形是某个典型地貌部位,则记录其种类;否则为 null。</summary>
public LandformKind? Landform { get; }
public TerrainField(TerrainKind kind = TerrainKind.Mountain, int size = 192) public TerrainField(TerrainKind kind = TerrainKind.Mountain, int size = 192)
{ {
Size = size; Size = size;
@@ -50,6 +63,16 @@ public sealed class TerrainField
Build(kind); Build(kind);
} }
/// <summary>创建一个专门表现某种典型地貌部位的高度场。</summary>
public TerrainField(LandformKind landform, int size = 192)
{
Size = size;
Kind = TerrainKind.Mountain;
Landform = landform;
Heights = new float[size, size];
BuildLandform(landform);
}
/// <summary>该类型对应的等高距:平原/丘陵用 20m,山地/高原/盆地用 100m。</summary> /// <summary>该类型对应的等高距:平原/丘陵用 20m,山地/高原/盆地用 100m。</summary>
public float EffectiveInterval => Kind switch public float EffectiveInterval => Kind switch
{ {
@@ -266,6 +289,157 @@ public sealed class TerrainField
MinHeight = min; MaxHeight = max; MinHeight = min; MaxHeight = max;
} }
// ───────────────────────── 五大典型地貌部位 ─────────────────────────
private void BuildLandform(LandformKind landform)
{
switch (landform)
{
case LandformKind.Peak: BuildPeak(); break;
case LandformKind.Ridge: BuildRidge(); break;
case LandformKind.Valley: BuildValley(); break;
case LandformKind.Saddle: BuildSaddle(); break;
case LandformKind.Cliff: BuildCliff(); break;
}
BuildFeatures();
}
/// <summary>山峰:单峰为主、层层闭合,四周逐级降低。配一处小侧峰便于读鞍部。</summary>
private void BuildPeak()
{
var min = double.MaxValue; var max = double.MinValue;
for (var y = 0; y < Size; y++)
for (var x = 0; x < Size; x++)
{
var u = (double)x / (Size - 1);
var v = (double)y / (Size - 1);
var du = u - 0.5; var dv = (v - 0.5) / 0.94;
var r = Math.Sqrt(du * du + dv * dv);
// 主峰:宽阔的穹状山体(半径约占图幅 8 成),层层闭合的等高线才画得开
var core = Math.Exp(-Math.Pow(r / 0.36, 1.85));
var rim = 1 - SmoothStep(0.36, 0.50, r); // 山脚过渡到平地
var h = 65 + 1230 * core * rim;
// 东南侧肩部,让等高线不是完美同心圆
h += 120 * Math.Exp(-(Math.Pow(u - 0.72, 2) + Math.Pow(v - 0.66, 2)) / 0.016) * rim;
h += 22 * Math.Sin(u * 7.3 + 0.6) * Math.Cos(v * 6.1) * rim;
h = Math.Max(0, h);
Heights[y, x] = (float)h;
if (h < min) min = h; if (h > max) max = h;
}
MinHeight = (float)min; MaxHeight = (float)max;
Tags.Clear();
Tags.Add((0.5, 0.5, 0.09, TerrainFeature.Peak));
}
/// <summary>山脊:一条狭长高地,等高线沿脊线向低处凸出(凸低为脊)。</summary>
private void BuildRidge()
{
var min = double.MaxValue; var max = double.MinValue;
for (var y = 0; y < Size; y++)
for (var x = 0; x < Size; x++)
{
var u = (double)x / (Size - 1);
var v = (double)y / (Size - 1);
// 脊线沿 u 方向(西高东低),东西向是长坡,南北向是宽缓的两翼
var crestV = 0.5 + 0.10 * Math.Sin(u * 3.1); // 脊线轻微弯曲
var across = v - crestV;
var crest = 1150 - 380 * u; // 脊线海拔由西向东降低
var lateral = Math.Exp(-Math.Pow(Math.Abs(across) / 0.27, 1.55));
var h = 85 + (crest - 85) * lateral;
// 两翼的次级起伏,避免像一堵直墙
h += 60 * Math.Exp(-Math.Pow(Math.Abs(across) - 0.30, 2) / 0.010) * (0.4 + 0.6 * (1 - u));
h += 24 * Math.Sin(u * 8.0) * Math.Cos(v * 5.6);
h = Math.Max(0, h);
Heights[y, x] = (float)h;
if (h < min) min = h; if (h > max) max = h;
}
MinHeight = (float)min; MaxHeight = (float)max;
Tags.Clear();
Tags.Add((0.30, 0.50, 0.09, TerrainFeature.Ridge));
Tags.Add((0.70, 0.50, 0.09, TerrainFeature.Ridge));
}
/// <summary>山谷:两侧高地夹持的低槽,等高线形成 V 形指向上游(凸高为谷)。</summary>
private void BuildValley()
{
var min = double.MaxValue; var max = double.MinValue;
for (var y = 0; y < Size; y++)
for (var x = 0; x < Size; x++)
{
var u = (double)x / (Size - 1);
var v = (double)y / (Size - 1);
// 谷轴沿 v 方向:两侧高、中间是 V 形谷底;北侧(v 小)为上游更高
var side = Math.Pow(Math.Abs(u - 0.5) / 0.5, 1.5); // 0=谷心 1=图边
var downhill = 1 - v; // 上游 1 → 下游 0
var h = 90 + 760 * downhill + 585 * side * (0.30 + 0.70 * downhill);
// 谷底再切深一点,形成明显的集水线
h -= 70 * Math.Exp(-Math.Pow(u - 0.5, 2) / 0.0022);
h += 18 * Math.Sin(u * 6.5) * Math.Cos(v * 7.2);
h = Math.Max(0, h);
Heights[y, x] = (float)h;
if (h < min) min = h; if (h > max) max = h;
}
MinHeight = (float)min; MaxHeight = (float)max;
Tags.Clear();
Tags.Add((0.50, 0.40, 0.075, TerrainFeature.Valley));
Tags.Add((0.50, 0.68, 0.075, TerrainFeature.Valley));
}
/// <summary>鞍部:两座山峰之间相对低洼、俯视轮廓收腰的过渡地带。</summary>
private void BuildSaddle()
{
var min = double.MaxValue; var max = double.MinValue;
for (var y = 0; y < Size; y++)
for (var x = 0; x < Size; x++)
{
var u = (double)x / (Size - 1);
var v = (double)y / (Size - 1);
// 两峰在 v≈0.5 的连线上,u=0.27 与 u=0.73;中间 u=0.5 为垭口
var d1 = Math.Sqrt(Math.Pow((u - 0.27) / 0.30, 2) + Math.Pow((v - 0.52) / 0.28, 2));
var d2 = Math.Sqrt(Math.Pow((u - 0.73) / 0.30, 2) + Math.Pow((v - 0.48) / 0.28, 2));
var p1 = 1140 * Math.Exp(-Math.Pow(d1, 2.2));
var p2 = 1060 * Math.Exp(-Math.Pow(d2, 2.2));
// 南北两侧缓慢降低,把两峰连成一条东西向的山梁
var bench = 330 * Math.Exp(-Math.Pow((v - 0.5) / 0.34, 2));
var h = 65 + bench + Math.Max(p1, p2);
h += 20 * Math.Sin(u * 8.0) * Math.Cos(v * 7.0);
h = Math.Max(0, h);
Heights[y, x] = (float)h;
if (h < min) min = h; if (h > max) max = h;
}
MinHeight = (float)min; MaxHeight = (float)max;
Tags.Clear();
Tags.Add((0.28, 0.50, 0.05, TerrainFeature.Peak));
Tags.Add((0.72, 0.50, 0.05, TerrainFeature.Peak));
Tags.Add((0.50, 0.50, 0.045, TerrainFeature.Saddle));
}
/// <summary>陡崖:一侧近乎直立的高差带,等高线在崖壁处高度密集甚至重合。</summary>
private void BuildCliff()
{
var min = double.MaxValue; var max = double.MinValue;
for (var y = 0; y < Size; y++)
for (var x = 0; x < Size; x++)
{
var u = (double)x / (Size - 1);
var v = (double)y / (Size - 1);
// 西侧低台地、东侧高台地,中间一条近乎直立的高差带形成陡崖
// 崖线略呈波状(真实崖壁不是一条直线),过渡带留出 2~3 个采样格
var edge = SmoothStep(0.50, 0.62, u + 0.045 * Math.Sin(v * 5.2) + 0.02 * Math.Sin(v * 11.0));
var h = 210 + 940 * edge;
// 高台地北高南低、顶面起伏,低台地保持缓坡
h += 170 * (1 - v) * edge;
h += 55 * Math.Sin(v * 5.4) * Math.Cos(u * 4.2) * (0.4 + 0.6 * edge);
h += 26 * Math.Sin(u * 9.0); // 顶面轻微起伏
h = Math.Max(0, h);
Heights[y, x] = (float)h;
if (h < min) min = h; if (h > max) max = h;
}
MinHeight = (float)min; MaxHeight = (float)max;
Tags.Clear();
Tags.Add((0.50, 0.50, 0.035, TerrainFeature.Cliff));
}
private static double SmoothStep(double a, double b, double x) private static double SmoothStep(double a, double b, double x)
{ {
var t = Math.Clamp((x - a) / (b - a), 0, 1); var t = Math.Clamp((x - a) / (b - a), 0, 1);
@@ -452,46 +626,77 @@ public sealed class TerrainField
private static double Lerp(double a, double b, double t) private static double Lerp(double a, double b, double t)
=> a + (b - a) * Math.Clamp(double.IsNaN(t) ? 0.5 : t, 0, 1); => a + (b - a) * Math.Clamp(double.IsNaN(t) ? 0.5 : t, 0, 1);
/// <summary>把零散线段按端点邻近关系串成折线。</summary> /// <summary>
/// 把零散线段按端点串成完整折线。
/// 关键点:必须**两端都延伸**。只往尾部延伸时,起点落在曲线中段就会把一条等高线
/// 切成许多短链,渲染出来是断续的虚线(学生看到的就是“虚线等高线”)。
/// </summary>
private static List<List<(double U, double V)>> Chain( private static List<List<(double U, double V)>> Chain(
List<(double U1, double V1, double U2, double V2)> segments) List<(double U1, double V1, double U2, double V2)> segments)
{ {
const double Eps = 0.004; // 量化到 1e-4 的网格做端点索引:共享边上的交点由同一次插值算出,
var result = new List<List<(double, double)>>(); // 端点值完全一致;网格远小于采样间距(1/192≈0.0052),不会误并。
const double Q = 1e4;
static (long, long) Key(double u, double v)
=> ((long)Math.Round(u * Q), (long)Math.Round(v * Q));
var index = new Dictionary<(long, long), List<int>>();
void Register(double u, double v, int seg)
{
var k = Key(u, v);
if (!index.TryGetValue(k, out var list)) index[k] = list = new List<int>();
list.Add(seg);
}
for (var i = 0; i < segments.Count; i++)
{
Register(segments[i].U1, segments[i].V1, i);
Register(segments[i].U2, segments[i].V2, i);
}
var used = new bool[segments.Count]; var used = new bool[segments.Count];
var result = new List<List<(double, double)>>();
int NextAt(double u, double v)
{
if (!index.TryGetValue(Key(u, v), out var list)) return -1;
foreach (var j in list) if (!used[j]) return j;
return -1;
}
for (var i = 0; i < segments.Count; i++) for (var i = 0; i < segments.Count; i++)
{ {
if (used[i]) continue; if (used[i]) continue;
used[i] = true; used[i] = true;
var line = new List<(double, double)> var line = new List<(double U, double V)>
{ {
(segments[i].U1, segments[i].V1), (segments[i].U1, segments[i].V1),
(segments[i].U2, segments[i].V2) (segments[i].U2, segments[i].V2)
}; };
// 向两端延伸 // 向尾部延伸
var grown = true; while (true)
while (grown)
{ {
grown = false; var (tu, tv) = line[^1];
var (tailU, tailV) = line[^1]; var j = NextAt(tu, tv);
for (var j = 0; j < segments.Count; j++) if (j < 0) break;
{ used[j] = true;
if (used[j]) continue; var s = segments[j];
var s = segments[j]; line.Add(Key(s.U1, s.V1) == Key(tu, tv) ? (s.U2, s.V2) : (s.U1, s.V1));
if (Near(tailU, tailV, s.U1, s.V1, Eps))
{
line.Add((s.U2, s.V2)); used[j] = true; grown = true; break;
}
if (Near(tailU, tailV, s.U2, s.V2, Eps))
{
line.Add((s.U1, s.V1)); used[j] = true; grown = true; break;
}
}
} }
if (line.Count >= 4) result.Add(line); // 向头部延伸
while (true)
{
var (hu, hv) = line[0];
var j = NextAt(hu, hv);
if (j < 0) break;
used[j] = true;
var s = segments[j];
line.Insert(0, Key(s.U1, s.V1) == Key(hu, hv) ? (s.U2, s.V2) : (s.U1, s.V1));
}
if (line.Count >= 3) result.Add(line);
} }
return result; return result;
+1 -1
View File
@@ -26,5 +26,5 @@
"frame": "#0A1524" "frame": "#0A1524"
}, },
"build": "cc68b8863b", "build": "cc68b8863b",
"updatedAt": "2026-11-18T10:16:41Z" "updatedAt": "2026-11-19T10:20:00Z"
} }
+1 -1
View File
@@ -32,5 +32,5 @@
"frame": "#0A1524" "frame": "#0A1524"
}, },
"build": "53b7a0fbc3", "build": "53b7a0fbc3",
"updatedAt": "2026-11-18T10:16:41Z" "updatedAt": "2026-11-19T10:20:00Z"
} }
+1 -1
View File
@@ -32,5 +32,5 @@
"frame": "#0A1524" "frame": "#0A1524"
}, },
"build": "ecd52665f9", "build": "ecd52665f9",
"updatedAt": "2026-11-18T10:16:41Z" "updatedAt": "2026-11-19T10:20:00Z"
} }
+1 -1
View File
@@ -33,5 +33,5 @@
"frame": "#F4F6FB" "frame": "#F4F6FB"
}, },
"build": "105653737d", "build": "105653737d",
"updatedAt": "2026-11-18T10:16:41Z" "updatedAt": "2026-11-19T10:20:00Z"
} }
+29 -29
View File
@@ -1,46 +1,46 @@
{ {
"schema": 1, "schema": 1,
"generated": "2026-11-18T12:37:25Z", "generated": "2026-11-19T10:20:00Z",
"repository": "https://git.xhmcl.com/Morris/GC", "repository": "https://git.xhmcl.com/Morris/GC",
"branch": "main", "branch": "main",
"modelDir": "model", "modelDir": "model",
"launcher": { "launcher": {
"version": "1.0.10", "version": "1.1.1",
"revision": "", "revision": "",
"packages": { "packages": {
"win-x64": { "win-x64": {
"path": "dist/win-amd64/GCL-1.0.10-win-amd64.zip", "path": "dist/win-amd64/GCL-1.1.1-win-amd64.zip",
"dir": "dist/win-amd64", "dir": "dist/win-amd64",
"name": "GCL-1.0.10-win-amd64.zip", "name": "GCL-1.1.1-win-amd64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-win-amd64.zip", "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-win-amd64.zip",
"sha256": "ace717e9a96704c0f51420fc7ee23af01405c239cf9e039352d9864d7fe513b8", "sha256": "a03532606121280a1553ea73e56d6f9e8cc6cd9eefaf49f8c62857733199c10f",
"size": 74323474 "size": 74993562
}, },
"win-arm64": { "win-arm64": {
"path": "dist/win-arm64/GCL-1.0.10-win-arm64.zip", "path": "dist/win-arm64/GCL-1.1.1-win-arm64.zip",
"dir": "dist/win-arm64", "dir": "dist/win-arm64",
"name": "GCL-1.0.10-win-arm64.zip", "name": "GCL-1.1.1-win-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-win-arm64.zip", "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-win-arm64.zip",
"sha256": "af1337e0ad110ca408141477d17cb33e9a3ea187909d94c5425086d6215ea651", "sha256": "0cd3e045fbc2415bb170e545bb720841eb4c5ebc01a98e03105618a2b7bace46",
"size": 72068324 "size": 72535103
}, },
"osx-arm64": { "osx-arm64": {
"path": "dist/mac-arm64/GCL-1.0.10-mac-arm64.zip", "path": "dist/mac-arm64/GCL-1.1.1-mac-arm64.zip",
"dir": "dist/mac-arm64", "dir": "dist/mac-arm64",
"name": "GCL-1.0.10-mac-arm64.zip", "name": "GCL-1.1.1-mac-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-mac-arm64.zip" "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-mac-arm64.zip"
}, },
"osx-x64": { "osx-x64": {
"path": "dist/mac-x64/GCL-1.0.10-mac-x64.zip", "path": "dist/mac-x64/GCL-1.1.1-mac-x64.zip",
"dir": "dist/mac-x64", "dir": "dist/mac-x64",
"name": "GCL-1.0.10-mac-x64.zip", "name": "GCL-1.1.1-mac-x64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-mac-x64.zip" "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-mac-x64.zip"
}, },
"linux-arm64": { "linux-arm64": {
"path": "dist/linux-arm64/GCL-1.0.10-linux-arm64.zip", "path": "dist/linux-arm64/GCL-1.1.1-linux-arm64.zip",
"dir": "dist/linux-arm64", "dir": "dist/linux-arm64",
"name": "GCL-1.0.10-linux-arm64.zip", "name": "GCL-1.1.1-linux-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-linux-arm64.zip" "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-linux-arm64.zip"
} }
} }
}, },
@@ -49,7 +49,7 @@
"id": "contour-map", "id": "contour-map",
"version": "1.1", "version": "1.1",
"build": "773ab2161d", "build": "773ab2161d",
"manifestSha256": "f81d18da03ea3507872468738a3e9bd43e63c884203cae36f213e8dafb3d4027", "manifestSha256": "ac3231d55175757b4c477ad6a3c398c041db9511061f0c650d2c10efca881103",
"filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699", "filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699",
"files": 5, "files": 5,
"dir": "model/contour-map" "dir": "model/contour-map"
@@ -58,7 +58,7 @@
"id": "earth-geography", "id": "earth-geography",
"version": "1.9", "version": "1.9",
"build": "cc68b8863b", "build": "cc68b8863b",
"manifestSha256": "d231450e1d103eb324ba6c78b073782247ce5e1960b6f7697795e18c89e8e888", "manifestSha256": "f69ceb758c643701480af441da26dfa64e190c9e583073deba211bac3e2a6e1a",
"filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95", "filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95",
"files": 11, "files": 11,
"dir": "model/earth-geography" "dir": "model/earth-geography"
@@ -67,7 +67,7 @@
"id": "earth-revolution", "id": "earth-revolution",
"version": "1.7", "version": "1.7",
"build": "53b7a0fbc3", "build": "53b7a0fbc3",
"manifestSha256": "3e9550fa769a2a52215a7eea53b26e5db13281d1833fc02f83c56ff5b214a949", "manifestSha256": "ab257669cd2bc57289d7e86b361064034d6040e85603b65069a93aec8d457b0b",
"filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1", "filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1",
"files": 7, "files": 7,
"dir": "model/earth-revolution" "dir": "model/earth-revolution"
@@ -76,7 +76,7 @@
"id": "earth-rotation", "id": "earth-rotation",
"version": "1.7", "version": "1.7",
"build": "ecd52665f9", "build": "ecd52665f9",
"manifestSha256": "ac74d2037ea06b1ce758c3187deb37527eec11ce37789e62e4dadf95bf1fdd94", "manifestSha256": "d463d85e08fd7f0525f8e08a5e9ec49c0005b3d8ca97a7f9497e95bdbb0697cb",
"filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e", "filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e",
"files": 7, "files": 7,
"dir": "model/earth-rotation" "dir": "model/earth-rotation"
@@ -85,7 +85,7 @@
"id": "scale-calculator", "id": "scale-calculator",
"version": "1.6", "version": "1.6",
"build": "105653737d", "build": "105653737d",
"manifestSha256": "f81bbd3453c56e7547a0fceedf4458a2a9febfb77f7d8eabe03b47e526eedaef", "manifestSha256": "2ac714eafb9acb4e4f11567b61848441de0f65ac41eb4260bc2d868c9500f56d",
"filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604", "filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604",
"files": 6, "files": 6,
"dir": "model/scale-calculator" "dir": "model/scale-calculator"
@@ -94,8 +94,8 @@
"signature": { "signature": {
"alg": "ECDSA-P256-SHA256", "alg": "ECDSA-P256-SHA256",
"keyId": "gc-2026-12", "keyId": "gc-2026-12",
"value": "4k5CD5awa6iiLoZDDTQbpUEs3qnA1GBNit66T0IOMmKzHpHFmd1oaMGiQFFMDL+LHnKoKooWcF6G8HnaQv3hig==", "value": "U6j86/9PIUe5ZIqLRUlSIFf6EhODc7Dar1KvL7MecYujzNJ+ZnRrUg7aUT1rvktVwz4nyRacf9RYM2JQFb+qKw==",
"contentSha256": "26aa159b440dd0f1d2e912c959059e8f7df6aa9ecd7c1c53fde8915239134b19", "contentSha256": "585f22236fa1a50d4e99581c676b8ad694c5e352b12fe1bfed30c342b1f38690",
"signedAt": "2026-11-18T12:38:10Z" "signedAt": "2026-11-19T10:21:32Z"
} }
} }
+29 -29
View File
@@ -1,46 +1,46 @@
{ {
"schema": 1, "schema": 1,
"generated": "2026-11-18T12:37:25Z", "generated": "2026-11-19T10:20:00Z",
"repository": "https://git.xhmcl.com/Morris/GC", "repository": "https://git.xhmcl.com/Morris/GC",
"branch": "main", "branch": "main",
"modelDir": "model", "modelDir": "model",
"launcher": { "launcher": {
"version": "1.0.10", "version": "1.1.1",
"revision": "", "revision": "",
"packages": { "packages": {
"win-x64": { "win-x64": {
"path": "dist/win-amd64/GCL-1.0.10-win-amd64.zip", "path": "dist/win-amd64/GCL-1.1.1-win-amd64.zip",
"dir": "dist/win-amd64", "dir": "dist/win-amd64",
"name": "GCL-1.0.10-win-amd64.zip", "name": "GCL-1.1.1-win-amd64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-win-amd64.zip", "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-win-amd64.zip",
"sha256": "ace717e9a96704c0f51420fc7ee23af01405c239cf9e039352d9864d7fe513b8", "sha256": "a03532606121280a1553ea73e56d6f9e8cc6cd9eefaf49f8c62857733199c10f",
"size": 74323474 "size": 74993562
}, },
"win-arm64": { "win-arm64": {
"path": "dist/win-arm64/GCL-1.0.10-win-arm64.zip", "path": "dist/win-arm64/GCL-1.1.1-win-arm64.zip",
"dir": "dist/win-arm64", "dir": "dist/win-arm64",
"name": "GCL-1.0.10-win-arm64.zip", "name": "GCL-1.1.1-win-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-win-arm64.zip", "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-win-arm64.zip",
"sha256": "af1337e0ad110ca408141477d17cb33e9a3ea187909d94c5425086d6215ea651", "sha256": "0cd3e045fbc2415bb170e545bb720841eb4c5ebc01a98e03105618a2b7bace46",
"size": 72068324 "size": 72535103
}, },
"osx-arm64": { "osx-arm64": {
"path": "dist/mac-arm64/GCL-1.0.10-mac-arm64.zip", "path": "dist/mac-arm64/GCL-1.1.1-mac-arm64.zip",
"dir": "dist/mac-arm64", "dir": "dist/mac-arm64",
"name": "GCL-1.0.10-mac-arm64.zip", "name": "GCL-1.1.1-mac-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-mac-arm64.zip" "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-mac-arm64.zip"
}, },
"osx-x64": { "osx-x64": {
"path": "dist/mac-x64/GCL-1.0.10-mac-x64.zip", "path": "dist/mac-x64/GCL-1.1.1-mac-x64.zip",
"dir": "dist/mac-x64", "dir": "dist/mac-x64",
"name": "GCL-1.0.10-mac-x64.zip", "name": "GCL-1.1.1-mac-x64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-mac-x64.zip" "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-mac-x64.zip"
}, },
"linux-arm64": { "linux-arm64": {
"path": "dist/linux-arm64/GCL-1.0.10-linux-arm64.zip", "path": "dist/linux-arm64/GCL-1.1.1-linux-arm64.zip",
"dir": "dist/linux-arm64", "dir": "dist/linux-arm64",
"name": "GCL-1.0.10-linux-arm64.zip", "name": "GCL-1.1.1-linux-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-linux-arm64.zip" "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-linux-arm64.zip"
} }
} }
}, },
@@ -49,7 +49,7 @@
"id": "contour-map", "id": "contour-map",
"version": "1.1", "version": "1.1",
"build": "773ab2161d", "build": "773ab2161d",
"manifestSha256": "f81d18da03ea3507872468738a3e9bd43e63c884203cae36f213e8dafb3d4027", "manifestSha256": "ac3231d55175757b4c477ad6a3c398c041db9511061f0c650d2c10efca881103",
"filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699", "filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699",
"files": 5, "files": 5,
"dir": "model/contour-map" "dir": "model/contour-map"
@@ -58,7 +58,7 @@
"id": "earth-geography", "id": "earth-geography",
"version": "1.9", "version": "1.9",
"build": "cc68b8863b", "build": "cc68b8863b",
"manifestSha256": "d231450e1d103eb324ba6c78b073782247ce5e1960b6f7697795e18c89e8e888", "manifestSha256": "f69ceb758c643701480af441da26dfa64e190c9e583073deba211bac3e2a6e1a",
"filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95", "filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95",
"files": 11, "files": 11,
"dir": "model/earth-geography" "dir": "model/earth-geography"
@@ -67,7 +67,7 @@
"id": "earth-revolution", "id": "earth-revolution",
"version": "1.7", "version": "1.7",
"build": "53b7a0fbc3", "build": "53b7a0fbc3",
"manifestSha256": "3e9550fa769a2a52215a7eea53b26e5db13281d1833fc02f83c56ff5b214a949", "manifestSha256": "ab257669cd2bc57289d7e86b361064034d6040e85603b65069a93aec8d457b0b",
"filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1", "filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1",
"files": 7, "files": 7,
"dir": "model/earth-revolution" "dir": "model/earth-revolution"
@@ -76,7 +76,7 @@
"id": "earth-rotation", "id": "earth-rotation",
"version": "1.7", "version": "1.7",
"build": "ecd52665f9", "build": "ecd52665f9",
"manifestSha256": "ac74d2037ea06b1ce758c3187deb37527eec11ce37789e62e4dadf95bf1fdd94", "manifestSha256": "d463d85e08fd7f0525f8e08a5e9ec49c0005b3d8ca97a7f9497e95bdbb0697cb",
"filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e", "filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e",
"files": 7, "files": 7,
"dir": "model/earth-rotation" "dir": "model/earth-rotation"
@@ -85,7 +85,7 @@
"id": "scale-calculator", "id": "scale-calculator",
"version": "1.6", "version": "1.6",
"build": "105653737d", "build": "105653737d",
"manifestSha256": "f81bbd3453c56e7547a0fceedf4458a2a9febfb77f7d8eabe03b47e526eedaef", "manifestSha256": "2ac714eafb9acb4e4f11567b61848441de0f65ac41eb4260bc2d868c9500f56d",
"filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604", "filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604",
"files": 6, "files": 6,
"dir": "model/scale-calculator" "dir": "model/scale-calculator"
@@ -94,8 +94,8 @@
"signature": { "signature": {
"alg": "ECDSA-P256-SHA256", "alg": "ECDSA-P256-SHA256",
"keyId": "gc-2026-12", "keyId": "gc-2026-12",
"value": "4k5CD5awa6iiLoZDDTQbpUEs3qnA1GBNit66T0IOMmKzHpHFmd1oaMGiQFFMDL+LHnKoKooWcF6G8HnaQv3hig==", "value": "U6j86/9PIUe5ZIqLRUlSIFf6EhODc7Dar1KvL7MecYujzNJ+ZnRrUg7aUT1rvktVwz4nyRacf9RYM2JQFb+qKw==",
"contentSha256": "26aa159b440dd0f1d2e912c959059e8f7df6aa9ecd7c1c53fde8915239134b19", "contentSha256": "585f22236fa1a50d4e99581c676b8ad694c5e352b12fe1bfed30c342b1f38690",
"signedAt": "2026-11-18T12:38:10Z" "signedAt": "2026-11-19T10:21:32Z"
} }
} }