From a937a7ba35edb1294f6a5168de591fd4f83be8e0 Mon Sep 17 00:00:00 2001
From: 3anya-T0n1c <khufujason@outlook.com>
Date: Sun, 22 Sep 2024 16:34:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E7=B3=BB=E7=BB=9F=E5=86=85?=
 =?UTF-8?q?=E6=A0=B8=E5=BC=80=E5=85=B3=E4=BB=85=E9=99=90=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E6=80=A7=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/eanyatonic/cctvViewer/MainActivity.java   | 11 ++---------
 .../eanyatonic/cctvViewer/SettingsActivity.java   | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/eanyatonic/cctvViewer/MainActivity.java b/app/src/main/java/com/eanyatonic/cctvViewer/MainActivity.java
index c64a107..947ecd4 100644
--- a/app/src/main/java/com/eanyatonic/cctvViewer/MainActivity.java
+++ b/app/src/main/java/com/eanyatonic/cctvViewer/MainActivity.java
@@ -132,12 +132,7 @@ protected void onCreate(Bundle savedInstanceState) {
         enableDualWebView = sharedPreferences.getBoolean("dual_webview", true);
 
         // 读取WebView设置
-        Boolean forceSysWebView = sharedPreferences.getBoolean("sys_webview", false);
-        if (forceSysWebView) {
-            QbSdk.forceSysWebView();
-        } else {
-            QbSdk.unForceSysWebView();
-        }
+        Boolean forceSysWebView = sharedPreferences.getBoolean("sys_webview", true);
 
 
         // 获取 AudioManager 实例
@@ -271,15 +266,13 @@ protected void onCreate(Bundle savedInstanceState) {
 
                 CoreText.setText("当前程序运行在腾讯X5内核上");
             }
-//        if (canLoadX5) {
             QbSdk.installLocalTbsCore(getApplicationContext(), 45738, "/data/user/0/com.eanyatonic.cctvViewer/app_tbs/045738_x5.tbs.apk");
-//        }
+        }
 
             HashMap<String, Object> map = new HashMap<>(2);
             map.put(TbsCoreSettings.TBS_SETTINGS_USE_SPEEDY_CLASSLOADER, true);
             map.put(TbsCoreSettings.TBS_SETTINGS_USE_DEXLOADER_SERVICE, true);
             QbSdk.initTbsSettings(map);
-        }
 
         // 配置 WebView 设置
         WebSettings webSettings = webView0.getSettings();
diff --git a/app/src/main/java/com/eanyatonic/cctvViewer/SettingsActivity.java b/app/src/main/java/com/eanyatonic/cctvViewer/SettingsActivity.java
index ab99446..2148638 100644
--- a/app/src/main/java/com/eanyatonic/cctvViewer/SettingsActivity.java
+++ b/app/src/main/java/com/eanyatonic/cctvViewer/SettingsActivity.java
@@ -5,6 +5,8 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
+import androidx.preference.SwitchPreference;
 
 import java.util.Objects;
 
@@ -19,10 +21,23 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     public static class SettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
+        private SwitchPreference sysWebViewPreference;
 
         @Override
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             setPreferencesFromResource(R.xml.preferences, rootKey);
+            // 获取 SwitchPreference
+            sysWebViewPreference = findPreference("sys_webview");
+
+            if (sysWebViewPreference != null) {
+                SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
+                boolean switchValue = sharedPreferences.getBoolean("sys_webview", true);
+
+                // 如果开关被关闭，禁用它
+                if (!switchValue) {
+                    sysWebViewPreference.setEnabled(false);
+                }
+            }
         }
 
         @Override