diff --git a/.gitignore b/.gitignore index 85ecde08..9d4c676a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ .idea *build *.jks +Nbys.java /local.properties \ No newline at end of file diff --git a/app/src/main/java/com/github/catvod/bean/Vod.java b/app/src/main/java/com/github/catvod/bean/Vod.java index ee75480e..097815af 100644 --- a/app/src/main/java/com/github/catvod/bean/Vod.java +++ b/app/src/main/java/com/github/catvod/bean/Vod.java @@ -64,10 +64,6 @@ public class Vod { this.vodId = vodId; } - public String getVodName() { - return vodName; - } - public void setVodName(String vodName) { this.vodName = Trans.get(vodName); } diff --git a/app/src/main/java/com/github/catvod/demo/MainActivity.java b/app/src/main/java/com/github/catvod/demo/MainActivity.java index 2a3de8c1..61a98f45 100644 --- a/app/src/main/java/com/github/catvod/demo/MainActivity.java +++ b/app/src/main/java/com/github/catvod/demo/MainActivity.java @@ -12,6 +12,7 @@ public class MainActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); new Thread(() -> { + }).start(); } } \ No newline at end of file diff --git a/app/src/main/java/com/github/catvod/spider/Ali.java b/app/src/main/java/com/github/catvod/spider/Ali.java index f0636a95..71aa4813 100644 --- a/app/src/main/java/com/github/catvod/spider/Ali.java +++ b/app/src/main/java/com/github/catvod/spider/Ali.java @@ -33,7 +33,7 @@ public class Ali { private static String accessToken; public Ali(String token) { - if (TextUtils.isEmpty(token)) Init.show("尚未設定阿里Token"); + if (TextUtils.isEmpty(token)) Init.show("尚未設定 Token"); if (token.startsWith("http")) token = OkHttpUtil.string(token); refreshToken = token; } @@ -75,7 +75,7 @@ public class Ali { String sub = getSub(shareId, shareToken, ids); refreshAccessToken(); if (TextUtils.isEmpty(accessToken)) return ""; - if (flag.contains("原畫")) { + if (flag.equals("原畫")) { return Result.get().url(getDownloadUrl(shareId, shareToken, fileId)).sub(sub).header(getHeaders()).string(); } else { return Result.get().url(getPreviewUrl(shareId, shareToken, fileId)).sub(sub).header(getHeaders()).string(); @@ -106,7 +106,7 @@ public class Ali { vod.setVodPic(object.getString("avatar")); vod.setVodName(object.getString("share_name")); vod.setVodPlayUrl(TextUtils.join("$$$", sourceUrls)); - vod.setVodPlayFrom("AliYun$$$AliYun原畫"); + vod.setVodPlayFrom("原畫$$$普畫"); vod.setTypeName("阿里雲盤"); return vod; } @@ -169,7 +169,7 @@ public class Ali { JSONObject object = new JSONObject(post("token/refresh", body)); accessToken = object.getString("token_type") + " " + object.getString("access_token"); } catch (JSONException e) { - Init.show("阿里Token已失效"); + Init.show("Token 已失效"); e.printStackTrace(); } } diff --git a/app/src/main/java/com/github/catvod/spider/Push.java b/app/src/main/java/com/github/catvod/spider/Push.java index 41ac260d..54e65a71 100644 --- a/app/src/main/java/com/github/catvod/spider/Push.java +++ b/app/src/main/java/com/github/catvod/spider/Push.java @@ -31,7 +31,7 @@ public class Push extends Spider { @Override public String playerContent(String flag, String id, List vipFlags) { - if (flag.contains("AliYun")) return ali.playerContent(flag, id); + if (flag.contains("畫")) return ali.playerContent(flag, id); if (flag.equals("官源")) return Result.get().parse().jx().url(id).string(); if (flag.equals("直連")) return Result.get().url(id).string(); return Result.get().parse().url(id).string(); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 8546e315..0e6511c0 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index a6d12e4f..2bd3c724 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -ff678226422bf7377f15b573bb0ee0e0 +debe17d2daafb0cc953ddb0034e1fa12