From ad9f40a6654c1c35e2e0132fd033dbdb916d3017 Mon Sep 17 00:00:00 2001 From: Administrator <390057892@qq.com> Date: Sat, 9 Nov 2019 23:40:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- app/src/main/java/com/novel/read/utlis/StringUtils.java | 4 ++-- .../java/com/novel/read/widget/dialog/ReadSettingDialog.kt | 1 - .../java/com/novel/read/widget/page/LocalPageLoader.java | 5 +---- .../main/java/com/novel/read/widget/page/NetPageLoader.java | 3 +-- .../main/java/com/novel/read/widget/page/PageAnimation.java | 3 +-- app/src/main/java/com/novel/read/widget/page/PageLoader.java | 3 +-- app/src/main/java/com/novel/read/widget/page/PageMode.java | 3 +-- app/src/main/java/com/novel/read/widget/page/PageStyle.java | 5 ++--- app/src/main/java/com/novel/read/widget/page/TxtChapter.java | 3 +-- app/src/main/java/com/novel/read/widget/page/Void.java | 4 ---- .../java/com/novel/read/widget/page/anim/CoverPageAnim.java | 3 ++- .../com/novel/read/widget/page/anim/HorizonPageAnim.java | 4 ++-- .../java/com/novel/read/widget/page/anim/NonePageAnim.java | 3 ++- .../java/com/novel/read/widget/page/anim/ScrollPageAnim.java | 4 +--- .../com/novel/read/widget/page/anim/SimulationPageAnim.java | 3 ++- .../java/com/novel/read/widget/page/anim/SlidePageAnim.java | 2 +- 17 files changed, 21 insertions(+), 34 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 89482aa..6d5dd44 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -10,7 +10,7 @@ - + diff --git a/app/src/main/java/com/novel/read/utlis/StringUtils.java b/app/src/main/java/com/novel/read/utlis/StringUtils.java index ef3adce..cce6acf 100644 --- a/app/src/main/java/com/novel/read/utlis/StringUtils.java +++ b/app/src/main/java/com/novel/read/utlis/StringUtils.java @@ -35,13 +35,13 @@ public class StringUtils { } private static String deleteImgs(String content) { - if (content!=null&&!TextUtils.isEmpty(content)){ + if (content != null && !TextUtils.isEmpty(content)) { // 去掉所有html元素, String str = content.replaceAll("\\&[a-zA-Z]{1,10};", "").replaceAll( "<[^>]*>", ""); str = str.replaceAll("[(/>)<]", ""); return str; - }else { + } else { return ""; } } diff --git a/app/src/main/java/com/novel/read/widget/dialog/ReadSettingDialog.kt b/app/src/main/java/com/novel/read/widget/dialog/ReadSettingDialog.kt index 22aaabc..1529d21 100644 --- a/app/src/main/java/com/novel/read/widget/dialog/ReadSettingDialog.kt +++ b/app/src/main/java/com/novel/read/widget/dialog/ReadSettingDialog.kt @@ -91,7 +91,6 @@ class ReadSettingDialog(mActivity: Activity, private var mPageLoader: PageLoader } - private fun getDrawable(drawRes: Int): Drawable? { return ContextCompat.getDrawable(context, drawRes) } diff --git a/app/src/main/java/com/novel/read/widget/page/LocalPageLoader.java b/app/src/main/java/com/novel/read/widget/page/LocalPageLoader.java index fd20f77..34c3c2d 100644 --- a/app/src/main/java/com/novel/read/widget/page/LocalPageLoader.java +++ b/app/src/main/java/com/novel/read/widget/page/LocalPageLoader.java @@ -34,11 +34,8 @@ import io.reactivex.SingleOnSubscribe; import io.reactivex.disposables.Disposable; /** - * Created by newbiechen on 17-7-1. - * 问题: - * 1. 异常处理没有做好 + * Created by zlj */ - public class LocalPageLoader extends PageLoader { private static final String TAG = "LocalPageLoader"; //默认从文件中获取数据的长度 diff --git a/app/src/main/java/com/novel/read/widget/page/NetPageLoader.java b/app/src/main/java/com/novel/read/widget/page/NetPageLoader.java index fbcceee..36d4594 100644 --- a/app/src/main/java/com/novel/read/widget/page/NetPageLoader.java +++ b/app/src/main/java/com/novel/read/widget/page/NetPageLoader.java @@ -17,10 +17,9 @@ import java.util.ArrayList; import java.util.List; /** - * Created by newbiechen on 17-5-29. + * Created by zlj * 网络页面加载器 */ - public class NetPageLoader extends PageLoader { private static final String TAG = "PageFactory"; private Context mContext; diff --git a/app/src/main/java/com/novel/read/widget/page/PageAnimation.java b/app/src/main/java/com/novel/read/widget/page/PageAnimation.java index 069d1bb..b0640c3 100644 --- a/app/src/main/java/com/novel/read/widget/page/PageAnimation.java +++ b/app/src/main/java/com/novel/read/widget/page/PageAnimation.java @@ -8,10 +8,9 @@ import android.view.animation.LinearInterpolator; import android.widget.Scroller; /** - * Created by newbiechen on 17-7-24. + * Created by zlj * 翻页动画抽象类 */ - public abstract class PageAnimation { //正在使用的View protected View mView; diff --git a/app/src/main/java/com/novel/read/widget/page/PageLoader.java b/app/src/main/java/com/novel/read/widget/page/PageLoader.java index aeb49de..68dcc47 100644 --- a/app/src/main/java/com/novel/read/widget/page/PageLoader.java +++ b/app/src/main/java/com/novel/read/widget/page/PageLoader.java @@ -46,9 +46,8 @@ import io.reactivex.SingleOnSubscribe; import io.reactivex.disposables.Disposable; /** - * Created by newbiechen on 17-7-1. + * Created by zlj */ - public abstract class PageLoader { private static final String TAG = "PageLoader"; diff --git a/app/src/main/java/com/novel/read/widget/page/PageMode.java b/app/src/main/java/com/novel/read/widget/page/PageMode.java index 6ac17dc..58dac4b 100644 --- a/app/src/main/java/com/novel/read/widget/page/PageMode.java +++ b/app/src/main/java/com/novel/read/widget/page/PageMode.java @@ -1,10 +1,9 @@ package com.novel.read.widget.page; /** - * Created by newbiechen on 2018/2/5. + * Created by zlj * 作用:翻页动画的模式 */ - public enum PageMode { SIMULATION, COVER, SLIDE, NONE, SCROLL } diff --git a/app/src/main/java/com/novel/read/widget/page/PageStyle.java b/app/src/main/java/com/novel/read/widget/page/PageStyle.java index db7a610..a8c9ca3 100644 --- a/app/src/main/java/com/novel/read/widget/page/PageStyle.java +++ b/app/src/main/java/com/novel/read/widget/page/PageStyle.java @@ -6,10 +6,9 @@ import androidx.annotation.ColorRes; import com.novel.read.R; /** - * Created by newbiechen on 2018/2/5. - * 作用:页面的展示风格。 + * Created by zlj + * 页面的展示风格。 */ - public enum PageStyle { BG_0(R.color.nb_read_font_1, R.color.nb_read_bg_1), BG_1(R.color.nb_read_font_2, R.color.nb_read_bg_2), diff --git a/app/src/main/java/com/novel/read/widget/page/TxtChapter.java b/app/src/main/java/com/novel/read/widget/page/TxtChapter.java index 93365f1..cb607aa 100644 --- a/app/src/main/java/com/novel/read/widget/page/TxtChapter.java +++ b/app/src/main/java/com/novel/read/widget/page/TxtChapter.java @@ -1,9 +1,8 @@ package com.novel.read.widget.page; /** - * Created by newbiechen on 17-7-1. + * Created by zlj */ - public class TxtChapter { //章节所属的小说(网络) diff --git a/app/src/main/java/com/novel/read/widget/page/Void.java b/app/src/main/java/com/novel/read/widget/page/Void.java index f293830..73c6948 100644 --- a/app/src/main/java/com/novel/read/widget/page/Void.java +++ b/app/src/main/java/com/novel/read/widget/page/Void.java @@ -1,8 +1,4 @@ package com.novel.read.widget.page; -/** - * Created by newbiechen on 17-5-27. - */ - public final class Void { } diff --git a/app/src/main/java/com/novel/read/widget/page/anim/CoverPageAnim.java b/app/src/main/java/com/novel/read/widget/page/anim/CoverPageAnim.java index 143a1eb..2f69300 100644 --- a/app/src/main/java/com/novel/read/widget/page/anim/CoverPageAnim.java +++ b/app/src/main/java/com/novel/read/widget/page/anim/CoverPageAnim.java @@ -7,7 +7,8 @@ import android.graphics.drawable.GradientDrawable; import android.view.View; /** - * Created by newbiechen on 17-7-24. + * Created by zlj + * 覆盖动画 */ public class CoverPageAnim extends HorizonPageAnim { diff --git a/app/src/main/java/com/novel/read/widget/page/anim/HorizonPageAnim.java b/app/src/main/java/com/novel/read/widget/page/anim/HorizonPageAnim.java index 6de2b3e..8df5eac 100644 --- a/app/src/main/java/com/novel/read/widget/page/anim/HorizonPageAnim.java +++ b/app/src/main/java/com/novel/read/widget/page/anim/HorizonPageAnim.java @@ -9,8 +9,8 @@ import android.view.ViewConfiguration; import com.novel.read.widget.page.PageAnimation; /** - * Created by newbiechen on 17-7-24. - * 横向动画的模板 + * Created by zlj + * 横向动画 */ public abstract class HorizonPageAnim extends PageAnimation { diff --git a/app/src/main/java/com/novel/read/widget/page/anim/NonePageAnim.java b/app/src/main/java/com/novel/read/widget/page/anim/NonePageAnim.java index d5db5e5..630e6b9 100644 --- a/app/src/main/java/com/novel/read/widget/page/anim/NonePageAnim.java +++ b/app/src/main/java/com/novel/read/widget/page/anim/NonePageAnim.java @@ -4,7 +4,8 @@ import android.graphics.Canvas; import android.view.View; /** - * Created by newbiechen on 17-7-24. + * Created by zlj + * 无 */ public class NonePageAnim extends HorizonPageAnim{ diff --git a/app/src/main/java/com/novel/read/widget/page/anim/ScrollPageAnim.java b/app/src/main/java/com/novel/read/widget/page/anim/ScrollPageAnim.java index 7a756be..da8f47c 100644 --- a/app/src/main/java/com/novel/read/widget/page/anim/ScrollPageAnim.java +++ b/app/src/main/java/com/novel/read/widget/page/anim/ScrollPageAnim.java @@ -14,10 +14,8 @@ import java.util.ArrayList; import java.util.Iterator; /** - * Created by newbiechen on 17-7-23. + * Created by zlj * 原理:仿照ListView源码实现的上下滑动效果 - * Alter by: zeroAngus - *

* 问题: * 1. 向上翻页,重复的问题 (完成) * 2. 滑动卡顿的问题。原因:由于绘制的数据过多造成的卡顿问题。 (主要是文字绘制需要的时长比较多) 解决办法:做文字缓冲 diff --git a/app/src/main/java/com/novel/read/widget/page/anim/SimulationPageAnim.java b/app/src/main/java/com/novel/read/widget/page/anim/SimulationPageAnim.java index faa7460..6f61405 100644 --- a/app/src/main/java/com/novel/read/widget/page/anim/SimulationPageAnim.java +++ b/app/src/main/java/com/novel/read/widget/page/anim/SimulationPageAnim.java @@ -15,7 +15,8 @@ import android.os.Build; import android.view.View; /** - * Created by newbiechen on 17-7-24. + * Created by zlj + * 仿真动画 */ public class SimulationPageAnim extends HorizonPageAnim { diff --git a/app/src/main/java/com/novel/read/widget/page/anim/SlidePageAnim.java b/app/src/main/java/com/novel/read/widget/page/anim/SlidePageAnim.java index 75a0fba..48bf949 100644 --- a/app/src/main/java/com/novel/read/widget/page/anim/SlidePageAnim.java +++ b/app/src/main/java/com/novel/read/widget/page/anim/SlidePageAnim.java @@ -5,7 +5,7 @@ import android.graphics.Rect; import android.view.View; /** - * Created by newbiechen on 17-7-24. + * Created by zlj */ public class SlidePageAnim extends HorizonPageAnim {