You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mi...@apache.org on 2017/08/16 03:49:18 UTC
[10/13] incubator-weex git commit: * [android] clean redundant
* [android] clean redundant
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d336ad2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d336ad2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d336ad2a
Branch: refs/heads/0.16-dev
Commit: d336ad2aed639d1e95d65428788ef26466208fb7
Parents: a62383e
Author: misakuo <mi...@apache.org>
Authored: Tue Aug 15 16:48:48 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Tue Aug 15 16:48:48 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/ui/view/WXCircleViewPager.java | 33 ++------------------
1 file changed, 2 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d336ad2a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
index 7e8e091..1659c30 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
@@ -34,7 +34,6 @@ import com.taobao.weex.ui.view.gesture.WXGesture;
import com.taobao.weex.ui.view.gesture.WXGestureObservable;
import com.taobao.weex.utils.WXLogUtils;
-import java.lang.ref.WeakReference;
import java.lang.reflect.Field;
/**
@@ -54,6 +53,7 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
@Override
public void handleMessage(Message msg) {
if (msg.what == SCROLL_TO_NEXT) {
+ WXLogUtils.d("[CircleViewPager] trigger auto play action");
showNextItem();
this.sendEmptyMessageDelayed(SCROLL_TO_NEXT, intervalTime);
return;
@@ -62,8 +62,6 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
}
};
- private Runnable scrollAction = new ScrollAction(this);
-
@SuppressLint("NewApi")
public WXCircleViewPager(Context context) {
super(context);
@@ -166,8 +164,6 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
isAutoScroll = true;
mAutoScrollHandler.removeCallbacksAndMessages(null);
mAutoScrollHandler.sendEmptyMessageDelayed(SCROLL_TO_NEXT, intervalTime);
-// mAutoScrollHandler.removeCallbacksAndMessages(scrollAction);
-// mAutoScrollHandler.postDelayed(scrollAction, intervalTime);
}
public void pauseAutoScroll(){
@@ -238,7 +234,6 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
case MotionEvent.ACTION_CANCEL:
if (isAutoScroll()) {
mAutoScrollHandler.sendEmptyMessageDelayed(SCROLL_TO_NEXT, intervalTime);
- //postDelayed(scrollAction, intervalTime);
}
break;
}
@@ -246,7 +241,7 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
}
public void destory() {
-
+ mAutoScrollHandler.removeCallbacksAndMessages(null);
}
@Override
@@ -310,28 +305,4 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
superSetCurrentItem(superGetCurrentItem() + 1, true);
}
}
-
- @Override
- protected void onDetachedFromWindow() {
- super.onDetachedFromWindow();
- mAutoScrollHandler.removeCallbacksAndMessages(null);
- }
-
- private static final class ScrollAction implements Runnable {
- private WeakReference<WXCircleViewPager> targetRef;
- private ScrollAction(WXCircleViewPager target) {
- this.targetRef = new WeakReference<>(target);
- }
-
- @Override
- public void run() {
- WXLogUtils.d("[CircleViewPager] trigger auto play action");
- WXCircleViewPager target;
- if ((target = targetRef.get()) != null) {
- target.showNextItem();
- target.removeCallbacks(this);
- target.postDelayed(this, target.getIntervalTime());
- }
- }
- }
}