fix moegirl ad blocker and optimize func

androidApp/src/main/kotlin/com/zhushenwudi/lovelivemusicplayer/MainActivity.kt

@@ -6,12 +6,16 @@ import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
+import android.view.View
+import android.view.ViewTreeObserver
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import com.zhushenwudi.lovelivemusicplayer.db.DriverFactory
 import com.zhushenwudi.lovelivemusicplayer.db.createDatabase
 import com.zhushenwudi.lovelivemusicplayer.native.platform.AndroidShareBridge
@@ -66,9 +70,32 @@ class MainActivity : ComponentActivity() {
         requestNotifyPermission()
         startPlaybackService()
 
+        // 系统栏 inset 和窗口高度到位之前不画出第一帧，避免顶栏先铺进状态栏再缩回。
+        holdDrawUntilSystemBarsReady()
         setContent { App() }
     }
 
+    private fun holdDrawUntilSystemBarsReady() {
+        val content = findViewById<View>(android.R.id.content) ?: return
+        content.viewTreeObserver.addOnPreDrawListener(object : ViewTreeObserver.OnPreDrawListener {
+            private var skips = 0
+
+            override fun onPreDraw(): Boolean {
+                val top = ViewCompat.getRootWindowInsets(content)
+                    ?.getInsets(WindowInsetsCompat.Type.statusBars())
+                    ?.top ?: 0
+                val ready = skips >= 3 || (content.height > 0 && top > 0)
+                if (ready) {
+                    content.viewTreeObserver.removeOnPreDrawListener(this)
+                    return true
+                }
+                skips++
+                content.postOnAnimation { content.invalidate() }
+                return false
+            }
+        })
+    }
+
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         setIntent(intent)

androidApp/src/main/kotlin/com/zhushenwudi/lovelivemusicplayer/native/WebViewActivity.kt

@@ -11,6 +11,7 @@ import android.webkit.WebViewClient
 import androidx.activity.ComponentActivity
 import androidx.activity.addCallback
 import androidx.activity.compose.setContent
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -19,6 +20,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.automirrored.filled.ArrowForward
@@ -28,16 +30,21 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
+import androidx.core.view.WindowCompat
 import com.zhushenwudi.lovelivemusicplayer.i18n.tr
 import com.zhushenwudi.lovelivemusicplayer.platform.WebViewAdBlock
 import java.io.ByteArrayInputStream
+import kotlinx.coroutines.delay
 
 class WebViewActivity : ComponentActivity() {
     private var webView: WebView? = null
@@ -48,6 +55,7 @@ class WebViewActivity : ComponentActivity() {
     @SuppressLint("SetJavaScriptEnabled")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
         val url = intent.getStringExtra(EXTRA_URL).orEmpty()
         val title = intent.getStringExtra(EXTRA_TITLE)
         title?.let { setTitle(it) }
@@ -67,7 +75,22 @@ class WebViewActivity : ComponentActivity() {
             val progress by pageProgress
 
             MaterialTheme {
-                Column(Modifier.fillMaxSize()) {
+                SideEffect {
+                    WindowCompat.getInsetsController(window, window.decorView)
+                        .isAppearanceLightStatusBars = true
+                }
+                LaunchedEffect(Unit) {
+                    while (true) {
+                        delay(1_000)
+                        webView?.evaluateJavascript(WebViewAdBlock.domCleanupScript(), null)
+                    }
+                }
+                Column(
+                    Modifier
+                        .fillMaxSize()
+                        .background(Color.White)
+                        .statusBarsPadding(),
+                ) {
                     Box(
                         modifier = Modifier
                             .weight(1f)
@@ -162,8 +185,8 @@ class WebViewActivity : ComponentActivity() {
             view: WebView?,
             request: WebResourceRequest?,
         ): WebResourceResponse? {
-            val host = request?.url?.host
-            if (!host.isNullOrBlank() && WebViewAdBlock.isBlockedHost(host)) {
+            val target = request?.url?.toString().orEmpty()
+            if (WebViewAdBlock.isBlockedUrl(target)) {
                 return WebResourceResponse(
                     "text/plain",
                     "utf-8",
@@ -180,8 +203,9 @@ class WebViewActivity : ComponentActivity() {
 
         override fun onPageFinished(view: WebView?, url: String?) {
             super.onPageFinished(view, url)
-            if (view != null && !url.isNullOrBlank()) {
-                view.evaluateJavascript(WebViewAdBlock.injectionScript(url), null)
+            if (view != null) {
+                view.evaluateJavascript(WebViewAdBlock.cosmeticStyleScript(), null)
+                view.evaluateJavascript(WebViewAdBlock.domCleanupScript(), null)
             }
             onNavigationChanged()
         }