-
-
-
-
- 
-
-
-
- , timeoutMs: number, label: string) {
+ if (timeoutMs <= 0) return
+
+ await Promise.race([
+ task.catch(error => {
+ console.warn(`[Launch] ${label} failed`, error)
+ }),
+ new Promise(resolve => window.setTimeout(resolve, timeoutMs)),
+ ])
+}
+
+async function waitForMinimumLaunchVisibility() {
+ const remaining = LAUNCH_MIN_VISIBLE_MS - (getLaunchNow() - launchStartedAt)
+ if (remaining > 0) {
+ await new Promise(resolve => window.setTimeout(resolve, remaining))
+ }
+}
+
+function getCachedAutoResolvedTheme() {
+ const cachedTheme = localStorage.getItem('materio-initial-resolved-theme')
+
+ return cachedTheme === 'dark' || cachedTheme === 'light' ? cachedTheme : null
+}
+
+function resolveInitialThemeName(themePreference: string) {
+ if (themePreference === 'auto') {
+ return getCachedAutoResolvedTheme() || resolveThemeName(themePreference)
+ }
+
+ return resolveThemeName(themePreference)
+}
// 生效主题
const vuetifyTheme = useTheme()
const { global: globalTheme } = vuetifyTheme
let themeValue = localStorage.getItem('theme') || 'auto'
-globalTheme.name.value = resolveThemeName(themeValue)
+let resumeThemeSyncTimer: number | null = null
+globalTheme.name.value = resolveInitialThemeName(themeValue)
applyStoredThemeCustomizerAppearance(vuetifyTheme)
// 启动屏和 iOS safe area 在同一层显示，根节点底色需要尽早和当前主题保持一致。
@@ -397,10 +443,18 @@ function updateHtmlThemeAttribute(themeName: string) {
}
// 从本地存储重新同步主题偏好、DOM 主题属性和相关外观配置。
-function syncThemePreferenceFromStorage() {
+function syncThemePreferenceFromStorage(preferCachedAuto = false) {
+ if (resumeThemeSyncTimer !== null) {
+ window.clearTimeout(resumeThemeSyncTimer)
+ resumeThemeSyncTimer = null
+ }
+
themeValue = localStorage.getItem('theme') || 'auto'
- const resolvedTheme = resolveThemeName(themeValue)
+ const resolvedTheme =
+ themeValue === 'auto' && preferCachedAuto
+ ? getCachedAutoResolvedTheme() || resolveThemeName(themeValue)
+ : resolveThemeName(themeValue)
if (globalTheme.name.value !== resolvedTheme) {
globalTheme.name.value = resolvedTheme
}
@@ -411,13 +465,20 @@ function syncThemePreferenceFromStorage() {
// 前台恢复时重新跑一次主题管理器，补齐 transparent CSS 和 auto 的实际 DOM 主题。
void themeManager
- .setTheme(themeValue)
+ .setTheme(themeValue === 'auto' ? resolvedTheme : themeValue)
.then(() => {
updateHtmlThemeAttribute(globalTheme.name.value)
})
.catch(error => {
console.error('同步主题管理器失败:', error)
})
+
+ if (preferCachedAuto && themeValue === 'auto') {
+ resumeThemeSyncTimer = window.setTimeout(() => {
+ resumeThemeSyncTimer = null
+ syncThemePreferenceFromStorage()
+ }, 180)
+ }
}
// 系统配色变化时，在自动主题模式下刷新当前实际主题。
@@ -430,7 +491,7 @@ function handleSystemThemeChange() {
/** 页面重新可见时同步主题，并在连接异常时立即重新探测服务。 */
function handleVisibilityThemeSync() {
if (document.visibilityState === 'visible') {
- syncThemePreferenceFromStorage()
+ syncThemePreferenceFromStorage(true)
if (isLogin.value && !offlineStatus.isOnline.value) offlineStatus.requestConnectionCheck()
}
}
@@ -440,7 +501,7 @@ function handlePageShowThemeSync() {
if (document.visibilityState === 'visible') {
if (isLogin.value && !offlineStatus.isOnline.value) offlineStatus.requestConnectionCheck()
}
- syncThemePreferenceFromStorage()
+ syncThemePreferenceFromStorage(true)
}
// 清理背景图交叉淡入淡出定时器。
@@ -724,7 +785,7 @@ async function animateAndRemoveLoader() {
document.body.style.removeProperty('overflow')
completeLaunchLoading()
resolve()
- }, 120)
+ }, LAUNCH_EXIT_DURATION_MS)
})
} else {
completeLaunchLoading()
@@ -737,19 +798,27 @@ async function removeLoadingWithStateCheck() {
// 设置各个组件的加载状态
globalLoadingStateManager.setLoadingState('pwa-state', true)
- // 静默检查PWA状态恢复
+ // 静默检查PWA状态恢复，但不能让恢复异常或慢请求挡住应用外壳。
const pwaController = (window as any).pwaStateController
- if (pwaController) {
- await pwaController.waitForStateRestore()
+ if (pwaController?.waitForStateRestore) {
+ await waitForLaunchTask(
+ Promise.resolve().then(() => pwaController.waitForStateRestore()),
+ getRemainingLaunchBudget(),
+ 'PWA state restore',
+ )
}
globalLoadingStateManager.setLoadingState('pwa-state', false)
// PWA/App 模式会影响布局和底部导航，必须在启动屏退场前稳定下来。
- await initializePWA()
- await initializeAuthenticatedState()
+ await waitForLaunchTask(initializePWA(), getRemainingLaunchBudget(), 'PWA detection')
- // 等待所有加载完成
- await globalLoadingStateManager.waitForAllComplete()
+ // 用户设置不影响首帧布局，交给应用外壳出现后继续加载。
+ void initializeAuthenticatedState().catch(error => {
+ console.warn('[Launch] Authenticated state initialization failed', error)
+ })
+
+ // 快速缓存命中时至少保留短暂的稳定画面，避免 iOS 只闪过一帧。
+ await waitForMinimumLaunchVisibility()
// 移除加载界面
await animateAndRemoveLoader()
@@ -824,7 +893,7 @@ onMounted(async () => {
updateHtmlThemeAttribute(globalTheme.name.value)
// 初始化主题管理器 - 统一处理主题初始化
- await themeManager.setTheme(themeValue)
+ await themeManager.setTheme(themeValue === 'auto' ? globalTheme.name.value : themeValue)
applyStoredThemeCustomizerAppearance(vuetifyTheme)
updateHtmlThemeAttribute(globalTheme.name.value)
diff --git a/src/utils/__tests__/themePalette.spec.ts b/src/utils/__tests__/themePalette.spec.ts
index 9d6e947f..a809f0b2 100644
--- a/src/utils/__tests__/themePalette.spec.ts
+++ b/src/utils/__tests__/themePalette.spec.ts
@@ -37,4 +37,29 @@ describe('theme palette', () => {
window.removeEventListener('moviepilot-theme-primary-color-change', handleFaviconChange)
}
})
+
+ it('persists the resolved auto theme for the next PWA resume', () => {
+ applyDocumentThemeChrome('auto', {
+ background: '#0E1116',
+ persistLoaderColors: true,
+ primary: '#6E66ED',
+ resolvedTheme: 'dark',
+ })
+
+ expect(localStorage.getItem('materio-initial-loader-bg')).toBe('#0E1116')
+ expect(localStorage.getItem('materio-initial-resolved-theme')).toBe('dark')
+ })
+
+ it('updates the resolved theme cache when the actual theme is confirmed', () => {
+ localStorage.setItem('materio-initial-resolved-theme', 'dark')
+
+ applyDocumentThemeChrome('light', {
+ background: '#F4F5FA',
+ persistLoaderColors: true,
+ primary: '#8D51F9',
+ resolvedTheme: 'light',
+ })
+
+ expect(localStorage.getItem('materio-initial-resolved-theme')).toBe('light')
+ })
})
diff --git a/src/utils/themePalette.ts b/src/utils/themePalette.ts
index 2329ef97..4a898993 100644
--- a/src/utils/themePalette.ts
+++ b/src/utils/themePalette.ts
@@ -133,6 +133,7 @@ export function applyDocumentThemeChrome(
if (options.persistLoaderColors) {
localStorage.setItem('materio-initial-loader-bg', background)
localStorage.setItem('materio-initial-loader-color', primary)
+ localStorage.setItem('materio-initial-resolved-theme', resolvedTheme)
}
return {
diff --git a/tests/config/pwa-splash.spec.ts b/tests/config/pwa-splash.spec.ts
new file mode 100644
index 00000000..7b8234e6
--- /dev/null
+++ b/tests/config/pwa-splash.spec.ts
@@ -0,0 +1,66 @@
+import { existsSync, readFileSync, readdirSync } from 'node:fs'
+import { resolve } from 'node:path'
+import { describe, expect, it } from 'vitest'
+import appleSplashSpecs from '../../scripts/pwa-splash-specs.json'
+
+const projectRoot = process.cwd()
+const indexHtml = readFileSync(resolve(projectRoot, 'index.html'), 'utf8')
+const splashDirectory = resolve(projectRoot, 'public/splash')
+
+describe('PWA 启动屏资源', () => {
+ it('为每个横竖屏资源声明静态 iOS 启动图链接', () => {
+ const splashAssets = readdirSync(splashDirectory)
+ .filter(fileName => fileName.endsWith('.jpg'))
+ .sort()
+ const parsedDocument = new DOMParser().parseFromString(indexHtml, 'text/html')
+ const launchLinks = [...parsedDocument.querySelectorAll('link[rel="apple-touch-startup-image"]')]
+ const declaredAssets = launchLinks.map(link => link.getAttribute('href')?.split('/').pop()).sort()
+
+ expect(splashAssets).toHaveLength(40)
+ expect(declaredAssets).toEqual(splashAssets)
+ splashAssets.forEach(fileName => expect(existsSync(resolve(splashDirectory, fileName))).toBe(true))
+
+ appleSplashSpecs.forEach(({ width: portraitWidth, height: portraitHeight, scaleFactor }) => {
+ const deviceWidth = portraitWidth / scaleFactor
+ const deviceHeight = portraitHeight / scaleFactor
+ const portraitMedia = `(device-width: ${deviceWidth}px) and (device-height: ${deviceHeight}px) and (-webkit-device-pixel-ratio: ${scaleFactor}) and (orientation: portrait)`
+ const landscapeMedia = `(device-width: ${deviceWidth}px) and (device-height: ${deviceHeight}px) and (-webkit-device-pixel-ratio: ${scaleFactor}) and (orientation: landscape)`
+
+ expect(
+ launchLinks.some(
+ link =>
+ link.getAttribute('href') === `/splash/apple-splash-${portraitWidth}-${portraitHeight}.jpg` &&
+ link.media === portraitMedia,
+ ),
+ ).toBe(true)
+ expect(
+ launchLinks.some(
+ link =>
+ link.getAttribute('href') === `/splash/apple-splash-${portraitHeight}-${portraitWidth}.jpg` &&
+ link.media === landscapeMedia,
+ ),
+ ).toBe(true)
+ })
+ })
+
+ it('保持启动层背景、可见回退和动效降级配置一致', () => {
+ expect(indexHtml.toLowerCase()).toContain('--initial-loader-bg: #0e1116')
+ expect(indexHtml).toContain('prefers-reduced-motion: reduce')
+ expect(indexHtml).toContain('inset: 0;')
+ expect(indexHtml).toContain('inset-block-end: calc(env(safe-area-inset-bottom, 0px) + 48px)')
+ expect(indexHtml).toContain('document.documentElement.dataset.launchStartedAt')
+ expect(indexHtml).toContain('materio-initial-resolved-theme')
+ expect(indexHtml).toContain('getCachedLaunchBackground')
+ expect(indexHtml).toContain('opacity: 1')
+ expect(indexHtml).not.toContain('apple-mobile-web-app-orientations')
+ expect(indexHtml).not.toContain('name="screen-orientation"')
+ expect(indexHtml).not.toContain('name="x5-orientation"')
+ })
+
+ it('让原生启动图和网页启动层共享物理屏幕中心', () => {
+ const generatorSource = readFileSync(resolve(projectRoot, 'scripts/generate-pwa-splash.mjs'), 'utf8')
+ expect(generatorSource).toContain('left: Math.round((width - logoSize) / 2)')
+ expect(generatorSource).toContain('top: Math.round((height - logoSize) / 2)')
+ expect(indexHtml).toContain('Keep the brand mark in the physical screen center')
+ })
+})
diff --git a/vite.config.ts b/vite.config.ts
index 13183c14..6b2e0f99 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -91,7 +91,6 @@ export default defineConfig(({ command, mode, isPreview }) => ({
'scope': './',
'display': 'standalone',
'display_override': ['window-controls-overlay', 'standalone'],
- 'orientation': 'portrait-primary',
'lang': 'zh-CN',
'dir': 'ltr',
'categories': ['entertainment', 'multimedia', 'utilities'],
-
-
-
+ setTimeout(function () {
+ const timeoutEl = document.getElementById('loading-timeout')
+ if (timeoutEl) {
+ // 适配多语言
+ const lang = navigator.language || 'zh-CN'
+ const messages = {
+ 'zh-CN': {
+ text: '页面加载似乎遇到了阻碍，请尝试',
+ btn: '清除缓存',
+ },
+ 'zh-TW': {
+ text: '頁面載入似乎遇到了阻礙，請嘗試',
+ btn: '清除快取',
+ },
+ 'en-US': {
+ text: 'Page loading seems to be blocked, please try',
+ btn: 'Clear Cache',
+ },
+ }
+
+ // 默认匹配前缀，如 en-GB 匹配 en-US 的逻辑
+ let msg = messages['zh-CN']
+ if (lang.startsWith('zh-TW') || lang.startsWith('zh-HK')) {
+ msg = messages['zh-TW']
+ } else if (lang.startsWith('en')) {
+ msg = messages['en-US']
+ }
+
+ const textNode = document.createTextNode(msg.text + ' ')
+ const btnLink = document.createElement('a')
+ btnLink.href = 'javascript:void(0)'
+ btnLink.id = 'timeout-btn'
+ btnLink.onclick = window.clearAndReload
+ btnLink.textContent = msg.btn
+
+ timeoutEl.innerHTML = ''
+ timeoutEl.appendChild(textNode)
+ timeoutEl.appendChild(btnLink)
+ timeoutEl.style.display = 'block'
+ }
+ }, 15000) // 15秒后显示超时提示
+
+
+
+
+
-
-
-
-
+
+
+
diff --git a/package.json b/package.json
index a352c0d0..5ddde744 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,9 @@
"scripts": {
"dev": "vite --host",
"dev:pwa": "vite --host --port 5174",
- "prebuild": "npm run build:icons",
+ "prebuild": "npm run build:icons && npm run generate:pwa-splash",
"build": "vite build",
+ "generate:pwa-splash": "node scripts/generate-pwa-splash.mjs",
"preview": "vite preview --port 5050",
"test": "vitest",
"test:run": "vitest run",
@@ -131,6 +132,7 @@
"postcss": "^8.5.1",
"postcss-html": "^1.5.0",
"prettier": "^3.9.5",
+ "sharp": "^0.33.5",
"stylelint": "^16.13.2",
"stylelint-config-idiomatic-order": "^10.0.0",
"stylelint-config-standard-scss": "^14.0.0",
diff --git a/public/splash/apple-splash-1125-2436.jpg b/public/splash/apple-splash-1125-2436.jpg
new file mode 100644
index 00000000..ca109856
Binary files /dev/null and b/public/splash/apple-splash-1125-2436.jpg differ
diff --git a/public/splash/apple-splash-1136-640.jpg b/public/splash/apple-splash-1136-640.jpg
new file mode 100644
index 00000000..1c5c5534
Binary files /dev/null and b/public/splash/apple-splash-1136-640.jpg differ
diff --git a/public/splash/apple-splash-1170-2532.jpg b/public/splash/apple-splash-1170-2532.jpg
new file mode 100644
index 00000000..b9052085
Binary files /dev/null and b/public/splash/apple-splash-1170-2532.jpg differ
diff --git a/public/splash/apple-splash-1179-2556.jpg b/public/splash/apple-splash-1179-2556.jpg
new file mode 100644
index 00000000..79e6e4c7
Binary files /dev/null and b/public/splash/apple-splash-1179-2556.jpg differ
diff --git a/public/splash/apple-splash-1206-2622.jpg b/public/splash/apple-splash-1206-2622.jpg
new file mode 100644
index 00000000..ebab30c5
Binary files /dev/null and b/public/splash/apple-splash-1206-2622.jpg differ
diff --git a/public/splash/apple-splash-1242-2208.jpg b/public/splash/apple-splash-1242-2208.jpg
new file mode 100644
index 00000000..f554e855
Binary files /dev/null and b/public/splash/apple-splash-1242-2208.jpg differ
diff --git a/public/splash/apple-splash-1242-2688.jpg b/public/splash/apple-splash-1242-2688.jpg
new file mode 100644
index 00000000..72109c5f
Binary files /dev/null and b/public/splash/apple-splash-1242-2688.jpg differ
diff --git a/public/splash/apple-splash-1260-2736.jpg b/public/splash/apple-splash-1260-2736.jpg
new file mode 100644
index 00000000..72416b7c
Binary files /dev/null and b/public/splash/apple-splash-1260-2736.jpg differ
diff --git a/public/splash/apple-splash-1284-2778.jpg b/public/splash/apple-splash-1284-2778.jpg
new file mode 100644
index 00000000..2147badd
Binary files /dev/null and b/public/splash/apple-splash-1284-2778.jpg differ
diff --git a/public/splash/apple-splash-1290-2796.jpg b/public/splash/apple-splash-1290-2796.jpg
new file mode 100644
index 00000000..22b94d72
Binary files /dev/null and b/public/splash/apple-splash-1290-2796.jpg differ
diff --git a/public/splash/apple-splash-1320-2868.jpg b/public/splash/apple-splash-1320-2868.jpg
new file mode 100644
index 00000000..805c2d11
Binary files /dev/null and b/public/splash/apple-splash-1320-2868.jpg differ
diff --git a/public/splash/apple-splash-1334-750.jpg b/public/splash/apple-splash-1334-750.jpg
new file mode 100644
index 00000000..2f8efb2f
Binary files /dev/null and b/public/splash/apple-splash-1334-750.jpg differ
diff --git a/public/splash/apple-splash-1488-2266.jpg b/public/splash/apple-splash-1488-2266.jpg
new file mode 100644
index 00000000..9a264ae5
Binary files /dev/null and b/public/splash/apple-splash-1488-2266.jpg differ
diff --git a/public/splash/apple-splash-1536-2048.jpg b/public/splash/apple-splash-1536-2048.jpg
new file mode 100644
index 00000000..5907d50e
Binary files /dev/null and b/public/splash/apple-splash-1536-2048.jpg differ
diff --git a/public/splash/apple-splash-1620-2160.jpg b/public/splash/apple-splash-1620-2160.jpg
new file mode 100644
index 00000000..bb0ac7e0
Binary files /dev/null and b/public/splash/apple-splash-1620-2160.jpg differ
diff --git a/public/splash/apple-splash-1640-2360.jpg b/public/splash/apple-splash-1640-2360.jpg
new file mode 100644
index 00000000..27ca9f15
Binary files /dev/null and b/public/splash/apple-splash-1640-2360.jpg differ
diff --git a/public/splash/apple-splash-1668-2224.jpg b/public/splash/apple-splash-1668-2224.jpg
new file mode 100644
index 00000000..7ee8296e
Binary files /dev/null and b/public/splash/apple-splash-1668-2224.jpg differ
diff --git a/public/splash/apple-splash-1668-2388.jpg b/public/splash/apple-splash-1668-2388.jpg
new file mode 100644
index 00000000..bad96991
Binary files /dev/null and b/public/splash/apple-splash-1668-2388.jpg differ
diff --git a/public/splash/apple-splash-1792-828.jpg b/public/splash/apple-splash-1792-828.jpg
new file mode 100644
index 00000000..22c99eec
Binary files /dev/null and b/public/splash/apple-splash-1792-828.jpg differ
diff --git a/public/splash/apple-splash-2048-1536.jpg b/public/splash/apple-splash-2048-1536.jpg
new file mode 100644
index 00000000..002fb43a
Binary files /dev/null and b/public/splash/apple-splash-2048-1536.jpg differ
diff --git a/public/splash/apple-splash-2048-2732.jpg b/public/splash/apple-splash-2048-2732.jpg
new file mode 100644
index 00000000..829227bf
Binary files /dev/null and b/public/splash/apple-splash-2048-2732.jpg differ
diff --git a/public/splash/apple-splash-2160-1620.jpg b/public/splash/apple-splash-2160-1620.jpg
new file mode 100644
index 00000000..505edaee
Binary files /dev/null and b/public/splash/apple-splash-2160-1620.jpg differ
diff --git a/public/splash/apple-splash-2208-1242.jpg b/public/splash/apple-splash-2208-1242.jpg
new file mode 100644
index 00000000..492b0792
Binary files /dev/null and b/public/splash/apple-splash-2208-1242.jpg differ
diff --git a/public/splash/apple-splash-2224-1668.jpg b/public/splash/apple-splash-2224-1668.jpg
new file mode 100644
index 00000000..77257058
Binary files /dev/null and b/public/splash/apple-splash-2224-1668.jpg differ
diff --git a/public/splash/apple-splash-2266-1488.jpg b/public/splash/apple-splash-2266-1488.jpg
new file mode 100644
index 00000000..81dc049e
Binary files /dev/null and b/public/splash/apple-splash-2266-1488.jpg differ
diff --git a/public/splash/apple-splash-2360-1640.jpg b/public/splash/apple-splash-2360-1640.jpg
new file mode 100644
index 00000000..1f29ce28
Binary files /dev/null and b/public/splash/apple-splash-2360-1640.jpg differ
diff --git a/public/splash/apple-splash-2388-1668.jpg b/public/splash/apple-splash-2388-1668.jpg
new file mode 100644
index 00000000..f6cbd138
Binary files /dev/null and b/public/splash/apple-splash-2388-1668.jpg differ
diff --git a/public/splash/apple-splash-2436-1125.jpg b/public/splash/apple-splash-2436-1125.jpg
new file mode 100644
index 00000000..e7df3732
Binary files /dev/null and b/public/splash/apple-splash-2436-1125.jpg differ
diff --git a/public/splash/apple-splash-2532-1170.jpg b/public/splash/apple-splash-2532-1170.jpg
new file mode 100644
index 00000000..f2353fab
Binary files /dev/null and b/public/splash/apple-splash-2532-1170.jpg differ
diff --git a/public/splash/apple-splash-2556-1179.jpg b/public/splash/apple-splash-2556-1179.jpg
new file mode 100644
index 00000000..d0999209
Binary files /dev/null and b/public/splash/apple-splash-2556-1179.jpg differ
diff --git a/public/splash/apple-splash-2622-1206.jpg b/public/splash/apple-splash-2622-1206.jpg
new file mode 100644
index 00000000..5be8924d
Binary files /dev/null and b/public/splash/apple-splash-2622-1206.jpg differ
diff --git a/public/splash/apple-splash-2688-1242.jpg b/public/splash/apple-splash-2688-1242.jpg
new file mode 100644
index 00000000..d0dfcf08
Binary files /dev/null and b/public/splash/apple-splash-2688-1242.jpg differ
diff --git a/public/splash/apple-splash-2732-2048.jpg b/public/splash/apple-splash-2732-2048.jpg
new file mode 100644
index 00000000..a6edeace
Binary files /dev/null and b/public/splash/apple-splash-2732-2048.jpg differ
diff --git a/public/splash/apple-splash-2736-1260.jpg b/public/splash/apple-splash-2736-1260.jpg
new file mode 100644
index 00000000..157f58b9
Binary files /dev/null and b/public/splash/apple-splash-2736-1260.jpg differ
diff --git a/public/splash/apple-splash-2778-1284.jpg b/public/splash/apple-splash-2778-1284.jpg
new file mode 100644
index 00000000..13f566da
Binary files /dev/null and b/public/splash/apple-splash-2778-1284.jpg differ
diff --git a/public/splash/apple-splash-2796-1290.jpg b/public/splash/apple-splash-2796-1290.jpg
new file mode 100644
index 00000000..decb8744
Binary files /dev/null and b/public/splash/apple-splash-2796-1290.jpg differ
diff --git a/public/splash/apple-splash-2868-1320.jpg b/public/splash/apple-splash-2868-1320.jpg
new file mode 100644
index 00000000..6aed3962
Binary files /dev/null and b/public/splash/apple-splash-2868-1320.jpg differ
diff --git a/public/splash/apple-splash-640-1136.jpg b/public/splash/apple-splash-640-1136.jpg
new file mode 100644
index 00000000..7f290c3f
Binary files /dev/null and b/public/splash/apple-splash-640-1136.jpg differ
diff --git a/public/splash/apple-splash-750-1334.jpg b/public/splash/apple-splash-750-1334.jpg
new file mode 100644
index 00000000..95b0ce0c
Binary files /dev/null and b/public/splash/apple-splash-750-1334.jpg differ
diff --git a/public/splash/apple-splash-828-1792.jpg b/public/splash/apple-splash-828-1792.jpg
new file mode 100644
index 00000000..7c60bda8
Binary files /dev/null and b/public/splash/apple-splash-828-1792.jpg differ
diff --git a/public/splash/apple-splash.png b/public/splash/apple-splash.png
index 5699dcaf..8cd21a08 100644
Binary files a/public/splash/apple-splash.png and b/public/splash/apple-splash.png differ
diff --git a/scripts/generate-pwa-splash.mjs b/scripts/generate-pwa-splash.mjs
new file mode 100644
index 00000000..411c3a91
--- /dev/null
+++ b/scripts/generate-pwa-splash.mjs
@@ -0,0 +1,68 @@
+import { mkdir } from 'node:fs/promises'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+import sharp from 'sharp'
+import appleSplashSpecs from './pwa-splash-specs.json' with { type: 'json' }
+
+const projectRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..')
+const logoPath = path.join(projectRoot, 'public', 'logo.svg')
+const outputDirectory = path.join(projectRoot, 'public', 'splash')
+const background = '#0E1116'
+
+async function createSplash(width, height, scaleFactor, outputPath, format) {
+ // Match the DOM loader's `min(160px, 36vw)` in CSS pixels, then convert it
+ // to physical pixels for the selected Apple launch image.
+ const logoSize = Math.round(Math.min(160, (width / scaleFactor) * 0.36) * scaleFactor)
+ const logo = await sharp(logoPath).resize(logoSize, logoSize, { fit: 'contain' }).png().toBuffer()
+ const image = sharp({
+ create: {
+ width,
+ height,
+ channels: 4,
+ background,
+ },
+ }).composite([
+ {
+ input: logo,
+ left: Math.round((width - logoSize) / 2),
+ top: Math.round((height - logoSize) / 2),
+ },
+ ])
+
+ if (format === 'png') {
+ await image.png({ compressionLevel: 9 }).toFile(outputPath)
+ return
+ }
+
+ await image.flatten({ background }).jpeg({ quality: 88, progressive: true }).toFile(outputPath)
+}
+
+await mkdir(outputDirectory, { recursive: true })
+
+for (const { width: portraitWidth, height: portraitHeight, scaleFactor } of appleSplashSpecs) {
+ const landscapeWidth = portraitHeight
+ const landscapeHeight = portraitWidth
+
+ await createSplash(
+ portraitWidth,
+ portraitHeight,
+ scaleFactor,
+ path.join(outputDirectory, `apple-splash-${portraitWidth}-${portraitHeight}.jpg`),
+ 'jpg',
+ )
+ await createSplash(
+ landscapeWidth,
+ landscapeHeight,
+ scaleFactor,
+ path.join(outputDirectory, `apple-splash-${landscapeWidth}-${landscapeHeight}.jpg`),
+ 'jpg',
+ )
+}
+
+// Keep the previous fallback filename for older deployments and bookmarked
+// entries that may still reference it. Its palette matches the new assets.
+await createSplash(750, 1334, 2, path.join(outputDirectory, 'apple-splash.png'), 'png')
+
+console.log(
+ `Generated ${appleSplashSpecs.length * 2 + 1} PWA splash assets in ${path.relative(projectRoot, outputDirectory)}`,
+)
diff --git a/scripts/pwa-splash-specs.json b/scripts/pwa-splash-specs.json
new file mode 100644
index 00000000..ef8a6c97
--- /dev/null
+++ b/scripts/pwa-splash-specs.json
@@ -0,0 +1,22 @@
+[
+ { "width": 2048, "height": 2732, "scaleFactor": 2 },
+ { "width": 1668, "height": 2388, "scaleFactor": 2 },
+ { "width": 1536, "height": 2048, "scaleFactor": 2 },
+ { "width": 1640, "height": 2360, "scaleFactor": 2 },
+ { "width": 1668, "height": 2224, "scaleFactor": 2 },
+ { "width": 1620, "height": 2160, "scaleFactor": 2 },
+ { "width": 1488, "height": 2266, "scaleFactor": 2 },
+ { "width": 1320, "height": 2868, "scaleFactor": 3 },
+ { "width": 1206, "height": 2622, "scaleFactor": 3 },
+ { "width": 1260, "height": 2736, "scaleFactor": 3 },
+ { "width": 1290, "height": 2796, "scaleFactor": 3 },
+ { "width": 1179, "height": 2556, "scaleFactor": 3 },
+ { "width": 1170, "height": 2532, "scaleFactor": 3 },
+ { "width": 1284, "height": 2778, "scaleFactor": 3 },
+ { "width": 1125, "height": 2436, "scaleFactor": 3 },
+ { "width": 1242, "height": 2688, "scaleFactor": 3 },
+ { "width": 828, "height": 1792, "scaleFactor": 2 },
+ { "width": 1242, "height": 2208, "scaleFactor": 3 },
+ { "width": 750, "height": 1334, "scaleFactor": 2 },
+ { "width": 640, "height": 1136, "scaleFactor": 2 }
+]
diff --git a/src/@core/utils/theme.ts b/src/@core/utils/theme.ts
index 66740208..66848017 100644
--- a/src/@core/utils/theme.ts
+++ b/src/@core/utils/theme.ts
@@ -3,4 +3,9 @@ export function saveLocalTheme(name: string, theme: any) {
localStorage.setItem('theme', name)
localStorage.setItem('materio-initial-loader-bg', theme.current.value.colors.background)
localStorage.setItem('materio-initial-loader-color', theme.current.value.colors.primary)
+
+ // 自动主题下次恢复时需要一个稳定的首帧明暗结果，避免媒体查询短暂返回浅色。
+ if (name === 'auto') {
+ localStorage.setItem('materio-initial-resolved-theme', theme.current.value.dark ? 'dark' : 'light')
+ }
}
diff --git a/src/App.vue b/src/App.vue
index 5c43c7d7..f1c94e32 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -51,12 +51,58 @@ import {
const LOGIN_WALLPAPER_ROUTE = '/login'
const BACKGROUND_CROSSFADE_DURATION_MS = 1500
+const LAUNCH_MIN_VISIBLE_MS = 320
+const LAUNCH_MAX_WAIT_MS = 1200
+const LAUNCH_EXIT_DURATION_MS = 180
+
+function getLaunchNow() {
+ return globalThis.performance?.now?.() ?? Date.now()
+}
+
+const launchStartedAt = Number.parseFloat(document.documentElement.dataset.launchStartedAt || '') || getLaunchNow()
+
+function getRemainingLaunchBudget() {
+ return Math.max(0, LAUNCH_MAX_WAIT_MS - (getLaunchNow() - launchStartedAt))
+}
+
+async function waitForLaunchTask(task: Promise
+
-
-
-
+
+
+
+
+
+
+
+
+
+