pull/5/head
fengyuecanzhu 4 years ago
parent c2a0788a8e
commit a0de29b519
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 8
      app/build.gradle
  3. 4
      app/src/main/assets/updatelog.fy
  4. 4
      app/src/main/java/xyz/fycz/myreader/greendao/util/MySQLiteOpenHelper.java
  5. 9
      app/src/main/java/xyz/fycz/myreader/model/storage/Backup.kt
  6. 14
      app/src/main/java/xyz/fycz/myreader/model/storage/Restore.kt
  7. 11
      app/src/main/java/xyz/fycz/myreader/ui/activity/RuleActivity.java
  8. 2
      app/src/main/java/xyz/fycz/myreader/ui/adapter/holder/ReplaceRuleHolder.java
  9. 116
      app/src/main/java/xyz/fycz/myreader/widget/swipemenu/CstViewPager.java
  10. 651
      app/src/main/java/xyz/fycz/myreader/widget/swipemenu/SwipeMenuLayout.java
  11. 6
      app/src/main/res/layout/item_replace_rule.xml
  12. 5
      app/src/main/res/values/attrs.xml

@ -51,12 +51,12 @@ def getVersionName(){
def versionN = getVersionName() def versionN = getVersionName()
android { android {
compileSdkVersion 29 compileSdkVersion 30
buildToolsVersion '29.0.3' buildToolsVersion '30.0.3'
defaultConfig { defaultConfig {
applicationId "xyz.fycz.myreader" applicationId "xyz.fycz.myreader"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 30
versionCode version versionCode version
versionName versionN versionName versionN
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@ -200,8 +200,6 @@ dependencies {
implementation "com.afollestad.material-dialogs:input:$dialog_version" implementation "com.afollestad.material-dialogs:input:$dialog_version"
implementation "com.afollestad.material-dialogs:files:$dialog_version" implementation "com.afollestad.material-dialogs:files:$dialog_version"
implementation "com.afollestad.material-dialogs:bottomsheets:$dialog_version"*/ implementation "com.afollestad.material-dialogs:bottomsheets:$dialog_version"*/
//
implementation 'com.github.mcxtzhang:SwipeDelMenuLayout:V1.3.0'
} }
greendao { greendao {

@ -1,3 +1,7 @@
风月读书v1.8.1
1、内容替换规则支持备份与恢复
2、优化规则列表左滑菜单交互
2021.01.19 2021.01.19
风月读书v1.8.0 风月读书v1.8.0
1、修复内容替换规则部分无法删除的bug 1、修复内容替换规则部分无法删除的bug

@ -4,6 +4,8 @@ import android.content.Context;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import com.github.yuweiguocn.library.greendao.MigrationHelper; import com.github.yuweiguocn.library.greendao.MigrationHelper;
import xyz.fycz.myreader.greendao.entity.ReplaceRuleBean;
import xyz.fycz.myreader.greendao.gen.*; import xyz.fycz.myreader.greendao.gen.*;
import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.Database;
@ -34,7 +36,7 @@ public class MySQLiteOpenHelper extends DaoMaster.OpenHelper {
DaoMaster.dropAllTables(db, ifExists); DaoMaster.dropAllTables(db, ifExists);
} }
}, },
BookDao.class, ChapterDao.class, SearchHistoryDao.class, BookMarkDao.class, BookGroupDao.class BookDao.class, ChapterDao.class, SearchHistoryDao.class, BookMarkDao.class, BookGroupDao.class, ReplaceRuleBeanDao.class
); );
} }

@ -40,6 +40,7 @@ object Backup {
"myBookGroup.json", "myBookGroup.json",
"setting.json", "setting.json",
"readStyles.json", "readStyles.json",
"replaceRule.json",
"config.xml" "config.xml"
) )
} }
@ -87,7 +88,13 @@ object Backup {
.writeText(json) .writeText(json)
} }
} }
GreenDaoManager.getInstance().session.replaceRuleBeanDao.queryBuilder().list().let {
if (it.isNotEmpty()) {
val json = GSON.toJson(it)
FileUtils.getFile(backupPath + File.separator + "replaceRule.json")
.writeText(json)
}
}
try { try {
val setting = SysManager.getNewSetting() val setting = SysManager.getNewSetting()

@ -13,10 +13,7 @@ import xyz.fycz.myreader.base.observer.MySingleObserver
import xyz.fycz.myreader.entity.ReadStyle import xyz.fycz.myreader.entity.ReadStyle
import xyz.fycz.myreader.entity.Setting import xyz.fycz.myreader.entity.Setting
import xyz.fycz.myreader.greendao.GreenDaoManager import xyz.fycz.myreader.greendao.GreenDaoManager
import xyz.fycz.myreader.greendao.entity.Book import xyz.fycz.myreader.greendao.entity.*
import xyz.fycz.myreader.greendao.entity.BookGroup
import xyz.fycz.myreader.greendao.entity.BookMark
import xyz.fycz.myreader.greendao.entity.SearchHistory
import xyz.fycz.myreader.util.SharedPreUtils import xyz.fycz.myreader.util.SharedPreUtils
import xyz.fycz.myreader.util.utils.* import xyz.fycz.myreader.util.utils.*
import java.io.File import java.io.File
@ -94,6 +91,15 @@ object Restore {
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
} }
try {
val file = FileUtils.getFile(path + File.separator + "replaceRule.json")
val json = file.readText()
GSON.fromJsonArray<ReplaceRuleBean>(json)?.let {
GreenDaoManager.getInstance().session.replaceRuleBeanDao.insertOrReplaceInTx(it)
}
} catch (e: Exception) {
e.printStackTrace()
}
try { try {
val settingFile = FileUtils.getFile(path + File.separator + "setting.json") val settingFile = FileUtils.getFile(path + File.separator + "setting.json")
val settingJson = settingFile.readText() val settingJson = settingFile.readText()

@ -1,34 +1,24 @@
package xyz.fycz.myreader.ui.activity; package xyz.fycz.myreader.ui.activity;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.widget.LinearLayout;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.documentfile.provider.DocumentFile;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.mcxtzhang.swipemenulib.SwipeMenuLayout;
import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import butterknife.BindView; import butterknife.BindView;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.annotations.NonNull; import io.reactivex.annotations.NonNull;
import io.reactivex.schedulers.Schedulers;
import xyz.fycz.myreader.R; import xyz.fycz.myreader.R;
import xyz.fycz.myreader.base.BaseActivity; import xyz.fycz.myreader.base.BaseActivity;
import xyz.fycz.myreader.base.observer.MyObserver; import xyz.fycz.myreader.base.observer.MyObserver;
@ -45,6 +35,7 @@ import xyz.fycz.myreader.util.utils.ClipBoardUtil;
import xyz.fycz.myreader.util.utils.FileUtils; import xyz.fycz.myreader.util.utils.FileUtils;
import xyz.fycz.myreader.util.utils.GsonExtensionsKt; import xyz.fycz.myreader.util.utils.GsonExtensionsKt;
import xyz.fycz.myreader.widget.DividerItemDecoration; import xyz.fycz.myreader.widget.DividerItemDecoration;
import xyz.fycz.myreader.widget.swipemenu.SwipeMenuLayout;
import static android.text.TextUtils.isEmpty; import static android.text.TextUtils.isEmpty;
import static xyz.fycz.myreader.util.UriFileUtil.getPath; import static xyz.fycz.myreader.util.UriFileUtil.getPath;

@ -11,7 +11,6 @@ import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import com.mcxtzhang.swipemenulib.SwipeMenuLayout;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -34,6 +33,7 @@ import xyz.fycz.myreader.util.ShareUtils;
import xyz.fycz.myreader.util.StringHelper; import xyz.fycz.myreader.util.StringHelper;
import xyz.fycz.myreader.util.ToastUtils; import xyz.fycz.myreader.util.ToastUtils;
import xyz.fycz.myreader.util.utils.GsonExtensionsKt; import xyz.fycz.myreader.util.utils.GsonExtensionsKt;
import xyz.fycz.myreader.widget.swipemenu.SwipeMenuLayout;
/** /**
* @author fengyue * @author fengyue

@ -0,0 +1,116 @@
package xyz.fycz.myreader.widget.swipemenu;
import android.content.Context;
import android.util.AttributeSet;
import android.view.MotionEvent;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
/**
* Intro: 解决 滑动冲突的 ViewPager
* <p>
* 因为ViewPager SwipMenuLayout都是水平方向滑动的控件
* 所以在一起使用时会有冲突
* 使用本控件(CstViewPager)可以在ViewPager的第一页使用左滑在ViewPager的最后一页使用右滑菜单
* <p>
* Author: zhangxutong
* E-mail: mcxtzhang@163.com
* Home Page: http://blog.csdn.net/zxt0601
* Created: 2017/9/27.
* History:
*/
public class CstViewPager extends ViewPager {
private static final String TAG = "zxt/CstViewPager";
private int mLastX, mLastY;
public CstViewPager(Context context) {
super(context);
}
public CstViewPager(Context context, AttributeSet attrs) {
super(context, attrs);
}
@Override
public boolean onInterceptTouchEvent(MotionEvent ev) {
//Log.i(TAG, "onInterceptTouchEvent() called with: ev = [" + ev + "]");
int x = (int) ev.getX();
int y = (int) ev.getY();
boolean intercept = false;
switch (ev.getAction()) {
case MotionEvent.ACTION_DOWN:
break;
case MotionEvent.ACTION_MOVE:
if (isHorizontalScroll(x, y)) {
//除了在 第一页的手指向右滑 , 最后一页的左滑,其他时刻都是父控件需要拦截事件
if (isReactFirstPage() && isScrollRight(x)) {
//Log.e(TAG, "第一页的手指向右滑]");
intercept = false;
} else if (isReachLastPage() && isScrollLeft(x)) {
//Log.e(TAG, "最后一页的左滑");
intercept = false;
} else {
//Log.e(TAG, "其他情况");
intercept = true;
}
} else {
}
break;
case MotionEvent.ACTION_UP:
break;
default:
break;
}
mLastX = x;
mLastY = y;
boolean onInterceptTouchEvent = super.onInterceptTouchEvent(ev);
return intercept || onInterceptTouchEvent;
}
@Override
public boolean onTouchEvent(MotionEvent ev) {
//Log.i(TAG, "onTouchEvent() called with: ev = [" + ev + "]");
return super.onTouchEvent(ev);
}
//是否在水平滑动
private boolean isHorizontalScroll(int x, int y) {
return Math.abs(y - mLastY) < Math.abs(x - mLastX);
}
//是否未到达最后一页
private boolean isReachLastPage() {
PagerAdapter adapter = getAdapter();
if (null != adapter && adapter.getCount() - 1 == getCurrentItem()) {
return true;
} else {
return false;
}
}
//是否在第一页
private boolean isReactFirstPage() {
if (getCurrentItem() == 0) {
return true;
} else {
return false;
}
}
//是否左滑
private boolean isScrollLeft(int x) {
return x - mLastX < 0;
}
private boolean isScrollRight(int x) {
return x - mLastX > 0;
}
}

@ -0,0 +1,651 @@
package xyz.fycz.myreader.widget.swipemenu;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.PointF;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.VelocityTracker;
import android.view.View;
import android.view.ViewConfiguration;
import android.view.ViewGroup;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.OvershootInterpolator;
import xyz.fycz.myreader.R;
/**
* Item侧滑删除菜单
* 继承自ViewGroup实现滑动出现删除等选项的效果
* 思路跟随手势将item向左滑动
* 在onMeasure时 将第一个Item设为屏幕宽度
* 解决屏幕上多个侧滑删除菜单内设一个类静态View类型变量 ViewCache存储的是当前正处于右滑状态的CstSwipeMenuItemViewGroup
* 每次Touch时对比如果两次Touch的不是一个View那么令ViewCache恢复普通状态并且设置新的CacheView
* 只要有一个侧滑菜单处于打开状态 就不给外层布局上下滑动了
* <p/>
* 平滑滚动使用的是Scroller,20160811最新平滑滚动又用属性动画做了因为这样更酷炫(设置加速器不同)
* <p/>
* 20160824,fix 多指一起滑我的情况只接第一个客人(使用一个类静态布尔变量)
* other:
* 1 菜单处于侧滑时拦截长按事件
* 2 解决侧滑时 点击 的冲突
* 3 通过 isIos 变量控制是否是IOS阻塞式交互默认是打开的
* 4 通过 isSwipeEnable 变量控制是否开启右滑菜单默认打开某些场景复用item没有编辑权限的用户不能右滑
* 5 2016 09 29 add,通过开关 isLeftSwipe支持左滑右滑
* 6 2016 10 21 add , 增加viewChache get()方法可以用在当点击外部空白处时关闭正在展开的侧滑菜单
* 7 2016 10 22 fix , 当父控件宽度不是全屏时的bug
* 2016 10 22 add , 仿QQ侧滑菜单展开时点击除侧滑菜单之外的区域关闭侧滑菜单
* 8 2016 11 03 add,判断手指起始落点如果距离属于滑动了就屏蔽一切点击事件
* 9 2016 11 04 fix 长按事件和侧滑的冲突
* 10 2016 11 09 add,适配GridLayoutManager将以第一个子Item(即ContentItem)的宽度为控件宽度
* 11 2016 11 14 add,支持padding,且后续计划加入上滑下滑因此不再支持ContentItem的margin属性
* 2016 11 14 add,修改回弹的动画更平滑
* 2016 11 14 fix,微小位移的move不回回弹的bug
* 2016 11 18,fix 当ItemView存在高度可变的情况
* 2016 12 07,fix 禁止侧滑时(isSwipeEnable false)点击事件不受干扰
* 2016 12 09,fix ListView快速滑动快速删除时偶现菜单不消失的bug
* Created by zhangxutong .
* Date: 16/04/24
*/
public class SwipeMenuLayout extends ViewGroup {
private static final String TAG = "zxt/SwipeMenuLayout";
private int mScaleTouchSlop;//为了处理单击事件的冲突
private int mMaxVelocity;//计算滑动速度用
private int mPointerId;//多点触摸只算第一根手指的速度
private int mHeight;//自己的高度
//右侧菜单宽度总和(最大滑动距离)
private int mRightMenuWidths;
//滑动判定临界值(右侧菜单宽度的40%) 手指抬起时,超过了展开,没超过收起menu
private int mLimit;
private View mContentView;//2016 11 13 add ,存储contentView(第一个View)
//private Scroller mScroller;//以前item的滑动动画靠它做,现在用属性动画做
//上一次的xy
private PointF mLastP = new PointF();
//2016 10 22 add , 仿QQ,侧滑菜单展开时,点击除侧滑菜单之外的区域,关闭侧滑菜单。
//增加一个布尔值变量,dispatch函数里,每次down时,为true,move时判断,如果是滑动动作,设为false。
//在Intercept函数的up时,判断这个变量,如果仍为true 说明是点击事件,则关闭菜单。
private boolean isUnMoved = true;
//2016 11 03 add,判断手指起始落点,如果距离属于滑动了,就屏蔽一切点击事件。
//up-down的坐标,判断是否是滑动,如果是,则屏蔽一切点击事件
private PointF mFirstP = new PointF();
private boolean isUserSwiped;
//存储的是当前正在展开的View
private static SwipeMenuLayout mViewCache;
//防止多只手指一起滑我的flag 在每次down里判断, touch事件结束清空
private static boolean isTouching;
private VelocityTracker mVelocityTracker;//滑动速度变量
private android.util.Log LogUtils;
/**
* 右滑删除功能的开关,默认开
*/
private boolean isSwipeEnable;
/**
* IOSQQ式交互默认开
*/
private boolean isIos;
private boolean iosInterceptFlag;//IOS类型下,是否拦截事件的flag
/**
* 20160929add 左滑右滑的开关,默认左滑打开菜单
*/
private boolean isLeftSwipe;
public SwipeMenuLayout(Context context) {
this(context, null);
}
public SwipeMenuLayout(Context context, AttributeSet attrs) {
this(context, attrs, 0);
}
public SwipeMenuLayout(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init(context, attrs, defStyleAttr);
}
public boolean isSwipeEnable() {
return isSwipeEnable;
}
/**
* 设置侧滑功能开关
*
* @param swipeEnable
*/
public void setSwipeEnable(boolean swipeEnable) {
isSwipeEnable = swipeEnable;
}
public boolean isIos() {
return isIos;
}
/**
* 设置是否开启IOS阻塞式交互
*
* @param ios
*/
public SwipeMenuLayout setIos(boolean ios) {
isIos = ios;
return this;
}
public boolean isLeftSwipe() {
return isLeftSwipe;
}
/**
* 设置是否开启左滑出菜单设置false 为右滑出菜单
*
* @param leftSwipe
* @return
*/
public SwipeMenuLayout setLeftSwipe(boolean leftSwipe) {
isLeftSwipe = leftSwipe;
return this;
}
/**
* 返回ViewCache
*
* @return
*/
public static SwipeMenuLayout getViewCache() {
return mViewCache;
}
private void init(Context context, AttributeSet attrs, int defStyleAttr) {
mScaleTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
mMaxVelocity = ViewConfiguration.get(context).getScaledMaximumFlingVelocity();
//初始化滑动帮助类对象
//mScroller = new Scroller(context);
//右滑删除功能的开关,默认开
isSwipeEnable = true;
//IOS、QQ式交互,默认开
isIos = true;
//左滑右滑的开关,默认左滑打开菜单
isLeftSwipe = true;
TypedArray ta = context.getTheme().obtainStyledAttributes(attrs, R.styleable.SwipeMenuLayout, defStyleAttr, 0);
int count = ta.getIndexCount();
for (int i = 0; i < count; i++) {
int attr = ta.getIndex(i);
//如果引用成AndroidLib 资源都不是常量,无法使用switch case
if (attr == R.styleable.SwipeMenuLayout_swipeEnable) {
isSwipeEnable = ta.getBoolean(attr, true);
} else if (attr == R.styleable.SwipeMenuLayout_ios) {
isIos = ta.getBoolean(attr, true);
} else if (attr == R.styleable.SwipeMenuLayout_leftSwipe) {
isLeftSwipe = ta.getBoolean(attr, true);
}
}
ta.recycle();
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
//Log.d(TAG, "onMeasure() called with: " + "widthMeasureSpec = [" + widthMeasureSpec + "], heightMeasureSpec = [" + heightMeasureSpec + "]");
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
setClickable(true);//令自己可点击,从而获取触摸事件
mRightMenuWidths = 0;//由于ViewHolder的复用机制,每次这里要手动恢复初始值
mHeight = 0;
int contentWidth = 0;//2016 11 09 add,适配GridLayoutManager,将以第一个子Item(即ContentItem)的宽度为控件宽度
int childCount = getChildCount();
//add by 2016 08 11 为了子View的高,可以matchParent(参考的FrameLayout 和LinearLayout的Horizontal)
final boolean measureMatchParentChildren = MeasureSpec.getMode(heightMeasureSpec) != MeasureSpec.EXACTLY;
boolean isNeedMeasureChildHeight = false;
for (int i = 0; i < childCount; i++) {
View childView = getChildAt(i);
//令每一个子View可点击,从而获取触摸事件
childView.setClickable(true);
if (childView.getVisibility() != GONE) {
//后续计划加入上滑、下滑,则将不再支持Item的margin
measureChild(childView, widthMeasureSpec, heightMeasureSpec);
//measureChildWithMargins(childView, widthMeasureSpec, 0, heightMeasureSpec, 0);
final MarginLayoutParams lp = (MarginLayoutParams) childView.getLayoutParams();
mHeight = Math.max(mHeight, childView.getMeasuredHeight()/* + lp.topMargin + lp.bottomMargin*/);
if (measureMatchParentChildren && lp.height == LayoutParams.MATCH_PARENT) {
isNeedMeasureChildHeight = true;
}
if (i > 0) {//第一个布局是Left item,从第二个开始才是RightMenu
mRightMenuWidths += childView.getMeasuredWidth();
} else {
mContentView = childView;
contentWidth = childView.getMeasuredWidth();
}
}
}
setMeasuredDimension(getPaddingLeft() + getPaddingRight() + contentWidth,
mHeight + getPaddingTop() + getPaddingBottom());//宽度取第一个Item(Content)的宽度
mLimit = mRightMenuWidths * 4 / 10;//滑动判断的临界值
//Log.d(TAG, "onMeasure() called with: " + "mRightMenuWidths = [" + mRightMenuWidths);
if (isNeedMeasureChildHeight) {//如果子View的height有MatchParent属性的,设置子View高度
forceUniformHeight(childCount, widthMeasureSpec);
}
}
@Override
public LayoutParams generateLayoutParams(AttributeSet attrs) {
return new MarginLayoutParams(getContext(), attrs);
}
/**
* 给MatchParent的子View设置高度
*
* @param count
* @param widthMeasureSpec
* @see android.widget.LinearLayout# 同名方法
*/
private void forceUniformHeight(int count, int widthMeasureSpec) {
// Pretend that the linear layout has an exact size. This is the measured height of
// ourselves. The measured height should be the max height of the children, changed
// to accommodate the heightMeasureSpec from the parent
int uniformMeasureSpec = MeasureSpec.makeMeasureSpec(getMeasuredHeight(),
MeasureSpec.EXACTLY);//以父布局高度构建一个Exactly的测量参数
for (int i = 0; i < count; ++i) {
final View child = getChildAt(i);
if (child.getVisibility() != GONE) {
MarginLayoutParams lp = (MarginLayoutParams) child.getLayoutParams();
if (lp.height == LayoutParams.MATCH_PARENT) {
// Temporarily force children to reuse their old measured width
// FIXME: this may not be right for something like wrapping text?
int oldWidth = lp.width;//measureChildWithMargins 这个函数会用到宽,所以要保存一下
lp.width = child.getMeasuredWidth();
// Remeasure with new dimensions
measureChildWithMargins(child, widthMeasureSpec, 0, uniformMeasureSpec, 0);
lp.width = oldWidth;
}
}
}
}
@Override
protected void onLayout(boolean changed, int l, int t, int r, int b) {
//LogUtils.e(TAG, "onLayout() called with: " + "changed = [" + changed + "], l = [" + l + "], t = [" + t + "], r = [" + r + "], b = [" + b + "]");
int childCount = getChildCount();
int left = 0 + getPaddingLeft();
int right = 0 + getPaddingLeft();
for (int i = 0; i < childCount; i++) {
View childView = getChildAt(i);
if (childView.getVisibility() != GONE) {
if (i == 0) {//第一个子View是内容 宽度设置为全屏
childView.layout(left, getPaddingTop(), left + childView.getMeasuredWidth(), getPaddingTop() + childView.getMeasuredHeight());
left = left + childView.getMeasuredWidth();
} else {
if (isLeftSwipe) {
childView.layout(left, getPaddingTop(), left + childView.getMeasuredWidth(), getPaddingTop() + childView.getMeasuredHeight());
left = left + childView.getMeasuredWidth();
} else {
childView.layout(right - childView.getMeasuredWidth(), getPaddingTop(), right, getPaddingTop() + childView.getMeasuredHeight());
right = right - childView.getMeasuredWidth();
}
}
}
}
//Log.d(TAG, "onLayout() called with: " + "maxScrollGap = [" + maxScrollGap + "], l = [" + l + "], t = [" + t + "], r = [" + r + "], b = [" + b + "]");
}
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
//LogUtils.d(TAG, "dispatchTouchEvent() called with: " + "ev = [" + ev + "]");
if (isSwipeEnable) {
acquireVelocityTracker(ev);
final VelocityTracker verTracker = mVelocityTracker;
switch (ev.getAction()) {
case MotionEvent.ACTION_DOWN:
isUserSwiped = false;//2016 11 03 add,判断手指起始落点,如果距离属于滑动了,就屏蔽一切点击事件。
isUnMoved = true;//2016 10 22 add , 仿QQ,侧滑菜单展开时,点击内容区域,关闭侧滑菜单。
iosInterceptFlag = false;//add by 2016 09 11 ,每次DOWN时,默认是不拦截的
if (isTouching) {//如果有别的指头摸过了,那么就return false。这样后续的move..等事件也不会再来找这个View了。
return false;
} else {
isTouching = true;//第一个摸的指头,赶紧改变标志,宣誓主权。
}
mLastP.set(ev.getRawX(), ev.getRawY());
mFirstP.set(ev.getRawX(), ev.getRawY());//2016 11 03 add,判断手指起始落点,如果距离属于滑动了,就屏蔽一切点击事件。
//如果down,view和cacheview不一样,则立马让它还原。且把它置为null
if (mViewCache != null) {
if (mViewCache != this) {
mViewCache.smoothClose();
iosInterceptFlag = isIos;//add by 2016 09 11 ,IOS模式开启的话,且当前有侧滑菜单的View,且不是自己的,就该拦截事件咯。
}
//只要有一个侧滑菜单处于打开状态, 就不给外层布局上下滑动了
getParent().requestDisallowInterceptTouchEvent(true);
}
//求第一个触点的id, 此时可能有多个触点,但至少一个,计算滑动速率用
mPointerId = ev.getPointerId(0);
break;
case MotionEvent.ACTION_MOVE:
//add by 2016 09 11 ,IOS模式开启的话,且当前有侧滑菜单的View,且不是自己的,就该拦截事件咯。滑动也不该出现
if (iosInterceptFlag) {
break;
}
float gap = mLastP.x - ev.getRawX();
//为了在水平滑动中禁止父类ListView等再竖直滑动
if (Math.abs(gap) > 10 || Math.abs(getScrollX()) > 10) {//2016 09 29 修改此处,使屏蔽父布局滑动更加灵敏,
getParent().requestDisallowInterceptTouchEvent(true);
}
//2016 10 22 add , 仿QQ,侧滑菜单展开时,点击内容区域,关闭侧滑菜单。begin
if (Math.abs(gap) > mScaleTouchSlop) {
isUnMoved = false;
}
//2016 10 22 add , 仿QQ,侧滑菜单展开时,点击内容区域,关闭侧滑菜单。end
//如果scroller还没有滑动结束 停止滑动动画
/* if (!mScroller.isFinished()) {
mScroller.abortAnimation();
}*/
scrollBy((int) (gap), 0);//滑动使用scrollBy
//越界修正
if (isLeftSwipe) {//左滑
if (getScrollX() < 0) {
scrollTo(0, 0);
}
if (getScrollX() > mRightMenuWidths) {
scrollTo(mRightMenuWidths, 0);
}
} else {//右滑
if (getScrollX() < -mRightMenuWidths) {
scrollTo(-mRightMenuWidths, 0);
}
if (getScrollX() > 0) {
scrollTo(0, 0);
}
}
mLastP.set(ev.getRawX(), ev.getRawY());
break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
//2016 11 03 add,判断手指起始落点,如果距离属于滑动了,就屏蔽一切点击事件。
if (Math.abs(ev.getRawX() - mFirstP.x) > mScaleTouchSlop) {
isUserSwiped = true;
}
//add by 2016 09 11 ,IOS模式开启的话,且当前有侧滑菜单的View,且不是自己的,就该拦截事件咯。滑动也不该出现
if (!iosInterceptFlag) {//且滑动了 才判断是否要收起、展开menu
//求伪瞬时速度
verTracker.computeCurrentVelocity(1000, mMaxVelocity);
final float velocityX = verTracker.getXVelocity(mPointerId);
if (Math.abs(velocityX) > 1000) {//滑动速度超过阈值
if (velocityX < -1000) {
if (isLeftSwipe) {//左滑
//平滑展开Menu
smoothExpand();
} else {
//平滑关闭Menu
smoothClose();
}
} else {
if (isLeftSwipe) {//左滑
// 平滑关闭Menu
smoothClose();
} else {
//平滑展开Menu
smoothExpand();
}
}
} else {
if (Math.abs(getScrollX()) > mLimit) {//否则就判断滑动距离
//平滑展开Menu
smoothExpand();
} else {
// 平滑关闭Menu
smoothClose();
}
}
}
//释放
releaseVelocityTracker();
//LogUtils.i(TAG, "onTouch A ACTION_UP ACTION_CANCEL:velocityY:" + velocityX);
isTouching = false;//没有手指在摸我了
break;
default:
break;
}
}
return super.dispatchTouchEvent(ev);
}
@Override
public boolean onInterceptTouchEvent(MotionEvent ev) {
//Log.d(TAG, "onInterceptTouchEvent() called with: ev = [" + ev + "]");
//add by zhangxutong 2016 12 07 begin:
//禁止侧滑时,点击事件不受干扰。
if (isSwipeEnable) {
switch (ev.getAction()) {
//add by zhangxutong 2016 11 04 begin :
// fix 长按事件和侧滑的冲突。
case MotionEvent.ACTION_MOVE:
//屏蔽滑动时的事件
if (Math.abs(ev.getRawX() - mFirstP.x) > mScaleTouchSlop) {
return true;
}
break;
//add by zhangxutong 2016 11 04 end
case MotionEvent.ACTION_UP:
//为了在侧滑时,屏蔽子View的点击事件
if (isLeftSwipe) {
if (getScrollX() > mScaleTouchSlop) {
//add by 2016 09 10 解决一个智障问题~ 居然不给点击侧滑菜单 我跪着谢罪
//这里判断落点在内容区域屏蔽点击,内容区域外,允许传递事件继续向下的的。。。
if (ev.getX() < getWidth() - getScrollX()) {
//2016 10 22 add , 仿QQ,侧滑菜单展开时,点击内容区域,关闭侧滑菜单。
if (isUnMoved) {
smoothClose();
}
return true;//true表示拦截
}
}
} else {
if (-getScrollX() > mScaleTouchSlop) {
if (ev.getX() > -getScrollX()) {//点击范围在菜单外 屏蔽
//2016 10 22 add , 仿QQ,侧滑菜单展开时,点击内容区域,关闭侧滑菜单。
if (isUnMoved) {
smoothClose();
}
return true;
}
}
}
//add by zhangxutong 2016 11 03 begin:
// 判断手指起始落点,如果距离属于滑动了,就屏蔽一切点击事件。
if (isUserSwiped) {
return true;
}
//add by zhangxutong 2016 11 03 end
break;
}
//模仿IOS 点击其他区域关闭:
if (iosInterceptFlag) {
//IOS模式开启,且当前有菜单的View,且不是自己的 拦截点击事件给子View
return true;
}
}
return super.onInterceptTouchEvent(ev);
}
/**
* 平滑展开
*/
private ValueAnimator mExpandAnim, mCloseAnim;
private boolean isExpand;//代表当前是否是展开状态 2016 11 03 add
public void smoothExpand() {
//Log.d(TAG, "smoothExpand() called" + this);
/*mScroller.startScroll(getScrollX(), 0, mRightMenuWidths - getScrollX(), 0);
invalidate();*/
//展开就加入ViewCache:
mViewCache = SwipeMenuLayout.this;
//2016 11 13 add 侧滑菜单展开,屏蔽content长按
if (null != mContentView) {
mContentView.setLongClickable(false);
}
cancelAnim();
mExpandAnim = ValueAnimator.ofInt(getScrollX(), isLeftSwipe ? mRightMenuWidths : -mRightMenuWidths);
mExpandAnim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
scrollTo((Integer) animation.getAnimatedValue(), 0);
}
});
mExpandAnim.setInterpolator(new OvershootInterpolator());
mExpandAnim.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
isExpand = true;
}
});
mExpandAnim.setDuration(300).start();
}
/**
* 每次执行动画之前都应该先取消之前的动画
*/
private void cancelAnim() {
if (mCloseAnim != null && mCloseAnim.isRunning()) {
mCloseAnim.cancel();
}
if (mExpandAnim != null && mExpandAnim.isRunning()) {
mExpandAnim.cancel();
}
}
/**
* 平滑关闭
*/
public void smoothClose() {
//Log.d(TAG, "smoothClose() called" + this);
/* mScroller.startScroll(getScrollX(), 0, -getScrollX(), 0);
invalidate();*/
mViewCache = null;
//2016 11 13 add 侧滑菜单展开,屏蔽content长按
if (null != mContentView) {
mContentView.setLongClickable(true);
}
cancelAnim();
mCloseAnim = ValueAnimator.ofInt(getScrollX(), 0);
mCloseAnim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
scrollTo((Integer) animation.getAnimatedValue(), 0);
}
});
mCloseAnim.setInterpolator(new AccelerateInterpolator());
mCloseAnim.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
isExpand = false;
}
});
mCloseAnim.setDuration(300).start();
//LogUtils.d(TAG, "smoothClose() called with:getScrollX() " + getScrollX());
}
/**
* @param event 向VelocityTracker添加MotionEvent
* @see VelocityTracker#obtain()
* @see VelocityTracker#addMovement(MotionEvent)
*/
private void acquireVelocityTracker(final MotionEvent event) {
if (null == mVelocityTracker) {
mVelocityTracker = VelocityTracker.obtain();
}
mVelocityTracker.addMovement(event);
}
/**
* * 释放VelocityTracker
*
* @see VelocityTracker#clear()
* @see VelocityTracker#recycle()
*/
private void releaseVelocityTracker() {
if (null != mVelocityTracker) {
mVelocityTracker.clear();
mVelocityTracker.recycle();
mVelocityTracker = null;
}
}
//每次ViewDetach的时候,判断一下 ViewCache是不是自己,如果是自己,关闭侧滑菜单,且ViewCache设置为null,
// 理由:1 防止内存泄漏(ViewCache是一个静态变量)
// 2 侧滑删除后自己后,这个View被Recycler回收,复用,下一个进入屏幕的View的状态应该是普通状态,而不是展开状态。
@Override
protected void onDetachedFromWindow() {
if (this == mViewCache) {
mViewCache.smoothClose();
mViewCache = null;
}
super.onDetachedFromWindow();
}
//展开时,禁止长按
@Override
public boolean performLongClick() {
if (Math.abs(getScrollX()) > mScaleTouchSlop) {
return false;
}
return super.performLongClick();
}
//平滑滚动 弃用 改属性动画实现
/* @Override
public void computeScroll() {
//判断Scroller是否执行完毕:
if (mScroller.computeScrollOffset()) {
scrollTo(mScroller.getCurrX(), mScroller.getCurrY());
//通知View重绘-invalidate()->onDraw()->computeScroll()
invalidate();
}
}*/
/**
* 快速关闭
* 用于 点击侧滑菜单上的选项,同时想让它快速关闭(删除 置顶)
* 这个方法在ListView里是必须调用的
* 在RecyclerView里视情况而定如果是mAdapter.notifyItemRemoved(pos)方法不用调用
*/
public void quickClose() {
if (this == mViewCache) {
//先取消展开动画
cancelAnim();
mViewCache.scrollTo(0, 0);//关闭
mViewCache = null;
}
}
}

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<com.mcxtzhang.swipemenulib.SwipeMenuLayout xmlns:android="http://schemas.android.com/apk/res/android" <xyz.fycz.myreader.widget.swipemenu.SwipeMenuLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:clickable="true" android:clickable="true"
android:paddingBottom="1dp" android:paddingBottom="1dp"
app:ios="false" app:ios="true"
app:leftSwipe="true" app:leftSwipe="true"
app:swipeEnable="true" app:swipeEnable="true"
android:focusable="true"> android:focusable="true">
@ -76,4 +76,4 @@
android:text="@string/delete" android:text="@string/delete"
android:textColor="@android:color/white"/> android:textColor="@android:color/white"/>
</com.mcxtzhang.swipemenulib.SwipeMenuLayout> </xyz.fycz.myreader.widget.swipemenu.SwipeMenuLayout>

@ -49,4 +49,9 @@
<attr name="speed" format="dimension"/> <attr name="speed" format="dimension"/>
</declare-styleable> </declare-styleable>
<declare-styleable name="SwipeMenuLayout">
<attr name="swipeEnable" format="boolean"/>
<attr name="ios" format="boolean"/>
<attr name="leftSwipe" format="boolean"/>
</declare-styleable>
</resources> </resources>
Loading…
Cancel
Save