fix(island): 合并常驻与自定义岛并统一经典通知和即时课表同步

This commit is contained in:
LoveChengke committed 2026-10-17 15:56:44 +08:00
1 parent 05848570d1
commit e84e43544a
19 files changed
+1565 -1445

No files matched your search

+3 -2
View File
@@ -214,7 +214,7 @@ export function normalizeIslandLayouts(input: unknown): IslandLayoutSettings {
const fallback = defaultIslandLayouts();
if (!input || typeof input !== 'object') return fallback;
const raw = input as IslandLayoutSettings;
const resident = raw.layout === 'custom' && raw.residentEnabled === true;
const resident = raw.layout === 'custom';
const clamp = (n: unknown, min: number, max: number, value: number) =>
typeof n === 'number' && Number.isFinite(n) ? Math.min(max, Math.max(min, n)) : value;
const color = (v: unknown, value: string) =>
@@ -327,7 +327,8 @@ export function normalizeIslandLayouts(input: unknown): IslandLayoutSettings {
}
return {
layout: raw.layout === 'custom' ? 'custom' : 'fixed',
residentEnabled: raw.layout === 'custom' && raw.residentEnabled === true,
// 旧常驻开关保留为兼容字段;自定义布局统一常驻,不再分成两种运行模式。
residentEnabled: raw.layout === 'custom',
pointerFadeEnabled: raw.pointerFadeEnabled !== false,
pointerFadeReversed: raw.pointerFadeReversed === true,
schemes: schemes.length ? schemes : fallback.schemes,