loading

lizongying · May 16, 2024 · 4e2e075 · 4e2e075
1 parent 4edc0af
commit 4e2e075
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 15 deletions.
diff --git a/app/src/main/java/com/lizongying/mytv1/WebFragment.kt b/app/src/main/java/com/lizongying/mytv1/WebFragment.kt
@@ -37,7 +37,7 @@ class WebFragment : Fragment() {
     ): View {
         webView = WebView(requireContext())
         webView.settings.javaScriptEnabled = true
-        webView.settings.domStorageEnabled = true
+//        webView.settings.domStorageEnabled = true
         webView.settings.databaseEnabled = true
         webView.settings.javaScriptCanOpenWindowsAutomatically = true
         webView.settings.mediaPlaybackRequiresUserGesture = false
@@ -68,10 +68,10 @@ class WebFragment : Fragment() {
         webView.webChromeClient = object : WebChromeClient() {
             override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean {
                 if (consoleMessage != null) {
-                    Log.e(
-                        "WebViewConsole",
-                        "Message: ${consoleMessage.message()}, Source: ${consoleMessage.sourceId()}, Line: ${consoleMessage.lineNumber()}"
-                    )
+//                    Log.e(
+//                        "WebViewConsole",
+//                        "Message: ${consoleMessage.message()}, Source: ${consoleMessage.sourceId()}, Line: ${consoleMessage.lineNumber()}"
+//                    )
 
                     if (consoleMessage.message() == "success") {
                         Log.e(TAG, "success")
@@ -114,7 +114,7 @@ class WebFragment : Fragment() {
                     return WebResourceResponse("text/plain", "utf-8", null)
                 }
 
-                Log.i(TAG, "${request?.method} ${uri.toString()} ${request?.requestHeaders}")
+//                Log.i(TAG, "${request?.method} ${uri.toString()} ${request?.requestHeaders}")
                 return null
             }
 
@@ -188,12 +188,20 @@ class WebFragment : Fragment() {
         val uri = Uri.parse(url)
         Log.e(TAG, "uri ${uri.host}")
         when (uri.host) {
-            "tv.cctv.com" -> webView.evaluateJavascript(
-                "localStorage.setItem('cctv_live_resolution', '720');",
-                null
-            )
+            "tv.cctv.com" -> {
+                webView.evaluateJavascript(
+                    "localStorage.setItem('cctv_live_resolution', '720');",
+                    null
+                )
+                webView.loadUrl(url)
+            }
+
+            "www.gdtv.cn" -> {
+                webView.loadUrl(url)
+            }
 
-            "www.gdtv.cn" -> {}
+            "www.yangshipin.cn" -> {
+            }
         }
         webView.loadUrl(url)
     }

diff --git a/app/src/main/res/layout/loading.xml b/app/src/main/res/layout/loading.xml
@@ -3,7 +3,7 @@
     android:id="@+id/loading"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/transparent"
+    android:background="@android:color/black"
     >
 
     <LinearLayout

diff --git a/app/src/main/res/raw/cctv.js b/app/src/main/res/raw/cctv.js
@@ -33,7 +33,7 @@
                 clearInterval(interval);
                 setTimeout(function () {
                     console.log('success');
-                }, 0)
+                }, 500)
             }
         }, 10);
     });

diff --git a/app/src/main/res/raw/channels.txt b/app/src/main/res/raw/channels.txt
diff --git a/app/src/main/res/raw/ysp.js b/app/src/main/res/raw/ysp.js
@@ -1,5 +1,7 @@
 (function () {
     return new Promise(function (resolve, reject) {
+//        window.location.reload(true);
+
         const divElement = document.createElement('div');
         divElement.style.position = 'fixed';
         divElement.style.top = '0';
@@ -29,7 +31,7 @@
                 clearInterval(interval);
                 setTimeout(function () {
                     console.log('success');
-                }, 0)
+                }, 1000)
             }
         }, 10);
     });
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ @@
                     clearInterval(interval);
                     setTimeout(function () {
                         console.log('success');
-                    }, 0)
+                    }, 500)
                 }
             }, 10);
         });
@@ Expand Down @@