Merge remote-tracking branch 'origin/mine' into mine

app/src/main/java/com/github/catvod/bean/bili/Page.java

@@ -16,6 +16,6 @@ public class Page {
     }
 
     public String getPart() {
-        return TextUtils.isEmpty(part) ? "" : part;
+        return TextUtils.isEmpty(part) ? "" : part.replace("#", "");
     }
 }

app/src/main/java/com/github/catvod/spider/Jianpian.java

@@ -1,7 +1,6 @@
 package com.github.catvod.spider;
 
 import android.content.Context;
-
 import com.github.catvod.bean.Class;
 import com.github.catvod.bean.Result;
 import com.github.catvod.bean.Vod;
@@ -13,11 +12,7 @@ import com.github.catvod.net.OkHttp;
 import com.github.catvod.utils.Json;
 
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Qile
@@ -70,7 +65,7 @@ public class Jianpian extends Spider {
         String url = siteUrl + String.format("/api/crumb/list?area=%s&category_id=%s&page=%s&type=0&limit=24&sort=%s&year=%s", area, cateId, pg, by, year);
         Resp resp = Resp.objectFrom(OkHttp.string(url, getHeader()));
         for (Data data : resp.getData()) list.add(data.vod());
-        return Result.string(list);
+        return Result.string(Integer.parseInt(pg), Integer.parseInt(pg) + 1, 24, Integer.MAX_VALUE, list);
     }
 
     @Override

jar/custom_spider.jar.md5

@@ -1 +1 @@
-94ac5701c2ae84b5f8361994d6e17b3b
+13a45bcad9441a08c06c37760e5c5f24

json/index.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;94ac5701c2ae84b5f8361994d6e17b3b",
+  "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;13a45bcad9441a08c06c37760e5c5f24",
   "lives": [
     {
       "name": "直播ipv6",

json/index1.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;94ac5701c2ae84b5f8361994d6e17b3b",
+  "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;13a45bcad9441a08c06c37760e5c5f24",
   "lives": [
     {
       "name": "直播ipv6",

json/index2.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;94ac5701c2ae84b5f8361994d6e17b3b",
+  "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;13a45bcad9441a08c06c37760e5c5f24",
   "lives": [
     {
       "name": "直播ipv6",