diff --git a/app/build.gradle b/app/build.gradle index 99089f6..b0e1e3c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.monke.monkeybook" minSdkVersion 17 targetSdkVersion 25 - versionCode 8 - versionName "1.2.3" + versionCode 9 + versionName "1.2.4" manifestPlaceholders = [UMENG_CHANNEL_VALUE: "debug"] } @@ -23,7 +23,6 @@ android { } } - lintOptions { abortOnError false } diff --git a/app/src/main/java/com/monke/monkeybook/BitIntentDataManager.java b/app/src/main/java/com/monke/monkeybook/BitIntentDataManager.java index 9db86da..139f98f 100644 --- a/app/src/main/java/com/monke/monkeybook/BitIntentDataManager.java +++ b/app/src/main/java/com/monke/monkeybook/BitIntentDataManager.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook; import java.util.HashMap; diff --git a/app/src/main/java/com/monke/monkeybook/ErrorAnalyContentManager.java b/app/src/main/java/com/monke/monkeybook/ErrorAnalyContentManager.java index e99adda..a08608f 100644 --- a/app/src/main/java/com/monke/monkeybook/ErrorAnalyContentManager.java +++ b/app/src/main/java/com/monke/monkeybook/ErrorAnalyContentManager.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook; import com.monke.monkeybook.base.observer.SimpleObserver; diff --git a/app/src/main/java/com/monke/monkeybook/MApplication.java b/app/src/main/java/com/monke/monkeybook/MApplication.java index 01c8911..058a202 100644 --- a/app/src/main/java/com/monke/monkeybook/MApplication.java +++ b/app/src/main/java/com/monke/monkeybook/MApplication.java @@ -1,11 +1,10 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook; import android.app.Application; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; -import android.widget.Toast; - import com.monke.monkeybook.service.DownloadService; import com.umeng.analytics.MobclickAgent; diff --git a/app/src/main/java/com/monke/monkeybook/ReadBookControl.java b/app/src/main/java/com/monke/monkeybook/ReadBookControl.java index c7f4412..f88e7d3 100644 --- a/app/src/main/java/com/monke/monkeybook/ReadBookControl.java +++ b/app/src/main/java/com/monke/monkeybook/ReadBookControl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook; import android.content.SharedPreferences; diff --git a/app/src/main/java/com/monke/monkeybook/base/MBaseActivity.java b/app/src/main/java/com/monke/monkeybook/base/MBaseActivity.java index c5d0afb..2023c0c 100644 --- a/app/src/main/java/com/monke/monkeybook/base/MBaseActivity.java +++ b/app/src/main/java/com/monke/monkeybook/base/MBaseActivity.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.base; import com.monke.basemvplib.IPresenter; diff --git a/app/src/main/java/com/monke/monkeybook/base/observer/SimpleObserClass.java b/app/src/main/java/com/monke/monkeybook/base/observer/SimpleObserClass.java index d59fbde..eebb0e3 100644 --- a/app/src/main/java/com/monke/monkeybook/base/observer/SimpleObserClass.java +++ b/app/src/main/java/com/monke/monkeybook/base/observer/SimpleObserClass.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.base.observer; import com.monke.monkeybook.utils.NetworkUtil; diff --git a/app/src/main/java/com/monke/monkeybook/base/observer/SimpleObserver.java b/app/src/main/java/com/monke/monkeybook/base/observer/SimpleObserver.java index fc0629d..f445a84 100644 --- a/app/src/main/java/com/monke/monkeybook/base/observer/SimpleObserver.java +++ b/app/src/main/java/com/monke/monkeybook/base/observer/SimpleObserver.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.base.observer; import io.reactivex.Observer; diff --git a/app/src/main/java/com/monke/monkeybook/bean/BookContentBean.java b/app/src/main/java/com/monke/monkeybook/bean/BookContentBean.java index fe88769..c0d31ea 100644 --- a/app/src/main/java/com/monke/monkeybook/bean/BookContentBean.java +++ b/app/src/main/java/com/monke/monkeybook/bean/BookContentBean.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.bean; import android.os.Parcel; diff --git a/app/src/main/java/com/monke/monkeybook/bean/BookInfoBean.java b/app/src/main/java/com/monke/monkeybook/bean/BookInfoBean.java index d039795..43c254d 100644 --- a/app/src/main/java/com/monke/monkeybook/bean/BookInfoBean.java +++ b/app/src/main/java/com/monke/monkeybook/bean/BookInfoBean.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.bean; import android.os.Parcel; diff --git a/app/src/main/java/com/monke/monkeybook/bean/BookShelfBean.java b/app/src/main/java/com/monke/monkeybook/bean/BookShelfBean.java index 7064192..0a6ee7e 100644 --- a/app/src/main/java/com/monke/monkeybook/bean/BookShelfBean.java +++ b/app/src/main/java/com/monke/monkeybook/bean/BookShelfBean.java @@ -1,6 +1,6 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.bean; - import android.os.Parcel; import android.os.Parcelable; import com.monke.monkeybook.widget.contentswitchview.BookContentView; diff --git a/app/src/main/java/com/monke/monkeybook/bean/ChapterListBean.java b/app/src/main/java/com/monke/monkeybook/bean/ChapterListBean.java index b41bff0..e34ae8a 100644 --- a/app/src/main/java/com/monke/monkeybook/bean/ChapterListBean.java +++ b/app/src/main/java/com/monke/monkeybook/bean/ChapterListBean.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.bean; import android.os.Parcel; @@ -7,6 +8,9 @@ import org.greenrobot.greendao.annotation.Id; import org.greenrobot.greendao.annotation.Transient; import org.greenrobot.greendao.annotation.Generated; +/** + * 章节列表 + */ @Entity public class ChapterListBean implements Parcelable,Cloneable{ diff --git a/app/src/main/java/com/monke/monkeybook/bean/DownloadChapterBean.java b/app/src/main/java/com/monke/monkeybook/bean/DownloadChapterBean.java index 23dac48..6f7f51e 100644 --- a/app/src/main/java/com/monke/monkeybook/bean/DownloadChapterBean.java +++ b/app/src/main/java/com/monke/monkeybook/bean/DownloadChapterBean.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.bean; import android.os.Parcel; diff --git a/app/src/main/java/com/monke/monkeybook/bean/DownloadChapterListBean.java b/app/src/main/java/com/monke/monkeybook/bean/DownloadChapterListBean.java index 8330253..8bc10ca 100644 --- a/app/src/main/java/com/monke/monkeybook/bean/DownloadChapterListBean.java +++ b/app/src/main/java/com/monke/monkeybook/bean/DownloadChapterListBean.java @@ -1,11 +1,14 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.bean; import android.os.Parcel; import android.os.Parcelable; - import java.util.ArrayList; import java.util.List; +/** + * 下载章节列表 + */ public class DownloadChapterListBean implements Parcelable { private List data; diff --git a/app/src/main/java/com/monke/monkeybook/bean/LibraryBean.java b/app/src/main/java/com/monke/monkeybook/bean/LibraryBean.java index e82eca6..97ae24d 100644 --- a/app/src/main/java/com/monke/monkeybook/bean/LibraryBean.java +++ b/app/src/main/java/com/monke/monkeybook/bean/LibraryBean.java @@ -1,7 +1,11 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.bean; import java.util.List; +/** + * 书城整体Data bean + */ public class LibraryBean { private List libraryNewBooks; private List kindBooks; diff --git a/app/src/main/java/com/monke/monkeybook/bean/LibraryKindBookListBean.java b/app/src/main/java/com/monke/monkeybook/bean/LibraryKindBookListBean.java index 3a18801..867e85a 100644 --- a/app/src/main/java/com/monke/monkeybook/bean/LibraryKindBookListBean.java +++ b/app/src/main/java/com/monke/monkeybook/bean/LibraryKindBookListBean.java @@ -1,7 +1,11 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.bean; import java.util.List; +/** + * 书城 书籍分类推荐列表 + */ public class LibraryKindBookListBean { private String kindName; private String kindUrl; diff --git a/app/src/main/java/com/monke/monkeybook/bean/LibraryNewBookBean.java b/app/src/main/java/com/monke/monkeybook/bean/LibraryNewBookBean.java index b8d2883..b35da20 100644 --- a/app/src/main/java/com/monke/monkeybook/bean/LibraryNewBookBean.java +++ b/app/src/main/java/com/monke/monkeybook/bean/LibraryNewBookBean.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.bean; public class LibraryNewBookBean { diff --git a/app/src/main/java/com/monke/monkeybook/bean/LibraryRankBean.java b/app/src/main/java/com/monke/monkeybook/bean/LibraryRankBean.java deleted file mode 100644 index 9d6b23d..0000000 --- a/app/src/main/java/com/monke/monkeybook/bean/LibraryRankBean.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.monke.monkeybook.bean; - -public class LibraryRankBean { - private String coverUrl; - private String name; - private String author; - - public String getCoverUrl() { - return coverUrl; - } - - public void setCoverUrl(String coverUrl) { - this.coverUrl = coverUrl; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getAuthor() { - return author; - } - - public void setAuthor(String author) { - this.author = author; - } -} diff --git a/app/src/main/java/com/monke/monkeybook/bean/LocBookShelfBean.java b/app/src/main/java/com/monke/monkeybook/bean/LocBookShelfBean.java index 96c2068..5583965 100644 --- a/app/src/main/java/com/monke/monkeybook/bean/LocBookShelfBean.java +++ b/app/src/main/java/com/monke/monkeybook/bean/LocBookShelfBean.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.bean; public class LocBookShelfBean { diff --git a/app/src/main/java/com/monke/monkeybook/bean/ReadBookContentBean.java b/app/src/main/java/com/monke/monkeybook/bean/ReadBookContentBean.java index 81b84dc..235ca3e 100644 --- a/app/src/main/java/com/monke/monkeybook/bean/ReadBookContentBean.java +++ b/app/src/main/java/com/monke/monkeybook/bean/ReadBookContentBean.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.bean; import java.util.List; diff --git a/app/src/main/java/com/monke/monkeybook/bean/SearchBookBean.java b/app/src/main/java/com/monke/monkeybook/bean/SearchBookBean.java index bc4a01b..62ec1f2 100644 --- a/app/src/main/java/com/monke/monkeybook/bean/SearchBookBean.java +++ b/app/src/main/java/com/monke/monkeybook/bean/SearchBookBean.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.bean; import android.os.Parcel; diff --git a/app/src/main/java/com/monke/monkeybook/bean/SearchHistoryBean.java b/app/src/main/java/com/monke/monkeybook/bean/SearchHistoryBean.java index 9888620..d5f6136 100644 --- a/app/src/main/java/com/monke/monkeybook/bean/SearchHistoryBean.java +++ b/app/src/main/java/com/monke/monkeybook/bean/SearchHistoryBean.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.bean; import org.greenrobot.greendao.annotation.Entity; diff --git a/app/src/main/java/com/monke/monkeybook/bean/WebChapterBean.java b/app/src/main/java/com/monke/monkeybook/bean/WebChapterBean.java index 5ad55a3..a3a61a0 100644 --- a/app/src/main/java/com/monke/monkeybook/bean/WebChapterBean.java +++ b/app/src/main/java/com/monke/monkeybook/bean/WebChapterBean.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.bean; public class WebChapterBean { diff --git a/app/src/main/java/com/monke/monkeybook/bean/WebContentBean.java b/app/src/main/java/com/monke/monkeybook/bean/WebContentBean.java index e682284..1317d81 100644 --- a/app/src/main/java/com/monke/monkeybook/bean/WebContentBean.java +++ b/app/src/main/java/com/monke/monkeybook/bean/WebContentBean.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.bean; public class WebContentBean { diff --git a/app/src/main/java/com/monke/monkeybook/cache/ACache.java b/app/src/main/java/com/monke/monkeybook/cache/ACache.java index a6150b2..d4d06d4 100644 --- a/app/src/main/java/com/monke/monkeybook/cache/ACache.java +++ b/app/src/main/java/com/monke/monkeybook/cache/ACache.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.cache; import java.io.BufferedReader; diff --git a/app/src/main/java/com/monke/monkeybook/common/RxBusTag.java b/app/src/main/java/com/monke/monkeybook/common/RxBusTag.java index c6ac019..22a3afa 100644 --- a/app/src/main/java/com/monke/monkeybook/common/RxBusTag.java +++ b/app/src/main/java/com/monke/monkeybook/common/RxBusTag.java @@ -1,6 +1,6 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.common; - public class RxBusTag { public final static String HAD_ADD_BOOK = "rxbus_add_book"; diff --git a/app/src/main/java/com/monke/monkeybook/common/api/IEasouApi.java b/app/src/main/java/com/monke/monkeybook/common/api/IEasouApi.java index 9cf52a6..b069434 100644 --- a/app/src/main/java/com/monke/monkeybook/common/api/IEasouApi.java +++ b/app/src/main/java/com/monke/monkeybook/common/api/IEasouApi.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.common.api; import io.reactivex.Observable; @@ -5,6 +6,9 @@ import retrofit2.http.GET; import retrofit2.http.Headers; import retrofit2.http.Url; +/** + * 宜搜小说API (质量太差 废弃) + */ public interface IEasouApi { @GET @Headers({"Accept:text/html,application/xhtml+xml,application/xml", diff --git a/app/src/main/java/com/monke/monkeybook/common/api/IGxwztvApi.java b/app/src/main/java/com/monke/monkeybook/common/api/IGxwztvApi.java index 50fb682..a28356f 100644 --- a/app/src/main/java/com/monke/monkeybook/common/api/IGxwztvApi.java +++ b/app/src/main/java/com/monke/monkeybook/common/api/IGxwztvApi.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.common.api; import io.reactivex.Observable; diff --git a/app/src/main/java/com/monke/monkeybook/common/api/ILingdiankanshuApi.java b/app/src/main/java/com/monke/monkeybook/common/api/ILingdiankanshuApi.java index 9fab0b9..7657da1 100644 --- a/app/src/main/java/com/monke/monkeybook/common/api/ILingdiankanshuApi.java +++ b/app/src/main/java/com/monke/monkeybook/common/api/ILingdiankanshuApi.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.common.api; import io.reactivex.Observable; diff --git a/app/src/main/java/com/monke/monkeybook/dao/DbHelper.java b/app/src/main/java/com/monke/monkeybook/dao/DbHelper.java index 99bf7e0..d9f3154 100644 --- a/app/src/main/java/com/monke/monkeybook/dao/DbHelper.java +++ b/app/src/main/java/com/monke/monkeybook/dao/DbHelper.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.dao; import android.database.sqlite.SQLiteDatabase; diff --git a/app/src/main/java/com/monke/monkeybook/listener/OnGetChapterListListener.java b/app/src/main/java/com/monke/monkeybook/listener/OnGetChapterListListener.java index 2951140..94e98a4 100644 --- a/app/src/main/java/com/monke/monkeybook/listener/OnGetChapterListListener.java +++ b/app/src/main/java/com/monke/monkeybook/listener/OnGetChapterListListener.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.listener; import com.monke.monkeybook.bean.BookShelfBean; diff --git a/app/src/main/java/com/monke/monkeybook/model/IEasouBookModel.java b/app/src/main/java/com/monke/monkeybook/model/IEasouBookModel.java index f7a6fcf..4ee119a 100644 --- a/app/src/main/java/com/monke/monkeybook/model/IEasouBookModel.java +++ b/app/src/main/java/com/monke/monkeybook/model/IEasouBookModel.java @@ -1,31 +1,28 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model; import com.monke.monkeybook.bean.BookContentBean; import com.monke.monkeybook.bean.BookShelfBean; -import com.monke.monkeybook.bean.LibraryBean; import com.monke.monkeybook.bean.SearchBookBean; -import com.monke.monkeybook.cache.ACache; import com.monke.monkeybook.listener.OnGetChapterListListener; - import java.util.List; - import io.reactivex.Observable; public interface IEasouBookModel { /** * 搜索书籍 */ - public Observable> searchBook(String content, int page, int rankKind); + Observable> searchBook(String content, int page, int rankKind); /** * 网络请求并解析书籍信息 */ - public Observable getBookInfo(final BookShelfBean bookShelfBean); + Observable getBookInfo(final BookShelfBean bookShelfBean); /** * 网络解析图书目录 */ - public void getChapterList(final BookShelfBean bookShelfBean, OnGetChapterListListener getChapterListListener); + void getChapterList(final BookShelfBean bookShelfBean, OnGetChapterListListener getChapterListListener); /** * 章节缓存 diff --git a/app/src/main/java/com/monke/monkeybook/model/IGxwztvBookModel.java b/app/src/main/java/com/monke/monkeybook/model/IGxwztvBookModel.java index f93931f..18e74fb 100644 --- a/app/src/main/java/com/monke/monkeybook/model/IGxwztvBookModel.java +++ b/app/src/main/java/com/monke/monkeybook/model/IGxwztvBookModel.java @@ -1,24 +1,23 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model; import com.monke.monkeybook.bean.LibraryBean; import com.monke.monkeybook.bean.SearchBookBean; import com.monke.monkeybook.cache.ACache; - import java.util.List; - import io.reactivex.Observable; public interface IGxwztvBookModel extends IStationBookModel { - public Observable> getKindBook(String url, int page); + Observable> getKindBook(String url, int page); /** * 获取主页信息 */ - public Observable getLibraryData(ACache aCache); + Observable getLibraryData(ACache aCache); /** * 解析主页数据 */ - public Observable analyLibraryData(String data); + Observable analyLibraryData(String data); } diff --git a/app/src/main/java/com/monke/monkeybook/model/IImportBookModel.java b/app/src/main/java/com/monke/monkeybook/model/IImportBookModel.java index a2b0351..57ef305 100644 --- a/app/src/main/java/com/monke/monkeybook/model/IImportBookModel.java +++ b/app/src/main/java/com/monke/monkeybook/model/IImportBookModel.java @@ -1,11 +1,8 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model; -import com.monke.monkeybook.bean.BookShelfBean; import com.monke.monkeybook.bean.LocBookShelfBean; - import java.io.File; -import java.util.List; - import io.reactivex.Observable; public interface IImportBookModel { diff --git a/app/src/main/java/com/monke/monkeybook/model/IStationBookModel.java b/app/src/main/java/com/monke/monkeybook/model/IStationBookModel.java index 5a6f316..1a4753d 100644 --- a/app/src/main/java/com/monke/monkeybook/model/IStationBookModel.java +++ b/app/src/main/java/com/monke/monkeybook/model/IStationBookModel.java @@ -1,12 +1,11 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model; import com.monke.monkeybook.bean.BookContentBean; import com.monke.monkeybook.bean.BookShelfBean; import com.monke.monkeybook.bean.SearchBookBean; import com.monke.monkeybook.listener.OnGetChapterListListener; - import java.util.List; - import io.reactivex.Observable; public interface IStationBookModel { @@ -14,17 +13,17 @@ public interface IStationBookModel { /** * 搜索书籍 */ - public Observable> searchBook(String content, int page); + Observable> searchBook(String content, int page); /** * 网络请求并解析书籍信息 */ - public Observable getBookInfo(final BookShelfBean bookShelfBean); + Observable getBookInfo(final BookShelfBean bookShelfBean); /** * 网络解析图书目录 */ - public void getChapterList(final BookShelfBean bookShelfBean, OnGetChapterListListener getChapterListListener); + void getChapterList(final BookShelfBean bookShelfBean, OnGetChapterListListener getChapterListListener); /** * 章节缓存 diff --git a/app/src/main/java/com/monke/monkeybook/model/IWebBookModel.java b/app/src/main/java/com/monke/monkeybook/model/IWebBookModel.java index 0b9066b..a4c0769 100644 --- a/app/src/main/java/com/monke/monkeybook/model/IWebBookModel.java +++ b/app/src/main/java/com/monke/monkeybook/model/IWebBookModel.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model; import com.monke.monkeybook.bean.BookContentBean; @@ -11,29 +12,24 @@ public interface IWebBookModel { /** * 网络请求并解析书籍信息 */ - public Observable getBookInfo(final BookShelfBean bookShelfBean); + Observable getBookInfo(final BookShelfBean bookShelfBean); /** * 网络解析图书目录 */ - public void getChapterList(final BookShelfBean bookShelfBean,OnGetChapterListListener getChapterListListener); + void getChapterList(final BookShelfBean bookShelfBean,OnGetChapterListListener getChapterListListener); /** * 章节缓存 */ - public Observable getBookContent(final String durChapterUrl, final int durChapterIndex, String tag); - - /** - * 搜索书籍 - */ - public Observable> searchBook(String content, int page,int rankKind); + Observable getBookContent(final String durChapterUrl, final int durChapterIndex, String tag); /** * 获取分类书籍 */ - public Observable> getKindBook(String url,int page); + Observable> getKindBook(String url,int page); /** * 其他站点资源整合搜索 */ - public Observable> searchOtherBook(String content,int page,String tag); + Observable> searchOtherBook(String content,int page,String tag); } diff --git a/app/src/main/java/com/monke/monkeybook/model/IWebContentModel.java b/app/src/main/java/com/monke/monkeybook/model/IWebContentModel.java index 5ad2bec..54c932b 100644 --- a/app/src/main/java/com/monke/monkeybook/model/IWebContentModel.java +++ b/app/src/main/java/com/monke/monkeybook/model/IWebContentModel.java @@ -1,6 +1,7 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model; public interface IWebContentModel { - public String analyBookcontent(String s,String realUrl) throws Exception; + String analyBookcontent(String s,String realUrl) throws Exception; } \ No newline at end of file diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/Content17duxsModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/Content17duxsModelImpl.java index be9d07f..8953b75 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/Content17duxsModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/Content17duxsModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/Content17kModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/Content17kModelImpl.java index ad52253..34a898f 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/Content17kModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/Content17kModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/Content3dllcModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/Content3dllcModelImpl.java index d4b0010..04d57ea 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/Content3dllcModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/Content3dllcModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/Content44pqModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/Content44pqModelImpl.java index a4cd811..be65631 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/Content44pqModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/Content44pqModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/Content630bookCCModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/Content630bookCCModelImpl.java index 55d503e..38acda4 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/Content630bookCCModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/Content630bookCCModelImpl.java @@ -1,11 +1,10 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.TextNode; - import java.util.List; public class Content630bookCCModelImpl implements IWebContentModel{ diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/Content92zwModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/Content92zwModelImpl.java index 80370fc..1acc3c5 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/Content92zwModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/Content92zwModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentAszwModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentAszwModelImpl.java index 3d4b25a..17df5f6 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentAszwModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentAszwModelImpl.java @@ -1,11 +1,10 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.TextNode; - import java.util.List; public class ContentAszwModelImpl implements IWebContentModel{ diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentBaishukuModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentBaishukuModelImpl.java index 27fa9ce..f2c79df 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentBaishukuModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentBaishukuModelImpl.java @@ -1,11 +1,10 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.TextNode; - import java.util.List; public class ContentBaishukuModelImpl implements IWebContentModel{ diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentBxwx9ModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentBxwx9ModelImpl.java index 54d1ea9..0583f93 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentBxwx9ModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentBxwx9ModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentCommendModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentCommendModelImpl.java index 243b75b..53d10ef 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentCommendModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentCommendModelImpl.java @@ -1,12 +1,11 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.ErrorAnalyContentManager; import com.monke.monkeybook.bean.BookContentBean; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.TextNode; - import java.util.List; public class ContentCommendModelImpl { diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentDhzwModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentDhzwModelImpl.java index db78051..215cd28 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentDhzwModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentDhzwModelImpl.java @@ -1,11 +1,10 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.TextNode; - import java.util.List; public class ContentDhzwModelImpl implements IWebContentModel{ diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentEasouModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentEasouModelImpl.java index dc8d3f4..7011846 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentEasouModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentEasouModelImpl.java @@ -1,10 +1,10 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.TextNode; - import java.util.List; public class ContentEasouModelImpl implements IWebContentModel { diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentFuheishuModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentFuheishuModelImpl.java index 7713d59..edff3f3 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentFuheishuModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentFuheishuModelImpl.java @@ -1,11 +1,10 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.TextNode; - import java.util.List; /** diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentKewaishuModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentKewaishuModelImpl.java index 208914b..01e9d3c 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentKewaishuModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentKewaishuModelImpl.java @@ -1,11 +1,10 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.TextNode; - import java.util.List; public class ContentKewaishuModelImpl implements IWebContentModel{ diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentLeduwoModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentLeduwoModelImpl.java index 63ebc72..d67ee31 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentLeduwoModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentLeduwoModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentLewen8ModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentLewen8ModelImpl.java index 0f975ed..8d36ee7 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentLewen8ModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentLewen8ModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentPbtxtModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentPbtxtModelImpl.java index feb34da..0b46e42 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentPbtxtModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentPbtxtModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentPpxsModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentPpxsModelImpl.java index 374fb80..9cdb8e8 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentPpxsModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentPpxsModelImpl.java @@ -1,11 +1,10 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.TextNode; - import java.util.List; public class ContentPpxsModelImpl implements IWebContentModel{ diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentQulaModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentQulaModelImpl.java index 06d5d70..cd7f690 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentQulaModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentQulaModelImpl.java @@ -1,11 +1,10 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.TextNode; - import java.util.List; public class ContentQulaModelImpl implements IWebContentModel{ diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentQzreadModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentQzreadModelImpl.java index f4ab41e..ae8c304 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentQzreadModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentQzreadModelImpl.java @@ -1,11 +1,10 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.TextNode; - import java.util.List; public class ContentQzreadModelImpl implements IWebContentModel{ diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentRanwenaModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentRanwenaModelImpl.java index fcd94f5..0147ce6 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentRanwenaModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentRanwenaModelImpl.java @@ -1,11 +1,10 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.TextNode; - import java.util.List; public class ContentRanwenaModelImpl implements IWebContentModel{ diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentShulouModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentShulouModelImpl.java index a1e329e..58a5af4 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentShulouModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentShulouModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentSnwx8ModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentSnwx8ModelImpl.java index 1eddf2f..c2e0ae7 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentSnwx8ModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentSnwx8ModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentSuimengModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentSuimengModelImpl.java index 719dfe9..e4f7e0a 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentSuimengModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentSuimengModelImpl.java @@ -1,11 +1,10 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.TextNode; - import java.util.List; public class ContentSuimengModelImpl implements IWebContentModel{ diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentSyzwwModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentSyzwwModelImpl.java index bf7138d..aa8d9d3 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentSyzwwModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentSyzwwModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentVodtwModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentVodtwModelImpl.java index 6f34d7a..4cd10a3 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentVodtwModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentVodtwModelImpl.java @@ -1,15 +1,12 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; -import org.jsoup.nodes.TextNode; import org.jsoup.select.Elements; -import java.util.List; - public class ContentVodtwModelImpl implements IWebContentModel { public static final String TAG = "http://www.vodtw.com"; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentWxguanModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentWxguanModelImpl.java index 39dd395..46d1519 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentWxguanModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentWxguanModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentXqingdouCCModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentXqingdouCCModelImpl.java index bc8cd27..eea9d09 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentXqingdouCCModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentXqingdouCCModelImpl.java @@ -1,7 +1,7 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.select.Elements; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentXqingdouModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentXqingdouModelImpl.java index 3602a52..a6dd6f8 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentXqingdouModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentXqingdouModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentYb3ModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentYb3ModelImpl.java index d3043bc..d449d66 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentYb3ModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentYb3ModelImpl.java @@ -1,13 +1,12 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.nodes.TextNode; import org.jsoup.select.Elements; - import java.util.List; public class ContentYb3ModelImpl implements IWebContentModel{ diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ContentZhulangModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ContentZhulangModelImpl.java index 85a6db9..a0fb2fa 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ContentZhulangModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ContentZhulangModelImpl.java @@ -1,14 +1,11 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.model.IWebContentModel; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; -import org.jsoup.nodes.TextNode; import org.jsoup.select.Elements; -import java.util.List; - public class ContentZhulangModelImpl implements IWebContentModel{ public static final String TAG = "http://book.zhulang.com"; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/EasouBookModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/EasouBookModelImpl.java deleted file mode 100644 index a02ebb9..0000000 --- a/app/src/main/java/com/monke/monkeybook/model/impl/EasouBookModelImpl.java +++ /dev/null @@ -1,555 +0,0 @@ -package com.monke.monkeybook.model.impl; - -import com.monke.basemvplib.impl.BaseModelImpl; -import com.monke.monkeybook.ErrorAnalyContentManager; -import com.monke.monkeybook.base.observer.SimpleObserver; -import com.monke.monkeybook.bean.BookContentBean; -import com.monke.monkeybook.bean.BookInfoBean; -import com.monke.monkeybook.bean.BookShelfBean; -import com.monke.monkeybook.bean.ChapterListBean; -import com.monke.monkeybook.bean.SearchBookBean; -import com.monke.monkeybook.bean.WebChapterBean; -import com.monke.monkeybook.common.api.IEasouApi; -import com.monke.monkeybook.listener.OnGetChapterListListener; -import com.monke.monkeybook.model.IEasouBookModel; - -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; -import org.jsoup.nodes.Element; -import org.jsoup.select.Elements; - -import java.io.IOException; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import io.reactivex.Observable; -import io.reactivex.ObservableEmitter; -import io.reactivex.ObservableOnSubscribe; -import io.reactivex.ObservableSource; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.functions.Function; -import io.reactivex.schedulers.Schedulers; -import okhttp3.Call; -import okhttp3.Callback; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; - -public class EasouBookModelImpl extends BaseModelImpl implements IEasouBookModel { - public static final String TAG = "http://book.easou.com"; - - public static EasouBookModelImpl getInstance() { - return new EasouBookModelImpl(); - } - - //////////////////////////////////////////////////////////////////////////////////////////////////////////// - - /** - * 搜索书籍 - */ - @Override - public Observable> searchBook(String content, int page, int rankKind) { - String temp = "/w/searchNovel/" + content + "_" + rankKind + "_" + page + ".html"; - return getRetrofitObject(TAG).create(IEasouApi.class).searchBook(temp).flatMap(new Function>>() { - @Override - public ObservableSource> apply(String s) throws Exception { - return analySearchBook(s); - } - }); - } - - public Observable> analySearchBook(final String s) { - return Observable.create(new ObservableOnSubscribe>() { - @Override - public void subscribe(ObservableEmitter> e) throws Exception { - try { - Document doc = Jsoup.parse(s); - Elements booksE = doc.getElementsByClass("resultContent").get(0).getElementsByTag("li"); - if (null != booksE && booksE.size() > 1) { - List books = new ArrayList(); - for (Element bookItem : booksE) { - SearchBookBean item = new SearchBookBean(); - item.setTag(TAG); - item.setAuthor(bookItem.getElementsByClass("attr").get(0).getElementsByTag("a").get(0).text()); - item.setKind(bookItem.getElementsByClass("attr").get(0).getElementsByTag("a").get(1).text()); - item.setState(bookItem.getElementsByTag("span").get(0).text()); - item.setLastChapter(bookItem.getElementsByClass("lastchapter").get(0).text()); - item.setOrigin(bookItem.getElementsByClass("source").get(0).text().replaceAll("来源:", "")); - item.setName(bookItem.getElementsByClass("name").get(0).getElementsByClass("common").get(0).text()); - item.setNoteUrl(TAG + bookItem.getElementsByClass("name").get(0).getElementsByClass("common").get(0).attr("href")); - item.setCoverUrl(bookItem.getElementsByTag("img").get(0).attr("src")); - books.add(item); - } - e.onNext(books); - } else { - e.onNext(new ArrayList()); - } - } catch (Exception ex) { - ex.printStackTrace(); - e.onNext(new ArrayList()); - } - e.onComplete(); - } - }); - } - - ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - /** - * 网络请求并解析书籍信息 - * return BookShelfBean - */ - @Override - public Observable getBookInfo(final BookShelfBean bookShelfBean) { - return getRetrofitObject(TAG).create(IEasouApi.class).getBookInfo(bookShelfBean.getNoteUrl().replace(TAG, "")).flatMap(new Function>() { - @Override - public ObservableSource apply(String s) throws Exception { - return analyBookInfo(s, bookShelfBean); - } - }); - } - - private Observable analyBookInfo(final String s, final BookShelfBean bookShelfBean) { - return Observable.create(new ObservableOnSubscribe() { - @Override - public void subscribe(ObservableEmitter e) throws Exception { - bookShelfBean.setTag(TAG); - bookShelfBean.setBookInfoBean(analyBookinfo(s, bookShelfBean.getNoteUrl())); - e.onNext(bookShelfBean); - e.onComplete(); - } - }); - } - - private BookInfoBean analyBookinfo(String s, String novelUrl) { - BookInfoBean bookInfoBean = new BookInfoBean(); - bookInfoBean.setNoteUrl(novelUrl); //id - bookInfoBean.setTag(TAG); - Document doc = Jsoup.parse(s); - Element resultE = doc.getElementsByClass("content").get(0); - String coverUrl = resultE.getElementsByClass("imgShow").get(0).getElementsByTag("img").get(0).attr("src"); - bookInfoBean.setCoverUrl(coverUrl.startsWith("http") ? coverUrl : (TAG + coverUrl)); - bookInfoBean.setName(resultE.getElementsByClass("tit").get(1).getElementsByTag("h1").get(0).text()); - bookInfoBean.setAuthor(resultE.getElementsByClass("author").get(0).getElementsByClass("common").get(0).text()); - bookInfoBean.setIntroduce("\u3000\u3000" + resultE.getElementsByClass("desc").get(0).text().trim()); - bookInfoBean.setChapterUrl(TAG + resultE.getElementsByClass("category").get(0).getElementsByTag("a").get(0).attr("href")); - bookInfoBean.setOrigin(resultE.getElementsByClass("attribute").get(0).getElementsByClass("source").get(0).getElementsByClass("t").get(0).text()); - return bookInfoBean; - } - ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - /** - * 网络解析图书目录 - * return BookShelfBean - */ - @Override - public void getChapterList(final BookShelfBean bookShelfBean, OnGetChapterListListener getChapterListListener) { - getChapterListPage(bookShelfBean, getChapterListListener, 1); - } - - private void getChapterListPage(final BookShelfBean bookShelfBean, final OnGetChapterListListener getChapterListListener, final int page) { - getRetrofitObject(TAG).create(IEasouApi.class).getChapterList(bookShelfBean.getBookInfoBean().getChapterUrl().replace(TAG, "").replace("1_", page + "_")).flatMap(new Function>>() { - @Override - public ObservableSource> apply(String s) throws Exception { - return analyChapterList(s, bookShelfBean, page == 1 ? true : false); - } - }) - .subscribeOn(Schedulers.newThread()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new SimpleObserver>() { - @Override - public void onNext(WebChapterBean value) { - if (value.getNext()) { - getChapterListPage(value.getData(), getChapterListListener, page + 1); - } else { - if (value.getData().getBookInfoBean().getChapterlist() != null && value.getData().getBookInfoBean().getChapterlist().size() > 0) { - for (int i = 0; i < value.getData().getBookInfoBean().getChapterlist().size(); i++) { - int temp = i; - for (int j = i; j < value.getData().getBookInfoBean().getChapterlist().size(); j++) { - if (value.getData().getBookInfoBean().getChapterlist().get(temp).getDurChapterIndex() > value.getData().getBookInfoBean().getChapterlist().get(j).getDurChapterIndex()) { - temp = j; - } - } - ChapterListBean tempBean = value.getData().getBookInfoBean().getChapterlist().get(i); - value.getData().getBookInfoBean().getChapterlist().set(i, value.getData().getBookInfoBean().getChapterlist().get(temp)); - value.getData().getBookInfoBean().getChapterlist().set(temp, tempBean); - } - for (int i = 0; i < value.getData().getBookInfoBean().getChapterlist().size(); i++) { - value.getData().getBookInfoBean().getChapterlist().get(i).setDurChapterIndex(i); - } - } - if (getChapterListListener != null) { - getChapterListListener.success(value.getData()); - } - } - } - - @Override - public void onError(Throwable e) { - e.printStackTrace(); - if (getChapterListListener != null) { - getChapterListListener.error(); - } - } - }); - } - - private Observable> analyChapterList(final String s, final BookShelfBean bookShelfBean, final Boolean isFirstPage) { - return Observable.create(new ObservableOnSubscribe>() { - @Override - public void subscribe(ObservableEmitter> e) throws Exception { - bookShelfBean.setTag(TAG); - WebChapterBean> temp = analyChapterlist(s, bookShelfBean.getNoteUrl(), bookShelfBean.getTag()); - if (isFirstPage) { - bookShelfBean.getBookInfoBean().setChapterlist(temp.getData()); - } else { - bookShelfBean.getBookInfoBean().addChapterlist(temp.getData()); - } - e.onNext(new WebChapterBean(bookShelfBean, temp.getNext())); - e.onComplete(); - } - }); - } - - private WebChapterBean> analyChapterlist(String s, String novelUrl, String chapterUrl) { - Document doc = Jsoup.parse(s); - Element element = doc.getElementsByClass("content").get(0); - Elements chapterlist = element.getElementsByClass("category").get(0).getElementsByTag("li"); - List chapterBeans = new ArrayList(); - for (int i = 0; i < chapterlist.size(); i++) { - ChapterListBean temp = new ChapterListBean(); - temp.setDurChapterUrl(chapterUrl + chapterlist.get(i).getElementsByTag("a").get(0).attr("href")); //id - String name = chapterlist.get(i).getElementsByTag("a").get(0).text(); - setDurChapterData(i, name, temp); - temp.setNoteUrl(novelUrl); - temp.setTag(TAG); - - chapterBeans.add(temp); - } - - Elements nextE = doc.getElementsByClass("pager").get(0).getElementsByClass("next unable"); - Boolean next = (nextE == null || nextE.size() <= 0) ? true : false; - return new WebChapterBean>(chapterBeans, next); - } - - private void setDurChapterData(int i, String name, ChapterListBean temp) { - try { - String regex = "第.{1,7}章"; - Pattern p = Pattern.compile(regex); - Matcher m = p.matcher(name); - if (m.find()) { - String indexTemp = m.group(); - indexTemp = indexTemp.replace("第", "").replace("章", "").trim(); - String regex3 = "[0-9]{1,6}"; - Pattern p3 = Pattern.compile(regex3); - Matcher m3 = p3.matcher(indexTemp); - int resultIndex = i; - if (m3.matches()) { - resultIndex = Integer.parseInt(indexTemp); - } else { - resultIndex = parse(indexTemp); - } - temp.setDurChapterIndex(resultIndex); - } else { - String regex2 = "[0-9]{1,6}\\."; - Pattern p2 = Pattern.compile(regex2); - Matcher m2 = p2.matcher(name); - if (m2.find()) { - String indexTemp = m2.group(); - indexTemp = indexTemp.replaceAll("\\.", "").trim(); - int resultIndex = Integer.parseInt(indexTemp); - temp.setDurChapterIndex(resultIndex); - } else { - temp.setDurChapterIndex(i); - } - } - } catch (Exception e) { - e.printStackTrace(); - temp.setDurChapterIndex(i); - }finally { - temp.setDurChapterName(name); - } - } - - public static int parse(String money) { - int result = 0; - char c = 0; - - boolean flag = Pattern.matches("^.*亿.*万.*$", money); - - for (int i = 0; i < money.length(); i++) { - switch (money.charAt(i)) { - case '零': - break; - case '一': - c = 1; - break; - case '二': - c = 2; - break; - case '三': - c = 3; - break; - case '四': - c = 4; - break; - case '五': - c = 5; - break; - case '六': - c = 6; - break; - case '七': - c = 7; - break; - case '八': - c = 8; - break; - case '九': - c = 9; - break; - case '十': - result += (c == 0 ? 10 : c * 10); - c = 0; - break; - case '百': - result += c * 100; - c = 0; - break; - case '千': - result += c * 1000; - c = 0; - break; - case '万': - result = (result + c) * 10000; - c = 0; - break; - case '亿': - if (flag) { - result = (result + c) * 10000; - } else { - result = (result + c) * 100000000; - } - c = 0; - break; - default: - c = 0; - } - - } - if (c != 0) - result += c; - return result; - - } - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - /** - * 章节缓存 - */ - @Override - public Observable getBookContent(final String durChapterUrl, final int durChapterIndex) { - return Observable.create(new ObservableOnSubscribe() { - @Override - public void subscribe(final ObservableEmitter e) throws Exception { - OkHttpClient client = clientBuilder.build(); - Request.Builder requestBuilder = new Request.Builder().url(durChapterUrl).method("GET", null); - requestBuilder.addHeader("Accept", "text/html,application/xhtml+xml,application/xml"); - requestBuilder.addHeader("User-Agent", "Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9.0.3) Gecko/2008092417 Firefox/3.0.3"); - requestBuilder.addHeader("Accept-Charset", "UTF-8"); - requestBuilder.addHeader("Keep-Alive", "300"); - requestBuilder.addHeader("Cache-Control", "no-cache"); - requestBuilder.addHeader("Connection", "Keep-Alive"); - Call mcall = client.newCall(requestBuilder.build()); - mcall.enqueue(new Callback() { - @Override - public void onFailure(Call call, IOException ex) { - ex.printStackTrace(); - if (!e.isDisposed()) { - e.onError(ex); - } - } - - @Override - public void onResponse(Call call, Response response) throws IOException { - String url = response.request().url().toString(); - BookContentBean bookContentBean = new BookContentBean(); - try { - bookContentBean = choiceAnaly(response, url, durChapterUrl, durChapterIndex); - } catch (Exception e) { - e.printStackTrace(); - ErrorAnalyContentManager.getInstance().writeMayByNetError(url); - bookContentBean = new BookContentBean(); - bookContentBean.setDurChapterIndex(durChapterIndex); - bookContentBean.setDurChapterUrl(durChapterUrl); - bookContentBean.setDurCapterContent(url.substring(0, url.indexOf('/', 8)) + "站点服务器异常"); - bookContentBean.setTag(TAG); - bookContentBean.setRight(false); - } - if (!e.isDisposed()) { - e.onNext(bookContentBean); - e.onComplete(); - } - } - }); - } - }); - } - - private BookContentBean choiceAnaly(Response response, String url, String durChapterUrl, int durChapterIndex) throws Exception { - BookContentBean bookContentBean = new BookContentBean(); - bookContentBean.setDurChapterIndex(durChapterIndex); - bookContentBean.setDurChapterUrl(durChapterUrl); - bookContentBean.setTag(TAG); - if (url.contains(ContentEasouModelImpl.TAG)) { - String xml = response.body().string(); - bookContentBean.setDurCapterContent(ContentEasouModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentShulouModelImpl.TAG)) { - String xml = response.body().string(); - bookContentBean.setDurCapterContent(ContentShulouModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentPbtxtModelImpl.TAG)) { - String xml = response.body().source().readString(Charset.forName("GBK")); - bookContentBean.setDurCapterContent(ContentPbtxtModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentXqingdouModelImpl.TAG)) { - String xml = response.body().string(); - bookContentBean.setDurCapterContent(ContentXqingdouModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentSnwx8ModelImpl.TAG)) { - String xml = response.body().source().readString(Charset.forName("GBK")); - bookContentBean.setDurCapterContent(ContentSnwx8ModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(Content17kModelImpl.TAG)) { - String xml = response.body().string(); - bookContentBean.setDurCapterContent(Content17kModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(Content92zwModelImpl.TAG)) { - String xml = response.body().source().readString(Charset.forName("GBK")); - bookContentBean.setDurCapterContent(Content92zwModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentSuimengModelImpl.TAG)) { - String xml = response.body().source().readString(Charset.forName("GBK")); - bookContentBean.setDurCapterContent(ContentSuimengModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentKewaishuModelImpl.TAG)) { - String xml = response.body().source().readString(Charset.forName("GBK")); - bookContentBean.setDurCapterContent(ContentKewaishuModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentWxguanModelImpl.TAG)) { - String xml = response.body().string(); - bookContentBean.setDurCapterContent(ContentWxguanModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentBaishukuModelImpl.TAG)) { - String xml = response.body().source().readString(Charset.forName("GBK")); - bookContentBean.setDurCapterContent(ContentBaishukuModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentAszwModelImpl.TAG)) { - String xml = response.body().source().readString(Charset.forName("GBK")); - bookContentBean.setDurCapterContent(ContentAszwModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentXqingdouCCModelImpl.TAG)) { - String xml = response.body().string(); - bookContentBean.setDurCapterContent(ContentXqingdouCCModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentFuheishuModelImpl.TAG)) { - String xml = response.body().string(); - //站点有问题 未完全解析 - bookContentBean.setDurCapterContent(ContentFuheishuModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentSyzwwModelImpl.TAG)) { - String xml = response.body().string(); - //站点有问题 未完全解析 - bookContentBean.setDurCapterContent(ContentSyzwwModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(Content630bookCCModelImpl.TAG)) { - String xml = response.body().source().readString(Charset.forName("GBK")); - bookContentBean.setDurCapterContent(Content630bookCCModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentBxwx9ModelImpl.TAG)) { - String xml = response.body().source().readString(Charset.forName("GBK")); - bookContentBean.setDurCapterContent(ContentBxwx9ModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(Content44pqModelImpl.TAG)) { - String xml = response.body().source().readString(Charset.forName("GBK")); - bookContentBean.setDurCapterContent(Content44pqModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentQzreadModelImpl.TAG)) { - String xml = response.body().source().readString(Charset.forName("GBK")); - bookContentBean.setDurCapterContent(ContentQzreadModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentLeduwoModelImpl.TAG)) { - String xml = response.body().source().readString(Charset.forName("GBK")); - bookContentBean.setDurCapterContent(ContentLeduwoModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(Content17duxsModelImpl.TAG)) { - String xml = response.body().source().readString(Charset.forName("GBK")); - bookContentBean.setDurCapterContent(Content17duxsModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentDhzwModelImpl.TAG)) { - String xml = response.body().source().readString(Charset.forName("GBK")); - bookContentBean.setDurCapterContent(ContentDhzwModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentYb3ModelImpl.TAG)) { - String xml = response.body().string(); - bookContentBean.setDurCapterContent(ContentYb3ModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentZhulangModelImpl.TAG)) { - String xml = response.body().string(); - bookContentBean.setDurCapterContent(ContentZhulangModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentRanwenaModelImpl.TAG)) { - String xml = response.body().string(); - bookContentBean.setDurCapterContent(ContentRanwenaModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentPpxsModelImpl.TAG)) { - String xml = response.body().source().readString(Charset.forName("GBK")); - bookContentBean.setDurCapterContent(ContentPpxsModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentVodtwModelImpl.TAG)) { - String xml = response.body().source().readString(Charset.forName("GB2312")); - bookContentBean.setDurCapterContent(ContentVodtwModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentQulaModelImpl.TAG)) { - String xml = response.body().string(); - bookContentBean.setDurCapterContent(ContentQulaModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(ContentLewen8ModelImpl.TAG)) { - String xml = response.body().string(); - bookContentBean.setDurCapterContent(ContentLewen8ModelImpl.getInstance().analyBookcontent(xml, url)); - } else if (url.contains(Content3dllcModelImpl.TAG)) { - String xml = response.body().string(); - bookContentBean.setDurCapterContent(Content3dllcModelImpl.getInstance().analyBookcontent(xml, url)); - } - ///////////////////////////////////////////////////////////////////////////////////////////////////////// - else { - byte[] xmlData = response.body().source().readByteArray(); - String xml = new String(xmlData, "UTF-8"); - String charset = "UTF-8"; - try { - Document doc = Jsoup.parse(xml); - String data = doc.getElementsByTag("head").get(0).getElementsByTag("meta").get(0).attr("content").toUpperCase().trim(); - if (data.contains("CHARSET")) { - data = data.substring(data.indexOf("CHARSET=") + 8); - if (data.contains(";")) { - data = data.substring(0, data.indexOf(";")); - } - charset = data; - if (!charset.equals("UTF-8")) { - xml = new String(xmlData, charset); - } - } - } catch (Exception e) { - e.printStackTrace(); - } - bookContentBean = ContentCommendModelImpl.getInstance().analyBookcontent(bookContentBean, xml, url); - } - return bookContentBean; - } - - /* - 测试各个网站目录解析 - */ - public static void main(String[] args) { - EasouBookModelImpl.getInstance().getBookContent("http://www.yb3.cc/5200/3186/7426551.html", 0) - .subscribe(new SimpleObserver() { - @Override - public void onNext(BookContentBean value) { - value.getRight(); - } - - @Override - public void onError(Throwable e) { - e.printStackTrace(); - } - }); -// EasouBookModelImpl.getInstance().setDurChapterData(1,"第42章学习",new ChapterListBean()); -// EasouBookModelImpl.getInstance().getLibraryData(null) -// .subscribe(new SimpleObserver() { -// @Override -// public void onNext(LibraryBean value) { -// } -// -// @Override -// public void onError(Throwable e) { -// e.printStackTrace(); -// } -// }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/GxwztvBookModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/GxwztvBookModelImpl.java index 2737b49..5e777eb 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/GxwztvBookModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/GxwztvBookModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.basemvplib.impl.BaseModelImpl; @@ -17,16 +18,13 @@ import com.monke.monkeybook.common.api.IGxwztvApi; import com.monke.monkeybook.listener.OnGetChapterListListener; import com.monke.monkeybook.model.IGxwztvBookModel; import com.monke.monkeybook.presenter.impl.LibraryPresenterImpl; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.nodes.TextNode; import org.jsoup.select.Elements; - import java.util.ArrayList; import java.util.List; - import io.reactivex.Observable; import io.reactivex.ObservableEmitter; import io.reactivex.ObservableOnSubscribe; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/ImportBookModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/ImportBookModelImpl.java index 56ee5f9..a77c4a1 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/ImportBookModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/ImportBookModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.basemvplib.impl.BaseModelImpl; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/LingdiankanshuStationBookModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/LingdiankanshuStationBookModelImpl.java index 936bfca..ece3356 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/LingdiankanshuStationBookModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/LingdiankanshuStationBookModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.basemvplib.impl.BaseModelImpl; @@ -12,16 +13,13 @@ import com.monke.monkeybook.bean.WebChapterBean; import com.monke.monkeybook.common.api.ILingdiankanshuApi; import com.monke.monkeybook.listener.OnGetChapterListListener; import com.monke.monkeybook.model.IStationBookModel; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.nodes.TextNode; import org.jsoup.select.Elements; - import java.util.ArrayList; import java.util.List; - import io.reactivex.Observable; import io.reactivex.ObservableEmitter; import io.reactivex.ObservableOnSubscribe; diff --git a/app/src/main/java/com/monke/monkeybook/model/impl/WebBookModelImpl.java b/app/src/main/java/com/monke/monkeybook/model/impl/WebBookModelImpl.java index c8acb3d..46b2764 100644 --- a/app/src/main/java/com/monke/monkeybook/model/impl/WebBookModelImpl.java +++ b/app/src/main/java/com/monke/monkeybook/model/impl/WebBookModelImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.model.impl; import com.monke.monkeybook.bean.BookContentBean; @@ -25,10 +26,7 @@ public class WebBookModelImpl implements IWebBookModel { */ @Override public Observable getBookInfo(BookShelfBean bookShelfBean) { - if (bookShelfBean.getTag().equals(EasouBookModelImpl.TAG)) { - return EasouBookModelImpl.getInstance().getBookInfo(bookShelfBean); - } - else if(bookShelfBean.getTag().equals(GxwztvBookModelImpl.TAG)){ + if(bookShelfBean.getTag().equals(GxwztvBookModelImpl.TAG)){ return GxwztvBookModelImpl.getInstance().getBookInfo(bookShelfBean); } else if(bookShelfBean.getTag().equals(LingdiankanshuStationBookModelImpl.TAG)){ @@ -47,10 +45,7 @@ public class WebBookModelImpl implements IWebBookModel { */ @Override public void getChapterList(final BookShelfBean bookShelfBean, OnGetChapterListListener getChapterListListener) { - if (bookShelfBean.getTag().equals(EasouBookModelImpl.TAG)) { - EasouBookModelImpl.getInstance().getChapterList(bookShelfBean, getChapterListListener); - } - else if(bookShelfBean.getTag().equals(GxwztvBookModelImpl.TAG)){ + if(bookShelfBean.getTag().equals(GxwztvBookModelImpl.TAG)){ GxwztvBookModelImpl.getInstance().getChapterList(bookShelfBean, getChapterListListener); } else if(bookShelfBean.getTag().equals(LingdiankanshuStationBookModelImpl.TAG)){ @@ -69,10 +64,7 @@ public class WebBookModelImpl implements IWebBookModel { */ @Override public Observable getBookContent(String durChapterUrl, int durChapterIndex, String tag) { - if (tag.equals(EasouBookModelImpl.TAG)) { - return EasouBookModelImpl.getInstance().getBookContent(durChapterUrl, durChapterIndex); - } - else if(tag.equals(GxwztvBookModelImpl.TAG)){ + if(tag.equals(GxwztvBookModelImpl.TAG)){ return GxwztvBookModelImpl.getInstance().getBookContent(durChapterUrl, durChapterIndex); } else if(tag.equals(LingdiankanshuStationBookModelImpl.TAG)){ @@ -93,10 +85,7 @@ public class WebBookModelImpl implements IWebBookModel { */ @Override public Observable> searchOtherBook(String content,int page,String tag){ - if(tag.equals(EasouBookModelImpl.TAG)){ - return EasouBookModelImpl.getInstance().searchBook(content, page, 0); - } - else if(tag.equals(GxwztvBookModelImpl.TAG)){ + if(tag.equals(GxwztvBookModelImpl.TAG)){ return GxwztvBookModelImpl.getInstance().searchBook(content, page); } else if(tag.equals(LingdiankanshuStationBookModelImpl.TAG)){ @@ -112,14 +101,6 @@ public class WebBookModelImpl implements IWebBookModel { }); } } - - /** - * 搜索书籍 //专用 - */ - @Override - public Observable> searchBook(String content, int page,int rankKind) { - return EasouBookModelImpl.getInstance().searchBook(content, page, rankKind); - } /** * 获取分类书籍 */ diff --git a/app/src/main/java/com/monke/monkeybook/presenter/IBookDetailPresenter.java b/app/src/main/java/com/monke/monkeybook/presenter/IBookDetailPresenter.java index 12b1d47..3786005 100644 --- a/app/src/main/java/com/monke/monkeybook/presenter/IBookDetailPresenter.java +++ b/app/src/main/java/com/monke/monkeybook/presenter/IBookDetailPresenter.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.presenter; import com.monke.basemvplib.IPresenter; @@ -6,17 +7,17 @@ import com.monke.monkeybook.bean.SearchBookBean; public interface IBookDetailPresenter extends IPresenter{ - public int getOpenfrom(); + int getOpenfrom(); - public SearchBookBean getSearchBook(); + SearchBookBean getSearchBook(); - public BookShelfBean getBookShelf(); + BookShelfBean getBookShelf(); - public Boolean getInBookShelf(); + Boolean getInBookShelf(); - public void getBookShelfInfo(); + void getBookShelfInfo(); - public void addToBookShelf(); + void addToBookShelf(); - public void removeFromBookShelf(); + void removeFromBookShelf(); } diff --git a/app/src/main/java/com/monke/monkeybook/presenter/IBookReadPresenter.java b/app/src/main/java/com/monke/monkeybook/presenter/IBookReadPresenter.java index 2982d64..9f244a4 100644 --- a/app/src/main/java/com/monke/monkeybook/presenter/IBookReadPresenter.java +++ b/app/src/main/java/com/monke/monkeybook/presenter/IBookReadPresenter.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.presenter; import android.app.Activity; @@ -10,27 +11,27 @@ import com.monke.monkeybook.widget.contentswitchview.BookContentView; public interface IBookReadPresenter extends IPresenter{ - public int getOpen_from(); + int getOpen_from(); - public BookShelfBean getBookShelf(); + BookShelfBean getBookShelf(); - public void initContent(); + void initContent(); - public void loadContent(BookContentView bookContentView,long bookTag, final int chapterIndex, final int page); + void loadContent(BookContentView bookContentView,long bookTag, final int chapterIndex, final int page); - public void updateProgress(int chapterIndex, int pageIndex); + void updateProgress(int chapterIndex, int pageIndex); - public void saveProgress(); + void saveProgress(); - public String getChapterTitle(int chapterIndex); + String getChapterTitle(int chapterIndex); - public void setPageLineCount(int pageLineCount); + void setPageLineCount(int pageLineCount); - public void addToShelf(final ReadBookPresenterImpl.OnAddListner addListner); + void addToShelf(final ReadBookPresenterImpl.OnAddListner addListner); - public Boolean getAdd(); + Boolean getAdd(); - public void initData(Activity activity); + void initData(Activity activity); - public void openBookFromOther(Activity activity); + void openBookFromOther(Activity activity); } diff --git a/app/src/main/java/com/monke/monkeybook/presenter/IChoiceBookPresenter.java b/app/src/main/java/com/monke/monkeybook/presenter/IChoiceBookPresenter.java index cfd2b87..503ef9b 100644 --- a/app/src/main/java/com/monke/monkeybook/presenter/IChoiceBookPresenter.java +++ b/app/src/main/java/com/monke/monkeybook/presenter/IChoiceBookPresenter.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.presenter; import com.monke.basemvplib.IPresenter; @@ -5,13 +6,13 @@ import com.monke.monkeybook.bean.SearchBookBean; public interface IChoiceBookPresenter extends IPresenter{ - public int getPage(); + int getPage(); - public void initPage(); + void initPage(); - public void toSearchBooks(String key); + void toSearchBooks(String key); - public void addBookToShelf(final SearchBookBean searchBookBean); + void addBookToShelf(final SearchBookBean searchBookBean); - public String getTitle(); + String getTitle(); } \ No newline at end of file diff --git a/app/src/main/java/com/monke/monkeybook/presenter/IImportBookPresenter.java b/app/src/main/java/com/monke/monkeybook/presenter/IImportBookPresenter.java index bc06a7f..406c9d4 100644 --- a/app/src/main/java/com/monke/monkeybook/presenter/IImportBookPresenter.java +++ b/app/src/main/java/com/monke/monkeybook/presenter/IImportBookPresenter.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.presenter; import com.monke.basemvplib.IPresenter; diff --git a/app/src/main/java/com/monke/monkeybook/presenter/ILibraryPresenter.java b/app/src/main/java/com/monke/monkeybook/presenter/ILibraryPresenter.java index db81b2e..c22b3ab 100644 --- a/app/src/main/java/com/monke/monkeybook/presenter/ILibraryPresenter.java +++ b/app/src/main/java/com/monke/monkeybook/presenter/ILibraryPresenter.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.presenter; import com.monke.basemvplib.IPresenter; @@ -5,7 +6,7 @@ import java.util.LinkedHashMap; public interface ILibraryPresenter extends IPresenter{ - public LinkedHashMap getKinds(); + LinkedHashMap getKinds(); - public void getLibraryData(); + void getLibraryData(); } diff --git a/app/src/main/java/com/monke/monkeybook/presenter/IMainPresenter.java b/app/src/main/java/com/monke/monkeybook/presenter/IMainPresenter.java index 4187c69..1be0412 100644 --- a/app/src/main/java/com/monke/monkeybook/presenter/IMainPresenter.java +++ b/app/src/main/java/com/monke/monkeybook/presenter/IMainPresenter.java @@ -1,7 +1,8 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.presenter; import com.monke.basemvplib.IPresenter; public interface IMainPresenter extends IPresenter{ - public void queryBookShelf(Boolean needRefresh); + void queryBookShelf(Boolean needRefresh); } diff --git a/app/src/main/java/com/monke/monkeybook/presenter/ISearchPresenter.java b/app/src/main/java/com/monke/monkeybook/presenter/ISearchPresenter.java index a081ad3..de21734 100644 --- a/app/src/main/java/com/monke/monkeybook/presenter/ISearchPresenter.java +++ b/app/src/main/java/com/monke/monkeybook/presenter/ISearchPresenter.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.presenter; import com.monke.basemvplib.IPresenter; @@ -5,25 +6,25 @@ import com.monke.monkeybook.bean.SearchBookBean; public interface ISearchPresenter extends IPresenter{ - public Boolean getHasSearch(); + Boolean getHasSearch(); - public void setHasSearch(Boolean hasSearch); + void setHasSearch(Boolean hasSearch); - public void insertSearchHistory(); + void insertSearchHistory(); - public void querySearchHistory(); + void querySearchHistory(); - public void cleanSearchHistory(); + void cleanSearchHistory(); - public int getPage(); + int getPage(); - public void initPage(); + void initPage(); - public void toSearchBooks(String key); + void toSearchBooks(String key,Boolean fromError); - public void addBookToShelf(final SearchBookBean searchBookBean); + void addBookToShelf(final SearchBookBean searchBookBean); - public Boolean getInput(); + Boolean getInput(); - public void setInput(Boolean input); + void setInput(Boolean input); } diff --git a/app/src/main/java/com/monke/monkeybook/presenter/impl/BookDetailPresenterImpl.java b/app/src/main/java/com/monke/monkeybook/presenter/impl/BookDetailPresenterImpl.java index ed8d5e9..b7b2009 100644 --- a/app/src/main/java/com/monke/monkeybook/presenter/impl/BookDetailPresenterImpl.java +++ b/app/src/main/java/com/monke/monkeybook/presenter/impl/BookDetailPresenterImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.presenter.impl; import android.content.Intent; diff --git a/app/src/main/java/com/monke/monkeybook/presenter/impl/ChoiceBookPresenterImpl.java b/app/src/main/java/com/monke/monkeybook/presenter/impl/ChoiceBookPresenterImpl.java index 5f9217d..07c0737 100644 --- a/app/src/main/java/com/monke/monkeybook/presenter/impl/ChoiceBookPresenterImpl.java +++ b/app/src/main/java/com/monke/monkeybook/presenter/impl/ChoiceBookPresenterImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.presenter.impl; import android.content.Intent; diff --git a/app/src/main/java/com/monke/monkeybook/presenter/impl/ImportBookPresenterImpl.java b/app/src/main/java/com/monke/monkeybook/presenter/impl/ImportBookPresenterImpl.java index 569fa8a..aaaed9f 100644 --- a/app/src/main/java/com/monke/monkeybook/presenter/impl/ImportBookPresenterImpl.java +++ b/app/src/main/java/com/monke/monkeybook/presenter/impl/ImportBookPresenterImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.presenter.impl; import android.os.Environment; diff --git a/app/src/main/java/com/monke/monkeybook/presenter/impl/LibraryPresenterImpl.java b/app/src/main/java/com/monke/monkeybook/presenter/impl/LibraryPresenterImpl.java index 2a86eeb..3107189 100644 --- a/app/src/main/java/com/monke/monkeybook/presenter/impl/LibraryPresenterImpl.java +++ b/app/src/main/java/com/monke/monkeybook/presenter/impl/LibraryPresenterImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.presenter.impl; import android.os.Handler; diff --git a/app/src/main/java/com/monke/monkeybook/presenter/impl/MainPresenterImpl.java b/app/src/main/java/com/monke/monkeybook/presenter/impl/MainPresenterImpl.java index 66e0b0a..cdf5a08 100644 --- a/app/src/main/java/com/monke/monkeybook/presenter/impl/MainPresenterImpl.java +++ b/app/src/main/java/com/monke/monkeybook/presenter/impl/MainPresenterImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.presenter.impl; import android.support.annotation.NonNull; diff --git a/app/src/main/java/com/monke/monkeybook/presenter/impl/ReadBookPresenterImpl.java b/app/src/main/java/com/monke/monkeybook/presenter/impl/ReadBookPresenterImpl.java index ef046f2..04fa4bf 100644 --- a/app/src/main/java/com/monke/monkeybook/presenter/impl/ReadBookPresenterImpl.java +++ b/app/src/main/java/com/monke/monkeybook/presenter/impl/ReadBookPresenterImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.presenter.impl; import android.Manifest; @@ -316,7 +317,6 @@ public class ReadBookPresenterImpl extends BasePresenterImpl impl TextPaint mPaint = (TextPaint) mView.getPaint(); mPaint.setSubpixelText(true); Layout tempLayout = new StaticLayout(paragraphstr, mPaint, mView.getContentWidth(), Layout.Alignment.ALIGN_NORMAL, 0, 0, false); - ; List linesdata = new ArrayList(); for (int i = 0; i < tempLayout.getLineCount(); i++) { linesdata.add(paragraphstr.substring(tempLayout.getLineStart(i), tempLayout.getLineEnd(i))); diff --git a/app/src/main/java/com/monke/monkeybook/presenter/impl/SearchPresenterImpl.java b/app/src/main/java/com/monke/monkeybook/presenter/impl/SearchPresenterImpl.java index ef0cb92..5268326 100644 --- a/app/src/main/java/com/monke/monkeybook/presenter/impl/SearchPresenterImpl.java +++ b/app/src/main/java/com/monke/monkeybook/presenter/impl/SearchPresenterImpl.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.presenter.impl; import android.support.annotation.NonNull; @@ -16,7 +17,6 @@ import com.monke.monkeybook.common.RxBusTag; import com.monke.monkeybook.dao.DbHelper; import com.monke.monkeybook.dao.SearchHistoryBeanDao; import com.monke.monkeybook.listener.OnGetChapterListListener; -import com.monke.monkeybook.model.impl.EasouBookModelImpl; import com.monke.monkeybook.model.impl.GxwztvBookModelImpl; import com.monke.monkeybook.model.impl.LingdiankanshuStationBookModelImpl; import com.monke.monkeybook.model.impl.WebBookModelImpl; @@ -36,6 +36,12 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; public class SearchPresenterImpl extends BasePresenterImpl implements ISearchPresenter { + public static final String TAG_KEY = "tag"; + public static final String HASMORE_KEY = "hasMore"; + public static final String HASLOAD_KEY = "hasLoad"; + public static final String DURREQUESTTIME = "durRequestTime"; //当前搜索引擎失败次数 成功一次会重新开始计数 + public static final String MAXREQUESTTIME = "maxRequestTime"; //最大连续请求失败次数 + public static final int BOOK = 2; private Boolean hasSearch = false; //判断是否搜索过 @@ -73,25 +79,24 @@ public class SearchPresenterImpl extends BasePresenterImpl implemen } }); + //搜索引擎初始化 searchEngine = new ArrayList<>(); Map gxwztvMap = new HashMap(); - gxwztvMap.put("tag", GxwztvBookModelImpl.TAG); - gxwztvMap.put("hasMore", true); - gxwztvMap.put("hasLoad", false); + gxwztvMap.put(TAG_KEY, GxwztvBookModelImpl.TAG); + gxwztvMap.put(HASMORE_KEY, true); + gxwztvMap.put(HASLOAD_KEY, false); + gxwztvMap.put(DURREQUESTTIME, 1); + gxwztvMap.put(MAXREQUESTTIME, 3); searchEngine.add(gxwztvMap); Map lingdiankanshu = new HashMap(); - lingdiankanshu.put("tag", LingdiankanshuStationBookModelImpl.TAG); - lingdiankanshu.put("hasMore", true); - lingdiankanshu.put("hasLoad", false); + lingdiankanshu.put(TAG_KEY, LingdiankanshuStationBookModelImpl.TAG); + lingdiankanshu.put(HASMORE_KEY, true); + lingdiankanshu.put(HASLOAD_KEY, false); + lingdiankanshu.put(DURREQUESTTIME, 1); + lingdiankanshu.put(MAXREQUESTTIME, 3); searchEngine.add(lingdiankanshu); - - Map easou = new HashMap(); - easou.put("tag", EasouBookModelImpl.TAG); - easou.put("hasMore", true); - easou.put("hasLoad", false); - searchEngine.add(easou); } @Override @@ -211,85 +216,96 @@ public class SearchPresenterImpl extends BasePresenterImpl implemen } @Override - public void toSearchBooks(String key) { + public void toSearchBooks(String key, Boolean fromError) { if (key != null) { durSearchKey = key; this.startThisSearchTime = System.currentTimeMillis(); for (int i = 0; i < searchEngine.size(); i++) { - searchEngine.get(i).put("hasMore", true); - searchEngine.get(i).put("hasLoad", false); + searchEngine.get(i).put(HASMORE_KEY, true); + searchEngine.get(i).put(HASLOAD_KEY, false); + searchEngine.get(i).put(DURREQUESTTIME, 1); } } - searchBook(durSearchKey, startThisSearchTime, 0); + searchBook(durSearchKey, startThisSearchTime, fromError); } - private void searchBook(final String content, final long searchTime, final int searchEngineIndex) { + private void searchBook(final String content, final long searchTime, Boolean fromError) { if (searchTime == startThisSearchTime) { - Boolean hasMore = false; + Boolean canLoad = false; for (Map temp : searchEngine) { - if ((Boolean) temp.get("hasMore")) { - hasMore = true; + if ((Boolean) temp.get(HASMORE_KEY) && (int) temp.get(DURREQUESTTIME) <= (int) temp.get(MAXREQUESTTIME)) { + canLoad = true; break; } } - if (hasMore) { - if (searchEngineIndex < searchEngine.size()) { - if ((Boolean) searchEngine.get(searchEngineIndex).get("hasMore") && !(Boolean) searchEngine.get(searchEngineIndex).get("hasLoad")) { - WebBookModelImpl.getInstance().searchOtherBook(content, page, (String) searchEngine.get(searchEngineIndex).get("tag")) - .observeOn(AndroidSchedulers.mainThread()) - .subscribeOn(Schedulers.newThread()) - .subscribe(new SimpleObserver>() { - @Override - public void onNext(List value) { - if (searchTime == startThisSearchTime) { - searchEngine.get(searchEngineIndex).put("hasLoad", true); - if (value.size() == 0) { - searchEngine.get(searchEngineIndex).put("hasMore", false); - } else { - for (SearchBookBean temp : value) { - for (BookShelfBean bookShelfBean : bookShelfs) { - if (temp.getNoteUrl().equals(bookShelfBean.getNoteUrl())) { - temp.setAdd(true); - break; - } + if (canLoad) { + int searchEngineIndex = -1; + for (int i = 0; i < searchEngine.size(); i++) { + if (!(Boolean) searchEngine.get(i).get(HASLOAD_KEY) && (int) searchEngine.get(i).get(DURREQUESTTIME) <= (int) searchEngine.get(i).get(MAXREQUESTTIME)) { + searchEngineIndex = i; + break; + } + } + if (searchEngineIndex == -1) { + this.page++; + for (Map item : searchEngine) { + item.put(HASLOAD_KEY, false); + } + if (!fromError) { + if (page - 1 == 1) { + mView.refreshFinish(false); + } else { + mView.loadMoreFinish(false); + } + } else { + searchBook(content, searchTime, false); + } + } else { + final int finalSearchEngineIndex = searchEngineIndex; + WebBookModelImpl.getInstance().searchOtherBook(content, page, (String) searchEngine.get(searchEngineIndex).get(TAG_KEY)) + .observeOn(AndroidSchedulers.mainThread()) + .subscribeOn(Schedulers.newThread()) + .subscribe(new SimpleObserver>() { + @Override + public void onNext(List value) { + if (searchTime == startThisSearchTime) { + searchEngine.get(finalSearchEngineIndex).put(HASLOAD_KEY, true); + searchEngine.get(finalSearchEngineIndex).put(DURREQUESTTIME, 1); + if (value.size() == 0) { + searchEngine.get(finalSearchEngineIndex).put(HASMORE_KEY, false); + } else { + for (SearchBookBean temp : value) { + for (BookShelfBean bookShelfBean : bookShelfs) { + if (temp.getNoteUrl().equals(bookShelfBean.getNoteUrl())) { + temp.setAdd(true); + break; } } } - if (page == 1 && searchEngineIndex == 0) { - mView.refreshSearchBook(value); - } else { - if (value != null && value.size() > 0 && !mView.checkIsExist(value.get(0))) - mView.loadMoreSearchBook(value); - else { - searchEngine.get(searchEngineIndex).put("hasMore", false); - } + } + if (page == 1 && finalSearchEngineIndex == 0) { + mView.refreshSearchBook(value); + } else { + if (value != null && value.size() > 0 && !mView.checkIsExist(value.get(0))) + mView.loadMoreSearchBook(value); + else { + searchEngine.get(finalSearchEngineIndex).put(HASMORE_KEY, false); } - searchBook(content, searchTime, searchEngineIndex + 1); } + searchBook(content, searchTime, false); } - - @Override - public void onError(Throwable e) { - e.printStackTrace(); - if (searchTime == startThisSearchTime) { - searchEngine.get(searchEngineIndex).put("hasLoad", false); - mView.searchBookError(page == 1 && (searchEngineIndex == 0 || (searchEngineIndex > 0 && mView.getSearchBookAdapter().getItemcount() == 0))); - } + } + + @Override + public void onError(Throwable e) { + e.printStackTrace(); + if (searchTime == startThisSearchTime) { + searchEngine.get(finalSearchEngineIndex).put(HASLOAD_KEY, false); + searchEngine.get(finalSearchEngineIndex).put(DURREQUESTTIME, ((int) searchEngine.get(finalSearchEngineIndex).get(DURREQUESTTIME)) + 1); + mView.searchBookError(page == 1 && (finalSearchEngineIndex == 0 || (finalSearchEngineIndex > 0 && mView.getSearchBookAdapter().getItemcount() == 0))); } - }); - } else { - searchBook(content, searchTime, searchEngineIndex + 1); - } - } else { - if (page == 1) { - mView.refreshFinish(false); - } else { - mView.loadMoreFinish(false); - } - this.page++; - for (Map item : searchEngine) { - item.put("hasLoad", false); - } + } + }); } } else { if (page == 1) { @@ -299,7 +315,7 @@ public class SearchPresenterImpl extends BasePresenterImpl implemen } this.page++; for (Map item : searchEngine) { - item.put("hasLoad", false); + item.put(HASLOAD_KEY, false); } } } @@ -405,9 +421,9 @@ public class SearchPresenterImpl extends BasePresenterImpl implemen } ) public void hadRemoveBook(BookShelfBean bookShelfBean) { - if(bookShelfs!=null){ - for(int i=0;i版权所有：2016-深圳市得色科技有限公司

- *

- *

类描述：

- *

创建人：章钦豪

- *

创建时间：2017/1/16

- *

修改人：

- *

修改时间：

- *

修改备注：

- * - * @version V1.0 - */ public class PremissionCheck { public static Boolean checkPremission(Context context,String permission){ boolean result = false; @@ -37,7 +16,6 @@ public class PremissionCheck { result = context.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED; } else { - // targetSdkVersion < Android M, we have to use PermissionChecker result = PermissionChecker.checkSelfPermission(context, permission) == PermissionChecker.PERMISSION_GRANTED; } diff --git a/app/src/main/java/com/monke/monkeybook/view/IBookDetailView.java b/app/src/main/java/com/monke/monkeybook/view/IBookDetailView.java index ced3219..b759f09 100644 --- a/app/src/main/java/com/monke/monkeybook/view/IBookDetailView.java +++ b/app/src/main/java/com/monke/monkeybook/view/IBookDetailView.java @@ -1,9 +1,16 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view; import com.monke.basemvplib.IView; public interface IBookDetailView extends IView{ - public void updateView(); + /** + * 更新书籍详情UI + */ + void updateView(); - public void getBookShelfError(); + /** + * 数据获取失败 + */ + void getBookShelfError(); } diff --git a/app/src/main/java/com/monke/monkeybook/view/IBookReadView.java b/app/src/main/java/com/monke/monkeybook/view/IBookReadView.java index 0fc4ab4..cbf1884 100644 --- a/app/src/main/java/com/monke/monkeybook/view/IBookReadView.java +++ b/app/src/main/java/com/monke/monkeybook/view/IBookReadView.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view; import android.graphics.Paint; @@ -5,23 +6,40 @@ import com.monke.basemvplib.IView; public interface IBookReadView extends IView{ - public Paint getPaint(); + /** + * 获取当前阅读界面UI画笔 + * @return + */ + Paint getPaint(); - public int getContentWidth(); + /** + * 获取当前小说内容可绘制宽度 + * @return + */ + int getContentWidth(); - public void initContentSuccess(int durChapterIndex, int chapterAll, int durPageIndex); + /** + * 小说数据初始化成功 + * @param durChapterIndex + * @param chapterAll + * @param durPageIndex + */ + void initContentSuccess(int durChapterIndex, int chapterAll, int durPageIndex); - public void startLoadingBook(); + /** + * 开始加载 + */ + void startLoadingBook(); - public void setHpbReadProgressMax(int count); + void setHpbReadProgressMax(int count); - public void initPop(); + void initPop(); - public void showLoadBook(); + void showLoadBook(); - public void dimissLoadBook(); + void dimissLoadBook(); - public void loadLocationBookError(); + void loadLocationBookError(); - public void showDownloadMenu(); + void showDownloadMenu(); } diff --git a/app/src/main/java/com/monke/monkeybook/view/IChoiceBookView.java b/app/src/main/java/com/monke/monkeybook/view/IChoiceBookView.java index 78641a1..c21a1d7 100644 --- a/app/src/main/java/com/monke/monkeybook/view/IChoiceBookView.java +++ b/app/src/main/java/com/monke/monkeybook/view/IChoiceBookView.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view; import com.monke.basemvplib.IView; @@ -7,23 +8,23 @@ import java.util.List; public interface IChoiceBookView extends IView{ - public void refreshSearchBook(List books); + void refreshSearchBook(List books); - public void loadMoreSearchBook(List books); + void loadMoreSearchBook(List books); - public void refreshFinish(Boolean isAll); + void refreshFinish(Boolean isAll); - public void loadMoreFinish(Boolean isAll); + void loadMoreFinish(Boolean isAll); - public void searchBookError(); + void searchBookError(); - public void addBookShelfSuccess(List searchBooks); + void addBookShelfSuccess(List searchBooks); - public void addBookShelfFailed(int code); + void addBookShelfFailed(int code); - public ChoiceBookAdapter getSearchBookAdapter(); + ChoiceBookAdapter getSearchBookAdapter(); - public void updateSearchItem(int index); + void updateSearchItem(int index); - public void startRefreshAnim(); + void startRefreshAnim(); } diff --git a/app/src/main/java/com/monke/monkeybook/view/IImportBookView.java b/app/src/main/java/com/monke/monkeybook/view/IImportBookView.java index 1c69df4..e7fcf73 100644 --- a/app/src/main/java/com/monke/monkeybook/view/IImportBookView.java +++ b/app/src/main/java/com/monke/monkeybook/view/IImportBookView.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view; import com.monke.basemvplib.IView; @@ -5,11 +6,24 @@ import java.io.File; public interface IImportBookView extends IView{ - public void addNewBook(File newFile); + /** + * 新增书籍 + * @param newFile + */ + void addNewBook(File newFile); - public void searchFinish(); + /** + * 书籍搜索完成 + */ + void searchFinish(); - public void addSuccess(); + /** + * 添加成功 + */ + void addSuccess(); - public void addError(); + /** + * 添加失败 + */ + void addError(); } \ No newline at end of file diff --git a/app/src/main/java/com/monke/monkeybook/view/ILibraryView.java b/app/src/main/java/com/monke/monkeybook/view/ILibraryView.java index 5348d87..a90a7d5 100644 --- a/app/src/main/java/com/monke/monkeybook/view/ILibraryView.java +++ b/app/src/main/java/com/monke/monkeybook/view/ILibraryView.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view; import com.monke.basemvplib.IView; @@ -5,6 +6,14 @@ import com.monke.monkeybook.bean.LibraryBean; public interface ILibraryView extends IView{ - public void updateUI(LibraryBean library); - public void finishRefresh(); + /** + * 书城书籍获取成功 更新UI + * @param library + */ + void updateUI(LibraryBean library); + + /** + * 书城数据刷新成功 更新UI + */ + void finishRefresh(); } diff --git a/app/src/main/java/com/monke/monkeybook/view/IMainView.java b/app/src/main/java/com/monke/monkeybook/view/IMainView.java index 6e2656f..aa04d58 100644 --- a/app/src/main/java/com/monke/monkeybook/view/IMainView.java +++ b/app/src/main/java/com/monke/monkeybook/view/IMainView.java @@ -1,24 +1,43 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view; import com.monke.basemvplib.IView; import com.monke.monkeybook.bean.BookShelfBean; -import com.monke.monkeybook.view.adapter.BookShelfAdapter; import java.util.List; public interface IMainView extends IView{ - public void refreshBookShelf(List bookShelfBeanList); - - public void activityRefreshView(); - - public void refreshFinish(); - - public void refreshError(String error); - - public List getBookShelfAdapterDatas(); - - public void refreshRecyclerViewItemAdd(); - - public void setRecyclerMaxProgress(int x); + /** + * 刷新书架书籍小说信息 更新UI + * @param bookShelfBeanList + */ + void refreshBookShelf(List bookShelfBeanList); + + /** + * 执行刷新书架小说信息 + */ + void activityRefreshView(); + + /** + * 刷新完成 + */ + void refreshFinish(); + + /** + * 刷新错误 + * @param error + */ + void refreshError(String error); + + /** + * 刷新书籍 UI进度修改 + */ + void refreshRecyclerViewItemAdd(); + + /** + * 设置刷新进度条最大值 + * @param x + */ + void setRecyclerMaxProgress(int x); } diff --git a/app/src/main/java/com/monke/monkeybook/view/ISearchView.java b/app/src/main/java/com/monke/monkeybook/view/ISearchView.java index 67f9aac..006375f 100644 --- a/app/src/main/java/com/monke/monkeybook/view/ISearchView.java +++ b/app/src/main/java/com/monke/monkeybook/view/ISearchView.java @@ -1,37 +1,77 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view; import android.widget.EditText; - import com.monke.basemvplib.IView; import com.monke.monkeybook.bean.SearchBookBean; import com.monke.monkeybook.bean.SearchHistoryBean; import com.monke.monkeybook.view.adapter.SearchBookAdapter; - import java.util.List; public interface ISearchView extends IView{ - public void insertSearchHistorySuccess(SearchHistoryBean searchHistoryBean); - - public void querySearchHistorySuccess(List datas); - - public void refreshSearchBook(List books); - - public void loadMoreSearchBook(List books); - - public void refreshFinish(Boolean isAll); - - public void loadMoreFinish(Boolean isAll); - - public void searchBookError(Boolean isRefresh); - - public EditText getEdtContent(); - - public void addBookShelfFailed(int code); - - public SearchBookAdapter getSearchBookAdapter(); - - public void updateSearchItem(int index); - - public Boolean checkIsExist(SearchBookBean searchBookBean); + /** + * 成功 新增查询记录 + * @param searchHistoryBean + */ + void insertSearchHistorySuccess(SearchHistoryBean searchHistoryBean); + + /** + * 成功搜索 搜索记录 + * @param datas + */ + void querySearchHistorySuccess(List datas); + + /** + * 首次查询成功 更新UI + * @param books + */ + void refreshSearchBook(List books); + + /** + * 加载更多书籍成功 更新UI + * @param books + */ + void loadMoreSearchBook(List books); + + /** + * 刷新成功 + * @param isAll + */ + void refreshFinish(Boolean isAll); + + /** + * 加载成功 + * @param isAll + */ + void loadMoreFinish(Boolean isAll); + + /** + * 搜索失败 + * @param isRefresh + */ + void searchBookError(Boolean isRefresh); + + /** + * 获取搜索内容EditText + * @return + */ + EditText getEdtContent(); + + /** + * 添加书籍失败 + * @param code + */ + void addBookShelfFailed(int code); + + SearchBookAdapter getSearchBookAdapter(); + + void updateSearchItem(int index); + + /** + * 判断书籍是否已经在书架上 + * @param searchBookBean + * @return + */ + Boolean checkIsExist(SearchBookBean searchBookBean); } diff --git a/app/src/main/java/com/monke/monkeybook/view/adapter/BookShelfAdapter.java b/app/src/main/java/com/monke/monkeybook/view/adapter/BookShelfAdapter.java index 0073bea..bec276c 100644 --- a/app/src/main/java/com/monke/monkeybook/view/adapter/BookShelfAdapter.java +++ b/app/src/main/java/com/monke/monkeybook/view/adapter/BookShelfAdapter.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.adapter; import android.os.Handler; @@ -36,11 +37,11 @@ public class BookShelfAdapter extends RefreshRecyclerViewAdapter { private OnItemClickListener itemClickListener; public interface OnItemClickListener { - public void toSearch(); + void toSearch(); - public void onClick(BookShelfBean bookShelfBean, int index); + void onClick(BookShelfBean bookShelfBean, int index); - public void onLongClick(View view, BookShelfBean bookShelfBean, int index); + void onLongClick(View view, BookShelfBean bookShelfBean, int index); } public BookShelfAdapter() { diff --git a/app/src/main/java/com/monke/monkeybook/view/adapter/ChapterListAdapter.java b/app/src/main/java/com/monke/monkeybook/view/adapter/ChapterListAdapter.java index 5bd2b80..7162074 100644 --- a/app/src/main/java/com/monke/monkeybook/view/adapter/ChapterListAdapter.java +++ b/app/src/main/java/com/monke/monkeybook/view/adapter/ChapterListAdapter.java @@ -1,7 +1,7 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.adapter; import android.graphics.Color; -import android.os.Handler; import android.support.annotation.NonNull; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -9,7 +9,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.TextView; - import com.monke.monkeybook.R; import com.monke.monkeybook.bean.BookShelfBean; import com.monke.monkeybook.widget.ChapterListView; diff --git a/app/src/main/java/com/monke/monkeybook/view/adapter/ChoiceBookAdapter.java b/app/src/main/java/com/monke/monkeybook/view/adapter/ChoiceBookAdapter.java index f07ce6e..124403a 100644 --- a/app/src/main/java/com/monke/monkeybook/view/adapter/ChoiceBookAdapter.java +++ b/app/src/main/java/com/monke/monkeybook/view/adapter/ChoiceBookAdapter.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.adapter; import android.support.v7.widget.RecyclerView; @@ -20,9 +21,9 @@ public class ChoiceBookAdapter extends RefreshRecyclerViewAdapter { private List searchBooks; public interface OnItemClickListener { - public void clickAddShelf(View clickView, int position, SearchBookBean searchBookBean); + void clickAddShelf(View clickView, int position, SearchBookBean searchBookBean); - public void clickItem(View animView, int position, SearchBookBean searchBookBean); + void clickItem(View animView, int position, SearchBookBean searchBookBean); } private OnItemClickListener itemClickListener; diff --git a/app/src/main/java/com/monke/monkeybook/view/adapter/ImportBookAdapter.java b/app/src/main/java/com/monke/monkeybook/view/adapter/ImportBookAdapter.java index 7c55a87..e84a4d7 100644 --- a/app/src/main/java/com/monke/monkeybook/view/adapter/ImportBookAdapter.java +++ b/app/src/main/java/com/monke/monkeybook/view/adapter/ImportBookAdapter.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.adapter; import android.os.Environment; @@ -20,7 +21,7 @@ public class ImportBookAdapter extends RecyclerView.Adapter selectDatas; public interface OnCheckBookListener{ - public void checkBook(int count); + void checkBook(int count); } private OnCheckBookListener checkBookListener; diff --git a/app/src/main/java/com/monke/monkeybook/view/adapter/SearchBookAdapter.java b/app/src/main/java/com/monke/monkeybook/view/adapter/SearchBookAdapter.java index 06b3311..568dc3e 100644 --- a/app/src/main/java/com/monke/monkeybook/view/adapter/SearchBookAdapter.java +++ b/app/src/main/java/com/monke/monkeybook/view/adapter/SearchBookAdapter.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.adapter; import android.support.v7.widget.RecyclerView; @@ -20,9 +21,9 @@ public class SearchBookAdapter extends RefreshRecyclerViewAdapter { private List searchBooks; public interface OnItemClickListener { - public void clickAddShelf(View clickView, int position, SearchBookBean searchBookBean); + void clickAddShelf(View clickView, int position, SearchBookBean searchBookBean); - public void clickItem(View animView, int position, SearchBookBean searchBookBean); + void clickItem(View animView, int position, SearchBookBean searchBookBean); } private OnItemClickListener itemClickListener; diff --git a/app/src/main/java/com/monke/monkeybook/view/adapter/SearchHistoryAdapter.java b/app/src/main/java/com/monke/monkeybook/view/adapter/SearchHistoryAdapter.java index 1419c11..c2aebd0 100644 --- a/app/src/main/java/com/monke/monkeybook/view/adapter/SearchHistoryAdapter.java +++ b/app/src/main/java/com/monke/monkeybook/view/adapter/SearchHistoryAdapter.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.adapter; import android.view.LayoutInflater; @@ -15,7 +16,7 @@ public class SearchHistoryAdapter extends TagAdapter { } public interface OnItemClickListener{ - public void itemClick(SearchHistoryBean searchHistoryBean); + void itemClick(SearchHistoryBean searchHistoryBean); } private SearchHistoryAdapter.OnItemClickListener onItemClickListener; diff --git a/app/src/main/java/com/monke/monkeybook/view/impl/BookDetailActivity.java b/app/src/main/java/com/monke/monkeybook/view/impl/BookDetailActivity.java index 5e32dd4..74bde0c 100644 --- a/app/src/main/java/com/monke/monkeybook/view/impl/BookDetailActivity.java +++ b/app/src/main/java/com/monke/monkeybook/view/impl/BookDetailActivity.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.impl; import android.content.Intent; @@ -9,7 +10,6 @@ import android.view.animation.AnimationUtils; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; - import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.monke.monkeybook.BitIntentDataManager; @@ -22,7 +22,6 @@ import com.monke.monkeybook.utils.BlurTransformation; import com.monke.monkeybook.view.IBookDetailView; public class BookDetailActivity extends MBaseActivity implements IBookDetailView { - private FrameLayout iflContent; private ImageView ivBlurCover; private ImageView ivCover; diff --git a/app/src/main/java/com/monke/monkeybook/view/impl/ChoiceBookActivity.java b/app/src/main/java/com/monke/monkeybook/view/impl/ChoiceBookActivity.java index 379ee62..9bbf7e6 100644 --- a/app/src/main/java/com/monke/monkeybook/view/impl/ChoiceBookActivity.java +++ b/app/src/main/java/com/monke/monkeybook/view/impl/ChoiceBookActivity.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.impl; import android.content.Context; diff --git a/app/src/main/java/com/monke/monkeybook/view/impl/ImportBookActivity.java b/app/src/main/java/com/monke/monkeybook/view/impl/ImportBookActivity.java index 4df65f1..173d2b3 100644 --- a/app/src/main/java/com/monke/monkeybook/view/impl/ImportBookActivity.java +++ b/app/src/main/java/com/monke/monkeybook/view/impl/ImportBookActivity.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.impl; import android.Manifest; diff --git a/app/src/main/java/com/monke/monkeybook/view/impl/LibraryActivity.java b/app/src/main/java/com/monke/monkeybook/view/impl/LibraryActivity.java index 0360dfd..f2058fb 100644 --- a/app/src/main/java/com/monke/monkeybook/view/impl/LibraryActivity.java +++ b/app/src/main/java/com/monke/monkeybook/view/impl/LibraryActivity.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.impl; import android.content.Intent; diff --git a/app/src/main/java/com/monke/monkeybook/view/impl/MainActivity.java b/app/src/main/java/com/monke/monkeybook/view/impl/MainActivity.java index 9619b52..93c9870 100644 --- a/app/src/main/java/com/monke/monkeybook/view/impl/MainActivity.java +++ b/app/src/main/java/com/monke/monkeybook/view/impl/MainActivity.java @@ -1,8 +1,10 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.impl; import android.content.Intent; import android.support.v7.widget.LinearLayoutManager; import android.view.KeyEvent; +import android.view.MotionEvent; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageButton; @@ -54,6 +56,11 @@ public class MainActivity extends MBaseActivity implements IMain bookShelfAdapter = new BookShelfAdapter(); } + @Override + public boolean dispatchTouchEvent(MotionEvent ev) { + return super.dispatchTouchEvent(ev); + } + @Override protected void bindView() { downloadListPop = new DownloadListPop(this); @@ -197,11 +204,6 @@ public class MainActivity extends MBaseActivity implements IMain Toast.makeText(this, error, Toast.LENGTH_SHORT).show(); } - @Override - public List getBookShelfAdapterDatas() { - return bookShelfAdapter.getBooks(); - } - @Override public void refreshRecyclerViewItemAdd() { rfRvShelf.getRpb().setDurProgress(rfRvShelf.getRpb().getDurProgress() + 1); diff --git a/app/src/main/java/com/monke/monkeybook/view/impl/ReadBookActivity.java b/app/src/main/java/com/monke/monkeybook/view/impl/ReadBookActivity.java index 7484b7f..a2a1527 100644 --- a/app/src/main/java/com/monke/monkeybook/view/impl/ReadBookActivity.java +++ b/app/src/main/java/com/monke/monkeybook/view/impl/ReadBookActivity.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.impl; import android.Manifest; @@ -19,7 +20,6 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; - import com.hwangjr.rxbus.RxBus; import com.monke.basemvplib.AppActivityManager; import com.monke.monkeybook.R; @@ -43,10 +43,8 @@ import com.monke.monkeybook.widget.contentswitchview.ContentSwitchView; import com.monke.monkeybook.widget.modialog.MoProgressHUD; import com.monke.mprogressbar.MHorProgressBar; import com.monke.mprogressbar.OnProgressListener; - import java.util.ArrayList; import java.util.List; - import me.grantland.widget.AutofitTextView; public class ReadBookActivity extends MBaseActivity implements IBookReadView { diff --git a/app/src/main/java/com/monke/monkeybook/view/impl/SearchActivity.java b/app/src/main/java/com/monke/monkeybook/view/impl/SearchActivity.java index efc9311..e87ab3f 100644 --- a/app/src/main/java/com/monke/monkeybook/view/impl/SearchActivity.java +++ b/app/src/main/java/com/monke/monkeybook/view/impl/SearchActivity.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.impl; import android.animation.Animator; @@ -25,6 +26,7 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; + import com.daimajia.androidanimations.library.Techniques; import com.daimajia.androidanimations.library.YoYo; import com.monke.immerselayout.StatusBarUtils; @@ -42,7 +44,9 @@ import com.monke.monkeybook.view.adapter.SearchHistoryAdapter; import com.monke.monkeybook.widget.flowlayout.TagFlowLayout; import com.monke.monkeybook.widget.refreshview.OnLoadMoreListener; import com.monke.monkeybook.widget.refreshview.RefreshRecyclerView; + import java.util.List; + import tyrantgit.explosionfield.ExplosionField; public class SearchActivity extends MBaseActivity implements ISearchView { @@ -100,7 +104,7 @@ public class SearchActivity extends MBaseActivity implements I public void onClick(View v) { //刷新失败 ，重试 mPresenter.initPage(); - mPresenter.toSearchBooks(null); + mPresenter.toSearchBooks(null,true); rfRvSearchBooks.startRefresh(); } }); @@ -192,12 +196,12 @@ public class SearchActivity extends MBaseActivity implements I rfRvSearchBooks.setLoadMoreListener(new OnLoadMoreListener() { @Override public void startLoadmore() { - mPresenter.toSearchBooks(null); + mPresenter.toSearchBooks(null, false); } @Override public void loadMoreErrorTryAgain() { - mPresenter.toSearchBooks(null); + mPresenter.toSearchBooks(null, true); } }); } @@ -220,7 +224,7 @@ public class SearchActivity extends MBaseActivity implements I @Override public void run() { mPresenter.initPage(); - mPresenter.toSearchBooks(key); + mPresenter.toSearchBooks(key, false); rfRvSearchBooks.startRefresh(); } }, 300); @@ -516,7 +520,7 @@ public class SearchActivity extends MBaseActivity implements I public Boolean checkIsExist(SearchBookBean searchBookBean) { Boolean result = false; for (int i = 0; i < searchBookAdapter.getItemcount(); i++) { - if(searchBookAdapter.getSearchBooks().get(i).getNoteUrl().equals(searchBookBean.getNoteUrl()) && searchBookAdapter.getSearchBooks().get(i).getTag().equals(searchBookBean.getTag())){ + if (searchBookAdapter.getSearchBooks().get(i).getNoteUrl().equals(searchBookBean.getNoteUrl()) && searchBookAdapter.getSearchBooks().get(i).getTag().equals(searchBookBean.getTag())) { result = true; break; } diff --git a/app/src/main/java/com/monke/monkeybook/view/impl/WelcomeActivity.java b/app/src/main/java/com/monke/monkeybook/view/impl/WelcomeActivity.java index e71cbe1..64692e5 100644 --- a/app/src/main/java/com/monke/monkeybook/view/impl/WelcomeActivity.java +++ b/app/src/main/java/com/monke/monkeybook/view/impl/WelcomeActivity.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.impl; import android.animation.Animator; diff --git a/app/src/main/java/com/monke/monkeybook/view/popupwindow/CheckAddShelfPop.java b/app/src/main/java/com/monke/monkeybook/view/popupwindow/CheckAddShelfPop.java index b60dbf4..ae8424d 100644 --- a/app/src/main/java/com/monke/monkeybook/view/popupwindow/CheckAddShelfPop.java +++ b/app/src/main/java/com/monke/monkeybook/view/popupwindow/CheckAddShelfPop.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.popupwindow; import android.content.Context; @@ -14,8 +15,8 @@ public class CheckAddShelfPop extends PopupWindow{ private View view; public interface OnItemClickListener { - public void clickExit(); - public void clickAddShelf(); + void clickExit(); + void clickAddShelf(); } private OnItemClickListener itemClick; private String bookName; diff --git a/app/src/main/java/com/monke/monkeybook/view/popupwindow/DownloadListPop.java b/app/src/main/java/com/monke/monkeybook/view/popupwindow/DownloadListPop.java index 3f41425..9dc764f 100644 --- a/app/src/main/java/com/monke/monkeybook/view/popupwindow/DownloadListPop.java +++ b/app/src/main/java/com/monke/monkeybook/view/popupwindow/DownloadListPop.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.popupwindow; import android.content.Context; diff --git a/app/src/main/java/com/monke/monkeybook/view/popupwindow/FontPop.java b/app/src/main/java/com/monke/monkeybook/view/popupwindow/FontPop.java index 0dcfaf1..1a7c8a1 100644 --- a/app/src/main/java/com/monke/monkeybook/view/popupwindow/FontPop.java +++ b/app/src/main/java/com/monke/monkeybook/view/popupwindow/FontPop.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.popupwindow; import android.content.Context; @@ -9,10 +10,8 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.PopupWindow; import android.widget.TextView; - import com.monke.monkeybook.R; import com.monke.monkeybook.ReadBookControl; - import de.hdodenhof.circleimageview.CircleImageView; public class FontPop extends PopupWindow{ diff --git a/app/src/main/java/com/monke/monkeybook/view/popupwindow/MoreSettingPop.java b/app/src/main/java/com/monke/monkeybook/view/popupwindow/MoreSettingPop.java index 603d080..23d86c9 100644 --- a/app/src/main/java/com/monke/monkeybook/view/popupwindow/MoreSettingPop.java +++ b/app/src/main/java/com/monke/monkeybook/view/popupwindow/MoreSettingPop.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.popupwindow; import android.content.Context; @@ -6,7 +7,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.CompoundButton; import android.widget.PopupWindow; - import com.kyleduo.switchbutton.SwitchButton; import com.monke.monkeybook.R; import com.monke.monkeybook.ReadBookControl; diff --git a/app/src/main/java/com/monke/monkeybook/view/popupwindow/ReadBookMenuMorePop.java b/app/src/main/java/com/monke/monkeybook/view/popupwindow/ReadBookMenuMorePop.java index ece3530..0f9e446 100644 --- a/app/src/main/java/com/monke/monkeybook/view/popupwindow/ReadBookMenuMorePop.java +++ b/app/src/main/java/com/monke/monkeybook/view/popupwindow/ReadBookMenuMorePop.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.popupwindow; import android.content.Context; diff --git a/app/src/main/java/com/monke/monkeybook/view/popupwindow/WindowLightPop.java b/app/src/main/java/com/monke/monkeybook/view/popupwindow/WindowLightPop.java index 5fd042b..3582945 100644 --- a/app/src/main/java/com/monke/monkeybook/view/popupwindow/WindowLightPop.java +++ b/app/src/main/java/com/monke/monkeybook/view/popupwindow/WindowLightPop.java @@ -1,3 +1,4 @@ +//Copyright (c) 2017. 章钦豪. All rights reserved. package com.monke.monkeybook.view.popupwindow; import android.app.Activity;