网盘bug
This commit is contained in:
parent
8365ff3c2e
commit
50727ca14e
|
|
@ -12,6 +12,7 @@ import android.view.ViewGroup;
|
||||||
import android.widget.EditText;
|
import android.widget.EditText;
|
||||||
import android.widget.FrameLayout;
|
import android.widget.FrameLayout;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
|
|
||||||
import com.github.catvod.bean.Result;
|
import com.github.catvod.bean.Result;
|
||||||
import com.github.catvod.bean.Vod;
|
import com.github.catvod.bean.Vod;
|
||||||
import com.github.catvod.bean.quark.Cache;
|
import com.github.catvod.bean.quark.Cache;
|
||||||
|
|
@ -25,6 +26,7 @@ import com.github.catvod.spider.Init;
|
||||||
import com.github.catvod.spider.Proxy;
|
import com.github.catvod.spider.Proxy;
|
||||||
import com.github.catvod.utils.*;
|
import com.github.catvod.utils.*;
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
|
|
@ -163,8 +165,12 @@ public class QuarkApi {
|
||||||
List<Map<String, Object>> listData = listFile(1, shareData, files, subs, shareData.getShareId(), shareData.getFolderId(), 1);
|
List<Map<String, Object>> listData = listFile(1, shareData, files, subs, shareData.getShareId(), shareData.getFolderId(), 1);
|
||||||
|
|
||||||
List<String> playFrom = QuarkApi.get().getPlayFormatList();
|
List<String> playFrom = QuarkApi.get().getPlayFormatList();
|
||||||
playFrom = new ArrayList<>(playFrom);
|
|
||||||
playFrom.add("原画");
|
List<String> playFromtmp = new ArrayList<>();
|
||||||
|
playFromtmp.add("quark原画");
|
||||||
|
for (String s : playFrom) {
|
||||||
|
playFromtmp.add("quark" + s);
|
||||||
|
}
|
||||||
|
|
||||||
List<String> playUrl = new ArrayList<>();
|
List<String> playUrl = new ArrayList<>();
|
||||||
|
|
||||||
|
|
@ -190,7 +196,7 @@ public class QuarkApi {
|
||||||
vod.setVodPic("");
|
vod.setVodPic("");
|
||||||
vod.setVodName("");
|
vod.setVodName("");
|
||||||
vod.setVodPlayUrl(TextUtils.join("$$$", playUrl));
|
vod.setVodPlayUrl(TextUtils.join("$$$", playUrl));
|
||||||
vod.setVodPlayFrom(TextUtils.join("$$$", playFrom));
|
vod.setVodPlayFrom(TextUtils.join("$$$", playFromtmp));
|
||||||
vod.setTypeName("夸克云盘");
|
vod.setTypeName("夸克云盘");
|
||||||
return vod;
|
return vod;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ import android.view.ViewGroup;
|
||||||
import android.widget.EditText;
|
import android.widget.EditText;
|
||||||
import android.widget.FrameLayout;
|
import android.widget.FrameLayout;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
|
|
||||||
import com.github.catvod.bean.Result;
|
import com.github.catvod.bean.Result;
|
||||||
import com.github.catvod.bean.Vod;
|
import com.github.catvod.bean.Vod;
|
||||||
import com.github.catvod.bean.uc.Cache;
|
import com.github.catvod.bean.uc.Cache;
|
||||||
|
|
@ -25,6 +26,7 @@ import com.github.catvod.spider.Init;
|
||||||
import com.github.catvod.spider.Proxy;
|
import com.github.catvod.spider.Proxy;
|
||||||
import com.github.catvod.utils.*;
|
import com.github.catvod.utils.*;
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
|
|
||||||
import org.apache.commons.lang3.RandomUtils;
|
import org.apache.commons.lang3.RandomUtils;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
|
|
@ -38,6 +40,7 @@ import java.util.concurrent.ScheduledExecutorService;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
public class UCApi {
|
public class UCApi {
|
||||||
private String apiUrl = "https://pc-api.uc.cn/1/clouddrive/";
|
private String apiUrl = "https://pc-api.uc.cn/1/clouddrive/";
|
||||||
|
|
@ -173,9 +176,11 @@ public class UCApi {
|
||||||
List<Map<String, Object>> listData = listFile(1, shareData, files, subs, shareData.getShareId(), shareData.getFolderId(), 1);
|
List<Map<String, Object>> listData = listFile(1, shareData, files, subs, shareData.getShareId(), shareData.getFolderId(), 1);
|
||||||
|
|
||||||
List<String> playFrom = UCApi.get().getPlayFormatList();
|
List<String> playFrom = UCApi.get().getPlayFormatList();
|
||||||
playFrom = new ArrayList<>(playFrom);
|
List<String> playFromtmp = new ArrayList<>();
|
||||||
playFrom.add("原画");
|
playFromtmp.add("uc原画");
|
||||||
|
for (String s : playFrom) {
|
||||||
|
playFromtmp.add("uc" + s);
|
||||||
|
}
|
||||||
List<String> playUrl = new ArrayList<>();
|
List<String> playUrl = new ArrayList<>();
|
||||||
|
|
||||||
if (files.isEmpty()) {
|
if (files.isEmpty()) {
|
||||||
|
|
@ -200,7 +205,7 @@ public class UCApi {
|
||||||
vod.setVodPic("");
|
vod.setVodPic("");
|
||||||
vod.setVodName("");
|
vod.setVodName("");
|
||||||
vod.setVodPlayUrl(TextUtils.join("$$$", playUrl));
|
vod.setVodPlayUrl(TextUtils.join("$$$", playUrl));
|
||||||
vod.setVodPlayFrom(TextUtils.join("$$$", playFrom));
|
vod.setVodPlayFrom(TextUtils.join("$$$", playFromtmp));
|
||||||
vod.setTypeName("uc云盘");
|
vod.setTypeName("uc云盘");
|
||||||
return vod;
|
return vod;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ import java.util.regex.Pattern;
|
||||||
*/
|
*/
|
||||||
public class Mogg extends Cloud {
|
public class Mogg extends Cloud {
|
||||||
|
|
||||||
private final String siteUrl = "https://www.mogg.top";
|
private final String siteUrl = "http://mogg.xn--yetu07f.top/";
|
||||||
private final Pattern regexCategory = Pattern.compile("index.php/vod/type/id/(\\w+).html");
|
private final Pattern regexCategory = Pattern.compile("index.php/vod/type/id/(\\w+).html");
|
||||||
private final Pattern regexPageTotal = Pattern.compile("\\$\\(\"\\.mac_total\"\\)\\.text\\('(\\d+)'\\);");
|
private final Pattern regexPageTotal = Pattern.compile("\\$\\(\"\\.mac_total\"\\)\\.text\\('(\\d+)'\\);");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ public class MoggTest {
|
||||||
@org.junit.Test
|
@org.junit.Test
|
||||||
public void detailContent() throws Exception {
|
public void detailContent() throws Exception {
|
||||||
|
|
||||||
String content = spider.detailContent(Arrays.asList("/index.php/vod/detail/id/851.html"));
|
String content = spider.detailContent(Arrays.asList("/index.php/vod/detail/id/141.html"));
|
||||||
System.out.println("detailContent--" + content);
|
System.out.println("detailContent--" + content);
|
||||||
|
|
||||||
JsonObject map = Json.safeObject(content);
|
JsonObject map = Json.safeObject(content);
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1 +1 @@
|
||||||
35df248493c0d078908026afe6258f9e
|
e02edfa3d8a0f70d558e40c18f1de5e8
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;35df248493c0d078908026afe6258f9e",
|
"spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;e02edfa3d8a0f70d558e40c18f1de5e8",
|
||||||
"lives": [
|
"lives": [
|
||||||
{
|
{
|
||||||
"name": "直播",
|
"name": "直播",
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;35df248493c0d078908026afe6258f9e",
|
"spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;e02edfa3d8a0f70d558e40c18f1de5e8",
|
||||||
"lives": [
|
"lives": [
|
||||||
{
|
{
|
||||||
"name": "直播ipv6",
|
"name": "直播ipv6",
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;35df248493c0d078908026afe6258f9e",
|
"spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;e02edfa3d8a0f70d558e40c18f1de5e8",
|
||||||
"lives": [
|
"lives": [
|
||||||
{
|
{
|
||||||
"name": "直播ipv6",
|
"name": "直播ipv6",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue