From e5d77fbf93b85b5a9174f94783f7d967d0e6fbf8 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 27 Mar 2025 15:17:38 +0800
Subject: [PATCH] Fix bug

---
 .../fongmi/android/tv/ui/activity/HomeActivity.java    |  2 +-
 app/src/mobile/AndroidManifest.xml                     |  2 +-
 .../activity/{MainActivity.java => HomeActivity.java}  | 10 +++++-----
 .../fongmi/android/tv/ui/fragment/SettingFragment.java |  6 +++---
 .../layout/{activity_main.xml => activity_home.xml}    |  0
 catvod/src/main/java/com/github/catvod/net/OkHttp.java |  5 +++++
 6 files changed, 15 insertions(+), 10 deletions(-)
 rename app/src/mobile/java/com/fongmi/android/tv/ui/activity/{MainActivity.java => HomeActivity.java} (97%)
 rename app/src/mobile/res/layout/{activity_main.xml => activity_home.xml} (100%)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
index 0a4869cb3..952e8d163 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
@@ -484,7 +484,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
 
     @Override
     protected void onDestroy() {
-        super.onDestroy();
         WallConfig.get().clear();
         LiveConfig.get().clear();
         VodConfig.get().clear();
@@ -492,5 +491,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
         AppDatabase.backup();
         Server.get().stop();
         Source.get().exit();
+        super.onDestroy();
     }
 }
\ No newline at end of file
diff --git a/app/src/mobile/AndroidManifest.xml b/app/src/mobile/AndroidManifest.xml
index 02e1cb08a..8120b51b3 100644
--- a/app/src/mobile/AndroidManifest.xml
+++ b/app/src/mobile/AndroidManifest.xml
@@ -11,7 +11,7 @@
     <application>
 
         <activity
-            android:name=".ui.activity.MainActivity"
+            android:name=".ui.activity.HomeActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:exported="true"
             android:screenOrientation="fullUser"
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
similarity index 97%
rename from app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java
rename to app/src/mobile/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
index 965f78813..8c90dc46b 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
@@ -20,7 +20,7 @@ import com.fongmi.android.tv.api.config.LiveConfig;
 import com.fongmi.android.tv.api.config.VodConfig;
 import com.fongmi.android.tv.api.config.WallConfig;
 import com.fongmi.android.tv.bean.Config;
-import com.fongmi.android.tv.databinding.ActivityMainBinding;
+import com.fongmi.android.tv.databinding.ActivityHomeBinding;
 import com.fongmi.android.tv.db.AppDatabase;
 import com.fongmi.android.tv.event.RefreshEvent;
 import com.fongmi.android.tv.event.ServerEvent;
@@ -43,14 +43,14 @@ import com.google.android.material.navigation.NavigationBarView;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
-public class MainActivity extends BaseActivity implements NavigationBarView.OnItemSelectedListener {
+public class HomeActivity extends BaseActivity implements NavigationBarView.OnItemSelectedListener {
 
-    private ActivityMainBinding mBinding;
+    private ActivityHomeBinding mBinding;
     private FragmentStateManager mManager;
 
     @Override
     protected ViewBinding getBinding() {
-        return mBinding = ActivityMainBinding.inflate(getLayoutInflater());
+        return mBinding = ActivityHomeBinding.inflate(getLayoutInflater());
     }
 
     @Override
@@ -204,7 +204,6 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
 
     @Override
     protected void onDestroy() {
-        super.onDestroy();
         WallConfig.get().clear();
         LiveConfig.get().clear();
         VodConfig.get().clear();
@@ -212,5 +211,6 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
         AppDatabase.backup();
         Source.get().exit();
         Server.get().stop();
+        super.onDestroy();
     }
 }
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
index 08b92f1bf..304913ae9 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
@@ -30,7 +30,7 @@ import com.fongmi.android.tv.impl.LiveCallback;
 import com.fongmi.android.tv.impl.ProxyCallback;
 import com.fongmi.android.tv.impl.SiteCallback;
 import com.fongmi.android.tv.player.Source;
-import com.fongmi.android.tv.ui.activity.MainActivity;
+import com.fongmi.android.tv.ui.activity.HomeActivity;
 import com.fongmi.android.tv.ui.base.BaseFragment;
 import com.fongmi.android.tv.ui.dialog.ConfigDialog;
 import com.fongmi.android.tv.ui.dialog.HistoryDialog;
@@ -80,8 +80,8 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
         return list.toArray(new String[0]);
     }
 
-    private MainActivity getRoot() {
-        return (MainActivity) getActivity();
+    private HomeActivity getRoot() {
+        return (HomeActivity) getActivity();
     }
 
     @Override
diff --git a/app/src/mobile/res/layout/activity_main.xml b/app/src/mobile/res/layout/activity_home.xml
similarity index 100%
rename from app/src/mobile/res/layout/activity_main.xml
rename to app/src/mobile/res/layout/activity_home.xml
diff --git a/catvod/src/main/java/com/github/catvod/net/OkHttp.java b/catvod/src/main/java/com/github/catvod/net/OkHttp.java
index 261cd3faa..49cc26c85 100644
--- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java
+++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java
@@ -59,6 +59,7 @@ public class OkHttp {
     }
 
     public void clear() {
+        cancelAll();
         dns().clear();
         selector().clear();
         requestInterceptor().clear();
@@ -169,6 +170,10 @@ public class OkHttp {
         for (Call call : client().dispatcher().runningCalls()) if (tag.equals(call.request().tag())) call.cancel();
     }
 
+    public static void cancelAll() {
+        client().dispatcher().cancelAll();
+    }
+
     public static FormBody toBody(ArrayMap<String, String> params) {
         FormBody.Builder body = new FormBody.Builder();
         for (Map.Entry<String, String> entry : params.entrySet()) body.add(entry.getKey(), entry.getValue());