keep pageIndex if pageEnabled seted (#1537)

apache · Sep 18, 2018 · 32621fc · 32621fc
1 parent e95972b
commit 32621fc
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
@@ -437,11 +437,15 @@ public void onScrollChanged(WXHorizontalScrollView scrollView, int x, int y, int
       scrollView.addView(mRealView, layoutParams);
       scrollView.setHorizontalScrollBarEnabled(false);
 
-      if(pageEnable && this.pageSize != 0) {
+      if(pageEnable) {
         mGestureDetector = new GestureDetector(new MyGestureDetector(scrollView));
         scrollView.setOnTouchListener(new View.OnTouchListener() {
           @Override
           public boolean onTouch(View v, MotionEvent event) {
+            if (pageSize == 0)  {
+              pageSize = v.getMeasuredWidth();
+            }
+
             if (mGestureDetector.onTouchEvent(event)) {
               return true;
             }
@@ -685,6 +689,11 @@ public void scrollTo(WXComponent component, Map<String, Object> options) {
       }
     }
 
+    if(pageEnable) {
+      mActiveFeature = mChildren.indexOf(component);
+    }
+
+
     int viewYInScroller=component.getAbsoluteY() - getAbsoluteY();
     int viewXInScroller=component.getAbsoluteX() - getAbsoluteX();