Update ali

This commit is contained in:
FongMi 2022-09-30 16:51:42 +08:00
parent 67200861bf
commit 44d8e15288
9 changed files with 80 additions and 16 deletions

1
.gitignore vendored
View File

@ -2,4 +2,5 @@
.idea .idea
*build *build
*.jks *.jks
Nbys.java
/local.properties /local.properties

View File

@ -64,10 +64,6 @@ public class Vod {
this.vodId = vodId; this.vodId = vodId;
} }
public String getVodName() {
return vodName;
}
public void setVodName(String vodName) { public void setVodName(String vodName) {
this.vodName = Trans.get(vodName); this.vodName = Trans.get(vodName);
} }

View File

@ -12,6 +12,7 @@ public class MainActivity extends Activity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
new Thread(() -> { new Thread(() -> {
}).start(); }).start();
} }
} }

View File

@ -33,7 +33,7 @@ public class Ali {
private static String accessToken; private static String accessToken;
public Ali(String token) { 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); if (token.startsWith("http")) token = OkHttpUtil.string(token);
refreshToken = token; refreshToken = token;
} }
@ -75,7 +75,7 @@ public class Ali {
String sub = getSub(shareId, shareToken, ids); String sub = getSub(shareId, shareToken, ids);
refreshAccessToken(); refreshAccessToken();
if (TextUtils.isEmpty(accessToken)) return ""; if (TextUtils.isEmpty(accessToken)) return "";
if (flag.contains("原畫")) { if (flag.equals("原畫")) {
return Result.get().url(getDownloadUrl(shareId, shareToken, fileId)).sub(sub).header(getHeaders()).string(); return Result.get().url(getDownloadUrl(shareId, shareToken, fileId)).sub(sub).header(getHeaders()).string();
} else { } else {
return Result.get().url(getPreviewUrl(shareId, shareToken, fileId)).sub(sub).header(getHeaders()).string(); 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.setVodPic(object.getString("avatar"));
vod.setVodName(object.getString("share_name")); vod.setVodName(object.getString("share_name"));
vod.setVodPlayUrl(TextUtils.join("$$$", sourceUrls)); vod.setVodPlayUrl(TextUtils.join("$$$", sourceUrls));
vod.setVodPlayFrom("AliYun$$$AliYun原"); vod.setVodPlayFrom("原畫$$$普");
vod.setTypeName("阿里雲盤"); vod.setTypeName("阿里雲盤");
return vod; return vod;
} }
@ -169,7 +169,7 @@ public class Ali {
JSONObject object = new JSONObject(post("token/refresh", body)); JSONObject object = new JSONObject(post("token/refresh", body));
accessToken = object.getString("token_type") + " " + object.getString("access_token"); accessToken = object.getString("token_type") + " " + object.getString("access_token");
} catch (JSONException e) { } catch (JSONException e) {
Init.show("阿里Token已失效"); Init.show("Token 已失效");
e.printStackTrace(); e.printStackTrace();
} }
} }

View File

@ -31,7 +31,7 @@ public class Push extends Spider {
@Override @Override
public String playerContent(String flag, String id, List<String> vipFlags) { public String playerContent(String flag, String id, List<String> 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().parse().jx().url(id).string();
if (flag.equals("直連")) return Result.get().url(id).string(); if (flag.equals("直連")) return Result.get().url(id).string();
return Result.get().parse().url(id).string(); return Result.get().parse().url(id).string();

Binary file not shown.

View File

@ -1 +1 @@
ff678226422bf7377f15b573bb0ee0e0 debe17d2daafb0cc953ddb0034e1fa12

View File

@ -1,5 +1,5 @@
{ {
"spider": "https://raw.githubusercontents.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;ff678226422bf7377f15b573bb0ee0e0", "spider": "https://raw.githubusercontents.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;debe17d2daafb0cc953ddb0034e1fa12",
"sites": [ "sites": [
{ {
"key": "AList", "key": "AList",
@ -10,6 +10,14 @@
"filterable": 1, "filterable": 1,
"ext": "9T$https://drive.9t.ee#木偶$https://www.kugutsu.ml" "ext": "9T$https://drive.9t.ee#木偶$https://www.kugutsu.ml"
}, },
{
"key": "泥巴",
"name": "泥巴",
"type": 3,
"api": "csp_Nbys",
"searchable": 1,
"filterable": 1
},
{ {
"key": "朱古力", "key": "朱古力",
"name": "朱古力", "name": "朱古力",

View File

@ -1,6 +1,15 @@
{ {
"spider": "https://raw.githubusercontents.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;ff678226422bf7377f15b573bb0ee0e0", "spider": "https://raw.githubusercontents.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;debe17d2daafb0cc953ddb0034e1fa12",
"sites": [ "sites": [
{
"key": "AList",
"name": "AList",
"type": 3,
"api": "csp_AList",
"searchable": 1,
"quickSearch": 1,
"ext": "https://raw.githubusercontents.com/FongMi/CatVodSpider/main/json/alist.json"
},
{ {
"key": "哔哩", "key": "哔哩",
"name": "哔哩", "name": "哔哩",
@ -11,13 +20,62 @@
"ext": "https://raw.githubusercontents.com/FongMi/CatVodSpider/main/json/bili.json" "ext": "https://raw.githubusercontents.com/FongMi/CatVodSpider/main/json/bili.json"
}, },
{ {
"key": "AList", "key": "泥巴",
"name": "AList", "name": "泥巴",
"type": 3, "type": 3,
"api": "csp_AList", "api": "csp_Nbys",
"searchable": 1,
"filterable": 1
},
{
"key": "快播",
"name": "快播",
"type": 1,
"api": "https://www.kuaibozy.com/api.php/provide/vod/",
"searchable": 1, "searchable": 1,
"quickSearch": 1, "quickSearch": 1,
"ext": "https://raw.githubusercontents.com/FongMi/CatVodSpider/main/json/alist.json" "filterable": 0,
"categories": [
"动漫",
"国产剧",
"日韩剧",
"港台剧",
"欧美剧",
"泰剧",
"动作片",
"喜剧片",
"爱情片",
"科幻片",
"恐怖片",
"剧情片",
"战争片",
"纪录片",
"综艺"
]
},
{
"key": "百度",
"name": "百度",
"type": 1,
"api": "https://api.apibdzy.com/api.php/provide/vod?ac=list",
"searchable": 1,
"quickSearch": 1,
"filterable": 0,
"categories": [
"国产动漫",
"日韩动漫",
"大陆剧",
"欧美剧",
"韩剧",
"日剧",
"动作片",
"喜剧片",
"爱情片",
"科幻片",
"恐怖片",
"剧情片",
"战争片"
]
}, },
{ {
"key": "櫻花", "key": "櫻花",