From 9dfa54950bc8adadbcf1880f8694c7d863d5aa0e Mon Sep 17 00:00:00 2001
From: JakeWoki <dadaobucaoge@gmail.com>
Date: Wed, 28 Nov 2018 11:37:18 +0800
Subject: [PATCH 1/4] https://github.com/huangyanbin/smartTable/issues/134

---
 app/build.gradle                              |  62 +++---
 app/src/main/AndroidManifest.xml              |   1 +
 .../bin/david/smarttable/MainActivity.java    |   1 +
 .../smarttable/NestedScrollActivity.java      | 106 +++++++++++
 .../layout/activity_nested_scroll_table.xml   |  42 +++++
 build.gradle                                  |  32 +++-
 form/build.gradle                             |  12 +-
 .../com/bin/david/form/core/SmartTable.java   | 178 +++++++++++++++++-
 gradle.properties                             |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 10 files changed, 402 insertions(+), 36 deletions(-)
 create mode 100644 app/src/main/java/com/bin/david/smarttable/NestedScrollActivity.java
 create mode 100644 app/src/main/res/layout/activity_nested_scroll_table.xml

diff --git a/app/build.gradle b/app/build.gradle
index 9fc84a9..fbdfe92 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    compileSdkVersion rootProject.compileSdkVersion
+    buildToolsVersion rootProject.buildToolsVersion
     defaultConfig {
         applicationId "com.bin.david.smarttable"
-        minSdkVersion 15
-        targetSdkVersion 25
+        minSdkVersion rootProject.minSdk
+        targetSdkVersion rootProject.targetSdk
         versionCode 1
         versionName "1.8.5"
         multiDexEnabled true
@@ -29,24 +29,44 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    testCompile 'junit:junit:4.12'
-    compile project(':form')
-    compile 'com.zhy:okhttputils:2.6.2'
-    compile 'com.google.code.gson:gson:2.8.0'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.github.huangyanbin:SmartChart:1.3.2'
-    compile 'com.android.support:cardview-v7:25.3.1'
-    compile 'com.android.support:multidex:1.0.0'
-    compile 'com.github.bumptech.glide:glide:4.3.1'
-    compile 'jp.wasabeef:glide-transformations:3.0.1'
-    compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.4.1'
+    testImplementation 'junit:junit:4.12'
+    implementation project(':form')
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation supportDependencies.annotations
+    implementation supportDependencies.recyclerview
+    implementation(supportDependencies.design) {
+        exclude module: "support-annotations"
+    }
+    implementation 'com.zhy:okhttputils:2.6.2'
+    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.github.huangyanbin:SmartChart:1.3.2'
+    implementation ("com.android.support:cardview-v7:${supportVersion}") {
+        exclude group: 'com.android.support', module: 'design'
+        exclude group: 'com.android.support', module: 'appcompat'
+        exclude group: 'com.android.support', module: 'support-v4'
+        exclude module: 'recyclerview-v7'
+    }
+    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'com.github.bumptech.glide:glide:4.3.1'
+    implementation 'jp.wasabeef:glide-transformations:3.0.1'
+    implementation 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.4.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.3.1'
-    compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.31'
-    compile files('libs/jxl.jar')
-    compile 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-1'
+    implementation ('com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.31') {
+        exclude group: 'com.android.support', module: 'design'
+        exclude group: 'com.android.support', module: 'appcompat'
+        exclude group: 'com.android.support', module: 'support-v4'
+        exclude module: 'recyclerview-v7'
+    }
+    implementation files('libs/jxl.jar')
+    implementation ('com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-15') {
+        exclude group: 'com.android.support', module: 'support-v4'
+    }
     implementation files('libs/poi-3.17.jar')
     implementation files('libs/poi-scratchpad-3.17.jar')
-    compile 'com.vincent.filepicker:MultiTypeFilePicker:1.0.5'
+    implementation ('com.vincent.filepicker:MultiTypeFilePicker:1.0.5') {
+        exclude group: 'com.android.support', module: 'design'
+        exclude group: 'com.android.support', module: 'appcompat'
+        exclude group: 'com.android.support', module: 'support-v4'
+        exclude module: 'recyclerview-v7'
+    }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1d80b4a..1a74714 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,6 +38,7 @@
         <activity android:name=".MergeModeActivity" />
         <activity android:name=".RefreshActivity" />
         <activity android:name=".MinModeActivity" />
+        <activity android:name=".NestedScrollActivity" />
         <activity android:name=".ArrayColumnModeActivity" />
         <activity android:name=".MapModeActivity" />
         <activity android:name=".WelcomeActivity" />
diff --git a/app/src/main/java/com/bin/david/smarttable/MainActivity.java b/app/src/main/java/com/bin/david/smarttable/MainActivity.java
index 9119afa..34d266c 100644
--- a/app/src/main/java/com/bin/david/smarttable/MainActivity.java
+++ b/app/src/main/java/com/bin/david/smarttable/MainActivity.java
@@ -44,6 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
         items.add(new MainItem(AlignActivity.class,"文字Align测试"));
         items.add(new MainItem(ManyActivity.class,"测试大量列"));
         items.add(new MainItem(MinModeActivity.class,"设置表格最小宽度(嵌入ScrollView)"));
+		items.add(new MainItem(NestedScrollActivity.class,"NestedScrollView的setNestedScrollingEnabled属性"));
         items.add(new MainItem(TableListActivity.class,"测试手势冲突"));
         items.add(new MainItem(WelcomeActivity.class,"表格动画") );
         items.add(new MainItem(GridModeActivity.class,"网格配置"));
diff --git a/app/src/main/java/com/bin/david/smarttable/NestedScrollActivity.java b/app/src/main/java/com/bin/david/smarttable/NestedScrollActivity.java
new file mode 100644
index 0000000..6f2e27c
--- /dev/null
+++ b/app/src/main/java/com/bin/david/smarttable/NestedScrollActivity.java
@@ -0,0 +1,106 @@
+package com.bin.david.smarttable;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.widget.NestedScrollView;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.widget.Button;
+
+import com.bin.david.form.core.SmartTable;
+import com.bin.david.form.data.style.FontStyle;
+import com.bin.david.form.utils.DensityUtils;
+import com.bin.david.smarttable.bean.ChildData;
+import com.bin.david.smarttable.bean.Lesson;
+import com.bin.david.smarttable.bean.LessonPoint;
+import com.bin.david.smarttable.bean.Student;
+import com.bin.david.smarttable.bean.TanBean;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+/**
+ *
+ * Created by owp on 2018/11/28.
+ */
+public class NestedScrollActivity extends AppCompatActivity {
+
+    private NestedScrollView scrollView;
+    private Button btn;
+    private SmartTable<Student> table;
+
+    private boolean isCeiling;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_nested_scroll_table);
+
+        FontStyle.setDefaultTextSize(DensityUtils.sp2px(this,15)); //设置全局字体大小
+        scrollView = (NestedScrollView) findViewById(R.id.scrollView);
+        table = (SmartTable<Student>) findViewById(R.id.table);
+
+
+        table.setNestedScrollingEnabled(true);
+
+
+        btn = (Button) findViewById(R.id.btn);
+        btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                table.setCeiling(isCeiling = !isCeiling);
+                btn.setText(isCeiling ? "普通效果" : "吸顶效果");
+            }
+        });
+
+        table.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                table.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+                table.getLayoutParams().height = scrollView.getMeasuredHeight();
+
+                loadData();
+            }
+        });
+    }
+
+    private void loadData() {
+        List<String> texts =  new ArrayList<>();
+        texts.add("测试哈1");
+        texts.add("测试哈2");
+        texts.add("测试哈3");
+        List<Lesson> lessons2 = new ArrayList<>();
+        Lesson lesson1 = new Lesson("软件",true);
+
+        lesson1.setTest(texts);
+        lesson1.setLessonPoints(new LessonPoint[]{new LessonPoint("软件工程"),new LessonPoint("离散数学")});
+        Lesson lesson2 = new Lesson("生物",true);
+        lesson2.setLessonPoints(new LessonPoint[]{new LessonPoint("医学构造"),new LessonPoint("生物科技")});
+        //lesson2.setTest(texts);
+        lessons2.add(lesson1);
+        lessons2.add(lesson2);
+        lessons2.add(new Lesson("微积分",false));
+        Random random = new Random();
+        //  Lesson[] lessonArray = new Lesson[]{new Lesson("政治",false),new Lesson("法学",false)};
+        List<TanBean> tanBeans = TanBean.initDatas();
+        final List<Student> students = new ArrayList<>();
+        //测试 从其他地方获取url
+        int urlSize = tanBeans.size();
+        for(int i = 0;i <30; i++) {
+            Student student = new Student("用户"+i, random.nextInt(70), System.currentTimeMillis()
+                    - random.nextInt(70)*3600*1000*24,true,new ChildData("测试"+i));
+            student.setUrl(tanBeans.get(i%urlSize).getUrl());
+            //student.setLessons(i%3 ==0?lessons2:lessons);
+            student.setLessons(lessons2);
+            // student.setLessonsArray(lessonArray);
+            students.add(student);
+        }
+        table.setData(students);
+        table.getConfig().setShowTableTitle(true);
+        table.getConfig().setShowXSequence(true);
+        table.getConfig().setShowYSequence(true);
+        table.setZoom(true,2,0.2f);
+    }
+}
diff --git a/app/src/main/res/layout/activity_nested_scroll_table.xml b/app/src/main/res/layout/activity_nested_scroll_table.xml
new file mode 100644
index 0000000..e8eb8db
--- /dev/null
+++ b/app/src/main/res/layout/activity_nested_scroll_table.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.bin.david.smarttable.MinModeActivity">
+
+   <android.support.v4.widget.NestedScrollView
+       android:id="@+id/scrollView"
+       android:layout_width="match_parent"
+       android:layout_height="match_parent">
+      <LinearLayout
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:orientation="vertical">
+
+         <Button
+             android:id="@+id/btn"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:paddingLeft="10dp"
+             android:paddingRight="10dp"
+             android:background="@drawable/dialog_btn_bg"
+             android:text="吸顶效果"
+             android:textColor="#fff" />
+
+         <TextView
+             android:id="@+id/text"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:textSize="18sp"
+             android:text="dddddddddddddddd\n2222222222222222222233333\n大规模枯干无可奈何花落去枯干奇才地霜无可奈何花落去地地夺奇才无可奈何花落去楏柘城地城可想而知枯干地需要地奇才村地标有夺夺电灯泡显加盟田影响力口田迷影响力\ndsffsdfh;lklkjkljlkjljlkjloiuoiukljk.,m.,m.mkwer3243243432432434343454565465465645654654645"/>
+
+         <com.bin.david.form.core.SmartTable
+             android:id="@+id/table"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent" />
+
+      </LinearLayout>
+   </android.support.v4.widget.NestedScrollView>
+
+</FrameLayout>
diff --git a/build.gradle b/build.gradle
index 6bf4521..7bd0077 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,8 +7,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -26,3 +26,31 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+ext {
+    minSdk = 15
+    targetSdk = 28
+    compileSdkVersion = 28
+    buildToolsVersion = "28.0.3"
+    supportLibVersion = "28.0.0"
+    runnerVersion = "1.0.1"
+    rulesVersion = "1.0.1"
+    espressoVersion = "3.0.1"
+
+    // Libraries
+    junitVersion = '4.12'
+    supportVersion = '28.0.0'
+
+    javaSourceCompatibility = JavaVersion.VERSION_1_8
+    javaTargetCompatibility = JavaVersion.VERSION_1_8
+
+    //Support Libraries dependencies
+    supportDependencies = [
+            annotations  : "com.android.support:support-annotations:${supportVersion}",
+            palette      : "com.android.support:palette-v7:${supportVersion}",
+            appcompat    : "com.android.support:appcompat-v7:${supportVersion}",
+            design       : "com.android.support:design:${supportVersion}",
+            vector       : "com.android.support:support-vector-drawable:${supportVersion}",
+            recyclerview : "com.android.support:recyclerview-v7:${supportVersion}",
+    ]
+}
\ No newline at end of file
diff --git a/form/build.gradle b/form/build.gradle
index 1da39a2..c7977c2 100644
--- a/form/build.gradle
+++ b/form/build.gradle
@@ -4,13 +4,13 @@ apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.huangyanbin'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    compileSdkVersion rootProject.compileSdkVersion
+    buildToolsVersion rootProject.buildToolsVersion
 
 
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 25
+        minSdkVersion rootProject.minSdk
+        targetSdkVersion rootProject.targetSdk
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -56,4 +56,8 @@ artifacts {
 }
 
 dependencies {
+    implementation supportDependencies.annotations
+    implementation(supportDependencies.design) {
+        exclude module: "support-annotations"
+    }
 }
diff --git a/form/src/main/java/com/bin/david/form/core/SmartTable.java b/form/src/main/java/com/bin/david/form/core/SmartTable.java
index 34c6d47..c93ee98 100644
--- a/form/src/main/java/com/bin/david/form/core/SmartTable.java
+++ b/form/src/main/java/com/bin/david/form/core/SmartTable.java
@@ -5,8 +5,12 @@
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
+import android.support.v4.view.NestedScrollingChild2;
+import android.support.v4.view.NestedScrollingChildHelper;
+import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 
@@ -36,7 +40,11 @@
  * 表格
  */
 
-public class SmartTable<T> extends View implements OnTableChangeListener {
+public class SmartTable<T> extends View implements NestedScrollingChild2, OnTableChangeListener {
+
+    static final String TAG = "SmartTable";
+
+    private static final int INVALID_POINTER = -1;
 
     private XSequence<T> xAxis;
     private YSequence<T> yAxis;
@@ -57,15 +65,21 @@ public class SmartTable<T> extends View implements OnTableChangeListener {
     private AtomicBoolean isNotifying = new AtomicBoolean(false); //是否正在更新数据
     private boolean isYSequenceRight;
 
+    private boolean isCeiling;
+    private int mActivePointerId = INVALID_POINTER;
+    private int mLastX;
+    private int mLastY;
+    private final int[] mScrollOffset = new int[2];
+    private final int[] mScrollConsumed = new int[2];
+    private int mNestedOffsetY;
+    private NestedScrollingChildHelper mScrollingChildHelper;
 
     public SmartTable(Context context) {
-        super(context);
-        init();
+        this(context, null);
     }
 
     public SmartTable(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
+        this(context, attrs, 0);
     }
 
     public SmartTable(Context context, AttributeSet attrs, int defStyleAttr) {
@@ -73,6 +87,13 @@ public SmartTable(Context context, AttributeSet attrs, int defStyleAttr) {
         init();
     }
 
+    private NestedScrollingChildHelper getScrollingChildHelper() {
+        if (mScrollingChildHelper == null) {
+            mScrollingChildHelper = new NestedScrollingChildHelper(this);
+        }
+        return mScrollingChildHelper;
+    }
+
     /**
      * 初始化
      */
@@ -98,6 +119,13 @@ private void init() {
 
     }
 
+    /**
+     * @param ceiling true：吸顶
+     */
+    public void setCeiling(boolean ceiling) {
+        isCeiling = ceiling;
+    }
+
     /**
      * 绘制
      * 首先通过计算的table大小，计算table title大小
@@ -370,8 +398,65 @@ private int measureHeight(int measureSpec) {
      * 将触摸事件交给Iouch处理
      */
     @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        return matrixHelper.handlerTouchEvent(event);
+    public boolean onTouchEvent(MotionEvent ev) {
+        boolean returnValue = false;
+
+        MotionEvent event = MotionEvent.obtain(ev);
+        final int actionMasked = ev.getActionMasked();
+        if (actionMasked == MotionEvent.ACTION_DOWN) {
+            mNestedOffsetY = 0;
+        }
+        event.offsetLocation(0, mNestedOffsetY);
+        switch (actionMasked) {
+            case MotionEvent.ACTION_MOVE:
+                final int activePointerIndex = ev.findPointerIndex(mActivePointerId);
+                if (activePointerIndex == -1) {
+                    Log.e(TAG, "Invalid pointerId=" + mActivePointerId + " in onTouchEvent");
+                    break;
+                }
+                int eventX = (int) ev.getX(activePointerIndex);
+                int eventY = (int) ev.getY(activePointerIndex);
+                int deltaX = mLastX - eventX;
+                int deltaY = mLastY - eventY;
+
+                // NestedPreScroll
+                if (dispatchNestedPreScroll(0, deltaY, mScrollConsumed, mScrollOffset)) {
+                    deltaY -= mScrollConsumed[1];
+                    mLastY = eventY - mScrollOffset[1];
+                    event.offsetLocation(0, mScrollOffset[1]);
+                    mNestedOffsetY += mScrollOffset[1];
+                }
+                // NestedScroll
+                if (dispatchNestedScroll(0, mScrollOffset[1], 0, deltaY, mScrollOffset)) {
+                    if (isCeiling) {
+                        event.offsetLocation(0, mScrollOffset[1]);
+                        mNestedOffsetY += mScrollOffset[1];
+                        mLastY -= mScrollOffset[1];
+                    }
+                }
+
+                returnValue = matrixHelper.handlerTouchEvent(event);
+                break;
+            case MotionEvent.ACTION_DOWN:
+                returnValue = matrixHelper.handlerTouchEvent(event);
+                mLastX = (int) ev.getX();
+                mLastY = (int) ev.getY();
+                mActivePointerId = ev.getPointerId(0);
+                // start NestedScroll
+                startNestedScroll(ViewCompat.SCROLL_AXIS_VERTICAL);
+                break;
+            case MotionEvent.ACTION_UP:
+                mActivePointerId = INVALID_POINTER;
+                returnValue = matrixHelper.handlerTouchEvent(event);
+                break;
+            case MotionEvent.ACTION_CANCEL:
+                mActivePointerId = INVALID_POINTER;
+                returnValue = matrixHelper.handlerTouchEvent(event);
+                // end NestedScroll
+                stopNestedScroll();
+                break;
+        }
+        return returnValue;
     }
 
     /**
@@ -619,5 +704,84 @@ public boolean isYSequenceRight() {
     public void setYSequenceRight(boolean YSequenceRight) {
         isYSequenceRight = YSequenceRight;
     }
+
+
+    // NestedScrollingChild
+
+    @Override
+    public void setNestedScrollingEnabled(boolean enabled) {
+        getScrollingChildHelper().setNestedScrollingEnabled(enabled);
+    }
+
+    @Override
+    public boolean isNestedScrollingEnabled() {
+        return getScrollingChildHelper().isNestedScrollingEnabled();
+    }
+
+    @Override
+    public boolean startNestedScroll(int axes) {
+        return getScrollingChildHelper().startNestedScroll(axes);
+    }
+
+    @Override
+    public boolean startNestedScroll(int axes, int type) {
+        return getScrollingChildHelper().startNestedScroll(axes, type);
+    }
+
+    @Override
+    public void stopNestedScroll() {
+        getScrollingChildHelper().stopNestedScroll();
+    }
+
+    @Override
+    public void stopNestedScroll(int type) {
+        getScrollingChildHelper().stopNestedScroll(type);
+    }
+
+    @Override
+    public boolean hasNestedScrollingParent() {
+        return getScrollingChildHelper().hasNestedScrollingParent();
+    }
+
+    @Override
+    public boolean hasNestedScrollingParent(int type) {
+        return getScrollingChildHelper().hasNestedScrollingParent(type);
+    }
+
+    @Override
+    public boolean dispatchNestedScroll(int dxConsumed, int dyConsumed, int dxUnconsumed,
+                                        int dyUnconsumed, int[] offsetInWindow) {
+        return getScrollingChildHelper().dispatchNestedScroll(dxConsumed, dyConsumed,
+                dxUnconsumed, dyUnconsumed, offsetInWindow);
+    }
+
+    @Override
+    public boolean dispatchNestedScroll(int dxConsumed, int dyConsumed, int dxUnconsumed,
+                                        int dyUnconsumed, int[] offsetInWindow, int type) {
+        return getScrollingChildHelper().dispatchNestedScroll(dxConsumed, dyConsumed,
+                dxUnconsumed, dyUnconsumed, offsetInWindow, type);
+    }
+
+    @Override
+    public boolean dispatchNestedPreScroll(int dx, int dy, int[] consumed, int[] offsetInWindow) {
+        return getScrollingChildHelper().dispatchNestedPreScroll(dx, dy, consumed, offsetInWindow);
+    }
+
+    @Override
+    public boolean dispatchNestedPreScroll(int dx, int dy, int[] consumed, int[] offsetInWindow,
+                                           int type) {
+        return getScrollingChildHelper().dispatchNestedPreScroll(dx, dy, consumed, offsetInWindow,
+                type);
+    }
+
+    @Override
+    public boolean dispatchNestedFling(float velocityX, float velocityY, boolean consumed) {
+        return getScrollingChildHelper().dispatchNestedFling(velocityX, velocityY, consumed);
+    }
+
+    @Override
+    public boolean dispatchNestedPreFling(float velocityX, float velocityY) {
+        return getScrollingChildHelper().dispatchNestedPreFling(velocityX, velocityY);
+    }
 }
 
diff --git a/gradle.properties b/gradle.properties
index d682789..2e25884 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
-android.enableAapt2=false
+# android.enableAapt2=false
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 776050e..10355ae 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

From b77fe31fcbac609a8bbe378334a2d01d995b8c67 Mon Sep 17 00:00:00 2001
From: JakeWoki <dadaobucaoge@gmail.com>
Date: Thu, 29 Nov 2018 16:05:23 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=8D=E5=B7=A6=E5=81=8F=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bin/david/form/component/TableProvider.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/form/src/main/java/com/bin/david/form/component/TableProvider.java b/form/src/main/java/com/bin/david/form/component/TableProvider.java
index fb27e1d..a84af88 100644
--- a/form/src/main/java/com/bin/david/form/component/TableProvider.java
+++ b/form/src/main/java/com/bin/david/form/component/TableProvider.java
@@ -430,7 +430,7 @@ private void drawCountText(Canvas canvas,Column column,int position, Rect rect,
         if(column.getTextAlign() !=null) {
             paint.setTextAlign(column.getTextAlign());
         }
-        canvas.drawText(text, DrawUtils.getTextCenterX(rect.left,rect.right,paint), DrawUtils.getTextCenterY(rect.centerY(), paint), paint);
+        canvas.drawText(text, DrawUtils.getTextCenterX(rect.left+config.getTextLeftOffset(), rect.right,paint), DrawUtils.getTextCenterY(rect.centerY(), paint), paint);
     }
 
 

From c1083160dfdcafc8a26a911edff65a8970484daf Mon Sep 17 00:00:00 2001
From: JakeWoki <dadaobucaoge@gmail.com>
Date: Thu, 29 Nov 2018 16:08:26 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E5=90=91=E5=8F=B3=E5=81=8F=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bin/david/form/component/TableProvider.java    |  3 ++-
 .../java/com/bin/david/form/core/TableConfig.java  | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/form/src/main/java/com/bin/david/form/component/TableProvider.java b/form/src/main/java/com/bin/david/form/component/TableProvider.java
index a84af88..4ec63d3 100644
--- a/form/src/main/java/com/bin/david/form/component/TableProvider.java
+++ b/form/src/main/java/com/bin/david/form/component/TableProvider.java
@@ -379,6 +379,7 @@ protected void drawContentCell(Canvas c, CellInfo<T> cellInfo, Rect rect,TableCo
             config.getTableGridFormat().drawContentGrid(c,cellInfo.col,cellInfo.row,rect,cellInfo,config.getPaint());
         }
         rect.left += config.getTextLeftOffset();
+        rect.right -= config.getTextRightOffset();
         cellInfo.column.getDrawFormat().draw(c,rect, cellInfo,  config);
     }
 
@@ -430,7 +431,7 @@ private void drawCountText(Canvas canvas,Column column,int position, Rect rect,
         if(column.getTextAlign() !=null) {
             paint.setTextAlign(column.getTextAlign());
         }
-        canvas.drawText(text, DrawUtils.getTextCenterX(rect.left+config.getTextLeftOffset(), rect.right,paint), DrawUtils.getTextCenterY(rect.centerY(), paint), paint);
+        canvas.drawText(text, DrawUtils.getTextCenterX(rect.left+config.getTextLeftOffset(), rect.right-config.getTextRightOffset(),paint), DrawUtils.getTextCenterY(rect.centerY(), paint), paint);
     }
 
 
diff --git a/form/src/main/java/com/bin/david/form/core/TableConfig.java b/form/src/main/java/com/bin/david/form/core/TableConfig.java
index 87e94e7..abcb01c 100644
--- a/form/src/main/java/com/bin/david/form/core/TableConfig.java
+++ b/form/src/main/java/com/bin/david/form/core/TableConfig.java
@@ -84,6 +84,10 @@ public class TableConfig {
      * 文字左边偏移
      */
     private int textLeftOffset = 0;
+    /**
+     * 文字右边偏移
+     */
+    private int textRightOffset = 0;
     /**
      * 增加列序列左右padding
      */
@@ -620,4 +624,14 @@ public TableConfig setTextLeftOffset(int textLeftOffset) {
         this.textLeftOffset = textLeftOffset;
         return this;
     }
+
+    public int getTextRightOffset() {
+        return textRightOffset;
+    }
+
+    public TableConfig setTextRightOffset(int textRightOffset) {
+        this.textRightOffset = textRightOffset;
+        return this;
+    }
+
 }

From d126544f12278209842528557c65cd60282755ab Mon Sep 17 00:00:00 2001
From: JakeWoki <dadaobucaoge@gmail.com>
Date: Fri, 30 Nov 2018 11:35:38 +0800
Subject: [PATCH 4/4] fix#124

---
 .../main/java/com/bin/david/form/component/TableProvider.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/form/src/main/java/com/bin/david/form/component/TableProvider.java b/form/src/main/java/com/bin/david/form/component/TableProvider.java
index 4ec63d3..7e2f6e0 100644
--- a/form/src/main/java/com/bin/david/form/component/TableProvider.java
+++ b/form/src/main/java/com/bin/david/form/component/TableProvider.java
@@ -156,8 +156,8 @@ private void drawCount(Canvas canvas) {
                     }else if(isPerColumnFixed){
                         canvas.save();
                         clipCount++;
-                        canvas.clipRect(clipRect.left, showRect.bottom - countHeight,
-                                showRect.right, showRect.bottom);
+                        canvas.clipRect(clipRect.left, bottom - countHeight,
+                                showRect.right, bottom);
                     }
                     tempRect.set((int)left, (int)top, (int)(left+width), (int)bottom);
                     drawCountText(canvas, column,i,tempRect, column.getTotalNumString(), config);