From aea8f3fe80f6fd6b8e70ea201eb280f6dbf4ef91 Mon Sep 17 00:00:00 2001
From: MikeAfc <mike8264791@gmail.com>
Date: Thu, 21 Jun 2018 10:30:42 +0800
Subject: [PATCH] Add interface to control can scroll feature.

---
 gradle.properties                             |  2 +-
 tangram/build.gradle                          |  2 +-
 .../tmall/wireless/tangram/TangramEngine.java | 45 ++++++++++++++-----
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 6573e6e..6e6f029 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -46,7 +46,7 @@ org.gradle.jvmargs=-Xmx1536M
 GROUP=com.alibaba.android
 ARTIFACT=tangram
 VERSION=1
-VERSION_NAME=3.1.1
+VERSION_NAME=3.1.2
 PACKAGING_TYPE=aar
 systemProp.compileSdkVersion=25
 systemProp.targetSdkVersion=25
diff --git a/tangram/build.gradle b/tangram/build.gradle
index 6625dd1..7d353dc 100644
--- a/tangram/build.gradle
+++ b/tangram/build.gradle
@@ -117,7 +117,7 @@ dependencies {
             exclude group: 'com.android.support', module: 'support-annotations'
         }
     } else {
-        compile('com.alibaba.android:vlayout:1.2.14@aar') {
+        compile('com.alibaba.android:vlayout:1.2.16@aar') {
             changing = true
         }
     }
diff --git a/tangram/src/main/java/com/tmall/wireless/tangram/TangramEngine.java b/tangram/src/main/java/com/tmall/wireless/tangram/TangramEngine.java
index 21f0900..23bcb0a 100644
--- a/tangram/src/main/java/com/tmall/wireless/tangram/TangramEngine.java
+++ b/tangram/src/main/java/com/tmall/wireless/tangram/TangramEngine.java
@@ -41,6 +41,7 @@ import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.Pair;
 import android.view.View;
+
 import com.tmall.wireless.tangram.dataparser.DataParser;
 import com.tmall.wireless.tangram.dataparser.IAdapterBuilder;
 import com.tmall.wireless.tangram.dataparser.concrete.Card;
@@ -66,14 +67,16 @@ import com.tmall.wireless.tangram.support.SimpleClickSupport;
 import com.tmall.wireless.tangram.support.async.CardLoadSupport;
 import com.tmall.wireless.tangram.util.Predicate;
 import com.tmall.wireless.vaf.virtualview.core.ViewCache;
+
 import io.reactivex.functions.Consumer;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 /**
  * Created by villadora on 15/8/24.
- *
+ * <p>
  * The core of Tangram used to access data, bind view, register service.
  */
 public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card, BaseCell> implements Engine {
@@ -81,8 +84,8 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
     private static final int NO_SWIPE = -1;
 
     public TangramEngine(@NonNull Context context,
-        @NonNull DataParser<JSONObject, JSONArray, Card, BaseCell> dataParser,
-        @NonNull IAdapterBuilder<Card, BaseCell> adapterBuilder) {
+                         @NonNull DataParser<JSONObject, JSONArray, Card, BaseCell> dataParser,
+                         @NonNull IAdapterBuilder<Card, BaseCell> adapterBuilder) {
         super(context, dataParser, adapterBuilder);
         this.register(DataParser.class, dataParser);
     }
@@ -124,7 +127,7 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
         }
 
         view.addOnItemTouchListener(mSwipeItemTouchListener);
-        view.setOnScrollListener(new RecyclerView.OnScrollListener(){
+        view.setOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
                 super.onScrolled(recyclerView, dx, dy);
@@ -145,6 +148,14 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
         getLayoutManager().setNoScrolling(noScrolling);
     }
 
+    public void setCanScrollVertically(boolean canScrollVertically) {
+        getLayoutManager().setCanScrollVertically(canScrollVertically);
+    }
+
+    public void setCanScrollHorizontally(boolean canScrollHorizontally) {
+        getLayoutManager().setCanScrollHorizontally(canScrollHorizontally);
+    }
+
     public void setEnableOverlapMargin(boolean enable) {
         getLayoutManager().setEnableMarginOverlapping(enable);
     }
@@ -261,7 +272,6 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
     }
 
     /**
-     *
      * @param enable True to auto trigger loading data for card whose's position in within 0 to {{@link #mPreLoadNumber}}.
      */
     public void setEnableLoadFirstPageCard(boolean enable) {
@@ -328,7 +338,7 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
             @Override
             public boolean isMatch(Card data) {
                 return data.loadMore && data.hasMore && !data.loading
-                    && !TextUtils.isEmpty(data.load);
+                        && !TextUtils.isEmpty(data.load);
             }
         });
 
@@ -351,7 +361,6 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
     }
 
     /**
-     *
      * @param id Target cell's id. Can not be null
      * @return
      * @since 3.0.0
@@ -551,8 +560,9 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
 
     /**
      * A high performance method to insert cells. TODO handle nested card
+     *
      * @param insertPosition the position to be inserted.
-     * @param data new cell data
+     * @param data           new cell data
      * @since 2.1.0
      */
     public void insertWith(int insertPosition, BaseCell data) {
@@ -562,8 +572,9 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
 
     /**
      * A high performance method to insert cells. Do not allowed to insert to an empty Tangram. TODO handle nested card
+     *
      * @param insertPosition the position to be inserted
-     * @param list new cell data list
+     * @param list           new cell data list
      * @since 2.1.0
      */
     public void insertWith(int insertPosition, List<BaseCell> list) {
@@ -598,7 +609,7 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
 
     /**
      * @param insertIdx the index to be inserted
-     * @param group a group of data
+     * @param group     a group of data
      * @since 2.1.0
      */
     public void insertBatchWith(int insertIdx, Card group) {
@@ -607,7 +618,7 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
 
     /**
      * @param insertIdx the index to be inserted
-     * @param groups a group list
+     * @param groups    a group list
      * @since 2.1.0
      */
     public void insertBatchWith(int insertIdx, List<Card> groups) {
@@ -639,6 +650,7 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
 
     /**
      * NOTE new API, use this to replace {@link BaseTangramEngine#appendData(List)} and {@link BaseTangramEngine#appendData(Object)}
+     *
      * @param groups new groups to be append at tail.
      * @since 2.1.0
      */
@@ -650,6 +662,7 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
 
     /**
      * Remove cell at target position. TODO handle nested card
+     *
      * @param position
      * @since 2.1.0
      */
@@ -664,6 +677,7 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
 
     /**
      * Remove target cell. TODO handle nested card, cell in staggered, cell in onePlusN
+     *
      * @param data
      * @since 2.1.0
      */
@@ -709,6 +723,7 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
 
     /**
      * Remove all cells in a card with target index
+     *
      * @param removeIdx target card's index
      * @since 2.1.0
      */
@@ -723,6 +738,7 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
 
     /**
      * Remove all cells in a card.
+     *
      * @param group
      * @since 2.1.0
      */
@@ -759,6 +775,7 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
 
     /**
      * Replace cell one by one.
+     *
      * @param oldOne
      * @param newOne
      * @since 2.1.0
@@ -778,6 +795,7 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
 
     /**
      * Replace parent card's children. Cells' size should be equal with parent's children size.
+     *
      * @param parent
      * @param cells
      * @since 2.1.0
@@ -818,6 +836,7 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
 
     /**
      * Replace card one by one. New one's children size should be equal with old one's children size.
+     *
      * @param oldOne
      * @param newOne
      * @since 2.1.0
@@ -844,6 +863,7 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
 
     /**
      * Update a view's UI by its cell's data, you should change cell's data first.
+     *
      * @param cell
      * @since 3.0.0
      */
@@ -912,6 +932,7 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
 
     /**
      * Make engine as a consumer to accept data to append at the end of list
+     *
      * @return
      * @since 3.0.0
      */
@@ -926,6 +947,7 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
 
     /**
      * Make engine as a consumer to accept data to append at the end of list
+     *
      * @return
      * @since 3.0.0
      */
@@ -1024,6 +1046,7 @@ public class TangramEngine extends BaseTangramEngine<JSONObject, JSONArray, Card
 
     /**
      * Make engine as a consumer to accept cell'data change
+     *
      * @return
      * @since 3.0.0
      */