From e5942f3294d131fee5081811e237e0967eb7fa28 Mon Sep 17 00:00:00 2001
From: yangqiang3504 <412594121@qq.com>
Date: Wed, 14 Sep 2022 10:16:58 +0800
Subject: [PATCH] add - douban yiso

---
 .../main/java/com/github/catvod/spider/PushAgent.java |  4 ++--
 .../java/com/github/catvod/spider/PushAgentQQ.java    |  8 ++------
 .../main/java/com/github/catvod/spider/Upyunso.java   |  8 ++------
 app/src/main/java/com/github/catvod/spider/Yiso.java  | 11 +++--------
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/github/catvod/spider/PushAgent.java b/app/src/main/java/com/github/catvod/spider/PushAgent.java
index 8c1538a..cc858d3 100644
--- a/app/src/main/java/com/github/catvod/spider/PushAgent.java
+++ b/app/src/main/java/com/github/catvod/spider/PushAgent.java
@@ -125,7 +125,7 @@ public class PushAgent extends Spider {
         return callback.getResult();
     }
 
-    private static void getRefreshTk() {
+    public static void getRefreshTk() {
         long timeSys = Time();
         if (accessToken.isEmpty() || timeToken - timeSys <= 600) {
             try {
@@ -793,6 +793,7 @@ public class PushAgent extends Spider {
                     } else result.put("header", Misc.jHeaders(Misc.type,id).toString());
                     return result.toString();
                 }
+                case "magnet":
                 case "player": {
                     result.put("parse", 0);
                     result.put("playUrl", "");
@@ -801,7 +802,6 @@ public class PushAgent extends Spider {
                     return result.toString();
                 }
                 case "AliYun":
-                    getRefreshTk();
                     String[] split = id.split("\\+");
                     String str3 = split[0];
                     String str5 = split[2];
diff --git a/app/src/main/java/com/github/catvod/spider/PushAgentQQ.java b/app/src/main/java/com/github/catvod/spider/PushAgentQQ.java
index 9815847..f706082 100644
--- a/app/src/main/java/com/github/catvod/spider/PushAgentQQ.java
+++ b/app/src/main/java/com/github/catvod/spider/PushAgentQQ.java
@@ -133,10 +133,6 @@ public class PushAgentQQ extends Spider {
                 Misc.jsonUrl = extend;
             }
         }
-        if (Misc.pushAgent == null) {
-            Misc.pushAgent = new PushAgent();
-            Misc.pushAgent.init(context, extend);
-        }
     }
 
 
@@ -273,13 +269,13 @@ public class PushAgentQQ extends Spider {
 
     @Override
     public String detailContent(List<String> list) {
-        return Misc.pushAgent.getDetail(list);
+        return PushAgent.getDetail(list);
     }
 
 
     @Override
     public String playerContent(String str, String str2, List<String> list) {
-        return Misc.pushAgent.player(str, str2, list);
+        return PushAgent.player(str, str2, list);
     }
 
     @Override
diff --git a/app/src/main/java/com/github/catvod/spider/Upyunso.java b/app/src/main/java/com/github/catvod/spider/Upyunso.java
index e09897f..3eb9609 100644
--- a/app/src/main/java/com/github/catvod/spider/Upyunso.java
+++ b/app/src/main/java/com/github/catvod/spider/Upyunso.java
@@ -17,16 +17,12 @@ public class Upyunso extends Spider {
     @Override
     public void init(Context context, String extend) {
         super.init(context, extend);
-        if (Misc.pushAgent == null) {
-            Misc.pushAgent = new PushAgent();
-            Misc.pushAgent.init(context, extend);
-        }
     }
 
     @Override
     public String detailContent(List<String> list) {
         try {
-            return Misc.pushAgent.getDetail(list);
+            return PushAgent.getDetail(list);
         } catch (Exception e) {
             e.printStackTrace();
             return "";
@@ -42,7 +38,7 @@ public class Upyunso extends Spider {
 
     @Override
     public String playerContent(String str, String str2, List<String> list) {
-        return Misc.pushAgent.player(str, str2, list);
+        return PushAgent.player(str, str2, list);
     }
 
     @Override
diff --git a/app/src/main/java/com/github/catvod/spider/Yiso.java b/app/src/main/java/com/github/catvod/spider/Yiso.java
index bf01a2a..9b80fad 100644
--- a/app/src/main/java/com/github/catvod/spider/Yiso.java
+++ b/app/src/main/java/com/github/catvod/spider/Yiso.java
@@ -20,16 +20,12 @@ public class Yiso extends Spider {
     @Override
     public void init(Context context, String extend) {
         super.init(context);
-        if (Misc.pushAgent == null) {
-            Misc.pushAgent = new PushAgent();
-            Misc.pushAgent.init(context, extend);
-        }
     }
 
     @Override
     public String detailContent(List<String> list) {
         try {
-            return Misc.pushAgent.getDetail(list);
+            return PushAgent.getDetail(list);
         } catch (Exception e) {
             SpiderDebug.log(e);
         }
@@ -37,7 +33,7 @@ public class Yiso extends Spider {
     }
 
     public String playerContent(String str, String str2, List<String> list) {
-        return Misc.pushAgent.player(str, str2, list);
+        return PushAgent.player(str, str2, list);
     }
 
     protected static HashMap<String, String> sHeaders() {
@@ -52,7 +48,7 @@ public class Yiso extends Spider {
     @Override
     public String searchContent(String key, boolean quick) {
         try {
-            HashMap hashMap = new HashMap();
+            PushAgent.getRefreshTk();
             HashMap<String, String> LT = sHeaders();
             String url = "https://yiso.fun/api/search?name=" + URLEncoder.encode(key) + "&from=ali";
 
@@ -62,7 +58,6 @@ public class Yiso extends Spider {
 
             JSONObject result = new JSONObject();
             JSONArray videos = new JSONArray();
-
             for (int i = 0; i < list.length(); i++) {
                 JSONObject jSONObject = list.getJSONObject(i);
                 String sourceName = jSONObject.getJSONArray("fileInfos").getJSONObject(0).getString("fileName");