From fe3f80ed557246a3c75ac1bad0fdd9d026f8c88c Mon Sep 17 00:00:00 2001 From: FongMi Date: Tue, 3 Oct 2023 11:47:09 +0800 Subject: [PATCH] Clean code --- .../java/com/fongmi/quickjs/method/Console.java | 2 +- .../java/com/fongmi/quickjs/method/Function.java | 16 ++++++++-------- .../java/com/fongmi/quickjs/utils/Module.java | 9 +++++++++ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/quickjs/src/main/java/com/fongmi/quickjs/method/Console.java b/quickjs/src/main/java/com/fongmi/quickjs/method/Console.java index a813bfa1c..feb47a62b 100644 --- a/quickjs/src/main/java/com/fongmi/quickjs/method/Console.java +++ b/quickjs/src/main/java/com/fongmi/quickjs/method/Console.java @@ -5,7 +5,7 @@ import com.whl.quickjs.wrapper.QuickJSContext; public class Console implements QuickJSContext.Console { - private static final String TAG = Console.class.getSimpleName(); + private static final String TAG = "quickjs"; @Override public void log(String info) { diff --git a/quickjs/src/main/java/com/fongmi/quickjs/method/Function.java b/quickjs/src/main/java/com/fongmi/quickjs/method/Function.java index 68bf53dac..3176133f5 100644 --- a/quickjs/src/main/java/com/fongmi/quickjs/method/Function.java +++ b/quickjs/src/main/java/com/fongmi/quickjs/method/Function.java @@ -8,32 +8,32 @@ import java.util.concurrent.Callable; public class Function implements Callable { - private final JSObject jsObject; + private final JSObject object; private final Object[] args; private final String name; private Object result; - public static Function call(JSObject jsObject, String name, Object[] args) { - return new Function(jsObject, name, args); + public static Function call(JSObject object, String name, Object[] args) { + return new Function(object, name, args); } - private Function(JSObject jsObject, String name, Object[] args) { - this.jsObject = jsObject; + private Function(JSObject object, String name, Object[] args) { + this.object = object; this.name = name; this.args = args; } @Override public Object call() throws Exception { - result = jsObject.getJSFunction(name).call(args); + result = object.getJSFunction(name).call(args); if (!(result instanceof JSObject)) return result; JSObject promise = (JSObject) result; JSFunction then = promise.getJSFunction("then"); - if (then != null) then.call(jsCallFunction); + if (then != null) then.call(func); return result; } - private final JSCallFunction jsCallFunction = new JSCallFunction() { + private final JSCallFunction func = new JSCallFunction() { @Override public Object call(Object... args) { return result = args[0]; diff --git a/quickjs/src/main/java/com/fongmi/quickjs/utils/Module.java b/quickjs/src/main/java/com/fongmi/quickjs/utils/Module.java index 725cee726..84ad73be8 100644 --- a/quickjs/src/main/java/com/fongmi/quickjs/utils/Module.java +++ b/quickjs/src/main/java/com/fongmi/quickjs/utils/Module.java @@ -1,6 +1,7 @@ package com.fongmi.quickjs.utils; import android.net.Uri; +import android.util.Base64; import com.github.catvod.net.OkHttp; import com.github.catvod.utils.Path; @@ -52,4 +53,12 @@ public class Module { return ""; } } + + public byte[] bb(String content) { + byte[] bytes = Base64.decode(content.substring(4), Base64.DEFAULT); + byte[] newBytes = new byte[bytes.length - 4]; + newBytes[0] = 1; + System.arraycopy(bytes, 5, newBytes, 1, bytes.length - 5); + return newBytes; + } }