优化

gedoor · Aug 29, 2018 · 1a64c40 · 1a64c40
1 parent 563e241
commit 1a64c40
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/app/src/main/java/com/monke/monkeybook/widget/page/PageView.java b/app/src/main/java/com/monke/monkeybook/widget/page/PageView.java
@@ -218,7 +218,13 @@ protected void onDraw(Canvas canvas) {
     public boolean onTouchEvent(MotionEvent event) {
         super.onTouchEvent(event);
 
-        if (!canTouch && event.getAction() != MotionEvent.ACTION_DOWN) return true;
+        if (mPageAnim == null) {
+            return true;
+        }
+
+        if (!canTouch && event.getAction() != MotionEvent.ACTION_DOWN) {
+            return true;
+        }
 
         int x = (int) event.getX();
         int y = (int) event.getY();
@@ -227,9 +233,7 @@ public boolean onTouchEvent(MotionEvent event) {
                 mStartX = x;
                 mStartY = y;
                 isMove = false;
-                if (mTouchListener != null) {
-                    canTouch = mTouchListener.onTouch();
-                }
+                canTouch = mTouchListener.onTouch();
                 mPageAnim.onTouchEvent(event);
                 break;
             case MotionEvent.ACTION_MOVE:
@@ -272,8 +276,6 @@ public boolean onTouchEvent(MotionEvent event) {
 
     /**
      * 判断是否存在上一页
-     *
-     * @return
      */
     private boolean hasPrevPage() {
         if (mPageLoader.prev()) {
@@ -286,8 +288,6 @@ private boolean hasPrevPage() {
 
     /**
      * 判断是否下一页存在
-     *
-     * @return
      */
     private boolean hasNextPage() {
         if (mPageLoader.next()) {