Merge pull request #1 from FongMi/main

a

app/build.gradle

@@ -11,6 +11,7 @@ android {
         minSdk 17
         targetSdk 29
         ndk { abiFilters "armeabi-v7a" }
+        buildConfigField("String", "APP_ID", "\"${appId}\"")
     }
 
     buildTypes {
@@ -35,6 +36,7 @@ android {
 dependencies {
     //Debug For HTTP/3
     debugImplementation 'org.chromium.net:cronet-embedded:101.4951.41'
+    implementation 'com.starkbank.ellipticcurve:starkbank-ecdsa:1.0.2'
     implementation 'com.google.net.cronet:cronet-okhttp:0.1.0'
     implementation 'androidx.annotation:annotation:1.5.0'
     implementation 'com.squareup.okhttp3:okhttp:3.12.13'

app/src/main/java/com/github/catvod/ali/API.java

@@ -0,0 +1,446 @@
+package com.github.catvod.ali;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.net.UrlQuerySanitizer;
+import android.os.SystemClock;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+
+import com.github.catvod.BuildConfig;
+import com.github.catvod.bean.Sub;
+import com.github.catvod.bean.Vod;
+import com.github.catvod.bean.ali.Auth;
+import com.github.catvod.bean.ali.Data;
+import com.github.catvod.bean.ali.Item;
+import com.github.catvod.net.OkHttp;
+import com.github.catvod.spider.Init;
+import com.github.catvod.spider.Proxy;
+import com.github.catvod.utils.Prefers;
+import com.github.catvod.utils.QRCode;
+import com.github.catvod.utils.Trans;
+import com.github.catvod.utils.Utils;
+import com.starkbank.ellipticcurve.Ecdsa;
+import com.starkbank.ellipticcurve.PrivateKey;
+import com.starkbank.ellipticcurve.utils.BinaryAscii;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+
+public class API {
+
+    private ScheduledExecutorService service;
+    private Map<String, String> mediaId2Url;
+    private final ReentrantLock lock;
+    private AlertDialog dialog;
+    private final Auth auth;
+
+    private static class Loader {
+        static volatile API INSTANCE = new API();
+    }
+
+    public static API get() {
+        return Loader.INSTANCE;
+    }
+
+    private API() {
+        this.auth = new Auth();
+        this.lock = new ReentrantLock(true);
+    }
+
+    public void setRefreshToken(String token) {
+        auth.setRefreshToken(Prefers.getString("token", token));
+    }
+
+    public void setShareId(String shareId) {
+        auth.setShareId(shareId);
+        refreshShareToken();
+    }
+
+    public HashMap<String, String> getHeader() {
+        HashMap<String, String> headers = new HashMap<>();
+        headers.put("User-Agent", Utils.CHROME);
+        headers.put("Referer", "https://www.aliyundrive.com/");
+        return headers;
+    }
+
+    private HashMap<String, String> getHeaderAuth() {
+        HashMap<String, String> headers = getHeader();
+        headers.put("authorization", auth.getAccessToken());
+        headers.put("x-share-token", auth.getShareToken());
+        return headers;
+    }
+
+    private HashMap<String, String> getHeaderSign() {
+        HashMap<String, String> headers = getHeaderAuth();
+        headers.put("x-device-id", auth.getDeviceId());
+        headers.put("x-signature", auth.getSignature());
+        return headers;
+    }
+
+    private String post(String url, JSONObject body) {
+        url = url.startsWith("https") ? url : "https://api.aliyundrive.com/" + url;
+        return OkHttp.postJson(url, body.toString(), getHeader());
+    }
+
+    private String auth(String url, JSONObject body, boolean retry) {
+        url = url.startsWith("https") ? url : "https://api.aliyundrive.com/" + url;
+        String result = OkHttp.postJson(url, body.toString(), getHeaderAuth());
+        if (retry && check401(result)) return auth(url, body, false);
+        return result;
+    }
+
+    private String sign(String url, JSONObject body, boolean retry) {
+        url = url.startsWith("https") ? url : "https://api.aliyundrive.com/" + url;
+        String result = OkHttp.postJson(url, body.toString(), getHeaderSign());
+        if (retry && check401(result)) return sign(url, body, false);
+        return result;
+    }
+
+    private boolean check401(String result) {
+        if (result.contains("AccessTokenInvalid")) return refreshAccessToken();
+        if (result.contains("ShareLinkTokenInvalid") || result.contains("InvalidParameterNotMatch")) return refreshShareToken();
+        if (result.contains("UserDeviceOffline") || result.contains("UserDeviceIllegality") || result.contains("DeviceSessionSignatureInvalid")) return refreshSignature();
+        return false;
+    }
+
+    public void checkAccessToken() {
+        if (auth.getAccessToken().isEmpty()) refreshAccessToken();
+    }
+
+    private void checkSignature() {
+        if (auth.getSignature().isEmpty()) refreshSignature();
+    }
+
+    private boolean refreshAccessToken() {
+        try {
+            JSONObject body = new JSONObject();
+            String token = auth.getRefreshToken();
+            if (token.startsWith("http")) token = OkHttp.string(token).replaceAll("[^A-Za-z0-9]", "");
+            body.put("refresh_token", token);
+            body.put("grant_type", "refresh_token");
+            JSONObject object = new JSONObject(post("https://auth.aliyundrive.com/v2/account/token", body));
+            auth.setUserId(object.getString("user_id"));
+            auth.setDeviceId(object.getString("device_id"));
+            auth.setAccessToken(object.getString("token_type") + " " + object.getString("access_token"));
+            auth.setRefreshToken(object.getString("refresh_token"));
+            return true;
+        } catch (Exception e) {
+            stopService();
+            auth.clean();
+            getQRCode();
+            return true;
+        } finally {
+            while (auth.isEmpty()) SystemClock.sleep(250);
+        }
+    }
+
+    public boolean refreshShareToken() {
+        try {
+            JSONObject body = new JSONObject();
+            body.put("share_id", auth.getShareId());
+            body.put("share_pwd", "");
+            JSONObject object = new JSONObject(post("v2/share_link/get_share_token", body));
+            auth.setShareToken(object.getString("share_token"));
+            return true;
+        } catch (Exception e) {
+            Init.show("來晚啦，該分享已失效。");
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    private boolean refreshSignature() {
+        try {
+            PrivateKey privateKey = new PrivateKey();
+            String pubKey = "04" + BinaryAscii.hexFromBinary(privateKey.publicKey().toByteString().getBytes());
+            String message = BuildConfig.APP_ID + ":" + auth.getDeviceId() + ":" + auth.getUserId() + ":" + 0;
+            String signature = BinaryAscii.hexFromBinary(Ecdsa.sign(message, privateKey).toDer().getBytes());
+            auth.setSignature(signature.substring(signature.length() - 128) + "01");
+            JSONObject body = new JSONObject();
+            body.put("deviceName", "samsung");
+            body.put("modelName", "SM-G9810");
+            body.put("nonce", 0);
+            body.put("pubKey", pubKey);
+            body.put("refreshToken", auth.getRefreshToken());
+            JSONObject object = new JSONObject(sign("users/v1/users/device/create_session", body, false));
+            if (!object.getBoolean("success")) throw new Exception(object.toString());
+            return true;
+        } catch (Exception e) {
+            auth.setSignature("");
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public Vod getVod(String url, String fileId) throws Exception {
+        JSONObject body = new JSONObject();
+        body.put("share_id", auth.getShareId());
+        String json = API.get().post("adrive/v3/share_link/get_share_by_anonymous", body);
+        JSONObject object = new JSONObject(json);
+        List<Item> files = new ArrayList<>();
+        LinkedHashMap<String, List<String>> subMap = new LinkedHashMap<>();
+        listFiles(new Item(getParentFileId(fileId, object)), files, subMap);
+        List<String> playUrls = new ArrayList<>();
+        for (Item file : files) playUrls.add(Trans.get(file.getDisplayName()) + "$" + file.getFileId() + findSubs(file.getName(), subMap));
+        List<String> sourceUrls = new ArrayList<>();
+        sourceUrls.add(TextUtils.join("#", playUrls));
+        sourceUrls.add(TextUtils.join("#", playUrls));
+        Vod vod = new Vod();
+        vod.setVodId(url);
+        vod.setVodContent(url);
+        vod.setVodPic(object.getString("avatar"));
+        vod.setVodName(object.getString("share_name"));
+        vod.setVodPlayUrl(TextUtils.join("$$$", sourceUrls));
+        vod.setVodPlayFrom("原畫$$$普畫");
+        vod.setTypeName("阿里雲盤");
+        return vod;
+    }
+
+    private void listFiles(Item folder, List<Item> files, LinkedHashMap<String, List<String>> subMap) throws Exception {
+        listFiles(folder, files, subMap, "");
+    }
+
+    private void listFiles(Item parent, List<Item> files, LinkedHashMap<String, List<String>> subMap, String marker) throws Exception {
+        JSONObject body = new JSONObject();
+        List<Item> folders = new ArrayList<>();
+        body.put("limit", 200);
+        body.put("share_id", auth.getShareId());
+        body.put("parent_file_id", parent.getFileId());
+        body.put("order_by", "name");
+        body.put("order_direction", "ASC");
+        if (marker.length() > 0) body.put("marker", marker);
+        Item item = Item.objectFrom(API.get().auth("adrive/v3/file/list", body, true));
+        for (Item file : item.getItems()) {
+            if (file.getType().equals("folder")) {
+                folders.add(file);
+            } else if (file.getCategory().equals("video") || file.getCategory().equals("audio")) {
+                files.add(file.parent(parent.getName()));
+            } else if (Utils.isSub(file.getExt())) {
+                String key = file.removeExt();
+                if (!subMap.containsKey(key)) subMap.put(key, new ArrayList<>());
+                subMap.get(key).add(key + "@@@" + file.getExt() + "@@@" + file.getFileId());
+            }
+        }
+        if (item.getNextMarker().length() > 0) {
+            listFiles(parent, files, subMap, item.getNextMarker());
+        }
+        for (Item folder : folders) {
+            listFiles(folder, files, subMap);
+        }
+    }
+
+    private String getParentFileId(String fileId, JSONObject shareInfo) throws Exception {
+        JSONArray array = shareInfo.getJSONArray("file_infos");
+        if (!TextUtils.isEmpty(fileId)) return fileId;
+        if (array.length() == 0) return "";
+        JSONObject fileInfo = array.getJSONObject(0);
+        if (fileInfo.getString("type").equals("folder")) return fileInfo.getString("file_id");
+        if (fileInfo.getString("type").equals("file") && fileInfo.getString("category").equals("video")) return "root";
+        return "";
+    }
+
+    private String findSubs(String name, Map<String, List<String>> subMap) {
+        name = name.substring(0, name.lastIndexOf("."));
+        List<String> subs = subMap.get(name);
+        if (subs != null && subs.size() > 0) return combineSubs(subs);
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, List<String>> entry : subMap.entrySet()) sb.append(combineSubs(entry.getValue()));
+        return sb.toString();
+    }
+
+    private String combineSubs(List<String> subs) {
+        StringBuilder sb = new StringBuilder();
+        for (String sub : subs) sb.append("+").append(sub);
+        return sb.toString();
+    }
+
+    public List<Sub> getSub(String[] ids) {
+        List<Sub> sub = new ArrayList<>();
+        for (String text : ids) {
+            if (!text.contains("@@@")) continue;
+            String[] split = text.split("@@@");
+            String name = split[0];
+            String ext = split[1];
+            String url = Proxy.getUrl() + "?do=ali&type=sub" + "&file_id=" + split[2];
+            sub.add(Sub.create().name(name).ext(ext).url(url));
+        }
+        return sub;
+    }
+
+    public String getPreviewUrl(String fileId) {
+        return Proxy.getUrl() + "?do=ali&type=m3u8&file_id=" + fileId;
+    }
+
+    public String getDownloadUrl(String fileId) {
+        try {
+            JSONObject body = new JSONObject();
+            body.put("file_id", fileId);
+            body.put("share_id", auth.getShareId());
+            body.put("expire_sec", 600);
+            String json = API.get().auth("v2/file/get_share_link_download_url", body, true);
+            String url = new JSONObject(json).optString("download_url");
+            Map<String, List<String>> respHeaders = new HashMap<>();
+            OkHttp.stringNoRedirect(url, API.get().getHeader(), respHeaders);
+            return OkHttp.getRedirectLocation(respHeaders);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
+
+    public Object[] proxySub(Map<String, String> params) {
+        String fileId = params.get("file_id");
+        String text = OkHttp.string(getDownloadUrl(fileId), API.get().getHeaderAuth());
+        Object[] result = new Object[3];
+        result[0] = 200;
+        result[1] = "application/octet-stream";
+        result[2] = new ByteArrayInputStream(text.getBytes());
+        return result;
+    }
+
+    public Object[] proxyM3U8(Map<String, String> params) {
+        String fileId = params.get("file_id");
+        Object[] result = new Object[3];
+        result[0] = 200;
+        result[1] = "application/vnd.apple.mpegurl";
+        result[2] = new ByteArrayInputStream(refreshM3U8(fileId).getBytes());
+        return result;
+    }
+
+    public Object[] proxyMedia(Map<String, String> params) {
+        try {
+            String fileId = params.get("file_id");
+            String mediaId = params.get("media_id");
+            lock.lock();
+            String mediaUrl = mediaId2Url.get(mediaId);
+            long expires = Long.parseLong(new UrlQuerySanitizer(mediaUrl).getValue("x-oss-expires"));
+            long current = System.currentTimeMillis() / 1000;
+            if (expires - current <= 60) {
+                refreshM3U8(fileId);
+                mediaUrl = mediaId2Url.get(mediaId);
+            }
+            lock.unlock();
+            Object[] result = new Object[3];
+            result[0] = 200;
+            result[1] = "video/MP2T";
+            result[2] = OkHttp.newCall(mediaUrl, getHeader()).body().byteStream();
+            return result;
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private String refreshM3U8(String fileId) {
+        try {
+            checkSignature();
+            JSONObject body = new JSONObject();
+            body.put("file_id", fileId);
+            body.put("share_id", auth.getShareId());
+            body.put("template_id", "");
+            body.put("category", "live_transcoding");
+            String json = sign("v2/file/get_share_link_video_preview_play_info", body, true);
+            JSONArray taskList = new JSONObject(json).getJSONObject("video_preview_play_info").getJSONArray("live_transcoding_task_list");
+            Map<String, List<String>> respHeaders = new HashMap<>();
+            OkHttp.stringNoRedirect(getPreviewQuality(taskList), getHeader(), respHeaders);
+            String location = OkHttp.getRedirectLocation(respHeaders);
+            String m3u8 = OkHttp.string(location, getHeader());
+            String mediaUrlPrefix = location.substring(0, location.lastIndexOf("/")) + "/";
+            List<String> lines = new ArrayList<>();
+            int mediaId = 0;
+            mediaId2Url = new HashMap<>();
+            for (String line : m3u8.split("\n")) {
+                if (line.contains("x-oss-expires")) {
+                    mediaId += 1;
+                    mediaId2Url.put(String.valueOf(mediaId), mediaUrlPrefix + line);
+                    line = Proxy.getUrl() + "?do=ali&type=media" + "&file_id=" + fileId + "&media_id=" + mediaId;
+                }
+                lines.add(line);
+            }
+            return TextUtils.join("\n", lines);
+        } catch (Exception e) {
+            return "";
+        }
+    }
+
+    private String getPreviewQuality(JSONArray taskList) throws Exception {
+        for (String templateId : Arrays.asList("FHD", "HD", "SD", "LD")) {
+            for (int i = 0; i < taskList.length(); ++i) {
+                JSONObject task = taskList.getJSONObject(i);
+                if (task.getString("template_id").equals(templateId)) {
+                    return task.getString("url");
+                }
+            }
+        }
+        return taskList.getJSONObject(0).getString("url");
+    }
+
+    private void getQRCode() {
+        Data data = Data.objectFrom(OkHttp.string("https://passport.aliyundrive.com/newlogin/qrcode/generate.do?appName=aliyun_drive&fromSite=52&appName=aliyun_drive&appEntrance=web&isMobile=false&lang=zh_CN&returnUrl=&bizParams=&_bx-v=2.2.3")).getContent().getData();
+        Init.run(() -> showQRCode(data));
+    }
+
+    private void showQRCode(Data data) {
+        try {
+            FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(Utils.dp2px(240), Utils.dp2px(240));
+            ImageView image = new ImageView(Init.context());
+            image.setScaleType(ImageView.ScaleType.CENTER_CROP);
+            image.setImageBitmap(QRCode.getBitmap(data.getCodeContent(), 240, 2));
+            FrameLayout frame = new FrameLayout(Init.context());
+            params.gravity = Gravity.CENTER;
+            frame.addView(image, params);
+            dialog = new AlertDialog.Builder(Init.getActivity()).setView(frame).setOnDismissListener(this::dismiss).show();
+            dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            Init.execute(() -> startService(data.getParams()));
+            Init.show("請使用阿里雲盤 App 掃描二維碼");
+        } catch (Exception ignored) {
+        }
+    }
+
+    private void startService(Map<String, String> params) {
+        service = Executors.newScheduledThreadPool(1);
+        service.scheduleAtFixedRate(() -> {
+            Data result = Data.objectFrom(OkHttp.post("https://passport.aliyundrive.com/newlogin/qrcode/query.do?appName=aliyun_drive&fromSite=52&_bx-v=2.2.3", params)).getContent().getData();
+            if (result.hasToken()) setToken(result.getToken());
+        }, 1, 1, TimeUnit.SECONDS);
+    }
+
+    private void setToken(String value) {
+        Prefers.put("token", value);
+        Init.show("請重新進入播放頁");
+        auth.setRefreshToken(value);
+        stopService();
+    }
+
+    private void stopService() {
+        if (service != null) service.shutdownNow();
+        Init.run(this::dismiss);
+    }
+
+    private void dismiss(DialogInterface dialog) {
+        stopService();
+    }
+
+    private void dismiss() {
+        try {
+            if (dialog != null) dialog.dismiss();
+        } catch (Exception ignored) {
+        }
+    }
+}

app/src/main/java/com/github/catvod/bean/ali/Auth.java

@@ -7,7 +7,10 @@ public class Auth {
     private String refreshToken;
     private String accessToken;
     private String shareToken;
+    private String signature;
+    private String deviceId;
     private String shareId;
+    private String userId;
 
     public String getRefreshToken() {
         return TextUtils.isEmpty(refreshToken) ? "" : refreshToken;
@@ -33,6 +36,22 @@ public class Auth {
         this.shareToken = shareToken;
     }
 
+    public String getSignature() {
+        return TextUtils.isEmpty(signature) ? "" : signature;
+    }
+
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
     public String getShareId() {
         return TextUtils.isEmpty(shareId) ? "" : shareId;
     }
@@ -41,6 +60,14 @@ public class Auth {
         this.shareId = shareId;
     }
 
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
     public boolean isEmpty() {
         return getAccessToken().isEmpty();
     }

app/src/main/java/com/github/catvod/bean/upyun/Item.java

@@ -15,7 +15,7 @@ public class Item {
     private String insertTime;
 
     public String getTitle() {
-        return TextUtils.isEmpty(title) ? "" : title;
+        return TextUtils.isEmpty(title) ? "" : title.replaceAll("<em>", "").replaceAll("</em>", "");
     }
 
     public String getPageUrl() {
@@ -26,8 +26,9 @@ public class Item {
         return TextUtils.isEmpty(insertTime) ? "" : insertTime;
     }
 
-    public boolean isAli() {
+    public Item url(String pageUrl) {
-        return getPageUrl().contains("www.aliyundrive.com");
+        this.pageUrl = pageUrl;
+        return this;
     }
 
     public Vod getVod() {

app/src/main/java/com/github/catvod/net/OkHttp.java

@@ -2,13 +2,17 @@ package com.github.catvod.net;
 
 import com.github.catvod.crawler.Spider;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import okhttp3.Call;
 import okhttp3.Dns;
+import okhttp3.Headers;
 import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
 
 public class OkHttp {
 
@@ -35,7 +39,7 @@ public class OkHttp {
         return new OkHttpClient.Builder().dns(safeDns()).readTimeout(30, TimeUnit.SECONDS).writeTimeout(30, TimeUnit.SECONDS).connectTimeout(30, TimeUnit.SECONDS).hostnameVerifier(SSLSocketFactoryCompat.hostnameVerifier).sslSocketFactory(new SSLSocketFactoryCompat(), SSLSocketFactoryCompat.trustAllCert);
     }
 
-    private static OkHttpClient client() {
+    public static OkHttpClient client() {
         return get().client;
     }
 
@@ -51,6 +55,10 @@ public class OkHttp {
         }
     }
 
+    public static Response newCall(String url, Map<String, String> header) throws IOException {
+        return client().newCall(new Request.Builder().url(url).headers(Headers.of(header)).build()).execute();
+    }
+
     public static void stringNoRedirect(String url, Map<String, String> header, Map<String, List<String>> respHeader) {
         string(noRedirect(), GET, url, null, null, header, respHeader);
     }

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

@@ -1,362 +1,55 @@
 package com.github.catvod.spider;
 
-import android.app.AlertDialog;
+import android.content.Context;
-import android.content.DialogInterface;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.SystemClock;
-import android.text.TextUtils;
-import android.view.Gravity;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
 
+import com.github.catvod.ali.API;
 import com.github.catvod.bean.Result;
-import com.github.catvod.bean.Sub;
+import com.github.catvod.crawler.Spider;
-import com.github.catvod.bean.Vod;
-import com.github.catvod.bean.ali.Auth;
-import com.github.catvod.bean.ali.Data;
-import com.github.catvod.bean.ali.Item;
-import com.github.catvod.net.OkHttp;
-import com.github.catvod.utils.Prefers;
-import com.github.catvod.utils.QRCode;
-import com.github.catvod.utils.Trans;
-import com.github.catvod.utils.Utils;
 
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
  * @author ColaMint & Adam & FongMi
  */
-public class Ali {
+public class Ali extends Spider {
 
     public static final Pattern pattern = Pattern.compile("www.aliyundrive.com/s/([^/]+)(/folder/([^/]+))?");
-    private ScheduledExecutorService service;
-    private final Auth auth;
-    private AlertDialog dialog;
 
-    private static class Loader {
+    @Override
-        static volatile Ali INSTANCE = new Ali();
+    public void init(Context context, String extend) {
-    }
+        API.get().setRefreshToken(extend);
-
-    public static Ali get() {
-        return Loader.INSTANCE;
-    }
-
-    public Ali() {
-        this.auth = new Auth();
-    }
-
-    public Ali init(String token) {
-        auth.setRefreshToken(Prefers.getString("token", token));
-        return this;
-    }
-
-    private HashMap<String, String> getHeaders() {
-        HashMap<String, String> headers = new HashMap<>();
-        headers.put("User-Agent", Utils.CHROME);
-        headers.put("Referer", "https://www.aliyundrive.com/");
-        return headers;
-    }
-
-    private HashMap<String, String> getAuthHeader() {
-        HashMap<String, String> headers = getHeaders();
-        headers.put("authorization", auth.getAccessToken());
-        headers.put("x-share-token", auth.getShareToken());
-        return headers;
-    }
-
-    private String post(String url, JSONObject body) {
-        url = url.startsWith("https") ? url : "https://api.aliyundrive.com/" + url;
-        return OkHttp.postJson(url, body.toString(), getHeaders());
-    }
-
-    private String postAuth(String url, JSONObject body) {
-        url = url.startsWith("https") ? url : "https://api.aliyundrive.com/" + url;
-        String result = OkHttp.postJson(url, body.toString(), getAuthHeader());
-        if (check401(result)) return postAuth(url, body);
-        return result;
-    }
-
-    private boolean check401(String result) {
-        if (result.contains("AccessTokenInvalid")) return refreshAccessToken();
-        if (result.contains("ShareLinkTokenInvalid")) return refreshShareToken();
-        if (result.contains("InvalidParameterNotMatch")) return refreshShareToken();
-        return false;
     }
 
+    @Override
     public String detailContent(List<String> ids) throws Exception {
         String url = ids.get(0).trim();
         Matcher matcher = pattern.matcher(url);
         if (!matcher.find()) return "";
         String shareId = matcher.group(1);
         String fileId = matcher.groupCount() == 3 ? matcher.group(3) : "";
-        auth.setShareId(shareId);
+        API.get().setShareId(shareId);
-        refreshShareToken();
+        return Result.string(API.get().getVod(url, fileId));
-        return Result.string(getVod(url, fileId));
     }
 
-    public String playerContent(String flag, String id) {
+    @Override
+    public String playerContent(String flag, String id, List<String> vipFlags) {
+        API.get().checkAccessToken();
         String[] ids = id.split("\\+");
-        if (auth.isEmpty()) refreshAccessToken();
         if (flag.equals("原畫")) {
-            return Result.get().url(getDownloadUrl(ids[0])).subs(getSub(ids)).header(getHeaders()).string();
+            return Result.get().url(API.get().getDownloadUrl(ids[0])).subs(API.get().getSub(ids)).header(API.get().getHeader()).parse(0).string();
         } else {
-            return Result.get().url(getPreviewUrl(ids[0])).subs(getSub(ids)).header(getHeaders()).string();
+            return Result.get().url(API.get().getPreviewUrl(ids[0])).subs(API.get().getSub(ids)).header(API.get().getHeader()).parse(0).string();
         }
     }
 
-    private Vod getVod(String url, String fileId) throws Exception {
+    public static Object[] vod(Map<String, String> params) {
-        JSONObject body = new JSONObject();
+        String type = params.get("type");
-        body.put("share_id", auth.getShareId());
+        if (type.equals("sub")) return API.get().proxySub(params);
-        String json = post("adrive/v3/share_link/get_share_by_anonymous", body);
+        if (type.equals("m3u8")) return API.get().proxyM3U8(params);
-        JSONObject object = new JSONObject(json);
+        if (type.equals("media")) return API.get().proxyMedia(params);
-        List<Item> files = new ArrayList<>();
+        return null;
-        LinkedHashMap<String, List<String>> subMap = new LinkedHashMap<>();
-        listFiles(new Item(getParentFileId(fileId, object)), files, subMap);
-        List<String> playUrls = new ArrayList<>();
-        for (Item file : files) playUrls.add(Trans.get(file.getDisplayName()) + "$" + file.getFileId() + findSubs(file.getName(), subMap));
-        List<String> sourceUrls = new ArrayList<>();
-        sourceUrls.add(TextUtils.join("#", playUrls));
-        sourceUrls.add(TextUtils.join("#", playUrls));
-        Vod vod = new Vod();
-        vod.setVodId(url);
-        vod.setVodContent(url);
-        vod.setVodPic(object.getString("avatar"));
-        vod.setVodName(object.getString("share_name"));
-        vod.setVodPlayUrl(TextUtils.join("$$$", sourceUrls));
-        vod.setVodPlayFrom("原畫$$$普畫");
-        vod.setTypeName("阿里雲盤");
-        return vod;
-    }
-
-    private void listFiles(Item folder, List<Item> files, LinkedHashMap<String, List<String>> subMap) throws Exception {
-        listFiles(folder, files, subMap, "");
-    }
-
-    private void listFiles(Item parent, List<Item> files, LinkedHashMap<String, List<String>> subMap, String marker) throws Exception {
-        JSONObject body = new JSONObject();
-        List<Item> folders = new ArrayList<>();
-        body.put("limit", 200);
-        body.put("share_id", auth.getShareId());
-        body.put("parent_file_id", parent.getFileId());
-        body.put("order_by", "name");
-        body.put("order_direction", "ASC");
-        if (marker.length() > 0) body.put("marker", marker);
-        Item item = Item.objectFrom(postAuth("adrive/v3/file/list", body));
-        for (Item file : item.getItems()) {
-            if (file.getType().equals("folder")) {
-                folders.add(file);
-            } else if (file.getCategory().equals("video") || file.getCategory().equals("audio")) {
-                files.add(file.parent(parent.getName()));
-            } else if (Utils.isSub(file.getExt())) {
-                String key = file.removeExt();
-                if (!subMap.containsKey(key)) subMap.put(key, new ArrayList<>());
-                subMap.get(key).add(key + "@@@" + file.getExt() + "@@@" + file.getFileId());
-            }
-        }
-        if (item.getNextMarker().length() > 0) {
-            listFiles(parent, files, subMap, item.getNextMarker());
-        }
-        for (Item folder : folders) {
-            listFiles(folder, files, subMap);
-        }
-    }
-
-    private String getParentFileId(String fileId, JSONObject shareInfo) throws Exception {
-        JSONArray array = shareInfo.getJSONArray("file_infos");
-        if (!TextUtils.isEmpty(fileId)) return fileId;
-        if (array.length() == 0) return "";
-        JSONObject fileInfo = array.getJSONObject(0);
-        if (fileInfo.getString("type").equals("folder")) return fileInfo.getString("file_id");
-        if (fileInfo.getString("type").equals("file") && fileInfo.getString("category").equals("video")) return "root";
-        return "";
-    }
-
-    private boolean refreshAccessToken() {
-        try {
-            JSONObject body = new JSONObject();
-            String token = auth.getRefreshToken();
-            if (token.startsWith("http")) token = OkHttp.string(token).replaceAll("[^A-Za-z0-9]", "");
-            body.put("refresh_token", token);
-            body.put("grant_type", "refresh_token");
-            JSONObject object = new JSONObject(post("https://auth.aliyundrive.com/v2/account/token", body));
-            auth.setAccessToken(object.getString("token_type") + " " + object.getString("access_token"));
-            auth.setRefreshToken(object.getString("refresh_token"));
-            return true;
-        } catch (Exception e) {
-            stopService();
-            auth.clean();
-            getQRCode();
-            return true;
-        } finally {
-            while (auth.isEmpty()) SystemClock.sleep(250);
-        }
-    }
-
-    private boolean refreshShareToken() {
-        try {
-            JSONObject body = new JSONObject();
-            body.put("share_id", auth.getShareId());
-            body.put("share_pwd", "");
-            JSONObject object = new JSONObject(post("v2/share_link/get_share_token", body));
-            auth.setShareToken(object.getString("share_token"));
-            return true;
-        } catch (Exception e) {
-            Init.show("來晚啦，該分享已失效。");
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    private String findSubs(String name, Map<String, List<String>> subMap) {
-        name = name.substring(0, name.lastIndexOf("."));
-        List<String> subs = subMap.get(name);
-        if (subs != null && subs.size() > 0) return combineSubs(subs);
-        StringBuilder sb = new StringBuilder();
-        for (Map.Entry<String, List<String>> entry : subMap.entrySet()) sb.append(combineSubs(entry.getValue()));
-        return sb.toString();
-    }
-
-    private String combineSubs(List<String> subs) {
-        StringBuilder sb = new StringBuilder();
-        for (String sub : subs) sb.append("+").append(sub);
-        return sb.toString();
-    }
-
-    private List<Sub> getSub(String[] ids) {
-        List<Sub> sub = new ArrayList<>();
-        for (String text : ids) {
-            if (!text.contains("@@@")) continue;
-            String[] split = text.split("@@@");
-            String name = split[0];
-            String ext = split[1];
-            String url = Proxy.getUrl() + "?do=ali&type=sub" + "&file_id=" + split[2];
-            sub.add(Sub.create().name(name).ext(ext).url(url));
-        }
-        return sub;
-    }
-
-    private String getPreviewQuality(JSONArray taskList) throws Exception {
-        for (String templateId : Arrays.asList("FHD", "HD", "SD", "LD")) {
-            for (int i = 0; i < taskList.length(); ++i) {
-                JSONObject task = taskList.getJSONObject(i);
-                if (task.getString("template_id").equals(templateId)) {
-                    return task.getString("url");
-                }
-            }
-        }
-        return taskList.getJSONObject(0).getString("url");
-    }
-
-    private String getPreviewUrl(String fileId) {
-        try {
-            JSONObject body = new JSONObject();
-            body.put("file_id", fileId);
-            body.put("share_id", auth.getShareId());
-            body.put("template_id", "");
-            body.put("category", "live_transcoding");
-            String json = postAuth("v2/file/get_share_link_video_preview_play_info", body);
-            JSONArray taskList = new JSONObject(json).getJSONObject("video_preview_play_info").getJSONArray("live_transcoding_task_list");
-            Map<String, List<String>> respHeaders = new HashMap<>();
-            OkHttp.stringNoRedirect(getPreviewQuality(taskList), getHeaders(), respHeaders);
-            return OkHttp.getRedirectLocation(respHeaders);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "";
-        }
-    }
-
-    private String getDownloadUrl(String fileId) {
-        try {
-            JSONObject body = new JSONObject();
-            body.put("file_id", fileId);
-            body.put("share_id", auth.getShareId());
-            body.put("expire_sec", 600);
-            String json = postAuth("v2/file/get_share_link_download_url", body);
-            String url = new JSONObject(json).optString("download_url");
-            Map<String, List<String>> respHeaders = new HashMap<>();
-            OkHttp.stringNoRedirect(url, getHeaders(), respHeaders);
-            return OkHttp.getRedirectLocation(respHeaders);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "";
-        }
-    }
-
-    public Object[] vod(Map<String, String> params) {
-        String fileId = params.get("file_id");
-        String text = OkHttp.string(getDownloadUrl(fileId), getAuthHeader());
-        Object[] result = new Object[3];
-        result[0] = 200;
-        result[1] = "application/octet-stream";
-        result[2] = new ByteArrayInputStream(text.getBytes());
-        return result;
-    }
-
-    private void getQRCode() {
-        Data data = Data.objectFrom(OkHttp.string("https://passport.aliyundrive.com/newlogin/qrcode/generate.do?appName=aliyun_drive&fromSite=52&appName=aliyun_drive&appEntrance=web&isMobile=false&lang=zh_CN&returnUrl=&bizParams=&_bx-v=2.2.3")).getContent().getData();
-        Init.run(() -> showQRCode(data));
-    }
-
-    private void showQRCode(Data data) {
-        try {
-            FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(Utils.dp2px(240), Utils.dp2px(240));
-            ImageView image = new ImageView(Init.context());
-            image.setScaleType(ImageView.ScaleType.CENTER_CROP);
-            image.setImageBitmap(QRCode.getBitmap(data.getCodeContent(), 240, 2));
-            FrameLayout frame = new FrameLayout(Init.context());
-            params.gravity = Gravity.CENTER;
-            frame.addView(image, params);
-            dialog = new AlertDialog.Builder(Init.getActivity()).setView(frame).setOnDismissListener(this::dismiss).show();
-            dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-            Init.execute(() -> startService(data.getParams()));
-            Init.show("請使用阿里雲盤 App 掃描二維碼");
-        } catch (Exception ignored) {
-        }
-    }
-
-    private void startService(Map<String, String> params) {
-        service = Executors.newScheduledThreadPool(1);
-        service.scheduleAtFixedRate(() -> {
-            Data result = Data.objectFrom(OkHttp.post("https://passport.aliyundrive.com/newlogin/qrcode/query.do?appName=aliyun_drive&fromSite=52&_bx-v=2.2.3", params)).getContent().getData();
-            if (result.hasToken()) setToken(result.getToken());
-        }, 1, 1, TimeUnit.SECONDS);
-    }
-
-    private void setToken(String value) {
-        Prefers.put("token", value);
-        Init.show("請重新進入播放頁");
-        auth.setRefreshToken(value);
-        stopService();
-    }
-
-    private void stopService() {
-        if (service != null) service.shutdownNow();
-        Init.run(this::dismiss);
-    }
-
-    private void dismiss(DialogInterface dialog) {
-        stopService();
-    }
-
-    private void dismiss() {
-        try {
-            if (dialog != null) dialog.dismiss();
-        } catch (Exception ignored) {
-        }
     }
 }

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

@@ -4,7 +4,6 @@ import android.content.Context;
 
 import com.github.catvod.bean.Result;
 import com.github.catvod.bean.Vod;
-import com.github.catvod.crawler.Spider;
 import com.github.catvod.net.OkHttp;
 import com.github.catvod.utils.Utils;
 
@@ -22,7 +21,7 @@ import java.util.Map;
 /**
  * @author ColaMint & FongMi
  */
-public class PanSou extends Spider {
+public class PanSou extends Ali {
 
     private final String siteUrl = "https://www.alipansou.com";
 
@@ -36,17 +35,17 @@ public class PanSou extends Spider {
 
     @Override
     public void init(Context context, String extend) {
-        Ali.get().init(extend);
+        super.init(context, extend);
     }
 
     @Override
     public String detailContent(List<String> ids) throws Exception {
-        if (Ali.pattern.matcher(ids.get(0)).find()) return Ali.get().detailContent(ids);
+        if (pattern.matcher(ids.get(0)).find()) return super.detailContent(ids);
         String url = siteUrl + ids.get(0).replace("/s/", "/cv/");
         Map<String, List<String>> respHeaders = new HashMap<>();
         OkHttp.stringNoRedirect(url, getHeaders(ids.get(0)), respHeaders);
         url = OkHttp.getRedirectLocation(respHeaders);
-        return Ali.get().detailContent(Arrays.asList(url));
+        return super.detailContent(Arrays.asList(url));
     }
 
     @Override
@@ -72,9 +71,4 @@ public class PanSou extends Spider {
         }
         return Result.string(list);
     }
-
-    @Override
-    public String playerContent(String flag, String id, List<String> vipFlags) {
-        return Ali.get().playerContent(flag, id);
-    }
 }

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

@@ -7,7 +7,6 @@ import com.github.catvod.bean.Filter;
 import com.github.catvod.bean.Result;
 import com.github.catvod.bean.Vod;
 import com.github.catvod.bean.paper.Data;
-import com.github.catvod.crawler.Spider;
 import com.github.catvod.net.OkHttp;
 import com.github.catvod.utils.Utils;
 
@@ -27,7 +26,7 @@ import java.util.Map;
 /**
  * @author ColaMint & FongMi
  */
-public class Paper extends Spider {
+public class Paper extends Ali {
 
     private final String url = "https://gitcafe.net/alipaper/";
     private final String api = "https://gitcafe.net/tool/alipaper/";
@@ -41,8 +40,8 @@ public class Paper extends Spider {
 
     @Override
     public void init(Context context, String extend) {
+        super.init(context, extend);
         types = Arrays.asList("hyds", "rhds", "omds", "qtds", "hydy", "rhdy", "omdy", "qtdy", "hydm", "rhdm", "omdm", "jlp", "zyp", "jypx", "qtsp");
-        Ali.get().init(extend);
     }
 
     @Override
@@ -90,11 +89,6 @@ public class Paper extends Spider {
         return Result.string(list);
     }
 
-    @Override
-    public String detailContent(List<String> ids) throws Exception {
-        return Ali.get().detailContent(ids);
-    }
-
     @Override
     public String searchContent(String key, boolean quick) {
         List<Vod> list = new ArrayList<>();
@@ -105,9 +99,4 @@ public class Paper extends Spider {
         for (Data item : Data.arrayFrom(result)) if (types.contains(item.getCat()) && item.getTitle().contains(key)) list.add(item.getVod());
         return Result.string(list);
     }
-
-    @Override
-    public String playerContent(String flag, String id, List<String> vipFlags) throws Exception {
-        return Ali.get().playerContent(flag, id);
-    }
 }

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

@@ -18,7 +18,7 @@ public class Proxy extends Spider {
             case "ck":
                 return new Object[]{200, "text/plain; charset=utf-8", new ByteArrayInputStream("ok".getBytes("UTF-8"))};
             case "ali":
-                return Ali.get().vod(params);
+                return Ali.vod(params);
             default:
                 return null;
         }

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

@@ -5,44 +5,40 @@ import android.text.TextUtils;
 
 import com.github.catvod.bean.Result;
 import com.github.catvod.bean.Vod;
-import com.github.catvod.crawler.Spider;
 
 import java.util.Arrays;
 import java.util.List;
 
-public class Push extends Spider {
+public class Push extends Ali {
 
     @Override
     public void init(Context context, String extend) {
-        Ali.get().init(extend);
+        super.init(context, extend);
     }
 
     @Override
     public String detailContent(List<String> ids) throws Exception {
         String url = ids.get(0).trim();
-        if (url.contains("aliyundrive")) return Ali.get().detailContent(ids);
+        if (url.contains("aliyundrive")) return super.detailContent(ids);
-        List<String> playFrom = Arrays.asList("直連", "嗅探", "解析");
+        return Result.string(vod(url));
-        List<String> playUrl = Arrays.asList("播放$" + url, "播放$" + url, "播放$" + url);
-        Vod vod = create(url);
-        vod.setVodPlayFrom(TextUtils.join("$$$", playFrom));
-        vod.setVodPlayUrl(TextUtils.join("$$$", playUrl));
-        return Result.string(vod);
     }
 
     @Override
     public String playerContent(String flag, String id, List<String> vipFlags) {
-        if (flag.contains("畫")) return Ali.get().playerContent(flag, id);
+        if (flag.contains("畫")) return super.playerContent(flag, id, vipFlags);
         if (flag.equals("嗅探")) return Result.get().parse().url(id).string();
         if (flag.equals("解析")) return Result.get().parse().jx().url(id).string();
         return Result.get().url(id).string();
     }
 
-    private Vod create(String url) {
+    private Vod vod(String url) {
         Vod vod = new Vod();
-        vod.setTypeName("FongMi");
         vod.setVodId(url);
         vod.setVodName(url);
+        vod.setTypeName("FongMi");
         vod.setVodPic("https://pic.rmb.bdstatic.com/bjh/1d0b02d0f57f0a42201f92caba5107ed.jpeg");
+        vod.setVodPlayFrom(TextUtils.join("$$$", Arrays.asList("直連", "嗅探", "解析")));
+        vod.setVodPlayUrl(TextUtils.join("$$$", Arrays.asList("播放$" + url, "播放$" + url, "播放$" + url)));
         return vod;
     }
 }

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

@@ -1,56 +1,48 @@
 package com.github.catvod.spider;
 
 import android.content.Context;
-import android.util.Base64;
 
 import com.github.catvod.bean.Result;
 import com.github.catvod.bean.Vod;
 import com.github.catvod.bean.upyun.Data;
 import com.github.catvod.bean.upyun.Item;
-import com.github.catvod.crawler.Spider;
 import com.github.catvod.net.OkHttp;
-import com.github.catvod.utils.Utils;
+import com.google.common.io.BaseEncoding;
 
 import java.net.URLEncoder;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
-public class UpYun extends Spider {
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
 
-    private final String siteUrl = "https://www.upyunso.com/";
+public class UpYun extends Ali {
-    private final String apiUrl = "https://api.upyunso2.com/";
-
-    private Map<String, String> getHeaders() {
-        HashMap<String, String> headers = new HashMap<>();
-        headers.put("User-Agent", Utils.CHROME);
-        headers.put("Referer", siteUrl);
-        return headers;
-    }
 
     @Override
     public void init(Context context, String extend) {
-        Ali.get().init(extend);
+        super.init(context, extend);
     }
 
     @Override
-    public String detailContent(List<String> ids) throws Exception {
+    public String searchContent(String key, boolean quick) throws Exception {
-        return Ali.get().detailContent(Arrays.asList(ids.get(0)));
+        String res = decode(OkHttp.string("https://zyb.upyunso.com/v15/search?keyword=" + URLEncoder.encode(key) + "&page=1&s_type=2"));
-    }
-
-    @Override
-    public String searchContent(String key, boolean quick) {
-        String url = apiUrl + "search?keyword=" + URLEncoder.encode(key) + "&page=1&s_type=2";
-        String res = new String(Base64.decode(OkHttp.string(url, getHeaders()), Base64.DEFAULT));
         List<Vod> list = new ArrayList<>();
-        for (Item item : Data.objectFrom(res).getResult().getItems()) if (item.isAli() && item.getTitle().contains(key)) list.add(item.getVod());
+        for (Item item : Data.objectFrom(res).getResult().getItems()) {
+            String url = decode(item.getPageUrl());
+            if (!url.contains("www.aliyundrive.com")) continue;
+            if (item.getTitle().contains(key)) list.add(item.url(url).getVod());
+        }
         return Result.string(list);
     }
 
-    @Override
+    private String decode(String data) throws Exception {
-    public String playerContent(String flag, String id, List<String> vipFlags) {
+        SecretKeySpec keySpec = new SecretKeySpec("qq1920520460qqzz".getBytes(), "AES");
-        return Ali.get().playerContent(flag, id);
+        IvParameterSpec ivSpec = new IvParameterSpec("qq1920520460qqzz".getBytes());
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        cipher.init(Cipher.DECRYPT_MODE, keySpec, ivSpec);
+        byte[] encryptDataBytes = BaseEncoding.base16().decode(data.toUpperCase());
+        byte[] decryptData = cipher.doFinal(encryptDataBytes);
+        return new String(decryptData, "UTF-8");
     }
 }

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

@@ -8,31 +8,19 @@ import android.webkit.WebViewClient;
 
 import com.github.catvod.bean.Result;
 import com.github.catvod.bean.yiso.Item;
-import com.github.catvod.crawler.Spider;
 import com.github.catvod.utils.Utils;
 import com.google.gson.JsonParser;
 
 import java.net.URLEncoder;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-public class YiSo extends Spider {
+public class YiSo extends Ali {
 
     @Override
     public void init(Context context, String extend) {
-        Ali.get().init(extend);
+        super.init(context, extend);
-    }
-
-    @Override
-    public String detailContent(List<String> ids) throws Exception {
-        return Ali.get().detailContent(ids);
-    }
-
-    @Override
-    public String playerContent(String flag, String id, List<String> vipFlags) throws Exception {
-        return Ali.get().playerContent(flag, id);
     }
 
     @Override

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

@@ -4,7 +4,6 @@ import android.content.Context;
 
 import com.github.catvod.bean.Result;
 import com.github.catvod.bean.Vod;
-import com.github.catvod.crawler.Spider;
 import com.github.catvod.net.OkHttp;
 import com.github.catvod.utils.Utils;
 
@@ -21,7 +20,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class Zhaozy extends Spider {
+public class Zhaozy extends Ali {
 
     private final Pattern regexAli = Pattern.compile("(https://www.aliyundrive.com/s/[^\"]+)");
     private final Pattern regexVid = Pattern.compile("(\\S+)");
@@ -55,24 +54,19 @@ public class Zhaozy extends Spider {
     @Override
     public void init(Context context, String extend) {
         String[] split = extend.split("\\$\\$\\$");
-        Ali.get().init(split[0]);
+        super.init(context, split[0]);
         username = split[1];
         password = split[2];
     }
 
     @Override
     public String detailContent(List<String> ids) throws Exception {
-        if (Ali.pattern.matcher(ids.get(0)).find()) return Ali.get().detailContent(ids);
+        if (pattern.matcher(ids.get(0)).find()) return super.detailContent(ids);
         Matcher matcher = regexAli.matcher(OkHttp.string(siteUrl + ids.get(0), getHeader()));
-        if (matcher.find()) return Ali.get().detailContent(Arrays.asList(matcher.group(1)));
+        if (matcher.find()) return super.detailContent(Arrays.asList(matcher.group(1)));
         return "";
     }
 
-    @Override
-    public String playerContent(String flag, String id, List<String> vipFlags) throws Exception {
-        return Ali.get().playerContent(flag, id);
-    }
-
     @Override
     public String searchContent(String key, boolean quick) throws Exception {
         String url = siteUrl + "so?filename=" + URLEncoder.encode(key);

gradle.properties

@@ -18,4 +18,5 @@ android.useAndroidX=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+appId=5dde4e1bdf9e4966b387ba58f4b3fdc3

jar/custom_spider.jar.md5

@@ -1 +1 @@
-c8bba231546a63b3431cf31e5d856794
+69ef6396eb2400c03529c7714d96841a

json/adult.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;c8bba231546a63b3431cf31e5d856794",
+  "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;69ef6396eb2400c03529c7714d96841a",
   "wallpaper": "https://gao.chuqiuyu.tk",
   "lives": [
     {

json/config.json

@@ -1,9 +1,16 @@
 {
-  "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;c8bba231546a63b3431cf31e5d856794",
+  "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;69ef6396eb2400c03529c7714d96841a",
   "wallpaper": "http://www.kf666888.cn/api/tvbox/img",
   "lives": [
     {
-      "name": "直播",
+      "name": "TXT",
+      "type": 0,
+      "url": "http://home.jundie.top:81/Cat/tv/live.txt",
+      "epg": "http://epg.51zmt.top:8000/api/diyp/?ch={name}&date={date}",
+      "logo": "https://epg.112114.xyz/logo/{name}.png"
+    },
+    {
+      "name": "Json",
       "type": 1,
       "url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/live.json",
       "epg": "http://epg.51zmt.top:8000/api/diyp/?ch={epg}&date={date}",