diff --git a/app/build.gradle b/app/build.gradle index 10b439d2..6e7f6fc9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,7 +39,6 @@ dependencies { implementation 'com.github.thegrizzlylabs:sardine-android:0.8' implementation 'com.google.net.cronet:cronet-okhttp:0.1.0' implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.10' - implementation 'androidx.annotation:annotation:1.5.0' implementation 'com.google.code.gson:gson:2.10.1' implementation 'cn.wanghaomiao:JsoupXpath:2.5.1' implementation 'com.google.zxing:core:3.4.1' diff --git a/app/src/main/java/com/github/catvod/bean/Result.java b/app/src/main/java/com/github/catvod/bean/Result.java index 5bdbd6cf..cbdff6af 100644 --- a/app/src/main/java/com/github/catvod/bean/Result.java +++ b/app/src/main/java/com/github/catvod/bean/Result.java @@ -1,7 +1,5 @@ package com.github.catvod.bean; -import androidx.annotation.NonNull; - import com.google.gson.Gson; import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; @@ -156,7 +154,6 @@ public class Result { return toString(); } - @NonNull @Override public String toString() { return new Gson().toJson(this); diff --git a/app/src/main/java/com/github/catvod/bean/ali/OAuth.java b/app/src/main/java/com/github/catvod/bean/ali/OAuth.java index 17712b27..88001aa2 100644 --- a/app/src/main/java/com/github/catvod/bean/ali/OAuth.java +++ b/app/src/main/java/com/github/catvod/bean/ali/OAuth.java @@ -2,8 +2,6 @@ package com.github.catvod.bean.ali; import android.text.TextUtils; -import androidx.annotation.NonNull; - import com.github.catvod.utils.Prefers; import com.google.gson.Gson; import com.google.gson.annotations.SerializedName; @@ -49,7 +47,6 @@ public class OAuth { return this; } - @NonNull @Override public String toString() { return new Gson().toJson(this); diff --git a/app/src/main/java/com/github/catvod/bean/ali/User.java b/app/src/main/java/com/github/catvod/bean/ali/User.java index 3d2a6afd..3dfd9250 100644 --- a/app/src/main/java/com/github/catvod/bean/ali/User.java +++ b/app/src/main/java/com/github/catvod/bean/ali/User.java @@ -2,8 +2,6 @@ package com.github.catvod.bean.ali; import android.text.TextUtils; -import androidx.annotation.NonNull; - import com.github.catvod.utils.Prefers; import com.google.gson.Gson; import com.google.gson.annotations.SerializedName; @@ -61,7 +59,6 @@ public class User { return this; } - @NonNull @Override public String toString() { return new Gson().toJson(this); diff --git a/app/src/main/java/com/github/catvod/spider/WebDAV.java b/app/src/main/java/com/github/catvod/spider/WebDAV.java index 9bdfc534..2516d040 100644 --- a/app/src/main/java/com/github/catvod/spider/WebDAV.java +++ b/app/src/main/java/com/github/catvod/spider/WebDAV.java @@ -105,9 +105,9 @@ public class WebDAV extends Spider { public String detailContent(List ids) throws Exception { String id = ids.get(0); String key = id.contains("/") ? id.substring(0, id.indexOf("/")) : id; - String name = id.substring(id.lastIndexOf("/") + 1); String parent = id.substring(0, id.lastIndexOf("/")); String path = parent.contains("/") ? parent.substring(parent.indexOf("/")) + "/" : ""; + String name = parent.substring(parent.lastIndexOf("/") + 1); Drive drive = getDrive(key); List parents = getList(drive, path, allExt); List subs = getSubs(parents); @@ -119,8 +119,7 @@ public class WebDAV extends Spider { } } Vod vod = new Vod(); - vod.setVodId(id); - //TODO 資料夾名稱 + vod.setVodId(name); vod.setVodName(name); vod.setVodPic(vodPic); vod.setVodPlayFrom(key); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 7f028343..fc1604f3 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 8afbe58b..c65c271b 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -fec1811bad085e87682f64be8bc9885a +962a1af0469ede7b575046c69c1f52d3