From b0d6891978d72d8997dcd35acf6b3e3af75871cc Mon Sep 17 00:00:00 2001
From: l <you@example.com>
Date: Fri, 5 Feb 2021 11:22:21 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BC=AB=E7=94=BB?=
 =?UTF-8?q?=E6=BA=90=20=E4=BC=98=E9=85=B7=E6=BC=AB=E7=94=BB=20Add=20New=20?=
 =?UTF-8?q?Source=20www.ykmh.com?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hiroshi/cimoc/helper/UpdateHelper.java    |  40 +++-
 .../hiroshi/cimoc/manager/SourceManager.java  |  44 ++++-
 .../java/com/hiroshi/cimoc/soup/Node.java     |  10 +
 .../java/com/hiroshi/cimoc/source/YKMH.java   | 183 ++++++++++++++++++
 4 files changed, 275 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/hiroshi/cimoc/source/YKMH.java

diff --git a/app/src/main/java/com/hiroshi/cimoc/helper/UpdateHelper.java b/app/src/main/java/com/hiroshi/cimoc/helper/UpdateHelper.java
index 8356cf4a..79df6200 100644
--- a/app/src/main/java/com/hiroshi/cimoc/helper/UpdateHelper.java
+++ b/app/src/main/java/com/hiroshi/cimoc/helper/UpdateHelper.java
@@ -6,8 +6,45 @@
 import com.hiroshi.cimoc.model.ComicDao;
 import com.hiroshi.cimoc.model.DaoSession;
 import com.hiroshi.cimoc.model.Source;
-import com.hiroshi.cimoc.source.*;
+import com.hiroshi.cimoc.source.Animx2;
+import com.hiroshi.cimoc.source.BaiNian;
+import com.hiroshi.cimoc.source.BuKa;
+import com.hiroshi.cimoc.source.CCMH;
+import com.hiroshi.cimoc.source.CCTuku;
+import com.hiroshi.cimoc.source.Cartoonmad;
+import com.hiroshi.cimoc.source.ChuiXue;
+import com.hiroshi.cimoc.source.CopyMH;
+import com.hiroshi.cimoc.source.DM5;
+import com.hiroshi.cimoc.source.Dmzj;
+import com.hiroshi.cimoc.source.Dmzjv2;
+import com.hiroshi.cimoc.source.EHentai;
+import com.hiroshi.cimoc.source.GuFeng;
+import com.hiroshi.cimoc.source.HHAAZZ;
+import com.hiroshi.cimoc.source.Hhxxee;
+import com.hiroshi.cimoc.source.IKanman;
+import com.hiroshi.cimoc.source.JMTT;
+import com.hiroshi.cimoc.source.MH160;
+import com.hiroshi.cimoc.source.MH50;
+import com.hiroshi.cimoc.source.MH517;
+import com.hiroshi.cimoc.source.MH57;
+import com.hiroshi.cimoc.source.MHLove;
+import com.hiroshi.cimoc.source.ManHuaDB;
+import com.hiroshi.cimoc.source.MangaBZ;
+import com.hiroshi.cimoc.source.MangaNel;
+import com.hiroshi.cimoc.source.Mangakakalot;
+import com.hiroshi.cimoc.source.Manhuatai;
+import com.hiroshi.cimoc.source.MiGu;
+import com.hiroshi.cimoc.source.Ohmanhua;
+import com.hiroshi.cimoc.source.PuFei;
+import com.hiroshi.cimoc.source.QiManWu;
+import com.hiroshi.cimoc.source.QiMiaoMH;
+import com.hiroshi.cimoc.source.Tencent;
+import com.hiroshi.cimoc.source.TuHao;
+import com.hiroshi.cimoc.source.U17;
+import com.hiroshi.cimoc.source.Webtoon;
 import com.hiroshi.cimoc.source.WebtoonDongManManHua;
+import com.hiroshi.cimoc.source.YKMH;
+import com.hiroshi.cimoc.source.YYLS;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -96,6 +133,7 @@ private static void initSource(DaoSession session) {
         list.add(WebtoonDongManManHua.getDefaultSource());
         list.add(MH160.getDefaultSource());
         list.add(QiMiaoMH.getDefaultSource());
+        list.add(YKMH.getDefaultSource());
         session.getSourceDao().insertOrReplaceInTx(list);
     }
 }
diff --git a/app/src/main/java/com/hiroshi/cimoc/manager/SourceManager.java b/app/src/main/java/com/hiroshi/cimoc/manager/SourceManager.java
index 13c98dbb..43ffe47e 100644
--- a/app/src/main/java/com/hiroshi/cimoc/manager/SourceManager.java
+++ b/app/src/main/java/com/hiroshi/cimoc/manager/SourceManager.java
@@ -7,8 +7,47 @@
 import com.hiroshi.cimoc.model.SourceDao;
 import com.hiroshi.cimoc.model.SourceDao.Properties;
 import com.hiroshi.cimoc.parser.Parser;
-import com.hiroshi.cimoc.source.*;
+import com.hiroshi.cimoc.source.Animx2;
+import com.hiroshi.cimoc.source.BaiNian;
+import com.hiroshi.cimoc.source.BuKa;
+import com.hiroshi.cimoc.source.CCMH;
+import com.hiroshi.cimoc.source.CCTuku;
+import com.hiroshi.cimoc.source.Cartoonmad;
+import com.hiroshi.cimoc.source.ChuiXue;
+import com.hiroshi.cimoc.source.CopyMH;
+import com.hiroshi.cimoc.source.DM5;
+import com.hiroshi.cimoc.source.Dmzj;
+import com.hiroshi.cimoc.source.Dmzjv2;
+import com.hiroshi.cimoc.source.EHentai;
+import com.hiroshi.cimoc.source.GuFeng;
+import com.hiroshi.cimoc.source.HHAAZZ;
+import com.hiroshi.cimoc.source.Hhxxee;
+import com.hiroshi.cimoc.source.IKanman;
+import com.hiroshi.cimoc.source.JMTT;
+import com.hiroshi.cimoc.source.Locality;
+import com.hiroshi.cimoc.source.MH160;
+import com.hiroshi.cimoc.source.MH50;
+import com.hiroshi.cimoc.source.MH517;
+import com.hiroshi.cimoc.source.MH57;
+import com.hiroshi.cimoc.source.MHLove;
+import com.hiroshi.cimoc.source.ManHuaDB;
+import com.hiroshi.cimoc.source.MangaBZ;
+import com.hiroshi.cimoc.source.MangaNel;
+import com.hiroshi.cimoc.source.Mangakakalot;
+import com.hiroshi.cimoc.source.Manhuatai;
+import com.hiroshi.cimoc.source.MiGu;
+import com.hiroshi.cimoc.source.Null;
+import com.hiroshi.cimoc.source.Ohmanhua;
+import com.hiroshi.cimoc.source.PuFei;
+import com.hiroshi.cimoc.source.QiManWu;
+import com.hiroshi.cimoc.source.QiMiaoMH;
+import com.hiroshi.cimoc.source.Tencent;
+import com.hiroshi.cimoc.source.TuHao;
+import com.hiroshi.cimoc.source.U17;
+import com.hiroshi.cimoc.source.Webtoon;
 import com.hiroshi.cimoc.source.WebtoonDongManManHua;
+import com.hiroshi.cimoc.source.YKMH;
+import com.hiroshi.cimoc.source.YYLS;
 
 import java.util.List;
 
@@ -205,6 +244,9 @@ public Parser getParser(int type) {
                 case QiMiaoMH.TYPE:
                     parser = new QiMiaoMH(source);
                     break;
+                case YKMH.TYPE:
+                    parser = new YKMH(source);
+                    break;
                 default:
                     parser = new Null();
                     break;
diff --git a/app/src/main/java/com/hiroshi/cimoc/soup/Node.java b/app/src/main/java/com/hiroshi/cimoc/soup/Node.java
index c81cb330..df7ec07e 100755
--- a/app/src/main/java/com/hiroshi/cimoc/soup/Node.java
+++ b/app/src/main/java/com/hiroshi/cimoc/soup/Node.java
@@ -28,6 +28,10 @@ public Node id(String id) {
         return new Node(element.getElementById(id));
     }
 
+    public Node getParent(String cssQuery) {
+        return new Node(get().select(cssQuery).first().parent());
+    }
+
     public Node getChild(String cssQuery) {
         return new Node(get().select(cssQuery).first());
     }
@@ -73,6 +77,12 @@ public String textWithSubstring(String cssQuery, int start) {
         return textWithSubstring(cssQuery, start, -1);
     }
 
+    public String hrefWithLastSplit() {
+        String string = href();
+        String[] arr = string.split("/");
+        return arr[arr.length - 1];
+    }
+
     public String textWithSplit(String cssQuery, String regex, int index) {
         return StringUtils.split(text(cssQuery), regex, index);
     }
diff --git a/app/src/main/java/com/hiroshi/cimoc/source/YKMH.java b/app/src/main/java/com/hiroshi/cimoc/source/YKMH.java
new file mode 100644
index 00000000..0b8e0ab8
--- /dev/null
+++ b/app/src/main/java/com/hiroshi/cimoc/source/YKMH.java
@@ -0,0 +1,183 @@
+package com.hiroshi.cimoc.source;
+
+import android.util.Log;
+
+import com.hiroshi.cimoc.core.Manga;
+import com.hiroshi.cimoc.model.Chapter;
+import com.hiroshi.cimoc.model.Comic;
+import com.hiroshi.cimoc.model.ImageUrl;
+import com.hiroshi.cimoc.model.Source;
+import com.hiroshi.cimoc.parser.MangaParser;
+import com.hiroshi.cimoc.parser.NodeIterator;
+import com.hiroshi.cimoc.parser.SearchIterator;
+import com.hiroshi.cimoc.soup.Node;
+import com.hiroshi.cimoc.utils.StringUtils;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+
+import java.io.UnsupportedEncodingException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import okhttp3.Headers;
+import okhttp3.Request;
+
+public class YKMH extends MangaParser {
+    public static final int TYPE = 91;
+    public static final String DEFAULT_TITLE = "优酷漫画";
+    public final String Host = "https://www.ykmh.com/";
+    public final String mHost = "https://m.ykmh.com/";
+
+    public YKMH(Source source) {
+        init(source, null);
+    }
+
+    public static Source getDefaultSource() {
+        return new Source(null, DEFAULT_TITLE, TYPE, true);
+    }
+
+    @Override
+    public Request getSearchRequest(String keyword, int page) throws UnsupportedEncodingException {
+        Log.d("SourceSearch:", String.valueOf(keyword));
+
+        return new Request.Builder().url(mHost + "search/?keywords=" + keyword + "&page=" + page).addHeader("referer", "https://m.ykmh.com/search").addHeader("user-agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36")
+                .build();
+    }
+
+    @Override
+    public SearchIterator getSearchIterator(String html, int page) throws JSONException {
+        Node body = new Node(html);
+        return new NodeIterator(body.list("#update_list > div.UpdateList > div")) {
+            @Override
+            protected Comic parse(Node node) {
+                Node titleN = node.getChild("div.itemTxt > a");
+                String cid = titleN.hrefWithLastSplit();
+                String title = titleN.text();
+                String cover = node.attr("div.itemImg > a > img", "src");
+                String Update = node.text("p.txtItme > span.date");
+                String Author = node.text("p > a");
+                return new Comic(TYPE, cid, title, cover, Update, Author);
+            }
+        };
+    }
+
+    @Override
+    public String getUrl(String cid) {
+        return StringUtils.format("%smanhua/%s", mHost, cid);
+    }
+
+    @Override
+    public Headers getHeader() {
+        return Headers.of("Referer", "https://m.ykmh.com/search/", "user-agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36");
+    }
+
+    @Override
+    public Request getInfoRequest(String cid) {
+        Log.d("SourceInfo:", String.valueOf(cid));
+
+        return new Request.Builder().url(mHost.concat("manhua/").concat(cid).concat("/")).addHeader("referer", "https://m.ykmh.com/search").addHeader("user-agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36")
+                .build();
+
+    }
+
+    @Override
+    public Comic parseInfo(String html, Comic comic) throws UnsupportedEncodingException {
+        Node body = new Node(html);
+        Node info = body.getChild("div.Introduct_Sub");
+        String title = body.text("div#comicName");
+        String cover = info.getChild("div#Cover > *").src();
+        String update = info.text("p.txtItme > span.date");
+        String author = info.getParent("p.txtItme > span.icon01").text();
+        String intro = body.getParent("p#full-des #showmore-des").text();
+        String isFinish = info.getParent("p.txtItme > span.icon01").text();
+        boolean finish = false;
+        if (isFinish.contains("完结")) finish = true;
+        comic.setInfo(title, cover, update, intro, author, finish);
+
+
+        return comic;
+    }
+
+    @Override
+    public List<Chapter> parseChapter(String html) {
+        List<Chapter> list = new LinkedList<>();
+        Node body = new Node(html);
+        for (Node node : body.list("div.chapter-warp ul.Drama > li > a")) {
+            String title = node.text();
+//            String path = StringUtils.split(node.href(), "/", 3);
+            String path = node.hrefWithSubString(1);
+            list.add(new Chapter(title, path));
+        }
+        return list;
+    }
+
+    @Override
+    public List<Chapter> parseChapter(String html, Comic comic, Long sourceComic) throws JSONException {
+        List<Chapter> list = new LinkedList<>();
+        Node body = new Node(html);
+        int i = 0;
+        for (Node node : body.list("div.chapter-warp ul.Drama > li > a")) {
+            String title = node.text();
+//            String path = StringUtils.split(node.href(), "/", 3);
+            String path = node.hrefWithSubString(1);
+            list.add(new Chapter(Long.parseLong(sourceComic + "000" + i++), sourceComic, title, path));
+        }
+        return list;
+    }
+
+    @Override
+    public Request getImagesRequest(String cid, String path) {
+        Log.d("SourceImage:", String.valueOf(path));
+
+        return new Request.Builder().url(mHost.concat(path)).addHeader("referer", "https://m.ykmh.com/search").addHeader("user-agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36")
+                .build();
+    }
+
+
+    @Override
+    public List<ImageUrl> parseImages(String html, Chapter chapter) throws Manga.NetworkErrorException, JSONException {
+        List<ImageUrl> list = new LinkedList<>();
+        Matcher matcher = Pattern.compile("var chapterImages\\s*=\\s*\\[(.+?)]").matcher(html);
+        if (!matcher.find()) {
+            return null;
+        }
+        String CDATA = String.format("[%s]", matcher.group(1));
+        JSONArray array = null;
+        try {
+            array = new JSONArray(CDATA);
+            for (int i = 0; i < array.length(); i++) {
+                String url = StringUtils.format("https://pic.w1fl.com%s", array.getString(i));
+                Long comicChapter = chapter.getId();
+                Long id = Long.parseLong(comicChapter + "000" + i + 1);
+                list.add(new ImageUrl(id, comicChapter, i + 1, url, false));
+
+            }
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+            Log.e("parseImages", "parseImages Error", e);
+            return null;
+
+        }
+
+        return list;
+    }
+
+    @Override
+    public Request getCheckRequest(String cid) {
+        return getInfoRequest(cid);
+    }
+
+    @Override
+    public String parseCheck(String html) {
+        return new Node(html).text("p.txtItme > span.date");
+    }
+
+    @Override
+    public String getTitle() {
+        return DEFAULT_TITLE;
+    }
+}

From 220564690e732ccb723537b347bd2425f4c30cef Mon Sep 17 00:00:00 2001
From: l <you@example.com>
Date: Fri, 5 Feb 2021 11:29:08 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BC=AB=E7=94=BB?=
 =?UTF-8?q?=E6=BA=90=20=E4=BC=98=E9=85=B7=E6=BC=AB=E7=94=BB=20Add=20New=20?=
 =?UTF-8?q?Source=20www.ykmh.com?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hiroshi/cimoc/helper/UpdateHelper.java    | 39 +-----------------
 .../hiroshi/cimoc/manager/SourceManager.java  | 41 +------------------
 2 files changed, 2 insertions(+), 78 deletions(-)

diff --git a/app/src/main/java/com/hiroshi/cimoc/helper/UpdateHelper.java b/app/src/main/java/com/hiroshi/cimoc/helper/UpdateHelper.java
index 79df6200..d925659f 100644
--- a/app/src/main/java/com/hiroshi/cimoc/helper/UpdateHelper.java
+++ b/app/src/main/java/com/hiroshi/cimoc/helper/UpdateHelper.java
@@ -6,45 +6,8 @@
 import com.hiroshi.cimoc.model.ComicDao;
 import com.hiroshi.cimoc.model.DaoSession;
 import com.hiroshi.cimoc.model.Source;
-import com.hiroshi.cimoc.source.Animx2;
-import com.hiroshi.cimoc.source.BaiNian;
-import com.hiroshi.cimoc.source.BuKa;
-import com.hiroshi.cimoc.source.CCMH;
-import com.hiroshi.cimoc.source.CCTuku;
-import com.hiroshi.cimoc.source.Cartoonmad;
-import com.hiroshi.cimoc.source.ChuiXue;
-import com.hiroshi.cimoc.source.CopyMH;
-import com.hiroshi.cimoc.source.DM5;
-import com.hiroshi.cimoc.source.Dmzj;
-import com.hiroshi.cimoc.source.Dmzjv2;
-import com.hiroshi.cimoc.source.EHentai;
-import com.hiroshi.cimoc.source.GuFeng;
-import com.hiroshi.cimoc.source.HHAAZZ;
-import com.hiroshi.cimoc.source.Hhxxee;
-import com.hiroshi.cimoc.source.IKanman;
-import com.hiroshi.cimoc.source.JMTT;
-import com.hiroshi.cimoc.source.MH160;
-import com.hiroshi.cimoc.source.MH50;
-import com.hiroshi.cimoc.source.MH517;
-import com.hiroshi.cimoc.source.MH57;
-import com.hiroshi.cimoc.source.MHLove;
-import com.hiroshi.cimoc.source.ManHuaDB;
-import com.hiroshi.cimoc.source.MangaBZ;
-import com.hiroshi.cimoc.source.MangaNel;
-import com.hiroshi.cimoc.source.Mangakakalot;
-import com.hiroshi.cimoc.source.Manhuatai;
-import com.hiroshi.cimoc.source.MiGu;
-import com.hiroshi.cimoc.source.Ohmanhua;
-import com.hiroshi.cimoc.source.PuFei;
-import com.hiroshi.cimoc.source.QiManWu;
-import com.hiroshi.cimoc.source.QiMiaoMH;
-import com.hiroshi.cimoc.source.Tencent;
-import com.hiroshi.cimoc.source.TuHao;
-import com.hiroshi.cimoc.source.U17;
-import com.hiroshi.cimoc.source.Webtoon;
+import com.hiroshi.cimoc.source.*;
 import com.hiroshi.cimoc.source.WebtoonDongManManHua;
-import com.hiroshi.cimoc.source.YKMH;
-import com.hiroshi.cimoc.source.YYLS;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/hiroshi/cimoc/manager/SourceManager.java b/app/src/main/java/com/hiroshi/cimoc/manager/SourceManager.java
index 43ffe47e..d67ad405 100644
--- a/app/src/main/java/com/hiroshi/cimoc/manager/SourceManager.java
+++ b/app/src/main/java/com/hiroshi/cimoc/manager/SourceManager.java
@@ -7,47 +7,8 @@
 import com.hiroshi.cimoc.model.SourceDao;
 import com.hiroshi.cimoc.model.SourceDao.Properties;
 import com.hiroshi.cimoc.parser.Parser;
-import com.hiroshi.cimoc.source.Animx2;
-import com.hiroshi.cimoc.source.BaiNian;
-import com.hiroshi.cimoc.source.BuKa;
-import com.hiroshi.cimoc.source.CCMH;
-import com.hiroshi.cimoc.source.CCTuku;
-import com.hiroshi.cimoc.source.Cartoonmad;
-import com.hiroshi.cimoc.source.ChuiXue;
-import com.hiroshi.cimoc.source.CopyMH;
-import com.hiroshi.cimoc.source.DM5;
-import com.hiroshi.cimoc.source.Dmzj;
-import com.hiroshi.cimoc.source.Dmzjv2;
-import com.hiroshi.cimoc.source.EHentai;
-import com.hiroshi.cimoc.source.GuFeng;
-import com.hiroshi.cimoc.source.HHAAZZ;
-import com.hiroshi.cimoc.source.Hhxxee;
-import com.hiroshi.cimoc.source.IKanman;
-import com.hiroshi.cimoc.source.JMTT;
-import com.hiroshi.cimoc.source.Locality;
-import com.hiroshi.cimoc.source.MH160;
-import com.hiroshi.cimoc.source.MH50;
-import com.hiroshi.cimoc.source.MH517;
-import com.hiroshi.cimoc.source.MH57;
-import com.hiroshi.cimoc.source.MHLove;
-import com.hiroshi.cimoc.source.ManHuaDB;
-import com.hiroshi.cimoc.source.MangaBZ;
-import com.hiroshi.cimoc.source.MangaNel;
-import com.hiroshi.cimoc.source.Mangakakalot;
-import com.hiroshi.cimoc.source.Manhuatai;
-import com.hiroshi.cimoc.source.MiGu;
-import com.hiroshi.cimoc.source.Null;
-import com.hiroshi.cimoc.source.Ohmanhua;
-import com.hiroshi.cimoc.source.PuFei;
-import com.hiroshi.cimoc.source.QiManWu;
-import com.hiroshi.cimoc.source.QiMiaoMH;
-import com.hiroshi.cimoc.source.Tencent;
-import com.hiroshi.cimoc.source.TuHao;
-import com.hiroshi.cimoc.source.U17;
-import com.hiroshi.cimoc.source.Webtoon;
+import com.hiroshi.cimoc.source.*;
 import com.hiroshi.cimoc.source.WebtoonDongManManHua;
-import com.hiroshi.cimoc.source.YKMH;
-import com.hiroshi.cimoc.source.YYLS;
 
 import java.util.List;
 

From ca2b547bf54ad815e9241b78847b6e594bc10641 Mon Sep 17 00:00:00 2001
From: l <you@example.com>
Date: Fri, 5 Feb 2021 12:17:53 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E9=98=B2=E6=AD=A2=20MIUI=20=E5=AF=B9=20P?=
 =?UTF-8?q?ageReaderActivity=20=E8=BF=9B=E8=A1=8C=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E5=8F=8D=E8=89=B2=20Fix=20DarkMode=20Related=20Bug=20For=20MIU?=
 =?UTF-8?q?I?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                     |  2 ++
 .../cimoc/ui/activity/PageReaderActivity.java        |  5 +++++
 .../hiroshi/cimoc/ui/activity/ReaderActivity.java    |  7 +++++++
 app/src/main/res/values-v29/styles.xml               |  8 ++++++++
 app/src/main/res/values/styles.xml                   | 12 ++++++++++--
 5 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/values-v29/styles.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e0ba0ce5..3c5998e8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,8 @@
             android:configChanges="orientation|keyboardHidden|screenSize" />
         <activity
             android:name=".ui.activity.PageReaderActivity"
+            android:forceDarkAllowed="false"
+            android:theme="@style/AppThemeNoDark"
             android:configChanges="orientation|keyboardHidden|screenSize" />
         <activity
             android:name=".ui.activity.StreamReaderActivity"
diff --git a/app/src/main/java/com/hiroshi/cimoc/ui/activity/PageReaderActivity.java b/app/src/main/java/com/hiroshi/cimoc/ui/activity/PageReaderActivity.java
index ff52c03d..622d5b05 100644
--- a/app/src/main/java/com/hiroshi/cimoc/ui/activity/PageReaderActivity.java
+++ b/app/src/main/java/com/hiroshi/cimoc/ui/activity/PageReaderActivity.java
@@ -1,5 +1,7 @@
 package com.hiroshi.cimoc.ui.activity;
 
+import android.os.Build;
+
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.hiroshi.cimoc.R;
@@ -32,6 +34,9 @@ protected void initView() {
             ((RecyclerViewPager) mRecyclerView).setScrollSpeed(0.12f);
         }
         ((RecyclerViewPager) mRecyclerView).setTriggerOffset(0.01f * offset);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            mRecyclerView.setForceDarkAllowed(false);
+        }
         ((RecyclerViewPager) mRecyclerView).setOnPageChangedListener(this);
         mRecyclerView.setItemAnimator(null);
         mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
diff --git a/app/src/main/java/com/hiroshi/cimoc/ui/activity/ReaderActivity.java b/app/src/main/java/com/hiroshi/cimoc/ui/activity/ReaderActivity.java
index 1fd0a2e8..13e57136 100644
--- a/app/src/main/java/com/hiroshi/cimoc/ui/activity/ReaderActivity.java
+++ b/app/src/main/java/com/hiroshi/cimoc/ui/activity/ReaderActivity.java
@@ -160,6 +160,7 @@ protected void initTheme() {
     protected BasePresenter initPresenter() {
         mPresenter = new ReaderPresenter();
         mPresenter.attachView(this);
+
         return mPresenter;
     }
 
@@ -168,6 +169,8 @@ protected void initView() {
         mHideInfo = mPreference.getBoolean(PreferenceManager.PREF_READER_HIDE_INFO, false);
         mControllerTrigThreshold = mPreference.getInt(PreferenceManager.PREF_READER_CONTROLLER_TRIG_THRESHOLD, 30) * 0.01f;
         mInfoLayout.setVisibility(mHideInfo ? View.INVISIBLE : View.VISIBLE);
+        // 防止miui及其他魔改ROM启用反色
+        setTheme(R.style.AppThemeNoDark);
         String key = mode == PreferenceManager.READER_MODE_PAGE ?
                 PreferenceManager.PREF_READER_PAGE_TURN : PreferenceManager.PREF_READER_STREAM_TURN;
         turn = mPreference.getInt(key, PreferenceManager.READER_TURN_LTR);
@@ -175,11 +178,14 @@ protected void initView() {
             mReaderBox.setBackgroundResource(R.color.white);
         }
         initSeekBar();
+
         initLayoutManager();
         initReaderAdapter();
         mRecyclerView.setItemAnimator(null);
         mRecyclerView.setLayoutManager(mLayoutManager);
         mRecyclerView.setAdapter(mReaderAdapter);
+
+
         mRecyclerView.setItemViewCacheSize(2);
         mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
@@ -239,6 +245,7 @@ private void initLayoutManager() {
         mLayoutManager.setOrientation(turn == PreferenceManager.READER_TURN_ATB ? LinearLayoutManager.VERTICAL : LinearLayoutManager.HORIZONTAL);
         mLayoutManager.setReverseLayout(turn == PreferenceManager.READER_TURN_RTL);
         mLayoutManager.setExtraSpace(2);
+
     }
 
     @Override
diff --git a/app/src/main/res/values-v29/styles.xml b/app/src/main/res/values-v29/styles.xml
new file mode 100644
index 00000000..0371e019
--- /dev/null
+++ b/app/src/main/res/values-v29/styles.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppThemeNoDark" parent="AppTheme">
+        <item name="android:forceDarkAllowed">false</item>
+
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c21a1b1e..356a9f0b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar"></style>
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+
+    </style>
+
+    <style name="AppThemeNoDark" parent="Theme.AppCompat.Light.NoActionBar">
+        <!--        // 防止miui及其他魔改ROM启用反色-->
+        <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
+
+    </style>
 
     <style name="AppThemeBlue" parent="AppTheme">
         <item name="colorPrimary">@color/colorPrimaryBlue</item>

From 01922a328248f4031a393bcd35f663336e8aef11 Mon Sep 17 00:00:00 2001
From: l <you@example.com>
Date: Fri, 5 Feb 2021 21:09:01 +0800
Subject: [PATCH 04/14] Fix DMZJ

---
 .../hiroshi/cimoc/helper/UpdateHelper.java    |   2 +
 .../hiroshi/cimoc/manager/SourceManager.java  |   3 +
 .../com/hiroshi/cimoc/source/DmzjFix.java     | 201 ++++++++++++++++++
 3 files changed, 206 insertions(+)
 create mode 100644 app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java

diff --git a/app/src/main/java/com/hiroshi/cimoc/helper/UpdateHelper.java b/app/src/main/java/com/hiroshi/cimoc/helper/UpdateHelper.java
index 8356cf4a..40563c30 100644
--- a/app/src/main/java/com/hiroshi/cimoc/helper/UpdateHelper.java
+++ b/app/src/main/java/com/hiroshi/cimoc/helper/UpdateHelper.java
@@ -96,6 +96,8 @@ private static void initSource(DaoSession session) {
         list.add(WebtoonDongManManHua.getDefaultSource());
         list.add(MH160.getDefaultSource());
         list.add(QiMiaoMH.getDefaultSource());
+        list.add(DmzjFix.getDefaultSource());
+
         session.getSourceDao().insertOrReplaceInTx(list);
     }
 }
diff --git a/app/src/main/java/com/hiroshi/cimoc/manager/SourceManager.java b/app/src/main/java/com/hiroshi/cimoc/manager/SourceManager.java
index 13c98dbb..34f6d78e 100644
--- a/app/src/main/java/com/hiroshi/cimoc/manager/SourceManager.java
+++ b/app/src/main/java/com/hiroshi/cimoc/manager/SourceManager.java
@@ -205,6 +205,9 @@ public Parser getParser(int type) {
                 case QiMiaoMH.TYPE:
                     parser = new QiMiaoMH(source);
                     break;
+                case DmzjFix.TYPE:
+                    parser = new DmzjFix(source);
+                    break;
                 default:
                     parser = new Null();
                     break;
diff --git a/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java b/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java
new file mode 100644
index 00000000..714731cd
--- /dev/null
+++ b/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java
@@ -0,0 +1,201 @@
+package com.hiroshi.cimoc.source;
+
+import android.annotation.SuppressLint;
+
+import com.hiroshi.cimoc.core.Manga;
+import com.hiroshi.cimoc.model.Chapter;
+import com.hiroshi.cimoc.model.Comic;
+import com.hiroshi.cimoc.model.ImageUrl;
+import com.hiroshi.cimoc.model.Source;
+import com.hiroshi.cimoc.parser.JsonIterator;
+import com.hiroshi.cimoc.parser.MangaParser;
+import com.hiroshi.cimoc.parser.SearchIterator;
+import com.hiroshi.cimoc.parser.UrlFilter;
+import com.hiroshi.cimoc.soup.Node;
+import com.hiroshi.cimoc.utils.StringUtils;
+import com.hiroshi.cimoc.utils.UicodeBackslashU;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.UnsupportedEncodingException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+
+import okhttp3.Headers;
+import okhttp3.Request;
+
+public class DmzjFix extends MangaParser {
+    public static final int TYPE = 100;
+    public static final String DEFAULT_TITLE = "动漫之家v2Fix";
+
+    public DmzjFix(Source source) {
+        init(source, null);
+    }
+
+    public static Source getDefaultSource() {
+        return new Source(null, DEFAULT_TITLE, TYPE, true);
+    }
+
+    @Override
+    protected void initUrlFilterList() {
+        filter.add(new UrlFilter("manhua.dmzj.com", "/(\\w+)"));
+        filter.add(new UrlFilter("m.dmzj.com", "/info/(\\w+).html"));
+    }
+
+    @Override
+    public Request getSearchRequest(String keyword, int page) throws UnsupportedEncodingException, Exception {
+        if (page == 1) {
+            String url = StringUtils.format("https://m.dmzj.com/search/%s.html", keyword);
+            return new Request.Builder().url(url).build();
+        }
+        return null;
+    }
+
+    @Override
+    public String getUrl(String cid) {
+        return StringUtils.format("http://m.dmzj.com/info/%s.html", cid);
+    }
+
+    @Override
+    public SearchIterator getSearchIterator(String html, int page) throws JSONException {
+        try {
+            String JsonString = StringUtils.match("var serchArry=(\\[\\{.*?\\}\\])", html, 1);
+            String decodeJsonString = UicodeBackslashU.unicodeToCn(JsonString).replace("\\/", "/");
+            return new JsonIterator(new JSONArray(decodeJsonString)) {
+                @Override
+                protected Comic parse(JSONObject object) {
+                    try {
+                        String cid = object.getString("id");
+                        String title = object.getString("name");
+                        String cover = object.getString("cover");
+                        cover = "https://images.dmzj.com/" + cover;
+                        String author = object.optString("authors");
+                        long time = Long.parseLong(object.getString("last_updatetime")) * 1000;
+                        String update = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(new Date(time));
+                        return new Comic(TYPE, cid, title, cover, update, author);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return null;
+                }
+            };
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    @Override
+    public Request getInfoRequest(String cid) {
+        String url = StringUtils.format("http://api.dmzj.com/dynamic/comicinfo/%s.json", cid);
+        return new Request.Builder().url(url).build();
+    }
+
+    public Headers getHeader() {
+        return Headers.of("Referer", "http://images.dmzj.com/");
+    }
+
+    @SuppressLint("SimpleDateFormat")
+    @Override
+    public Comic parseInfo(String html, Comic comic) throws UnsupportedEncodingException {
+        try {
+            JSONObject root = new JSONObject(html).getJSONObject("data");
+            JSONObject info = root.getJSONObject("info");
+            String title = info.getString("title");
+            boolean status = !info.getString("status").contains("连载");
+            String cover = info.getString("cover");
+            String author = info.getString("authors");
+            String update = info.getString("last_updatetime");
+            update = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(Integer.parseInt(update) * 1000));
+            String intro = info.getString("description");
+            comic.setInfo(title, cover, update, intro, author, status);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return comic;
+    }
+
+    @Override
+    public List<Chapter> parseChapter(String html, Comic comic, Long sourceComic) {
+        List<Chapter> list = new LinkedList<>();
+        List<Chapter> list1 = new LinkedList<>();
+
+        try {
+            JSONArray root = new JSONObject(html).getJSONObject("data").getJSONArray("list");
+            for (int i = 0; i < root.length(); i++) {
+                JSONObject chapter = root.getJSONObject(i);
+                String title = chapter.getString("chapter_name");
+                String comic_id = chapter.getString("comic_id");
+                String chapter_id = chapter.getString("id");
+                String path = comic_id + "/" + chapter_id;
+                list.add(new Chapter(Long.parseLong(sourceComic + "000" + i + 1), sourceComic, title, path));
+                list1.add(new Chapter(Long.parseLong(sourceComic + "001" + i + 1), sourceComic, title.concat(" (备用)"), path + "x"));
+
+
+            }
+            list.addAll(list1);
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+            return null;
+
+        }
+        return list;
+
+
+    }
+
+    @Override
+    public Request getImagesRequest(String cid, String path) {
+
+        String url = StringUtils.format("https://m.dmzj.com/chapinfo/%s.html", path);
+        return new Request.Builder().url(url).build();
+    }
+
+    @Override
+    public List<ImageUrl> parseImages(String html, Chapter chapter) throws Manga.NetworkErrorException, JSONException {
+        List<ImageUrl> list = new LinkedList<>();
+        JSONArray root = new JSONObject(html).getJSONArray("page_url");
+        String flag = chapter.getId().toString().replace(chapter.getSourceComic().toString(), "");
+        for (int i = 0; i < root.length(); i++) {
+            Long comicChapter = chapter.getId();
+            String url = root.getString(i);
+            Long id = Long.parseLong(comicChapter + "000" + i);
+
+            if (flag.startsWith("001")) {
+                url = url.replace("dmzj", "dmzj1");
+
+            }
+            list.add(new ImageUrl(id, comicChapter, i + 1, url, false));
+
+
+        }
+
+
+        return list;
+    }
+
+    @Override
+    public Request getCheckRequest(String cid) {
+        return getInfoRequest(cid);
+    }
+
+    @SuppressLint("SimpleDateFormat")
+    @Override
+    public String parseCheck(String html) {
+        try {
+            String update = new JSONObject(html).getJSONObject("data").getString("last_updatetime");
+            return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(Integer.parseInt(update) * 1000));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return null;
+
+    }
+
+}

From f08bf6d162b37fdbafbdceb221dc6f921ee17906 Mon Sep 17 00:00:00 2001
From: l <you@example.com>
Date: Fri, 5 Feb 2021 21:44:45 +0800
Subject: [PATCH 05/14] Fix DMZJ

---
 app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java b/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java
index 714731cd..2b5dd21a 100644
--- a/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java
+++ b/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java
@@ -153,7 +153,7 @@ public List<Chapter> parseChapter(String html, Comic comic, Long sourceComic) {
     @Override
     public Request getImagesRequest(String cid, String path) {
 
-        String url = StringUtils.format("https://m.dmzj.com/chapinfo/%s.html", path);
+        String url = StringUtils.format("https://m.dmzj.com/chapinfo/%s.html", path.replace("x", ""));
         return new Request.Builder().url(url).build();
     }
 

From 2414631f1ef18cc130f5362156c999d6c5fc117d Mon Sep 17 00:00:00 2001
From: l <you@example.com>
Date: Sun, 7 Feb 2021 22:58:24 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=8B=B7?=
 =?UTF-8?q?=E8=B4=9D=E6=BC=AB=E7=94=BB=E5=8F=AA=E6=98=BE=E7=A4=BA=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=BA=90=E7=9A=84Bug=20=EF=BC=88=E4=BC=9A=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=AB=A0=E8=8A=82=E7=95=8C=E9=9D=A2=E7=89=88=E5=BC=8F?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96=EF=BC=8C=E8=A7=A3=E6=9E=90=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=8F=98=E9=95=BF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  2 +
 .../java/com/hiroshi/cimoc/model/Chapter.java | 37 ++++++--
 .../java/com/hiroshi/cimoc/model/Comic.java   |  4 +-
 .../java/com/hiroshi/cimoc/source/CopyMH.java | 67 ++++++++++++---
 .../cimoc/ui/adapter/DetailAdapter.java       | 85 ++++++++++++++++++-
 5 files changed, 169 insertions(+), 26 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c76e8f31..cca81598 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -85,6 +85,8 @@
             android:configChanges="orientation|keyboardHidden|screenSize" />
         <activity
             android:name=".ui.activity.StreamReaderActivity"
+            android:forceDarkAllowed="false"
+            android:theme="@style/AppThemeNoDark"
             android:configChanges="orientation|keyboardHidden|screenSize" />
 
         <service android:name=".service.DownloadService" />
diff --git a/app/src/main/java/com/hiroshi/cimoc/model/Chapter.java b/app/src/main/java/com/hiroshi/cimoc/model/Chapter.java
index 6843e00d..97815784 100644
--- a/app/src/main/java/com/hiroshi/cimoc/model/Chapter.java
+++ b/app/src/main/java/com/hiroshi/cimoc/model/Chapter.java
@@ -11,6 +11,7 @@
 /**
  * Created by Hiroshi on 2016/7/2.
  * fixed by Haleydu on 2020/8/25.
+ * Modified by lx200916 on 2021/2/7
  */
 @Entity
 public class Chapter implements Parcelable {
@@ -36,13 +37,19 @@ public Chapter[] newArray(int size) {
     private boolean complete;
     private boolean download;
     private long tid;
+    private String sourceGroup;
 
-    public Chapter(Long id,Long sourceComic,String title, String path, long tid) {
-        this(id,sourceComic,title, path, 0, false, false, tid);
+    public Chapter(Long id, Long sourceComic, String title, String path, long tid) {
+        this(id, sourceComic, title, path, 0, false, false, tid, "");
     }
 
-    public Chapter(Long id,Long sourceComic,String title, String path) {
-        this(id,sourceComic,title, path, 0, false, false, -1);
+    public Chapter(Long id, Long sourceComic, String title, String path, String sourceGroup) {
+        this(id, sourceComic, title, path, 0, false, false, -1, sourceGroup);
+
+    }
+
+    public Chapter(Long id, Long sourceComic, String title, String path) {
+        this(id, sourceComic, title, path, 0, false, false, -1, "");
     }
 
     public Chapter(String title, String path) {
@@ -53,13 +60,18 @@ public Chapter(String title, String path) {
         this.download = false;
         this.tid = -1;
     }
-    
+
     public Chapter(Parcel source) {
-        this(source.readLong(), source.readLong(),source.readString(), source.readString(), source.readInt(), source.readByte() == 1, source.readByte() == 1, source.readLong());
+        this(source.readLong(), source.readLong(), source.readString(), source.readString(), source.readInt(), source.readByte() == 1, source.readByte() == 1, source.readLong(), "");
     }
 
-    @Generated(hash = 342970835)
-    public Chapter(Long id, @NotNull Long sourceComic, String title, String path, int count, boolean complete, boolean download, long tid) {
+    public Chapter(Long id, Long sourceComic, String title, String path, int progress, boolean b, boolean b1, Long id1) {
+        this(id, sourceComic, title, path, progress, b, b1, id1, "");
+
+    }
+
+    @Generated(hash = 1726293378)
+    public Chapter(Long id, @NotNull Long sourceComic, String title, String path, int count, boolean complete, boolean download, long tid, String sourceGroup) {
         this.id = id;
         this.sourceComic = sourceComic;
         this.title = title;
@@ -68,6 +80,15 @@ public Chapter(Long id, @NotNull Long sourceComic, String title, String path, in
         this.complete = complete;
         this.download = download;
         this.tid = tid;
+        this.sourceGroup = sourceGroup;
+    }
+
+    public String getSourceGroup() {
+        return sourceGroup;
+    }
+
+    public void setSourceGroup(String sourceGroup) {
+        this.sourceGroup = sourceGroup;
     }
 
     @Generated(hash = 393170288)
diff --git a/app/src/main/java/com/hiroshi/cimoc/model/Comic.java b/app/src/main/java/com/hiroshi/cimoc/model/Comic.java
index b4e29be9..3b460b4a 100644
--- a/app/src/main/java/com/hiroshi/cimoc/model/Comic.java
+++ b/app/src/main/java/com/hiroshi/cimoc/model/Comic.java
@@ -35,6 +35,8 @@ public class Comic {
     private Integer page;
     private String chapter;
     private String url;
+    @Transient
+    public Object note;
 
 
     private String intro;
@@ -43,7 +45,7 @@ public class Comic {
 
     public Comic(int source, String cid, String title, String cover, String update, String author) {
         this(null, source, cid, title, cover == null ? "" : cover, false, false, update,
-                null, null, null, null, null, null, null, null,null,null);
+                null, null, null, null, null, null, null, null, null, null);
         this.author = author;
     }
 
diff --git a/app/src/main/java/com/hiroshi/cimoc/source/CopyMH.java b/app/src/main/java/com/hiroshi/cimoc/source/CopyMH.java
index a59a99ff..7dc59e7a 100644
--- a/app/src/main/java/com/hiroshi/cimoc/source/CopyMH.java
+++ b/app/src/main/java/com/hiroshi/cimoc/source/CopyMH.java
@@ -2,8 +2,12 @@
 
 import android.util.Base64;
 
+import androidx.arch.core.util.Function;
+
 import com.facebook.common.util.Hex;
+import com.google.common.base.Functions;
 import com.google.common.collect.Lists;
+import com.hiroshi.cimoc.App;
 import com.hiroshi.cimoc.model.Chapter;
 import com.hiroshi.cimoc.model.Comic;
 import com.hiroshi.cimoc.model.ImageUrl;
@@ -20,6 +24,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -27,6 +32,8 @@
 import okhttp3.Request;
 import taobe.tec.jcc.JChineseConvertor;
 
+import static com.hiroshi.cimoc.core.Manga.getResponseBody;
+
 public class CopyMH extends MangaParser {
     public static final int TYPE = 26;
     public static final String DEFAULT_TITLE = "拷贝漫画";
@@ -90,24 +97,32 @@ protected Comic parse(JSONObject object) {
 
     @Override
     public Request getInfoRequest(String cid) {
-        String url = "https://copymanga.com/comic/".concat(cid);
+        String url = "https://api.copymanga.com/api/v3/comic2/".concat(cid);
         return new Request.Builder().url(url).build();
     }
 
     @Override
     public Comic parseInfo(String html, Comic comic) {
-        Node body = new Node(html);
-        String cover = body.attr("div.comicParticulars-left-img.loadingIcon > img", "data-src");
-        String intro = body.text("p.intro");
-        String title = body.text("div.col-9.comicParticulars-title-right > ul > li:nth-child(1) > h6");
-        String update = body.text("div.col-9.comicParticulars-title-right > ul > li:nth-child(5) > span.comicParticulars-right-txt");
-        String author = body.text("div.col-9.comicParticulars-title-right > ul > li:nth-child(3) > span.comicParticulars-right-txt > a");
-
-        // 连载状态
-        String status = body.text("div.col-9.comicParticulars-title-right > ul > li:nth-child(6) > span.comicParticulars-right-txt");
-        boolean finish = isFinish(status);
+        JSONObject body = null;
+        try {
+            JSONObject comicInfo = new JSONObject(html).getJSONObject("results");
+            body = comicInfo.getJSONObject("comic");
+            String cover = body.getString("cover");
+            String intro = body.getString("brief");
+            String title = body.getString("name");
+            String update = body.getString("datetime_updated");
+            String author = ((JSONObject) body.getJSONArray("author").get(0)).getString("name");
+            // 连载状态
+            boolean finish = body.getJSONObject("status").getInt("value") != 0;
+            JSONObject group = comicInfo.getJSONObject("groups");
+            comic.note = group;
+
+
+            comic.setInfo(title, cover, update, intro, author, finish);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
 
-        comic.setInfo(title, cover, update, intro, author, finish);
 
         return comic;
     }
@@ -126,8 +141,34 @@ public List<Chapter> parseChapter(String html, Comic comic, Long sourceComic) th
         for (int i = 0; i < array.length(); ++i) {
             String title = array.getJSONObject(i).getString("name");
             String path = array.getJSONObject(i).getString("uuid");
-            list.add(new Chapter(Long.parseLong(sourceComic + "000" + i), sourceComic, title, path));
+            list.add(new Chapter(Long.parseLong(sourceComic + "000" + i), sourceComic, title, path, "默认"));
         }
+        try {
+            JSONObject groups = (JSONObject) comic.note;
+            Iterator<String> keys = groups.keys();
+            while (keys.hasNext()) {
+                String key = keys.next();
+                if (key.equals("default")) continue;
+                String path_word = groups.getJSONObject(key).getString("path_word");
+                String PathName = groups.getJSONObject(key).getString("name");
+                String url = String.format("https://api.copymanga.com/api/v3/comic/%s/group/%s/chapters?limit=500&offset=0", comic.getCid(), path_word);
+                Request request = new Request.Builder().url(url).build();
+                html = getResponseBody(App.getHttpClient(), request);
+                jsonObject = new JSONObject(html);
+                array = jsonObject.getJSONObject("results").getJSONArray("list");
+                for (int i = 0; i < array.length(); ++i) {
+                    String title = array.getJSONObject(i).getString("name");
+                    String path = array.getJSONObject(i).getString("uuid");
+                    list.add(new Chapter(Long.parseLong(sourceComic + "000" + i), sourceComic, title, path, PathName));
+                }
+
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+
         return Lists.reverse(list);
     }
 
diff --git a/app/src/main/java/com/hiroshi/cimoc/ui/adapter/DetailAdapter.java b/app/src/main/java/com/hiroshi/cimoc/ui/adapter/DetailAdapter.java
index 500e22e4..b70e0d8c 100644
--- a/app/src/main/java/com/hiroshi/cimoc/ui/adapter/DetailAdapter.java
+++ b/app/src/main/java/com/hiroshi/cimoc/ui/adapter/DetailAdapter.java
@@ -1,9 +1,18 @@
 package com.hiroshi.cimoc.ui.adapter;
 
 import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
 import android.graphics.Rect;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
+import android.graphics.Typeface;
+import android.text.TextPaint;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -39,9 +48,22 @@ public class DetailAdapter extends BaseAdapter<Chapter> {
     private Boolean Reversed = false;
 
     private String last;
+    Paint textPaint;
+
+    Paint paint;
 
     public DetailAdapter(Context context, List<Chapter> list) {
         super(context, list);
+        textPaint = new TextPaint();
+        textPaint.setTypeface(Typeface.DEFAULT_BOLD);
+        textPaint.setFakeBoldText(true);
+        textPaint.setAntiAlias(true);
+        textPaint.setTextSize(40);//文字大小
+        textPaint.setColor(Color.BLACK);//背景颜色
+        textPaint.setTextAlign(Paint.Align.LEFT);
+        paint = new Paint();
+        paint.setColor(ContextCompat.getColor(context, R.color.transparent));
+
     }
 
     @Override
@@ -53,8 +75,45 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, Recycle
                 if (position == 0) {
                     outRect.set(0, 0, 0, 10);
                 } else {
-                    int offset = parent.getWidth() / 40;
-                    outRect.set(offset, 0, offset, (int) (offset * 1.5));
+                    if (isFirst(position)) {
+                        int offset = parent.getWidth() / 40;
+
+                        outRect.set(offset, 50, offset, (int) (offset * 1.5));
+
+                    } else {
+                        int offset = parent.getWidth() / 40;
+                        outRect.set(offset, 0, offset, (int) (offset * 1.5));
+                    }
+
+
+                }
+            }
+
+            @Override
+            public void onDraw(@NonNull Canvas c, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
+                super.onDraw(c, parent, state);
+                if (parent.getAdapter() != null) {
+                    RecyclerView.Adapter adapter = parent.getAdapter();
+                    int count = parent.getChildCount();
+                    for (int i = 1; i < count; i++) {
+                        View view = parent.getChildAt(i);
+                        int position = parent.getChildLayoutPosition(view);
+                        boolean isHeader = isFirst(position);
+
+                        if (isHeader) {
+                            float top = view.getTop() - 60;
+                            float bottom = view.getTop() - 30;
+                            Rect rect = new Rect(parent.getPaddingLeft(), (int) top, parent.getWidth() - parent.getPaddingRight(), (int) bottom);
+                            c.drawRect(rect, paint);
+                            Paint.FontMetrics fontMetrics = textPaint.getFontMetrics();
+                            float baseline = (rect.bottom + rect.top - fontMetrics.bottom - fontMetrics.top) / 2;
+                            textPaint.setTextAlign(Paint.Align.CENTER);
+                            c.drawText(getGroupName(position), rect.centerX(), baseline, textPaint);
+
+
+                        }  //                            c.drawRect(0, view.getTop() - 1, parent.getWidth(), view.getTop(), mLinePaint);
+
+                    }
                 }
             }
         };
@@ -71,6 +130,22 @@ public void reverse() {
         super.reverse();
     }
 
+    //判断是否分组且当前是否为第一个元素
+    public boolean isFirst(int position) {
+        position = position - 1;
+        if (mDataSet.get(position).getSourceGroup().isEmpty()) return false;
+        if (position == 0) return true;
+        if (position <= 0) {
+            return false;
+        }
+        return !mDataSet.get(position - 1).getSourceGroup().equals(mDataSet.get(position).getSourceGroup());
+    }
+
+    public String getGroupName(int position) {
+        return mDataSet.get(position - 1).getSourceGroup();
+
+    }
+
     @Override
     public int getItemCount() {
         return mDataSet.size() + 1;
@@ -132,7 +207,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
                 ChapterHolder viewHolder = (ChapterHolder) holder;
                 viewHolder.chapterButton.setText(chapter.getTitle());
                 viewHolder.chapterButton.setDownload(chapter.isComplete());
-                if (chapter.getPath() !=null &&chapter.getPath().equals(last)) {
+                if (chapter.getPath() != null && chapter.getPath().equals(last)) {
                     viewHolder.chapterButton.setSelected(true);
                 } else if (viewHolder.chapterButton.isSelected()) {
                     viewHolder.chapterButton.setSelected(false);
@@ -151,7 +226,9 @@ public void onAttachedToRecyclerView(RecyclerView recyclerView) {
         manager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
             @Override
             public int getSpanSize(int position) {
-                return position == 0 ? manager.getSpanCount() : 1;
+                if (position == 0 || isFirst(position)) return manager.getSpanCount();
+
+                return 1;
             }
         });
     }

From 2cea81bd745a2dc49eb9985b3d75ce72cb96a41c Mon Sep 17 00:00:00 2001
From: l <you@example.com>
Date: Mon, 8 Feb 2021 12:04:03 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  2 +-
 .../hiroshi/cimoc/helper/DBOpenHelper.java    | 19 +++++++++++++++++++
 .../java/com/hiroshi/cimoc/model/Chapter.java |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5a3d0820..4ed1b667 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -119,7 +119,7 @@ android {
 }
 
 greendao {
-    schemaVersion 11
+    schemaVersion 12
 }
 
 dependencies {
diff --git a/app/src/main/java/com/hiroshi/cimoc/helper/DBOpenHelper.java b/app/src/main/java/com/hiroshi/cimoc/helper/DBOpenHelper.java
index 92ae877a..fa92954e 100644
--- a/app/src/main/java/com/hiroshi/cimoc/helper/DBOpenHelper.java
+++ b/app/src/main/java/com/hiroshi/cimoc/helper/DBOpenHelper.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
+import android.util.Log;
 
 import com.hiroshi.cimoc.model.ChapterDao;
 import com.hiroshi.cimoc.model.ComicDao;
@@ -11,6 +12,7 @@
 import com.hiroshi.cimoc.model.TagDao;
 import com.hiroshi.cimoc.model.TagRefDao;
 import com.hiroshi.cimoc.model.TaskDao;
+import com.hiroshi.cimoc.utils.StringUtils;
 
 import org.greenrobot.greendao.database.Database;
 
@@ -34,6 +36,7 @@ public void onCreate(Database db) {
 
     @Override
     public void onUpgrade(Database db, int oldVersion, int newVersion) {
+        Log.d("DB", StringUtils.format("DB V:%d,%d", oldVersion, newVersion));
         switch (oldVersion) {
             case 1:
                 SourceDao.createTable(db, false);
@@ -58,9 +61,25 @@ public void onUpgrade(Database db, int oldVersion, int newVersion) {
                 updateIntroAndAuthor(db);
                 ChapterDao.createTable(db, true);
                 ImageUrlDao.createTable(db, true);
+            case 11:
+                updateChapter(db);
+
         }
     }
 
+    private void updateChapter(Database db) {
+        db.beginTransaction();
+        db.execSQL("ALTER TABLE \"CHAPTER\" RENAME TO \"CHAPTER2\"");
+        ChapterDao.createTable(db, false);
+        db.execSQL("INSERT INTO \"CHAPTER\" (\"_id\", \"SOURCE_COMIC\", \"TITLE\", \"PATH\", \"COUNT\", \"COMPLETE\", \"DOWNLOAD\",  \"TID\" , \"SOURCE_GROUP\")" +
+                " SELECT \"_id\", \"SOURCE_COMIC\", \"TITLE\", \"PATH\", \"COUNT\", \"COMPLETE\", \"DOWNLOAD\", \"TID\",\"\" FROM \"CHAPTER2\"");
+        db.execSQL("DROP TABLE \"CHAPTER2\"");
+        db.setTransactionSuccessful();
+        db.endTransaction();
+
+
+    }
+
     private void updateLocal(Database db) {
         db.beginTransaction();
         db.execSQL("ALTER TABLE \"COMIC\" RENAME TO \"COMIC2\"");
diff --git a/app/src/main/java/com/hiroshi/cimoc/model/Chapter.java b/app/src/main/java/com/hiroshi/cimoc/model/Chapter.java
index 97815784..23a84ef9 100644
--- a/app/src/main/java/com/hiroshi/cimoc/model/Chapter.java
+++ b/app/src/main/java/com/hiroshi/cimoc/model/Chapter.java
@@ -84,7 +84,7 @@ public Chapter(Long id, @NotNull Long sourceComic, String title, String path, in
     }
 
     public String getSourceGroup() {
-        return sourceGroup;
+        return sourceGroup == null ? "" : sourceGroup;
     }
 
     public void setSourceGroup(String sourceGroup) {

From 80149b96fe62af64ec50f55f6840b654f8adb777 Mon Sep 17 00:00:00 2001
From: lx200916 <mjt197305@gmail.com>
Date: Mon, 8 Feb 2021 12:20:07 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A5=87=E6=BC=AB?=
 =?UTF-8?q?=E5=B1=8B=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/hiroshi/cimoc/source/QiManWu.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/com/hiroshi/cimoc/source/QiManWu.java b/app/src/main/java/com/hiroshi/cimoc/source/QiManWu.java
index e6e77425..e668393d 100644
--- a/app/src/main/java/com/hiroshi/cimoc/source/QiManWu.java
+++ b/app/src/main/java/com/hiroshi/cimoc/source/QiManWu.java
@@ -151,10 +151,15 @@ public Request getImagesRequest(String cid, String path) {
 
     @Override
     public List<ImageUrl> parseImages(String html, Chapter chapter) {
+
         List<ImageUrl> list = new LinkedList<>();
         String str = StringUtils.match("eval\\((.*?\\}\\))\\)", html, 0);
         try {
             String str1 = DecryptionUtils.evalDecrypt(str, "newImgs");
+            if (str1.isEmpty()) {
+                str1 = DecryptionUtils.evalDecrypt(str);
+
+            }
             String[] array = str1.split(",");
             for (int i = 0; i != array.length; ++i) {
                 Long comicChapter = chapter.getId();

From bbf179c931812d592d4e25d0af88619d70758959 Mon Sep 17 00:00:00 2001
From: lx200916 <mjt197305@gmail.com>
Date: Mon, 8 Feb 2021 12:56:35 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8A=A8=E6=BC=AB=E4=B9=8B=E5=AE=B6=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=87=E7=94=A8=E9=93=BE=E6=8E=A5Dmzj1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java b/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java
index 2b5dd21a..3ace72b2 100644
--- a/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java
+++ b/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java
@@ -133,8 +133,8 @@ public List<Chapter> parseChapter(String html, Comic comic, Long sourceComic) {
                 String comic_id = chapter.getString("comic_id");
                 String chapter_id = chapter.getString("id");
                 String path = comic_id + "/" + chapter_id;
-                list.add(new Chapter(Long.parseLong(sourceComic + "000" + i + 1), sourceComic, title, path));
-                list1.add(new Chapter(Long.parseLong(sourceComic + "001" + i + 1), sourceComic, title.concat(" (备用)"), path + "x"));
+                list.add(new Chapter(Long.parseLong(sourceComic + "000" + i + 1), sourceComic, title, path, "默认线路"));
+                list1.add(new Chapter(Long.parseLong(sourceComic + "001" + i + 1), sourceComic, title.concat(" (备用)"), path + "x", "备用线路"));
 
 
             }

From 1936702791f497d0a237e0199dc32f54006ea84f Mon Sep 17 00:00:00 2001
From: lx200916 <mjt197305@gmail.com>
Date: Mon, 8 Feb 2021 13:32:35 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8DMH160?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/hiroshi/cimoc/source/MH160.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/hiroshi/cimoc/source/MH160.java b/app/src/main/java/com/hiroshi/cimoc/source/MH160.java
index ddc14bd5..edc81330 100644
--- a/app/src/main/java/com/hiroshi/cimoc/source/MH160.java
+++ b/app/src/main/java/com/hiroshi/cimoc/source/MH160.java
@@ -137,12 +137,12 @@ public List<ImageUrl> parseImages(String html, Chapter chapter) {
                 String[] array = str.split("\\$qingtiandy\\$");
                 String preUrl = "";
                 if(Integer.parseInt(str_id)>542724){
-                    preUrl = "https://mhpic5.miyeye.cn:20208";
+                    preUrl = "https://mhpic5.gezhengzhongyi.cn:8443";
                 }else {
                     preUrl = "https://res.gezhengzhongyi.cn:20207";
                 }
                 if (Integer.parseInt(str_id)>884998){
-                    preUrl = "https://mhpic88.miyeye.cn:20207";
+                    preUrl = "https://mhpic88.miyeye.cn:8443";
                 }
 
                 for (int i = 0; i != array.length; ++i) {

From c87cffff16803e29d2e9515a7990e7f5a6f871a2 Mon Sep 17 00:00:00 2001
From: lx200916 <mjt197305@gmail.com>
Date: Wed, 10 Feb 2021 11:22:24 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E5=88=B0=E5=8A=9F=E8=83=BD=20=E9=9C=80=E5=AE=9E=E7=8E=B0=20Url?=
 =?UTF-8?q?Filter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              | 185 ++++++++++++++++++
 .../java/com/hiroshi/cimoc/source/DM5.java    |   2 +
 .../java/com/hiroshi/cimoc/source/Dmzj.java   |   1 +
 .../com/hiroshi/cimoc/source/DmzjFix.java     |  37 ++--
 .../java/com/hiroshi/cimoc/source/MH160.java  |   5 +-
 .../java/com/hiroshi/cimoc/source/YKMH.java   |   7 +
 .../cimoc/ui/activity/BrowserFilter.java      | 135 +++++++++++++
 .../res/layout/activity_browser_filter.xml    |   8 +
 8 files changed, 362 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/java/com/hiroshi/cimoc/ui/activity/BrowserFilter.java
 create mode 100644 app/src/main/res/layout/activity_browser_filter.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cca81598..9dbe9be5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -88,6 +88,191 @@
             android:forceDarkAllowed="false"
             android:theme="@style/AppThemeNoDark"
             android:configChanges="orientation|keyboardHidden|screenSize" />
+        <activity
+            android:name=".ui.activity.BrowserFilter"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="cimoc" />
+                <data
+                    android:host="m.buka.cn"
+                    android:scheme="http" />
+                <data
+                    android:host="m.buka.cn"
+                    android:scheme="https" />
+                <data
+                    android:host="www.dm5.com"
+                    android:scheme="http" />
+                <data
+                    android:host="www.dm5.com"
+                    android:scheme="https" />
+                <data
+                    android:host="tel.dm5.com"
+                    android:scheme="http" />
+                <data
+                    android:host="tel.dm5.com"
+                    android:scheme="https" />
+                <data
+                    android:host="manhua.dmzj.com"
+                    android:scheme="http" />
+                <data
+                    android:host="manhua.dmzj.com"
+                    android:scheme="https" />
+                <data
+                    android:host="m.dmzj.com"
+                    android:scheme="http" />
+                <data
+                    android:host="m.dmzj.com"
+                    android:scheme="https" />
+                <!-- <data
+                    android:host="www.manhuagui.com"
+                    android:scheme="http" />
+                <data
+                    android:host="www.manhuagui.com"
+                    android:scheme="https" />
+                <data
+                    android:host="tw.manhuagui.com"
+                    android:scheme="http" />
+                <data
+                    android:host="tw.manhuagui.com"
+                    android:scheme="https" />
+                <data
+                    android:host="m.manhuagui.com"
+                    android:scheme="http" />
+                <data
+                    android:host="m.manhuagui.com"
+                    android:scheme="https" /> -->
+                <data
+                    android:host="m.5qmh.com"
+                    android:scheme="http" />
+                <data
+                    android:host="m.5qmh.com"
+                    android:scheme="https" />
+                <data
+                    android:host="m.pufei.net"
+                    android:scheme="http" />
+                <data
+                    android:host="m.pufei.net"
+                    android:scheme="https" />
+                <data
+                    android:host="ac.qq.com"
+                    android:scheme="http" />
+                <data
+                    android:host="ac.qq.com"
+                    android:scheme="https" />
+                <data
+                    android:host="m.ac.qq.com"
+                    android:scheme="http" />
+                <data
+                    android:host="m.ac.qq.com"
+                    android:scheme="https" />
+                <data
+                    android:host="www.u17.com"
+                    android:scheme="http" />
+                <data
+                    android:host="www.u17.com"
+                    android:scheme="https" />
+                <data
+                    android:host="www.migudm.cn"
+                    android:scheme="http" />
+                <data
+                    android:host="www.migudm.cn"
+                    android:scheme="https" />
+                <data
+                    android:host="m.migudm.cn"
+                    android:scheme="http" />
+                <data
+                    android:host="m.migudm.cn"
+                    android:scheme="https" />
+                <!-- <data
+                    android:host="h5.manhua.163.com"
+                    android:scheme="http" />
+                <data
+                    android:host="h5.manhua.163.com"
+                    android:scheme="https" /> -->
+                <data
+                    android:host="99770.hhxxee.com"
+                    android:scheme="http" />
+                <data
+                    android:host="99770.hhxxee.com"
+                    android:scheme="https" />
+                <data
+                    android:host="www.cartoonmad.com"
+                    android:scheme="http" />
+                <data
+                    android:host="www.cartoonmad.com"
+                    android:scheme="https" />
+                <data
+                    android:host="www.2animx.com"
+                    android:scheme="http" />
+                <data
+                    android:host="www.2animx.com"
+                    android:scheme="https" />
+                <data
+                    android:host="www.50mh.com"
+                    android:scheme="http" />
+                <data
+                    android:host="www.50mh.com"
+                    android:scheme="https" />
+                <data
+                    android:host="m.50mh.com"
+                    android:scheme="http" />
+                <data
+                    android:host="m.50mh.com"
+                    android:scheme="https" />
+                <data
+                    android:host="www.manhuadb.com"
+                    android:scheme="http" />
+                <data
+                    android:host="www.manhuadb.com"
+                    android:scheme="https" />
+                <data
+                    android:host="m.bnmanhua.com"
+                    android:scheme="http" />
+                <data
+                    android:host="m.bnmanhua.com"
+                    android:scheme="https" />
+                <data
+                    android:host="m.tohomh123.com"
+                    android:scheme="http" />
+                <data
+                    android:host="m.tohomh123.com"
+                    android:scheme="https" />
+                <data
+                    android:host="www.chuixue.net"
+                    android:scheme="http" />
+                <data
+                    android:host="www.chuixue.net"
+                    android:scheme="https" />
+                <data
+                    android:host="m.517manhua.com"
+                    android:scheme="http" />
+                <data
+                    android:host="m.517manhua.com"
+                    android:scheme="https" />
+                <data
+                    android:host="m.ykmh.com"
+                    android:scheme="https" />
+                <data
+                    android:host="m.mh160.xyz"
+                    android:scheme="https" />
+                <data
+                    android:host="www.mh160.xyz"
+                    android:scheme="https" />
+            </intent-filter>
+        </activity>
 
         <service android:name=".service.DownloadService" />
 
diff --git a/app/src/main/java/com/hiroshi/cimoc/source/DM5.java b/app/src/main/java/com/hiroshi/cimoc/source/DM5.java
index 78d9e41f..886368a0 100644
--- a/app/src/main/java/com/hiroshi/cimoc/source/DM5.java
+++ b/app/src/main/java/com/hiroshi/cimoc/source/DM5.java
@@ -99,6 +99,8 @@ public String getUrl(String cid) {
     protected void initUrlFilterList() {
         filter.add(new UrlFilter("www.dm5.com", "/([\\w\\-]+)"));
         filter.add(new UrlFilter("tel.dm5.com", "/([\\w\\-]+)"));
+        filter.add(new UrlFilter("m.dm5.com", "/([\\w\\-]+)"));
+
     }
 
     @Override
diff --git a/app/src/main/java/com/hiroshi/cimoc/source/Dmzj.java b/app/src/main/java/com/hiroshi/cimoc/source/Dmzj.java
index 992c969a..d6a7d6ab 100644
--- a/app/src/main/java/com/hiroshi/cimoc/source/Dmzj.java
+++ b/app/src/main/java/com/hiroshi/cimoc/source/Dmzj.java
@@ -10,6 +10,7 @@
 import com.hiroshi.cimoc.parser.MangaCategory;
 import com.hiroshi.cimoc.parser.MangaParser;
 import com.hiroshi.cimoc.parser.SearchIterator;
+import com.hiroshi.cimoc.parser.UrlFilter;
 import com.hiroshi.cimoc.utils.LogUtil;
 import com.hiroshi.cimoc.utils.StringUtils;
 import com.hiroshi.cimoc.utils.UicodeBackslashU;
diff --git a/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java b/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java
index 3ace72b2..b374f6d8 100644
--- a/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java
+++ b/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java
@@ -29,6 +29,8 @@
 import okhttp3.Headers;
 import okhttp3.Request;
 
+import static com.hiroshi.cimoc.utils.HttpUtils.getSimpleMobileRequest;
+
 public class DmzjFix extends MangaParser {
     public static final int TYPE = 100;
     public static final String DEFAULT_TITLE = "动漫之家v2Fix";
@@ -48,36 +50,30 @@ protected void initUrlFilterList() {
     }
 
     @Override
-    public Request getSearchRequest(String keyword, int page) throws UnsupportedEncodingException, Exception {
+    public Request getSearchRequest(String keyword, int page) {
         if (page == 1) {
-            String url = StringUtils.format("https://m.dmzj.com/search/%s.html", keyword);
-            return new Request.Builder().url(url).build();
+            String url = StringUtils.format("http://s.acg.dmzj1.com/comicsum/search.php?s=%s", keyword, page - 1);
+            return getSimpleMobileRequest(url);
         }
         return null;
     }
 
     @Override
-    public String getUrl(String cid) {
-        return StringUtils.format("http://m.dmzj.com/info/%s.html", cid);
-    }
-
-    @Override
-    public SearchIterator getSearchIterator(String html, int page) throws JSONException {
+    public SearchIterator getSearchIterator(String html, int page) {
         try {
-            String JsonString = StringUtils.match("var serchArry=(\\[\\{.*?\\}\\])", html, 1);
+            String JsonString = StringUtils.match("var g_search_data = (.*?);", html, 1);
             String decodeJsonString = UicodeBackslashU.unicodeToCn(JsonString).replace("\\/", "/");
+
             return new JsonIterator(new JSONArray(decodeJsonString)) {
                 @Override
                 protected Comic parse(JSONObject object) {
                     try {
                         String cid = object.getString("id");
-                        String title = object.getString("name");
-                        String cover = object.getString("cover");
-                        cover = "https://images.dmzj.com/" + cover;
-                        String author = object.optString("authors");
-                        long time = Long.parseLong(object.getString("last_updatetime")) * 1000;
-                        String update = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(new Date(time));
-                        return new Comic(TYPE, cid, title, cover, update, author);
+                        String title = object.getString("comic_name");
+                        String cover = object.getString("comic_cover");
+                        if (cover.startsWith("//")) cover = "https:" + cover;
+                        String author = object.optString("comic_author");
+                        return new Comic(TYPE, cid, title, cover, null, author);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -90,6 +86,13 @@ protected Comic parse(JSONObject object) {
         return null;
     }
 
+
+    @Override
+    public String getUrl(String cid) {
+        return StringUtils.format("http://m.dmzj.com/info/%s.html", cid);
+    }
+
+
     @Override
     public Request getInfoRequest(String cid) {
         String url = StringUtils.format("http://api.dmzj.com/dynamic/comicinfo/%s.json", cid);
diff --git a/app/src/main/java/com/hiroshi/cimoc/source/MH160.java b/app/src/main/java/com/hiroshi/cimoc/source/MH160.java
index ddc14bd5..d134e401 100644
--- a/app/src/main/java/com/hiroshi/cimoc/source/MH160.java
+++ b/app/src/main/java/com/hiroshi/cimoc/source/MH160.java
@@ -17,6 +17,7 @@
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -77,7 +78,9 @@ public String getUrl(String cid) {
 
     @Override
     protected void initUrlFilterList() {
-        filter.add(new UrlFilter("www.mh160.xyz"));
+        filter.add(new UrlFilter("www.mh160.xyz", "(//(.+s)//)"));
+        filter.add(new UrlFilter("m.mh160.xyz", "/kanmanhua//(.+s)//"));
+
     }
 
     @Override
diff --git a/app/src/main/java/com/hiroshi/cimoc/source/YKMH.java b/app/src/main/java/com/hiroshi/cimoc/source/YKMH.java
index 0b8e0ab8..bc820027 100644
--- a/app/src/main/java/com/hiroshi/cimoc/source/YKMH.java
+++ b/app/src/main/java/com/hiroshi/cimoc/source/YKMH.java
@@ -10,6 +10,7 @@
 import com.hiroshi.cimoc.parser.MangaParser;
 import com.hiroshi.cimoc.parser.NodeIterator;
 import com.hiroshi.cimoc.parser.SearchIterator;
+import com.hiroshi.cimoc.parser.UrlFilter;
 import com.hiroshi.cimoc.soup.Node;
 import com.hiroshi.cimoc.utils.StringUtils;
 
@@ -69,6 +70,12 @@ public String getUrl(String cid) {
         return StringUtils.format("%smanhua/%s", mHost, cid);
     }
 
+    @Override
+    protected void initUrlFilterList() {
+        filter.add(new UrlFilter("m.ykmh.com", "/manhua/(\\w.+)/"));
+
+    }
+
     @Override
     public Headers getHeader() {
         return Headers.of("Referer", "https://m.ykmh.com/search/", "user-agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36");
diff --git a/app/src/main/java/com/hiroshi/cimoc/ui/activity/BrowserFilter.java b/app/src/main/java/com/hiroshi/cimoc/ui/activity/BrowserFilter.java
new file mode 100644
index 00000000..f7871769
--- /dev/null
+++ b/app/src/main/java/com/hiroshi/cimoc/ui/activity/BrowserFilter.java
@@ -0,0 +1,135 @@
+package com.hiroshi.cimoc.ui.activity;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.widget.Toast;
+
+import com.hiroshi.cimoc.R;
+import com.hiroshi.cimoc.manager.SourceManager;
+import com.hiroshi.cimoc.source.Animx2;
+import com.hiroshi.cimoc.source.BaiNian;
+import com.hiroshi.cimoc.source.BuKa;
+import com.hiroshi.cimoc.source.Cartoonmad;
+import com.hiroshi.cimoc.source.ChuiXue;
+import com.hiroshi.cimoc.source.DM5;
+import com.hiroshi.cimoc.source.Dmzjv2;
+import com.hiroshi.cimoc.source.Hhxxee;
+import com.hiroshi.cimoc.source.IKanman;
+import com.hiroshi.cimoc.source.MH50;
+import com.hiroshi.cimoc.source.MH517;
+import com.hiroshi.cimoc.source.MH57;
+import com.hiroshi.cimoc.source.ManHuaDB;
+import com.hiroshi.cimoc.source.MiGu;
+import com.hiroshi.cimoc.source.PuFei;
+import com.hiroshi.cimoc.source.Tencent;
+import com.hiroshi.cimoc.source.TuHao;
+import com.hiroshi.cimoc.source.U17;
+import com.hiroshi.cimoc.source.YKMH;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BrowserFilter extends BaseActivity {
+
+    @Override
+    protected int getLayoutRes() {
+        return R.layout.activity_browser_filter;
+    }
+
+    @Override
+    protected String getDefaultTitle() {
+        return "jumping...";
+    }
+
+//    private Parser parser;
+//    private SourceManager mSourceManager;
+
+    public void openDetailActivity(int source, String comicId) {
+        Intent intent = DetailActivity.createIntent(this, null, source, comicId);
+        startActivity(intent);
+    }
+
+//    public void openReaderActivity(int source,String comicId) {
+//        Intent intent = DetailActivity.createIntent(this, null, source, comicId);
+//        startActivity(intent);
+//    }
+
+    private List<Integer> registUrlListener() {
+        List<Integer> list = new ArrayList<>();
+
+        list.add(Dmzjv2.TYPE);
+        list.add(BuKa.TYPE);
+        list.add(PuFei.TYPE);
+        list.add(Cartoonmad.TYPE);
+        list.add(Animx2.TYPE);
+        list.add(MH517.TYPE);
+        list.add(BaiNian.TYPE);
+        list.add(MiGu.TYPE);
+        list.add(Tencent.TYPE);
+        list.add(U17.TYPE);
+        list.add(MH57.TYPE);
+        list.add(MH50.TYPE);
+        list.add(DM5.TYPE);
+        list.add(IKanman.TYPE);
+        list.add(Hhxxee.TYPE);
+        list.add(BaiNian.TYPE);
+        list.add(ChuiXue.TYPE);
+        list.add(ManHuaDB.TYPE);
+        list.add(TuHao.TYPE);
+        list.add(YKMH.TYPE);
+
+        return list;
+    }
+
+    private void openReader(Uri uri) {
+        try {
+            SourceManager mSourceManager = SourceManager.getInstance(this);
+            String comicId;
+
+            for (int i : registUrlListener()) {
+                if (mSourceManager.getParser(i).isHere(uri)
+                        && ((comicId = mSourceManager.getParser(i).getComicId(uri)) != null)) {
+                    openDetailActivity(i, comicId);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    private void openReaderByIntent(Intent intent) {
+        String action = intent.getAction();
+        String type = intent.getType();
+
+        //来自url
+        if (Intent.ACTION_VIEW.equals(action)) {
+            Uri uri = intent.getData();
+            if (uri != null) {
+                openReader(uri);
+            } else {
+                Toast.makeText(this, "url不合法", Toast.LENGTH_SHORT);
+            }
+        }
+
+        //来自分享
+        if (Intent.ACTION_SEND.equals(action) && "text/plain".equals(type)) {
+            try {
+                openReader(Uri.parse(intent.getStringExtra(Intent.EXTRA_TEXT).replace("https://m.ykmh.com", "https://m.ykmh.com/")));
+            } catch (Exception ex) {
+                Toast.makeText(this, "url不合法", Toast.LENGTH_SHORT);
+            }
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_browser_filter);
+
+        openReaderByIntent(getIntent());
+
+        finish();
+    }
+}
diff --git a/app/src/main/res/layout/activity_browser_filter.xml b/app/src/main/res/layout/activity_browser_filter.xml
new file mode 100644
index 00000000..4bf59db5
--- /dev/null
+++ b/app/src/main/res/layout/activity_browser_filter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.activity.BrowserFilter">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 6ae40cea7a20408c53bd332d5bf73b4f3600ff9b Mon Sep 17 00:00:00 2001
From: lx200916 <mjt197305@gmail.com>
Date: Wed, 10 Feb 2021 11:27:17 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E5=88=B0=E5=8A=9F=E8=83=BD=20=E9=9C=80=E5=AE=9E=E7=8E=B0=20Url?=
 =?UTF-8?q?Filter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hiroshi/cimoc/source/DmzjFix.java     | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java b/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java
index b374f6d8..3ace72b2 100644
--- a/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java
+++ b/app/src/main/java/com/hiroshi/cimoc/source/DmzjFix.java
@@ -29,8 +29,6 @@
 import okhttp3.Headers;
 import okhttp3.Request;
 
-import static com.hiroshi.cimoc.utils.HttpUtils.getSimpleMobileRequest;
-
 public class DmzjFix extends MangaParser {
     public static final int TYPE = 100;
     public static final String DEFAULT_TITLE = "动漫之家v2Fix";
@@ -50,30 +48,36 @@ protected void initUrlFilterList() {
     }
 
     @Override
-    public Request getSearchRequest(String keyword, int page) {
+    public Request getSearchRequest(String keyword, int page) throws UnsupportedEncodingException, Exception {
         if (page == 1) {
-            String url = StringUtils.format("http://s.acg.dmzj1.com/comicsum/search.php?s=%s", keyword, page - 1);
-            return getSimpleMobileRequest(url);
+            String url = StringUtils.format("https://m.dmzj.com/search/%s.html", keyword);
+            return new Request.Builder().url(url).build();
         }
         return null;
     }
 
     @Override
-    public SearchIterator getSearchIterator(String html, int page) {
+    public String getUrl(String cid) {
+        return StringUtils.format("http://m.dmzj.com/info/%s.html", cid);
+    }
+
+    @Override
+    public SearchIterator getSearchIterator(String html, int page) throws JSONException {
         try {
-            String JsonString = StringUtils.match("var g_search_data = (.*?);", html, 1);
+            String JsonString = StringUtils.match("var serchArry=(\\[\\{.*?\\}\\])", html, 1);
             String decodeJsonString = UicodeBackslashU.unicodeToCn(JsonString).replace("\\/", "/");
-
             return new JsonIterator(new JSONArray(decodeJsonString)) {
                 @Override
                 protected Comic parse(JSONObject object) {
                     try {
                         String cid = object.getString("id");
-                        String title = object.getString("comic_name");
-                        String cover = object.getString("comic_cover");
-                        if (cover.startsWith("//")) cover = "https:" + cover;
-                        String author = object.optString("comic_author");
-                        return new Comic(TYPE, cid, title, cover, null, author);
+                        String title = object.getString("name");
+                        String cover = object.getString("cover");
+                        cover = "https://images.dmzj.com/" + cover;
+                        String author = object.optString("authors");
+                        long time = Long.parseLong(object.getString("last_updatetime")) * 1000;
+                        String update = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(new Date(time));
+                        return new Comic(TYPE, cid, title, cover, update, author);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -86,13 +90,6 @@ protected Comic parse(JSONObject object) {
         return null;
     }
 
-
-    @Override
-    public String getUrl(String cid) {
-        return StringUtils.format("http://m.dmzj.com/info/%s.html", cid);
-    }
-
-
     @Override
     public Request getInfoRequest(String cid) {
         String url = StringUtils.format("http://api.dmzj.com/dynamic/comicinfo/%s.json", cid);

From fbcfb508a22bf5394d8be233dea945d995e6f27d Mon Sep 17 00:00:00 2001
From: lx200916 <mjt197305@gmail.com>
Date: Wed, 10 Feb 2021 12:42:32 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=8EChrome?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E4=BC=98=E9=85=B7=E6=BC=AB=E7=94=BBurl?=
 =?UTF-8?q?=E6=97=B6=E5=87=BA=E7=8E=B0=E7=9A=84=E8=8E=AB=E5=90=8D=E5=85=B6?=
 =?UTF-8?q?=E5=A6=99Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/hiroshi/cimoc/ui/activity/BrowserFilter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/hiroshi/cimoc/ui/activity/BrowserFilter.java b/app/src/main/java/com/hiroshi/cimoc/ui/activity/BrowserFilter.java
index f7871769..e66409fa 100644
--- a/app/src/main/java/com/hiroshi/cimoc/ui/activity/BrowserFilter.java
+++ b/app/src/main/java/com/hiroshi/cimoc/ui/activity/BrowserFilter.java
@@ -116,7 +116,7 @@ private void openReaderByIntent(Intent intent) {
         //来自分享
         if (Intent.ACTION_SEND.equals(action) && "text/plain".equals(type)) {
             try {
-                openReader(Uri.parse(intent.getStringExtra(Intent.EXTRA_TEXT).replace("https://m.ykmh.com", "https://m.ykmh.com/")));
+                openReader(Uri.parse(intent.getStringExtra(Intent.EXTRA_TEXT).replace("https://m.ykmh.commanhua", "https://m.ykmh.com/manhua")));
             } catch (Exception ex) {
                 Toast.makeText(this, "url不合法", Toast.LENGTH_SHORT);
             }

From ce24139bbe2861f19af43c45e83ada3ec50f3e56 Mon Sep 17 00:00:00 2001
From: lx200916 <mjt197305@gmail.com>
Date: Sat, 13 Feb 2021 09:17:28 +0800
Subject: [PATCH 14/14] Fix 997700

---
 app/src/main/java/com/hiroshi/cimoc/source/Hhxxee.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/hiroshi/cimoc/source/Hhxxee.java b/app/src/main/java/com/hiroshi/cimoc/source/Hhxxee.java
index df1b31c2..177b05d5 100644
--- a/app/src/main/java/com/hiroshi/cimoc/source/Hhxxee.java
+++ b/app/src/main/java/com/hiroshi/cimoc/source/Hhxxee.java
@@ -96,8 +96,9 @@ public Comic parseInfo(String html, Comic comic) throws UnsupportedEncodingExcep
         Node body = new Node(html);
         String title = body.text(".cTitle");
         String cover = body.src(".cDefaultImg > img");
-        String update = "";
-        String author = "";
+        String update = body.text(".cInfoTxt  tr:nth-child(5) > td:last-child").trim().split("更新時間:")[1];
+        String author = body.text(".cInfoTxt  tr:nth-child(2) > td:last-child").trim();
+        ;
         String intro = body.text(".cCon");
         boolean status = false;
         comic.setInfo(title, cover, update, intro, author, status);
@@ -108,7 +109,7 @@ public Comic parseInfo(String html, Comic comic) throws UnsupportedEncodingExcep
     public List<Chapter> parseChapter(String html, Comic comic, Long sourceComic) {
         List<Chapter> list = new LinkedList<>();
         int i=0;
-        for (Node node : new Node(html).list("#subBookListAct > div")) {
+        for (Node node : new Node(html).list(".cVolList > div")) {
             String title = node.text("a");
             String path = node.hrefWithSplit("a", 2);
             list.add(new Chapter(Long.parseLong(sourceComic + "000" + i++), sourceComic, title, path));