GithubStar/QMUI_Android
1
0
Fork 0
mirror of https://github.com/Tencent/QMUI_Android.git synced 2026-10-29 03:26:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

add protection

Browse Source
This commit is contained in:
cgspine
2020-03-25 17:59:29 +08:00
parent 69b7281047
commit f896208ca3
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qmui/src/main/java/com/qmuiteam/qmui/recyclerView/QMUIRVItemSwipeAction.java
+5 -7
View File
@@ -530,7 +530,7 @@ public class QMUIRVItemSwipeAction extends RecyclerView.ItemDecoration
return;
}
swipeViewHolder.clearTouchInfo();
final int swipeDir = checkSwipe(mSelected, mSwipeDirection);
final int swipeDir = checkSwipe(mSelected, mSwipeDirection, true);
if (swipeDir == SWIPE_NONE) {
select(null, true);
} else {
@@ -594,7 +594,7 @@ public class QMUIRVItemSwipeAction extends RecyclerView.ItemDecoration
final RecyclerView.ViewHolder prevSelected = mSelected;
if (prevSelected.itemView.getParent() != null) {
endRecoverAnimation(prevSelected, true);
final int swipeDir = isActionUp ? checkSwipe(mSelected, mSwipeDirection) : SWIPE_NONE;
final int swipeDir = isActionUp ? checkSwipe(mSelected, mSwipeDirection, false) : SWIPE_NONE;
getSelectedDxDy(mTmpPosition);
final float currentTranslateX = mTmpPosition[0];
final float currentTranslateY = mTmpPosition[1];
@@ -724,7 +724,7 @@ public class QMUIRVItemSwipeAction extends RecyclerView.ItemDecoration
return false;
}
private int checkSwipe(RecyclerView.ViewHolder viewHolder, int swipeDirection) {
private int checkSwipe(RecyclerView.ViewHolder viewHolder, int swipeDirection, boolean checkAction) {
if (swipeDirection == SWIPE_LEFT || swipeDirection == SWIPE_RIGHT) {
final int dirFlag = mDx > 0 ? SWIPE_RIGHT : SWIPE_LEFT;
if (mVelocityTracker != null && mActivePointerId > -1) {
@@ -740,8 +740,7 @@ public class QMUIRVItemSwipeAction extends RecyclerView.ItemDecoration
}
float threshold;
if (viewHolder instanceof QMUISwipeViewHolder) {
QMUISwipeViewHolder vh = (QMUISwipeViewHolder) viewHolder;
if (checkAction && viewHolder instanceof QMUISwipeViewHolder) {
threshold = ((QMUISwipeViewHolder) viewHolder).mActionTotalWidth;
} else {
threshold = mRecyclerView.getWidth() * mCallback.getSwipeThreshold(viewHolder);
@@ -765,8 +764,7 @@ public class QMUIRVItemSwipeAction extends RecyclerView.ItemDecoration
}
float threshold;
if (viewHolder instanceof QMUISwipeViewHolder) {
QMUISwipeViewHolder vh = (QMUISwipeViewHolder) viewHolder;
if (checkAction && viewHolder instanceof QMUISwipeViewHolder) {
threshold = ((QMUISwipeViewHolder) viewHolder).mActionTotalHeight;
} else {
threshold = mRecyclerView.getHeight() * mCallback.getSwipeThreshold(viewHolder);
qmui/src/main/java/com/qmuiteam/qmui/recyclerView/QMUISwipeViewHolder.java
+1 -1
View File
@@ -164,7 +164,7 @@ public class QMUISwipeViewHolder extends RecyclerView.ViewHolder {
}
void draw(Canvas canvas, boolean overSwipeThreshold, float dx, float dy) {
if (mSwipeActions.isEmpty()) {
if (mSwipeActions == null || mSwipeActions.isEmpty()) {
return;
}
if (mActionTotalWidth > 0) {