更新

app/build.gradle

@@ -62,7 +62,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "com.gedoor.monkeybook.super"
+        applicationId "com.nick.monkeybook.super"
         minSdkVersion min_sdk_version
         targetSdkVersion target_sdk_version
         versionCode currentVersionCode
@@ -113,6 +113,11 @@ configurations.all {
         }
     }
 }
+repositories {
+    flatDir {
+        dirs 'libs'
+    }
+}
 
 dependencies {
     implementation project(':basemvplib')

app/src/main/java/com/monke/monkeybook/bean/BookShelfBean.java

@@ -531,4 +531,10 @@ public String getVariable(String key) {
         }
         return variableStore.getVariable(key);
     }
+
+
+    public int getUnreadChapterNum() {
+        int num = getChapterListSize() - getDurChapter() - 1;
+        return num < 0 ? 0 : num;
+    }
 }

app/src/main/java/com/monke/monkeybook/bean/SearchBookBean.java

@@ -150,7 +150,7 @@ public void setNoteUrl(String noteUrl) {
 
     public String getRealNoteUrl() {
         if (!StringUtils.isBlank(noteUrl)
-                && noteUrl.startsWith("@716:")) {
+                && noteUrl.startsWith("@SQi:")) {
             return noteUrl.substring(5);
         }
         return noteUrl;

app/src/main/java/com/monke/monkeybook/model/SearchBookModel.java

@@ -13,7 +13,6 @@
 import com.monke.monkeybook.bean.SearchEngine;
 import com.monke.monkeybook.help.AppConfigHelper;
 import com.monke.monkeybook.model.annotation.BookType;
-import com.monke.monkeybook.model.content.Default716;
 import com.monke.monkeybook.model.content.DefaultShuqi;
 import com.monke.monkeybook.model.impl.ISearchTask;
 import com.monke.monkeybook.model.task.SearchTaskImpl;
@@ -36,7 +35,6 @@ public class SearchBookModel implements ISearchTask.OnSearchingListener {
     private String group;
     private SearchListener searchListener;
     private boolean searchEngineChanged = false;
-    private boolean useMy716;
     private boolean useShuqi;
     private final List<SearchEngine> searchEngineS = new ArrayList<>();
     private final List<ISearchTask> searchTasks = new ArrayList<>();
@@ -91,14 +89,10 @@ public SearchBookModel(Context context) {
     /**
      * 搜索引擎初始化
      */
-    private void initSearchEngineS() {
+    public void initSearchEngineS() {
         if (!searchEngineS.isEmpty()) {
             searchEngineS.clear();
         }
-
-        if (useMy716) {
-            searchEngineS.add(new SearchEngine(Default716.TAG));
-        }
         if (useShuqi) {
             searchEngineS.add(new SearchEngine(DefaultShuqi.TAG));
         }
@@ -108,7 +102,7 @@ private void initSearchEngineS() {
                 if (searchBookType != null && !TextUtils.equals(bookSourceBean.getBookSourceType(), searchBookType)) {
                     continue;
                 }
-                searchEngineS.add(new SearchEngine(bookSourceBean.getBookSourceUrl()));
+                 searchEngineS.add(new SearchEngine(bookSourceBean.getBookSourceUrl()));
             }
         }
         searchEngineChanged = false;
@@ -123,6 +117,7 @@ public void startSearch(String query) {
 
         if (searchEngineChanged || searchEngineS.isEmpty()) {
             initSearchEngineS();
+            //searchHandler.obtainMessage(SearchHandler.MSG_EMPTY).sendToTarget();
         } else {
             for (SearchEngine searchEngine : searchEngineS) {
                 searchEngine.searchReset();
@@ -192,11 +187,6 @@ public SearchBookModel listener(SearchListener listener) {
         return this;
     }
 
-    public SearchBookModel useMy716(boolean useMy716) {
-        this.useMy716 = useMy716;
-        return this;
-    }
-
     public SearchBookModel useShuqi(boolean useShuqi) {
         this.useShuqi = useShuqi;
         return this;

app/src/main/java/com/monke/monkeybook/model/WebBookModel.java

@@ -10,7 +10,6 @@
 import com.monke.monkeybook.bean.SearchBookBean;
 import com.monke.monkeybook.help.BookshelfHelp;
 import com.monke.monkeybook.help.ChapterContentHelp;
-import com.monke.monkeybook.model.content.Default716;
 import com.monke.monkeybook.model.content.DefaultModel;
 import com.monke.monkeybook.model.content.DefaultShuqi;
 import com.monke.monkeybook.model.impl.IAudioBookChapterModel;
@@ -22,7 +21,6 @@
 import java.util.Objects;
 
 import io.reactivex.Observable;
-import io.reactivex.schedulers.Schedulers;
 
 public class WebBookModel implements IWebBookModel {
 
@@ -132,8 +130,6 @@ public Observable<List<SearchBookBean>> findBook(String tag, String url, int pag
     private IStationBookModel getBookSourceModel(String tag) {
         if (BookShelfBean.LOCAL_TAG.equals(tag)) {
             return null;
-        } else if (TextUtils.equals(tag, Default716.TAG)) {
-            return Default716.getInstance();
         } else if (TextUtils.equals(tag, DefaultShuqi.TAG)) {
             return DefaultShuqi.getInstance();
         } else {