diff --git a/app/build.gradle b/app/build.gradle
index f85d1f89d..30b0fc885 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -81,10 +81,10 @@ android {
}
dependencies {
- implementation project(':drpy')
implementation project(':tvbus')
implementation project(':zlive')
implementation project(':catvod')
+ implementation project(':quickjs')
implementation project(':jianpian')
implementation project(':forcetech')
implementation project(':ijkplayer')
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c9b9934f..fad9db867 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -40,8 +40,8 @@
spiders;
+ private final ConcurrentHashMap spiders;
private final JarLoader jarLoader;
private String recent;
@@ -21,7 +21,7 @@ public class JsLoader {
}
public void clear() {
- for (Spider spider : spiders.values()) spider.destroy();
+ for (com.github.catvod.crawler.Spider spider : spiders.values()) spider.destroy();
jarLoader.clear();
spiders.clear();
}
@@ -38,10 +38,10 @@ public class JsLoader {
}
}
- public Spider getSpider(String key, String api, String ext, String jar) {
+ public com.github.catvod.crawler.Spider getSpider(String key, String api, String ext, String jar) {
try {
if (spiders.containsKey(key)) return spiders.get(key);
- Spider spider = new com.hiker.drpy.Spider(api, dex(key, jar));
+ com.github.catvod.crawler.Spider spider = new Spider(api, dex(key, jar));
spider.init(App.get(), ext);
spiders.put(key, spider);
return spider;
@@ -53,7 +53,7 @@ public class JsLoader {
public Object[] proxyInvoke(Map, ?> params) {
try {
- Spider spider = spiders.get(recent);
+ com.github.catvod.crawler.Spider spider = spiders.get(recent);
if (spider == null) return null;
return spider.proxyLocal(params);
} catch (Throwable e) {
diff --git a/app/src/main/java/com/fongmi/android/tv/server/Server.java b/app/src/main/java/com/fongmi/android/tv/server/Server.java
index 55994f0ac..0941db530 100644
--- a/app/src/main/java/com/fongmi/android/tv/server/Server.java
+++ b/app/src/main/java/com/fongmi/android/tv/server/Server.java
@@ -5,7 +5,7 @@ import android.net.wifi.WifiManager;
import android.text.format.Formatter;
import com.fongmi.android.tv.App;
-import com.hiker.drpy.Proxy;
+import com.fongmi.quickjs.utils.Proxy;
import java.net.Inet4Address;
import java.net.InetAddress;
diff --git a/drpy/src/main/AndroidManifest.xml b/drpy/src/main/AndroidManifest.xml
deleted file mode 100644
index 5c58de906..000000000
--- a/drpy/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/drpy/.gitignore b/quickjs/.gitignore
similarity index 100%
rename from drpy/.gitignore
rename to quickjs/.gitignore
diff --git a/drpy/build.gradle b/quickjs/build.gradle
similarity index 100%
rename from drpy/build.gradle
rename to quickjs/build.gradle
diff --git a/quickjs/src/main/AndroidManifest.xml b/quickjs/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..828a70579
--- /dev/null
+++ b/quickjs/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/drpy/src/main/assets/js/lib/cheerio.min.js b/quickjs/src/main/assets/js/lib/cheerio.min.js
similarity index 100%
rename from drpy/src/main/assets/js/lib/cheerio.min.js
rename to quickjs/src/main/assets/js/lib/cheerio.min.js
diff --git a/drpy/src/main/assets/js/lib/crypto-js.js b/quickjs/src/main/assets/js/lib/crypto-js.js
similarity index 100%
rename from drpy/src/main/assets/js/lib/crypto-js.js
rename to quickjs/src/main/assets/js/lib/crypto-js.js
diff --git a/drpy/src/main/java/com/hiker/drpy/Loader.java b/quickjs/src/main/java/com/fongmi/quickjs/Provider.java
similarity index 92%
rename from drpy/src/main/java/com/hiker/drpy/Loader.java
rename to quickjs/src/main/java/com/fongmi/quickjs/Provider.java
index 7b0e55d27..f962e4066 100644
--- a/drpy/src/main/java/com/hiker/drpy/Loader.java
+++ b/quickjs/src/main/java/com/fongmi/quickjs/Provider.java
@@ -1,4 +1,4 @@
-package com.hiker.drpy;
+package com.fongmi.quickjs;
import android.content.ContentProvider;
import android.content.ContentValues;
@@ -9,10 +9,12 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.media3.common.util.UriUtil;
+import com.fongmi.quickjs.utils.Module;
+import com.fongmi.quickjs.utils.Prefers;
import com.whl.quickjs.android.QuickJSLoader;
import com.whl.quickjs.wrapper.JSModule;
-public class Loader extends ContentProvider {
+public class Provider extends ContentProvider {
static {
try {
diff --git a/drpy/src/main/java/com/hiker/drpy/bean/Cache.java b/quickjs/src/main/java/com/fongmi/quickjs/bean/Cache.java
similarity index 95%
rename from drpy/src/main/java/com/hiker/drpy/bean/Cache.java
rename to quickjs/src/main/java/com/fongmi/quickjs/bean/Cache.java
index d38d9486f..fc2026937 100644
--- a/drpy/src/main/java/com/hiker/drpy/bean/Cache.java
+++ b/quickjs/src/main/java/com/fongmi/quickjs/bean/Cache.java
@@ -1,4 +1,4 @@
-package com.hiker.drpy.bean;
+package com.fongmi.quickjs.bean;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
diff --git a/drpy/src/main/java/com/hiker/drpy/bean/Info.java b/quickjs/src/main/java/com/fongmi/quickjs/bean/Info.java
similarity index 96%
rename from drpy/src/main/java/com/hiker/drpy/bean/Info.java
rename to quickjs/src/main/java/com/fongmi/quickjs/bean/Info.java
index ff90fdb11..95d9fb4a0 100644
--- a/drpy/src/main/java/com/hiker/drpy/bean/Info.java
+++ b/quickjs/src/main/java/com/fongmi/quickjs/bean/Info.java
@@ -1,4 +1,4 @@
-package com.hiker.drpy.bean;
+package com.fongmi.quickjs.bean;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/drpy/src/main/java/com/hiker/drpy/bean/Req.java b/quickjs/src/main/java/com/fongmi/quickjs/bean/Req.java
similarity index 97%
rename from drpy/src/main/java/com/hiker/drpy/bean/Req.java
rename to quickjs/src/main/java/com/fongmi/quickjs/bean/Req.java
index e1580330c..4e9d0a4ac 100644
--- a/drpy/src/main/java/com/hiker/drpy/bean/Req.java
+++ b/quickjs/src/main/java/com/fongmi/quickjs/bean/Req.java
@@ -1,4 +1,4 @@
-package com.hiker.drpy.bean;
+package com.fongmi.quickjs.bean;
import android.text.TextUtils;
diff --git a/drpy/src/main/java/com/hiker/drpy/bean/Res.java b/quickjs/src/main/java/com/fongmi/quickjs/bean/Res.java
similarity index 96%
rename from drpy/src/main/java/com/hiker/drpy/bean/Res.java
rename to quickjs/src/main/java/com/fongmi/quickjs/bean/Res.java
index 9befdc0cc..f73c9e3bd 100644
--- a/drpy/src/main/java/com/hiker/drpy/bean/Res.java
+++ b/quickjs/src/main/java/com/fongmi/quickjs/bean/Res.java
@@ -1,4 +1,4 @@
-package com.hiker.drpy.bean;
+package com.fongmi.quickjs.bean;
import android.text.TextUtils;
diff --git a/drpy/src/main/java/com/hiker/drpy/Spider.java b/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java
similarity index 97%
rename from drpy/src/main/java/com/hiker/drpy/Spider.java
rename to quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java
index aca126a75..0d3587363 100644
--- a/drpy/src/main/java/com/hiker/drpy/Spider.java
+++ b/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java
@@ -1,13 +1,14 @@
-package com.hiker.drpy;
+package com.fongmi.quickjs.crawler;
import android.content.Context;
import android.util.Base64;
+import com.fongmi.quickjs.bean.Res;
+import com.fongmi.quickjs.method.Function;
+import com.fongmi.quickjs.method.Global;
+import com.fongmi.quickjs.method.Local;
+import com.fongmi.quickjs.utils.Module;
import com.github.catvod.utils.Json;
-import com.hiker.drpy.bean.Res;
-import com.hiker.drpy.method.Function;
-import com.hiker.drpy.method.Global;
-import com.hiker.drpy.method.Local;
import com.whl.quickjs.android.QuickJSLoader;
import com.whl.quickjs.wrapper.JSArray;
import com.whl.quickjs.wrapper.JSMethod;
diff --git a/drpy/src/main/java/com/hiker/drpy/method/Function.java b/quickjs/src/main/java/com/fongmi/quickjs/method/Function.java
similarity index 97%
rename from drpy/src/main/java/com/hiker/drpy/method/Function.java
rename to quickjs/src/main/java/com/fongmi/quickjs/method/Function.java
index bd1229be5..0f3ad5f90 100644
--- a/drpy/src/main/java/com/hiker/drpy/method/Function.java
+++ b/quickjs/src/main/java/com/fongmi/quickjs/method/Function.java
@@ -1,4 +1,4 @@
-package com.hiker.drpy.method;
+package com.fongmi.quickjs.method;
import com.whl.quickjs.wrapper.JSCallFunction;
import com.whl.quickjs.wrapper.JSFunction;
diff --git a/drpy/src/main/java/com/hiker/drpy/method/Global.java b/quickjs/src/main/java/com/fongmi/quickjs/method/Global.java
similarity index 97%
rename from drpy/src/main/java/com/hiker/drpy/method/Global.java
rename to quickjs/src/main/java/com/fongmi/quickjs/method/Global.java
index 91fa42078..88c1b4dc4 100644
--- a/drpy/src/main/java/com/hiker/drpy/method/Global.java
+++ b/quickjs/src/main/java/com/fongmi/quickjs/method/Global.java
@@ -1,15 +1,15 @@
-package com.hiker.drpy.method;
+package com.fongmi.quickjs.method;
import android.text.TextUtils;
import android.util.Base64;
import androidx.annotation.Keep;
+import com.fongmi.quickjs.bean.Req;
+import com.fongmi.quickjs.utils.Parser;
+import com.fongmi.quickjs.utils.Proxy;
import com.github.catvod.net.OkHttp;
import com.google.gson.Gson;
-import com.hiker.drpy.Parser;
-import com.hiker.drpy.Proxy;
-import com.hiker.drpy.bean.Req;
import com.whl.quickjs.wrapper.JSArray;
import com.whl.quickjs.wrapper.JSFunction;
import com.whl.quickjs.wrapper.JSMethod;
diff --git a/drpy/src/main/java/com/hiker/drpy/method/Local.java b/quickjs/src/main/java/com/fongmi/quickjs/method/Local.java
similarity index 87%
rename from drpy/src/main/java/com/hiker/drpy/method/Local.java
rename to quickjs/src/main/java/com/fongmi/quickjs/method/Local.java
index a54960493..fb57e22eb 100644
--- a/drpy/src/main/java/com/hiker/drpy/method/Local.java
+++ b/quickjs/src/main/java/com/fongmi/quickjs/method/Local.java
@@ -1,8 +1,8 @@
-package com.hiker.drpy.method;
+package com.fongmi.quickjs.method;
import androidx.annotation.Keep;
-import com.hiker.drpy.Prefers;
+import com.fongmi.quickjs.utils.Prefers;
import com.whl.quickjs.wrapper.JSMethod;
public class Local {
diff --git a/drpy/src/main/java/com/hiker/drpy/Module.java b/quickjs/src/main/java/com/fongmi/quickjs/utils/Module.java
similarity index 99%
rename from drpy/src/main/java/com/hiker/drpy/Module.java
rename to quickjs/src/main/java/com/fongmi/quickjs/utils/Module.java
index 203df9568..ac4241c0a 100644
--- a/drpy/src/main/java/com/hiker/drpy/Module.java
+++ b/quickjs/src/main/java/com/fongmi/quickjs/utils/Module.java
@@ -1,4 +1,4 @@
-package com.hiker.drpy;
+package com.fongmi.quickjs.utils;
import android.content.Context;
import android.net.Uri;
diff --git a/drpy/src/main/java/com/hiker/drpy/Parser.java b/quickjs/src/main/java/com/fongmi/quickjs/utils/Parser.java
similarity index 98%
rename from drpy/src/main/java/com/hiker/drpy/Parser.java
rename to quickjs/src/main/java/com/fongmi/quickjs/utils/Parser.java
index e90dfc62b..80e18a3b2 100644
--- a/drpy/src/main/java/com/hiker/drpy/Parser.java
+++ b/quickjs/src/main/java/com/fongmi/quickjs/utils/Parser.java
@@ -1,11 +1,11 @@
-package com.hiker.drpy;
+package com.fongmi.quickjs.utils;
import android.text.TextUtils;
import androidx.media3.common.util.UriUtil;
-import com.hiker.drpy.bean.Cache;
-import com.hiker.drpy.bean.Info;
+import com.fongmi.quickjs.bean.Cache;
+import com.fongmi.quickjs.bean.Info;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
diff --git a/drpy/src/main/java/com/hiker/drpy/Prefers.java b/quickjs/src/main/java/com/fongmi/quickjs/utils/Prefers.java
similarity index 97%
rename from drpy/src/main/java/com/hiker/drpy/Prefers.java
rename to quickjs/src/main/java/com/fongmi/quickjs/utils/Prefers.java
index 7f57e1d38..3f31acdb5 100644
--- a/drpy/src/main/java/com/hiker/drpy/Prefers.java
+++ b/quickjs/src/main/java/com/fongmi/quickjs/utils/Prefers.java
@@ -1,4 +1,4 @@
-package com.hiker.drpy;
+package com.fongmi.quickjs.utils;
import android.content.Context;
import android.content.SharedPreferences;
diff --git a/drpy/src/main/java/com/hiker/drpy/Proxy.java b/quickjs/src/main/java/com/fongmi/quickjs/utils/Proxy.java
similarity index 73%
rename from drpy/src/main/java/com/hiker/drpy/Proxy.java
rename to quickjs/src/main/java/com/fongmi/quickjs/utils/Proxy.java
index 93fa0b9b4..5e2866de3 100644
--- a/drpy/src/main/java/com/hiker/drpy/Proxy.java
+++ b/quickjs/src/main/java/com/fongmi/quickjs/utils/Proxy.java
@@ -1,8 +1,8 @@
-package com.hiker.drpy;
+package com.fongmi.quickjs.utils;
public class Proxy {
- private static int port;
+ private static int port = 9978;
public static void set(int port) {
Proxy.port = port;
diff --git a/settings.gradle b/settings.gradle
index 9271bca2c..f4736405e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,11 +20,11 @@ dependencyResolutionManagement {
}
}
include ':app'
-include ':drpy'
include ':zlive'
include ':tvbus'
include ':catvod'
include ':pyramid'
+include ':quickjs'
include ':jianpian'
include ':forcetech'
include ':ijkplayer'