bug修复

lihangleo2 · lihangleo2 · commit 9be752eda50d · 2019-05-28T09:39:29.000+08:00
diff --git a/smartloadview/src/main/java/com/lihang/smartloadview/SmartLoadingView.java b/smartloadview/src/main/java/com/lihang/smartloadview/SmartLoadingView.java
@@ -537,18 +537,41 @@ private void initOk() {
         pathMeasure = new PathMeasure(path, true);
     }
 
-
     private boolean isCanClick = true;//&#26159;&#21542;&#21487;&#20197;&#34987;&#28857;&#20987;
 
+
+    private boolean isAnimRuning = false;
+
+    private int clickIndex = 1;//&#29992;&#20110;&#21028;&#26029;&#37325;&#22797;&#28857;&#20987;&#30340;&#26102;&#38388;
+
+    public boolean isCanRest() {
+        if (clickIndex % 2 == 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public boolean isAnimRuning() {
+        return isAnimRuning;
+    }
+
+    public boolean isCanClick() {
+        return isCanClick;
+    }
+
+
     /**
      * &#28857;&#20987;&#21551;&#21160;&#21160;&#30011;&#65292;
      * &#65288;&#36825;&#37324;&#26159;&#28857;&#20987;&#21018;&#24320;&#22987;&#30331;&#24405;&#65289;
      */
     public void start() {
         if (isCanClick) {
+            clickIndex++;
             paint.setColor(normal_color);
             animatorSet.start();
             isCanClick = false;
+            isAnimRuning = true;
         }
     }
 
@@ -558,6 +581,27 @@ public void netFaile() {
         buttonString = errorString;
         paint.setColor(error_color);
         animatorNetfail.start();
+        animatorNetfail.addListener(new Animator.AnimatorListener() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                isAnimRuning = false;
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+
+            }
+
+            @Override
+            public void onAnimationRepeat(Animator animation) {
+
+            }
+        });
     }
 
     //&#21152;&#36733;&#22833;&#36133;&#36816;&#34892;(&#25991;&#26696;&#33258;&#23450;&#20041;)
@@ -566,6 +610,27 @@ public void netFaile(String message) {
         buttonString = errorString;
         paint.setColor(error_color);
         animatorNetfail.start();
+        animatorNetfail.addListener(new Animator.AnimatorListener() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                isAnimRuning = false;
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+
+            }
+
+            @Override
+            public void onAnimationRepeat(Animator animation) {
+
+            }
+        });
     }
 
 
@@ -581,6 +646,12 @@ public void reset() {
         int alpha = 255;
         textPaint.setAlpha(alpha);
         invalidate();
+
+        animator_draw_ok.cancel();
+        animatorSet.cancel();
+        animatorNetfail.cancel();
+        clickIndex++;
+
     }
 
 
@@ -633,6 +704,8 @@ public void onAnimationRepeat(Animator animation) {
      * &#32472;&#21046;&#25171;&#21246;&#21160;&#30011;
      */
     public void loginSuccess(final AnimationOKListener animationOKListener) {
+        //&#36825;&#20010;&#24605;&#36335;&#26159;&#23545;&#30340;&#65292;&#28982;&#21518;&#23601;&#26159;&#30475;clickindex&#26159;&#21542;&#19968;&#33268;
+        animator_draw_ok.cancel();
         animator_draw_ok.start();
         animator_draw_ok.addListener(new Animator.AnimatorListener() {
             @Override
@@ -643,6 +716,7 @@ public void onAnimationStart(Animator animation) {
             @Override
             public void onAnimationEnd(Animator animation) {
                 animationOKListener.animationOKFinish();
+                isAnimRuning = false;
             }
 
             @Override
@@ -655,6 +729,7 @@ public void onAnimationRepeat(Animator animation) {
 
             }
         });
+
     }
 
 
