Add js method

app/build.gradle

@@ -10,7 +10,6 @@ android {
         applicationId "com.github.catvod.demo"
         minSdk 17
         targetSdk 28
-        ndk { abiFilters "armeabi-v7a" }
         buildConfigField("String", "CLIENT_ID", "\"${clientId}\"")
         multiDexEnabled true
     }

app/proguard-rules.pro

@@ -3,9 +3,9 @@
 -dontwarn org.slf4j.impl.StaticLoggerBinder
 
 # Spider
+-keep class com.github.catvod.js.* { *; }
 -keep class com.github.catvod.crawler.* { *; }
 -keep class com.github.catvod.spider.* { public <methods>; }
--keep class com.github.catvod.parser.* { public <methods>; }
 
 # Gson
 -keepattributes Signature

app/src/main/java/com/github/catvod/js/JSLoader.java

@@ -1,14 +0,0 @@
-package com.github.catvod.js;
-
-import com.whl.quickjs.android.QuickJSLoader;
-
-public class JSLoader {
-
-    public static void init() {
-        try {
-            QuickJSLoader.init();
-        } catch (Throwable ignored) {
-        }
-    }
-}
-

app/src/main/java/com/github/catvod/js/Method.java

@@ -1,4 +1,31 @@
 package com.github.catvod.js;
 
+import com.github.catvod.utils.Utils;
+import com.google.errorprone.annotations.Keep;
+import com.whl.quickjs.wrapper.JSMethod;
+import com.whl.quickjs.wrapper.QuickJSContext;
+
 public class Method {
+
+    private final QuickJSContext context;
+
+    public Method(QuickJSContext context) {
+        this.context = context;
+    }
+
+    @Keep
+    @JSMethod
+    public void showToast(String msg) {
+        Utils.notify(msg);
+    }
+
+    @Keep
+    public class test {
+
+        @Keep
+        @JSMethod
+        public int add(int a, int b) {
+            return a + b;
+        }
+    }
 }

app/src/main/java/com/github/catvod/spider/Init.java

@@ -7,7 +7,6 @@ import android.os.Handler;
 import android.os.Looper;
 
 import com.github.catvod.crawler.SpiderDebug;
-import com.github.catvod.js.JSLoader;
 
 import java.lang.reflect.Field;
 import java.util.Map;
@@ -40,7 +39,6 @@ public class Init {
     public static void init(Context context) {
         get().app = ((Application) context);
         SpiderDebug.log("自定義爬蟲代碼載入成功！");
-        JSLoader.init();
     }
 
     public static void execute(Runnable runnable) {

jar/custom_spider.jar.md5

@@ -1 +1 @@
-307810edcc83ed68f35682e6f3e67a60
+8ebd953e794760d656dc0e0cbe9f8d65

jar/genJar.bat

@@ -6,16 +6,14 @@ rd /s/q "%~dp0\Smali_classes"
 java -jar "%~dp0\3rd\baksmali-2.5.2.jar" d "%~dp0\..\app\build\intermediates\dex\release\minifyReleaseWithR8\classes.dex" -o "%~dp0\Smali_classes"
 
 rd /s/q "%~dp0\spider.jar\smali\com\github\catvod\spider"
-rd /s/q "%~dp0\spider.jar\smali\com\github\catvod\parser"
+rd /s/q "%~dp0\spider.jar\smali\com\github\catvod\js"
 
 if not exist "%~dp0\spider.jar\smali\com\github\catvod\" md "%~dp0\spider.jar\smali\com\github\catvod\"
 
-if "%1" == "ec" (
+java -Dfile.encoding=utf-8 -jar "%~dp0\3rd\oss.jar" "%~dp0\Smali_classes"
-    java -Dfile.encoding=utf-8 -jar "%~dp0\3rd\oss.jar" "%~dp0\Smali_classes"
-)
 
 move "%~dp0\Smali_classes\com\github\catvod\spider" "%~dp0\spider.jar\smali\com\github\catvod\"
-move "%~dp0\Smali_classes\com\github\catvod\parser" "%~dp0\spider.jar\smali\com\github\catvod\"
+move "%~dp0\Smali_classes\com\github\catvod\js" "%~dp0\spider.jar\smali\com\github\catvod\"
 
 rd /s/q "%~dp0\Smali_classes"
 
@@ -26,7 +24,7 @@ move "%~dp0\spider.jar\dist\dex.jar" "%~dp0\custom_spider.jar"
 certUtil -hashfile "%~dp0\custom_spider.jar" MD5 | find /i /v "md5" | find /i /v "certutil" > "%~dp0\custom_spider.jar.md5"
 
 rd /s/q "%~dp0\spider.jar\smali\com\github\catvod\spider"
-rd /s/q "%~dp0\spider.jar\smali\com\github\catvod\parser"
+rd /s/q "%~dp0\spider.jar\smali\com\github\catvod\js"
 
 rd /s/q "%~dp0\spider.jar\build"
 rd /s/q "%~dp0\spider.jar\dist"