From d39effea2269d36b71730885ab0ff0c4d69e8ea2 Mon Sep 17 00:00:00 2001
From: yangqiang3504 <412594121@qq.com>
Date: Tue, 13 Sep 2022 14:29:32 +0800
Subject: [PATCH] add - douban bg99

---
 .../java/com/github/catvod/spider/PushAgentQQ.java | 14 +++++++++-----
 .../java/com/github/catvod/spider/Upyunso.java     |  5 ++++-
 .../main/java/com/github/catvod/spider/Yiso.java   | 10 +++++++---
 .../main/java/com/github/catvod/utils/Misc.java    |  9 +++++++--
 4 files changed, 27 insertions(+), 11 deletions(-)

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 25d5f34..9815847 100644
--- a/app/src/main/java/com/github/catvod/spider/PushAgentQQ.java
+++ b/app/src/main/java/com/github/catvod/spider/PushAgentQQ.java
@@ -110,8 +110,9 @@ public class PushAgentQQ extends Spider {
             if (!o.toString().equals("null")) {
                 o1 = v.getJSONObject("rating");
                 remark = o1.optString("value", "暂无评分");
-            }else  remark = "暂无评分";
-            remark = o1.optString("value", "暂无评分");
+            }else {
+                remark = "暂无评分";
+            }
             op1 = v.getJSONObject("pic");
             pic = op1.optString("normal", "");
             vo.put("vod_id", "");
@@ -132,7 +133,10 @@ public class PushAgentQQ extends Spider {
                 Misc.jsonUrl = extend;
             }
         }
-        PushAgent.fetchRule(false, 0);
+        if (Misc.pushAgent == null) {
+            Misc.pushAgent = new PushAgent();
+            Misc.pushAgent.init(context, extend);
+        }
     }
 
 
@@ -269,13 +273,13 @@ public class PushAgentQQ extends Spider {
 
     @Override
     public String detailContent(List<String> list) {
-        return PushAgent.getDetail(list);
+        return Misc.pushAgent.getDetail(list);
     }
 
 
     @Override
     public String playerContent(String str, String str2, List<String> list) {
-        return PushAgent.player(str, str2, list);
+        return Misc.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 12a20fe..1671ee0 100644
--- a/app/src/main/java/com/github/catvod/spider/Upyunso.java
+++ b/app/src/main/java/com/github/catvod/spider/Upyunso.java
@@ -17,7 +17,10 @@ public class Upyunso extends Spider {
     @Override
     public void init(Context context, String extend) {
         super.init(context, extend);
-        PushAgent.fetchRule(false, 0);
+        if (Misc.pushAgent == null) {
+            Misc.pushAgent = new PushAgent();
+            Misc.pushAgent.init(context, extend);
+        }
     }
 
     @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 459cd0d..217a1d1 100644
--- a/app/src/main/java/com/github/catvod/spider/Yiso.java
+++ b/app/src/main/java/com/github/catvod/spider/Yiso.java
@@ -4,6 +4,7 @@ import android.content.Context;
 
 import com.github.catvod.crawler.Spider;
 import com.github.catvod.crawler.SpiderDebug;
+import com.github.catvod.utils.Misc;
 import com.github.catvod.utils.okhttp.OkHttpUtil;
 
 import org.json.JSONArray;
@@ -17,9 +18,12 @@ import java.util.regex.Pattern;
 public class Yiso extends Spider {
     private static final Pattern aliyun = Pattern.compile("(https://www.aliyundrive.com/s/[^\"]+)");
     @Override
-    public void init(Context context) {
+    public void init(Context context, String extend) {
         super.init(context);
-        PushAgent.fetchRule(false, 0);
+        if (Misc.pushAgent == null) {
+            Misc.pushAgent = new PushAgent();
+            Misc.pushAgent.init(context, extend);
+        }
     }
 
     @Override
@@ -33,7 +37,7 @@ public class Yiso extends Spider {
     }
 
     public String playerContent(String str, String str2, List<String> list) {
-        return PushAgent.player(str, str2, list);
+        return Misc.pushAgent.player(str, str2, list);
     }
 
     protected static HashMap<String, String> sHeaders() {
diff --git a/app/src/main/java/com/github/catvod/utils/Misc.java b/app/src/main/java/com/github/catvod/utils/Misc.java
index 4790545..f8bde6b 100644
--- a/app/src/main/java/com/github/catvod/utils/Misc.java
+++ b/app/src/main/java/com/github/catvod/utils/Misc.java
@@ -2,6 +2,7 @@ package com.github.catvod.utils;
 import android.net.Uri;
 import android.os.Build;
 import com.github.catvod.crawler.SpiderDebug;
+import com.github.catvod.spider.PushAgent;
 import org.json.JSONException;
 import org.json.JSONObject;
 import java.util.ArrayList;
@@ -18,6 +19,7 @@ public class Misc {
     public static String jsonUrl = "http://test.xinjun58.com/sp/d.json";
     public static String refreshToken="http://catvod.fun:8001/tv/ali.txt";
     public static JSONObject siteRule = null;
+    public static PushAgent pushAgent = null;
     public static Integer type=1;
     public static String btype="N";
     public static boolean rflag = false;
@@ -279,7 +281,10 @@ public class Misc {
         return regexStr;
     }
     public static String tip(){
-        String text = btype + type + refreshToken;
-        return text;
+        if (rflag) {
+            String text = btype + type + refreshToken;
+            return text;
+        }
+        return "";
     }
 }
\ No newline at end of file