diff --git a/app/src/main/java/com/github/catvod/spider/Init.java b/app/src/main/java/com/github/catvod/spider/Init.java index 50712dd0..d717dcdf 100644 --- a/app/src/main/java/com/github/catvod/spider/Init.java +++ b/app/src/main/java/com/github/catvod/spider/Init.java @@ -8,7 +8,6 @@ import android.os.Looper; import android.widget.Toast; import com.github.catvod.crawler.SpiderDebug; -import com.github.catvod.utils.Notice; import java.lang.reflect.Field; import java.util.Map; @@ -41,7 +40,6 @@ public class Init { public static void init(Context context) { get().app = ((Application) context); SpiderDebug.log("自定義爬蟲代碼載入成功!"); - Notice.show("https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/notice.json"); } public static void execute(Runnable runnable) { diff --git a/app/src/main/java/com/github/catvod/utils/Notice.java b/app/src/main/java/com/github/catvod/spider/Notice.java similarity index 65% rename from app/src/main/java/com/github/catvod/utils/Notice.java rename to app/src/main/java/com/github/catvod/spider/Notice.java index 51c93aa2..27eec92e 100644 --- a/app/src/main/java/com/github/catvod/utils/Notice.java +++ b/app/src/main/java/com/github/catvod/spider/Notice.java @@ -1,13 +1,15 @@ -package com.github.catvod.utils; +package com.github.catvod.spider; +import android.content.Context; import android.graphics.Color; import android.graphics.Typeface; import android.view.Gravity; import android.widget.FrameLayout; +import com.github.catvod.crawler.Spider; import com.github.catvod.net.OkHttp; -import com.github.catvod.spider.Init; import com.github.catvod.ui.ScrollTextView; +import com.github.catvod.utils.Utils; import org.json.JSONObject; @@ -16,31 +18,41 @@ import java.util.Date; import java.util.Locale; import java.util.Random; -public class Notice { +public class Notice extends Spider { private static final String SPACE = " "; private ScrollTextView view; + private String extend; private int duration; private String msg; - public static void show(String url) { - new Notice().init(url); - } - - public void init(String url) { + public static void show(String extend) { try { - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss", Locale.getDefault()); - String json = OkHttp.string(url); - JSONObject object = new JSONObject(json); - msg = object.optString("msg"); - duration = object.optInt("duration", 30); - String date = object.optString("date"); - boolean show = msg.length() > 0 && (date.isEmpty() || new Date().after(sdf.parse(date))); - if (show) Init.run(this::createView); + Notice notice = new Notice(); + notice.init(null, extend); + notice.homeContent(false); } catch (Exception ignored) { } } + @Override + public void init(Context context, String extend) { + this.extend = extend; + } + + @Override + public String homeContent(boolean filter) throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss", Locale.getDefault()); + String json = OkHttp.string(extend); + JSONObject object = new JSONObject(json); + msg = object.optString("msg"); + duration = object.optInt("duration", 30); + String date = object.optString("date"); + boolean show = msg.length() > 0 && (date.isEmpty() || new Date().after(sdf.parse(date))); + if (show) Init.run(this::createView); + return ""; + } + private void createView() { createText(); createRoot(); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index c4290b12..af21fce3 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index 39e622ca..fdad02a0 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -388b76449e755e157bf0812c5621bd78 +4698f64899d582ca9986f8c45564dd38