feat(app): GUI 全量接线，五页改吃 core 真实数据（M43）
app 从「mock 骨架」切到「真实 core host」：新增 src/host 装配层（env/job/ game/launch/identity/versions/install/meter/java/accounts/logs/settings/engine/ dispatch），是 app 里除 settings_bridge 外唯一 use unlucky_core 的地方，出口只有 crate::dto 的 DTO/事件（三通道纪律，AGENTS §6）。 页面接线： - 实例页：profiles+版本 JSON 继承链+会话索引 → 磁贴（真实版本/加载器徽标/最后启动/ 隔离档位/载荷缺失）；启动按钮走 LaunchRequest 装配 → Launcher::spawn → JSONL 尾随 → 运行/失败回写；M30 ModeChangeWarning 进横幅通知条。 - 新建实例向导：版本 → 加载器 → 名字 → 确认 → 真实安装进度；Fabric/Quilt 可装， Forge/NeoForge 因需要 installer processors（仅 CLI 有）显式拒装并给出 CLI 命令。 - 下载页：远端 manifest（12h 缓存）+ 内嵌 unlisted → 分类（正式/预览/远古四子类）； 安装进度（文件数/字节/速度/ETA，速度由相邻采样差分）+ 阶段边界可取消； Java 分组：四家发行版 + 回退链可视化（计划链/真实 ChainLog）+ 本地运行时。 - 账户页：三轨账户列表（只读公开字段）+ 离线新增 + 删除/切换 + 微软设备码登录 （用户码/链接/轮询状态；取消后丢弃结果）。凭据只在 host/identity 与 host/accounts 出现，DTO 无 token 字段（单测钉住）。 - 设置页：新增 download/java/data/ai/mcp 五组，行由 core::setting schema 键生成， 写回走 SettingStore::set（与 ull config set / AI set_config 同源 launcher.json）。 - 日志页：会话索引 → 列表；事件 JSONL → 日志行（等级高亮）+ D8 规则引擎诊断卡片； 启动中实时尾随（600ms/拍，只读新增字节）；崩溃日志导入分析（hs_err/crash/latest）。 架构与守线： - 新页面状态走 ui/page_state.slint 的 PageState global（main.slint 再导出）， Rust 侧 page_sync.rs 灌入、callbacks_pages.rs 接线；避免属性逐层转发顶破 400 行。 - DTO 全部 Serialize+Deserialize（IPC 契约），新增 accounts/java/settings/install/ notices 五个子模块；事件扩展 LogAppended/LaunchFinished/AccountsChanged/ DeviceLoginChanged/JavaChanged/InstallProgress/SettingsChanged/NoticesChanged。 - 截图通道扩展：--data-dir（钉数据根且 settings 同源）/--mock/--screenshot-page/ --screenshot-wizard/--screenshot-session/--screenshot-install/--screenshot-launch （真实中间态，取图后自动 stop 防孤儿进程）。 已知边界：GUI 账户「当前启动账户」仅内存态（core schema 无 auth.* 键，app 不自建键）； Forge/NeoForge GUI 安装待 processors 执行器上移。
This commit is contained in:
AskaEth committed
1 parent
bc41dfcf7d
commit
ddc0577f83
64 files changed
+8047
-408
No files matched your search
+174
-124
@@ -1,14 +1,19 @@
|
||||
// G2 下载页（09 §2 P0·G2 / Q24-4 定案）：页内独立左侧分类栏（常驻，非 tab）+ 右侧版本列表。
|
||||
// 远古版入口显式可达（ULL 对 HMCL「隐藏」行为的纠偏），下挂 classic/alpha/beta/unlisted 子类树，
|
||||
// 进入远古版分类时顶部提示兼容性 + 每行带「远古版」徽标（防误装）。
|
||||
//
|
||||
// P3 接线：右侧多一个「Java 运行时」视图（四家发行版 + 回退链），页面底部常驻安装进度条。
|
||||
import { Theme } from "../theme/tokens.slint";
|
||||
import { Metrics } from "../theme/metrics.slint";
|
||||
import { UiVersion, VersionKind, DownloadCategory } from "../models.slint";
|
||||
import { PageState } from "../page_state.slint";
|
||||
import { UiText, TextRole } from "../components/label.slint";
|
||||
import { AppIcon, IconKind } from "../components/icons.slint";
|
||||
import { Badge } from "../components/badge.slint";
|
||||
import { MetroButton, ButtonKind } from "../widgets/button.slint";
|
||||
import { SearchField, CheckBox } from "../widgets/inputs.slint";
|
||||
import { InstallPanel } from "../components/install-panel.slint";
|
||||
import { JavaPanel } from "download-java.slint";
|
||||
import { ListView } from "std-widgets.slint";
|
||||
|
||||
component CategoryRow inherits Rectangle {
|
||||
@@ -112,6 +117,8 @@ export component DownloadPage inherits Rectangle {
|
||||
in-out property <string> query: "";
|
||||
/// 远古版子类树是否展开（默认展开，显式可达）
|
||||
in-out property <bool> ancient-expanded: true;
|
||||
/// 右侧视图：0 = 版本列表，1 = Java 运行时
|
||||
in-out property <int> view-tab <=> PageState.download-tab;
|
||||
|
||||
callback category-changed(DownloadCategory);
|
||||
callback install(string);
|
||||
@@ -123,148 +130,191 @@ export component DownloadPage inherits Rectangle {
|
||||
|
||||
background: Theme.bg-canvas;
|
||||
|
||||
HorizontalLayout {
|
||||
// ── 页内分类侧栏（常驻）───────────────────────────────────
|
||||
VerticalLayout {
|
||||
// 视图切换（版本 / Java）
|
||||
Rectangle {
|
||||
width: 200px;
|
||||
height: 40px;
|
||||
background: Theme.bg-surface;
|
||||
border-width: 1px;
|
||||
border-color: Theme.stroke;
|
||||
HorizontalLayout {
|
||||
padding-left: Metrics.gap-4;
|
||||
spacing: Metrics.gap-2;
|
||||
UiText {
|
||||
role: TextRole.subtitle;
|
||||
text: "版本获取";
|
||||
width: 96px;
|
||||
}
|
||||
MetroButton {
|
||||
kind: root.view-tab == 0 ? ButtonKind.accent : ButtonKind.subtle;
|
||||
text: "版本列表";
|
||||
button-height: 26px;
|
||||
clicked => { root.view-tab = 0; }
|
||||
}
|
||||
MetroButton {
|
||||
kind: root.view-tab == 1 ? ButtonKind.accent : ButtonKind.subtle;
|
||||
text: "Java 运行时";
|
||||
button-height: 26px;
|
||||
clicked => { root.view-tab = 1; }
|
||||
}
|
||||
Rectangle { horizontal-stretch: 1; background: transparent; }
|
||||
if PageState.java-busy : UiText {
|
||||
role: TextRole.caption;
|
||||
text: "Java 安装中…";
|
||||
color: Theme.accent;
|
||||
}
|
||||
}
|
||||
}
|
||||
Rectangle { height: 1px; background: Theme.stroke; }
|
||||
|
||||
if root.view-tab == 0 : HorizontalLayout {
|
||||
vertical-stretch: 1;
|
||||
|
||||
// ── 页内分类侧栏（常驻）───────────────────────────────────
|
||||
Rectangle {
|
||||
width: 200px;
|
||||
background: Theme.bg-surface;
|
||||
border-width: 1px;
|
||||
border-color: Theme.stroke;
|
||||
|
||||
VerticalLayout {
|
||||
padding-top: Metrics.gap-2;
|
||||
|
||||
CategoryRow {
|
||||
label: "正式版 release";
|
||||
active: root.category == DownloadCategory.release;
|
||||
clicked => { root.category-changed(DownloadCategory.release); }
|
||||
}
|
||||
CategoryRow {
|
||||
label: "预览版 snapshot";
|
||||
active: root.category == DownloadCategory.snapshot;
|
||||
clicked => { root.category-changed(DownloadCategory.snapshot); }
|
||||
}
|
||||
|
||||
// 远古版：可展开的父节点 + 子类树
|
||||
CategoryRow {
|
||||
label: root.ancient-expanded ? "远古版 ▾" : "远古版 ▸";
|
||||
active: root.category == DownloadCategory.ancientClassic
|
||||
|| root.category == DownloadCategory.ancientAlpha
|
||||
|| root.category == DownloadCategory.ancientBeta
|
||||
|| root.category == DownloadCategory.ancientUnlisted;
|
||||
clicked => { root.toggle-ancient(); }
|
||||
}
|
||||
if root.ancient-expanded : CategoryRow {
|
||||
label: "classic（rd-*）";
|
||||
sub: true;
|
||||
active: root.category == DownloadCategory.ancientClassic;
|
||||
clicked => { root.category-changed(DownloadCategory.ancientClassic); }
|
||||
}
|
||||
if root.ancient-expanded : CategoryRow {
|
||||
label: "old_alpha（a1.*）";
|
||||
sub: true;
|
||||
active: root.category == DownloadCategory.ancientAlpha;
|
||||
clicked => { root.category-changed(DownloadCategory.ancientAlpha); }
|
||||
}
|
||||
if root.ancient-expanded : CategoryRow {
|
||||
label: "old_beta（b1.*）";
|
||||
sub: true;
|
||||
active: root.category == DownloadCategory.ancientBeta;
|
||||
clicked => { root.category-changed(DownloadCategory.ancientBeta); }
|
||||
}
|
||||
if root.ancient-expanded : CategoryRow {
|
||||
label: "unlisted 汇总";
|
||||
sub: true;
|
||||
active: root.category == DownloadCategory.ancientUnlisted;
|
||||
clicked => { root.category-changed(DownloadCategory.ancientUnlisted); }
|
||||
}
|
||||
|
||||
CategoryRow {
|
||||
label: "整合包（P1）";
|
||||
disabled: true;
|
||||
}
|
||||
CategoryRow {
|
||||
label: "Mod（P1）";
|
||||
disabled: true;
|
||||
}
|
||||
|
||||
Rectangle { vertical-stretch: 1; background: transparent; }
|
||||
}
|
||||
}
|
||||
|
||||
// ── 右侧版本列表 ──────────────────────────────────────────
|
||||
VerticalLayout {
|
||||
padding-top: Metrics.gap-2;
|
||||
vertical-stretch: 1;
|
||||
|
||||
CategoryRow {
|
||||
label: "正式版 release";
|
||||
active: root.category == DownloadCategory.release;
|
||||
clicked => { root.category-changed(DownloadCategory.release); }
|
||||
}
|
||||
CategoryRow {
|
||||
label: "预览版 snapshot";
|
||||
active: root.category == DownloadCategory.snapshot;
|
||||
clicked => { root.category-changed(DownloadCategory.snapshot); }
|
||||
Rectangle {
|
||||
height: Metrics.page-header-height;
|
||||
background: Theme.bg-canvas;
|
||||
|
||||
HorizontalLayout {
|
||||
padding-left: Metrics.gap-4;
|
||||
padding-right: Metrics.gap-4;
|
||||
spacing: Metrics.gap-3;
|
||||
|
||||
SearchField {
|
||||
width: 220px;
|
||||
placeholder: "筛选版本号";
|
||||
text <=> root.query;
|
||||
edited(t) => { root.query-changed(t); }
|
||||
}
|
||||
CheckBox {
|
||||
text: "仅已装";
|
||||
checked: root.installed-only;
|
||||
toggled(v) => { root.installed-only-changed(v); }
|
||||
}
|
||||
Rectangle { horizontal-stretch: 1; background: transparent; }
|
||||
}
|
||||
}
|
||||
|
||||
// 远古版：可展开的父节点 + 子类树
|
||||
CategoryRow {
|
||||
label: root.ancient-expanded ? "远古版 ▾" : "远古版 ▸";
|
||||
active: root.category == DownloadCategory.ancientClassic
|
||||
// 远古版兼容性提示条（首次进入显示，显式可达的代价告知）
|
||||
Rectangle {
|
||||
height: 44px;
|
||||
visible: root.category == DownloadCategory.ancientClassic
|
||||
|| root.category == DownloadCategory.ancientAlpha
|
||||
|| root.category == DownloadCategory.ancientBeta
|
||||
|| root.category == DownloadCategory.ancientUnlisted;
|
||||
clicked => { root.toggle-ancient(); }
|
||||
}
|
||||
if root.ancient-expanded : CategoryRow {
|
||||
label: "classic（rd-*）";
|
||||
sub: true;
|
||||
active: root.category == DownloadCategory.ancientClassic;
|
||||
clicked => { root.category-changed(DownloadCategory.ancientClassic); }
|
||||
}
|
||||
if root.ancient-expanded : CategoryRow {
|
||||
label: "old_alpha（a1.*）";
|
||||
sub: true;
|
||||
active: root.category == DownloadCategory.ancientAlpha;
|
||||
clicked => { root.category-changed(DownloadCategory.ancientAlpha); }
|
||||
}
|
||||
if root.ancient-expanded : CategoryRow {
|
||||
label: "old_beta（b1.*）";
|
||||
sub: true;
|
||||
active: root.category == DownloadCategory.ancientBeta;
|
||||
clicked => { root.category-changed(DownloadCategory.ancientBeta); }
|
||||
}
|
||||
if root.ancient-expanded : CategoryRow {
|
||||
label: "unlisted 汇总";
|
||||
sub: true;
|
||||
active: root.category == DownloadCategory.ancientUnlisted;
|
||||
clicked => { root.category-changed(DownloadCategory.ancientUnlisted); }
|
||||
background: Theme.state-warn-soft;
|
||||
|
||||
HorizontalLayout {
|
||||
padding-left: Metrics.gap-4;
|
||||
padding-right: Metrics.gap-4;
|
||||
spacing: Metrics.gap-2;
|
||||
|
||||
AppIcon { kind: IconKind.warn; icon-size: 16px; tint: Theme.state-warn; }
|
||||
UiText {
|
||||
role: TextRole.caption;
|
||||
text: "远古版（classic/alpha/beta）需要旧版 Java 与旧启动参数，装完请先看兼容性说明。";
|
||||
wrap: word-wrap;
|
||||
horizontal-stretch: 1;
|
||||
}
|
||||
MetroButton {
|
||||
kind: ButtonKind.subtle;
|
||||
text: "说明";
|
||||
button-height: 26px;
|
||||
clicked => { root.ancient-help(); }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
CategoryRow {
|
||||
label: "整合包（P1）";
|
||||
disabled: true;
|
||||
}
|
||||
CategoryRow {
|
||||
label: "Mod（P1）";
|
||||
disabled: true;
|
||||
}
|
||||
Rectangle { height: 1px; background: Theme.stroke; }
|
||||
|
||||
Rectangle { vertical-stretch: 1; background: transparent; }
|
||||
ListView {
|
||||
vertical-stretch: 1;
|
||||
|
||||
for v in root.versions : VersionRow {
|
||||
data: v;
|
||||
install => { root.install(v.id); }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── 右侧版本列表 ──────────────────────────────────────────
|
||||
VerticalLayout {
|
||||
if root.view-tab == 1 : JavaPanel {
|
||||
vertical-stretch: 1;
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
height: Metrics.page-header-height;
|
||||
background: Theme.bg-canvas;
|
||||
|
||||
HorizontalLayout {
|
||||
padding-left: Metrics.gap-4;
|
||||
padding-right: Metrics.gap-4;
|
||||
spacing: Metrics.gap-3;
|
||||
|
||||
UiText {
|
||||
role: TextRole.subtitle;
|
||||
text: "版本获取";
|
||||
width: 96px;
|
||||
}
|
||||
SearchField {
|
||||
width: 220px;
|
||||
placeholder: "筛选版本号";
|
||||
text <=> root.query;
|
||||
edited(t) => { root.query-changed(t); }
|
||||
}
|
||||
CheckBox {
|
||||
text: "仅已装";
|
||||
checked: root.installed-only;
|
||||
toggled(v) => { root.installed-only-changed(v); }
|
||||
}
|
||||
Rectangle { horizontal-stretch: 1; background: transparent; }
|
||||
}
|
||||
}
|
||||
|
||||
// 远古版兼容性提示条（首次进入显示，显式可达的代价告知）
|
||||
Rectangle {
|
||||
height: 44px;
|
||||
visible: root.category == DownloadCategory.ancientClassic
|
||||
|| root.category == DownloadCategory.ancientAlpha
|
||||
|| root.category == DownloadCategory.ancientBeta
|
||||
|| root.category == DownloadCategory.ancientUnlisted;
|
||||
background: Theme.state-warn-soft;
|
||||
|
||||
HorizontalLayout {
|
||||
padding-left: Metrics.gap-4;
|
||||
padding-right: Metrics.gap-4;
|
||||
spacing: Metrics.gap-2;
|
||||
|
||||
AppIcon { kind: IconKind.warn; icon-size: 16px; tint: Theme.state-warn; }
|
||||
UiText {
|
||||
role: TextRole.caption;
|
||||
text: "远古版（classic/alpha/beta）需要旧版 Java 与旧启动参数，装完请先看兼容性说明。";
|
||||
wrap: word-wrap;
|
||||
horizontal-stretch: 1;
|
||||
}
|
||||
MetroButton {
|
||||
kind: ButtonKind.subtle;
|
||||
text: "说明";
|
||||
button-height: 26px;
|
||||
clicked => { root.ancient-help(); }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle { height: 1px; background: Theme.stroke; }
|
||||
|
||||
ListView {
|
||||
vertical-stretch: 1;
|
||||
|
||||
for v in root.versions : VersionRow {
|
||||
data: v;
|
||||
install => { root.install(v.id); }
|
||||
}
|
||||
}
|
||||
// 安装进度（下载页行内安装 / 向导共用同一份进度）
|
||||
InstallPanel {
|
||||
data: PageState.install;
|
||||
cancel => { PageState.install-cancel(); }
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user