Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
82cab7b0e3 | ||
|
|
2640de0836 | ||
|
|
255cfa3d85 | ||
|
|
487250582c | ||
|
|
e39e6f26b1 | ||
|
|
9cd4fa6266 | ||
|
|
4043ed5e72 | ||
|
|
46ed84475d | ||
|
|
1dd3b40cb6 | ||
|
|
355ca89a68 | ||
|
|
4ef291568a | ||
|
|
5b628971a9 | ||
|
|
faaee9abe2 | ||
|
|
ead63e8ffe | ||
|
|
01c2d017c6 | ||
|
|
3efdf74258 | ||
|
|
3c74effb4c | ||
|
|
f03046bffd | ||
|
|
2cd18b4e5f | ||
|
|
023e9468db | ||
|
|
5e5d84856a | ||
|
|
b4724d7ca0 | ||
|
|
9a911089bf | ||
|
|
4bdfb49600 | ||
|
|
59a66c8fa8 | ||
|
|
a5fcaeb658 | ||
|
|
fcaacf3b33 | ||
|
|
0997de514e | ||
|
|
192f2a63e9 | ||
|
|
a1a14f106b | ||
|
|
e67cc63998 | ||
|
|
2ba4789c95 | ||
|
|
22baa6fda9 |
No files matched your search
@@ -57,9 +57,12 @@ jobs:
|
||||
with:
|
||||
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
|
||||
|
||||
- name: 运行应用器测试(整目录替换 / .GC/bin 合并 / 回滚)
|
||||
run: dotnet run --project GC/src/test/dotnet/GC.Savedog.Tests/GC.Savedog.Tests.csproj -c Release
|
||||
|
||||
frontend:
|
||||
name: 前端检查(Flutter)
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
@@ -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
|
||||
@@ -0,0 +1,122 @@
|
||||
# 2026-11-19 工作日志
|
||||
|
||||
## GC 项目 Flutter 1.1.1 编译环境配置
|
||||
|
||||
### 项目结构关键发现
|
||||
- 仓库有两个远程:`origin`(Avalonia 版,分支 `main`)和 `origin2`(**Flutter 版**,分支 `origin2/main`,tag `1.1.1`)。
|
||||
- 用户口中的"C#+Flutter 项目"指 **origin2/main**:`GC-UI/` 是前后端分离实现——Flutter 前端(`GC-UI/frontend/`)+ .NET 8 后端(`GC-UI/backend/GC.UI.Server/`)。模型窗口仍由后端用 Avalonia 承载(契约不可变)。
|
||||
- 当前 `main` 分支是纯 Avalonia 版,无 Flutter 代码。最初误判"没有 Flutter",实际在另一远程分支。
|
||||
|
||||
### 分支操作
|
||||
- 原 `main` 有未提交改动(8 个文件,version.json 从 1.0.7 手改成 1.1.1),已 stash 到 `stash@{0}`(message: `backup-before-flutter-switch-20261119`)。
|
||||
- 已新建本地分支 `flutter-1.1.1` 跟踪 `origin2/main`,HEAD 在 tag `1.1.1`(commit 3c74eff)。
|
||||
|
||||
### Flutter 环境(已完成)
|
||||
- 工程锁定 Flutter **3.24.5**(Dart 3.5.4),依据是 `GC-UI/frontend/.metadata` 的 revision `dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668`,与官方 release hash 一致。
|
||||
- SDK 安装在 `/Users/lixi/development/flutter`,zip 校验 sha256 `ca9624a6de7a1a8962f2f0a3e2a57b16434ca34f1137b8d9dc68c5ca1f187133`。
|
||||
- 国内镜像(快 100 倍,8MB/s):`FLUTTER_STORAGE_BASE_URL=https://storage.flutter-io.cn`、`PUB_HOSTED_URL=https://pub.flutter-io.cn`。
|
||||
- 已把 PATH 和两个镜像变量写入 `~/.zshrc`。
|
||||
- `flutter pub get` 成功,`flutter analyze` 零问题(代码本身健康)。
|
||||
- 注意:Flutter 构建命令需在无沙箱模式下运行(需写 SDK 缓存目录 `.pub-preload-cache`)。
|
||||
|
||||
### 编译阻塞(待用户处理)
|
||||
- 目标 macOS 版,但本机**只有 Command Line Tools,无完整 Xcode**(`xcodebuild` 不存在)。
|
||||
- `flutter build macos --release` 实测报错 exit 72:`xcrun: error: unable to find utility "xcodebuild"`。
|
||||
- App Store 无 Apple ID 登录态(MobileMeAccounts / 钥匙串均无凭据),命令行无法无人值守安装 Xcode。
|
||||
- 用户选择:**自己手动在 App Store 登录并安装 Xcode**,装完后再继续 `flutter build macos`。
|
||||
- 备选方案(用户未选):本机可用 `buildsh/cross/build-ui-win-cross.sh` 走 mingw-w64 + wine 交叉编译 Windows 版(需 `brew install mingw-w64 cmake ninja` + `brew install --cask wine-stable`),Rosetta 2 已安装。
|
||||
|
||||
### 编译完成(Xcode 27.2 装好后)
|
||||
用户手动装好 Xcode 27.2(`/Applications/Xcode.app`,xcode-select 已指向)。编译过程连破 3 个新 Xcode 兼容问题:
|
||||
1. **部署目标过低**:`macos/Runner.xcodeproj/project.pbxproj` 三处 `MACOSX_DEPLOYMENT_TARGET = 10.14` → 改为 `12.0`(Xcode 27 最低支持 12.0)。这是对工程文件的持久化改动。
|
||||
2. **lipo -verify_arch 参数解析变更**:Flutter 3.24.5 的 `packages/flutter_tools/lib/src/build_system/targets/macos.dart` 一次性传多个架构给 `-verify_arch`,Xcode 27 的 lipo 报 "requires exactly one input file"。改为逐个架构分别验证。改后需删 `bin/cache/flutter_tools.stamp` 强制重建 snapshot 才生效。
|
||||
3. **假符号链接**:解压 Flutter SDK 时沙箱把 `.framework` 里的符号链接写成文本文件路径(内容是 `Versions/Current/...`),导致 SwiftPM 报 `Unable to resolve module 'FlutterMacOS'`。按「先 Versions/Current→A,再顶层 4 个链接」顺序修复,共 19 个(SDK artifacts 15 + build 目录 4)。修复脚本思路见 `/tmp/fix2.sh`(临时)。
|
||||
|
||||
**产物**:`GC-UI/frontend/build/macos/Build/Products/Release/GC-UI.app`(38MB,版本 1.1.1,universal x86_64+arm64,adhoc 签名,bundle id com.morris.gc.gcUi)。
|
||||
交付 zip:`dist/GC-UI-1.1.1-mac-universal.zip`(16MB,sha256 `55f40c146e86cfed3adc1f02a72ab89944dd81ba8e9c8ba6cf929f7061573db5`)。
|
||||
注意:这是 Flutter 前端外壳,需 .NET 后端(GC.UI.Server / GC-BOOT 进程内托管)配合才能完整工作。完整发布包 `GC.app` 需走 `build.sh build`,但该流程强制走 Windows 交叉编译(wine/mingw,本机装不了,Homebrew 被沙箱拦截),故未跑完整发布。
|
||||
|
||||
### "打开即连好"完整发布包(用户反馈单独 GC-UI.app 报"无法连接后端")
|
||||
根因:Flutter 前端不含后端,靠 `GC_UI_PORT` 环境变量 / `.GC/ui-backend.json` 发现后端。正统入口是 `GC-BOOT`(产物 `GC`):`FlutterShell.TryRun` 在进程内起后端 → 选端口 → 拉起 `GC-UI.app/Contents/MacOS/GC-UI` 并传入 `GC_UI_PORT` → 前端自动连上。单独双击 GC-UI.app 必然连不上。
|
||||
|
||||
手动只构建 macOS 完整包(绕开装不了的 wine/mingw):
|
||||
1. `dotnet publish GC-BOOT/GC-BOOT.csproj -c Release -r osx-arm64 --self-contained -p:... -o dist/mac-arm64`(GC-BOOT.csproj 已把后端作库引用,`FrameworkReference Microsoft.AspNetCore.App`,一个 exe 够用)
|
||||
2. 同样 publish `GC-SAVEDOG`(裁剪)
|
||||
3. 复制 GC-UI.app 到 dist/mac-arm64
|
||||
4. 组装 GC.app:Info.plist(版本 1.1.1)+ Contents/MacOS 放 GC/GC.UI.Server.runtimeconfig.json/GC-UI.app,SAVEDOG 收进 `.GC/bin`,iconutil 从 icon-1024.png 生成 AppIcon.icns
|
||||
5. `ditto -c -k --sequesterRsrc --keepParent` 打包
|
||||
|
||||
**验证通过**:`open GC.app` 后用 curl 查 `http://127.0.0.1:17890/api/health` 返回 `{"ok":true,"version":"1.1.1","platform":"osx-arm64"}`;frontend 进程 GC-UI 在跑;models/settings/about API 全部正常。测试完已 pkill 并清掉 .GC 运行数据。
|
||||
|
||||
最终交付:`dist/mac-arm64/GC-1.1.1-mac-arm64.zip`(72MB,sha256 `3bb4101fee9588b1a3b73dcf2e65bc081b83220e5fbbe18a433ee2af8ccfb5e3`),解压得 GC.app,双击即自动连好后端。旧的 `dist/GC-UI-1.1.1-mac-universal.zip` 只是纯前端,已被取代。
|
||||
|
||||
注意:dotnet publish 的 `-o dist/mac-arm64` 不会清旧文件;`rm -rf dist/mac-arm64` 会触发批量删除保护(156 文件)。发布包数据目录落在 dist/mac-arm64/.GC(AppPaths 回退逻辑),启动器日志里 SAVEDOG 显示"未找到"是因为它找的是同级而非 .GC/bin,不影响主流程。
|
||||
|
||||
### 真正根因:App Sandbox 缺 network.client(用户第二次反馈仍连不上)
|
||||
上面的"验证通过"是**假阳性**:只 curl 了后端(后端在沙箱外,当然正常),从没让前端真发请求。前端报"无法连接后端(baseUrl)"是 api_client.dart:428 的 ApiException。
|
||||
|
||||
真因:`GC-UI/frontend/macos/Runner/Release.entitlements` 只开了 `com.apple.security.app-sandbox=true`,**没有 `com.apple.security.network.client`**。沙箱内进程向 127.0.0.1:17890 发起出站 HTTP 会被内核拒绝(EPERM),所以发布版前端连不上;DebugProfile.entitlements 有 network.server 所以开发时正常,掩盖了问题。用 `codesign -d --entitlements :- GC-UI.app` 可确认签名里只有 app-sandbox。
|
||||
|
||||
修复:给 Release.entitlements 加 `network.client` + `network.server` → 重新 `flutter build macos --release`(新签名自动嵌入)→ 替换 GC.app 内 GC-UI.app → 重打包。
|
||||
|
||||
**这次验证到位**:`open GC.app` 后 `lsof -nP -a -p <前端PID> -iTCP` 显示 `GC-UI ... TCP 127.0.0.1:60082->127.0.0.1:17890 (ESTABLISHED)`——前端真连上了。这才是"打开即连好"的硬证据。
|
||||
|
||||
最终交付覆盖更新:`dist/mac-arm64/GC-1.1.1-mac-arm64.zip`(72MB,sha256 `2b0f4c25ce4e52edf18a45ceb2fe2f91612757db5589f346ffd984665cab5172`),包内前端签名已含 network.client/server。
|
||||
|
||||
教训:验证桌面端"连后端"必须看**前端进程的网络连接**(lsof),不能只 curl 后端。无 GUI 会话时 screencapture/AppleScript 不可用。
|
||||
|
||||
### 恢复用户改动
|
||||
回到 `main` 后执行 `git stash pop` 恢复 `stash@{0}` 的 8 个文件改动。
|
||||
当前 checkout 分支:`flutter-1.1.1`(跟踪 origin2/main,tag 1.1.1)。
|
||||
|
||||
### 提交 PR 到 xhmcl(Gitea 28.1.0,git.xhmcl.com/Morris/GC)
|
||||
分支 `fix/macos-release-sandbox-network`(commit 3efdf74),**只含本次修复两文件**:`Release.entitlements`、`project.pbxproj`。
|
||||
严格排除了干扰项:`model/contour-map/*`(他人地貌改动)、`pubspec.lock`(配国内镜像 pub get 的副作用,不能提交)、未跟踪的 mp4/js/html 等。
|
||||
PR #28:https://git.xhmcl.com/Morris/GC/pulls/28 (base main,state open,mergeable=true,+7/−3,2 files)。
|
||||
|
||||
**凭据/接口要点(踩坑记录)**:
|
||||
- 该实例 git 协议与 API 认证分离。`gdt_...` 是 git 凭据(当密码用可 push),但调 API 全部 401(Authorization: token/Bearer、X-Token、PRIVATE-TOKEN、query 都试过)。
|
||||
- 建 PR 必须用**账号登录密码**做 basic auth:`curl -u 'Morris:<密码>' -X POST .../api/v1/repos/Morris/GC/pulls -d @body.json`,返回 201。
|
||||
- push 时若报 "unable to get credential storage lock: File exists",用 `git -c credential.helper= push` + `GIT_ASKPASS` 脚本绕过;其实首次已推成功,是误报。
|
||||
- 临时凭据文件(netrc/askpass/pr.json)用完即删,不落盘留存。
|
||||
- 注意:本机无图形会话时 screencapture/AppleScript 不可用;验证"前端连后端"必须用 `lsof -nP -a -p <PID> -iTCP` 看 ESTABLISHED。
|
||||
|
||||
### 模型无法启动 + 后端崩溃(PR #29)
|
||||
**根因**:macOS 的 AppKit 要求 NSApplication 在**主线程**。Flutter 模式下 `FlutterShell` 用 `ui.WaitForExit()` 占住主线程,而 `AvaloniaHost` 在 `new Thread(...)` 副线程里跑 `StartWithClassicDesktopLifetime`。点「启动模型」时模型窗口在副线程触碰 AppKit → 进程级崩溃,后端随之消失(表现为"无法启动模型"+"后端容易崩溃")。纯 Avalonia 版不受影响,只在 Flutter 打包模式暴露。
|
||||
|
||||
**修复**(4 文件,+114/−51):
|
||||
- `AvaloniaHost`:新增 `RunOnCurrentThread()`/`Shutdown()`,`EnsureStartedAsync()` 改为只等 `_ready`,不再自建线程。
|
||||
- `BackendServer.Start(args, port, out AvaloniaHost)` 重载(out 参数不能在 lambda 里用,内部用局部 `host`)。
|
||||
- `FlutterShell`:前端拉起后在主线程跑 Avalonia 事件循环,`ui.Exited` 时后台 `Shutdown()`;Avalonia 不可用时退化 `WaitForExit()`。
|
||||
- `Program.cs`:`app.StartAsync()` 后主线程跑 Avalonia,失败则 `WaitForShutdown()`(需 `using Microsoft.Extensions.Hosting`)。
|
||||
|
||||
**验证**:`/api/health` → `uiAvailable:true`;前端 `ESTABLISHED →17890`;`POST launch` → `HTTP 200 {"ok":true,"message":"已启动模型 contour-map"}`;启动后后端存活。
|
||||
|
||||
**交付**:`dist/mac-arm64/GC-1.1.1-mac-arm64.zip`(72MB,sha256 `4b3978eab5cb8fba4e97a3a623cb532080b9e0e24dd6f3e28e69440966c510bb`)。
|
||||
PR #29:https://git.xhmcl.com/Morris/GC/pulls/29
|
||||
|
||||
**坑**:`dist/mac-arm64/GC.app` 在清理 `.GC` 时被误删过;可从 `/tmp/gc-fresh-test/GC.app` 取 `GC-SAVEDOG` 与结构,配合 `/tmp/gc-new/GC`(publish 产物)+ build 目录新前端重建。组装脚本见上面的"打开即连好完整发布包"步骤。
|
||||
|
||||
## contour-map 模型重写(对照加密 HTML 课件移植)
|
||||
|
||||
**背景**:用户提供的 `~/Downloads/等高线及地形部位演示.html`(79MB)是授权壳 + AES-256-GCM + gzip 的课件,内含 Three.js 版五大地貌演示。已在本地用 node 复现解密(key = 两数组异或,AAD `QLAB|contour-landform-reading|...`),还原出 83MB 内部课件;其内容为「10 张内嵌 PNG + 切割视频 + 标注层」,并非可交互 3D。按用户要求改为在 `model/contour-map` 用 C#/Avalonia 重写。
|
||||
|
||||
**改动文件**(均在 `model/contour-map/src/`):
|
||||
- `TerrainField.cs`:新增 `LandformKind`(Peak/Ridge/Valley/Saddle/Cliff)与五个高度场生成器。要点是地形要**宽阔**(穹状山体、宽脊、V 形谷、双峰垭口、台地陡崖),半径过小会变成“尖锥/薄墙”。
|
||||
- `ContourView.cs`:重写为可交互 3D(拖动旋转、滚轮缩放),四步实验(切割/成线/投影/判坡),俯视/立体切换,自动取景 `UpdateCamera`(按包围盒八点投影铺满画布),法线光照,裙边侧壁,分层设色在 3D 用 `ColorForHeightSmooth` 平滑过渡、俯视仍用硬分档。
|
||||
- `ContourPage.cs`:地貌标签移到画布上方(WrapPanel,窄屏自动换行);右侧栏 344px,<980px 自动隐藏;四步流程/观察面板/判读要点;底部播放、重置、视图切换、上色、实时读数;空格与 1–5 快捷键;全屏。
|
||||
- `DefaultTexts.cs`:90 个键,中英各一套。
|
||||
- `ContourMapRuntime.cs`:`LoadTexts` 改为「内置默认 + i18n/*.json 覆盖」,之前完全忽略语言包。
|
||||
- 清单 `contour-map.json` 版本 1.1 → 1.2;`help.json` 同步新交互。
|
||||
|
||||
**修掉的真实 Bug**:
|
||||
1. `ExtractContour` 的 `Chain()` 只向尾部延伸,一条等高线被切成大量短链 → 3D 里显示成**虚线等高线**。改为端点索引 + 双向延伸后,每层只剩 1 条 300+ 点的完整曲线。
|
||||
2. `SlopeAt` 固定除以 450,导致山体坡度全饱和为 1(整片红),“疏密判坡”失效。改为按 `span*2.6` 自适应归一化。
|
||||
3. 切割步骤原本只是叠一张半透明板,山尖仍在。改为把高度场压到切面 `min(h, lv)`,得到真实截面,并用 `ExtractContour(lv)` 精确求交线。
|
||||
4. 切割时山峰标注悬在切面上方 → 高于切面的山峰不再标注。
|
||||
|
||||
**性能**:62×62 面片 + 画刷颜色缓存,1440×900 离屏单帧约 35ms(≈28fps),可接受。
|
||||
|
||||
**验证**:`dotnet build` 0 警告 0 错误;`dotnet run --project model/_engine/PreviewGen` 全模型离屏渲染通过并生成封面;自建 `/tmp/ccheck` 全尺寸渲染器逐状态出图核对(默认/俯视/五地貌/四步/中间帧)。
|
||||
|
||||
**交付**:PR #30 https://git.xhmcl.com/Morris/GC/pulls/30(`feat/contour-map-rewrite` → `main`,12 文件 +1903/-600,基于最新 main 单提交)。提交 PR 时注意:本地 `flutter-1.1.1` 落后 origin2/main 4 个提交,需先 stash 改动、从 `origin2/main` 建分支再 pop,否则 PR 会带上 48 个无关提交;gitcode(origin) 的 main 更旧且仍是 `NeoRF.*` 命名空间,不宜作为 PR 目标。推送用 `GIT_ASKPASS` 临时脚本传凭据,用完即删,不写 remote URL。
|
||||
@@ -0,0 +1,67 @@
|
||||
# 2026-11-21 工作日志
|
||||
|
||||
## 把加密 HTML 课件搬进 Flutter 前端(WebView 渲染)
|
||||
|
||||
**需求转变**:之前用 C# 重写 contour-map 模型,用户反馈"不够还原",改为直接把原课件搬进 Flutter,用 WebView 原样渲染(100% 还原),去验证 + 优化。
|
||||
|
||||
**去验证 / 拆资源**(产物在 `GC-UI/frontend/courseware/`):
|
||||
- 原始 `~/Downloads/等高线及地形部位演示.html`(79MB)是授权壳(AES-GCM+gzip);解密后 83MB 单文件。
|
||||
- 写出拆分脚本:CSS、视频、背景图、3 段 JS 抽成独立文件;app.js 里 10 张 data:image/png 抽成 `peak/ridge/valley/saddle/cliff-{3d,top}.png` 并改为相对路径。
|
||||
- 生成纯净 index.html:去掉 QLAB 注释、零宽水印 span、授权声明 div+style;CSP 放宽为允许 self/data/blob(否则 WebView 加载不了本地资源)。
|
||||
- 优化:11 张 PNG(全是不透明 RGB)用 sips 转 JPEG(q88),83MB → 27MB(HTML 本体 20KB);视频 17MB 保留原样(核心内容不劣化,且本机无 ffmpeg)。
|
||||
- 验证无残留:0 个 base64 / QLAB / 授权声明;JS 引用的 42 个 DOM id 全部存在;16 个资源引用无缺失。
|
||||
|
||||
**Flutter 接入**:
|
||||
- 依赖 `flutter_inappwebview: 6.1.5`(兼容 Flutter 3.24.5 / Dart 3.5.4;桌面 Win/mac/Linux 都支持;6.2-beta 要 Flutter 3.32 故不用)。
|
||||
- 新增 `lib/pages/courseware.dart`:Dart 自带 `HttpServer.bind(loopbackIPv4, 0)` 静态服务器(端口自动分配、含 HTTP Range 支持供视频拖动、路径规范化防越界),把课件 assets 用 `AssetManifest.loadFromAssetBundle(rootBundle)` 解压到系统临时目录再提供给 WebView。
|
||||
- **坑1**:`InAppLocalhostServer` 的 `port` 是 final,`port=0` 不会回写实际端口 → 弃用,改用 Dart 自带 HttpServer。
|
||||
- **坑2**:打包后工作目录不固定,不能用相对路径读 assets → 必须解压到临时目录。
|
||||
- **坑3**:AssetManifest 里的 key 是 `courseware/xxx`(不是 `assets/courseware/xxx`)→ 用 `flutter build bundle --asset-dir /tmp/xx` 检查实际 key。
|
||||
- `shell.dart`:导航项插在 index=1(主页之后),_buildPage case 顺延;home.dart 的 `goTo(1)/(2)` 改为 `goTo(2)/(3)`;**课件页在 `_content` 里放到 backendReady 检查之前**(纯前端不依赖后端)。
|
||||
- i18n 加 `nav.courseware`(等高线课件 / Contour Course);macOS Debug entitlements 补 `network.client`。
|
||||
- pubspec assets 声明 `courseware/` + `courseware/assets/`。
|
||||
|
||||
**验证**:`flutter analyze` 零问题;`flutter build macos --debug` 成功;实际启动 app(临时把 `index=1` 后编译)截图确认 WebView 完整渲染出课件(标题、四步流程、地貌标签、播放按钮)——之后已恢复 `index=0` 并重编最终版。
|
||||
|
||||
**环境坑(本机 macOS)**:
|
||||
- 系统 Ruby 2.6 装不了 CocoaPods(需 Ruby≥3)→ `brew install cocoapods`(brew 自带 Ruby 4)。
|
||||
- brew auto-update 卡住 → `HOMEBREW_NO_AUTO_UPDATE=1`。
|
||||
- CocoaPods CDN 走代理 SSL 证书校验失败 → `pod repo add trunk-git https://github.com/CocoaPods/Specs.git` + `GIT_SSL_NO_VERIFY=true`;完整 specs 约 3.4GB,clone 超时后目录保留,手动 `git checkout -f master` 完成展开,再 `pod install` 成功。
|
||||
- GUI 自动化:System Events 的点击/置前被权限拒绝(-10004),但 `tell application "GC-UI" to activate` 可用;验证 GUI 靠 activate + screencapture。
|
||||
|
||||
## 提交 PR
|
||||
|
||||
- PR #30(C# 3D 模型重写)已合入 `main`(合并提交 `4ef2915`)。
|
||||
- 从最新 `origin2/main` 新建独立分支 `feat/flutter-courseware`,只提交 Flutter 课件方案(30 文件,含 17MB 视频与 10 张 JPEG),与工作区里那批无关的 C# 安全改动隔离。
|
||||
- 提交 `355ca89`;已推送到 `origin2` 并通过 Gitea API 创建 **PR #32**:https://git.xhmcl.com/Morris/GC/pulls/32 ,状态 open、mergeable=true。
|
||||
- PR 草稿说明中注明「C# 重写已在 PR #30 合入 main」,避免与已合入内容混淆。
|
||||
|
||||
## 安全修复 PR #33(四类风险)
|
||||
- 从 fetch 后的最新 `origin2/main`(`1dd3b40`,含 #32 课件)建隔离 worktree `/tmp/gc-security`,分支 `fix/security-hardening`,只应用 7 个安全文件补丁(ModelInstaller / DirectoryRemote / FlutterShell / BackendServer / ApiModels / api_client.dart / DownloadContracts),排除用户工作区里课件/构建副作用;`flutter pub get` 改了 pubspec.lock 已 checkout 还原后 amend。提交 `46ed844`(+305/−34)。
|
||||
- 验证:dotnet build 0 错误、flutter analyze 0 问题;自建反射测试 32/32(恶意 Id 拒绝 14/14、合法放行 4/4、SafePath 符号链接 5/5、URL 9/9);实机 open GC.app 无/错 token 受保护接口 401、前端 ESTABLISHED→17890。
|
||||
- 注意:`GC-DOWNLOAD/DirectoryRemote.cs` 验签是「记录 + SignatureTrust 上送,由 UpdateService/LauncherUpdater 统一闸门拒绝」,与 GiteaRemote/GitCodeRemote 设计一致,未在 DirectoryRemote 内直接 return null。
|
||||
- `--update-test` 19 项失败是**既有测试夹具密钥不匹配**:`.signing/gc-signing.pem` 派生 gc-2026-11 公钥,但测试用 gc-2026-12 硬编码公钥验签,连正常签名清单都判 Invalid;与安全补丁无关(未碰签名文件),篡改相关断言通过。
|
||||
- push 用邮箱 `chenmoyuan1214@qq.com` + rotated `gdt_` token(askpass)成功;API 建 PR 用登录名 `Morris` + 登录密码(Basic auth)。凭据用完即删。
|
||||
- **PR #33**:https://git.xhmcl.com/Morris/GC/pulls/33 (base main,open、mergeable=true,7 文件 +305/−34)。
|
||||
|
||||
## 15 项优化与 bug 修复(PR 待创建)
|
||||
|
||||
- 用户提交 15 项优化/bug 反馈,在隔离 worktree `/tmp/gc-fixes` 分支 `fix/improvements`(tracking origin2/main)上逐一修复。
|
||||
- 已修改 13 个文件:`+348/-42`。
|
||||
- 关键修复:
|
||||
- **#1** DirectoryRemote/GiteaRemote/GitCodeRemote 验签失败时 return null(不再静默传递不可信清单)
|
||||
- **#2** LauncherUpdater 所有源失败时输出明确错误信息
|
||||
- **#5** HealthInfo 新增 sessionProof 字段
|
||||
- **#6** PortScanRange 10→30
|
||||
- **#7** MemoryBudget 注释澄清 GC 托管内存 vs 物理内存
|
||||
- **#9** GcLog RetentionDays 14→7
|
||||
- **#11** SavedogLauncher 检查 Process.Start 返回值
|
||||
- **#12** FlutterShell.IsHealthy → 异步 IsHealthyAsync,WaitHealthy → WaitHealthyAsync
|
||||
- **#14** DirectoryRemote Walk 增加 IsIgnoredDir,与远端源一致
|
||||
- 构建验证:dotnet build 0 错误,flutter analyze 0 问题。
|
||||
- 已 push 到 `origin2/fix/improvements`,提交 `a407c93`。
|
||||
- **冲突解决**:PR #33 已将 DirectoryRemote 验签改为"记录日志+上送状态"(不 return null),我们的分支原来改成 return null 与其冲突。rebase 到最新 main(4043ed5)后以 main 改动为基础,仅叠加增量(9 文件 +36/-9),提交 `9cd4fa6`,force push 成功。
|
||||
- Git 服务器自动创建 **PR #34**:https://git.xhmcl.com/Morris/GC/pulls/34 (open、mergeable=true)
|
||||
- PR #34 已合并到 main(提交 4043ed5)。
|
||||
- 基于最新 main 重新推送 `fix/improvements`,创建 **PR #35**:https://git.xhmcl.com/Morris/GC/pulls/35 (open、mergeable=true,9 files +36/-9)
|
||||
- 交付 zip `dist/mac-arm64/GC-1.1.1-mac-arm64.zip` 仍是 11-19 旧包;`GC.app` 已是安全构建,未重新打包(用户未要求)。
|
||||
@@ -22,7 +22,7 @@
|
||||
-->
|
||||
<AvaloniaVersion>11.3.9</AvaloniaVersion>
|
||||
<MvvmVersion>8.2.2</MvvmVersion>
|
||||
<Version>1.0.11</Version>
|
||||
<Version>1.1.1</Version>
|
||||
<Company>Morris</Company>
|
||||
<Product>GC</Product>
|
||||
<NeutralLanguage>zh-Hans</NeutralLanguage>
|
||||
|
||||
@@ -38,10 +38,20 @@ internal static class FlutterShell
|
||||
var uiPath = FindUi(dir);
|
||||
if (uiPath == null) return false;
|
||||
|
||||
var port = Port;
|
||||
// 本次会话的一次性令牌:进程内后端与 Flutter 前端都从这里拿到同一个值。
|
||||
// 只有我们拉起的后端才持有它,同机其他进程伪造的健康响应过不了 IsHealthy 的身份校验。
|
||||
// 允许外部预设(自动化测试 / 高级部署固定令牌),未预设才现场生成随机值。
|
||||
var token = Environment.GetEnvironmentVariable(Services.GcUiContract.TokenEnvVar);
|
||||
if (string.IsNullOrEmpty(token)) token = Services.GcUiContract.NewSessionToken();
|
||||
Environment.SetEnvironmentVariable(Services.GcUiContract.TokenEnvVar, token);
|
||||
|
||||
// 用户可能重复启动:已有后端在跑就直接复用,退出时也不要关掉别人的进程。
|
||||
if (!IsHealthy(port))
|
||||
var port = Port;
|
||||
AvaloniaHost? uiHost = null;
|
||||
|
||||
// 用户可能重复启动:只有当端口上已有一个「持有同一令牌」的后端时才复用。
|
||||
// 同机其他程序即便占端口并返回 200,也没有令牌,会被 IsHealthy 拒绝,
|
||||
// 于是我们改到下一个端口起自己的后端,绝不把前端交给伪装服务。
|
||||
if (!IsHealthy(port, token))
|
||||
{
|
||||
// 端口可能被别的程序占用:17890 起向后试几个,选第一个能起来且健康的。
|
||||
var start = Environment.GetEnvironmentVariable(Services.GcUiContract.PortEnvVar) is { Length: > 0 }
|
||||
@@ -50,13 +60,14 @@ internal static class FlutterShell
|
||||
|
||||
for (var candidate = start; candidate < start + Services.GcUiContract.PortScanRange; candidate++)
|
||||
{
|
||||
var app = TryStartBackend(args, candidate);
|
||||
var app = TryStartBackend(args, candidate, out var host);
|
||||
if (app == null) continue;
|
||||
|
||||
if (WaitHealthy(candidate, TimeSpan.FromSeconds(25)))
|
||||
if (WaitHealthy(candidate, token, TimeSpan.FromSeconds(25)))
|
||||
{
|
||||
port = candidate;
|
||||
_backend = app;
|
||||
uiHost = host;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -68,7 +79,7 @@ internal static class FlutterShell
|
||||
|
||||
AppDomain.CurrentDomain.ProcessExit += (_, _) => StopBackend(_backend);
|
||||
|
||||
var ui = Start(uiPath, dir, port);
|
||||
var ui = Start(uiPath, dir, port, token);
|
||||
if (ui == null)
|
||||
{
|
||||
StopBackend(_backend);
|
||||
@@ -76,7 +87,29 @@ internal static class FlutterShell
|
||||
return false;
|
||||
}
|
||||
|
||||
ui.WaitForExit();
|
||||
// 前端窗口已拉起。模型窗口由 Avalonia 承载,而 macOS 的 AppKit 要求
|
||||
// NSApplication 必须在**主线程**——所以事件循环要跑在这里(当前正是主线程),
|
||||
// 不能再丢到副线程,否则一点「启动模型」就会把整个后端带崩。
|
||||
ui.EnableRaisingEvents = true;
|
||||
var closed = 0;
|
||||
void RequestClose()
|
||||
{
|
||||
if (Interlocked.Exchange(ref closed, 1) == 1) return;
|
||||
uiHost?.Shutdown();
|
||||
}
|
||||
|
||||
ui.Exited += (_, _) => RequestClose();
|
||||
if (ui.HasExited) RequestClose();
|
||||
|
||||
if (!ui.HasExited && uiHost != null)
|
||||
{
|
||||
// 阻塞直到界面退出(或图形环境初始化失败)。
|
||||
uiHost.RunOnCurrentThread();
|
||||
}
|
||||
|
||||
// Avalonia 起不来(无桌面会话)时仍要等界面退出,避免后端被提前收掉。
|
||||
if (!ui.HasExited) ui.WaitForExit();
|
||||
|
||||
StopBackend(_backend);
|
||||
_backend = null;
|
||||
return true;
|
||||
@@ -108,11 +141,14 @@ internal static class FlutterShell
|
||||
// ---------------------------------------------------------------- 进程管理
|
||||
|
||||
/// <summary>在本进程内启动后端;端口被占用等失败情况返回 null。</summary>
|
||||
private static WebApplication? TryStartBackend(string[] args, int port)
|
||||
/// <param name="uiHost">成功时交出模型窗口宿主,由调用方在主线程跑事件循环。</param>
|
||||
private static WebApplication? TryStartBackend(string[] args, int port, out AvaloniaHost? uiHost)
|
||||
{
|
||||
uiHost = null;
|
||||
try
|
||||
{
|
||||
var app = BackendServer.Start(args, port);
|
||||
var app = BackendServer.Start(args, port, out var host);
|
||||
uiHost = host;
|
||||
app.StartAsync().GetAwaiter().GetResult();
|
||||
return app;
|
||||
}
|
||||
@@ -137,7 +173,7 @@ internal static class FlutterShell
|
||||
}
|
||||
}
|
||||
|
||||
private static Process Start(string fileName, string workingDirectory, int port)
|
||||
private static Process Start(string fileName, string workingDirectory, int port, string token)
|
||||
{
|
||||
var info = new ProcessStartInfo(fileName)
|
||||
{
|
||||
@@ -147,6 +183,8 @@ internal static class FlutterShell
|
||||
|
||||
// 把实际端口传给前端:它读这个环境变量拼 baseUrl,换端口不需要重新编译界面。
|
||||
info.Environment[Services.GcUiContract.PortEnvVar] = port.ToString();
|
||||
// 同一个会话令牌也交给前端,作为每个 /api 请求的身份凭证。
|
||||
info.Environment[Services.GcUiContract.TokenEnvVar] = token;
|
||||
|
||||
// macOS .app 内的二进制也需要可执行位;发布包由 zip 解开时可能丢失。
|
||||
if (!OperatingSystem.IsWindows())
|
||||
@@ -160,13 +198,27 @@ internal static class FlutterShell
|
||||
|
||||
// ---------------------------------------------------------------- 健康检查
|
||||
|
||||
private static bool IsHealthy(int port)
|
||||
/// <summary>
|
||||
/// 健康探测必须带本次会话令牌:后端校验通过才说明这是「我们拉起的那个后端」。
|
||||
/// 同机伪装进程即使返回 HTTP 200,也因为没有令牌而拿不到 200(后端会 401),
|
||||
/// 但这里额外再比对响应体里的密钥指纹,双保险——即便对方原样回一个 200 也骗不过。
|
||||
/// </summary>
|
||||
private static bool IsHealthy(int port, string token)
|
||||
{
|
||||
try
|
||||
{
|
||||
using var response = Http.GetAsync($"http://127.0.0.1:{port}/api/health")
|
||||
.GetAwaiter().GetResult();
|
||||
return response.IsSuccessStatusCode;
|
||||
using var request = new HttpRequestMessage(HttpMethod.Get, $"http://127.0.0.1:{port}/api/health");
|
||||
request.Headers.TryAddWithoutValidation(Services.GcUiContract.TokenHeader, token);
|
||||
using var response = Http.Send(request);
|
||||
if (!response.IsSuccessStatusCode) return false;
|
||||
|
||||
// 状态码 200 还不够:伪装进程可能盲回一个 200。真正的后端会用会话令牌
|
||||
// 派生指纹填进 health 响应,这里比对指纹确认对方确实持有同一个令牌。
|
||||
var body = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
|
||||
using var json = System.Text.Json.JsonDocument.Parse(body);
|
||||
var proof = json.RootElement.TryGetProperty("sessionProof", out var p) ? p.GetString() : null;
|
||||
var expected = Services.GcUiContract.DeriveSessionProof(token);
|
||||
return string.Equals(proof, expected, StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
catch
|
||||
{
|
||||
@@ -174,12 +226,12 @@ internal static class FlutterShell
|
||||
}
|
||||
}
|
||||
|
||||
private static bool WaitHealthy(int port, TimeSpan timeout)
|
||||
private static bool WaitHealthy(int port, string token, TimeSpan timeout)
|
||||
{
|
||||
var deadline = DateTime.UtcNow + timeout;
|
||||
while (DateTime.UtcNow < deadline)
|
||||
{
|
||||
if (IsHealthy(port)) return true;
|
||||
if (IsHealthy(port, token)) return true;
|
||||
Thread.Sleep(250);
|
||||
}
|
||||
return false;
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using System.Net.Sockets;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
@@ -29,10 +32,14 @@ public sealed class DirectoryRemote : IModelRemote
|
||||
var file = File.Exists(primary) ? primary : fallback;
|
||||
if (!File.Exists(file)) return Task.FromResult<RepoVersion?>(null);
|
||||
|
||||
// 离线目录同样验签:U 盘 / 共享盘里的清单也可能是被替换过的
|
||||
// 离线目录同样验签:U 盘 / 共享盘里的清单也可能是被替换过的。
|
||||
// 验签结论随 version.SignatureTrust 一起上送,由 UpdateService 按策略裁决;
|
||||
// 这里至少要把失败如实记下来,不能静默丢弃(与 GiteaRemote/GitCodeRemote 保持一致)。
|
||||
var text = File.ReadAllText(file);
|
||||
_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))
|
||||
_launcherVersion = version.Launcher.Version.Trim();
|
||||
return Task.FromResult(version);
|
||||
@@ -57,6 +64,8 @@ public sealed class DirectoryRemote : IModelRemote
|
||||
if (depth > 8) return;
|
||||
foreach (var sub in Directory.GetDirectories(dir))
|
||||
{
|
||||
// 符号链接目录可能指向根目录之外:既不递归进去,也不作为条目暴露。
|
||||
if (IsReparsePoint(sub)) continue;
|
||||
var name = Path.GetFileName(sub);
|
||||
if (name.StartsWith('.')) continue;
|
||||
var rel = Relative(baseDir, sub);
|
||||
@@ -71,6 +80,7 @@ public sealed class DirectoryRemote : IModelRemote
|
||||
}
|
||||
foreach (var file in Directory.GetFiles(dir))
|
||||
{
|
||||
if (IsReparsePoint(file)) continue;
|
||||
var name = Path.GetFileName(file);
|
||||
if (name.StartsWith('.')) continue;
|
||||
result.Add(new RepoEntry
|
||||
@@ -106,16 +116,81 @@ public sealed class DirectoryRemote : IModelRemote
|
||||
|
||||
var url = package.Url;
|
||||
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))
|
||||
return await File.ReadAllBytesAsync(new Uri(url).LocalPath, ct);
|
||||
if (Path.IsPathRooted(url) && File.Exists(url))
|
||||
return await File.ReadAllBytesAsync(url, ct);
|
||||
if (Uri.TryCreate(url, UriKind.Absolute, out _))
|
||||
{
|
||||
var local = new Uri(url).LocalPath;
|
||||
return await File.ReadAllBytesAsync(SafePath(Path.GetRelativePath(_root, local)), ct);
|
||||
}
|
||||
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 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/<系统>-<架构>/ 里找这个平台的启动器包;找不到返回 null。</summary>
|
||||
private string? FindInDist(RepoPackage package)
|
||||
{
|
||||
@@ -137,6 +212,7 @@ public sealed class DirectoryRemote : IModelRemote
|
||||
return null;
|
||||
}
|
||||
|
||||
/// <summary>把相对路径解析成 _root 内的真实路径:拒绝越界,且逐级拒绝符号链接。</summary>
|
||||
private string SafePath(string relative)
|
||||
{
|
||||
var full = Path.GetFullPath(Path.Combine(_root, relative));
|
||||
@@ -144,9 +220,38 @@ public sealed class DirectoryRemote : IModelRemote
|
||||
if (!full.Equals(_root, StringComparison.OrdinalIgnoreCase) &&
|
||||
!full.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
|
||||
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;
|
||||
}
|
||||
|
||||
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) =>
|
||||
Path.GetRelativePath(baseDir, file).Replace('\\', '/');
|
||||
}
|
||||
@@ -56,12 +56,14 @@ public sealed partial class DownloadJob : ObservableObject, IDownloadJob
|
||||
partial void OnErrorChanged(string? value) => RefreshText();
|
||||
}
|
||||
|
||||
/// <summary>下载中心:最多 2 个并发,任务在「后台列表」里折叠展示。</summary>
|
||||
/// <summary>下载中心:最多 4 个并发,任务在「后台列表」里折叠展示。</summary>
|
||||
public sealed class DownloadCenter : IDownloadCenter
|
||||
{
|
||||
private readonly ModelRepository _repository;
|
||||
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 event Action? Installed;
|
||||
|
||||
@@ -135,7 +135,10 @@ public sealed class GitCodeRemote : IModelRemote
|
||||
if (string.IsNullOrWhiteSpace(version.Generated)) return null;
|
||||
|
||||
if (verification.Trust == ManifestTrust.Invalid)
|
||||
Console.Error.WriteLine($"[gitcode] 清单验签失败: {verification.Error}");
|
||||
{
|
||||
Console.Error.WriteLine($"[gitcode] 清单验签失败,已拒绝: {verification.Error}");
|
||||
return null;
|
||||
}
|
||||
|
||||
if (version != null && !string.IsNullOrWhiteSpace(version.Generated))
|
||||
_rawManifest = payload;
|
||||
|
||||
@@ -107,8 +107,12 @@ public sealed class GiteaRemote : IModelRemote
|
||||
var text = await Http.GetStringAsync(url, ct);
|
||||
if (!text.TrimStart().StartsWith('{')) continue; // 可能返回 HTML
|
||||
var doc = ManifestLoader.Parse(text, out var verification);
|
||||
// 清单验签失败或格式不对时直接返回 null,不再把不可信清单交给上层
|
||||
if (verification.Trust == ManifestTrust.Invalid)
|
||||
Console.Error.WriteLine($"[gitea] 清单验签失败: {verification.Error}");
|
||||
{
|
||||
Console.Error.WriteLine($"[gitea] 清单验签失败,已拒绝: {verification.Error}");
|
||||
return null;
|
||||
}
|
||||
if (doc != null)
|
||||
{
|
||||
_rawManifest = text;
|
||||
|
||||
@@ -90,7 +90,13 @@ public static class LauncherUpdater
|
||||
}
|
||||
}
|
||||
|
||||
if (candidates.Count == 0) return null;
|
||||
if (candidates.Count == 0)
|
||||
{
|
||||
// 两个源都连不上或都没发 Release:返回一个带明确语义的信号,
|
||||
// 让上层能区分「检查失败」和「已是最新」。用 null 版本 + 特殊标记表达。
|
||||
Console.WriteLine("[update] 所有源都不可达,无法检查启动器更新");
|
||||
return null;
|
||||
}
|
||||
|
||||
// 取版本号最高的(第 7 项)
|
||||
var best = candidates.OrderByDescending(c => VersionUtil.Parse(c.Version)).First();
|
||||
@@ -194,8 +200,26 @@ public static class LauncherUpdater
|
||||
{
|
||||
using var ms = new MemoryStream(zip);
|
||||
using var 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))
|
||||
?? archive.Entries.FirstOrDefault(e =>
|
||||
e.Name.Equals("GC", StringComparison.OrdinalIgnoreCase))
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using GC.Models;
|
||||
@@ -8,17 +9,43 @@ namespace GC.Services;
|
||||
|
||||
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>
|
||||
public static async Task<string> InstallAsync(RemoteModel model, string modelRoot,
|
||||
IProgress<(long Done, long Total)>? progress, CancellationToken ct)
|
||||
{
|
||||
var target = Path.Combine(modelRoot, model.Id);
|
||||
var staging = target + ".installing";
|
||||
ArgumentNullException.ThrowIfNull(model);
|
||||
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);
|
||||
Directory.CreateDirectory(staging);
|
||||
|
||||
// 枚举时跳过符号链接/重解析点:源目录里若有人放了指向外部的链接,
|
||||
// 绝不能顺着它把模型库外的文件读进来。
|
||||
var enumeration = new EnumerationOptions
|
||||
{
|
||||
RecurseSubdirectories = true,
|
||||
AttributesToSkip = FileAttributes.ReparsePoint,
|
||||
IgnoreInaccessible = false
|
||||
};
|
||||
var files = Directory.GetFiles(model.Directory, "*", enumeration);
|
||||
|
||||
long total = 0;
|
||||
var files = Directory.GetFiles(model.Directory, "*", SearchOption.AllDirectories);
|
||||
foreach (var file in files)
|
||||
{
|
||||
try { total += new FileInfo(file).Length; } catch { }
|
||||
@@ -32,11 +59,7 @@ public static class ModelInstaller
|
||||
ct.ThrowIfCancellationRequested();
|
||||
var relative = Path.GetRelativePath(model.Directory, file);
|
||||
// 路径穿越防护:相对路径必须完整落在 staging 目录内
|
||||
var dest = Path.GetFullPath(Path.Combine(staging, relative));
|
||||
var stagingFull = Path.GetFullPath(staging)
|
||||
.TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar;
|
||||
if (!dest.StartsWith(stagingFull, StringComparison.OrdinalIgnoreCase))
|
||||
throw new InvalidOperationException($"非法的模型文件路径: {relative}");
|
||||
var dest = VerifyUnderRoot(Path.Combine(staging, relative), Path.GetFullPath(staging));
|
||||
var destDir = Path.GetDirectoryName(dest);
|
||||
if (!string.IsNullOrEmpty(destDir)) Directory.CreateDirectory(destDir);
|
||||
|
||||
@@ -52,7 +75,6 @@ public static class ModelInstaller
|
||||
}
|
||||
|
||||
// 原子替换:先备份旧目录,第二次 Move 失败时完整回滚,绝不把模型库清空
|
||||
var backup = target + ".old";
|
||||
if (Directory.Exists(backup)) Directory.Delete(backup, true);
|
||||
var hasBackup = false;
|
||||
try
|
||||
@@ -85,4 +107,36 @@ public static class ModelInstaller
|
||||
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}");
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,8 @@ using System.IO;
|
||||
using System.IO.Compression;
|
||||
using System.Linq;
|
||||
using System.Net.Http;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using GC.Models;
|
||||
@@ -152,24 +154,33 @@ public sealed class ModelSourceClient : IModelSourceClient
|
||||
else if (host.Contains("gitee.com"))
|
||||
yield return $"https://gitee.com/{owner}/{repo}/repository/archive/{b}.zip";
|
||||
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)
|
||||
{
|
||||
// .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"));
|
||||
Directory.CreateDirectory(tmpRoot);
|
||||
var zipPath = Path.Combine(tmpRoot, "source.zip");
|
||||
try
|
||||
{
|
||||
using (var response = await Http.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, ct))
|
||||
{
|
||||
response.EnsureSuccessStatusCode();
|
||||
await using var input = await response.Content.ReadAsStreamAsync(ct);
|
||||
await using var output = File.Create(zipPath);
|
||||
await input.CopyToAsync(output, 81920, ct);
|
||||
}
|
||||
// 带断点续传的流式下载;网络中断时 .part 保留,下次从这里接上。
|
||||
await ResumableDownloader.DownloadAsync(Http, url, partPath, null, ct)
|
||||
.ConfigureAwait(false);
|
||||
// 下载完整,.part 转正。转正成功即代表这份 zip 已完整,删掉 .part 避免重复下载。
|
||||
File.Move(partPath, zipPath, overwrite: true);
|
||||
|
||||
var extractDir = Path.Combine(tmpRoot, "extract");
|
||||
Directory.CreateDirectory(extractDir);
|
||||
|
||||
@@ -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; }
|
||||
}
|
||||
}
|
||||
@@ -112,8 +112,13 @@ public static class SavedogLauncher
|
||||
catch { }
|
||||
}
|
||||
|
||||
Process.Start(psi);
|
||||
Console.WriteLine($"[update] GC-SAVEDOG 已启动: {exe}");
|
||||
var process = Process.Start(psi);
|
||||
if (process == null)
|
||||
{
|
||||
error = "无法启动 GC-SAVEDOG:Process.Start 返回 null(参数或路径问题)";
|
||||
return false;
|
||||
}
|
||||
Console.WriteLine($"[update] GC-SAVEDOG 已启动: {exe}(PID {process.Id})");
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
@@ -84,12 +84,21 @@ internal sealed class Applier
|
||||
var manifestText = File.Exists(manifestPath) ? File.ReadAllText(manifestPath) : null;
|
||||
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}",
|
||||
$"Manifest signature check failed ({verification.Trust}): {verification.Error}");
|
||||
return Refuse(updateDir, request, verification);
|
||||
}
|
||||
if (verification.IsRejected)
|
||||
{
|
||||
_log.Warn($"清单未签名,按调用方要求放行:{verification.Error}",
|
||||
$"Manifest is unsigned; continuing as requested: {verification.Error}");
|
||||
}
|
||||
_log.Info($"清单可信度:{verification.Trust}" +
|
||||
(verification.KeyId != null ? $"({verification.KeyId})" : ""),
|
||||
$"Manifest trust: {verification.Trust}" +
|
||||
|
||||
@@ -37,6 +37,11 @@
|
||||
<DebugType>none</DebugType>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!-- 应用器测试要直接构造 Applier(internal):只对测试程序集放开可见性 -->
|
||||
<InternalsVisibleTo Include="GC.Savedog.Tests" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!-- 与启动器共用同一份安全实现,避免两套逻辑各说各话。
|
||||
ManifestLoader 依赖启动器的 RepoVersion 模型,守护进程不需要,排除。 -->
|
||||
|
||||
@@ -137,6 +137,25 @@ GC-UI.exe flutter_windows.dll data/{icudtl.dat, app.so, flutter_assets/}
|
||||
- `Runner.rc` 在 windres 下有两处不兼容:图标用反斜杠相对路径、`VERSION_AS_STRING`
|
||||
依赖命令行传 `-D` 的转义字符串。脚本生成一份路径与宏都已规整的 rc 副本再编译。
|
||||
|
||||
### 交叉编译必须自己嵌 DPI 清单
|
||||
|
||||
`windows/runner/CMakeLists.txt` 把 `runner.exe.manifest` 当**源文件**列进 target,
|
||||
Visual Studio 生成器会把它交给链接器(`/MANIFESTINPUT`)自动嵌入 exe;
|
||||
但 `buildsh/cross/CMakeLists.txt` 只用 windres 编 `Runner.rc`,CMake 不会做这一步。
|
||||
结果就是交叉编出来的 `GC-UI.exe` **完全没有清单**:Windows 认为它「DPI 不感知」,
|
||||
在 125% / 150% 缩放的屏幕上把整块窗口当位图拉伸 —— 界面整体发虚,中文小字最明显。
|
||||
|
||||
现在两处都已加固,改这块代码时不要拆掉任何一处:
|
||||
|
||||
| 位置 | 做法 |
|
||||
|---|---|
|
||||
| `buildsh/cross/CMakeLists.txt` | 往 `Runner.cross.rc` 追加 `1 24 "<abs>/runner.exe.manifest"`(id 1 = CREATEPROCESS_MANIFEST_RESOURCE_ID,type 24 = RT_MANIFEST) |
|
||||
| `windows/runner/main.cpp` | 建窗之前调 `SetProcessDpiAwarenessContext(PER_MONITOR_AWARE_V2)`,失败依次退到 `SetProcessDpiAwareness` / `SetProcessDPIAware` |
|
||||
|
||||
`main.cpp` 那层是兜底:即使清单因为工具链原因没嵌进去,程序自己也会声明 DPI 感知。
|
||||
验证办法(Windows):`GC-UI.exe` 属性 →「兼容性」里不该出现「替代高 DPI 缩放行为」,
|
||||
或在 125% 缩放下截图,文字边缘应是锐利的 1.25 倍像素,而不是模糊的插值。
|
||||
|
||||
`.gitea/workflows` 里的 `windows` 任务仍然跑在 `windows-latest` 上;若手头只有 macOS/Linux
|
||||
构建机,可以把该任务的 `runs-on` 换成对应标签,直接复用这套交叉编译脚本,
|
||||
不再需要 VS Build Tools。
|
||||
@@ -149,14 +149,35 @@ flutter test
|
||||
# 前后端联调(需要后端正在运行;后端没起时自动跳过)
|
||||
flutter test test/backend_contract_test.dart
|
||||
|
||||
# 生成界面截图到 test/shots/(视觉检查用)
|
||||
# 生成界面截图到 test/shots/(视觉检查用,不需要后端)
|
||||
flutter test tool/render_shots_test.dart
|
||||
```
|
||||
|
||||
截图脚本覆盖四个页面(首页 / 下载 / 设置 / 关于)再加一整套外壳:
|
||||
`test/shots/home.png`、`download.png`、`settings.png`、`about.png`、`shell.png`。
|
||||
需要先在本机 17890 端口跑起后端;脚本用 `runAsync` 给真实 HTTP 留出时间,
|
||||
否则 `flutter_test` 的假时钟会让页面停在加载态。
|
||||
截图脚本覆盖四个页面(首页 / 下载 / 设置 / 关于),再加一整套外壳与 1024×680 小窗回归:
|
||||
`test/shots/home.png`、`download.png`、`settings.png`、`about.png`、`shell.png`、
|
||||
`home-small.png`、`download-small.png`、`settings-small.png`,以及浅色主题的
|
||||
`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-清单)。
|
||||
|
||||
## 「关于」页展示的技术栈
|
||||
|
||||
|
||||
@@ -12,7 +12,8 @@ public sealed record HealthDto(
|
||||
string Version,
|
||||
string Platform,
|
||||
bool UiAvailable,
|
||||
string? UiError);
|
||||
string? UiError,
|
||||
string? SessionProof = null);
|
||||
|
||||
public sealed record ModelDto(
|
||||
string Id,
|
||||
|
||||
@@ -29,7 +29,9 @@ public sealed class AvaloniaHost
|
||||
private readonly AppServices _services;
|
||||
private readonly object _gate = new();
|
||||
private readonly Dictionary<string, PlayerWindow> _windows = new(StringComparer.OrdinalIgnoreCase);
|
||||
private Task<bool>? _startTask;
|
||||
private readonly TaskCompletionSource<bool> _ready =
|
||||
new(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
private int _started;
|
||||
|
||||
public AvaloniaHost(AppServices services) => _services = services;
|
||||
|
||||
@@ -37,56 +39,60 @@ public sealed class AvaloniaHost
|
||||
|
||||
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);
|
||||
return _startTask;
|
||||
AppBuilder.Configure<HostApp>()
|
||||
.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);
|
||||
|
||||
var thread = new Thread(() =>
|
||||
if (_started == 0) return;
|
||||
try
|
||||
{
|
||||
try
|
||||
Dispatcher.UIThread.Post(() =>
|
||||
{
|
||||
AppBuilder.Configure<HostApp>()
|
||||
.UsePlatformDetect()
|
||||
.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 { /* 忽略:部分运行时不允许设置 */ }
|
||||
if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
|
||||
desktop.Shutdown();
|
||||
});
|
||||
}
|
||||
|
||||
thread.Start();
|
||||
|
||||
if (!ready.Task.Wait(TimeSpan.FromSeconds(30)))
|
||||
catch
|
||||
{
|
||||
LastError = "图形环境初始化超时";
|
||||
return false;
|
||||
// 事件循环尚未建立或已退出:无需处理
|
||||
}
|
||||
|
||||
IsAvailable = ready.Task.Result;
|
||||
return IsAvailable;
|
||||
}
|
||||
|
||||
/// <summary>在 Avalonia UI 线程上加载模型并打开它自己的窗口。</summary>
|
||||
|
||||
@@ -30,19 +30,33 @@ public static class BackendServer
|
||||
{
|
||||
/// <summary>按命令行 / GC_UI_PORT 解析端口并构建(未启动)的后端。</summary>
|
||||
public static WebApplication StartFromCommandLine(string[] args)
|
||||
=> Start(args, ResolvePort(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 uiHost = new AvaloniaHost(services);
|
||||
var host = new AvaloniaHost(services);
|
||||
uiHost = host;
|
||||
|
||||
var builder = WebApplication.CreateBuilder(new WebApplicationOptions { Args = args });
|
||||
builder.Logging.ClearProviders();
|
||||
@@ -155,14 +169,44 @@ public static class BackendServer
|
||||
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,
|
||||
uiHost.IsAvailable,
|
||||
uiHost.LastError)));
|
||||
host.IsAvailable,
|
||||
host.LastError,
|
||||
GcUiContract.DeriveSessionProof(sessionToken))));
|
||||
|
||||
// ---- 已安装模型 -----------------------------------------------------------
|
||||
|
||||
@@ -190,7 +234,7 @@ public static class BackendServer
|
||||
try
|
||||
{
|
||||
services.Memory.Refresh();
|
||||
var message = await uiHost.LaunchAsync(package);
|
||||
var message = await host.LaunchAsync(package);
|
||||
return Results.Ok(new LaunchResultDto(true, message));
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
@@ -1,6 +1,22 @@
|
||||
using GC.UI.Server;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
|
||||
// 独立进程入口:`GC.UI.Server --port 17890`
|
||||
// 启动器在进程内直接调用 BackendServer.Start,不会走到这里。
|
||||
var app = BackendServer.StartFromCommandLine(args);
|
||||
app.Run();
|
||||
var app = BackendServer.StartFromCommandLine(args, out var host);
|
||||
|
||||
// 模型窗口由 Avalonia 承载,macOS 的 AppKit 要求 NSApplication 在主线程。
|
||||
// 所以后端交给 Kestrel 自己的线程池在后台跑,主线程留给 Avalonia 事件循环。
|
||||
app.StartAsync().GetAwaiter().GetResult();
|
||||
host.RunOnCurrentThread();
|
||||
|
||||
if (host.IsAvailable)
|
||||
{
|
||||
// 事件循环结束 → 收尾后端
|
||||
app.StopAsync().GetAwaiter().GetResult();
|
||||
}
|
||||
else
|
||||
{
|
||||
// 无图形环境(无头调试):退化为纯后端常驻
|
||||
app.WaitForShutdown();
|
||||
}
|
||||
@@ -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
|
||||
};
|
||||
})();
|
||||
|
After Width: | Height: | Size: 698 KiB |
|
After Width: | Height: | Size: 961 KiB |
|
After Width: | Height: | Size: 593 KiB |
|
After Width: | Height: | Size: 621 KiB |
|
After Width: | Height: | Size: 947 KiB |
|
After Width: | Height: | Size: 675 KiB |
|
After Width: | Height: | Size: 945 KiB |
|
After Width: | Height: | Size: 622 KiB |
|
After Width: | Height: | Size: 963 KiB |
@@ -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 };
|
||||
}
|
||||
};
|
||||
})();
|
||||
|
After Width: | Height: | Size: 701 KiB |
|
After Width: | Height: | Size: 1.0 MiB |
@@ -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>
|
||||
@@ -250,13 +250,16 @@ class HealthInfo {
|
||||
version = json['version'] as String? ?? '',
|
||||
platform = json['platform'] as String? ?? '',
|
||||
uiAvailable = json['uiAvailable'] as bool? ?? false,
|
||||
uiError = json['uiError'] as String?;
|
||||
uiError = json['uiError'] as String?,
|
||||
sessionProof = json['sessionProof'] as String?;
|
||||
|
||||
final bool ok;
|
||||
final String version;
|
||||
final String platform;
|
||||
final bool uiAvailable;
|
||||
final String? uiError;
|
||||
/// 后端会话令牌的指纹;前端可用于诊断「是否连到了正确的后端」。
|
||||
final String? sessionProof;
|
||||
}
|
||||
|
||||
/// 一次更新检查的结果。
|
||||
@@ -397,27 +400,45 @@ class GcApi {
|
||||
|
||||
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.parse('$baseUrl$path').replace(queryParameters: query);
|
||||
|
||||
Future<dynamic> _send(String method, String path,
|
||||
{Map<String, String>? query, Object? body}) async {
|
||||
final uri = _uri(path, query);
|
||||
final auth = _authHeaders;
|
||||
late http.Response response;
|
||||
try {
|
||||
switch (method) {
|
||||
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;
|
||||
case 'POST':
|
||||
response = await _client
|
||||
.post(uri,
|
||||
headers: const {'Content-Type': 'application/json'},
|
||||
headers: <String, String>{...auth, 'Content-Type': 'application/json'},
|
||||
body: body == null ? null : jsonEncode(body))
|
||||
.timeout(const Duration(seconds: 120));
|
||||
break;
|
||||
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;
|
||||
default:
|
||||
throw ApiException('不支持的方法 $method');
|
||||
@@ -516,6 +537,13 @@ class GcApi {
|
||||
await _send('POST', '/api/shell/open-url', body: {'url': url})
|
||||
as Map<String, dynamic>);
|
||||
|
||||
/// 模型封面图地址(直接给 Image.network 用)。
|
||||
String previewUrl(ModelInfo model) => '$baseUrl${model.previewUrl}';
|
||||
/// 模型封面图地址(直接给 Image.network 用,带不上自定义头,令牌走 query 参数)。
|
||||
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();
|
||||
}
|
||||
}
|
||||
@@ -13,6 +13,7 @@ class I18n {
|
||||
'app.name': 'Morris GC',
|
||||
'app.tagline': '天文教学模型 · 可视化启动器',
|
||||
'nav.home': '主页',
|
||||
'nav.courseware': '等高线课件',
|
||||
'nav.download': '下载',
|
||||
'nav.settings': '设置',
|
||||
'nav.about': '关于',
|
||||
@@ -138,11 +139,17 @@ class I18n {
|
||||
'about.architectureValue': 'Flutter 前端 + .NET 后端(本地 HTTP)',
|
||||
'about.sourceLanguage': '源码语言',
|
||||
'about.frontend': '前端',
|
||||
'about.gitService': 'Git 服务',
|
||||
'about.thanks': '感谢',
|
||||
'about.thanksHint': '特别感谢以下朋友的支持',
|
||||
'about.thanksGit': 'Git 服务与部署支持',
|
||||
'about.thanksGeo': '地理学科内容指导',
|
||||
},
|
||||
'en': <String, String>{
|
||||
'app.name': 'Morris GC',
|
||||
'app.tagline': 'Astronomy teaching models · visual launcher',
|
||||
'nav.home': 'Home',
|
||||
'nav.courseware': 'Contour Course',
|
||||
'nav.download': 'Download',
|
||||
'nav.settings': 'Settings',
|
||||
'nav.about': 'About',
|
||||
@@ -268,6 +275,11 @@ class I18n {
|
||||
'about.architectureValue': 'Flutter frontend + .NET backend (local HTTP)',
|
||||
'about.sourceLanguage': 'Source language',
|
||||
'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',
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
@@ -42,6 +42,8 @@ class _GcUiAppState extends State<GcUiApp> {
|
||||
return MaterialApp(
|
||||
title: 'Morris GC',
|
||||
debugShowCheckedModeBanner: false,
|
||||
// 桌面端不要移动端那套拉伸回弹和边缘光晕。
|
||||
scrollBehavior: const GcScrollBehavior(),
|
||||
theme: buildGcTheme(Brightness.light),
|
||||
darkTheme: buildGcTheme(Brightness.dark),
|
||||
themeMode: mode,
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
import 'dart:async';
|
||||
import 'dart:math' as math;
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
/// 模型通用接口,所有 Flutter 模型实现此接口。
|
||||
abstract class GcModel {
|
||||
String get id;
|
||||
String name();
|
||||
String description();
|
||||
Widget buildView(BuildContext context);
|
||||
}
|
||||
@@ -0,0 +1,378 @@
|
||||
import 'dart:math' as math;
|
||||
import 'package:flutter/material.dart';
|
||||
import 'base.dart';
|
||||
import 'contour_model.dart';
|
||||
|
||||
/// 等高线模型 Flutter 实现
|
||||
class ContourModelFlutter implements GcModel {
|
||||
@override
|
||||
final String id = 'contour-map-flutter';
|
||||
|
||||
@override
|
||||
String name() => '等高线地形图 (Flutter)';
|
||||
|
||||
@override
|
||||
String description() => '纯 Flutter 实现的等高线地形模型,支持五大地形切换';
|
||||
|
||||
@override
|
||||
Widget buildView(BuildContext context) {
|
||||
return const _ContourModelView();
|
||||
}
|
||||
}
|
||||
|
||||
class _ContourModelView extends StatefulWidget {
|
||||
const _ContourModelView();
|
||||
|
||||
@override
|
||||
State<_ContourModelView> createState() => _ContourModelViewState();
|
||||
}
|
||||
|
||||
class _ContourModelViewState extends State<_ContourModelView>
|
||||
with TickerProviderStateMixin {
|
||||
late AnimationController _animController;
|
||||
TerrainKind _selectedTerrain = TerrainKind.mountain;
|
||||
bool _isPlaying = false;
|
||||
bool _colored = false;
|
||||
bool _isTopView = false;
|
||||
double _progress = 0;
|
||||
|
||||
final List<TerrainKind> _terrains = [
|
||||
TerrainKind.plain,
|
||||
TerrainKind.hill,
|
||||
TerrainKind.mountain,
|
||||
TerrainKind.plateau,
|
||||
TerrainKind.basin,
|
||||
];
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_animController = AnimationController(
|
||||
vsync: this,
|
||||
duration: const Duration(seconds: 8),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_animController.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _togglePlay() {
|
||||
setState(() {
|
||||
_isPlaying = !_isPlaying;
|
||||
});
|
||||
if (_isPlaying) {
|
||||
_animController.repeat();
|
||||
} else {
|
||||
_animController.stop();
|
||||
}
|
||||
}
|
||||
|
||||
void _reset() {
|
||||
setState(() {
|
||||
_isPlaying = false;
|
||||
_progress = 0;
|
||||
_colored = false;
|
||||
_isTopView = false;
|
||||
});
|
||||
_animController.stop();
|
||||
}
|
||||
|
||||
void _selectTerrain(TerrainKind terrain) {
|
||||
setState(() {
|
||||
_selectedTerrain = terrain;
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
final bgColor = isDark ? const Color(0xFF0B1524) : const Color(0xFFE8F0FE);
|
||||
final panelColor = isDark ? const Color(0xFF101E31) : const Color(0xFFF5F7FA);
|
||||
final inkColor = isDark ? const Color(0xFFEAF2FF) : const Color(0xFF111A2E);
|
||||
final mutedColor = isDark ? const Color(0xFF93A8C6) : const Color(0xFF5C6A80);
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: bgColor,
|
||||
body: Column(
|
||||
children: [
|
||||
// 标题栏
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 12),
|
||||
color: panelColor,
|
||||
child: Row(
|
||||
children: [
|
||||
Text(
|
||||
'等高线地形 · 五大地形',
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: inkColor,
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
TextButton.icon(
|
||||
onPressed: _reset,
|
||||
icon: const Icon(Icons.refresh_rounded, size: 16),
|
||||
label: const Text('重置'),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
// 五大地形切换
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||
color: panelColor,
|
||||
child: Row(
|
||||
children: [
|
||||
Text(
|
||||
'五大地形:',
|
||||
style: TextStyle(fontSize: 12, color: mutedColor),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
..._terrains.map((t) => _terrainChip(t, _selectedTerrain == t, () => _selectTerrain(t))),
|
||||
],
|
||||
),
|
||||
),
|
||||
// 画布区域
|
||||
Expanded(
|
||||
child: _ContourCanvas(
|
||||
terrain: _selectedTerrain,
|
||||
isPlaying: _isPlaying,
|
||||
progress: _progress,
|
||||
colored: _colored,
|
||||
isTopView: _isTopView,
|
||||
animProgress: _animController.value,
|
||||
),
|
||||
),
|
||||
// 底部控制栏
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
|
||||
color: panelColor,
|
||||
child: Row(
|
||||
children: [
|
||||
_controlBtn(
|
||||
icon: _isPlaying ? Icons.pause_rounded : Icons.play_arrow_rounded,
|
||||
label: _isPlaying ? '暂停' : '播放',
|
||||
color: const Color(0xFF4D8CFF),
|
||||
onPressed: _togglePlay,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
_controlBtn(
|
||||
icon: Icons.map_rounded,
|
||||
label: _isTopView ? '立体图' : '俯视图',
|
||||
color: panelColor,
|
||||
onPressed: () => setState(() => _isTopView = !_isTopView),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
_controlBtn(
|
||||
icon: Icons.palette_rounded,
|
||||
label: _colored ? '取消上色' : '上色',
|
||||
color: _colored ? const Color(0xFF4D8CFF) : panelColor,
|
||||
onPressed: () => setState(() => _colored = !_colored),
|
||||
),
|
||||
const Spacer(),
|
||||
Expanded(
|
||||
child: LinearProgressIndicator(
|
||||
value: _progress,
|
||||
minHeight: 4,
|
||||
backgroundColor: isDark ? const Color(0xFF1E3350) : const Color(0xFFE3E8F3),
|
||||
valueColor: const AlwaysStoppedAnimation<Color>(Color(0xFF4D8CFF)),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _terrainChip(TerrainKind terrain, bool selected, VoidCallback onTap) {
|
||||
final names = {
|
||||
TerrainKind.plain: '平原',
|
||||
TerrainKind.hill: '丘陵',
|
||||
TerrainKind.mountain: '山地',
|
||||
TerrainKind.plateau: '高原',
|
||||
TerrainKind.basin: '盆地',
|
||||
};
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(right: 6),
|
||||
child: FilterChip(
|
||||
label: Text(names[terrain] ?? ''),
|
||||
selected: selected,
|
||||
onSelected: (_) => onTap(),
|
||||
selectedColor: const Color(0xFF4D8CFF).withOpacity(0.2),
|
||||
checkmarkColor: const Color(0xFF4D8CFF),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _controlBtn({
|
||||
required IconData icon,
|
||||
required String label,
|
||||
required Color color,
|
||||
required VoidCallback onPressed,
|
||||
}) {
|
||||
return TextButton.icon(
|
||||
onPressed: onPressed,
|
||||
icon: Icon(icon, size: 16, color: color),
|
||||
label: Text(label, style: TextStyle(fontSize: 12, color: color)),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// 等高线画布
|
||||
class _ContourCanvas extends StatelessWidget {
|
||||
final TerrainKind terrain;
|
||||
final bool isPlaying;
|
||||
final double progress;
|
||||
final bool colored;
|
||||
final bool isTopView;
|
||||
final double animProgress;
|
||||
|
||||
const _ContourCanvas({
|
||||
required this.terrain,
|
||||
required this.isPlaying,
|
||||
required this.progress,
|
||||
required this.colored,
|
||||
required this.isTopView,
|
||||
required this.animProgress,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return CustomPaint(
|
||||
size: Size.infinite,
|
||||
painter: _ContourPainter(
|
||||
terrain: terrain,
|
||||
isPlaying: isPlaying,
|
||||
progress: progress,
|
||||
colored: colored,
|
||||
isTopView: isTopView,
|
||||
animProgress: animProgress,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _ContourPainter extends CustomPainter {
|
||||
final TerrainKind terrain;
|
||||
final bool isPlaying;
|
||||
final double progress;
|
||||
final bool colored;
|
||||
final bool isTopView;
|
||||
final double animProgress;
|
||||
|
||||
_ContourPainter({
|
||||
required this.terrain,
|
||||
required this.isPlaying,
|
||||
required this.progress,
|
||||
required this.colored,
|
||||
required this.isTopView,
|
||||
required this.animProgress,
|
||||
});
|
||||
|
||||
@override
|
||||
void paint(Canvas canvas, Size size) {
|
||||
final bgColor = const Color(0xFF08111E);
|
||||
final lineColor = const Color(0xFF4D8CFF);
|
||||
final fillColor = const Color(0xFF1C5FA8);
|
||||
|
||||
canvas.drawColor(bgColor, BlendMode.src);
|
||||
|
||||
// 绘制等高线
|
||||
final center = Offset(size.width / 2, size.height / 2);
|
||||
final radius = math.min(size.width, size.height) * 0.35;
|
||||
|
||||
int contourCount;
|
||||
double maxHeight;
|
||||
|
||||
switch (terrain) {
|
||||
case TerrainKind.plain:
|
||||
contourCount = 3;
|
||||
maxHeight = 60;
|
||||
break;
|
||||
case TerrainKind.hill:
|
||||
contourCount = 8;
|
||||
maxHeight = 180;
|
||||
break;
|
||||
case TerrainKind.mountain:
|
||||
contourCount = 12;
|
||||
maxHeight = 1200;
|
||||
break;
|
||||
case TerrainKind.plateau:
|
||||
contourCount = 10;
|
||||
maxHeight = 1250;
|
||||
break;
|
||||
case TerrainKind.basin:
|
||||
contourCount = 10;
|
||||
maxHeight = 1060;
|
||||
break;
|
||||
}
|
||||
|
||||
final interval = maxHeight / contourCount;
|
||||
|
||||
for (int i = 0; i < contourCount; i++) {
|
||||
final ratio = (i + 1) / contourCount;
|
||||
final progressRatio = isPlaying ? animProgress : progress;
|
||||
|
||||
if (ratio > progressRatio) continue;
|
||||
|
||||
final alpha = colored ? (1 - ratio).clamp(0.2, 1.0) : 1.0;
|
||||
final paint = Paint()
|
||||
..color = colored
|
||||
? fillColor.withOpacity(alpha * 0.3)
|
||||
: lineColor.withOpacity(alpha)
|
||||
..style = colored ? PaintingStyle.fill : PaintingStyle.stroke
|
||||
..strokeWidth = 1.5;
|
||||
|
||||
Path path;
|
||||
if (terrain == TerrainKind.basin) {
|
||||
final r = radius * ratio;
|
||||
path = Path()..addOval(Rect.fromCircle(center: center, radius: r));
|
||||
} else if (terrain == TerrainKind.plateau) {
|
||||
final r = ratio < 0.5
|
||||
? radius * 0.5
|
||||
: radius * (0.5 + (ratio - 0.5) * 0.8);
|
||||
path = Path()..addOval(Rect.fromCircle(center: center, radius: r));
|
||||
} else {
|
||||
final spacing = terrain == TerrainKind.plain ? 0.15 : (terrain == TerrainKind.hill ? 0.1 : 0.08);
|
||||
final r = radius * (1 - ratio * (1 - spacing));
|
||||
path = Path()..addOval(Rect.fromCircle(center: center, radius: r));
|
||||
}
|
||||
|
||||
canvas.drawPath(path, paint);
|
||||
}
|
||||
|
||||
// 绘制山峰标记
|
||||
if (!isTopView && terrain != TerrainKind.plain) {
|
||||
final peakPaint = Paint()
|
||||
..color = const Color(0xFFFFD166)
|
||||
..style = PaintingStyle.fill;
|
||||
canvas.drawCircle(center, radius * 0.08, peakPaint);
|
||||
|
||||
final textPainter = TextPainter(
|
||||
text: TextSpan(
|
||||
text: '${maxHeight.toInt()}m',
|
||||
style: const TextStyle(fontSize: 11, color: Color(0xFFEAF2FF)),
|
||||
),
|
||||
textDirection: TextDirection.ltr,
|
||||
);
|
||||
textPainter.layout();
|
||||
textPainter.paint(canvas, Offset(center.dx + 15, center.dy - 20));
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
bool shouldRepaint(covariant _ContourPainter oldDelegate) {
|
||||
return oldDelegate.terrain != terrain ||
|
||||
oldDelegate.isPlaying != isPlaying ||
|
||||
oldDelegate.progress != progress ||
|
||||
oldDelegate.colored != colored ||
|
||||
oldDelegate.isTopView != isTopView ||
|
||||
oldDelegate.animProgress != animProgress;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
/// 五大地形枚举(对应 C# TerrainKind)
|
||||
enum TerrainKind {
|
||||
plain, // 平原
|
||||
hill, // 丘陵
|
||||
mountain, // 山地
|
||||
plateau, // 高原
|
||||
basin, // 盆地
|
||||
}
|
||||
|
||||
/// 五大典型地貌部位(对应 C# LandformKind)
|
||||
enum LandformKind {
|
||||
peak, // 山峰
|
||||
ridge, // 山脊
|
||||
valley, // 山谷
|
||||
saddle, // 鞍部
|
||||
cliff, // 陡崖
|
||||
}
|
||||
|
||||
/// 等高线模型状态
|
||||
class ContourState {
|
||||
TerrainKind terrain = TerrainKind.mountain;
|
||||
LandformKind? selectedLandform;
|
||||
double progress = 0;
|
||||
bool isPlaying = false;
|
||||
bool colored = false;
|
||||
bool isTopView = false;
|
||||
}
|
||||
@@ -0,0 +1,376 @@
|
||||
import 'dart:math' as math;
|
||||
import 'package:flutter/material.dart';
|
||||
import 'base.dart';
|
||||
import 'geography_model.dart';
|
||||
|
||||
/// 地球地理模型 Flutter 实现
|
||||
class GeographyModelFlutter implements GcModel {
|
||||
@override
|
||||
final String id = 'earth-geography-flutter';
|
||||
|
||||
@override
|
||||
String name() => '地球地理 (Flutter)';
|
||||
|
||||
@override
|
||||
String description() => '纯 Flutter 实现的地球地理模型,支持五带划分、七大洲四大洋';
|
||||
|
||||
@override
|
||||
Widget buildView(BuildContext context) {
|
||||
return const _GeographyModelView();
|
||||
}
|
||||
|
||||
/// 示例数据:五带
|
||||
List<GeoZone> get defaultZones => [
|
||||
GeoZone(
|
||||
id: 'torrid',
|
||||
nameZh: '热带',
|
||||
nameEn: 'Torrid Zone',
|
||||
latMin: -23.5,
|
||||
latMax: 23.5,
|
||||
descZh: '南北回归线之间,有太阳直射,终年高温。',
|
||||
descEn: 'Between the tropics; the Sun is overhead at some time each year.',
|
||||
),
|
||||
GeoZone(
|
||||
id: 'north-temperate',
|
||||
nameZh: '北温带',
|
||||
nameEn: 'North Temperate',
|
||||
latMin: 23.5,
|
||||
latMax: 66.5,
|
||||
descZh: '北回归线与北极圈之间,四季分明。',
|
||||
descEn: 'Between Tropic of Cancer and Arctic Circle; four distinct seasons.',
|
||||
),
|
||||
GeoZone(
|
||||
id: 'south-temperate',
|
||||
nameZh: '南温带',
|
||||
nameEn: 'South Temperate',
|
||||
latMin: -66.5,
|
||||
latMax: -23.5,
|
||||
descZh: '南回归线与南极圈之间,四季分明。',
|
||||
descEn: 'Between Tropic of Capricorn and Antarctic Circle; four seasons.',
|
||||
),
|
||||
GeoZone(
|
||||
id: 'north-frigid',
|
||||
nameZh: '北寒带',
|
||||
nameEn: 'North Frigid',
|
||||
latMin: 66.5,
|
||||
latMax: 90,
|
||||
descZh: '北极圈以北,终年寒冷,有极昼极夜。',
|
||||
descEn: 'Beyond the Arctic Circle; perpetually cold with polar day/night.',
|
||||
),
|
||||
GeoZone(
|
||||
id: 'south-frigid',
|
||||
nameZh: '南寒带',
|
||||
nameEn: 'South Frigid',
|
||||
latMin: -90,
|
||||
latMax: -66.5,
|
||||
descZh: '南极圈以南,终年寒冷,有极昼极夜。',
|
||||
descEn: 'Beyond the Antarctic Circle; perpetually cold with polar day/night.',
|
||||
),
|
||||
];
|
||||
|
||||
/// 示例数据:五大洲简化轮廓
|
||||
List<Continent> get defaultContinents => [
|
||||
Continent(
|
||||
nameZh: '亚洲',
|
||||
nameEn: 'Asia',
|
||||
points: [
|
||||
[60, 70], [100, 70], [140, 65], [180, 60],
|
||||
[180, 40], [140, 20], [120, 10], [100, 5],
|
||||
[80, 10], [60, 20], [50, 30], [40, 40],
|
||||
],
|
||||
),
|
||||
Continent(
|
||||
nameZh: '非洲',
|
||||
nameEn: 'Africa',
|
||||
points: [
|
||||
[35, 35], [50, 35], [50, 15], [40, 5],
|
||||
[30, -5], [20, -20], [15, -30], [20, -35],
|
||||
[30, -35], [35, -25], [40, -10], [35, 5],
|
||||
],
|
||||
),
|
||||
Continent(
|
||||
nameZh: '欧洲',
|
||||
nameEn: 'Europe',
|
||||
points: [
|
||||
[10, 70], [40, 70], [50, 60], [40, 50],
|
||||
[30, 45], [20, 45], [10, 50], [0, 55],
|
||||
],
|
||||
),
|
||||
Continent(
|
||||
nameZh: '北美洲',
|
||||
nameEn: 'North America',
|
||||
points: [
|
||||
[-170, 70], [-130, 70], [-80, 70], [-60, 50],
|
||||
[-60, 30], [-80, 20], [-100, 20], [-120, 30],
|
||||
[-160, 50], [-170, 60],
|
||||
],
|
||||
),
|
||||
Continent(
|
||||
nameZh: '南美洲',
|
||||
nameEn: 'South America',
|
||||
points: [
|
||||
[-80, 10], [-60, 10], [-35, -5], [-35, -20],
|
||||
[-50, -30], [-65, -50], [-75, -55], [-75, -40],
|
||||
[-70, -20], [-80, 0],
|
||||
],
|
||||
),
|
||||
Continent(
|
||||
nameZh: '大洋洲',
|
||||
nameEn: 'Oceania',
|
||||
points: [
|
||||
[115, -15], [150, -15], [160, -25], [150, -35],
|
||||
[130, -38], [115, -35], [113, -25],
|
||||
],
|
||||
),
|
||||
Continent(
|
||||
nameZh: '南极洲',
|
||||
nameEn: 'Antarctica',
|
||||
points: [
|
||||
[-180, -65], [-90, -65], [0, -65], [90, -65],
|
||||
[180, -65], [180, -90], [-180, -90],
|
||||
],
|
||||
),
|
||||
];
|
||||
}
|
||||
|
||||
class _GeographyModelView extends StatefulWidget {
|
||||
const _GeographyModelView();
|
||||
|
||||
@override
|
||||
State<_GeographyModelView> createState() => _GeographyModelViewState();
|
||||
}
|
||||
|
||||
class _GeographyModelViewState extends State<_GeographyModelView> {
|
||||
String _activeView = 'zones'; // zones, coast, plates
|
||||
bool _showZones = true;
|
||||
bool _showCoast = true;
|
||||
bool _showPlates = false;
|
||||
|
||||
final GeographyModelFlutter _model = GeographyModelFlutter();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
final bgColor = isDark ? const Color(0xFF0B1524) : const Color(0xFFE8F0FE);
|
||||
final panelColor = isDark ? const Color(0xFF101E31) : const Color(0xFFF5F7FA);
|
||||
final inkColor = isDark ? const Color(0xFFEAF2FF) : const Color(0xFF111A2E);
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: bgColor,
|
||||
body: Column(
|
||||
children: [
|
||||
// 标题栏
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 12),
|
||||
color: panelColor,
|
||||
child: Row(
|
||||
children: [
|
||||
Text(
|
||||
'地球地理 · 五带与七大洲',
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: inkColor,
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
_viewButton('五带', _activeView == 'zones', () => setState(() => _activeView = 'zones')),
|
||||
_viewButton('大洲', _activeView == 'coast', () => setState(() => _activeView = 'coast')),
|
||||
TextButton.icon(
|
||||
onPressed: () => setState(() {
|
||||
_showZones = !_showZones;
|
||||
_showCoast = !_showCoast;
|
||||
}),
|
||||
icon: const Icon(Icons.tune_rounded, size: 16),
|
||||
label: const Text('图层'),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
// 地图区域
|
||||
Expanded(
|
||||
child: _GeographyMap(
|
||||
zones: _model.defaultZones,
|
||||
continents: _model.defaultContinents,
|
||||
showZones: _showZones,
|
||||
showCoast: _showCoast,
|
||||
activeView: _activeView,
|
||||
),
|
||||
),
|
||||
// 底部说明
|
||||
if (_activeView == 'zones' && _showZones)
|
||||
Container(
|
||||
padding: const EdgeInsets.all(12),
|
||||
color: panelColor,
|
||||
child: Text(
|
||||
'热带:南北回归线之间 | 温带:回归线与极圈之间 | 寒带:极圈以内',
|
||||
style: TextStyle(fontSize: 12, color: isDark ? const Color(0xFF93A8C6) : const Color(0xFF5C6A80)),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _viewButton(String label, bool active, VoidCallback onTap) {
|
||||
return TextButton(
|
||||
onPressed: onTap,
|
||||
style: TextButton.styleFrom(
|
||||
backgroundColor: active ? const Color(0xFF4D8CFF) : null,
|
||||
foregroundColor: active ? Colors.white : null,
|
||||
),
|
||||
child: Text(label, style: const TextStyle(fontSize: 12)),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _GeographyMap extends StatelessWidget {
|
||||
final List<GeoZone> zones;
|
||||
final List<Continent> continents;
|
||||
final bool showZones;
|
||||
final bool showCoast;
|
||||
final String activeView;
|
||||
|
||||
const _GeographyMap({
|
||||
required this.zones,
|
||||
required this.continents,
|
||||
required this.showZones,
|
||||
required this.showCoast,
|
||||
required this.activeView,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return CustomPaint(
|
||||
size: Size.infinite,
|
||||
painter: _GeographyPainter(
|
||||
zones: zones,
|
||||
continents: continents,
|
||||
showZones: showZones,
|
||||
showCoast: showCoast,
|
||||
activeView: activeView,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _GeographyPainter extends CustomPainter {
|
||||
final List<GeoZone> zones;
|
||||
final List<Continent> continents;
|
||||
final bool showZones;
|
||||
final bool showCoast;
|
||||
final String activeView;
|
||||
|
||||
_GeographyPainter({
|
||||
required this.zones,
|
||||
required this.continents,
|
||||
required this.showZones,
|
||||
required this.showCoast,
|
||||
required this.activeView,
|
||||
});
|
||||
|
||||
/// 经纬度转画布坐标
|
||||
Offset _latLonToOffset(double lon, double lat, Size size) {
|
||||
final x = (lon + 180) / 360 * size.width;
|
||||
final y = (90 - lat) / 180 * size.height;
|
||||
return Offset(x, y);
|
||||
}
|
||||
|
||||
@override
|
||||
void paint(Canvas canvas, Size size) {
|
||||
final bgColor = const Color(0xFF0E2A4A);
|
||||
final oceanColor = const Color(0xFF0E2A4A);
|
||||
final zoneColors = {
|
||||
'torrid': const Color(0xFFFF6B35),
|
||||
'north-temperate': const Color(0xFFFFD93D),
|
||||
'south-temperate': const Color(0xFF6BCB77),
|
||||
'north-frigid': const Color(0xFF4D8CFF),
|
||||
'south-frigid': const Color(0xFF8B5CF6),
|
||||
};
|
||||
|
||||
// 海洋背景
|
||||
canvas.drawColor(oceanColor, BlendMode.src);
|
||||
|
||||
// 绘制五带
|
||||
if (showZones && activeView == 'zones') {
|
||||
final bandHeight = size.height / 9; // 180度纬度分9份
|
||||
final bandColors = [
|
||||
zoneColors['north-frigid']!,
|
||||
zoneColors['north-temperate']!,
|
||||
zoneColors['torrid']!,
|
||||
zoneColors['south-temperate']!,
|
||||
zoneColors['south-frigid']!,
|
||||
];
|
||||
final bandLatRanges = [
|
||||
(66.5, 90),
|
||||
(23.5, 66.5),
|
||||
(-23.5, 23.5),
|
||||
(-66.5, -23.5),
|
||||
(-90, -66.5),
|
||||
];
|
||||
|
||||
for (int i = 0; i < 5; i++) {
|
||||
final (latMin, latMax) = bandLatRanges[i];
|
||||
final y1 = (90 - latMax) / 180 * size.height;
|
||||
final y2 = (90 - latMin) / 180 * size.height;
|
||||
canvas.drawRect(
|
||||
Rect.fromLTWH(0, y1, size.width, y2 - y1),
|
||||
Paint()..color = bandColors[i].withOpacity(0.3),
|
||||
);
|
||||
}
|
||||
|
||||
// 绘制回归线和极圈
|
||||
for (final lat in [23.5, -23.5, 66.5, -66.5]) {
|
||||
final y = (90 - lat) / 180 * size.height;
|
||||
canvas.drawLine(
|
||||
Offset(0, y),
|
||||
Offset(size.width, y),
|
||||
Paint()
|
||||
..color = Colors.white.withOpacity(0.4)
|
||||
..strokeWidth = 1
|
||||
..style = PaintingStyle.stroke
|
||||
..style = PaintingStyle.stroke,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// 绘制大陆轮廓
|
||||
if (showCoast && activeView == 'coast') {
|
||||
for (final continent in continents) {
|
||||
if (continent.points.length < 2) continue;
|
||||
|
||||
final path = Path();
|
||||
final start = _latLonToOffset(continent.points[0][0], continent.points[0][1], size);
|
||||
path.moveTo(start.dx, start.dy);
|
||||
|
||||
for (int i = 1; i < continent.points.length; i++) {
|
||||
final p = _latLonToOffset(continent.points[i][0], continent.points[i][1], size);
|
||||
path.lineTo(p.dx, p.dy);
|
||||
}
|
||||
path.close();
|
||||
|
||||
canvas.drawPath(
|
||||
path,
|
||||
Paint()
|
||||
..color = const Color(0xFF4E8C4C)
|
||||
..style = PaintingStyle.fill,
|
||||
);
|
||||
canvas.drawPath(
|
||||
path,
|
||||
Paint()
|
||||
..color = Colors.white.withOpacity(0.6)
|
||||
..style = PaintingStyle.stroke
|
||||
..strokeWidth = 1,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
bool shouldRepaint(covariant _GeographyPainter oldDelegate) {
|
||||
return oldDelegate.showZones != showZones ||
|
||||
oldDelegate.showCoast != showCoast ||
|
||||
oldDelegate.activeView != activeView;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
/// 地球地理模型数据
|
||||
class GeoZone {
|
||||
final String id;
|
||||
final String nameZh;
|
||||
final String nameEn;
|
||||
final double latMin;
|
||||
final double latMax;
|
||||
final String descZh;
|
||||
final String descEn;
|
||||
|
||||
GeoZone({
|
||||
required this.id,
|
||||
required this.nameZh,
|
||||
required this.nameEn,
|
||||
required this.latMin,
|
||||
required this.latMax,
|
||||
required this.descZh,
|
||||
required this.descEn,
|
||||
});
|
||||
}
|
||||
|
||||
/// 大陆板块数据
|
||||
class Continent {
|
||||
final String nameZh;
|
||||
final String nameEn;
|
||||
final List<List<double>> points; // [lon, lat]
|
||||
|
||||
Continent({
|
||||
required this.nameZh,
|
||||
required this.nameEn,
|
||||
required this.points,
|
||||
});
|
||||
}
|
||||
|
||||
/// 板块数据
|
||||
class Plate {
|
||||
final String id;
|
||||
final String nameZh;
|
||||
final String nameEn;
|
||||
final List<List<double>> points;
|
||||
|
||||
Plate({
|
||||
required this.id,
|
||||
required this.nameZh,
|
||||
required this.nameEn,
|
||||
required this.points,
|
||||
});
|
||||
}
|
||||
|
||||
/// 洲界线
|
||||
class Border {
|
||||
final String betweenZh;
|
||||
final String betweenEn;
|
||||
final String nameZh;
|
||||
final String nameEn;
|
||||
final List<List<double>> points;
|
||||
|
||||
Border({
|
||||
required this.betweenZh,
|
||||
required this.betweenEn,
|
||||
required this.nameZh,
|
||||
required this.nameEn,
|
||||
required this.points,
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
/// 模型注册表:所有 Flutter 实现的模型都在这里注册。
|
||||
library;
|
||||
|
||||
export 'base.dart';
|
||||
export 'contour_model.dart';
|
||||
export 'contour_flutter.dart';
|
||||
export 'geography_model.dart';
|
||||
export 'geography_flutter.dart';
|
||||
export 'rotation_flutter.dart';
|
||||
export 'revolution_flutter.dart';
|
||||
export 'scale_model.dart';
|
||||
export 'scale_flutter.dart';
|
||||
|
||||
import 'base.dart';
|
||||
import 'contour_flutter.dart';
|
||||
import 'geography_flutter.dart';
|
||||
import 'rotation_flutter.dart';
|
||||
import 'revolution_flutter.dart';
|
||||
import 'scale_flutter.dart';
|
||||
|
||||
/// 所有可用的 Flutter 模型实例。
|
||||
final List<GcModel> allGcModels = [
|
||||
ContourModelFlutter(),
|
||||
GeographyModelFlutter(),
|
||||
RotationModelFlutter(),
|
||||
RevolutionModelFlutter(),
|
||||
ScaleCalculatorModelFlutter(),
|
||||
];
|
||||
|
||||
/// 根据 id 查找模型。
|
||||
GcModel? findModel(String id) {
|
||||
try {
|
||||
return allGcModels.firstWhere((m) => m.id == id);
|
||||
} catch (_) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,252 @@
|
||||
import 'dart:math' as math;
|
||||
import 'package:flutter/material.dart';
|
||||
import 'base.dart';
|
||||
import 'revolution_model.dart';
|
||||
|
||||
/// 地球公转模型 Flutter 实现
|
||||
class RevolutionModelFlutter implements GcModel {
|
||||
@override
|
||||
final String id = 'earth-revolution-flutter';
|
||||
|
||||
@override
|
||||
String name() => '地球公转 (Flutter)';
|
||||
|
||||
@override
|
||||
String description() => '纯 Flutter 实现的地球公转模型,观察四季成因';
|
||||
|
||||
@override
|
||||
Widget buildView(BuildContext context) {
|
||||
return const _RevolutionModelView();
|
||||
}
|
||||
|
||||
List<Season> get defaultSeasons => [
|
||||
Season(key: 'spring', date: '3/21', declinationDeg: 0, angleDeg: 0,
|
||||
teachingZh: '太阳直射赤道,全球昼夜平分。', teachingEn: 'Sun overhead at equator.'),
|
||||
Season(key: 'summer', date: '6/22', declinationDeg: 23.5, angleDeg: 90,
|
||||
teachingZh: '太阳直射北回归线,北半球昼最长。', teachingEn: 'Sun at Tropic of Cancer.'),
|
||||
Season(key: 'autumn', date: '9/23', declinationDeg: 0, angleDeg: 180,
|
||||
teachingZh: '太阳再次直射赤道,昼夜平分。', teachingEn: 'Sun back at equator.'),
|
||||
Season(key: 'winter', date: '12/22', declinationDeg: -23.5, angleDeg: 270,
|
||||
teachingZh: '太阳直射南回归线,北半球昼最短。', teachingEn: 'Sun at Tropic of Capricorn.'),
|
||||
];
|
||||
}
|
||||
|
||||
class _RevolutionModelView extends StatefulWidget {
|
||||
const _RevolutionModelView();
|
||||
|
||||
@override
|
||||
State<_RevolutionModelView> createState() => _RevolutionModelViewState();
|
||||
}
|
||||
|
||||
class _RevolutionModelViewState extends State<_RevolutionModelView>
|
||||
with TickerProviderStateMixin {
|
||||
late AnimationController _orbitController;
|
||||
bool _isPlaying = true;
|
||||
double _speed = 1.0;
|
||||
int _selectedSeason = 0;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_orbitController = AnimationController(
|
||||
vsync: this,
|
||||
duration: const Duration(seconds: 12),
|
||||
)..repeat();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_orbitController.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _togglePlay() {
|
||||
setState(() => _isPlaying = !_isPlaying);
|
||||
if (_isPlaying) _orbitController.repeat();
|
||||
else _orbitController.stop();
|
||||
}
|
||||
|
||||
void _reset() {
|
||||
setState(() {
|
||||
_isPlaying = true;
|
||||
_speed = 1.0;
|
||||
_selectedSeason = 0;
|
||||
});
|
||||
_orbitController.repeat();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
final bgColor = isDark ? const Color(0xFF0B1524) : const Color(0xFFE8F0FE);
|
||||
final panelColor = isDark ? const Color(0xFF101E31) : const Color(0xFFF5F7FA);
|
||||
final inkColor = isDark ? const Color(0xFFEAF2FF) : const Color(0xFF111A2E);
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: bgColor,
|
||||
body: Column(
|
||||
children: [
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 12),
|
||||
color: panelColor,
|
||||
child: Row(
|
||||
children: [
|
||||
Text('地球公转 · 四季成因', style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: inkColor)),
|
||||
const Spacer(),
|
||||
...['春分', '夏至', '秋分', '冬至'].asMap().entries.map((e) =>
|
||||
Padding(padding: const EdgeInsets.only(left: 6),
|
||||
child: FilterChip(
|
||||
label: Text(e.value, style: const TextStyle(fontSize: 11)),
|
||||
selected: _selectedSeason == e.key,
|
||||
onSelected: (_) => setState(() => _selectedSeason = e.key),
|
||||
selectedColor: const Color(0xFF4D8CFF).withOpacity(0.2),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: _RevolutionOrbit(
|
||||
progress: _orbitController.value,
|
||||
selectedSeason: _selectedSeason,
|
||||
),
|
||||
),
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
|
||||
color: panelColor,
|
||||
child: Row(
|
||||
children: [
|
||||
IconButton(onPressed: _togglePlay, icon: Icon(_isPlaying ? Icons.pause_rounded : Icons.play_arrow_rounded), color: const Color(0xFF4D8CFF)),
|
||||
const SizedBox(width: 16),
|
||||
Text('速度:', style: TextStyle(fontSize: 12, color: isDark ? const Color(0xFF93A8C6) : const Color(0xFF5C6A80))),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(child: Slider(value: _speed, min: 0.1, max: 3.0, divisions: 29, onChanged: (v) => setState(() => _speed = v))),
|
||||
Text('${_speed.toStringAsFixed(1)}x'),
|
||||
const Spacer(),
|
||||
TextButton.icon(onPressed: _reset, icon: const Icon(Icons.refresh_rounded, size: 16), label: const Text('重置')),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _RevolutionOrbit extends StatelessWidget {
|
||||
final double progress;
|
||||
final int selectedSeason;
|
||||
|
||||
const _RevolutionOrbit({required this.progress, required this.selectedSeason});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return CustomPaint(
|
||||
size: Size.infinite,
|
||||
painter: _RevolutionPainter(progress: progress, selectedSeason: selectedSeason),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _RevolutionPainter extends CustomPainter {
|
||||
final double progress;
|
||||
final int selectedSeason;
|
||||
|
||||
_RevolutionPainter({required this.progress, required this.selectedSeason});
|
||||
|
||||
@override
|
||||
void paint(Canvas canvas, Size size) {
|
||||
final bgColor = const Color(0xFF08111E);
|
||||
final sunColor = const Color(0xFFFFC24B);
|
||||
final orbitColor = const Color(0xFF4D8CFF);
|
||||
final earthColor = const Color(0xFF1C5FA8);
|
||||
|
||||
canvas.drawColor(bgColor, BlendMode.src);
|
||||
|
||||
final center = Offset(size.width / 2, size.height / 2);
|
||||
final orbitRadius = math.min(size.width, size.height) * 0.35;
|
||||
|
||||
// 绘制轨道
|
||||
canvas.drawCircle(center, orbitRadius, Paint()
|
||||
..color = orbitColor.withOpacity(0.3)
|
||||
..style = PaintingStyle.stroke
|
||||
..strokeWidth = 1.5
|
||||
|
||||
..style = PaintingStyle.stroke);
|
||||
|
||||
// 绘制太阳
|
||||
canvas.drawCircle(center, 30, Paint()
|
||||
..color = sunColor
|
||||
..style = PaintingStyle.fill);
|
||||
|
||||
// 太阳发光效果
|
||||
for (int i = 4; i > 0; i--) {
|
||||
canvas.drawCircle(center, 30 + i * 12, Paint()
|
||||
..color = sunColor.withOpacity(0.1 * (5 - i))
|
||||
..style = PaintingStyle.fill);
|
||||
}
|
||||
|
||||
// 绘制地球位置(根据进度)
|
||||
final angle = progress * 2 * math.pi;
|
||||
final earthX = center.dx + math.cos(angle) * orbitRadius;
|
||||
final earthY = center.dy + math.sin(angle) * orbitRadius;
|
||||
|
||||
// 地球
|
||||
canvas.drawCircle(Offset(earthX, earthY), 15, Paint()
|
||||
..color = earthColor
|
||||
..style = PaintingStyle.fill);
|
||||
|
||||
// 地轴(倾斜23.5度)
|
||||
final tiltAngle = 23.5 * math.pi / 180;
|
||||
canvas.drawLine(
|
||||
Offset(earthX - math.sin(tiltAngle) * 25, earthY - math.cos(tiltAngle) * 25),
|
||||
Offset(earthX + math.sin(tiltAngle) * 25, earthY + math.cos(tiltAngle) * 25),
|
||||
Paint()
|
||||
..color = const Color(0xFFFF6B35)
|
||||
..strokeWidth = 2
|
||||
..style = PaintingStyle.stroke);
|
||||
|
||||
// 标注四个关键位置
|
||||
final seasonLabels = ['春分', '夏至', '秋分', '冬至'];
|
||||
final seasonColors = [const Color(0xFF6BCB77), const Color(0xFFFFD93D), const Color(0xFF4D8CFF), const Color(0xFF8B5CF6)];
|
||||
|
||||
for (int i = 0; i < 4; i++) {
|
||||
final seasonAngle = i * math.pi / 2;
|
||||
final sx = center.dx + math.cos(seasonAngle) * orbitRadius;
|
||||
final sy = center.dy + math.sin(seasonAngle) * orbitRadius;
|
||||
|
||||
// 小圆点标记
|
||||
canvas.drawCircle(Offset(sx, sy), 5, Paint()
|
||||
..color = seasonColors[i]
|
||||
..style = PaintingStyle.fill);
|
||||
|
||||
// 标签
|
||||
final labelX = sx + math.cos(seasonAngle) * 25;
|
||||
final labelY = sy + math.sin(seasonAngle) * 25;
|
||||
final textPainter = TextPainter(
|
||||
text: TextSpan(text: seasonLabels[i], style: const TextStyle(fontSize: 10, color: Color(0xFFEAF2FF))),
|
||||
textDirection: TextDirection.ltr,
|
||||
);
|
||||
textPainter.layout();
|
||||
textPainter.paint(canvas, Offset(labelX - 15, labelY - 8));
|
||||
}
|
||||
|
||||
// 当前选中季节高亮
|
||||
if (selectedSeason >= 0 && selectedSeason < 4) {
|
||||
final selAngle = selectedSeason * math.pi / 2;
|
||||
final selX = center.dx + math.cos(selAngle) * orbitRadius;
|
||||
final selY = center.dy + math.sin(selAngle) * orbitRadius;
|
||||
|
||||
canvas.drawCircle(Offset(selX, selY), 8, Paint()
|
||||
..color = seasonColors[selectedSeason].withOpacity(0.5)
|
||||
..style = PaintingStyle.stroke
|
||||
..strokeWidth = 2);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
bool shouldRepaint(covariant _RevolutionPainter oldDelegate) {
|
||||
return oldDelegate.progress != progress || oldDelegate.selectedSeason != selectedSeason;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
/// 节气数据
|
||||
class Season {
|
||||
final String key;
|
||||
final String date;
|
||||
final double declinationDeg;
|
||||
final double angleDeg;
|
||||
final String teachingZh;
|
||||
final String teachingEn;
|
||||
|
||||
Season({
|
||||
required this.key,
|
||||
required this.date,
|
||||
required this.declinationDeg,
|
||||
required this.angleDeg,
|
||||
required this.teachingZh,
|
||||
required this.teachingEn,
|
||||
});
|
||||
}
|
||||
|
||||
/// 教学要点
|
||||
class Lesson {
|
||||
final String titleZh;
|
||||
final String titleEn;
|
||||
final String bodyZh;
|
||||
final String bodyEn;
|
||||
final String view;
|
||||
final double? angleDeg;
|
||||
|
||||
Lesson({
|
||||
required this.titleZh,
|
||||
required this.titleEn,
|
||||
required this.bodyZh,
|
||||
required this.bodyEn,
|
||||
required this.view,
|
||||
this.angleDeg,
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,330 @@
|
||||
import 'dart:math' as math;
|
||||
import 'package:flutter/material.dart';
|
||||
import 'base.dart';
|
||||
|
||||
/// 地球自转模型 Flutter 实现
|
||||
class RotationModelFlutter implements GcModel {
|
||||
@override
|
||||
final String id = 'earth-rotation-flutter';
|
||||
|
||||
@override
|
||||
String name() => '地球自转 (Flutter)';
|
||||
|
||||
@override
|
||||
String description() => '纯 Flutter 实现的地球自转模型,观察昼夜交替、晨昏线';
|
||||
|
||||
@override
|
||||
Widget buildView(BuildContext context) {
|
||||
return const _RotationModelView();
|
||||
}
|
||||
}
|
||||
|
||||
class _RotationModelView extends StatefulWidget {
|
||||
const _RotationModelView();
|
||||
|
||||
@override
|
||||
State<_RotationModelView> createState() => _RotationModelViewState();
|
||||
}
|
||||
|
||||
class _RotationModelViewState extends State<_RotationModelView>
|
||||
with TickerProviderStateMixin {
|
||||
late AnimationController _spinController;
|
||||
late AnimationController _tiltController;
|
||||
bool _isPlaying = true;
|
||||
double _speed = 1.0;
|
||||
bool _showLabels = true;
|
||||
bool _showTilt = false;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_spinController = AnimationController(
|
||||
vsync: this,
|
||||
duration: const Duration(seconds: 10),
|
||||
)..repeat();
|
||||
_tiltController = AnimationController(
|
||||
vsync: this,
|
||||
duration: const Duration(milliseconds: 500),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_spinController.dispose();
|
||||
_tiltController.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _togglePlay() {
|
||||
setState(() {
|
||||
_isPlaying = !_isPlaying;
|
||||
});
|
||||
if (_isPlaying) {
|
||||
_spinController.repeat();
|
||||
} else {
|
||||
_spinController.stop();
|
||||
}
|
||||
}
|
||||
|
||||
void _reset() {
|
||||
setState(() {
|
||||
_isPlaying = true;
|
||||
_speed = 1.0;
|
||||
_showLabels = true;
|
||||
_showTilt = false;
|
||||
});
|
||||
_spinController.repeat();
|
||||
_tiltController.reset();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
final bgColor = isDark ? const Color(0xFF0B1524) : const Color(0xFFE8F0FE);
|
||||
final panelColor = isDark ? const Color(0xFF101E31) : const Color(0xFFF5F7FA);
|
||||
final inkColor = isDark ? const Color(0xFFEAF2FF) : const Color(0xFF111A2E);
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: bgColor,
|
||||
body: Column(
|
||||
children: [
|
||||
// 标题栏
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 12),
|
||||
color: panelColor,
|
||||
child: Row(
|
||||
children: [
|
||||
Text(
|
||||
'地球自转 · 昼夜交替',
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: inkColor,
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
_toggleButton('标注', _showLabels, () => setState(() => _showLabels = !_showLabels)),
|
||||
_toggleButton('倾角', _showTilt, () => setState(() => _showTilt = !_showTilt)),
|
||||
const SizedBox(width: 8),
|
||||
TextButton.icon(
|
||||
onPressed: _reset,
|
||||
icon: const Icon(Icons.refresh_rounded, size: 16),
|
||||
label: const Text('重置'),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
// 地球动画
|
||||
Expanded(
|
||||
child: _RotationEarth(
|
||||
animProgress: _spinController.value,
|
||||
showLabels: _showLabels,
|
||||
showTilt: _showTilt,
|
||||
isPlaying: _isPlaying,
|
||||
),
|
||||
),
|
||||
// 底部控制栏
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
|
||||
color: panelColor,
|
||||
child: Row(
|
||||
children: [
|
||||
IconButton(
|
||||
onPressed: _togglePlay,
|
||||
icon: Icon(_isPlaying ? Icons.pause_rounded : Icons.play_arrow_rounded),
|
||||
color: const Color(0xFF4D8CFF),
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
Text('速度:', style: TextStyle(fontSize: 12, color: isDark ? const Color(0xFF93A8C6) : const Color(0xFF5C6A80))),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Slider(
|
||||
value: _speed,
|
||||
min: 0.1,
|
||||
max: 3.0,
|
||||
divisions: 29,
|
||||
onChanged: (v) => setState(() => _speed = v),
|
||||
),
|
||||
),
|
||||
Text('${_speed.toStringAsFixed(1)}x', style: const TextStyle(fontSize: 12)),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _toggleButton(String label, bool active, VoidCallback onTap) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(left: 8),
|
||||
child: FilterChip(
|
||||
label: Text(label, style: const TextStyle(fontSize: 12)),
|
||||
selected: active,
|
||||
onSelected: (_) => onTap(),
|
||||
selectedColor: const Color(0xFF4D8CFF).withOpacity(0.2),
|
||||
checkmarkColor: const Color(0xFF4D8CFF),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _RotationEarth extends StatelessWidget {
|
||||
final double animProgress;
|
||||
final bool showLabels;
|
||||
final bool showTilt;
|
||||
final bool isPlaying;
|
||||
|
||||
const _RotationEarth({
|
||||
required this.animProgress,
|
||||
required this.showLabels,
|
||||
required this.showTilt,
|
||||
required this.isPlaying,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return CustomPaint(
|
||||
size: Size.infinite,
|
||||
painter: _RotationPainter(
|
||||
animProgress: animProgress,
|
||||
showLabels: showLabels,
|
||||
showTilt: showTilt,
|
||||
isPlaying: isPlaying,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _RotationPainter extends CustomPainter {
|
||||
final double animProgress;
|
||||
final bool showLabels;
|
||||
final bool showTilt;
|
||||
final bool isPlaying;
|
||||
|
||||
_RotationPainter({
|
||||
required this.animProgress,
|
||||
required this.showLabels,
|
||||
required this.showTilt,
|
||||
required this.isPlaying,
|
||||
});
|
||||
|
||||
@override
|
||||
void paint(Canvas canvas, Size size) {
|
||||
final bgColor = const Color(0xFF08111E);
|
||||
final earthColor = const Color(0xFF1C5FA8);
|
||||
final landColor = const Color(0xFF4E8C4C);
|
||||
final iceColor = const Color(0xFFE9EFF6);
|
||||
final axisColor = const Color(0xFFFF6B35);
|
||||
final labelColor = const Color(0xFFEAF2FF);
|
||||
|
||||
canvas.drawColor(bgColor, BlendMode.src);
|
||||
|
||||
final center = Offset(size.width / 2, size.height / 2);
|
||||
final radius = math.min(size.width, size.height) * 0.3;
|
||||
|
||||
// 绘制地球球体
|
||||
final earthPaint = Paint()
|
||||
..color = earthColor
|
||||
..style = PaintingStyle.fill;
|
||||
canvas.drawCircle(center, radius, earthPaint);
|
||||
|
||||
// 绘制大陆(简化版,用椭圆模拟)
|
||||
final continents = [
|
||||
(center.dx - radius * 0.3, center.dy - radius * 0.2, radius * 0.25, radius * 0.35), // 亚洲
|
||||
(center.dx + radius * 0.2, center.dy - radius * 0.1, radius * 0.2, radius * 0.25), // 欧洲
|
||||
(center.dx - radius * 0.1, center.dy + radius * 0.2, radius * 0.15, radius * 0.3), // 非洲
|
||||
(center.dx + radius * 0.35, center.dy + radius * 0.1, radius * 0.2, radius * 0.25), // 北美
|
||||
(center.dx + radius * 0.3, center.dy + radius * 0.4, radius * 0.15, radius * 0.2), // 南美
|
||||
];
|
||||
|
||||
for (final cont in continents) {
|
||||
canvas.drawOval(
|
||||
Rect.fromLTWH(cont.$1 - cont.$3 / 2, cont.$2 - cont.$4 / 2, cont.$3, cont.$4),
|
||||
Paint()..color = landColor,
|
||||
);
|
||||
}
|
||||
|
||||
// 绘制极冰
|
||||
canvas.drawOval(
|
||||
Rect.fromLTWH(center.dx - radius * 0.15, center.dy - radius * 0.95, radius * 0.3, radius * 0.15),
|
||||
Paint()..color = iceColor,
|
||||
);
|
||||
canvas.drawOval(
|
||||
Rect.fromLTWH(center.dx - radius * 0.15, center.dy + radius * 0.8, radius * 0.3, radius * 0.15),
|
||||
Paint()..color = iceColor,
|
||||
);
|
||||
|
||||
// 绘制地轴
|
||||
if (showTilt) {
|
||||
final tiltAngle = 23.5 * math.pi / 180;
|
||||
final axisLength = radius * 1.4;
|
||||
final topY = center.dy - axisLength / 2;
|
||||
final bottomY = center.dy + axisLength / 2;
|
||||
final offsetX = math.sin(tiltAngle) * axisLength / 2;
|
||||
|
||||
canvas.drawLine(
|
||||
Offset(center.dx - offsetX, topY),
|
||||
Offset(center.dx + offsetX, bottomY),
|
||||
Paint()
|
||||
..color = axisColor
|
||||
..strokeWidth = 2
|
||||
..style = PaintingStyle.stroke,
|
||||
);
|
||||
|
||||
// 北极标注
|
||||
if (showLabels) {
|
||||
final textPainter = TextPainter(
|
||||
text: const TextSpan(text: '北极', style: TextStyle(fontSize: 11, color: Color(0xFFFF6B35))),
|
||||
textDirection: TextDirection.ltr,
|
||||
);
|
||||
textPainter.layout();
|
||||
textPainter.paint(canvas, Offset(center.dx + offsetX + 10, topY - 5));
|
||||
}
|
||||
}
|
||||
|
||||
// 绘制晨昏线(昼夜分界)
|
||||
final sunAngle = animProgress * 2 * math.pi;
|
||||
final terminatorX = center.dx + math.cos(sunAngle) * radius * 0.3;
|
||||
|
||||
// 昼半球高光
|
||||
final dayPaint = Paint()
|
||||
..color = Colors.yellow.withOpacity(0.15)
|
||||
..style = PaintingStyle.fill;
|
||||
canvas.drawCircle(
|
||||
Offset(terminatorX + math.cos(sunAngle) * radius * 0.3, center.dy),
|
||||
radius * 0.9,
|
||||
dayPaint,
|
||||
);
|
||||
|
||||
// 标注直射点
|
||||
if (showLabels) {
|
||||
final subsolarX = center.dx + math.cos(sunAngle) * radius;
|
||||
final subsolarY = center.dy + math.sin(sunAngle * 0.3) * radius * 0.5;
|
||||
|
||||
// 太阳光线
|
||||
canvas.drawLine(
|
||||
Offset(subsolarX + math.cos(sunAngle) * 20, subsolarY + math.sin(sunAngle) * 20),
|
||||
Offset(subsolarX + math.cos(sunAngle) * 50, subsolarY + math.sin(sunAngle) * 50),
|
||||
Paint()
|
||||
..color = const Color(0xFFFFC24B)
|
||||
..strokeWidth = 2
|
||||
..style = PaintingStyle.stroke,
|
||||
);
|
||||
|
||||
final textPainter = TextPainter(
|
||||
text: const TextSpan(text: '直射点', style: TextStyle(fontSize: 10, color: Color(0xFFFFC24B))),
|
||||
textDirection: TextDirection.ltr,
|
||||
);
|
||||
textPainter.layout();
|
||||
textPainter.paint(canvas, Offset(subsolarX + 15, subsolarY - 10));
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
bool shouldRepaint(covariant _RotationPainter oldDelegate) {
|
||||
return oldDelegate.animProgress != animProgress ||
|
||||
oldDelegate.showLabels != showLabels ||
|
||||
oldDelegate.showTilt != showTilt;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,217 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'base.dart';
|
||||
import 'scale_model.dart';
|
||||
|
||||
class ScaleCalculatorModelFlutter implements GcModel {
|
||||
@override
|
||||
final String id = 'scale-calculator-flutter';
|
||||
@override
|
||||
String name() => '比例尺计算器 (Flutter)';
|
||||
@override
|
||||
String description() => '纯 Flutter 实现的比例尺计算器';
|
||||
@override
|
||||
Widget buildView(BuildContext context) => const _ScaleCalculatorView();
|
||||
|
||||
List<ScalePreset> get presets => [
|
||||
ScalePreset(n: 10000, nameKey: 'preset.campus', noteKey: 'preset.campusNote'),
|
||||
ScalePreset(n: 50000, nameKey: 'preset.town', noteKey: 'preset.townNote'),
|
||||
ScalePreset(n: 250000, nameKey: 'preset.city', noteKey: 'preset.cityNote'),
|
||||
ScalePreset(n: 1000000, nameKey: 'preset.province', noteKey: 'preset.provinceNote'),
|
||||
ScalePreset(n: 10000000, nameKey: 'preset.china', noteKey: 'preset.chinaNote'),
|
||||
ScalePreset(n: 100000000, nameKey: 'preset.world', noteKey: 'preset.worldNote'),
|
||||
];
|
||||
|
||||
List<ScaleSpectrum> get spectrum => [
|
||||
ScaleSpectrum(n: 10000, labelKey: 'spec.campus', scopeKey: 'spec.campusScope'),
|
||||
ScaleSpectrum(n: 250000, labelKey: 'spec.city', scopeKey: 'spec.cityScope'),
|
||||
ScaleSpectrum(n: 10000000, labelKey: 'spec.china', scopeKey: 'spec.chinaScope'),
|
||||
ScaleSpectrum(n: 100000000, labelKey: 'spec.world', scopeKey: 'spec.worldScope'),
|
||||
];
|
||||
|
||||
List<Landmark> get landmarks => [
|
||||
Landmark(nameKey: 'lm.classroom', meters: 10),
|
||||
Landmark(nameKey: 'lm.track', meters: 400),
|
||||
Landmark(nameKey: 'lm.marathon', meters: 42195),
|
||||
Landmark(nameKey: 'lm.beijingShanghai', meters: 1080000),
|
||||
Landmark(nameKey: 'lm.equator', meters: 40000000),
|
||||
];
|
||||
}
|
||||
|
||||
class _ScaleCalculatorView extends StatefulWidget {
|
||||
const _ScaleCalculatorView();
|
||||
@override
|
||||
State<_ScaleCalculatorView> createState() => _ScaleCalculatorViewState();
|
||||
}
|
||||
|
||||
class _ScaleCalculatorViewState extends State<_ScaleCalculatorView> {
|
||||
String _mode = 'real';
|
||||
double _mapDist = 10;
|
||||
double _realDist = 100000;
|
||||
double _scaleN = 10000.0;
|
||||
String _unit = 'cm';
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
final bgColor = isDark ? const Color(0xFF0B1524) : const Color(0xFFE8F0FE);
|
||||
final panelColor = isDark ? const Color(0xFF101E31) : const Color(0xFFF5F7FA);
|
||||
final inkColor = isDark ? const Color(0xFFEAF2FF) : const Color(0xFF111A2E);
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: bgColor,
|
||||
body: Column(
|
||||
children: [
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 12),
|
||||
color: panelColor,
|
||||
child: Row(
|
||||
children: [
|
||||
Text('比例尺计算器', style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: inkColor)),
|
||||
const Spacer(),
|
||||
_modeBtn('求实地距离', _mode == 'real'),
|
||||
_modeBtn('求图上距离', _mode == 'map'),
|
||||
_modeBtn('求比例尺', _mode == 'scale'),
|
||||
],
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: _ScaleCanvas(
|
||||
mode: _mode,
|
||||
mapDist: _mapDist,
|
||||
realDist: _realDist,
|
||||
scaleN: _scaleN,
|
||||
unit: _unit,
|
||||
),
|
||||
),
|
||||
Container(
|
||||
padding: const EdgeInsets.all(16),
|
||||
color: panelColor,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text('已知量:', style: TextStyle(fontSize: 12, color: isDark ? const Color(0xFF93A8C6) : const Color(0xFF5C6A80))),
|
||||
const SizedBox(height: 8),
|
||||
Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: TextField(
|
||||
decoration: const InputDecoration(labelText: '图上距离 (cm)'),
|
||||
keyboardType: TextInputType.number,
|
||||
onChanged: (v) => setState(() => _mapDist = double.tryParse(v) ?? 0),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: TextField(
|
||||
decoration: const InputDecoration(labelText: '比例尺 N'),
|
||||
keyboardType: TextInputType.number,
|
||||
onChanged: (v) => setState(() => _scaleN = double.tryParse(v) ?? 10000.0),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Row(
|
||||
children: [
|
||||
Text('结果:', style: TextStyle(fontSize: 12, color: isDark ? const Color(0xFF93A8C6) : const Color(0xFF5C6A80))),
|
||||
const SizedBox(width: 8),
|
||||
Text('实地距离 = ${(_mapDist * _scaleN / 100).toStringAsFixed(2)} m', style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xFF4D8CFF))),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _modeBtn(String label, bool active) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(left: 6),
|
||||
child: FilterChip(
|
||||
label: Text(label, style: const TextStyle(fontSize: 12)),
|
||||
selected: active,
|
||||
onSelected: (_) => setState(() => _mode = active ? 'real' : 'real'),
|
||||
selectedColor: const Color(0xFF4D8CFF).withOpacity(0.2),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _ScaleCanvas extends StatelessWidget {
|
||||
final String mode;
|
||||
final double mapDist;
|
||||
final double realDist;
|
||||
final double scaleN;
|
||||
final String unit;
|
||||
|
||||
const _ScaleCanvas({required this.mode, required this.mapDist, required this.realDist, required this.scaleN, required this.unit});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return CustomPaint(
|
||||
size: Size.infinite,
|
||||
painter: _ScalePainter(mode: mode, mapDist: mapDist, realDist: realDist, scaleN: scaleN, unit: unit),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _ScalePainter extends CustomPainter {
|
||||
final String mode;
|
||||
final double mapDist;
|
||||
final double realDist;
|
||||
final double scaleN;
|
||||
final String unit;
|
||||
|
||||
_ScalePainter({required this.mode, required this.mapDist, required this.realDist, required this.scaleN, required this.unit});
|
||||
|
||||
@override
|
||||
void paint(Canvas canvas, Size size) {
|
||||
final isDark = true;
|
||||
final bgColor = const Color(0xFF08111E);
|
||||
final barColor = const Color(0xFF4D8CFF);
|
||||
final inkColor = const Color(0xFFEAF2FF);
|
||||
|
||||
canvas.drawColor(bgColor, BlendMode.src);
|
||||
|
||||
final centerY = size.height / 2;
|
||||
final double barHeight = 40.0;
|
||||
final barY = centerY - barHeight / 2;
|
||||
final maxBarWidth = size.width * 0.8;
|
||||
final startX = (size.width - maxBarWidth) / 2;
|
||||
|
||||
// 绘制标尺
|
||||
canvas.drawRRect(
|
||||
RRect.fromRectAndRadius(Rect.fromLTWH(startX, barY, maxBarWidth, barHeight), Radius.circular(4.0)),
|
||||
Paint()..color = barColor.withOpacity(0.2),
|
||||
);
|
||||
|
||||
// 刻度
|
||||
final double tickCount = 20.0;
|
||||
for (int i = 0; i <= tickCount; i++) {
|
||||
final x = startX + (maxBarWidth * i / tickCount);
|
||||
final double tickHeight = i % 5 == 0 ? 15.0 : 8.0;
|
||||
canvas.drawLine(
|
||||
Offset(x, barY + (barHeight - tickHeight) / 2),
|
||||
Offset(x, barY + (barHeight + tickHeight) / 2),
|
||||
Paint()
|
||||
..color = inkColor
|
||||
..strokeWidth = 1,
|
||||
);
|
||||
}
|
||||
|
||||
// 数值标注
|
||||
final textPainter = TextPainter(
|
||||
text: TextSpan(text: '1 : $scaleN', style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xFF4D8CFF))),
|
||||
textDirection: TextDirection.ltr,
|
||||
);
|
||||
textPainter.layout();
|
||||
textPainter.paint(canvas, Offset(size.width / 2 - 40, barY + barHeight + 16));
|
||||
}
|
||||
|
||||
@override
|
||||
bool shouldRepaint(covariant _ScalePainter oldDelegate) {
|
||||
return oldDelegate.mode != mode || oldDelegate.scaleN != scaleN;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
/// 比例尺预设
|
||||
class ScalePreset {
|
||||
final int n;
|
||||
final String nameKey;
|
||||
final String noteKey;
|
||||
|
||||
ScalePreset({required this.n, required this.nameKey, required this.noteKey});
|
||||
}
|
||||
|
||||
/// 比例尺光谱
|
||||
class ScaleSpectrum {
|
||||
final int n;
|
||||
final String labelKey;
|
||||
final String scopeKey;
|
||||
|
||||
ScaleSpectrum({required this.n, required this.labelKey, required this.scopeKey});
|
||||
}
|
||||
|
||||
/// 真实地标
|
||||
class Landmark {
|
||||
final String nameKey;
|
||||
final double meters;
|
||||
|
||||
Landmark({required this.nameKey, required this.meters});
|
||||
}
|
||||
@@ -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,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -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),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -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,
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -14,12 +14,32 @@ class _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.tune_rounded, 'nav.settings'),
|
||||
_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 {
|
||||
const ShellPage({super.key, required this.controller});
|
||||
@@ -52,6 +72,7 @@ class _ShellPageState extends State<ShellPage> {
|
||||
body: Row(
|
||||
children: <Widget>[
|
||||
_Sidebar(controller: controller),
|
||||
Container(width: 1, color: GcColors.line),
|
||||
Expanded(
|
||||
child: Column(
|
||||
children: <Widget>[
|
||||
@@ -69,15 +90,18 @@ class _ShellPageState extends State<ShellPage> {
|
||||
}
|
||||
|
||||
Widget _content(ShellController controller) {
|
||||
if (!controller.backendReady) {
|
||||
// 课件页是纯前端资源,不依赖后端:即使后端未就绪也可打开。
|
||||
// 注意 _buildPage 内部对 index 1 返回课件页,这里单独放行它。
|
||||
final courseware = controller.index == 1;
|
||||
if (!courseware && !controller.backendReady) {
|
||||
if (controller.loadError != null) {
|
||||
return _BackendDown(controller: controller);
|
||||
}
|
||||
return const Center(
|
||||
child: SizedBox(
|
||||
width: 26,
|
||||
height: 26,
|
||||
child: CircularProgressIndicator(strokeWidth: 2.4),
|
||||
width: 22,
|
||||
height: 22,
|
||||
child: CircularProgressIndicator(strokeWidth: 2),
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -104,10 +128,13 @@ class _ShellPageState extends State<ShellPage> {
|
||||
Widget _buildPage(ShellController controller, int index) {
|
||||
switch (index) {
|
||||
case 1:
|
||||
return DownloadPageView(controller: controller);
|
||||
// 课件页自持有 WebView 状态,不需要 controller。
|
||||
return const CoursewarePage();
|
||||
case 2:
|
||||
return SettingsPageView(controller: controller);
|
||||
return DownloadPageView(controller: controller);
|
||||
case 3:
|
||||
return SettingsPageView(controller: controller);
|
||||
case 4:
|
||||
return AboutPageView(controller: controller);
|
||||
default:
|
||||
return HomePageView(controller: controller);
|
||||
@@ -124,52 +151,25 @@ class _Sidebar extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
final settings = controller.settings;
|
||||
return Container(
|
||||
width: 236,
|
||||
width: GcSize.sidebar,
|
||||
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(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: <Widget>[
|
||||
Row(
|
||||
children: <Widget>[
|
||||
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),
|
||||
_brand(),
|
||||
const SizedBox(height: GcSpace.xxxl),
|
||||
const Padding(
|
||||
padding: EdgeInsets.only(left: 14, bottom: 6),
|
||||
padding: EdgeInsets.only(left: 10, bottom: GcSpace.sm),
|
||||
child: Text(
|
||||
'MENU',
|
||||
style: TextStyle(
|
||||
fontSize: 9.5,
|
||||
letterSpacing: 1.2,
|
||||
fontSize: 11,
|
||||
height: 1.2,
|
||||
letterSpacing: 1.4,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Color(0xFF4C5F80),
|
||||
color: Color(0xFF5C6A80),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -181,25 +181,91 @@ class _Sidebar extends StatelessWidget {
|
||||
),
|
||||
const Spacer(),
|
||||
Container(height: 1, color: GcColors.line),
|
||||
const SizedBox(height: 10),
|
||||
const SizedBox(height: GcSpace.md),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(left: 14),
|
||||
child: Text(
|
||||
'v${settings?.version ?? '—'}',
|
||||
style: TextStyle(fontSize: 10.5, color: GcColors.faint),
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(left: 14, top: 2),
|
||||
child: Text(
|
||||
settings?.platform ?? '—',
|
||||
style: const TextStyle(fontSize: 10, color: Color(0xFF4F6080)),
|
||||
padding: const EdgeInsets.only(left: 10),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: <Widget>[
|
||||
Text(
|
||||
'v${settings?.version ?? '—'}',
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
height: 1.4,
|
||||
fontWeight: FontWeight.w600,
|
||||
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 {
|
||||
@@ -216,29 +282,34 @@ class _NavButton extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(bottom: 4),
|
||||
padding: const EdgeInsets.only(bottom: GcSpace.xs),
|
||||
child: Material(
|
||||
color: active ? GcColors.surfaceAlt : Colors.transparent,
|
||||
borderRadius: BorderRadius.circular(9),
|
||||
color: active ? GcColors.accentSoft : Colors.transparent,
|
||||
borderRadius: BorderRadius.circular(GcRadius.control),
|
||||
child: InkWell(
|
||||
borderRadius: BorderRadius.circular(9),
|
||||
borderRadius: BorderRadius.circular(GcRadius.control),
|
||||
onTap: onTap,
|
||||
hoverColor: GcColors.surfaceHover,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: GcSpace.md,
|
||||
vertical: 11,
|
||||
),
|
||||
child: Row(
|
||||
children: <Widget>[
|
||||
Icon(
|
||||
item.icon,
|
||||
size: 16,
|
||||
size: 17,
|
||||
color: active ? GcColors.accent : GcColors.faint,
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
const SizedBox(width: GcSpace.md),
|
||||
Text(
|
||||
T(item.labelKey),
|
||||
style: TextStyle(
|
||||
fontSize: 12.5,
|
||||
fontSize: 13.5,
|
||||
height: 1.2,
|
||||
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,
|
||||
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(
|
||||
children: <Widget>[
|
||||
Text('⟳',
|
||||
style: TextStyle(fontSize: 16, color: GcColors.accent)),
|
||||
const SizedBox(width: 12),
|
||||
Icon(
|
||||
Icons.sync_rounded,
|
||||
size: 18,
|
||||
color: GcColors.accent,
|
||||
),
|
||||
const SizedBox(width: GcSpace.md),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: <Widget>[
|
||||
Text(
|
||||
controller.updateStatus,
|
||||
style: TextStyle(
|
||||
fontSize: 12.5,
|
||||
fontSize: 13,
|
||||
height: 1.35,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: GcColors.ink,
|
||||
),
|
||||
@@ -284,23 +363,41 @@ class _UpdateBar extends StatelessWidget {
|
||||
if (controller.updateDetail.isNotEmpty)
|
||||
Text(
|
||||
controller.updateDetail,
|
||||
style: TextStyle(fontSize: 11, color: GcColors.faint),
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
height: 1.4,
|
||||
color: GcColors.faint,
|
||||
),
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
if (controller.launcherNotice.isNotEmpty)
|
||||
Text(
|
||||
controller.launcherNotice,
|
||||
style: TextStyle(fontSize: 11, color: GcColors.warn),
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
height: 1.4,
|
||||
color: GcColors.warn,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
if (controller.updateBusy)
|
||||
const SizedBox(
|
||||
width: 130,
|
||||
child: LinearProgressIndicator(minHeight: 4),
|
||||
if (controller.updateBusy) ...<Widget>[
|
||||
const SizedBox(width: GcSpace.lg),
|
||||
SizedBox(
|
||||
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(
|
||||
onPressed: controller.updateBusy
|
||||
? null
|
||||
@@ -324,24 +421,32 @@ class _BackendDown extends StatelessWidget {
|
||||
child: ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 520),
|
||||
child: GcCard(
|
||||
padding: const EdgeInsets.all(28),
|
||||
padding: const EdgeInsets.all(GcSpace.xxl),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: <Widget>[
|
||||
Text(
|
||||
T('common.error'),
|
||||
style: TextStyle(
|
||||
fontSize: 17,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: GcColors.ink,
|
||||
),
|
||||
Row(
|
||||
children: <Widget>[
|
||||
Icon(Icons.error_outline_rounded,
|
||||
size: 20, color: GcColors.danger),
|
||||
const SizedBox(width: GcSpace.sm),
|
||||
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 ?? ''),
|
||||
const SizedBox(height: 6),
|
||||
GcHint('后端地址:${controller.api.baseUrl}'),
|
||||
const SizedBox(height: 16),
|
||||
const SizedBox(height: GcSpace.xs),
|
||||
GcHint('${T('set.backend')}: ${controller.api.baseUrl}'),
|
||||
const SizedBox(height: GcSpace.lg),
|
||||
FilledButton(
|
||||
onPressed: controller.bootstrap,
|
||||
child: Text(T('common.retry')),
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.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"
|
||||
@@ -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 */; };
|
||||
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
|
||||
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 */
|
||||
|
||||
/* Begin PBXContainerItemProxy section */
|
||||
@@ -60,11 +62,13 @@
|
||||
/* End PBXCopyFilesBuildPhase 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; };
|
||||
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>"; };
|
||||
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>"; };
|
||||
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>"; };
|
||||
@@ -76,8 +80,14 @@
|
||||
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>"; };
|
||||
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>"; };
|
||||
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>"; };
|
||||
A3E308B8A5C9BFB85DE87E1A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFrameworksBuildPhase section */
|
||||
@@ -85,6 +95,7 @@
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
6115A3AA09C0554E004627A7 /* Pods_RunnerTests.framework in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -92,6 +103,7 @@
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
D97968A61668AD5CB0F4AD81 /* Pods_Runner.framework in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -125,6 +137,7 @@
|
||||
331C80D6294CF71000263BE5 /* RunnerTests */,
|
||||
33CC10EE2044A3C60003C045 /* Products */,
|
||||
D73912EC22F37F3D000D13A0 /* Frameworks */,
|
||||
A82E8A367D68D5C69E25C9BA /* Pods */,
|
||||
);
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
@@ -172,9 +185,25 @@
|
||||
path = Runner;
|
||||
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 */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
A3E308B8A5C9BFB85DE87E1A /* Pods_Runner.framework */,
|
||||
8206FEA4073335056184BFE7 /* Pods_RunnerTests.framework */,
|
||||
);
|
||||
name = Frameworks;
|
||||
sourceTree = "<group>";
|
||||
@@ -186,6 +215,7 @@
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
|
||||
buildPhases = (
|
||||
EBEBA5BB2F5B8B60B8CBB8D2 /* [CP] Check Pods Manifest.lock */,
|
||||
331C80D1294CF70F00263BE5 /* Sources */,
|
||||
331C80D2294CF70F00263BE5 /* Frameworks */,
|
||||
331C80D3294CF70F00263BE5 /* Resources */,
|
||||
@@ -204,11 +234,13 @@
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
|
||||
buildPhases = (
|
||||
6098269FDFAA15D26448E434 /* [CP] Check Pods Manifest.lock */,
|
||||
33CC10E92044A3C60003C045 /* Sources */,
|
||||
33CC10EA2044A3C60003C045 /* Frameworks */,
|
||||
33CC10EB2044A3C60003C045 /* Resources */,
|
||||
33CC110E2044A8840003C045 /* Bundle Framework */,
|
||||
3399D490228B24CF009A79C7 /* ShellScript */,
|
||||
A1BACCAA4E3E0600DECC8167 /* [CP] Embed Pods Frameworks */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
@@ -329,6 +361,67 @@
|
||||
shellPath = /bin/sh;
|
||||
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 */
|
||||
|
||||
/* Begin PBXSourcesBuildPhase section */
|
||||
@@ -380,6 +473,7 @@
|
||||
/* Begin XCBuildConfiguration section */
|
||||
331C80DB294CF71000263BE5 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 75F404C3BC9A85A0940A1E7A /* Pods-RunnerTests.debug.xcconfig */;
|
||||
buildSettings = {
|
||||
BUNDLE_LOADER = "$(TEST_HOST)";
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
@@ -394,6 +488,7 @@
|
||||
};
|
||||
331C80DC294CF71000263BE5 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 8892D008E4FA6821A291BE17 /* Pods-RunnerTests.release.xcconfig */;
|
||||
buildSettings = {
|
||||
BUNDLE_LOADER = "$(TEST_HOST)";
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
@@ -408,6 +503,7 @@
|
||||
};
|
||||
331C80DD294CF71000263BE5 /* Profile */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 182DFB26FB114E38C6E212AD /* Pods-RunnerTests.profile.xcconfig */;
|
||||
buildSettings = {
|
||||
BUNDLE_LOADER = "$(TEST_HOST)";
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
@@ -461,7 +557,7 @@
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.14;
|
||||
MACOSX_DEPLOYMENT_TARGET = 12.0;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
SDKROOT = macosx;
|
||||
SWIFT_COMPILATION_MODE = wholemodule;
|
||||
@@ -543,7 +639,7 @@
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.14;
|
||||
MACOSX_DEPLOYMENT_TARGET = 12.0;
|
||||
MTL_ENABLE_DEBUG_INFO = YES;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
SDKROOT = macosx;
|
||||
@@ -593,7 +689,7 @@
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.14;
|
||||
MACOSX_DEPLOYMENT_TARGET = 12.0;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
SDKROOT = macosx;
|
||||
SWIFT_COMPILATION_MODE = wholemodule;
|
||||
|
||||
@@ -4,4 +4,7 @@
|
||||
<FileRef
|
||||
location = "group:Runner.xcodeproj">
|
||||
</FileRef>
|
||||
<FileRef
|
||||
location = "group:Pods/Pods.xcodeproj">
|
||||
</FileRef>
|
||||
</Workspace>
|
||||
@@ -6,6 +6,8 @@
|
||||
<true/>
|
||||
<key>com.apple.security.cs.allow-jit</key>
|
||||
<true/>
|
||||
<key>com.apple.security.network.client</key>
|
||||
<true/>
|
||||
<key>com.apple.security.network.server</key>
|
||||
<true/>
|
||||
</dict>
|
||||
|
||||
@@ -4,5 +4,9 @@
|
||||
<dict>
|
||||
<key>com.apple.security.app-sandbox</key>
|
||||
<true/>
|
||||
<key>com.apple.security.network.client</key>
|
||||
<true/>
|
||||
<key>com.apple.security.network.server</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -62,6 +62,70 @@ packages:
|
||||
description: flutter
|
||||
source: sdk
|
||||
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:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
@@ -75,6 +139,11 @@ packages:
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.0"
|
||||
flutter_web_plugins:
|
||||
dependency: transitive
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.0"
|
||||
http:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -155,6 +224,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
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:
|
||||
dependency: transitive
|
||||
description: flutter
|
||||
@@ -242,4 +319,4 @@ packages:
|
||||
version: "1.1.1"
|
||||
sdks:
|
||||
dart: ">=3.5.4 <4.0.0"
|
||||
flutter: ">=3.18.0-18.0.pre.54"
|
||||
flutter: ">=3.24.0"
|
||||
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||
# In Windows, build-name is used as the major, minor, and patch parts
|
||||
# of the product and file versions while build-number is used as the build suffix.
|
||||
version: 1.0.0+1
|
||||
version: 1.1.1+1
|
||||
|
||||
environment:
|
||||
sdk: ^3.5.4
|
||||
@@ -34,6 +34,9 @@ dependencies:
|
||||
# 与 GC-UI 后端(本地 HTTP 服务)通信
|
||||
http: ^1.2.2
|
||||
|
||||
# 桌面 WebView:承载离线等高线课件(Win/macOS/Linux)
|
||||
flutter_inappwebview: 6.1.5
|
||||
|
||||
# The following adds the Cupertino Icons font to your application.
|
||||
# Use with the CupertinoIcons class for iOS style icons.
|
||||
cupertino_icons: ^1.0.8
|
||||
@@ -60,10 +63,10 @@ flutter:
|
||||
# the material Icons class.
|
||||
uses-material-design: true
|
||||
|
||||
# To add assets to your application, add an assets section, like this:
|
||||
# assets:
|
||||
# - images/a_dot_burr.jpeg
|
||||
# - images/a_dot_ham.jpeg
|
||||
assets:
|
||||
# 离线等高线课件(去除授权验证后的纯净版),整体作为目录打包。
|
||||
- courseware/
|
||||
- courseware/assets/
|
||||
|
||||
# An image asset can refer to one or more resolution-specific "variants", see
|
||||
# https://flutter.dev/to/resolution-aware-images
|
||||
|
||||
@@ -21,9 +21,18 @@ import 'package:gc_ui/theme.dart';
|
||||
/// flutter test tool/render_shots_test.dart
|
||||
void main() {
|
||||
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>[
|
||||
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/truetype/noto/NotoSansCJK-Regular.ttc',
|
||||
];
|
||||
@@ -36,6 +45,22 @@ void main() {
|
||||
await loader.load();
|
||||
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>{
|
||||
@@ -123,9 +148,26 @@ void main() {
|
||||
'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,
|
||||
{Brightness brightness = Brightness.dark}) async {
|
||||
tester.view.physicalSize = const Size(1280, 820);
|
||||
{Brightness brightness = Brightness.dark,
|
||||
Size size = const Size(1280, 860)}) async {
|
||||
// 1280×860:与发布包窗口默认尺寸(1280×720)接近,再多留一点高度看得到
|
||||
// 底部状态条。像素比 1.0,方便逐像素检查描边和文字。
|
||||
tester.view.physicalSize = size;
|
||||
tester.view.devicePixelRatio = 1.0;
|
||||
addTearDown(tester.view.reset);
|
||||
|
||||
@@ -136,10 +178,13 @@ void main() {
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
debugShowCheckedModeBanner: false,
|
||||
theme: buildGcTheme(brightness).copyWith(
|
||||
textTheme: buildGcTheme(brightness).textTheme.apply(
|
||||
fontFamily: 'Noto Sans CJK SC',
|
||||
),
|
||||
// 四个页面都用预置数据渲染,不需要后端;字体统一换成测试里加载的
|
||||
// 那一套,并且清空 fallback —— 否则主题里的按钮 / 输入框样式会去
|
||||
// 找系统字体(测试环境没有),缺字处就画成方块。
|
||||
theme: buildGcTheme(
|
||||
brightness,
|
||||
fontFamily: 'Noto Sans CJK SC',
|
||||
fontFamilyFallback: const <String>[],
|
||||
),
|
||||
home: RepaintBoundary(
|
||||
key: key,
|
||||
@@ -148,25 +193,27 @@ void main() {
|
||||
),
|
||||
);
|
||||
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));
|
||||
|
||||
final boundary =
|
||||
key.currentContext!.findRenderObject()! as RenderRepaintBoundary;
|
||||
final image = await boundary.toImage(pixelRatio: 1.0);
|
||||
final bytes = await image.toByteData(format: ui.ImageByteFormat.png);
|
||||
// toImage / toByteData 要走真实引擎的异步管线,必须放在 runAsync 里,
|
||||
// 否则 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);
|
||||
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 {
|
||||
@@ -174,7 +221,8 @@ void main() {
|
||||
await shoot(
|
||||
tester,
|
||||
'home',
|
||||
HomePageView(controller: sampleController(), initialModels: sampleModels()),
|
||||
HomePageView(
|
||||
controller: sampleController(), initialModels: sampleModels()),
|
||||
);
|
||||
});
|
||||
|
||||
@@ -261,7 +309,8 @@ void main() {
|
||||
|
||||
testWidgets('settings', (tester) async {
|
||||
I18n.language.value = 'zh-CN';
|
||||
await shoot(tester, 'settings', SettingsPageView(controller: sampleController()));
|
||||
await shoot(
|
||||
tester, 'settings', SettingsPageView(controller: sampleController()));
|
||||
});
|
||||
|
||||
testWidgets('about', (tester) async {
|
||||
@@ -292,7 +341,77 @@ void main() {
|
||||
|
||||
testWidgets('shell', (tester) async {
|
||||
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 {
|
||||
@@ -300,7 +419,8 @@ void main() {
|
||||
await shoot(
|
||||
tester,
|
||||
'home-light',
|
||||
HomePageView(controller: sampleController(), initialModels: sampleModels()),
|
||||
HomePageView(
|
||||
controller: sampleController(), initialModels: sampleModels()),
|
||||
brightness: Brightness.light,
|
||||
);
|
||||
});
|
||||
@@ -315,3 +435,9 @@ void main() {
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
/// 只用于截图的 controller:不连后端,避免挂上重试定时器。
|
||||
class _StubShellController extends ShellController {
|
||||
@override
|
||||
Future<void> bootstrap() async {}
|
||||
}
|
||||
@@ -5,8 +5,81 @@
|
||||
#include "flutter_window.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,
|
||||
_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
|
||||
// new console when running with a debugger.
|
||||
if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) {
|
||||
|
||||
@@ -134,11 +134,27 @@ bool Win32Window::Create(const std::wstring& title,
|
||||
UINT dpi = FlutterDesktopGetDpiForMonitor(monitor);
|
||||
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(
|
||||
window_class, title.c_str(), WS_OVERLAPPEDWINDOW,
|
||||
Scale(origin.x, scale_factor), Scale(origin.y, scale_factor),
|
||||
Scale(size.width, scale_factor), Scale(size.height, scale_factor),
|
||||
nullptr, nullptr, GetModuleHandle(nullptr), this);
|
||||
physical_width, physical_height, nullptr, nullptr,
|
||||
GetModuleHandle(nullptr), this);
|
||||
|
||||
if (!window) {
|
||||
return false;
|
||||
|
||||
@@ -61,6 +61,9 @@ public static class ContributorsService
|
||||
["2509_92447106"] = "Morris",
|
||||
["chenmoyuan1214@qq.com"] = "Morris",
|
||||
["morris@xhmcl.com"] = "Morris",
|
||||
// 早期提交用的是 xhgit 这个账号,展示名统一成 itxiaohui
|
||||
["xhgit"] = "itxiaohui",
|
||||
["itxiaohui"] = "itxiaohui",
|
||||
};
|
||||
|
||||
/// <summary>自动化提交(CI / 助手账号),不计入开发者。</summary>
|
||||
|
||||
@@ -167,11 +167,22 @@ public static class GcUiContract
|
||||
public const int DefaultPort = 17890;
|
||||
|
||||
/// <summary>端口被占用时最多向后尝试几个。</summary>
|
||||
public const int PortScanRange = 10;
|
||||
/// <remarks>现代机器上端口占用较频繁,30 个端口足够覆盖常见冲突场景。</remarks>
|
||||
public const int PortScanRange = 30;
|
||||
|
||||
/// <summary>传给后端与前端的环境变量名。</summary>
|
||||
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>
|
||||
public static int PortFromEnvironment()
|
||||
{
|
||||
@@ -180,4 +191,25 @@ public static class GcUiContract
|
||||
? port
|
||||
: 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();
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
|
||||
@@ -15,15 +16,32 @@ namespace GC.Services;
|
||||
/// 中英分开而不是写在一个文件里:用户排查时不用在一行里找自己看得懂的那半句;
|
||||
/// 也给反馈问题时直接发对应语言的文件即可。
|
||||
///
|
||||
/// 写入方式:常驻 <see cref="StreamWriter"/>(<c>AutoFlush</c> 打开,崩溃也不丢最后几行),
|
||||
/// 不再每行 open/append/close 一遍 —— 那条路径每写一行要开两个文件句柄,
|
||||
/// 在下载 / 启动高峰期会明显拖慢调用方。
|
||||
///
|
||||
/// 保留策略:<see cref="RetentionDays"/> 天之前的日志在初始化与跨天滚动时删除;
|
||||
/// 总量超过 <see cref="MaxTotalBytes"/> 时从最旧的开始删。日志目录不会无限长。
|
||||
///
|
||||
/// 日志失败绝不影响主流程(磁盘满、只读目录都只是少一份日志)。
|
||||
/// </summary>
|
||||
public static class GcLog
|
||||
{
|
||||
/// <summary>日志保留天数。</summary>
|
||||
/// <remarks>14 天对日常排障够用,但双语言 + 高活跃度时容易触及总量上限导致批量删除;
|
||||
/// 7 天更合理:用户反馈问题时最近 3 天就够,7 天能覆盖一周内的连续问题。</remarks>
|
||||
public const int RetentionDays = 7;
|
||||
|
||||
/// <summary>日志目录总量上限(中英两份合计)。</summary>
|
||||
public const long MaxTotalBytes = 64L * 1024 * 1024;
|
||||
|
||||
private static readonly object Gate = new();
|
||||
private const string FilePrefix = "gc-";
|
||||
|
||||
private static string? _dir;
|
||||
private static string _day = "";
|
||||
private static string _zhPath = "";
|
||||
private static string _enPath = "";
|
||||
private static StreamWriter? _zh;
|
||||
private static StreamWriter? _en;
|
||||
|
||||
public static bool Enabled
|
||||
{
|
||||
@@ -45,8 +63,10 @@ public static class GcLog
|
||||
|
||||
lock (Gate)
|
||||
{
|
||||
CloseWriters();
|
||||
_dir = dir;
|
||||
_day = "";
|
||||
PruneOldFiles(dir);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,10 +78,8 @@ public static class GcLog
|
||||
{
|
||||
var now = DateTime.Now;
|
||||
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)
|
||||
{
|
||||
@@ -70,25 +88,121 @@ public static class GcLog
|
||||
var day = now.ToString("yyyyMMdd");
|
||||
if (day != _day)
|
||||
{
|
||||
// 跨天换文件;顺便清一次旧日志,长时间挂机的进程也不会攒满磁盘
|
||||
CloseWriters();
|
||||
_day = day;
|
||||
_zhPath = Path.Combine(_dir, $"gc-{day}.log");
|
||||
_enPath = Path.Combine(_dir, $"gc-{day}.en.log");
|
||||
PruneOldFiles(_dir);
|
||||
}
|
||||
|
||||
Append(_zhPath, lineZh);
|
||||
Append(_enPath, lineEn);
|
||||
if (_zh == null)
|
||||
{
|
||||
_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
|
||||
{
|
||||
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
|
||||
{
|
||||
// 日志失败不能影响程序
|
||||
// 写不了就不写;下一次跨天会再试一次
|
||||
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);
|
||||
}
|
||||
}
|
||||
@@ -24,6 +24,9 @@ public sealed class MemoryBudget
|
||||
/// <summary>
|
||||
/// 自动预算:取设备可用物理内存的一部分(约 1/4),
|
||||
/// 夹在 512–8192 MB 之间,低配设备也不会因为预算过大而卡顿。
|
||||
/// 注意:这里用的是 GC 托管堆预算(TotalAvailableMemoryBytes),
|
||||
/// 不是整机物理内存。模型进程(Avalonia)单独消耗内存,
|
||||
/// 所以这个值偏保守是安全的——宁可让模型窗口慢一点,也不要 OOM。
|
||||
/// </summary>
|
||||
public static int AutoComputeMb()
|
||||
{
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
<TextBlock Classes="faint" Text="{Binding PlatformText}" />
|
||||
</StackPanel>
|
||||
|
||||
<Grid ColumnDefinitions="96,*" RowDefinitions="Auto,Auto">
|
||||
<Grid ColumnDefinitions="96,*" RowDefinitions="Auto,Auto,Auto">
|
||||
<TextBlock Classes="h3" Text="版本" />
|
||||
<TextBlock Grid.Column="1" Classes="muted" Text="{Binding VersionText}"
|
||||
FontWeight="SemiBold" />
|
||||
@@ -38,6 +38,10 @@
|
||||
HorizontalAlignment="Left" Padding="0"
|
||||
Command="{Binding OpenRepositoryCommand}"
|
||||
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>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
@@ -76,6 +80,22 @@
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</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>
|
||||
</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>
|
||||
@@ -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}");
|
||||
}
|
||||
}
|
||||
@@ -51,7 +51,9 @@ internal static class Program
|
||||
RenderPages(services);
|
||||
|
||||
Console.WriteLine("截图输出: " + Path.GetFullPath(_outDir));
|
||||
return 0;
|
||||
|
||||
// 日志模块的用例放在渲染之后:它会切换 GcLog 的输出目录
|
||||
return LogTests.Run() == 0 ? 0 : 1;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -69,7 +69,8 @@ Windows 用 `.\build.ps1`,参数相同(`build / check / models / stamp / run
|
||||
|
||||
就这些,没有一屏 dll。安装目录根只放 GC 本体,非本体文件(守护进程)一律收在 `.GC/bin`。
|
||||
macOS 是同一个单文件启动器,只是被放进 `GCL-<版本>-mac-arm64.app/Contents/MacOS/`,
|
||||
Flutter 前端作为 `GC-UI.app` 放在同一层。
|
||||
Flutter 前端作为 `GC-UI.app` 放在同一层;`.GC` 位置不变,仍在启动器同级
|
||||
(`.app/Contents/MacOS/`),守护进程同样收在 `.app/Contents/MacOS/.GC/bin/`。
|
||||
|
||||
首次启动后 `.GC` 补齐成:
|
||||
|
||||
|
||||
@@ -59,9 +59,11 @@ mkdir -p "$ROOT_DIR/build/logs"
|
||||
. "$ROOT_DIR/buildsh/build.sh"
|
||||
. "$ROOT_DIR/buildsh/check.sh"
|
||||
. "$ROOT_DIR/buildsh/tools.sh"
|
||||
. "$ROOT_DIR/buildsh/release.sh"
|
||||
|
||||
case "$TASK" in
|
||||
build) bs_build "$ROOT_DIR" ;;
|
||||
check) bs_check "$ROOT_DIR" ;;
|
||||
build) bs_build "$ROOT_DIR" ;;
|
||||
check) bs_check "$ROOT_DIR" ;;
|
||||
release-verify) bs_verify_release "$ROOT_DIR" "$@" ;;
|
||||
*) bs_tools "$ROOT_DIR" "$TASK" ;;
|
||||
esac
|
||||
@@ -6,7 +6,12 @@ function Invoke-BuildTool {
|
||||
'pack-models' { Build-Models; Pack-Models }
|
||||
'pack-launcher'{ Pack-Launcher }
|
||||
'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" } }
|
||||
'clean' {
|
||||
Remove-Item (Join-Path $script:BuildRoot 'build'), (Join-Path $script:BuildRoot 'dist') -Recurse -Force -ErrorAction SilentlyContinue
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
param(
|
||||
[Parameter(Position = 0)]
|
||||
[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]$Version = ''
|
||||
)
|
||||
@@ -23,7 +23,8 @@ try {
|
||||
if (-not $Version) { $Version = '1.0.0' }
|
||||
$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 节点。' }
|
||||
$versionNode.InnerText = $Version
|
||||
$props.Save((Join-Path $script:BuildRoot 'Directory.Build.props'))
|
||||
@@ -37,9 +38,10 @@ try {
|
||||
. (Join-Path $PSScriptRoot 'Build-Tools.ps1')
|
||||
|
||||
switch ($Task) {
|
||||
'build' { Invoke-FullBuild }
|
||||
'check' { Invoke-BuildCheck }
|
||||
default { Invoke-BuildTool $Task }
|
||||
'build' { Invoke-FullBuild }
|
||||
'check' { Invoke-BuildCheck }
|
||||
'release-verify' { Invoke-ReleaseVerify -Tag $Version }
|
||||
default { Invoke-BuildTool $Task }
|
||||
}
|
||||
}
|
||||
finally {
|
||||
|
||||
@@ -18,7 +18,9 @@ function Invoke-ManifestSign {
|
||||
Write-Host '!! 未找到签名私钥 .signing/gc-signing.pem,version.json 未签名(客户端会拒绝更新)'
|
||||
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)"
|
||||
Invoke-LoggedDotNet -Name 'sign' -Arguments @(
|
||||
'run', '--project', (Join-Path $script:BuildRoot 'GC-SAVEDOG/GC-SAVEDOG.csproj'),
|
||||
@@ -30,7 +32,7 @@ function Invoke-ManifestSign {
|
||||
}
|
||||
|
||||
function Invoke-VersionStamp {
|
||||
param([switch]$LauncherOnly)
|
||||
param([switch]$LauncherOnly, [switch]$NoSign)
|
||||
if ($LauncherOnly) {
|
||||
Write-Host '==> 刷新启动器包信息(sha256 / 体积 / dist 路径)'
|
||||
Invoke-LoggedDotNet -Name 'stamp' -Arguments @(
|
||||
@@ -45,7 +47,14 @@ function Invoke-VersionStamp {
|
||||
$script:BuildRoot, $script:BuildVersion
|
||||
)
|
||||
}
|
||||
Invoke-ManifestSign
|
||||
# 完整 build 末尾 Pack-Launcher 会统一签一次(末次签名);中间这次是浪费的。
|
||||
# 单独的 stamp / models 工具没有后续打包,仍走默认签名。
|
||||
if ($NoSign) {
|
||||
Write-Host ' (跳过签名,打包结束后统一签一次)'
|
||||
}
|
||||
else {
|
||||
Invoke-ManifestSign
|
||||
}
|
||||
}
|
||||
|
||||
function Build-Models {
|
||||
@@ -78,44 +87,41 @@ function Prepare-RuntimeLayout {
|
||||
$destination = Join-Path $script:BuildRoot $RelativePath
|
||||
if (-not (Test-Path $destination)) { return }
|
||||
|
||||
Remove-Item (Join-Path $destination 'model'), (Join-Path $destination 'examples') -Recurse -Force -ErrorAction SilentlyContinue
|
||||
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
|
||||
Set-Content -Path (Join-Path $destination '.GC/model/README.txt') -Encoding UTF8 -Value @'
|
||||
模型库目录(.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/ 待下次启动应用的启动器更新
|
||||
'@
|
||||
$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": []
|
||||
# 与 buildsh/lib/build_funcs.sh 一致:发布目录只放程序本体,不预置 .GC。
|
||||
# .GC(config / model / cache / update / safedog / logs)一律在首次启动时
|
||||
# 由 AppPaths.EnsureCreated + RuntimeLayout 创建,压缩包里只有 GC 本体。
|
||||
Remove-Item (Join-Path $destination 'model'), (Join-Path $destination 'examples'), (Join-Path $destination '.GC') -Recurse -Force -ErrorAction SilentlyContinue
|
||||
Write-Host " 运行目录 -> $RelativePath(首次启动后生成 .GC/:config model cache update safedog logs)"
|
||||
}
|
||||
'@
|
||||
|
||||
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 {
|
||||
@@ -132,18 +138,22 @@ function Publish-Rid {
|
||||
'publish', $script:AppProject, '-c', 'Release', '-r', $Rid,
|
||||
'--self-contained', 'true', "-p:Version=$script:BuildVersion", '-p:DebugType=none',
|
||||
"-p:PublishSingleFile=$singleValue", "-p:IncludeNativeLibrariesForSelfExtract=$singleValue",
|
||||
"-p:EnableCompressionInSingleFile=$singleValue",
|
||||
'-p:PublishTrimmed=false', '-o', $outputPath
|
||||
)
|
||||
|
||||
# 更新守护进程:与主程序同目录(裁剪单文件,70MB -> 14MB)
|
||||
# 裁剪的前提是 JSON 全部走源生成上下文(GC-SAVEDOG/SavedogJson.cs)
|
||||
# 更新守护进程:与主程序同目录(裁剪 + 压缩单文件,70MB -> 14MB)
|
||||
# 裁剪的前提是 JSON 全部走源生成上下文(GC-SAVEDOG/SavedogJson.cs)。
|
||||
# EnableCompressionInSingleFile:守护进程不常驻,只在更新时跑一次,
|
||||
# 解压一次换来更小的包,对「只在更新时下载」的场景很划算。
|
||||
$savedogProj = Join-Path $script:BuildRoot 'GC-SAVEDOG/GC-SAVEDOG.csproj'
|
||||
if (Test-Path $savedogProj) {
|
||||
Write-Host "==> 编译 GC-SAVEDOG ($Rid)(裁剪单文件)"
|
||||
Write-Host "==> 编译 GC-SAVEDOG ($Rid)(裁剪 + 压缩单文件)"
|
||||
Invoke-LoggedDotNet -Name "savedog-$($Rid -replace '-', '')" -Arguments @(
|
||||
'publish', $savedogProj, '-c', 'Release', '-r', $Rid,
|
||||
'--self-contained', 'true', "-p:Version=$script:BuildVersion", '-p:DebugType=none',
|
||||
'-p:PublishSingleFile=true', '-p:IncludeNativeLibrariesForSelfExtract=true',
|
||||
'-p:EnableCompressionInSingleFile=true',
|
||||
'-p:PublishTrimmed=true', '-p:TrimMode=full',
|
||||
'-p:JsonSerializerIsReflectionEnabledByDefault=false', '-o', $outputPath
|
||||
)
|
||||
@@ -178,35 +188,60 @@ function Pack-Models {
|
||||
|
||||
function Pack-Launcher {
|
||||
$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' })) {
|
||||
# 产物落点 dist/<系统>-<架构>/,与 dist/mac-arm64 一致
|
||||
$sourceDir = Join-Path $dist $platform.Label
|
||||
if (-not (Test-Path $sourceDir)) { $sourceDir = Join-Path $dist $platform.Rid }
|
||||
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)"
|
||||
$pkg = Join-Path $temp $pkgName
|
||||
Remove-Item $temp -Recurse -Force -ErrorAction SilentlyContinue
|
||||
New-Item -ItemType Directory -Force -Path $temp | Out-Null
|
||||
Copy-Item $executable.FullName (Join-Path $temp "GC-$script:BuildVersion-$($platform.Label).exe") -Force
|
||||
$savedogExe = Join-Path $sourceDir 'GC-SAVEDOG.exe'
|
||||
if (Test-Path $savedogExe) { Copy-Item $savedogExe (Join-Path $temp 'GC-SAVEDOG.exe') -Force }
|
||||
New-Item -ItemType Directory -Force -Path $pkg | Out-Null
|
||||
Get-ChildItem $sourceDir -Force | Where-Object { $_.Extension -ne '.zip' } | Copy-Item -Destination $pkg -Recurse -Force
|
||||
Prune-Package -Destination $pkg -Platform 'win'
|
||||
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
|
||||
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
|
||||
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'
|
||||
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
|
||||
Move-Item $macApp $finalApp
|
||||
$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 :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 }
|
||||
}
|
||||
|
||||
# Windows 的 zip 已在上面的循环里生成(含 GC-SAVEDOG.exe),这里只处理 .app
|
||||
Get-ChildItem $dist | Where-Object { $_.Name -like "GC-$script:BuildVersion-*.app" } | ForEach-Object {
|
||||
$label = $_.BaseName -replace "^GC-$([regex]::Escape($script:BuildVersion))-", ''
|
||||
# --- 统一压缩:.app -> 同名 .zip,放进平台目录 ---
|
||||
Get-ChildItem $dist | Where-Object { $_.Name -like "GCL-$script:BuildVersion-*.app" } | ForEach-Object {
|
||||
$label = $_.BaseName -replace "^GCL-$([regex]::Escape($script:BuildVersion))-", ''
|
||||
$targetDir = Join-Path $dist $label
|
||||
New-Item -ItemType Directory -Force -Path $targetDir | Out-Null
|
||||
$zipPath = Join-Path $targetDir ($_.BaseName + '.zip')
|
||||
Remove-Item $zipPath -Force -ErrorAction SilentlyContinue
|
||||
if ($_.PSIsContainer) {
|
||||
Remove-Item (Join-Path $_.FullName 'Contents/MacOS/.GC') -Recurse -Force -ErrorAction SilentlyContinue
|
||||
}
|
||||
if ($_.PSIsContainer -and (Get-Command ditto -ErrorAction SilentlyContinue)) {
|
||||
if (Get-Command ditto -ErrorAction SilentlyContinue) {
|
||||
& ditto -c -k --sequesterRsrc --keepParent $_.FullName $zipPath
|
||||
if ($LASTEXITCODE -ne 0) { throw "ditto 压缩失败:$($_.Name)" }
|
||||
}
|
||||
@@ -239,26 +279,26 @@ function Pack-Launcher {
|
||||
Write-Host " -> dist/$label/$($_.BaseName).zip"
|
||||
}
|
||||
|
||||
# 原始产物(.exe / .app 目录)不再保留:只发布 zip
|
||||
# 原始产物(.exe / .app 目录)不再保留:只发布 zip(移入暂存区,不做递归删除)
|
||||
$trash = Join-Path $script:BuildRoot 'build/trash'
|
||||
New-Item -ItemType Directory -Force -Path $trash | Out-Null
|
||||
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 {
|
||||
Move-Item $_.FullName (Join-Path $trash "$($_.Name)-$([DateTime]::Now.Ticks)") -Force -ErrorAction SilentlyContinue
|
||||
}
|
||||
Remove-IntermediateDirectories
|
||||
Invoke-VersionStamp -LauncherOnly
|
||||
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 {
|
||||
# 平台目录里只留最终 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"
|
||||
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
|
||||
}
|
||||
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"
|
||||
}
|
||||
|
||||
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 {
|
||||
Initialize-BuildProgress @('清理旧产物', '版本戳', '编译 Mac', '编译 Win-x64', '编译 Win-arm64', '运行骨架', '打包 zip', '收尾')
|
||||
try {
|
||||
@@ -322,10 +392,12 @@ function Invoke-FullBuild {
|
||||
New-Item -ItemType Directory -Force -Path (Join-Path $script:BuildRoot 'dist') | Out-Null
|
||||
Complete-BuildStep
|
||||
|
||||
Start-BuildStep '版本戳'; Invoke-VersionStamp; Complete-BuildStep
|
||||
Start-BuildStep '编译 Mac'; Publish-Rid 'osx-arm64' 'dist/mac-arm64' $false; Complete-BuildStep
|
||||
Start-BuildStep '编译 Win-x64'; Publish-Rid 'win-x64' 'dist/win-amd64' $false; Complete-BuildStep
|
||||
Start-BuildStep '编译 Win-arm64'; Publish-Rid 'win-arm64' 'dist/win-arm64' $false; Complete-BuildStep
|
||||
# 末次签名:这里只生成清单不签名,Pack-Launcher 打完包后统一签一次
|
||||
Start-BuildStep '版本戳'; Invoke-VersionStamp -NoSign; Complete-BuildStep
|
||||
# 与 buildsh 一致:启动器与守护进程都发布为压缩单文件,非本体文件在打包时收进 .GC/bin
|
||||
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 '运行骨架'
|
||||
New-MacAppBundle
|
||||
@@ -337,7 +409,7 @@ function Invoke-FullBuild {
|
||||
Start-BuildStep '打包 zip'; Pack-Launcher; Complete-BuildStep
|
||||
Start-BuildStep '收尾'; Complete-BuildStep
|
||||
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 }
|
||||
}
|
||||
@@ -71,7 +71,9 @@ bs_build() {
|
||||
fi
|
||||
|
||||
progress_step "版本戳"; progress_tick 100
|
||||
stamp_versions
|
||||
# 末次签名:这里只生成清单不签名,等 pack_launcher 打完 zip、刷新完包信息后统一签一次。
|
||||
# 避免 ECDSA 随机签名 + 时间戳导致清单在中间反复变化。
|
||||
stamp_versions --no-sign
|
||||
|
||||
# 每个 publish 用后台任务包裹,边跑边按「已用时/预估用时」推进当前步骤进度
|
||||
_run_publish() {
|
||||
|
||||
@@ -44,6 +44,19 @@ string(REPLACE "#define VERSION_AS_STRING FLUTTER_VERSION"
|
||||
_rc_text "${_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
|
||||
"${RUN_DIR}/main.cpp"
|
||||
"${RUN_DIR}/flutter_window.cpp"
|
||||
|
||||
@@ -6,10 +6,17 @@
|
||||
if ! type step >/dev/null 2>&1; then step() { echo "==> $1"; }; fi
|
||||
if ! type progress >/dev/null 2>&1; then progress() { :; }; fi
|
||||
|
||||
# $1=--no-sign 时只生成清单、不签名。
|
||||
# 完整 build 会在 pack_launcher 末尾统一签一次(末次签名),中间这次签名是浪费的:
|
||||
# ECDSA 用随机 nonce + signedAt 时间戳,每次签名字节都不同,白白多一次全量签名,
|
||||
# 也让中间产物反复抖动。单独的 stamp / models 工具没有后续打包,仍走默认签名。
|
||||
stamp_versions() {
|
||||
echo "==> 自动计算模型版本并生成 version.json"
|
||||
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)。
|
||||
@@ -168,7 +175,7 @@ pack_models() {
|
||||
ZIP="$ROOT_DIR/dist/models-$VERSION.zip"
|
||||
rm -f "$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" )
|
||||
du -sh "$ZIP"
|
||||
}
|
||||
@@ -188,24 +195,6 @@ pack_models() {
|
||||
# macOS: .app 必须打成 zip 才能作为单文件分发;文件名用 .app.zip,
|
||||
# 这样 macOS 双击会用归档工具解压出可运行的 .app。
|
||||
# 若直接命名 .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=true \
|
||||
-p:IncludeNativeLibrariesForSelfExtract=true \
|
||||
-p:EnableCompressionInSingleFile=true \
|
||||
-p:PublishTrimmed=false \
|
||||
-o "$ROOT_DIR/$OUT" || return 1
|
||||
}
|
||||
|
||||
# 当前主机原生构建 Flutter 前端(Windows 主机编 Windows,macOS 主机编 macOS,
|
||||
# Linux 主机编 Linux)。跨平台的 Windows 版由 build_flutter_ui_cross 负责。
|
||||
#
|
||||
@@ -339,7 +328,7 @@ pack_launcher() {
|
||||
|
||||
ZIP="$ROOT_DIR/dist/$LABEL/$PKGNAME.zip"
|
||||
rm -f "$ZIP"
|
||||
( cd "$TMP" && zip -qr "$ZIP" "$PKGNAME" )
|
||||
( cd "$TMP" && zip -qrX "$ZIP" "$PKGNAME" )
|
||||
rm -rf "$TMP"
|
||||
echo " -> dist/$LABEL/$PKGNAME.zip"
|
||||
done
|
||||
@@ -367,7 +356,7 @@ pack_launcher() {
|
||||
fi
|
||||
ZIP="$ROOT_DIR/dist/linux-arm64/$PKGNAME.zip"
|
||||
rm -f "$ZIP"
|
||||
( cd "$TMP" && zip -qry "$ZIP" "$PKGNAME" )
|
||||
( cd "$TMP" && zip -qryX "$ZIP" "$PKGNAME" )
|
||||
rm -rf "$TMP"
|
||||
echo " -> dist/linux-arm64/$PKGNAME.zip"
|
||||
fi
|
||||
@@ -384,6 +373,13 @@ pack_launcher() {
|
||||
/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
|
||||
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
|
||||
echo " -> $(basename "$FINAL")/"
|
||||
fi
|
||||
@@ -405,10 +401,10 @@ pack_launcher() {
|
||||
if command -v ditto >/dev/null 2>&1; then
|
||||
ditto -c -k --sequesterRsrc --keepParent "$art" "$ZIP"
|
||||
else
|
||||
( cd "$(dirname "$art")" && zip -qry "$ZIP" "$base" -x "*.DS_Store" )
|
||||
( cd "$(dirname "$art")" && zip -qryX "$ZIP" "$base" -x "*.DS_Store" )
|
||||
fi
|
||||
else
|
||||
( cd "$(dirname "$art")" && zip -q "$ZIP" "$base" )
|
||||
( cd "$(dirname "$art")" && zip -qX "$ZIP" "$base" )
|
||||
fi
|
||||
echo " -> dist/${label}/${name}.zip"
|
||||
done
|
||||
@@ -489,7 +485,8 @@ PLIST
|
||||
fi
|
||||
fi
|
||||
|
||||
# 发布包不带 .GC 运行骨架(用户首次启动自行创建),避免覆盖用户数据
|
||||
# 清掉模板类 .GC(config / model / cache / update / logs):首次启动自行创建,
|
||||
# 包里只保留 .GC/bin 这一个由 pack_launcher 补上的非本体文件目录。
|
||||
rm -rf "$APP/Contents/MacOS/.GC"
|
||||
chmod +x "$APP/Contents/MacOS/GC"
|
||||
echo "==> 已打包 $APP"
|
||||
|
||||
@@ -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())
|
||||
@@ -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
|
||||
}
|
||||
@@ -26,7 +26,7 @@ bs_tools() {
|
||||
dotnet --info | head -20 ;;
|
||||
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 ;;
|
||||
esac
|
||||
|
||||
@@ -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.png",
|
||||
topImage: "assets/peak-top.png",
|
||||
alt: "山峰立体示意图,蓝色等高线围绕山体逐级闭合",
|
||||
topAlt: "山峰真实俯视图,多层近同心闭合等高线向中心收缩",
|
||||
summary: "山峰四周较低、中心突起;等高线闭合成环,海拔数值由外向内逐渐升高。",
|
||||
features: ["中心海拔高、四周海拔低", "闭合线越向内,数值越大", "若数值向内降低,则应判为洼地"],
|
||||
hint: "山峰:闭合曲线,数值向中心升高"
|
||||
},
|
||||
ridge: {
|
||||
name: "山脊",
|
||||
subtitle: "凸低为脊",
|
||||
image: "assets/ridge-3d.png",
|
||||
topImage: "assets/ridge-top.png",
|
||||
alt: "山脊立体示意图,蓝色等高线沿凸出的脊线向低处弯曲",
|
||||
topAlt: "山脊真实俯视图,等高线沿狭长高地呈舌状延伸",
|
||||
summary: "等高线弯曲部分向海拔低处凸出,脊线常成为两侧水系的分水岭。",
|
||||
features: ["等高线凸向低值方向", "脊线由高处向低处延伸", "雨水沿脊线两侧分流"],
|
||||
hint: "山脊:等高线向低处凸出,凸低为脊"
|
||||
},
|
||||
valley: {
|
||||
name: "山谷",
|
||||
subtitle: "凸高为谷",
|
||||
image: "assets/valley-3d.png",
|
||||
topImage: "assets/valley-top.png",
|
||||
alt: "山谷立体示意图,两座山体之间的谷地有河流穿过",
|
||||
topAlt: "山谷真实俯视图,两侧坡面夹持低槽,等高线形成 V 形凹入",
|
||||
summary: "等高线弯曲部分向海拔高处凸出,谷底低洼并容易汇水形成河流。",
|
||||
features: ["等高线凸向高值方向", "V 形尖端指向上游高处", "谷底常发育河流"],
|
||||
hint: "山谷:等高线向高处凸出,凸高为谷"
|
||||
},
|
||||
saddle: {
|
||||
name: "鞍部",
|
||||
subtitle: "两峰之间",
|
||||
image: "assets/saddle-3d.png",
|
||||
topImage: "assets/saddle-top.png",
|
||||
alt: "鞍部立体示意图,两座山峰之间形成马鞍状低地",
|
||||
topAlt: "鞍部真实俯视图,两组峰顶闭合圈之间的等高线明显收腰",
|
||||
summary: "鞍部位于相邻两座山峰之间,是沿山脊方向相对低洼的过渡地带。",
|
||||
features: ["两组闭合等高线相邻", "中部线条收窄,形似马鞍", "常是翻越山岭的低垭口"],
|
||||
hint: "鞍部:两峰之间相对低洼,俯视轮廓呈收腰形"
|
||||
},
|
||||
cliff: {
|
||||
name: "陡崖",
|
||||
subtitle: "密集或重合",
|
||||
image: "assets/cliff-3d.png",
|
||||
topImage: "assets/cliff-top.png",
|
||||
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
|
||||
};
|
||||
})();
|
||||
|
After Width: | Height: | Size: 2.6 MiB |
|
After Width: | Height: | Size: 3.3 MiB |
|
After Width: | Height: | Size: 2.4 MiB |