From 701d23cf10849cd6a09e794cd1a78e1f5ed271ac Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 26 Mar 2026 23:28:03 +0800
Subject: [PATCH] Clean catvod code

---
 .../src/main/java/com/github/catvod/Init.java |  8 +++---
 .../com/github/catvod/crawler/Spider.java     | 16 +++++------
 .../java/com/github/catvod/net/OkHttp.java    | 28 +++++++++----------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/catvod/src/main/java/com/github/catvod/Init.java b/catvod/src/main/java/com/github/catvod/Init.java
index 2d6207a2f..c37c3bf6d 100644
--- a/catvod/src/main/java/com/github/catvod/Init.java
+++ b/catvod/src/main/java/com/github/catvod/Init.java
@@ -8,10 +8,6 @@ public class Init {
 
     private WeakReference<Context> context;
 
-    private static class Loader {
-        static volatile Init INSTANCE = new Init();
-    }
-
     private static Init get() {
         return Loader.INSTANCE;
     }
@@ -23,4 +19,8 @@ public class Init {
     public static Context context() {
         return get().context.get();
     }
+
+    private static class Loader {
+        static volatile Init INSTANCE = new Init();
+    }
 }
diff --git a/catvod/src/main/java/com/github/catvod/crawler/Spider.java b/catvod/src/main/java/com/github/catvod/crawler/Spider.java
index c07b9f819..1b4e91fe4 100644
--- a/catvod/src/main/java/com/github/catvod/crawler/Spider.java
+++ b/catvod/src/main/java/com/github/catvod/crawler/Spider.java
@@ -15,6 +15,14 @@ public abstract class Spider {
 
     public String siteKey;
 
+    public static Dns safeDns() {
+        return OkHttp.dns();
+    }
+
+    public static OkHttpClient client() {
+        return OkHttp.client();
+    }
+
     public void init(Context context) throws Exception {
     }
 
@@ -72,12 +80,4 @@ public abstract class Spider {
 
     public void destroy() {
     }
-
-    public static Dns safeDns() {
-        return OkHttp.dns();
-    }
-
-    public static OkHttpClient client() {
-        return OkHttp.client();
-    }
 }
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 71f19b196..b1c1516e8 100644
--- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java
+++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java
@@ -41,24 +41,10 @@ public class OkHttp {
     private OkHttpClient player;
     private OkDns dns;
 
-    private static class Loader {
-        static volatile OkHttp INSTANCE = new OkHttp();
-    }
-
     public static OkHttp get() {
         return Loader.INSTANCE;
     }
 
-    public void clear() {
-        cancelAll();
-        dns().clear();
-        selector().clear();
-        authenticator().clear();
-        authInterceptor().clear();
-        requestInterceptor().clear();
-        responseInterceptor().clear();
-    }
-
     public static OkDns dns() {
         if (get().dns != null) return get().dns;
         return get().dns = new OkDns();
@@ -232,4 +218,18 @@ public class OkHttp {
             }
         };
     }
+
+    public void clear() {
+        cancelAll();
+        dns().clear();
+        selector().clear();
+        authenticator().clear();
+        authInterceptor().clear();
+        requestInterceptor().clear();
+        responseInterceptor().clear();
+    }
+
+    private static class Loader {
+        static volatile OkHttp INSTANCE = new OkHttp();
+    }
 }