diff --git a/app/src/main/java/com/github/catvod/debug/MainActivity.java b/app/src/main/java/com/github/catvod/debug/MainActivity.java index 64aaa7a2..f5dcb790 100644 --- a/app/src/main/java/com/github/catvod/debug/MainActivity.java +++ b/app/src/main/java/com/github/catvod/debug/MainActivity.java @@ -6,8 +6,8 @@ import android.widget.Button; import com.github.catvod.R; import com.github.catvod.crawler.Spider; -import com.github.catvod.spider.Doll; import com.github.catvod.spider.Init; +import com.github.catvod.spider.NiNi; import com.orhanobut.logger.AndroidLogAdapter; import com.orhanobut.logger.Logger; @@ -46,7 +46,7 @@ public class MainActivity extends Activity { private void initSpider() { try { Init.init(getApplicationContext()); - spider = new Doll(); + spider = new NiNi(); spider.init(this, ""); } catch (Throwable e) { e.printStackTrace(); @@ -79,7 +79,7 @@ public class MainActivity extends Activity { public void detailContent() { try { - Logger.t("detailContent").d(spider.detailContent(Arrays.asList("2121173431"))); + Logger.t("detailContent").d(spider.detailContent(Arrays.asList("ulNJ1TWJXFPn0GQGCuSKjZMmP28PTq2U"))); } catch (Throwable e) { e.printStackTrace(); } @@ -87,7 +87,7 @@ public class MainActivity extends Activity { public void playerContent() { try { - Logger.t("playerContent").d(spider.playerContent("轉存原畫", "kahf2rw5Uuk+652f55f6943ee2f75d8e4fa590b4ec65fd007f8c", new ArrayList<>())); + Logger.t("playerContent").d(spider.playerContent("", "ulNJ1TWJXFPn0GQGCuSKjZMmP28PTq2U_J52h83OSgHvZXbaecUtirP1qzfVouxIk_1", new ArrayList<>())); } catch (Throwable e) { e.printStackTrace(); } diff --git a/app/src/main/java/com/github/catvod/spider/NiNi.java b/app/src/main/java/com/github/catvod/spider/NiNi.java index 4c86d829..dee22d23 100644 --- a/app/src/main/java/com/github/catvod/spider/NiNi.java +++ b/app/src/main/java/com/github/catvod/spider/NiNi.java @@ -38,7 +38,7 @@ public class NiNi extends Spider { private static final String searchUrl = "https://api.nivodz.com/show/search/WEB/3.2"; private static final String categoryUrl = "https://api.nivodz.com/show/filter/WEB/3.2"; private static final String detailUrl = "https://api.nivodz.com/show/detail/WEB/3.2"; - private static final String playUrl = "https://api.nivodz.com/show/play/info/WEB/3.2"; + private static final String playUrl = "https://api.nivodz.com/show/play/info/WEB/3.3"; private static final String des_key = "diao.com"; private boolean adult; @@ -174,7 +174,7 @@ public class NiNi extends Spider { JSONObject item = plays.getJSONObject(j); String episodeName = item.getString("episodeName"); episodeName = TextUtils.isEmpty(episodeName) ? "播放" : episodeName; - vodItems.add(episodeName + "$" + id + "_" + item.getString("playIdCode")); + vodItems.add(episodeName + "$" + id + "_" + item.getString("playIdCode") + "_" + episodeName); } Vod vod = new Vod(); vod.setVodId(id); @@ -198,10 +198,10 @@ public class NiNi extends Spider { Map params = new TreeMap<>(); params.put("show_id_code", ids[0]); params.put("play_id_code", ids[1]); - params.put("oid", "1"); + params.put("episode_id", ids[2]); JSONObject object = new JSONObject(post(playUrl, params)); - String playUrl = object.getJSONObject("entity").optString("playUrl"); - return Result.get().url(playUrl).header(getHeaders()).string(); + String url = object.getJSONObject("entity").getJSONArray("plays").getJSONObject(0).optString("playUrl"); + return Result.get().url(url).header(getHeaders()).string(); } @Override diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index e98f1957..a986f8d1 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 63d5652c..4812cd87 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -3f392906996ac13aaeb8c91956f95f7f +fd1b4ae6ab532b829b3256e786c03e21