diff --git a/app/build.gradle b/app/build.gradle index 11978824..3e0ec2b3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,6 +12,7 @@ android { targetSdk 28 ndk { abiFilters "armeabi-v7a" } buildConfigField("String", "CLIENT_ID", "\"${clientId}\"") + multiDexEnabled true } buildTypes { diff --git a/app/src/main/java/com/github/catvod/ali/API.java b/app/src/main/java/com/github/catvod/ali/API.java index dda67f14..c7b59925 100644 --- a/app/src/main/java/com/github/catvod/ali/API.java +++ b/app/src/main/java/com/github/catvod/ali/API.java @@ -460,7 +460,7 @@ public class API { public Object[] proxySub(Map params) throws Exception { String fileId = params.get("file_id"); Response res = OkHttp.newCall(getDownloadUrl(fileId), getHeaderAuth()); - byte[] body = Utils.getUTF8(res.body().bytes()); + byte[] body = Utils.toUtf8(res.body().bytes()); Object[] result = new Object[3]; result[0] = 200; result[1] = "application/octet-stream"; diff --git a/app/src/main/java/com/github/catvod/utils/Utils.java b/app/src/main/java/com/github/catvod/utils/Utils.java index 4bc10627..7ab81bc2 100644 --- a/app/src/main/java/com/github/catvod/utils/Utils.java +++ b/app/src/main/java/com/github/catvod/utils/Utils.java @@ -49,19 +49,15 @@ public class Utils { return hasCamera && hasPhone && hasBT; } - public static boolean isGBK(byte[] bytes) { + public static boolean isGbk(byte[] bytes) { Charset charset = Charset.forName("GBK"); String str = new String(bytes, charset); byte[] newBytes = str.getBytes(charset); return Arrays.equals(bytes, newBytes); } - public static byte[] getUTF8(byte[] bytes) throws Exception { - if (isGBK(bytes)) { - return new String(bytes, Charset.forName("GBK")).getBytes("UTF-8"); - } else { - return bytes; - } + public static byte[] toUtf8(byte[] bytes) throws Exception { + return isGbk(bytes) ? new String(bytes, Charset.forName("GBK")).getBytes("UTF-8") : bytes; } public static boolean isSub(String ext) {