add try catch

Author: XunMengWinter

circularanim/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 24
         versionCode 5
-        versionName "0.3.1"
+        versionName "0.3.2"
     }
     buildTypes {
         release {

circularanim/src/main/java/top/wefor/circularanim/CircularAnim.java

@@ -17,7 +17,7 @@
  * <p/>
  * GitHub: https://github.com/XunMengWinter
  * <p/>
- * latest edited date: 2016-08-05 17:07
+ * latest edited date: 2016-08-05 20:00
  *
  * @author ice
  */
@@ -81,13 +81,7 @@ public VisibleBuilder onAnimationEndListener(OnAnimationEndListener onAnimationE
         public void go() {
             // 版本判断
             if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP) {
-                if (isShow)
-                    mAnimView.setVisibility(View.VISIBLE);
-                else
-                    mAnimView.setVisibility(View.INVISIBLE);
-
-                if (mOnAnimationEndListener != null)
-                    mOnAnimationEndListener.onAnimationEnd();
+                doOnEnd();
                 return;
             }
 
@@ -137,26 +131,37 @@ public void go() {
             else if (!isShow && mStartRadius == null)
                 mStartRadius = maxRadius + 0F;
 
-            Animator anim = ViewAnimationUtils.createCircularReveal(
-                    mAnimView, rippleCX, rippleCY, mStartRadius, mEndRadius);
-            mAnimView.setVisibility(View.VISIBLE);
-            anim.setDuration(mDurationMills);
-
-            anim.addListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    super.onAnimationEnd(animation);
-                    if (isShow)
-                        mAnimView.setVisibility(View.VISIBLE);
-                    else
-                        mAnimView.setVisibility(View.INVISIBLE);
-
-                    if (mOnAnimationEndListener != null)
-                        mOnAnimationEndListener.onAnimationEnd();
-                }
-            });
+            try {
+                Animator anim = ViewAnimationUtils.createCircularReveal(
+                        mAnimView, rippleCX, rippleCY, mStartRadius, mEndRadius);
+
+
+                mAnimView.setVisibility(View.VISIBLE);
+                anim.setDuration(mDurationMills);
+
+                anim.addListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        super.onAnimationEnd(animation);
+                        doOnEnd();
+                    }
+                });
 
-            anim.start();
+                anim.start();
+            } catch (Exception e) {
+                e.printStackTrace();
+                doOnEnd();
+            }
+        }
+
+        private void doOnEnd() {
+            if (isShow)
+                mAnimView.setVisibility(View.VISIBLE);
+            else
+                mAnimView.setVisibility(View.INVISIBLE);
+
+            if (mOnAnimationEndListener != null)
+                mOnAnimationEndListener.onAnimationEnd();
         }
 
     }
@@ -203,7 +208,7 @@ public void go(OnAnimationEndListener onAnimationEndListener) {
 
             // 版本判断,小于5.0则无动画.
             if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP) {
-                mOnAnimationEndListener.onAnimationEnd();
+                doOnEnd();
                 return;
             }
 
@@ -224,54 +229,72 @@ public void go(OnAnimationEndListener onAnimationEndListener) {
             int maxH = Math.max(cy, h - cy);
             final int finalRadius = (int) Math.sqrt(maxW * maxW + maxH * maxH) + 1;
 
-            Animator anim = ViewAnimationUtils.createCircularReveal(view, cx, cy, mStartRadius, finalRadius);
-            int maxRadius = (int) Math.sqrt(w * w + h * h) + 1;
-            // 若未设置时长，则以PERFECT_MILLS为基准根据水波扩散的距离来计算实际时间
-            if (mDurationMills == null) {
-                // 算出实际边距与最大边距的比率
-                double rate = 1d * finalRadius / maxRadius;
-                // 为了让用户便于感触到水波，速度应随最大边距的变小而越慢，扩散时间应随最大边距的变小而变小，因此比率应在 @rate 与 1 之间。
-                mDurationMills = (long) (PERFECT_MILLS * Math.sqrt(rate));
-            }
-            final long finalDuration = mDurationMills;
-            // 由于thisActivity.startActivity()会有所停顿，所以进入的水波动画应比退出的水波动画时间短才能保持视觉上的一致。
-            anim.setDuration((long) (finalDuration * 0.9));
-            anim.addListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    super.onAnimationEnd(animation);
-
-                    mOnAnimationEndListener.onAnimationEnd();
-
-                    mActivity.overridePendingTransition(mEnterAnim, mExitAnim);
-
-                    // 默认显示返回至当前Activity的动画.
-                    mTriggerView.postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (mActivity.isFinishing()) return;
-
-                            Animator anim = ViewAnimationUtils.createCircularReveal(view, cx, cy,
-                                    finalRadius, mStartRadius);
-                            anim.setDuration(finalDuration);
-                            anim.addListener(new AnimatorListenerAdapter() {
-                                @Override
-                                public void onAnimationEnd(Animator animation) {
-                                    super.onAnimationEnd(animation);
+            try {
+                Animator anim = ViewAnimationUtils.createCircularReveal(view, cx, cy, mStartRadius, finalRadius);
+
+                int maxRadius = (int) Math.sqrt(w * w + h * h) + 1;
+                // 若未设置时长，则以PERFECT_MILLS为基准根据水波扩散的距离来计算实际时间
+                if (mDurationMills == null) {
+                    // 算出实际边距与最大边距的比率
+                    double rate = 1d * finalRadius / maxRadius;
+                    // 为了让用户便于感触到水波，速度应随最大边距的变小而越慢，扩散时间应随最大边距的变小而变小，因此比率应在 @rate 与 1 之间。
+                    mDurationMills = (long) (PERFECT_MILLS * Math.sqrt(rate));
+                }
+                final long finalDuration = mDurationMills;
+                // 由于thisActivity.startActivity()会有所停顿，所以进入的水波动画应比退出的水波动画时间短才能保持视觉上的一致。
+                anim.setDuration((long) (finalDuration * 0.9));
+                anim.addListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        super.onAnimationEnd(animation);
+
+                        doOnEnd();
+
+                        mActivity.overridePendingTransition(mEnterAnim, mExitAnim);
+
+                        // 默认显示返回至当前Activity的动画.
+                        mTriggerView.postDelayed(new Runnable() {
+                            @Override
+                            public void run() {
+                                if (mActivity.isFinishing()) return;
+                                try {
+                                    Animator anim = ViewAnimationUtils.createCircularReveal(view, cx, cy,
+                                            finalRadius, mStartRadius);
+                                    anim.setDuration(finalDuration);
+                                    anim.addListener(new AnimatorListenerAdapter() {
+                                        @Override
+                                        public void onAnimationEnd(Animator animation) {
+                                            super.onAnimationEnd(animation);
+                                            try {
+                                                decorView.removeView(view);
+                                            } catch (Exception e) {
+                                                e.printStackTrace();
+                                            }
+                                        }
+                                    });
+                                    anim.start();
+                                } catch (Exception e) {
+                                    e.printStackTrace();
                                     try {
                                         decorView.removeView(view);
-                                    } catch (Exception e) {
-                                        e.printStackTrace();
+                                    } catch (Exception e1) {
+                                        e1.printStackTrace();
                                     }
                                 }
-                            });
-                            anim.start();
-                        }
-                    }, 1000);
+                            }
+                        }, 1000);
+
+                    }
+                });
+                anim.start();
+            } catch (Exception e) {
+                e.printStackTrace();
+                doOnEnd();
+            }
+        }
 
-                }
-            });
-            anim.start();
+        private void doOnEnd() {
+            mOnAnimationEndListener.onAnimationEnd();
         }
     }