yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/v1.0.2' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.2

Browse Source
This commit is contained in:
wangcongtao
2020-03-13 17:15:37 +08:00
parent ed0ed93eb1 946c77c59a
commit 9de447ea65
103 changed files with 3233 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/OrientedViewPager.java
View File

@@ -1946,14 +1946,14 @@ public class OrientedViewPager extends ViewGroup {
Log.v(TAG, "Moved x to " + x + "," + y + " diff=" + xDiff + "," + yDiff);
}
if (dx != 0 && !isGutterDrag(mLastMotionX, dx) &&
canScroll(this, false, (int) dx, (int) x, (int) y)) {
// Nested view has scrollable area under this point. Let it be handled there.
mLastMotionX = x;
mLastMotionY = y;
mIsUnableToDrag = true;
return false;
}
//if (dx != 0 && !isGutterDrag(mLastMotionX, dx) &&
// canScroll(this, false, (int) dx, (int) x, (int) y)) {
// // Nested view has scrollable area under this point. Let it be handled there.
// mLastMotionX = x;
// mLastMotionY = y;
// mIsUnableToDrag = true;
// return false;
//}
if (xDiff > mTouchSlop && xDiff * 0.5f > yDiff) {
if (DEBUG) Log.v(TAG, "Starting drag!");
mIsBeingDragged = true;