Merge branch 'main' of https://github.com/FongMi/CatVodSpider

app/src/main/java/com/github/catvod/bean/Vod.java

@@ -30,6 +30,8 @@ public class Vod {
     private String vodPlayUrl;
     @SerializedName("vod_tag")
     private String vodTag;
+    @SerializedName("style")
+    private Style style;
 
     public Vod() {
     }
@@ -47,6 +49,14 @@ public class Vod {
         setVodRemarks(vodRemarks);
     }
 
+    public Vod(String vodId, String vodName, String vodPic, String vodRemarks, Style style) {
+        setVodId(vodId);
+        setVodName(vodName);
+        setVodPic(vodPic);
+        setVodRemarks(vodRemarks);
+        setStyle(style);
+    }
+
     public Vod(String vodId, String vodName, String vodPic, String vodRemarks, boolean folder) {
         setVodId(vodId);
         setVodName(vodName);
@@ -110,4 +120,45 @@ public class Vod {
     public void setVodTag(String vodTag) {
         this.vodTag = vodTag;
     }
+
+    public void setStyle(Style style) {
+        this.style = style;
+    }
+
+    public static class Style {
+
+        @SerializedName("type")
+        private String type;
+        @SerializedName("ratio")
+        private Float ratio;
+
+        public static Style rect() {
+            return rect(0.75f);
+        }
+
+        public static Style rect(float ratio) {
+            return new Style("rect", ratio);
+        }
+
+        public static Style oval() {
+            return new Style("oval", 1.0f);
+        }
+
+        public static Style full() {
+            return new Style("full");
+        }
+
+        public static Style list() {
+            return new Style("list");
+        }
+
+        public Style(String type) {
+            this.type = type;
+        }
+
+        public Style(String type, Float ratio) {
+            this.type = type;
+            this.ratio = ratio;
+        }
+    }
 }

jar/custom_spider.jar.md5

@@ -1 +1 @@
-1330f8422b05c560a0f1eba33e81e3c2
+f51d388e6b71feab1764866c37a7b84a

json/adult.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;1330f8422b05c560a0f1eba33e81e3c2",
+  "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;f51d388e6b71feab1764866c37a7b84a",
   "wallpaper": "https://gao.chuqiuyu.tk",
   "sites": [
     {

json/config.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;1330f8422b05c560a0f1eba33e81e3c2",
+  "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;f51d388e6b71feab1764866c37a7b84a",
   "wallpaper": "http://饭太硬.top/深色壁纸/api.php",
   "sites": [
     {