fix CCTuKu

Haleydu · Jan 21, 2021 · a101984 · a101984
1 parent 8284d88
commit a101984
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 33 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -18,7 +18,7 @@ else {
     buildVersion = cmdGetCommitNums.execute().text.trim().toInteger()
     cmdGetTagname = 'git describe --abbrev=0'
 
-    buildVersion = 157
+    buildVersion = 165
     version = cmdGetTagname.execute().text.trim()
 }
 

diff --git a/app/src/main/java/com/hiroshi/cimoc/source/CCTuku.java b/app/src/main/java/com/hiroshi/cimoc/source/CCTuku.java
@@ -95,6 +95,12 @@ public List<Chapter> parseChapter(String html, Comic comic, Long sourceComic) {
         for (Node node : body.list("#chapter > div > div > ul > li > a")) {
             String title = node.text();
             String path = node.hrefWithSplit(2);
+            if (path == null) {
+                path = "";
+            }
+            if (title == null) {
+                title = "";
+            }
             list.add(new Chapter(Long.parseLong(sourceComic + "000" + i++), sourceComic, title, path));
         }
         return list;

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
@@ -243,13 +243,17 @@ private void initLayoutManager() {
 
     @Override
     protected void initData() {
-        mClickArray = mode == PreferenceManager.READER_MODE_PAGE ?
-                ClickEvents.getPageClickEventChoice(mPreference) : ClickEvents.getStreamClickEventChoice(mPreference);
-        mLongClickArray = mode == PreferenceManager.READER_MODE_PAGE ?
-                ClickEvents.getPageLongClickEventChoice(mPreference) : ClickEvents.getStreamLongClickEventChoice(mPreference);
-        long id = getIntent().getLongExtra(Extra.EXTRA_ID, -1);
-        List<Chapter> list = getIntent().getParcelableArrayListExtra(Extra.EXTRA_CHAPTER);
-        mPresenter.loadInit(id, Objects.requireNonNull(list).toArray(new Chapter[list.size()]));
+        try {
+            mClickArray = mode == PreferenceManager.READER_MODE_PAGE ?
+                    ClickEvents.getPageClickEventChoice(mPreference) : ClickEvents.getStreamClickEventChoice(mPreference);
+            mLongClickArray = mode == PreferenceManager.READER_MODE_PAGE ?
+                    ClickEvents.getPageLongClickEventChoice(mPreference) : ClickEvents.getStreamLongClickEventChoice(mPreference);
+            long id = getIntent().getLongExtra(Extra.EXTRA_ID, -1);
+            List<Chapter> list = getIntent().getParcelableArrayListExtra(Extra.EXTRA_CHAPTER);
+            mPresenter.loadInit(id, Objects.requireNonNull(list).toArray(new Chapter[list.size()]));
+        }catch (Exception e){
+            e.printStackTrace();
+        }
     }
 
     @Override

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
@@ -89,35 +89,40 @@ public void setInfo(String cover, String title, String author, String intro, Boo
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
         super.onBindViewHolder(holder, position);
-        if (position == 0) {
-            HeaderHolder headerHolder = (HeaderHolder) holder;
-            AdRequest adRequest = new AdRequest.Builder().build();
-            headerHolder.mAdView.loadAd(adRequest);
-            if (title != null) {
-                if (cover != null) {
-                    headerHolder.mComicImage.setController(mControllerSupplier.get().setUri(cover).build());
+        try {
+            if (position == 0) {
+                HeaderHolder headerHolder = (HeaderHolder) holder;
+                AdRequest adRequest = new AdRequest.Builder().build();
+                headerHolder.mAdView.loadAd(adRequest);
+                if (title != null) {
+                    if (cover != null) {
+                        headerHolder.mComicImage.setController(mControllerSupplier.get().setUri(cover).build());
+                    }
+                    headerHolder.mComicTitle.setText(title);
+                    headerHolder.mComicIntro.setText(intro);
+                    if (finish != null) {
+                        headerHolder.mComicStatus.setText(finish ? "完结" : "连载中");
+                    }
+                    if (update != null) {
+                        headerHolder.mComicUpdate.setText("最后更新：".concat(update));
+                    }
+                    headerHolder.mComicAuthor.setText(author);
                 }
-                headerHolder.mComicTitle.setText(title);
-                headerHolder.mComicIntro.setText(intro);
-                if (finish != null) {
-                    headerHolder.mComicStatus.setText(finish ? "完结" : "连载中");
+            } else {
+                Chapter chapter = mDataSet.get(position - 1);
+                ChapterHolder viewHolder = (ChapterHolder) holder;
+                viewHolder.chapterButton.setText(chapter.getTitle());
+                viewHolder.chapterButton.setDownload(chapter.isComplete());
+                if (chapter.getPath() !=null &&chapter.getPath().equals(last)) {
+                    viewHolder.chapterButton.setSelected(true);
+                } else if (viewHolder.chapterButton.isSelected()) {
+                    viewHolder.chapterButton.setSelected(false);
                 }
-                if (update != null) {
-                    headerHolder.mComicUpdate.setText("最后更新：".concat(update));
-                }
-                headerHolder.mComicAuthor.setText(author);
-            }
-        } else {
-            Chapter chapter = mDataSet.get(position - 1);
-            ChapterHolder viewHolder = (ChapterHolder) holder;
-            viewHolder.chapterButton.setText(chapter.getTitle());
-            viewHolder.chapterButton.setDownload(chapter.isComplete());
-            if (chapter.getPath().equals(last)) {
-                viewHolder.chapterButton.setSelected(true);
-            } else if (viewHolder.chapterButton.isSelected()) {
-                viewHolder.chapterButton.setSelected(false);
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
+
     }
 
     @Override