移动部分文件

This commit is contained in:
2509_92447106 committed 2026-11-14 13:16:01 +08:00
1 parent 0ddee422ab
commit c95dfaf9f3
78 files changed
+102 -47

No files matched your search

+2 -1
View File
@@ -1,7 +1,8 @@
<Project>
<!--
多目录结构公共属性:
GC-BOOT 启动器生产代码
GC-BOOT 启动入口
GC/src/ 启动器核心代码
GC/src/test/dotnet/<module> 测试 / 离屏渲染校验
TargetFramework 可由命令行覆盖:dotnet build -p:TargetFramework=net10.0
-->
+24
View File
@@ -0,0 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<RootNamespace>GC.Boot</RootNamespace>
<AssemblyName>GC</AssemblyName>
<ApplicationManifest>app.manifest</ApplicationManifest>
<!-- 应用图标(Windows exe / 任务栏) -->
<ApplicationIcon>..\GC\src\Assets\icon.ico</ApplicationIcon>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\GC\src\GC.Core.csproj" />
</ItemGroup>
</Project>
+31 -1
View File
@@ -5,7 +5,7 @@ VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GC-BOOT", "GC-BOOT", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC", "GC-BOOT\GC.csproj", "{2E3BE2DB-1C4B-4EA0-9523-43EE910BD54C}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC", "GC-BOOT\GC-BOOT.csproj", "{2E3BE2DB-1C4B-4EA0-9523-43EE910BD54C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GC", "GC", "{3E72BF5C-0B5E-D5BD-DCAE-6B991004B4A5}"
EndProject
@@ -31,6 +31,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EADF0841-BEC
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EarthRevolutionModel", "model\earth-revolution\src\EarthRevolutionModel.csproj", "{6BD9C21B-8F06-4F60-A087-696B6F03CC25}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC.Core", "GC\src\GC.Core.csproj", "{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_sdk", "_sdk", "{6C38EF76-7D14-0C76-0B88-84F29EAA96CD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -101,6 +105,30 @@ Global
{6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Release|x64.Build.0 = Release|Any CPU
{6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Release|x86.ActiveCfg = Release|Any CPU
{6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Release|x86.Build.0 = Release|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x64.ActiveCfg = Debug|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x64.Build.0 = Debug|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x86.ActiveCfg = Debug|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x86.Build.0 = Debug|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|Any CPU.Build.0 = Release|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|x64.ActiveCfg = Release|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|x64.Build.0 = Release|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|x86.ActiveCfg = Release|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|x86.Build.0 = Release|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x64.ActiveCfg = Debug|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x64.Build.0 = Debug|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x86.ActiveCfg = Debug|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x86.Build.0 = Debug|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|Any CPU.Build.0 = Release|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|x64.ActiveCfg = Release|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|x64.Build.0 = Release|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|x86.ActiveCfg = Release|Any CPU
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -116,5 +144,7 @@ Global
{0B92F86C-37C2-3C12-904C-85123CE34F4C} = {62B8A37E-7066-D91A-6443-87D4E6CE63FE}
{EADF0841-BEC2-9A74-4322-069D7B5A6EBB} = {0B92F86C-37C2-3C12-904C-85123CE34F4C}
{6BD9C21B-8F06-4F60-A087-696B6F03CC25} = {EADF0841-BEC2-9A74-4322-069D7B5A6EBB}
{AB63C416-5783-4FB9-A162-5BBA32E8BFCC} = {09578AA7-0862-3E52-D2AA-D8F7E863B74B}
{6C38EF76-7D14-0C76-0B88-84F29EAA96CD} = {62B8A37E-7066-D91A-6443-87D4E6CE63FE}
EndGlobalSection
EndGlobal
+1 -1
View File
@@ -43,6 +43,6 @@
<Application.Styles>
<FluentTheme />
<StyleInclude Source="avares://GC/Styles/AppTheme.axaml" />
<StyleInclude Source="avares://GC.Core/Styles/AppTheme.axaml" />
</Application.Styles>
</Application>
+1 -1
View File
@@ -56,7 +56,7 @@ public partial class App : Application
try
{
using var iconStream = Avalonia.Platform.AssetLoader.Open(
new Uri("avares://GC/Assets/icon.png"));
new Uri("avares://GC.Core/Assets/icon.png"));
window.Icon = new Avalonia.Controls.WindowIcon(iconStream);
}
catch { /* 图标缺失不影响启动 */ }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+4 -9
View File
@@ -1,22 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<RootNamespace>GC</RootNamespace>
<AssemblyName>GC</AssemblyName>
<ApplicationManifest>app.manifest</ApplicationManifest>
<!-- 应用图标(Windows exe / 任务栏) -->
<ApplicationIcon>Assets\icon.ico</ApplicationIcon>
<AssemblyName>GC.Core</AssemblyName>
<AvaloniaUseCompiledBindingsByDefault>false</AvaloniaUseCompiledBindingsByDefault>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<InvariantGlobalization>false</InvariantGlobalization>
</PropertyGroup>
<ItemGroup>
<AvaloniaResource Include="Assets\**" />
<Compile Include="..\GC-DRAW\PlayerWindow.cs" />
<Compile Include="..\..\GC-DRAW\PlayerWindow.cs" />
<Compile Remove="test\**\*.cs" />
</ItemGroup>
<ItemGroup>
@@ -26,9 +22,8 @@
<PackageReference Include="CommunityToolkit.Mvvm" Version="$(MvvmVersion)" />
</ItemGroup>
<!-- 模型契约:启动器与模型唯一的共享代码(不含任何渲染/业务) -->
<ItemGroup>
<ProjectReference Include="..\model\_sdk\GC.ModelSdk\GC.ModelSdk.csproj" />
<ProjectReference Include="..\..\model\_sdk\GC.ModelSdk\GC.ModelSdk.csproj" />
</ItemGroup>
</Project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -75,7 +75,7 @@ public sealed class L : INotifyPropertyChanged
{
try
{
var uri = new Uri($"avares://GC/Assets/i18n/{code}.json");
var uri = new Uri($"avares://GC.Core/Assets/i18n/{code}.json");
using var stream = AssetLoader.Open(uri);
using var reader = new StreamReader(stream);
return JsonSerializer.Deserialize<Dictionary<string, string>>(reader.ReadToEnd(),
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+1 -1
View File
@@ -14,7 +14,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../../../../../GC-BOOT/GC.csproj" />
<ProjectReference Include="../../../GC.Core.csproj" />
</ItemGroup>
</Project>
+11 -6
View File
@@ -56,12 +56,17 @@ Repository/
├── Directory.Build.props # 公共构建属性
├── version.json # ★ 自动生成的版本清单(推送到仓库后才生效)
├── build.sh / build.ps1 # 构建脚本
├── GC/ # 原 src 内容
│ └── src/test/dotnet/GC.Tests/ # 离屏校验 + --update-test 离线更新链路验证
├── GC-BOOT/ # 启动器(不实现模型绘制)
│ ├── Models/ Services/ # 清单/设置/目录探测/i18n/模型库/下载/自动更新
│ ├── ViewModels/ Views/ # 主页、下载、设置和启动更新状态
│ └── Assets/i18n/ # 启动器界面语言包
├── GC/ # 启动器主要代码
│ └── src/
│ ├── GC.Core.csproj
│ ├── Models/ Services/ # 清单/设置/目录探测/i18n/模型库/下载/自动更新
│ ├── ViewModels/ Views/ # 主页、下载、设置和启动更新状态
│ ├── Assets/i18n/ # 启动器界面语言包
│ └── test/dotnet/GC.Tests/ # 离屏校验 + --update-test 离线更新链路验证
├── GC-BOOT/ # 轻量启动入口
│ ├── GC-BOOT.csproj
│ ├── Program.cs
│ └── app.manifest
├── GC-DRAW/PlayerWindow.cs # 通用模型窗口宿主;实际绘制由模型提供
├── model/ # ★ 模型的一切
│ ├── version.json # 与根 version.json 相同(便于按 model/ 地址读取)
+1 -1
View File
@@ -15,7 +15,7 @@ $Root = $PSScriptRoot
Set-Location $Root
$env:AVALONIA_TELEMETRY_OPTOUT = '1'
$AppProj = 'GC-BOOT/GC.csproj'
$AppProj = 'GC-BOOT/GC-BOOT.csproj'
$TestProj = 'GC/src/test/dotnet/GC.Tests/GC.Tests.csproj'
$StampProj= 'model/_engine/VersionStamp/VersionStamp.csproj'
$Sln = 'GC.sln'
+1 -1
View File
@@ -21,7 +21,7 @@ export AVALONIA_TELEMETRY_OPTOUT=1
ROOT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
cd "$ROOT_DIR"
APP_PROJ="GC-BOOT/GC.csproj"
APP_PROJ="GC-BOOT/GC-BOOT.csproj"
PREVIEW_PROJ="model/_engine/PreviewGen/PreviewGen.csproj"
STAMP_PROJ="model/_engine/VersionStamp/VersionStamp.csproj"
TEST_PROJ="GC/src/test/dotnet/GC.Tests/GC.Tests.csproj"
+1 -1
View File
@@ -220,7 +220,7 @@ PLIST
mv "$f" "$APP/Contents/MacOS/"
done
# 应用图标:由 Assets/icon-1024.png 生成 .icns
ICONSRC="$ROOT_DIR/GC-BOOT/Assets/icon-1024.png"
ICONSRC="$ROOT_DIR/GC/src/Assets/icon-1024.png"
if [ -f "$ICONSRC" ] && command -v iconutil >/dev/null 2>&1; then
ICONSET="$DIST/AppIcon.iconset"
rm -rf "$ICONSET"; mkdir -p "$ICONSET"
+2 -2
View File
@@ -25,6 +25,6 @@
"button": "#9FB4D4",
"frame": "#0A1524"
},
"updatedAt": "2026-11-14T04:52:33Z",
"build": "6824878fe5"
"updatedAt": "2026-11-14T05:09:30Z",
"build": "257dcfd58f"
}
+2 -2
View File
@@ -18,7 +18,7 @@
],
"dataDir": "earth-geography.model",
"version": "1.8",
"updatedAt": "2026-11-14T04:52:33Z",
"updatedAt": "2026-11-14T05:09:30Z",
"chrome": {
"titleBar": "#0C1828",
"titleBorder": "#1B2740",
@@ -26,5 +26,5 @@
"button": "#9FB4D4",
"frame": "#0A1524"
},
"build": "e06308cb71"
"build": "3a10607730"
}
+2 -2
View File
@@ -24,7 +24,7 @@
"preview": "preview.png",
"apiVersion": 1,
"version": "1.6",
"updatedAt": "2026-11-14T04:52:33Z",
"updatedAt": "2026-11-14T05:09:30Z",
"chrome": {
"titleBar": "#0C1828",
"titleBorder": "#1B2740",
@@ -32,5 +32,5 @@
"button": "#9FB4D4",
"frame": "#0A1524"
},
"build": "dfe649ec3c"
"build": "30d5d835df"
}
+2 -2
View File
@@ -24,7 +24,7 @@
"preview": "preview.png",
"apiVersion": 1,
"version": "1.6",
"updatedAt": "2026-11-14T04:52:33Z",
"updatedAt": "2026-11-14T05:09:30Z",
"chrome": {
"titleBar": "#0C1828",
"titleBorder": "#1B2740",
@@ -32,5 +32,5 @@
"button": "#9FB4D4",
"frame": "#0A1524"
},
"build": "ea8cf4a843"
"build": "aaeef1614c"
}
+2 -2
View File
@@ -25,7 +25,7 @@
"preview": "preview.png",
"apiVersion": 1,
"version": "1.5",
"updatedAt": "2026-11-14T04:52:33Z",
"updatedAt": "2026-11-14T05:09:30Z",
"chrome": {
"titleBar": "#FFFFFF",
"titleBorder": "#E3E8F3",
@@ -33,5 +33,5 @@
"button": "#5B6A86",
"frame": "#F4F6FB"
},
"build": "139afd4199"
"build": "c41765488d"
}
@@ -17,7 +17,7 @@ namespace NeoRF.ScaleCalculator;
/// </summary>
public sealed partial class ScaleCalculatorView : UserControl
{
// 调色(与 GC-BOOT/Styles/AppTheme.axaml 一致)
// 调色(与 GC/src/Styles/AppTheme.axaml 一致)
internal static readonly Color CAppBg = Color.Parse("#F4F6FB");
internal static readonly Color CSurface = Color.Parse("#FFFFFF");
internal static readonly Color CSurfaceAlt = Color.Parse("#F7F9FE");
+6 -6
View File
@@ -1,6 +1,6 @@
{
"schema": 1,
"generated": "2026-11-14T04:52:33Z",
"generated": "2026-11-14T05:09:30Z",
"repository": "https://gitcode.com/2509_92447106/GC",
"branch": "main",
"modelDir": "model",
@@ -34,31 +34,31 @@
{
"id": "contour-map",
"version": "1.0",
"build": "6824878fe5",
"build": "257dcfd58f",
"dir": "model/contour-map"
},
{
"id": "earth-geography",
"version": "1.8",
"build": "e06308cb71",
"build": "3a10607730",
"dir": "model/earth-geography"
},
{
"id": "earth-revolution",
"version": "1.6",
"build": "dfe649ec3c",
"build": "30d5d835df",
"dir": "model/earth-revolution"
},
{
"id": "earth-rotation",
"version": "1.6",
"build": "ea8cf4a843",
"build": "aaeef1614c",
"dir": "model/earth-rotation"
},
{
"id": "scale-calculator",
"version": "1.5",
"build": "139afd4199",
"build": "c41765488d",
"dir": "model/scale-calculator"
}
]
+6 -6
View File
@@ -1,6 +1,6 @@
{
"schema": 1,
"generated": "2026-11-14T04:52:33Z",
"generated": "2026-11-14T05:09:30Z",
"repository": "https://gitcode.com/2509_92447106/GC",
"branch": "main",
"modelDir": "model",
@@ -34,31 +34,31 @@
{
"id": "contour-map",
"version": "1.0",
"build": "6824878fe5",
"build": "257dcfd58f",
"dir": "model/contour-map"
},
{
"id": "earth-geography",
"version": "1.8",
"build": "e06308cb71",
"build": "3a10607730",
"dir": "model/earth-geography"
},
{
"id": "earth-revolution",
"version": "1.6",
"build": "dfe649ec3c",
"build": "30d5d835df",
"dir": "model/earth-revolution"
},
{
"id": "earth-rotation",
"version": "1.6",
"build": "ea8cf4a843",
"build": "aaeef1614c",
"dir": "model/earth-rotation"
},
{
"id": "scale-calculator",
"version": "1.5",
"build": "139afd4199",
"build": "c41765488d",
"dir": "model/scale-calculator"
}
]