Compare commits

..
8 Commits
Author SHA1 Message Date
xhgit a5fcaeb658 Merge pull request '1.1.0:版本号同步,关于页补 Git 服务与感谢(itxiaohui)' (#19) from sync/1.1.0-about into main
Reviewed-on: Morris/GC#19
2026-11-18 15:13:00 +00:00
Morris fcaacf3b33 1.1.0:版本号同步,关于页补 Git 服务与感谢
- version.json / model/version.json 升到 1.1.0,写入新包 sha256 与体积并重签(gc-2026-12)
- pubspec.yaml 版本 1.0.0+1 -> 1.1.0+1,Windows 前端 exe 的版本资源跟着走
- 关于页新增「Git 服务」一行(itxiaohui)与「感谢」卡片:
  地理洪老师(学科内容)、itxiaohui(Git 服务与部署),中英双语文案
- 开发者列表把早期账号 xhgit 归并到 itxiaohui,避免同一个人的两个名字
- Avalonia 回退界面同步这两处(Git 服务行 + 感谢项)
2026-11-18 22:51:09 +08:00
xhgit 0997de514e Merge pull request 'release: 1.1.0 版本号' (#18) from release/1.1.0 into main 2026-11-18 14:33:45 +00:00
lead 192f2a63e9 1.1.0:界面重做与 DPI 修复的正式版本号
Directory.Build.props 的 Version 从 1.0.11 提到 1.1.0,启动器程序集版本 / 关于页 / version.json 的 launcher.version 都跟着走。
2026-11-18 22:33:24 +08:00
xhgit a1a14f106b Merge pull request 'feat(ui): 重做启动器界面并修复 DPI 发糊' (#17) from feat/ui-crisp-dpi into main
Reviewed-on: Morris/GC#17
2026-11-18 14:18:00 +00:00
lead e67cc63998 feat(ui): 重做启动器界面并修复 DPI 发糊
- 交叉编译补嵌 runner.exe.manifest:GNUn res 不再丢掉 DPI 声明,缩放屏不再位图拉伸
- main.cpp 建窗前自行声明 Per-Monitor V2 DPI 感知(三级回退)
- win32_window 初始窗口按显示器工作区上限收缩,避免 150% 缩放后超出屏幕
- 重做主题:中性石墨底 + 高对比正文、统一字号/间距/圆角令牌、Segoe UI + 雅黑字体栈
- 首页/下载/设置/关于四页重排,宽屏自适应、小窗不溢出
- 修复下拉框字体丢失、封面遮罩盖住占位、任务状态未翻译等问题
- 截图脚本:注入 CJK/图标字体、runAsync 取像素、补小窗回归用例
2026-11-18 22:15:54 +08:00
Morris 2ba4789c95 Merge pull request 'macOS:守护进程收进 .app/Contents/MacOS/.GC/bin' (#16) from release/1.0.11-singlefile into main
Reviewed-on: Morris/GC#16
2026-11-18 13:50:30 +00:00
Morris 22baa6fda9 macOS 的 .GC/bin 也随包分发:守护进程不再落在 .app 根
- pack_launcher 的 macOS 分支把包内 GC-SAVEDOG 移进 .app/Contents/MacOS/.GC/bin,
  与 Windows 布局一致;.GC 位置不变,仍在启动器同级
- package_mac_app 的注释同步:包里只保留 .GC/bin,模板类目录仍由首次启动创建
- README 补 macOS 的 .GC 位置与守护进程路径
2026-11-18 21:10:43 +08:00
19 changed files with 2691 additions and 1131 deletions

No files matched your search

+1 -1
View File
@@ -22,7 +22,7 @@
--> -->
<AvaloniaVersion>11.3.9</AvaloniaVersion> <AvaloniaVersion>11.3.9</AvaloniaVersion>
<MvvmVersion>8.2.2</MvvmVersion> <MvvmVersion>8.2.2</MvvmVersion>
<Version>1.0.11</Version> <Version>1.1.0</Version>
<Company>Morris</Company> <Company>Morris</Company>
<Product>GC</Product> <Product>GC</Product>
<NeutralLanguage>zh-Hans</NeutralLanguage> <NeutralLanguage>zh-Hans</NeutralLanguage>
+19
View File
@@ -137,6 +137,25 @@ GC-UI.exe flutter_windows.dll data/{icudtl.dat, app.so, flutter_assets/}
- `Runner.rc` 在 windres 下有两处不兼容:图标用反斜杠相对路径、`VERSION_AS_STRING` - `Runner.rc` 在 windres 下有两处不兼容:图标用反斜杠相对路径、`VERSION_AS_STRING`
依赖命令行传 `-D` 的转义字符串。脚本生成一份路径与宏都已规整的 rc 副本再编译。 依赖命令行传 `-D` 的转义字符串。脚本生成一份路径与宏都已规整的 rc 副本再编译。
### 交叉编译必须自己嵌 DPI 清单
`windows/runner/CMakeLists.txt` 把 `runner.exe.manifest` 当**源文件**列进 target,
Visual Studio 生成器会把它交给链接器(`/MANIFESTINPUT`)自动嵌入 exe;
但 `buildsh/cross/CMakeLists.txt` 只用 windres 编 `Runner.rc`,CMake 不会做这一步。
结果就是交叉编出来的 `GC-UI.exe` **完全没有清单**:Windows 认为它「DPI 不感知」,
在 125% / 150% 缩放的屏幕上把整块窗口当位图拉伸 —— 界面整体发虚,中文小字最明显。
现在两处都已加固,改这块代码时不要拆掉任何一处:
| 位置 | 做法 |
|---|---|
| `buildsh/cross/CMakeLists.txt` | 往 `Runner.cross.rc` 追加 `1 24 "<abs>/runner.exe.manifest"`(id 1 = CREATEPROCESS_MANIFEST_RESOURCE_ID,type 24 = RT_MANIFEST) |
| `windows/runner/main.cpp` | 建窗之前调 `SetProcessDpiAwarenessContext(PER_MONITOR_AWARE_V2)`,失败依次退到 `SetProcessDpiAwareness` / `SetProcessDPIAware` |
`main.cpp` 那层是兜底:即使清单因为工具链原因没嵌进去,程序自己也会声明 DPI 感知。
验证办法(Windows):`GC-UI.exe` 属性 →「兼容性」里不该出现「替代高 DPI 缩放行为」,
或在 125% 缩放下截图,文字边缘应是锐利的 1.25 倍像素,而不是模糊的插值。
`.gitea/workflows` 里的 `windows` 任务仍然跑在 `windows-latest` 上;若手头只有 macOS/Linux `.gitea/workflows` 里的 `windows` 任务仍然跑在 `windows-latest` 上;若手头只有 macOS/Linux
构建机,可以把该任务的 `runs-on` 换成对应标签,直接复用这套交叉编译脚本, 构建机,可以把该任务的 `runs-on` 换成对应标签,直接复用这套交叉编译脚本,
不再需要 VS Build Tools。 不再需要 VS Build Tools。
+26 -5
View File
@@ -149,14 +149,35 @@ flutter test
# 前后端联调(需要后端正在运行;后端没起时自动跳过) # 前后端联调(需要后端正在运行;后端没起时自动跳过)
flutter test test/backend_contract_test.dart flutter test test/backend_contract_test.dart
# 生成界面截图到 test/shots/(视觉检查用) # 生成界面截图到 test/shots/(视觉检查用,不需要后端)
flutter test tool/render_shots_test.dart flutter test tool/render_shots_test.dart
``` ```
截图脚本覆盖四个页面(首页 / 下载 / 设置 / 关于)再加一整套外壳: 截图脚本覆盖四个页面(首页 / 下载 / 设置 / 关于),再加一整套外壳与 1024×680 小窗回归:
`test/shots/home.png`、`download.png`、`settings.png`、`about.png`、`shell.png`。 `test/shots/home.png`、`download.png`、`settings.png`、`about.png`、`shell.png`、
需要先在本机 17890 端口跑起后端;脚本用 `runAsync` 给真实 HTTP 留出时间, `home-small.png`、`download-small.png`、`settings-small.png`,以及浅色主题的
否则 `flutter_test` 的假时钟会让页面停在加载态。 `home-light.png`、`settings-light.png`。小窗用例会顺带抓布局溢出(RenderFlex overflow)。
四个页面都用预置数据(`initialModels` / `initialSources` / `initialAbout` 等)渲染,
所以**不需要先起后端**。测试环境的字体是 Ahem(所有字都是方块),脚本会显式加载
系统里的 Noto Sans SC / 微软雅黑 / 苹方,并顺带加载 Material 图标字体,中文和图标才正常。
截图必须放在 `runAsync` 里取像素(`toImage` / `toByteData` 走真实引擎管线),
否则 fake async 时钟不推进,每个用例会卡满 10 分钟才超时。
## 界面清晰度(DPI)
`GC-UI.exe` 必须在启动时就声明 DPI 感知,否则 Windows 在 125% / 150% 缩放下会把
整块窗口当位图拉伸,界面看起来「糊」—— 中文小字最先糊。两处保证:
- `windows/runner/runner.exe.manifest`:PerMonitorV2(原生 MSVC 构建由 CMake 自动嵌入)
- `windows/runner/main.cpp`:建窗前再声明一次,依次尝试
`SetProcessDpiAwarenessContext` → `SetProcessDpiAwareness` → `SetProcessDPIAware`
- `buildsh/cross/CMakeLists.txt`:交叉编译时把清单写进 `.rc`(windres 不会自动嵌入)
另外主题里做了两件跟「清晰」有关的事:字体族走
`Segoe UI + Microsoft YaHei UI`(macOS 走苹方)而不是让引擎随意回退;
正文最小 12px、行高固定,中文不再挤成一片。详见
[CI.md 的「交叉编译必须自己嵌 DPI 清单」](CI.md#交叉编译必须自己嵌-dpi-清单)。
## 「关于」页展示的技术栈 ## 「关于」页展示的技术栈
+10
View File
@@ -138,6 +138,11 @@ class I18n {
'about.architectureValue': 'Flutter 前端 + .NET 后端(本地 HTTP)', 'about.architectureValue': 'Flutter 前端 + .NET 后端(本地 HTTP)',
'about.sourceLanguage': '源码语言', 'about.sourceLanguage': '源码语言',
'about.frontend': '前端', 'about.frontend': '前端',
'about.gitService': 'Git 服务',
'about.thanks': '感谢',
'about.thanksHint': '特别感谢以下朋友的支持',
'about.thanksGit': 'Git 服务与部署支持',
'about.thanksGeo': '地理学科内容指导',
}, },
'en': <String, String>{ 'en': <String, String>{
'app.name': 'Morris GC', 'app.name': 'Morris GC',
@@ -268,6 +273,11 @@ class I18n {
'about.architectureValue': 'Flutter frontend + .NET backend (local HTTP)', 'about.architectureValue': 'Flutter frontend + .NET backend (local HTTP)',
'about.sourceLanguage': 'Source language', 'about.sourceLanguage': 'Source language',
'about.frontend': 'Frontend', 'about.frontend': 'Frontend',
'about.gitService': 'Git hosting',
'about.thanks': 'Thanks',
'about.thanksHint': 'Special thanks to',
'about.thanksGit': 'Git hosting and deployment',
'about.thanksGeo': 'Geography content guidance',
}, },
}; };
+2
View File
@@ -42,6 +42,8 @@ class _GcUiAppState extends State<GcUiApp> {
return MaterialApp( return MaterialApp(
title: 'Morris GC', title: 'Morris GC',
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
// 桌面端不要移动端那套拉伸回弹和边缘光晕。
scrollBehavior: const GcScrollBehavior(),
theme: buildGcTheme(Brightness.light), theme: buildGcTheme(Brightness.light),
darkTheme: buildGcTheme(Brightness.dark), darkTheme: buildGcTheme(Brightness.dark),
themeMode: mode, themeMode: mode,
File diff suppressed because it is too large. Load diff
+184 -86
View File
@@ -14,12 +14,31 @@ class _NavItem {
} }
const List<_NavItem> _navItems = <_NavItem>[ const List<_NavItem> _navItems = <_NavItem>[
_NavItem(Icons.grid_view_rounded, 'nav.home'), _NavItem(Icons.dashboard_rounded, 'nav.home'),
_NavItem(Icons.download_rounded, 'nav.download'), _NavItem(Icons.download_rounded, 'nav.download'),
_NavItem(Icons.tune_rounded, 'nav.settings'), _NavItem(Icons.tune_rounded, 'nav.settings'),
_NavItem(Icons.info_outline_rounded, 'nav.about'), _NavItem(Icons.info_outline_rounded, 'nav.about'),
]; ];
/// 桌面端滚动行为:去掉移动端的拉伸回弹和边缘光晕,滚轮更跟手。
class GcScrollBehavior extends MaterialScrollBehavior {
const GcScrollBehavior();
@override
Widget buildOverscrollIndicator(
BuildContext context,
Widget child,
ScrollableDetails details,
) {
return child;
}
@override
ScrollPhysics getScrollPhysics(BuildContext context) {
return const ClampingScrollPhysics(parent: AlwaysScrollableScrollPhysics());
}
}
/// 应用外壳:左侧导航 + 右侧内容 + 底部更新状态条。 /// 应用外壳:左侧导航 + 右侧内容 + 底部更新状态条。
class ShellPage extends StatefulWidget { class ShellPage extends StatefulWidget {
const ShellPage({super.key, required this.controller}); const ShellPage({super.key, required this.controller});
@@ -52,6 +71,7 @@ class _ShellPageState extends State<ShellPage> {
body: Row( body: Row(
children: <Widget>[ children: <Widget>[
_Sidebar(controller: controller), _Sidebar(controller: controller),
Container(width: 1, color: GcColors.line),
Expanded( Expanded(
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
@@ -75,9 +95,9 @@ class _ShellPageState extends State<ShellPage> {
} }
return const Center( return const Center(
child: SizedBox( child: SizedBox(
width: 26, width: 22,
height: 26, height: 22,
child: CircularProgressIndicator(strokeWidth: 2.4), child: CircularProgressIndicator(strokeWidth: 2),
), ),
); );
} }
@@ -124,52 +144,25 @@ class _Sidebar extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final settings = controller.settings; final settings = controller.settings;
return Container( return Container(
width: 236, width: GcSize.sidebar,
color: GcColors.sideBg, color: GcColors.sideBg,
padding: const EdgeInsets.fromLTRB(16, 20, 16, 18), padding: const EdgeInsets.fromLTRB(
GcSpace.xl, GcSpace.xxl, GcSpace.lg, GcSpace.lg),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( _brand(),
children: <Widget>[ const SizedBox(height: GcSpace.xxxl),
Container(
width: 26,
height: 26,
decoration: BoxDecoration(
color: GcColors.surfaceAlt,
borderRadius: BorderRadius.circular(8),
),
alignment: Alignment.center,
child: Text(
'◎',
style: TextStyle(fontSize: 14, color: GcColors.accent),
),
),
const SizedBox(width: 10),
Expanded(
child: Text(
'Morris GC',
style: TextStyle(
fontSize: 13,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
),
],
),
const SizedBox(height: 6),
GcHint(T('app.tagline')),
const SizedBox(height: 26),
const Padding( const Padding(
padding: EdgeInsets.only(left: 14, bottom: 6), padding: EdgeInsets.only(left: 10, bottom: GcSpace.sm),
child: Text( child: Text(
'MENU', 'MENU',
style: TextStyle( style: TextStyle(
fontSize: 9.5, fontSize: 11,
letterSpacing: 1.2, height: 1.2,
letterSpacing: 1.4,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Color(0xFF4C5F80), color: Color(0xFF5C6A80),
), ),
), ),
), ),
@@ -181,25 +174,91 @@ class _Sidebar extends StatelessWidget {
), ),
const Spacer(), const Spacer(),
Container(height: 1, color: GcColors.line), Container(height: 1, color: GcColors.line),
const SizedBox(height: 10), const SizedBox(height: GcSpace.md),
Padding( Padding(
padding: const EdgeInsets.only(left: 14), padding: const EdgeInsets.only(left: 10),
child: Text( child: Column(
'v${settings?.version ?? '—'}', crossAxisAlignment: CrossAxisAlignment.start,
style: TextStyle(fontSize: 10.5, color: GcColors.faint), children: <Widget>[
), Text(
), 'v${settings?.version ?? '—'}',
Padding( style: TextStyle(
padding: const EdgeInsets.only(left: 14, top: 2), fontSize: 12,
child: Text( height: 1.4,
settings?.platform ?? '—', fontWeight: FontWeight.w600,
style: const TextStyle(fontSize: 10, color: Color(0xFF4F6080)), color: GcColors.muted,
),
),
const SizedBox(height: 2),
Text(
settings?.platform ?? '—',
style: TextStyle(
fontSize: 11.5,
height: 1.4,
color: GcColors.ghost,
),
),
],
), ),
), ),
], ],
), ),
); );
} }
/// 品牌区:一个渐变圆角标 + 名称 + 一句定位。
Widget _brand() {
return Row(
children: <Widget>[
Container(
width: 32,
height: 32,
alignment: Alignment.center,
decoration: BoxDecoration(
color: GcColors.accentSoft,
borderRadius: BorderRadius.circular(9),
border: Border.all(
color: Color.alphaBlend(
GcColors.accent.withOpacity(0.35), GcColors.sideBg),
),
),
child: Text(
'◎',
style: TextStyle(fontSize: 16, height: 1.1, color: GcColors.accent),
),
),
const SizedBox(width: GcSpace.md),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(
'Morris GC',
style: TextStyle(
fontSize: 14,
height: 1.3,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
const SizedBox(height: 1),
Text(
'SCIENCE · CLASSROOM',
style: TextStyle(
fontSize: 10,
height: 1.3,
letterSpacing: 0.9,
fontWeight: FontWeight.w600,
color: GcColors.ghost,
),
),
],
),
),
],
);
}
} }
class _NavButton extends StatelessWidget { class _NavButton extends StatelessWidget {
@@ -216,29 +275,34 @@ class _NavButton extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Padding( return Padding(
padding: const EdgeInsets.only(bottom: 4), padding: const EdgeInsets.only(bottom: GcSpace.xs),
child: Material( child: Material(
color: active ? GcColors.surfaceAlt : Colors.transparent, color: active ? GcColors.accentSoft : Colors.transparent,
borderRadius: BorderRadius.circular(9), borderRadius: BorderRadius.circular(GcRadius.control),
child: InkWell( child: InkWell(
borderRadius: BorderRadius.circular(9), borderRadius: BorderRadius.circular(GcRadius.control),
onTap: onTap, onTap: onTap,
hoverColor: GcColors.surfaceHover,
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10), padding: const EdgeInsets.symmetric(
horizontal: GcSpace.md,
vertical: 11,
),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Icon( Icon(
item.icon, item.icon,
size: 16, size: 17,
color: active ? GcColors.accent : GcColors.faint, color: active ? GcColors.accent : GcColors.faint,
), ),
const SizedBox(width: 10), const SizedBox(width: GcSpace.md),
Text( Text(
T(item.labelKey), T(item.labelKey),
style: TextStyle( style: TextStyle(
fontSize: 12.5, fontSize: 13.5,
height: 1.2,
fontWeight: active ? FontWeight.w600 : FontWeight.w400, fontWeight: active ? FontWeight.w600 : FontWeight.w400,
color: active ? GcColors.ink : GcColors.muted, color: active ? GcColors.accent : GcColors.muted,
), ),
), ),
], ],
@@ -262,20 +326,28 @@ class _UpdateBar extends StatelessWidget {
color: GcColors.surface, color: GcColors.surface,
border: Border(top: BorderSide(color: GcColors.line)), border: Border(top: BorderSide(color: GcColors.line)),
), ),
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 9), padding: const EdgeInsets.symmetric(
horizontal: GcSpace.xxl,
vertical: GcSpace.md,
),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Text('⟳', Icon(
style: TextStyle(fontSize: 16, color: GcColors.accent)), Icons.sync_rounded,
const SizedBox(width: 12), size: 18,
color: GcColors.accent,
),
const SizedBox(width: GcSpace.md),
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
Text( Text(
controller.updateStatus, controller.updateStatus,
style: TextStyle( style: TextStyle(
fontSize: 12.5, fontSize: 13,
height: 1.35,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: GcColors.ink, color: GcColors.ink,
), ),
@@ -284,23 +356,41 @@ class _UpdateBar extends StatelessWidget {
if (controller.updateDetail.isNotEmpty) if (controller.updateDetail.isNotEmpty)
Text( Text(
controller.updateDetail, controller.updateDetail,
style: TextStyle(fontSize: 11, color: GcColors.faint), style: TextStyle(
fontSize: 12,
height: 1.4,
color: GcColors.faint,
),
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
if (controller.launcherNotice.isNotEmpty) if (controller.launcherNotice.isNotEmpty)
Text( Text(
controller.launcherNotice, controller.launcherNotice,
style: TextStyle(fontSize: 11, color: GcColors.warn), style: TextStyle(
fontSize: 12,
height: 1.4,
color: GcColors.warn,
),
), ),
], ],
), ),
), ),
if (controller.updateBusy) if (controller.updateBusy) ...<Widget>[
const SizedBox( const SizedBox(width: GcSpace.lg),
width: 130, SizedBox(
child: LinearProgressIndicator(minHeight: 4), width: 140,
child: ClipRRect(
borderRadius: BorderRadius.circular(3),
child: LinearProgressIndicator(
value: controller.updateProgress > 0
? controller.updateProgress.clamp(0, 1).toDouble()
: null,
minHeight: 4,
),
),
), ),
const SizedBox(width: 14), ],
const SizedBox(width: GcSpace.lg),
TextButton( TextButton(
onPressed: controller.updateBusy onPressed: controller.updateBusy
? null ? null
@@ -324,24 +414,32 @@ class _BackendDown extends StatelessWidget {
child: ConstrainedBox( child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 520), constraints: const BoxConstraints(maxWidth: 520),
child: GcCard( child: GcCard(
padding: const EdgeInsets.all(28), padding: const EdgeInsets.all(GcSpace.xxl),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Row(
T('common.error'), children: <Widget>[
style: TextStyle( Icon(Icons.error_outline_rounded,
fontSize: 17, size: 20, color: GcColors.danger),
fontWeight: FontWeight.w600, const SizedBox(width: GcSpace.sm),
color: GcColors.ink, Text(
), T('common.error'),
style: TextStyle(
fontSize: 16,
height: 1.35,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
],
), ),
const SizedBox(height: 10), const SizedBox(height: GcSpace.md),
GcHint(controller.loadError ?? ''), GcHint(controller.loadError ?? ''),
const SizedBox(height: 6), const SizedBox(height: GcSpace.xs),
GcHint('后端地址:${controller.api.baseUrl}'), GcHint('${T('set.backend')}: ${controller.api.baseUrl}'),
const SizedBox(height: 16), const SizedBox(height: GcSpace.lg),
FilledButton( FilledButton(
onPressed: controller.bootstrap, onPressed: controller.bootstrap,
child: Text(T('common.retry')), child: Text(T('common.retry')),
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 1.0.0+1 version: 1.1.0+1
environment: environment:
sdk: ^3.5.4 sdk: ^3.5.4
+150 -24
View File
@@ -21,9 +21,18 @@ import 'package:gc_ui/theme.dart';
/// flutter test tool/render_shots_test.dart /// flutter test tool/render_shots_test.dart
void main() { void main() {
setUpAll(() async { setUpAll(() async {
HttpOverrides.global = null; // 不要设置 HttpOverrides.global = null:那会打开真实网络,
// flutter_test 的假时钟下 HTTP 定时器永远悬着,用例结束时
// 会撞上「!timersPending」断言。保持 flutter_test 默认的 FakeHttpClient
// (所有请求立即返回 400),页面本身都用预置数据渲染,不需要后端。
// 测试环境默认用 Ahem 占位字体(所有字都是方块),必须显式加载一套真字体:
// Linux CI 用 Noto CJK,Windows 本机用 Noto Sans SC / 微软雅黑,macOS 用苹方。
const candidates = <String>[ const candidates = <String>[
r'C:\Windows\Fonts\Deng.ttf',
r'C:\Windows\Fonts\NotoSansSC-VF.ttf',
r'C:\Windows\Fonts\msyh.ttc',
r'C:\Windows\Fonts\simhei.ttf',
'/System/Library/Fonts/PingFang.ttc',
'/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc', '/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc',
'/usr/share/fonts/truetype/noto/NotoSansCJK-Regular.ttc', '/usr/share/fonts/truetype/noto/NotoSansCJK-Regular.ttc',
]; ];
@@ -36,6 +45,22 @@ void main() {
await loader.load(); await loader.load();
break; break;
} }
// Material 图标字体:flutter_test 不会自动加载,不加载的话所有 Icon
// 都是方框,截图就没法检查图标。SDK 缓存里那份由 flutter test 通过
// FLUTTER_ROOT 指过来。
final flutterRoot = Platform.environment['FLUTTER_ROOT'];
if (flutterRoot != null) {
final icons = File(
'$flutterRoot/bin/cache/artifacts/material_fonts/materialicons-regular.otf',
);
if (icons.existsSync()) {
final bytes = icons.readAsBytesSync();
final loader = FontLoader('MaterialIcons')
..addFont(Future<ByteData>.value(ByteData.view(bytes.buffer)));
await loader.load();
}
}
}); });
SettingsInfo sampleSettings() => SettingsInfo.fromJson(<String, dynamic>{ SettingsInfo sampleSettings() => SettingsInfo.fromJson(<String, dynamic>{
@@ -123,9 +148,26 @@ void main() {
'uiAvailable': true, 'uiAvailable': true,
}); });
/// 外壳用的 controller:bootstrap 直接返回,不去连后端。
///
/// 真 ShellPage 会在 initState 里 bootstrap,后端不在时会挂重试定时器,
/// 用例结束时报「!timersPending」。这里只把 bootstrap 换成空实现,
/// 页面里的数据请求仍会走 flutter_test 的假 HTTP(立即 400)。
ShellController shellController() => _StubShellController()
..settings = sampleSettings()
..health = HealthInfo.fromJson(<String, dynamic>{
'ok': true,
'version': '1.0.7',
'platform': 'osx-arm64',
'uiAvailable': true,
});
Future<void> shoot(WidgetTester tester, String name, Widget page, Future<void> shoot(WidgetTester tester, String name, Widget page,
{Brightness brightness = Brightness.dark}) async { {Brightness brightness = Brightness.dark,
tester.view.physicalSize = const Size(1280, 820); Size size = const Size(1280, 860)}) async {
// 1280×860:与发布包窗口默认尺寸(1280×720)接近,再多留一点高度看得到
// 底部状态条。像素比 1.0,方便逐像素检查描边和文字。
tester.view.physicalSize = size;
tester.view.devicePixelRatio = 1.0; tester.view.devicePixelRatio = 1.0;
addTearDown(tester.view.reset); addTearDown(tester.view.reset);
@@ -136,10 +178,13 @@ void main() {
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
theme: buildGcTheme(brightness).copyWith( // 四个页面都用预置数据渲染,不需要后端;字体统一换成测试里加载的
textTheme: buildGcTheme(brightness).textTheme.apply( // 那一套,并且清空 fallback —— 否则主题里的按钮 / 输入框样式会去
fontFamily: 'Noto Sans CJK SC', // 找系统字体(测试环境没有),缺字处就画成方块。
), theme: buildGcTheme(
brightness,
fontFamily: 'Noto Sans CJK SC',
fontFamilyFallback: const <String>[],
), ),
home: RepaintBoundary( home: RepaintBoundary(
key: key, key: key,
@@ -148,25 +193,27 @@ void main() {
), ),
); );
await tester.pump(const Duration(milliseconds: 200)); await tester.pump(const Duration(milliseconds: 200));
// 页面里的数据来自真实后端(/api/about、/api/sources 等)。
// flutter_test 默认用假时钟,真实 HTTP 永远不会完成,所以这里用 runAsync
// 让出真实时间,等请求回来后再 pump 出最终画面。
await tester.runAsync(() async {
await Future<void>.delayed(const Duration(milliseconds: 1200));
});
await tester.pump(const Duration(milliseconds: 300));
await tester.runAsync(() async {
await Future<void>.delayed(const Duration(milliseconds: 600));
});
await tester.pump(const Duration(milliseconds: 300)); await tester.pump(const Duration(milliseconds: 300));
final boundary = final boundary =
key.currentContext!.findRenderObject()! as RenderRepaintBoundary; key.currentContext!.findRenderObject()! as RenderRepaintBoundary;
final image = await boundary.toImage(pixelRatio: 1.0); // toImage / toByteData 要走真实引擎的异步管线,必须放在 runAsync 里,
final bytes = await image.toByteData(format: ui.ImageByteFormat.png); // 否则 fake async 时钟不会推进,Future 一直不完成(表现为每个用例卡
// 满 10 分钟超时才返回)。
final stopwatch = Stopwatch()..start();
final image = await tester.runAsync(
() => boundary.toImage(pixelRatio: 1.0),
);
final bytes = await tester.runAsync(
() => image!.toByteData(format: ui.ImageByteFormat.png),
);
final dir = Directory('test/shots')..createSync(recursive: true); final dir = Directory('test/shots')..createSync(recursive: true);
File('${dir.path}/$name.png').writeAsBytesSync(bytes!.buffer.asUint8List()); File('${dir.path}/$name.png').writeAsBytesSync(bytes!.buffer.asUint8List());
stopwatch.stop();
// ignore: avoid_print
print(
'[shots] $name (${brightness.name}) 耗时 ${stopwatch.elapsedMilliseconds} ms');
} }
testWidgets('home', (tester) async { testWidgets('home', (tester) async {
@@ -174,7 +221,8 @@ void main() {
await shoot( await shoot(
tester, tester,
'home', 'home',
HomePageView(controller: sampleController(), initialModels: sampleModels()), HomePageView(
controller: sampleController(), initialModels: sampleModels()),
); );
}); });
@@ -261,7 +309,8 @@ void main() {
testWidgets('settings', (tester) async { testWidgets('settings', (tester) async {
I18n.language.value = 'zh-CN'; I18n.language.value = 'zh-CN';
await shoot(tester, 'settings', SettingsPageView(controller: sampleController())); await shoot(
tester, 'settings', SettingsPageView(controller: sampleController()));
}); });
testWidgets('about', (tester) async { testWidgets('about', (tester) async {
@@ -292,7 +341,77 @@ void main() {
testWidgets('shell', (tester) async { testWidgets('shell', (tester) async {
I18n.language.value = 'zh-CN'; I18n.language.value = 'zh-CN';
await shoot(tester, 'shell', ShellPage(controller: sampleController())); final controller = shellController()
..setUpdateStatus(
visible: true,
busy: false,
progress: 1,
status: '已更新 2 个模型,立即生效',
detail: '模型与启动器均为最新版',
notice: '',
);
await shoot(tester, 'shell', ShellPage(controller: controller));
});
/// 小窗口回归:1024×680 下不应出现溢出条纹或卡片挤压。
testWidgets('home-small', (tester) async {
I18n.language.value = 'zh-CN';
await shoot(
tester,
'home-small',
HomePageView(
controller: sampleController(), initialModels: sampleModels()),
size: const Size(1024, 680),
);
});
testWidgets('download-small', (tester) async {
I18n.language.value = 'zh-CN';
await shoot(
tester,
'download-small',
DownloadPageView(
controller: sampleController(),
initialSources: <SourceInfo>[
SourceInfo.fromJson(<String, dynamic>{
'id': 'github',
'name': 'GitHub',
'url': 'https://github.com/Morris-GC/GC',
'enabled': true,
'builtIn': true,
'host': 'github.com',
}),
],
initialIndex: SourceIndexInfo.fromJson(<String, dynamic>{
'sourceId': 'github',
'root': 'https://github.com/Morris-GC/GC',
'fromCache': false,
'resolvedFrom': 'version.json',
'models': <dynamic>[
<String, dynamic>{
'id': 'sun',
'name': '太阳系',
'description': '观察八大行星的公转轨道与相对大小。',
'version': '1.2',
'sizeText': '2.3 MB',
'installed': true,
},
],
}),
initialJobs: const <JobInfo>[],
),
size: const Size(1024, 680),
);
});
testWidgets('settings-small', (tester) async {
I18n.language.value = 'zh-CN';
await shoot(
tester,
'settings-small',
SettingsPageView(controller: sampleController()),
size: const Size(1024, 680),
);
}); });
testWidgets('home-light', (tester) async { testWidgets('home-light', (tester) async {
@@ -300,7 +419,8 @@ void main() {
await shoot( await shoot(
tester, tester,
'home-light', 'home-light',
HomePageView(controller: sampleController(), initialModels: sampleModels()), HomePageView(
controller: sampleController(), initialModels: sampleModels()),
brightness: Brightness.light, brightness: Brightness.light,
); );
}); });
@@ -315,3 +435,9 @@ void main() {
); );
}); });
} }
/// 只用于截图的 controller:不连后端,避免挂上重试定时器。
class _StubShellController extends ShellController {
@override
Future<void> bootstrap() async {}
}
+73
View File
@@ -5,8 +5,81 @@
#include "flutter_window.h" #include "flutter_window.h"
#include "utils.h" #include "utils.h"
namespace {
// Enable DPI awareness (Per-Monitor V2 when available).
//
// The runner.exe.manifest normally declares this, but the mingw/windres cross
// build does not embed the manifest the way the Visual Studio generator does.
// A DPI-unaware process gets bitmap-stretched by Windows on a 125% / 150%
// scaled display, which makes the whole UI (especially small CJK text) look
// blurry. Declaring it again before any window exists costs nothing and does
// not depend on the manifest being present.
//
// Every API is resolved through GetProcAddress: it keeps the binary working on
// older systems and does not require the current SDK / mingw headers to declare
// DPI_AWARENESS_CONTEXT.
#if defined(_MSC_VER)
#pragma warning(push)
#pragma warning(disable : 4191) // FARPROC to typed function pointer, on purpose
#endif
BOOL TryPerMonitorV2() {
// DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 == (HANDLE)-4
using Fn = BOOL(WINAPI*)(HANDLE);
HMODULE user32 = ::GetModuleHandleW(L"user32.dll");
if (user32 == nullptr) return FALSE;
auto set_context = reinterpret_cast<Fn>(
::GetProcAddress(user32, "SetProcessDpiAwarenessContext"));
if (set_context == nullptr) return FALSE;
// Cast through INT_PTR: plain -4 to pointer is C4312 at /W4.
return set_context(reinterpret_cast<HANDLE>(static_cast<INT_PTR>(-4)));
}
void TryPerMonitor() {
// Windows 8.1+: PROCESS_PER_MONITOR_DPI_AWARE == 2
using Fn = HRESULT(WINAPI*)(int);
HMODULE shcore = ::LoadLibraryW(L"shcore.dll");
if (shcore == nullptr) return;
auto set_awareness =
reinterpret_cast<Fn>(::GetProcAddress(shcore, "SetProcessDpiAwareness"));
if (set_awareness != nullptr) {
// E_ACCESSDENIED means the manifest already set awareness: still fine.
set_awareness(2);
}
::FreeLibrary(shcore);
}
void TrySystemDpiAware() {
// Windows Vista+: system DPI awareness, better than nothing.
using Fn = BOOL(WINAPI*)();
HMODULE user32 = ::GetModuleHandleW(L"user32.dll");
if (user32 == nullptr) return;
auto set_aware =
reinterpret_cast<Fn>(::GetProcAddress(user32, "SetProcessDPIAware"));
if (set_aware != nullptr) set_aware();
}
#if defined(_MSC_VER)
#pragma warning(pop)
#endif
void EnableDpiAwareness() {
// When the manifest already declared awareness, SetProcessDpiAwarenessContext
// returns FALSE; fall back to the 8.1 and Vista entry points. All three
// failing is harmless: the app still starts, it just scales blurrily.
if (TryPerMonitorV2()) return;
TryPerMonitor();
TrySystemDpiAware();
}
} // namespace
int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
_In_ wchar_t *command_line, _In_ int show_command) { _In_ wchar_t *command_line, _In_ int show_command) {
// Must run before the first window is created to take effect.
EnableDpiAwareness();
// Attach to console when present (e.g., 'flutter run') or create a // Attach to console when present (e.g., 'flutter run') or create a
// new console when running with a debugger. // new console when running with a debugger.
if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) {
+18 -2
View File
@@ -134,11 +134,27 @@ bool Win32Window::Create(const std::wstring& title,
UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); UINT dpi = FlutterDesktopGetDpiForMonitor(monitor);
double scale_factor = dpi / 96.0; double scale_factor = dpi / 96.0;
// Cap the initial size to the monitor work area. 1280x720 logical is
// 1920x1080 physical at 150% scaling, which no longer fits on a 1080p
// screen; clamping keeps the window usable instead of hanging off-screen.
int physical_width = Scale(size.width, scale_factor);
int physical_height = Scale(size.height, scale_factor);
MONITORINFO monitor_info{};
monitor_info.cbSize = sizeof(MONITORINFO);
if (::GetMonitorInfoW(monitor, &monitor_info)) {
const int max_width =
(monitor_info.rcWork.right - monitor_info.rcWork.left) * 92 / 100;
const int max_height =
(monitor_info.rcWork.bottom - monitor_info.rcWork.top) * 92 / 100;
if (physical_width > max_width) physical_width = max_width;
if (physical_height > max_height) physical_height = max_height;
}
HWND window = CreateWindow( HWND window = CreateWindow(
window_class, title.c_str(), WS_OVERLAPPEDWINDOW, window_class, title.c_str(), WS_OVERLAPPEDWINDOW,
Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), Scale(origin.x, scale_factor), Scale(origin.y, scale_factor),
Scale(size.width, scale_factor), Scale(size.height, scale_factor), physical_width, physical_height, nullptr, nullptr,
nullptr, nullptr, GetModuleHandle(nullptr), this); GetModuleHandle(nullptr), this);
if (!window) { if (!window) {
return false; return false;
+3
View File
@@ -61,6 +61,9 @@ public static class ContributorsService
["2509_92447106"] = "Morris", ["2509_92447106"] = "Morris",
["chenmoyuan1214@qq.com"] = "Morris", ["chenmoyuan1214@qq.com"] = "Morris",
["morris@xhmcl.com"] = "Morris", ["morris@xhmcl.com"] = "Morris",
// 早期提交用的是 xhgit 这个账号,展示名统一成 itxiaohui
["xhgit"] = "itxiaohui",
["itxiaohui"] = "itxiaohui",
}; };
/// <summary>自动化提交(CI / 助手账号),不计入开发者。</summary> /// <summary>自动化提交(CI / 助手账号),不计入开发者。</summary>
+21 -1
View File
@@ -28,7 +28,7 @@
<TextBlock Classes="faint" Text="{Binding PlatformText}" /> <TextBlock Classes="faint" Text="{Binding PlatformText}" />
</StackPanel> </StackPanel>
<Grid ColumnDefinitions="96,*" RowDefinitions="Auto,Auto"> <Grid ColumnDefinitions="96,*" RowDefinitions="Auto,Auto,Auto">
<TextBlock Classes="h3" Text="版本" /> <TextBlock Classes="h3" Text="版本" />
<TextBlock Grid.Column="1" Classes="muted" Text="{Binding VersionText}" <TextBlock Grid.Column="1" Classes="muted" Text="{Binding VersionText}"
FontWeight="SemiBold" /> FontWeight="SemiBold" />
@@ -38,6 +38,10 @@
HorizontalAlignment="Left" Padding="0" HorizontalAlignment="Left" Padding="0"
Command="{Binding OpenRepositoryCommand}" Command="{Binding OpenRepositoryCommand}"
Content="{Binding RepositoryText}" /> Content="{Binding RepositoryText}" />
<TextBlock Grid.Row="2" Classes="h3" Text="Git 服务" Margin="0,8,0,0" />
<TextBlock Grid.Row="2" Grid.Column="1" Classes="muted" Text="itxiaohui"
FontWeight="SemiBold" Margin="0,8,0,0" />
</Grid> </Grid>
</StackPanel> </StackPanel>
</Grid> </Grid>
@@ -76,6 +80,22 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</Border> </Border>
<Border Background="{DynamicResource SurfaceAlt}"
BorderBrush="{DynamicResource Line}" BorderThickness="1"
CornerRadius="12" Padding="12,10" MinWidth="190">
<StackPanel Orientation="Horizontal" Spacing="10">
<Border Width="34" Height="34" CornerRadius="17"
Background="{DynamicResource AccentSoft}">
<TextBlock Text="◉" FontSize="15" Foreground="{DynamicResource Accent}"
HorizontalAlignment="Center" VerticalAlignment="Center" />
</Border>
<StackPanel VerticalAlignment="Center" Spacing="1">
<TextBlock Text="itxiaohui" FontSize="12.5" FontWeight="SemiBold" />
<TextBlock Classes="faint" Text="Git 服务与部署支持" />
</StackPanel>
</StackPanel>
</Border>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</Border> </Border>
+2 -1
View File
@@ -69,7 +69,8 @@ Windows 用 `.\build.ps1`,参数相同(`build / check / models / stamp / run
就这些,没有一屏 dll。安装目录根只放 GC 本体,非本体文件(守护进程)一律收在 `.GC/bin`。 就这些,没有一屏 dll。安装目录根只放 GC 本体,非本体文件(守护进程)一律收在 `.GC/bin`。
macOS 是同一个单文件启动器,只是被放进 `GCL-<版本>-mac-arm64.app/Contents/MacOS/`, 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` 补齐成: 首次启动后 `.GC` 补齐成:
+13
View File
@@ -44,6 +44,19 @@ string(REPLACE "#define VERSION_AS_STRING FLUTTER_VERSION"
_rc_text "${_rc_text}") _rc_text "${_rc_text}")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/Runner.cross.rc" "${_rc_text}") file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/Runner.cross.rc" "${_rc_text}")
# ★ DPI 清单必须自己嵌进去。
#
# windows/runner/CMakeLists.txt 把 runner.exe.manifest 当源文件列进 target,
# Visual Studio 生成器会把它交给链接器(/MANIFESTINPUT)自动嵌入;
# 但这里的交叉编译只用 windres 编 Runner.rc,CMake 不会做这一步,
# 编出来的 GC-UI.exe 就完全没有清单 —— Windows 当它「DPI 不感知」,
# 在 125% / 150% 缩放的屏幕上整体位图拉伸,界面全是糊的。
#
# 因此把清单直接写成资源条目:id 1 = CREATEPROCESS_MANIFEST_RESOURCE_ID,
# type 24 = RT_MANIFEST。windres 不按相对路径解析,这里给绝对路径。
file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/Runner.cross.rc"
"\n1 24 \"${RUN_DIR}/runner.exe.manifest\"\n")
add_executable(${BINARY_NAME} WIN32 add_executable(${BINARY_NAME} WIN32
"${RUN_DIR}/main.cpp" "${RUN_DIR}/main.cpp"
"${RUN_DIR}/flutter_window.cpp" "${RUN_DIR}/flutter_window.cpp"
+9 -1
View File
@@ -384,6 +384,13 @@ pack_launcher() {
/usr/libexec/PlistBuddy -c "Set :CFBundleName Morris GC" "$PLIST" 2>/dev/null || true /usr/libexec/PlistBuddy -c "Set :CFBundleName Morris GC" "$PLIST" 2>/dev/null || true
/usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName Morris GC" "$PLIST" 2>/dev/null || true /usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName Morris GC" "$PLIST" 2>/dev/null || true
fi fi
# 非本体文件收进 .GC/bin(与 Windows 布局一致):.GC 位置不变,仍在启动器同级
# (也就是 .app/Contents/MacOS/),首次启动复制到 .GC/safedog 再运行。
if [ -f "$FINAL/Contents/MacOS/GC-SAVEDOG" ]; then
mkdir -p "$FINAL/Contents/MacOS/.GC/bin"
mv "$FINAL/Contents/MacOS/GC-SAVEDOG" "$FINAL/Contents/MacOS/.GC/bin/"
chmod +x "$FINAL/Contents/MacOS/.GC/bin/GC-SAVEDOG" 2>/dev/null || true
fi
xattr -cr "$FINAL" 2>/dev/null || true xattr -cr "$FINAL" 2>/dev/null || true
echo " -> $(basename "$FINAL")/" echo " -> $(basename "$FINAL")/"
fi fi
@@ -489,7 +496,8 @@ PLIST
fi fi
fi fi
# 发布包不带 .GC 运行骨架(用户首次启动自行创建),避免覆盖用户数据 # 清掉模板类 .GC(config / model / cache / update / logs):首次启动自行创建,
# 包里只保留 .GC/bin 这一个由 pack_launcher 补上的非本体文件目录。
rm -rf "$APP/Contents/MacOS/.GC" rm -rf "$APP/Contents/MacOS/.GC"
chmod +x "$APP/Contents/MacOS/GC" chmod +x "$APP/Contents/MacOS/GC"
echo "==> 已打包 $APP" echo "==> 已打包 $APP"
+23 -23
View File
@@ -5,42 +5,42 @@
"branch": "main", "branch": "main",
"modelDir": "model", "modelDir": "model",
"launcher": { "launcher": {
"version": "1.0.11", "version": "1.1.0",
"revision": "", "revision": "",
"packages": { "packages": {
"win-x64": { "win-x64": {
"path": "dist/win-amd64/GCL-1.0.11-win-amd64.zip", "path": "dist/win-amd64/GCL-1.1.0-win-amd64.zip",
"dir": "dist/win-amd64", "dir": "dist/win-amd64",
"name": "GCL-1.0.11-win-amd64.zip", "name": "GCL-1.1.0-win-amd64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-win-amd64.zip", "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-win-amd64.zip",
"sha256": "55f1d5eb0dfdfc243656e6705c3d276dd83611561f913fe5ca9e6e5d2f2dd658", "sha256": "adfdca03bd84ad1a831da4925795dd4ee5b9f79f654a7a8208abcb6f3dbc4f3b",
"size": 74973271 "size": 74984771
}, },
"win-arm64": { "win-arm64": {
"path": "dist/win-arm64/GCL-1.0.11-win-arm64.zip", "path": "dist/win-arm64/GCL-1.1.0-win-arm64.zip",
"dir": "dist/win-arm64", "dir": "dist/win-arm64",
"name": "GCL-1.0.11-win-arm64.zip", "name": "GCL-1.1.0-win-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-win-arm64.zip", "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-win-arm64.zip",
"sha256": "9ce48381fcca18e7d6789364e1c43f7e616ceae529c0c1167b099ed762f5808f", "sha256": "2ef3f657a4ff61d9cc62100daed8d399ad0635f120c5f38589a4efd3a8e76d9a",
"size": 72515856 "size": 72527477
}, },
"osx-arm64": { "osx-arm64": {
"path": "dist/mac-arm64/GCL-1.0.11-mac-arm64.zip", "path": "dist/mac-arm64/GCL-1.1.0-mac-arm64.zip",
"dir": "dist/mac-arm64", "dir": "dist/mac-arm64",
"name": "GCL-1.0.11-mac-arm64.zip", "name": "GCL-1.1.0-mac-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-mac-arm64.zip" "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-mac-arm64.zip"
}, },
"osx-x64": { "osx-x64": {
"path": "dist/mac-x64/GCL-1.0.11-mac-x64.zip", "path": "dist/mac-x64/GCL-1.1.0-mac-x64.zip",
"dir": "dist/mac-x64", "dir": "dist/mac-x64",
"name": "GCL-1.0.11-mac-x64.zip", "name": "GCL-1.1.0-mac-x64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-mac-x64.zip" "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-mac-x64.zip"
}, },
"linux-arm64": { "linux-arm64": {
"path": "dist/linux-arm64/GCL-1.0.11-linux-arm64.zip", "path": "dist/linux-arm64/GCL-1.1.0-linux-arm64.zip",
"dir": "dist/linux-arm64", "dir": "dist/linux-arm64",
"name": "GCL-1.0.11-linux-arm64.zip", "name": "GCL-1.1.0-linux-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-linux-arm64.zip" "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-linux-arm64.zip"
} }
} }
}, },
@@ -94,8 +94,8 @@
"signature": { "signature": {
"alg": "ECDSA-P256-SHA256", "alg": "ECDSA-P256-SHA256",
"keyId": "gc-2026-12", "keyId": "gc-2026-12",
"value": "6i/y23uDD4qa3docjAeeUIHHEV+hSrEGEV6vxQ54a3tyUzxc5lbxBth15gnmxgac7kL3ULULb3G4dI59R6MHxg==", "value": "A/A7GQ2muXgqhtG+HVKkAvs0cAX90TXDgXOtxWCr8VTQW10FPUUroUSdmp4x5FUT7KNnrs1wIoz4/YSJspv9oQ==",
"contentSha256": "86290d84dce5ae9619f5f25e7151480d916aab6177449955366f87b74fbce71c", "contentSha256": "84488b35a9f45f44c3b6c21c400f6c0d0a26b5f0f045a696afd889cf5af6f2f1",
"signedAt": "2026-11-18T13:06:34Z" "signedAt": "2026-11-18T14:46:36Z"
} }
} }
+23 -23
View File
@@ -5,42 +5,42 @@
"branch": "main", "branch": "main",
"modelDir": "model", "modelDir": "model",
"launcher": { "launcher": {
"version": "1.0.11", "version": "1.1.0",
"revision": "", "revision": "",
"packages": { "packages": {
"win-x64": { "win-x64": {
"path": "dist/win-amd64/GCL-1.0.11-win-amd64.zip", "path": "dist/win-amd64/GCL-1.1.0-win-amd64.zip",
"dir": "dist/win-amd64", "dir": "dist/win-amd64",
"name": "GCL-1.0.11-win-amd64.zip", "name": "GCL-1.1.0-win-amd64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-win-amd64.zip", "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-win-amd64.zip",
"sha256": "55f1d5eb0dfdfc243656e6705c3d276dd83611561f913fe5ca9e6e5d2f2dd658", "sha256": "adfdca03bd84ad1a831da4925795dd4ee5b9f79f654a7a8208abcb6f3dbc4f3b",
"size": 74973271 "size": 74984771
}, },
"win-arm64": { "win-arm64": {
"path": "dist/win-arm64/GCL-1.0.11-win-arm64.zip", "path": "dist/win-arm64/GCL-1.1.0-win-arm64.zip",
"dir": "dist/win-arm64", "dir": "dist/win-arm64",
"name": "GCL-1.0.11-win-arm64.zip", "name": "GCL-1.1.0-win-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-win-arm64.zip", "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-win-arm64.zip",
"sha256": "9ce48381fcca18e7d6789364e1c43f7e616ceae529c0c1167b099ed762f5808f", "sha256": "2ef3f657a4ff61d9cc62100daed8d399ad0635f120c5f38589a4efd3a8e76d9a",
"size": 72515856 "size": 72527477
}, },
"osx-arm64": { "osx-arm64": {
"path": "dist/mac-arm64/GCL-1.0.11-mac-arm64.zip", "path": "dist/mac-arm64/GCL-1.1.0-mac-arm64.zip",
"dir": "dist/mac-arm64", "dir": "dist/mac-arm64",
"name": "GCL-1.0.11-mac-arm64.zip", "name": "GCL-1.1.0-mac-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-mac-arm64.zip" "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-mac-arm64.zip"
}, },
"osx-x64": { "osx-x64": {
"path": "dist/mac-x64/GCL-1.0.11-mac-x64.zip", "path": "dist/mac-x64/GCL-1.1.0-mac-x64.zip",
"dir": "dist/mac-x64", "dir": "dist/mac-x64",
"name": "GCL-1.0.11-mac-x64.zip", "name": "GCL-1.1.0-mac-x64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-mac-x64.zip" "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-mac-x64.zip"
}, },
"linux-arm64": { "linux-arm64": {
"path": "dist/linux-arm64/GCL-1.0.11-linux-arm64.zip", "path": "dist/linux-arm64/GCL-1.1.0-linux-arm64.zip",
"dir": "dist/linux-arm64", "dir": "dist/linux-arm64",
"name": "GCL-1.0.11-linux-arm64.zip", "name": "GCL-1.1.0-linux-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-linux-arm64.zip" "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-linux-arm64.zip"
} }
} }
}, },
@@ -94,8 +94,8 @@
"signature": { "signature": {
"alg": "ECDSA-P256-SHA256", "alg": "ECDSA-P256-SHA256",
"keyId": "gc-2026-12", "keyId": "gc-2026-12",
"value": "6i/y23uDD4qa3docjAeeUIHHEV+hSrEGEV6vxQ54a3tyUzxc5lbxBth15gnmxgac7kL3ULULb3G4dI59R6MHxg==", "value": "A/A7GQ2muXgqhtG+HVKkAvs0cAX90TXDgXOtxWCr8VTQW10FPUUroUSdmp4x5FUT7KNnrs1wIoz4/YSJspv9oQ==",
"contentSha256": "86290d84dce5ae9619f5f25e7151480d916aab6177449955366f87b74fbce71c", "contentSha256": "84488b35a9f45f44c3b6c21c400f6c0d0a26b5f0f045a696afd889cf5af6f2f1",
"signedAt": "2026-11-18T13:06:34Z" "signedAt": "2026-11-18T14:46:36Z"
} }
} }