混合规则使用##正则##替换

Invinciblelee · May 27, 2019 · 4c2f5f5 · 4c2f5f5
1 parent c3350ae
commit 4c2f5f5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md
@@ -1,6 +1,15 @@
 ## 本软件为开源软件,没有上架Google Play,没有在任何地方售卖,如果想支持我请通过软件里的捐赠,不要在任何地方购买!
 ## 更新日志
 #### 彩蛋,领支付宝红包有惊喜
+**2019/05/27**
+*修复某些书源发现分页异常
+*增加正文标题显示和隐藏
+*修复无法更换封面
+*修复无法添加书签
+*修复无法下载最后一章
+*混合，CSS, XPATH使用##正则##替换
+*注：长按加悬浮书架按钮可以更新书架。另外最近比较忙，其他功能延迟更新
+
 **2019/05/19**
 *修复一个导致音频嗅探失败的原因（例如喜马拉雅）
 *加入分组搜索

diff --git a/app/src/main/java/com/monke/monkeybook/presenter/ChoiceBookPresenterImpl.java b/app/src/main/java/com/monke/monkeybook/presenter/ChoiceBookPresenterImpl.java
@@ -18,11 +18,10 @@
 import com.monke.monkeybook.model.WebBookModel;
 import com.monke.monkeybook.presenter.contract.ChoiceBookContract;
 
-import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
 
 public class ChoiceBookPresenterImpl extends BasePresenterImpl<ChoiceBookContract.View> implements ChoiceBookContract.Presenter {
@@ -59,17 +58,18 @@ public void toSearchBooks(String key) {
     private void searchBook(final long searchTime) {
         WebBookModel.getInstance().findBook(tag, url, page)
                 .subscribeOn(Schedulers.single())
-                .map((Function<List<SearchBookBean>, List<SearchBookBean>>) searchBookBeans -> {
-                    boolean hasMore = true;
-                    for (SearchBookBean searchBook : searchBookBeans) {
+                .map(searchBookBeans -> {
+                    Iterator<SearchBookBean> iterator = searchBookBeans.iterator();
+                    while (iterator.hasNext()) {
+                        SearchBookBean searchBook = iterator.next();
                         for (SearchBookBean temp : mView.getSearchBookAdapter().getSearchBooks()) {
                             if (TextUtils.equals(temp.getRealNoteUrl(), searchBook.getRealNoteUrl())) {
-                                hasMore = false;
+                                iterator.remove();
                                 break;
                             }
                         }
                     }
-                    return hasMore ? searchBookBeans : Collections.emptyList();
+                    return searchBookBeans;
                 })
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SimpleObserver<List<SearchBookBean>>() {

diff --git a/app/version.properties b/app/version.properties
@@ -1,2 +1,2 @@
-#Mon May 27 08:49:24 CST 2019
-VERSION_CODE=3006
+#Mon May 27 09:07:58 CST 2019
+VERSION_CODE=3010