Compare commits

...
Author SHA1 Message Date
Morris 926a568dc0 Merge branch 'main' into feat/flutter-ui 2026-11-18 04:37:15 +00:00
Morris cd44c7ecff feat(ui): 启动器接入 Flutter 前端 · 公司名统一 Morris · 模型版本 +1
- GC-BOOT 新增 FlutterShell:随包带 GC.UI.Server 与 GC-UI 时,拉起「本地后端 + Flutter 窗口」,界面退出后一起收尾;缺任一产物则回退内置 Avalonia 界面
- 构建脚本新增 publish_backend(三平台发布 UI 后端)与 build_flutter_ui(宿主平台构建 Flutter 桌面产物)
- Windows 打包由「单文件 exe」改为整目录,包含启动器、GC-SAVEDOG、UI 后端与可选 Flutter 产物
- Flutter 工程:Windows BINARY_NAME 与 macOS PRODUCT_NAME 改为 GC-UI,窗口标题 Morris GC
- 公司信息:Windows CompanyName/LegalCopyright、macOS PRODUCT_COPYRIGHT 统一为 Morris
- 模型版本末位 +1:contour-map 1.1 / earth-geography 1.9 / earth-revolution 1.7 / earth-rotation 1.7 / scale-calculator 1.6,并重算清单哈希
2026-11-18 12:36:21 +08:00
Morris aeab68d421 Merge pull request 'chore: 彻底移除 NeoRF 标识(命名空间 / 作者 / Bundle ID)' (#5) from chore/remove-neorf into main
Reviewed-on: Morris/GC#5
2026-11-17 22:55:44 +00:00
Morris 0b2f263dea chore: 彻底移除 NeoRF 标识,统一为 GC / Morris
- 命名空间 NeoRF.EarthModels / NeoRF.ContourMap / NeoRF.ScaleCalculator
  改为 GC.EarthModels / GC.ContourMap / GC.ScaleCalculator
- 模型清单 type 字段同步更新,五个模型 DLL 全部重新编译并替换
- 程序集 Company 由 NeoRF 改为 Morris
- 模型作者 author 统一为 Morris(原 NeoRF / Morris GC)
- macOS 包标识 cn.neorf.GC 改为 com.xhmcl.GC
- 重算 version.json 与 model/version.json 的 build / manifestSha256 / filesSha256
2026-11-18 06:55:10 +08:00
Morris a18d0ea1a8 Merge pull request '关于页开发者改为读取仓库真实提交者(身份归并 + 排除自动化账号)' (#4) from fix/about-contributors into main
Reviewed-on: Morris/GC#4
2026-11-17 22:52:38 +00:00
61 changed files with 394 additions and 154 deletions

No files matched your search

+1 -1
View File
@@ -23,7 +23,7 @@
<AvaloniaVersion>11.3.9</AvaloniaVersion>
<MvvmVersion>8.2.2</MvvmVersion>
<Version>1.0.7</Version>
<Company>NeoRF</Company>
<Company>Morris</Company>
<Product>GC</Product>
<NeutralLanguage>zh-Hans</NeutralLanguage>
</PropertyGroup>
+179
View File
@@ -0,0 +1,179 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
namespace GC;
/// <summary>
/// 新界面启动壳。
///
/// 发布包同时带 <c>GC.UI.Server</c>(本地 HTTP 后端 + 模型窗口宿主)和
/// <c>GC-UI</c>(Flutter 前端)时,启动器只做三件事:
/// 1. 拉起后端并等 <c>/api/health</c> 就绪;
/// 2. 拉起 Flutter 窗口;
/// 3. 界面退出后关掉后端。
///
/// 两个产物缺任意一个就返回 <c>false</c>,由调用方回退到内置 Avalonia 界面——
/// 这样 `dotnet run`、只编了启动器的开发场景、以及交叉编译缺前端产物的包都能正常打开。
/// </summary>
internal static class FlutterShell
{
/// <summary>与 GC-UI/frontend 的默认 baseUrl 保持一致,前端不需要额外配置。</summary>
private const int Port = 17890;
private static readonly HttpClient Http = new() { Timeout = TimeSpan.FromSeconds(1.5) };
private static Process? _backend;
public static bool TryRun(string[] args)
{
var dir = AppContext.BaseDirectory;
var backendPath = FindBackend(dir);
var uiPath = FindUi(dir);
if (backendPath == null || uiPath == null) return false;
// 用户可能重复启动:已有后端在跑就直接复用,退出时也不要关掉别人的进程。
var reused = IsHealthy();
if (!reused)
{
_backend = Start(backendPath, $"--port {Port}", dir);
if (_backend == null) return false;
if (!WaitHealthy(TimeSpan.FromSeconds(25)))
{
Stop(_backend);
_backend = null;
return false;
}
}
AppDomain.CurrentDomain.ProcessExit += (_, _) => Stop(_backend);
var ui = Start(uiPath, null, dir);
if (ui == null)
{
Stop(_backend);
_backend = null;
return false;
}
ui.WaitForExit();
Stop(_backend);
_backend = null;
return true;
}
// ---------------------------------------------------------------- 产物定位
private static string? FindBackend(string dir)
{
foreach (var name in OperatingSystem.IsWindows()
? new[] { "GC.UI.Server.exe", "GC.UI.Server" }
: new[] { "GC.UI.Server", "GC.UI.Server.exe" })
{
var path = Path.Combine(dir, name);
if (File.Exists(path)) return path;
}
return null;
}
/// <summary>
/// Flutter 桌面产物。
/// macOS 是 <c>GC-UI.app/Contents/MacOS/GC-UI</c>;Windows 是 <c>GC-UI.exe</c>;
/// Linux 是 <c>GC-UI</c>。
/// </summary>
private static string? FindUi(string dir)
{
if (OperatingSystem.IsMacOS())
{
var exe = Path.Combine(dir, "GC-UI.app", "Contents", "MacOS", "GC-UI");
if (File.Exists(exe)) return exe;
}
foreach (var name in OperatingSystem.IsWindows() ? new[] { "GC-UI.exe" } : new[] { "GC-UI" })
{
var path = Path.Combine(dir, name);
if (File.Exists(path)) return path;
}
return null;
}
// ---------------------------------------------------------------- 进程管理
private static Process? Start(string fileName, string? arguments, string workingDirectory)
{
try
{
var info = new ProcessStartInfo(fileName)
{
WorkingDirectory = workingDirectory,
UseShellExecute = false,
CreateNoWindow = true,
};
if (!string.IsNullOrEmpty(arguments)) info.Arguments = arguments;
// macOS .app 内的二进制也需要可执行位;发布包由 zip 解开时可能丢失。
if (!OperatingSystem.IsWindows())
{
try { File.SetUnixFileMode(fileName, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute); }
catch { /* 权限不足时交给系统判断 */ }
}
return Process.Start(info);
}
catch (Exception ex)
{
Console.Error.WriteLine($"[shell] 启动失败 {fileName}: {ex.Message}");
return null;
}
}
private static void Stop(Process? process)
{
if (process == null) return;
try
{
if (!process.HasExited) process.Kill(entireProcessTree: true);
}
catch (Exception ex)
{
Console.Error.WriteLine($"[shell] 关闭后端失败: {ex.Message}");
}
finally
{
process.Dispose();
}
}
// ---------------------------------------------------------------- 健康检查
private static bool IsHealthy()
{
try
{
using var response = Http.GetAsync($"http://127.0.0.1:{Port}/api/health")
.GetAwaiter().GetResult();
return response.IsSuccessStatusCode;
}
catch
{
return false;
}
}
private static bool WaitHealthy(TimeSpan timeout)
{
var deadline = DateTime.UtcNow + timeout;
while (DateTime.UtcNow < deadline)
{
// 后端进程已经退出就没必要再等:端口被占、依赖缺失都会走这里。
if (_backend is { HasExited: true }) return false;
if (IsHealthy()) return true;
Thread.Sleep(250);
}
return false;
}
}
+3
View File
@@ -18,6 +18,9 @@ internal static class Program
// 上次下载的启动器新版,到这次启动才应用
if (DownloadModuleHost.Factory.TryApplyPending(paths)) return;
// 发布包带 Flutter 前端时,界面交给它;没带则回退到内置 Avalonia 界面。
if (FlutterShell.TryRun(args)) return;
BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
}
@@ -5,10 +5,10 @@
// 'flutter create' template.
// The application's name. By default this is also the title of the Flutter window.
PRODUCT_NAME = gc_ui
PRODUCT_NAME = GC-UI
// The application's bundle identifier
PRODUCT_BUNDLE_IDENTIFIER = com.morris.gc.gcUi
// The copyright displayed in application information
PRODUCT_COPYRIGHT = Copyright © 2026 com.morris.gc. All rights reserved.
PRODUCT_COPYRIGHT = Copyright © 2026 Morris. All rights reserved.
+1 -1
View File
@@ -4,7 +4,7 @@ project(gc_ui LANGUAGES CXX)
# The name of the executable created for the application. Change this to change
# the on-disk name of your application.
set(BINARY_NAME "gc_ui")
set(BINARY_NAME "GC-UI")
# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
# versions of CMake.
+6 -6
View File
@@ -89,13 +89,13 @@ BEGIN
BEGIN
BLOCK "040904e4"
BEGIN
VALUE "CompanyName", "com.morris.gc" "\0"
VALUE "FileDescription", "gc_ui" "\0"
VALUE "CompanyName", "Morris" "\0"
VALUE "FileDescription", "GC UI" "\0"
VALUE "FileVersion", VERSION_AS_STRING "\0"
VALUE "InternalName", "gc_ui" "\0"
VALUE "LegalCopyright", "Copyright (C) 2026 com.morris.gc. All rights reserved." "\0"
VALUE "OriginalFilename", "gc_ui.exe" "\0"
VALUE "ProductName", "gc_ui" "\0"
VALUE "InternalName", "GC-UI" "\0"
VALUE "LegalCopyright", "Copyright (C) 2026 Morris. All rights reserved." "\0"
VALUE "OriginalFilename", "GC-UI.exe" "\0"
VALUE "ProductName", "Morris GC" "\0"
VALUE "ProductVersion", VERSION_AS_STRING "\0"
END
END
+1 -1
View File
@@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
FlutterWindow window(project);
Win32Window::Point origin(10, 10);
Win32Window::Size size(1280, 720);
if (!window.Create(L"gc_ui", origin, size)) {
if (!window.Create(L"Morris GC", origin, size)) {
return EXIT_FAILURE;
}
window.SetQuitOnClose(true);
+1 -1
View File
@@ -275,7 +275,7 @@ function New-MacAppBundle {
<plist version="1.0"><dict>
<key>CFBundleName</key><string>GC</string>
<key>CFBundleDisplayName</key><string>GC</string>
<key>CFBundleIdentifier</key><string>cn.neorf.GC</string>
<key>CFBundleIdentifier</key><string>com.xhmcl.GC</string>
<key>CFBundleVersion</key><string>$script:BuildVersion</string>
<key>CFBundleShortVersionString</key><string>$script:BuildVersion</string>
<key>CFBundlePackageType</key><string>APPL</string>
+19
View File
@@ -39,12 +39,31 @@ bs_build() {
progress_step "编译 Mac"
_run_publish mac 90 publish_rid "osx-arm64" "dist/mac-arm64" false || return 1
publish_backend "osx-arm64" "dist/mac-arm64" || return 1
# Flutter 的 macOS 产物只能在 macOS 上编;交叉构建时跳过,包内回退内置界面
if [ "$(uname -s)" = "Darwin" ]; then
build_flutter_ui macos "dist/mac-arm64" || return 1
fi
progress_step "编译 Win-x64"
_run_publish winx64 70 publish_rid "win-x64" "dist/win-amd64" true || return 1
publish_backend "win-x64" "dist/win-amd64" || return 1
progress_step "编译 Win-arm64"
_run_publish winarm 70 publish_rid "win-arm64" "dist/win-arm64" true || return 1
publish_backend "win-arm64" "dist/win-arm64" || return 1
# Windows 版 Flutter 只能在 Windows 上编;x64 产物同时放进两个 Windows 包
# (ARM64 上由系统模拟 x64 进程运行前端)。
case "$(uname -s)" in
MINGW*|MSYS*|CYGWIN*)
build_flutter_ui windows "dist/win-flutter" || return 1
for label in win-amd64 win-arm64; do
cp -R "$ROOT_DIR/dist/win-flutter/." "$ROOT_DIR/dist/$label/"
done
rm -rf "$ROOT_DIR/dist/win-flutter"
;;
esac
progress_step "运行骨架"; progress_tick 100
package_mac_app
+62 -9
View File
@@ -174,32 +174,85 @@ 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=false \
-p:PublishTrimmed=false \
-o "$ROOT_DIR/$OUT" || return 1
}
# 构建 Flutter 前端并把桌面产物放进平台目录。
# Flutter 桌面只能在对应宿主平台上构建:Windows 产物必须在 Windows 上编,
# macOS 产物必须在 macOS 上编。交叉构建时这里只警告,包内不含前端,
# 启动器会自动回退到内置 Avalonia 界面。
build_flutter_ui() {
PLAT="$1"; DEST="$2"
UI_SRC="$ROOT_DIR/GC-UI/frontend"
[ -d "$UI_SRC" ] || return 0
FLUTTER_BIN="${FLUTTER_BIN:-flutter}"
if ! command -v "$FLUTTER_BIN" >/dev/null 2>&1; then
echo "!! 未找到 flutter(可用 FLUTTER_BIN=<路径> 指定),本次包内不含 Flutter 界面"
return 0
fi
echo "==> 构建 Flutter 前端 (${PLAT})"
( cd "$UI_SRC" && "$FLUTTER_BIN" pub get && "$FLUTTER_BIN" build "$PLAT" --release ) || return 1
mkdir -p "$ROOT_DIR/$DEST"
case "$PLAT" in
windows)
# Release/ 里含 GC-UI.exe、flutter_windows.dll 和 data/
cp -R "$UI_SRC/build/windows/x64/runner/Release/." "$ROOT_DIR/$DEST/"
;;
macos)
rm -rf "$ROOT_DIR/$DEST/GC-UI.app"
cp -R "$UI_SRC/build/macos/Build/Products/Release/GC-UI.app" "$ROOT_DIR/$DEST/"
;;
esac
echo " -> $DEST(Flutter ${PLAT})"
}
pack_launcher() {
echo "==> 生成启动器产物(GC-<版本>-<系统>-<架构>)"
# --- Windows:exe 单文件(连同 GC-SAVEDOG.exe 一起打进 zip)---
# --- Windows:启动器 + 守护进程 + UI 后端 + Flutter 前端,整目录打包 ---
for pair in "win-x64:win-amd64" "win-arm64:win-arm64"; do
RID="${pair%%:*}"; LABEL="${pair##*:}"
SRC="$ROOT_DIR/dist/$LABEL"
[ -d "$SRC" ] || SRC="$ROOT_DIR/dist/$RID" # 兼容旧布局
[ -d "$SRC" ] || continue
# 注意排除守护进程:GC-SAVEDOG.exe 在字典序里排在 GC.exe 前面
EXE=$(ls "$SRC"/*.exe 2>/dev/null | grep -v 'GC-SAVEDOG' | head -1)
# 启动器固定是 GC.exe;后端与前端是可选的随包产物,不能当成启动器。
EXE="$SRC/GC.exe"
[ -f "$EXE" ] || EXE=$(ls "$SRC"/*.exe 2>/dev/null | grep -v 'GC-SAVEDOG\|GC.UI.Server\|GC-UI' | head -1)
[ -n "$EXE" ] || continue
TMP="$ROOT_DIR/dist/.winpkg-$LABEL"
rm -rf "$TMP"; mkdir -p "$TMP"
cp "$EXE" "$TMP/GC-${VERSION}-${LABEL}.exe"
cp -R "$SRC"/. "$TMP"/
rm -f "$TMP"/*.zip
mv "$TMP/$(basename "$EXE")" "$TMP/GC-${VERSION}-${LABEL}.exe"
chmod +x "$TMP/GC-${VERSION}-${LABEL}.exe" 2>/dev/null || true
if [ -f "$SRC/GC-SAVEDOG.exe" ]; then
cp "$SRC/GC-SAVEDOG.exe" "$TMP/GC-SAVEDOG.exe"
else
if [ ! -f "$TMP/GC-SAVEDOG.exe" ]; then
echo " !! 缺少 GC-SAVEDOG.exe,该平台将退回旧脚本更新"
fi
if [ ! -f "$TMP/GC-UI.exe" ]; then
echo " !! 包内没有 Flutter 前端,启动器将使用内置 Avalonia 界面"
fi
ZIP="$ROOT_DIR/dist/$LABEL/GC-${VERSION}-${LABEL}.zip"
rm -f "$ZIP"
( cd "$TMP" && zip -q "$ZIP" ./* )
( cd "$TMP" && zip -qr "$ZIP" . )
rm -rf "$TMP"
echo " -> dist/$LABEL/GC-${VERSION}-${LABEL}.zip"
done
@@ -284,7 +337,7 @@ package_mac_app() {
<dict>
<key>CFBundleName</key><string>GC</string>
<key>CFBundleDisplayName</key><string>GC</string>
<key>CFBundleIdentifier</key><string>cn.neorf.GC</string>
<key>CFBundleIdentifier</key><string>com.xhmcl.GC</string>
<key>CFBundleVersion</key><string>${VERSION}</string>
<key>CFBundleShortVersionString</key><string>${VERSION}</string>
<key>CFBundlePackageType</key><string>APPL</string>
+2 -2
View File
@@ -74,10 +74,10 @@ dll / json 的哈希 —— 本地文件被替换会直接拒绝加载。
"descriptionI18n": { "zh-CN": "……", "en": "……" },
"version": "1.6",
"updatedAt": "2026-11-14T08:00:00Z",
"author": "NeoRF",
"author": "Morris",
"tags": ["astronomy", "geography"],
"assembly": "EarthRotationModel.dll",
"type": "NeoRF.EarthModels.RotationModelFactory",
"type": "GC.EarthModels.RotationModelFactory",
"preview": "preview.png",
"apiVersion": 1,
"minAppVersion": "1.0.7"
+1 -1
View File
@@ -5,7 +5,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings>
<RootNamespace>NeoRF.EarthModels</RootNamespace>
<RootNamespace>GC.EarthModels</RootNamespace>
<AssemblyName>EarthModelPreview</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
+2 -2
View File
@@ -10,9 +10,9 @@ using Avalonia.Headless;
using Avalonia.Media.Imaging;
using Avalonia.Platform;
using GC.ModelSdk;
using NeoRF.EarthModels;
using GC.EarthModels;
namespace NeoRF.EarthModels.Preview;
namespace GC.EarthModels.Preview;
/// <summary>
/// 封面生成工具:给每个模型画一张 preview.png。
+1 -1
View File
@@ -12,7 +12,7 @@ using Avalonia.Media.Imaging;
using Avalonia.Platform;
using Avalonia.Threading;
namespace NeoRF.EarthModels;
namespace GC.EarthModels;
public enum SceneView
{
+1 -1
View File
@@ -11,7 +11,7 @@ using Avalonia.Media;
using Avalonia.Threading;
using GC.ModelSdk;
namespace NeoRF.EarthModels;
namespace GC.EarthModels;
/// <summary>
/// 模型自己的界面:画布 + 触控友好工具栏 + 课堂演示卡 + 节气定格与步进。
+1 -1
View File
@@ -2,7 +2,7 @@ using System;
using Avalonia.Controls;
using GC.ModelSdk;
namespace NeoRF.EarthModels;
namespace GC.EarthModels;
/// <summary>
/// 地球模型共享运行时:读自己目录下的 scene.json / land.json / i18n,
+1 -1
View File
@@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Numerics;
namespace NeoRF.EarthModels;
namespace GC.EarthModels;
/// <summary>
/// 地理模型的球面几何工具:经纬度 ↔ 单位球坐标、正交投影到屏幕、
+1 -1
View File
@@ -4,7 +4,7 @@ using System.IO;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace NeoRF.EarthModels;
namespace GC.EarthModels;
/// <summary>&lt;id&gt;.model/land.json —— 简化的大陆轮廓(经纬度多边形)。</summary>
public sealed class LandData
+1 -1
View File
@@ -3,7 +3,7 @@ using System.Text.Encodings.Web;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace NeoRF.EarthModels;
namespace GC.EarthModels;
/// <summary>模型自己的 JSON 读写(不依赖启动器)。</summary>
public static class ModelJson
+1 -1
View File
@@ -4,7 +4,7 @@ using System.Globalization;
using System.IO;
using System.Text.Json;
namespace NeoRF.EarthModels;
namespace GC.EarthModels;
/// <summary>
/// 模型自己的一份文案。优先读模型数据目录里的 <c>i18n/&lt;language&gt;.json</c>,
+1 -1
View File
@@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace NeoRF.EarthModels;
namespace GC.EarthModels;
/// <summary>&lt;id&gt;.model/scene.json —— 模型数据(可视化场景描述)。</summary>
public sealed class SceneDefinition
+1 -1
View File
@@ -2,7 +2,7 @@ using System;
using System.IO;
using Avalonia.Media;
namespace NeoRF.EarthModels;
namespace GC.EarthModels;
/// <summary>
/// 模型自己的场景运行时:场景描述 + 预烘焙地表纹理 + 调色板。
+1 -1
View File
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Threading.Tasks;
using Avalonia.Media;
namespace NeoRF.EarthModels;
namespace GC.EarthModels;
/// <summary>
/// 预烘焙的等经纬度地表贴图:反照率 + 高度 + 冰盖 + 云层 + 夜间灯光。
+1 -1
View File
@@ -3,7 +3,7 @@ using System.Numerics;
using System.Threading.Tasks;
using Avalonia.Media.Imaging;
namespace NeoRF.EarthModels;
namespace GC.EarthModels;
/// <summary>
/// 球体像素级渲染:正交投影 + 预烘焙地表纹理 + 地形光照 + 云层 + 夜灯 + 大气边缘光。
+4 -4
View File
@@ -16,8 +16,8 @@
"terrain"
],
"assembly": "ContourMapModel.dll",
"type": "NeoRF.ContourMap.ContourMapFactory",
"version": "1.0",
"type": "GC.ContourMap.ContourMapFactory",
"version": "1.1",
"chrome": {
"titleBar": "#0C1828",
"titleBorder": "#1B2740",
@@ -25,6 +25,6 @@
"button": "#9FB4D4",
"frame": "#0A1524"
},
"build": "e4b3f2b87e",
"updatedAt": "2026-11-14T11:34:35Z"
"build": "773ab2161d",
"updatedAt": "2026-11-18T04:35:15Z"
}
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings>
<RootNamespace>NeoRF.ContourMap</RootNamespace>
<RootNamespace>GC.ContourMap</RootNamespace>
<AssemblyName>ContourMapModel</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>false</IsPackable>
+1 -1
View File
@@ -6,7 +6,7 @@ using Avalonia.Layout;
using Avalonia.Media;
using GC.ModelSdk;
namespace NeoRF.ContourMap;
namespace GC.ContourMap;
/// <summary>等高线模型入口(清单里的 type 指向这里)。</summary>
public sealed class ContourMapFactory : IModelFactory
+1 -1
View File
@@ -5,7 +5,7 @@ using Avalonia.Controls;
using Avalonia.Layout;
using Avalonia.Media;
namespace NeoRF.ContourMap;
namespace GC.ContourMap;
/// <summary>等高线模型的界面:顶部标题、中间双图联动、右侧判读要点、底部实时读数。</summary>
public sealed class ContourPage
+1 -1
View File
@@ -6,7 +6,7 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Media;
namespace NeoRF.ContourMap;
namespace GC.ContourMap;
/// <summary>
/// 等高线教学画布,左右两块:
+1 -1
View File
@@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace NeoRF.ContourMap;
namespace GC.ContourMap;
/// <summary>内置全量文案兜底:没有语言包也能完整显示。</summary>
internal static class DefaultTexts
+1 -1
View File
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
namespace NeoRF.ContourMap;
namespace GC.ContourMap;
/// <summary>地形部位识别结果:课本要求学生能在等高线图上认出这五种部位。</summary>
public enum TerrainFeature
+1 -1
View File
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
namespace NeoRF.ContourMap;
namespace GC.ContourMap;
/// <summary>五种基本地形类型(教科书分类)。</summary>
public enum TerrainKind
+4 -4
View File
@@ -9,7 +9,7 @@
"en": "Climate zones, continent/ocean outlines, plates and borders — clean line art."
},
"assembly": "EarthGeographyModel.dll",
"type": "NeoRF.EarthModels.GeographyModelFactory",
"type": "GC.EarthModels.GeographyModelFactory",
"author": "Morris GC",
"tags": [
"geography",
@@ -17,7 +17,7 @@
"atlas"
],
"dataDir": "earth-geography.model",
"version": "1.8",
"version": "1.9",
"chrome": {
"titleBar": "#0C1828",
"titleBorder": "#1B2740",
@@ -25,6 +25,6 @@
"button": "#9FB4D4",
"frame": "#0A1524"
},
"build": "3b645c45c2",
"updatedAt": "2026-11-14T11:34:35Z"
"build": "cc68b8863b",
"updatedAt": "2026-11-18T04:35:15Z"
}
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings>
<RootNamespace>NeoRF.EarthModels</RootNamespace>
<RootNamespace>GC.EarthModels</RootNamespace>
<AssemblyName>EarthGeographyModel</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>false</IsPackable>
+1 -1
View File
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace NeoRF.EarthModels;
namespace GC.EarthModels;
/// <summary>地球地理模型的数据文件:全部是经纬度折线,只有轮廓没有填色。</summary>
public sealed class GeoData
@@ -7,7 +7,7 @@ using Avalonia.Layout;
using Avalonia.Media;
using GC.ModelSdk;
namespace NeoRF.EarthModels;
namespace GC.EarthModels;
/// <summary>
/// 地球地理模型:五带划分 + 七大洲四大洋轮廓 + 六大板块与洲界,纯线稿。
+1 -1
View File
@@ -8,7 +8,7 @@ using Avalonia.Input;
using Avalonia.Media;
using GC.ModelSdk;
namespace NeoRF.EarthModels;
namespace GC.EarthModels;
public enum GeoMode { Sphere3D, Flat2D }
+5 -5
View File
@@ -6,7 +6,7 @@
"zh-CN": "地球公转",
"en": "Earth Revolution"
},
"author": "NeoRF",
"author": "Morris",
"description": "四季更替、黄赤交角与二分二至",
"descriptionI18n": {
"zh-CN": "地球绕太阳公转一年:地轴指向不变,太阳直射点南北往返,形成四季。",
@@ -20,10 +20,10 @@
"entry": "scene.json",
"license": "MIT",
"assembly": "EarthRevolutionModel.dll",
"type": "NeoRF.EarthModels.RevolutionModelFactory",
"type": "GC.EarthModels.RevolutionModelFactory",
"preview": "preview.png",
"apiVersion": 1,
"version": "1.6",
"version": "1.7",
"chrome": {
"titleBar": "#0C1828",
"titleBorder": "#1B2740",
@@ -31,6 +31,6 @@
"button": "#9FB4D4",
"frame": "#0A1524"
},
"build": "947efa36bb",
"updatedAt": "2026-11-14T11:34:35Z"
"build": "53b7a0fbc3",
"updatedAt": "2026-11-18T04:35:15Z"
}
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings>
<RootNamespace>NeoRF.EarthModels</RootNamespace>
<RootNamespace>GC.EarthModels</RootNamespace>
<AssemblyName>EarthRevolutionModel</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>false</IsPackable>
@@ -1,6 +1,6 @@
using GC.ModelSdk;
namespace NeoRF.EarthModels;
namespace GC.EarthModels;
/// <summary>地球公转模型入口(清单里的 type 指向这里)。</summary>
public sealed class RevolutionModelFactory : IModelFactory
+5 -5
View File
@@ -6,7 +6,7 @@
"zh-CN": "地球自转",
"en": "Earth Rotation"
},
"author": "NeoRF",
"author": "Morris",
"description": "昼夜交替、晨昏线与太阳直射点",
"descriptionI18n": {
"zh-CN": "观察自转中的地球:昼夜半球、晨昏线与太阳直射点位置。",
@@ -20,10 +20,10 @@
"entry": "scene.json",
"license": "MIT",
"assembly": "EarthRotationModel.dll",
"type": "NeoRF.EarthModels.RotationModelFactory",
"type": "GC.EarthModels.RotationModelFactory",
"preview": "preview.png",
"apiVersion": 1,
"version": "1.6",
"version": "1.7",
"chrome": {
"titleBar": "#0C1828",
"titleBorder": "#1B2740",
@@ -31,6 +31,6 @@
"button": "#9FB4D4",
"frame": "#0A1524"
},
"build": "a803d9c020",
"updatedAt": "2026-11-14T11:34:35Z"
"build": "ecd52665f9",
"updatedAt": "2026-11-18T04:35:15Z"
}
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings>
<RootNamespace>NeoRF.EarthModels</RootNamespace>
<RootNamespace>GC.EarthModels</RootNamespace>
<AssemblyName>EarthRotationModel</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>false</IsPackable>
@@ -1,6 +1,6 @@
using GC.ModelSdk;
namespace NeoRF.EarthModels;
namespace GC.EarthModels;
/// <summary>地球自转模型入口(清单里的 type 指向这里)。</summary>
public sealed class RotationModelFactory : IModelFactory
+4 -4
View File
@@ -21,10 +21,10 @@
"entry": "scales.json",
"license": "MIT",
"assembly": "ScaleCalculatorModel.dll",
"type": "NeoRF.ScaleCalculator.ScaleCalculatorFactory",
"type": "GC.ScaleCalculator.ScaleCalculatorFactory",
"preview": "preview.png",
"apiVersion": 1,
"version": "1.5",
"version": "1.6",
"chrome": {
"titleBar": "#FFFFFF",
"titleBorder": "#E3E8F3",
@@ -32,6 +32,6 @@
"button": "#5B6A86",
"frame": "#F4F6FB"
},
"build": "02a555272a",
"updatedAt": "2026-11-14T11:34:35Z"
"build": "105653737d",
"updatedAt": "2026-11-18T04:35:15Z"
}
+1 -1
View File
@@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace NeoRF.ScaleCalculator;
namespace GC.ScaleCalculator;
/// <summary>内置全量文案兜底:即使模型包里没有语言包也能完整显示。</summary>
internal static class DefaultTexts
@@ -1,6 +1,6 @@
using GC.ModelSdk;
namespace NeoRF.ScaleCalculator;
namespace GC.ScaleCalculator;
/// <summary>比例尺计算器模型入口(清单里的 type 指向这里)。</summary>
public sealed class ScaleCalculatorFactory : IModelFactory
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings>
<RootNamespace>NeoRF.ScaleCalculator</RootNamespace>
<RootNamespace>GC.ScaleCalculator</RootNamespace>
<AssemblyName>ScaleCalculatorModel</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>false</IsPackable>
@@ -5,7 +5,7 @@ using System.Text.Json;
using Avalonia.Controls;
using GC.ModelSdk;
namespace NeoRF.ScaleCalculator;
namespace GC.ScaleCalculator;
/// <summary>
/// 比例尺计算器运行时。Prepare 在后台线程读数据/语言包,CreateView 在 UI 线程构建界面。
@@ -5,7 +5,7 @@ using Avalonia.Controls.Primitives;
using Avalonia.Layout;
using Avalonia.Media;
namespace NeoRF.ScaleCalculator;
namespace GC.ScaleCalculator;
public sealed partial class ScaleCalculatorView
{
@@ -5,7 +5,7 @@ using Avalonia.Controls;
using Avalonia.Controls.Primitives;
using Avalonia.Media;
namespace NeoRF.ScaleCalculator;
namespace GC.ScaleCalculator;
public sealed partial class ScaleCalculatorView
{
@@ -8,7 +8,7 @@ using Avalonia.Input;
using Avalonia.Layout;
using Avalonia.Media;
namespace NeoRF.ScaleCalculator;
namespace GC.ScaleCalculator;
/// <summary>
/// 比例尺计算器主界面。三栏(已知量 / 可视化标尺 / 三种写法与判读)+ 底部实地尺与练习。
+1 -1
View File
@@ -4,7 +4,7 @@ using System.IO;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace NeoRF.ScaleCalculator;
namespace GC.ScaleCalculator;
public sealed class PresetItem
{
+1 -1
View File
@@ -1,7 +1,7 @@
using System;
using System.Globalization;
namespace NeoRF.ScaleCalculator;
namespace GC.ScaleCalculator;
/// <summary>三种求解模式:待求的量。</summary>
public enum SolveMode
+1 -1
View File
@@ -4,7 +4,7 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Media;
namespace NeoRF.ScaleCalculator;
namespace GC.ScaleCalculator;
/// <summary>
/// 自绘可视化标尺:上条「图上距离」按真实厘米画,下条「实地距离」按同一比例尺压缩,
+28 -35
View File
@@ -1,6 +1,6 @@
{
"schema": 1,
"generated": "2026-11-14T11:34:35Z",
"generated": "2026-11-18T04:35:15Z",
"repository": "https://gitcode.com/Morris_1/GC",
"branch": "main",
"modelDir": "model",
@@ -13,24 +13,24 @@
"dir": "dist/win-amd64",
"name": "GC-1.0.7-win-amd64.zip",
"url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-win-amd64.zip",
"sha256": "f90ff51ac6b041ae238cbeb4672622b0d029142a9d8b0705f08e654336512308",
"size": 46363183
"sha256": "e9e0794206c6a0dfb8449ac30390ed788da72a5661d362af9f9a6e489cad0aad",
"size": 102382195
},
"win-arm64": {
"path": "dist/win-arm64/GC-1.0.7-win-arm64.zip",
"dir": "dist/win-arm64",
"name": "GC-1.0.7-win-arm64.zip",
"url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-win-arm64.zip",
"sha256": "0b2bab2c3ac7e6223d8dd0b0faf9a0994319fa5ad13826addf7b402619b812e0",
"size": 44390354
"sha256": "11dd6aea480b7eb9d5d0e40c6e8ac7733b83756e37ec924cb98f5e46a531def1",
"size": 98435968
},
"osx-arm64": {
"path": "dist/mac-arm64/GC-1.0.7-mac-arm64.zip",
"dir": "dist/mac-arm64",
"name": "GC-1.0.7-mac-arm64.zip",
"url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-mac-arm64.zip",
"sha256": "e5fd355bace68dc0794eb3e049cbef63c952a60a765ab3806adaf1199e1b09ab",
"size": 9178314
"sha256": "b085ffabf764ab57cc69a0192b47069479170f9494fb9f447230e74028794982",
"size": 60065859
},
"osx-x64": {
"path": "dist/mac-x64/GC-1.0.7-mac-x64.zip",
@@ -49,55 +49,48 @@
"models": [
{
"id": "contour-map",
"version": "1.0",
"build": "e4b3f2b87e",
"manifestSha256": "ee0897d46ee85126fbfd0d07f5ca3111950d0c36f9b8a80e4eb6ae85d226da4f",
"filesSha256": "b1f323fb41dec4f45992a30ff8726f3307f83b564127aff99bcb3d044c79d2bd",
"version": "1.1",
"build": "773ab2161d",
"manifestSha256": "c71ea15b519feb47a4fd33288fb92f2dcd40202fb2ce0a771fa408f9b4fbaf41",
"filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699",
"files": 5,
"dir": "model/contour-map"
},
{
"id": "earth-geography",
"version": "1.8",
"build": "3b645c45c2",
"manifestSha256": "a9f30fd4a1dd0aeccb88c892579c93bf32a92379d7b3f545b28f6cac612f9871",
"filesSha256": "0e55d2f9bacc3e0ff42f5c45d9e7c265864df9784b1609c09dcb32d21b4addfc",
"version": "1.9",
"build": "cc68b8863b",
"manifestSha256": "ae64033c7b46c51eb9c5f3dfb70a5491068c6cd608dec953eb34311cb8045d60",
"filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95",
"files": 11,
"dir": "model/earth-geography"
},
{
"id": "earth-revolution",
"version": "1.6",
"build": "947efa36bb",
"manifestSha256": "feb715cde8ad5da9ecfb48785a95e6fc82930cc92c668514b328915366c2f57a",
"filesSha256": "a37e0b493c78bb0a04a276512b612be3f8e7a178ed1a7fc72acb5353aa57f7c5",
"version": "1.7",
"build": "53b7a0fbc3",
"manifestSha256": "88e6f2f1bd2f7654d169745b96fa85aaea37671b6cdf8ed4fc05f7f259ae90bc",
"filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1",
"files": 7,
"dir": "model/earth-revolution"
},
{
"id": "earth-rotation",
"version": "1.6",
"build": "a803d9c020",
"manifestSha256": "56ed397cbc008bd9ec8bea0ee34a94a28ab29ce39a8b096b0629e529883b4dff",
"filesSha256": "4e4428812d18d15a99105e73c027b99f3197033f0138d643ba69c15fabc9d8f6",
"version": "1.7",
"build": "ecd52665f9",
"manifestSha256": "9ac0050f65eedc833dd8daa8eb3b18400540269fd1a4b764ef771a357fb1cf0a",
"filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e",
"files": 7,
"dir": "model/earth-rotation"
},
{
"id": "scale-calculator",
"version": "1.5",
"build": "02a555272a",
"manifestSha256": "d00034888d9b9da03338b7f394d1bdf33f73b1fbdd7e8f154d85b9080318ab13",
"filesSha256": "4a5fbf898df1d98eddf68b5d3929ae7b25cd7bcdfdfa36b5ad0ed72d9941d049",
"version": "1.6",
"build": "105653737d",
"manifestSha256": "05dcb4ec0a4a0cda66dbb633b8ea58e4f4f2de47b5c9557799ac317de874f2af",
"filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604",
"files": 6,
"dir": "model/scale-calculator"
}
],
"signature": {
"alg": "ECDSA-P256-SHA256",
"keyId": "gc-2026-11",
"value": "LHaF2bw+IZeWUw2qLQM1IQHoNXsHNko38dyjP45Jy41KtlyhvJhhFaNh+THKhAU+6jSzV1eFHgbwasboYBOa5w==",
"contentSha256": "749055593bf9839837428d900d523b3363486556970cbf4e2daa25001ab174c8",
"signedAt": "2026-11-14T11:36:03Z"
}
]
}
+28 -35
View File
@@ -1,6 +1,6 @@
{
"schema": 1,
"generated": "2026-11-14T11:34:35Z",
"generated": "2026-11-18T04:35:15Z",
"repository": "https://gitcode.com/Morris_1/GC",
"branch": "main",
"modelDir": "model",
@@ -13,24 +13,24 @@
"dir": "dist/win-amd64",
"name": "GC-1.0.7-win-amd64.zip",
"url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-win-amd64.zip",
"sha256": "f90ff51ac6b041ae238cbeb4672622b0d029142a9d8b0705f08e654336512308",
"size": 46363183
"sha256": "e9e0794206c6a0dfb8449ac30390ed788da72a5661d362af9f9a6e489cad0aad",
"size": 102382195
},
"win-arm64": {
"path": "dist/win-arm64/GC-1.0.7-win-arm64.zip",
"dir": "dist/win-arm64",
"name": "GC-1.0.7-win-arm64.zip",
"url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-win-arm64.zip",
"sha256": "0b2bab2c3ac7e6223d8dd0b0faf9a0994319fa5ad13826addf7b402619b812e0",
"size": 44390354
"sha256": "11dd6aea480b7eb9d5d0e40c6e8ac7733b83756e37ec924cb98f5e46a531def1",
"size": 98435968
},
"osx-arm64": {
"path": "dist/mac-arm64/GC-1.0.7-mac-arm64.zip",
"dir": "dist/mac-arm64",
"name": "GC-1.0.7-mac-arm64.zip",
"url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-mac-arm64.zip",
"sha256": "e5fd355bace68dc0794eb3e049cbef63c952a60a765ab3806adaf1199e1b09ab",
"size": 9178314
"sha256": "b085ffabf764ab57cc69a0192b47069479170f9494fb9f447230e74028794982",
"size": 60065859
},
"osx-x64": {
"path": "dist/mac-x64/GC-1.0.7-mac-x64.zip",
@@ -49,55 +49,48 @@
"models": [
{
"id": "contour-map",
"version": "1.0",
"build": "e4b3f2b87e",
"manifestSha256": "ee0897d46ee85126fbfd0d07f5ca3111950d0c36f9b8a80e4eb6ae85d226da4f",
"filesSha256": "b1f323fb41dec4f45992a30ff8726f3307f83b564127aff99bcb3d044c79d2bd",
"version": "1.1",
"build": "773ab2161d",
"manifestSha256": "c71ea15b519feb47a4fd33288fb92f2dcd40202fb2ce0a771fa408f9b4fbaf41",
"filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699",
"files": 5,
"dir": "model/contour-map"
},
{
"id": "earth-geography",
"version": "1.8",
"build": "3b645c45c2",
"manifestSha256": "a9f30fd4a1dd0aeccb88c892579c93bf32a92379d7b3f545b28f6cac612f9871",
"filesSha256": "0e55d2f9bacc3e0ff42f5c45d9e7c265864df9784b1609c09dcb32d21b4addfc",
"version": "1.9",
"build": "cc68b8863b",
"manifestSha256": "ae64033c7b46c51eb9c5f3dfb70a5491068c6cd608dec953eb34311cb8045d60",
"filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95",
"files": 11,
"dir": "model/earth-geography"
},
{
"id": "earth-revolution",
"version": "1.6",
"build": "947efa36bb",
"manifestSha256": "feb715cde8ad5da9ecfb48785a95e6fc82930cc92c668514b328915366c2f57a",
"filesSha256": "a37e0b493c78bb0a04a276512b612be3f8e7a178ed1a7fc72acb5353aa57f7c5",
"version": "1.7",
"build": "53b7a0fbc3",
"manifestSha256": "88e6f2f1bd2f7654d169745b96fa85aaea37671b6cdf8ed4fc05f7f259ae90bc",
"filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1",
"files": 7,
"dir": "model/earth-revolution"
},
{
"id": "earth-rotation",
"version": "1.6",
"build": "a803d9c020",
"manifestSha256": "56ed397cbc008bd9ec8bea0ee34a94a28ab29ce39a8b096b0629e529883b4dff",
"filesSha256": "4e4428812d18d15a99105e73c027b99f3197033f0138d643ba69c15fabc9d8f6",
"version": "1.7",
"build": "ecd52665f9",
"manifestSha256": "9ac0050f65eedc833dd8daa8eb3b18400540269fd1a4b764ef771a357fb1cf0a",
"filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e",
"files": 7,
"dir": "model/earth-rotation"
},
{
"id": "scale-calculator",
"version": "1.5",
"build": "02a555272a",
"manifestSha256": "d00034888d9b9da03338b7f394d1bdf33f73b1fbdd7e8f154d85b9080318ab13",
"filesSha256": "4a5fbf898df1d98eddf68b5d3929ae7b25cd7bcdfdfa36b5ad0ed72d9941d049",
"version": "1.6",
"build": "105653737d",
"manifestSha256": "05dcb4ec0a4a0cda66dbb633b8ea58e4f4f2de47b5c9557799ac317de874f2af",
"filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604",
"files": 6,
"dir": "model/scale-calculator"
}
],
"signature": {
"alg": "ECDSA-P256-SHA256",
"keyId": "gc-2026-11",
"value": "LHaF2bw+IZeWUw2qLQM1IQHoNXsHNko38dyjP45Jy41KtlyhvJhhFaNh+THKhAU+6jSzV1eFHgbwasboYBOa5w==",
"contentSha256": "749055593bf9839837428d900d523b3363486556970cbf4e2daa25001ab174c8",
"signedAt": "2026-11-14T11:36:03Z"
}
]
}