屏幕亮度
›
@@ -41,6 +45,7 @@ window.loadSettings = function () {
版本 0.1.0›
`;
setupTheme(page);
+ setupGlass(page);
setupMask(page);
setupNotificationAccess(page);
setupBrightness(page);
@@ -71,6 +76,18 @@ function setupTheme(page) {
};
}
+// 玻璃效果开关：普通半透明 ↔ 液态玻璃（backdrop-filter 磨砂 + 边缘高光）
+// Glass effect toggle: plain translucent vs liquid glass
+function setupGlass(page) {
+ const sw = page.querySelector('#glass-sw');
+ const refresh = () => sw.classList.toggle('on', glass.enabled());
+ refresh();
+ page.querySelector('#glass-item').onclick = () => {
+ glass.setEnabled(!glass.enabled());
+ refresh();
+ };
+}
+
// 背景遮罩：开关 + 明暗度（仅夜间主题显示）
// Wallpaper dim: toggle + opacity (shown only under dark theme)
function setupMask(page) {
diff --git a/app/src/main/assets/h5/js/router.js b/app/src/main/assets/h5/js/router.js
index 0458ad7..6d26fa2 100644
--- a/app/src/main/assets/h5/js/router.js
+++ b/app/src/main/assets/h5/js/router.js
@@ -29,9 +29,16 @@ const router = {
// always occupies space; only toggle visibility to avoid shifting icons)
const clock = document.getElementById('rail-clock');
if (clock) clock.style.visibility = (id === 'home') ? 'hidden' : 'visible';
- if (id === 'home') window.updateHomeCards && window.updateHomeCards();
- if (id === 'applist') window.loadAppList && window.loadAppList();
- if (id === 'webapplist') window.loadWebAppList && window.loadWebAppList();
- if (id === 'settings') window.loadSettings && window.loadSettings();
+ // 延迟内容加载到下一帧：让切换动画先流畅播放，避免加载重活（查应用/拉清单）
+ // 在动画帧内阻塞导致卡顿
+ // Defer content loading to the next frame: let the switch animation play
+ // smoothly first, avoiding jank from heavy loads (app query / manifest fetch)
+ // blocking within the animation frame
+ requestAnimationFrame(() => {
+ if (id === 'home') window.updateHomeCards && window.updateHomeCards();
+ if (id === 'applist') window.loadAppList && window.loadAppList();
+ if (id === 'webapplist') window.loadWebAppList && window.loadWebAppList();
+ if (id === 'settings') window.loadSettings && window.loadSettings();
+ });
}
};
diff --git a/app/src/main/java/top/yeij/hearth/MainActivity.kt b/app/src/main/java/top/yeij/hearth/MainActivity.kt
index bf27ca9..33b55a5 100644
--- a/app/src/main/java/top/yeij/hearth/MainActivity.kt
+++ b/app/src/main/java/top/yeij/hearth/MainActivity.kt
@@ -164,6 +164,10 @@ class MainActivity : Activity() {
// Log when the main frame finishes loading, to help diagnose a black screen
override fun onPageFinished(view: WebView?, url: String?) {
Log.d(TAG, "onPageFinished: url=$url")
+ // H5 就绪后重新拉取一次媒体，修复启动时推送早于页面渲染的时序问题
+ // Re-pull media once H5 is ready: fixes the startup timing where the
+ // media push happens before the page has rendered
+ bridge.refreshMedia()
}
// 主帧加载失败时展示错误页，避免白屏
diff --git a/app/src/main/java/top/yeij/hearth/media/MediaSessionSource.kt b/app/src/main/java/top/yeij/hearth/media/MediaSessionSource.kt
index 88a0d45..d7b242c 100644
--- a/app/src/main/java/top/yeij/hearth/media/MediaSessionSource.kt
+++ b/app/src/main/java/top/yeij/hearth/media/MediaSessionSource.kt
@@ -68,6 +68,19 @@ class MediaSessionSource(context: Context) {
callback = null
}
+ // 主动拉取当前会话并回调（不重新注册监听），供 H5 页面就绪后刷新媒体卡
+ // Actively pull the current session and notify (without re-registering), for
+ // refreshing the media card once the H5 page is ready
+ fun refresh() {
+ val cb = callback ?: return
+ try {
+ val current = msm.getActiveSessions(listenerComponent).firstOrNull()
+ notifyMedia(current, cb)
+ } catch (e: SecurityException) {
+ Log.w(TAG, "refresh: no notification access: ${e.message}")
+ }
+ }
+
// 从 controller 提取 metadata + playbackState 构造 MediaInfo 并回调
// Build MediaInfo from the controller's metadata + playbackState and invoke the callback
private fun notifyMedia(controller: MediaController?, cb: (MediaInfo?) -> Unit) {
diff --git a/app/src/main/java/top/yeij/hearth/webview/JsBridge.kt b/app/src/main/java/top/yeij/hearth/webview/JsBridge.kt
index 1675c0f..4bfbd6f 100644
--- a/app/src/main/java/top/yeij/hearth/webview/JsBridge.kt
+++ b/app/src/main/java/top/yeij/hearth/webview/JsBridge.kt
@@ -4,6 +4,7 @@ import android.util.Log
import top.yeij.hearth.app.AppRepository
import top.yeij.hearth.card.Card
import top.yeij.hearth.card.CardRepository
+import top.yeij.hearth.media.MediaInfo
import top.yeij.hearth.media.MediaSessionSource
import top.yeij.hearth.webapp.Tab
import top.yeij.hearth.webapp.WebApp
@@ -283,15 +284,27 @@ class JsBridge(
// 注册媒体会话监听，回调推送给 H5（info 为 null 时推 "null"）
// Register media session listener; push callbacks to H5 (push "null" when info is null)
+ private var mediaSourceRef: MediaSessionSource? = null
+
fun setMediaListener(source: MediaSessionSource, webView: android.webkit.WebView) {
- source.start { info ->
- webView.post {
- val json = info?.toJson() ?: "null"
- webView.evaluateJavascript(
- "window.HearthEvents && window.HearthEvents.mediaSessionChanged($json);",
- null
- )
- }
+ mediaSourceRef = source
+ source.start { info -> pushMedia(info, webView) }
+ }
+
+ // H5 页面就绪后重新拉取一次媒体：修复启动时推送早于页面渲染的时序问题
+ // Re-pull media once the H5 page is ready: fixes the startup timing where the
+ // push happens before the page has rendered
+ fun refreshMedia() {
+ mediaSourceRef?.refresh()
+ }
+
+ private fun pushMedia(info: MediaInfo?, webView: android.webkit.WebView) {
+ webView.post {
+ val json = info?.toJson() ?: "null"
+ webView.evaluateJavascript(
+ "window.HearthEvents && window.HearthEvents.mediaSessionChanged($json);",
+ null
+ )
}
}
}