From 407c65c78e97279567adcc95e294f66295590ed6 Mon Sep 17 00:00:00 2001
From: zhengsr <845731923@qq.com>
Date: Wed, 16 Mar 2022 09:22:07 +0800
Subject: [PATCH] =?UTF-8?q?2.1=E7=89=88=E6=9C=AC=201.=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?item=E5=BF=AB=E9=80=9F=E7=82=B9=E5=87=BB,TabColorTextView=20?=
 =?UTF-8?q?=E8=BF=98=E6=9C=89=E6=AE=8B=E7=95=99=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=202.=20=E6=B7=BB=E5=8A=A0=20chooseItem,=E7=BB=93=E5=90=88setCu?=
 =?UTF-8?q?rrentItem(position,false)=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  3 +-
 TAB_README3_0.md                              |  3 +-
 .../com/zhengsr/tabhelper/MainActivity.java   |  3 ++
 .../tabhelper/activity/TabActivity.java       |  6 ++--
 appx/src/main/res/color/color_selector.xml    |  1 +
 appx/src/main/res/layout/activity_main.xml    |  7 ++++
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../tablib/view/action/BViewPager.java        |  9 +++--
 .../tablib/view/action/BaseAction.java        | 35 ++++++++++++++++---
 .../tablib/view/flow/TabVpFlowLayout.java     | 13 +++++++
 .../tablib/view/flow/base/AbsFlowLayout.java  |  1 -
 11 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index bbaf293..8d49c96 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ allprojects {
 
 **如果你的工程的是androidx且想支持ViewPager2，可以关联tablibx库**
 ```
-implementation 'com.github.LillteZheng:FlowHelper:vv2.0'
+implementation 'com.github.LillteZheng:FlowHelper:vv2.1'
 ```
 **support可以关联以下连接，请尽快切到androidx，support包不再维护**
 ```
@@ -144,6 +144,7 @@ implementation 'com.github.LillteZheng:FlowHelper:vv2.0'
 
 
 ## 版本信息：
+-  v2.1  : 修改TabVpFlowLayout 快速点击时,TabColorTextView 还有残留的问题
 -  v2.0  : 内置部分控件，减少接入成本，并优化一些bug，和关闭demo ，viewpager 内存泄露的问题
 -  v1.37 : 增加 tab_width_equals_text ，让 rect 根据 text 的长度变化，修复 TabColorTextView 加粗不起作用的问题
 -  v1.32 : 修复res和round，tab_margin_x 不起作用的问题
diff --git a/TAB_README3_0.md b/TAB_README3_0.md
index e6a182f..28c713f 100644
--- a/TAB_README3_0.md
+++ b/TAB_README3_0.md
@@ -207,7 +207,8 @@ flowLayout.setViewPager(viewpager) .
 
 **为了避免卡顿，当viewpager结合fragment时，可以有以下优化手段：**
 - fragment 布局复杂或者网络加载数据时，建议在懒加载中去初始化或者加载数据
-- viewpager 增加缓存，setOffscreenPageLimit(3)。
+- ViewPager 增加缓存，setOffscreenPageLimit(3)。
+- ViewPager 选择页面的方法设置为 setCurrentItem(position,false);再调用 chooseItem(position) 方法
 
 
 **如果您觉得viewpager切换太快，可以使用 ViewPagerHelperUtils.initSwitchTime(getContext(), viewPager, 600) 改变滚动速度**
diff --git a/appx/src/main/java/com/zhengsr/tabhelper/MainActivity.java b/appx/src/main/java/com/zhengsr/tabhelper/MainActivity.java
index 0258315..2990bf9 100644
--- a/appx/src/main/java/com/zhengsr/tabhelper/MainActivity.java
+++ b/appx/src/main/java/com/zhengsr/tabhelper/MainActivity.java
@@ -3,6 +3,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
@@ -29,6 +30,8 @@ public class MainActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        TextView textView = findViewById(R.id.text);
+        textView.setTextColor(getResources().getColor(R.color.color_selector));
 
     }
 
diff --git a/appx/src/main/java/com/zhengsr/tabhelper/activity/TabActivity.java b/appx/src/main/java/com/zhengsr/tabhelper/activity/TabActivity.java
index 3422a5c..95e688f 100644
--- a/appx/src/main/java/com/zhengsr/tabhelper/activity/TabActivity.java
+++ b/appx/src/main/java/com/zhengsr/tabhelper/activity/TabActivity.java
@@ -53,8 +53,8 @@ protected void onCreate(Bundle savedInstanceState) {
         triFlow();
         roundFlow();
         resFlow();
-        colorFlow();
         cusFlow();
+        colorFlow();
     }
 
     boolean isDetele = false;
@@ -129,8 +129,8 @@ private void colorFlow() {
         int t = DisplayUtil.dip2px(this, 6);
         TextConfig textConfig = new TextConfig()
                 .setPadding(l, t, l, t)
-                .setTypeface(Typeface.defaultFromStyle(Typeface.BOLD))
-                .setTextSize(18);
+                .setTypeface(Typeface.DEFAULT_BOLD)
+                .setTextSize(14);
 
         TabConfig config = new TabConfig.Builder()
                 .setViewpager(mViewPager)
diff --git a/appx/src/main/res/color/color_selector.xml b/appx/src/main/res/color/color_selector.xml
index 02e2cc3..d4fba17 100644
--- a/appx/src/main/res/color/color_selector.xml
+++ b/appx/src/main/res/color/color_selector.xml
@@ -3,4 +3,5 @@
 
     <item android:color="@color/white" android:state_selected="true"/>
     <item android:color="@color/black_ff_bg" android:state_selected="false"/>
+    <item android:color="@color/white" />
 </selector>
\ No newline at end of file
diff --git a/appx/src/main/res/layout/activity_main.xml b/appx/src/main/res/layout/activity_main.xml
index 2c09406..f7a8e5f 100644
--- a/appx/src/main/res/layout/activity_main.xml
+++ b/appx/src/main/res/layout/activity_main.xml
@@ -8,6 +8,13 @@
     android:background="#506E7A"
     tools:context=".MainActivity">
 
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="测试textcolor"
+        />
+
     <Button
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 617fbf6..2120ec2 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-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/tablibx/src/main/java/com/zhengsr/tablib/view/action/BViewPager.java b/tablibx/src/main/java/com/zhengsr/tablib/view/action/BViewPager.java
index 037ad69..c052cb2 100644
--- a/tablibx/src/main/java/com/zhengsr/tablib/view/action/BViewPager.java
+++ b/tablibx/src/main/java/com/zhengsr/tablib/view/action/BViewPager.java
@@ -1,7 +1,5 @@
 package com.zhengsr.tablib.view.action;
 
-import android.util.Log;
-
 import androidx.viewpager.widget.ViewPager;
 import androidx.viewpager2.widget.ViewPager2;
 
@@ -14,6 +12,7 @@ public class BViewPager {
     protected ViewPager2 mViewPager2;
     protected ViewPager mViewPager;
     private Pager2Listener mPager2Listener;
+    protected boolean isChooseItemWhenPageSelected = false;
     public BViewPager setViewPager(ViewPager2 viewPager){
         if (viewPager != null) {
             mViewPager2 = viewPager;
@@ -43,6 +42,12 @@ public ViewPager2 getViewPager2() {
         return mViewPager2;
     }
 
+    public void chooseItemWhenPageSelected() {
+        isChooseItemWhenPageSelected = true;
+    }
+
+
+
     private class PagerListener implements ViewPager.OnPageChangeListener{
 
         @Override
diff --git a/tablibx/src/main/java/com/zhengsr/tablib/view/action/BaseAction.java b/tablibx/src/main/java/com/zhengsr/tablib/view/action/BaseAction.java
index 8f63837..b82d50e 100644
--- a/tablibx/src/main/java/com/zhengsr/tablib/view/action/BaseAction.java
+++ b/tablibx/src/main/java/com/zhengsr/tablib/view/action/BaseAction.java
@@ -8,7 +8,6 @@
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.RectF;
-import android.util.Log;
 import android.view.View;
 import android.view.animation.LinearInterpolator;
 import android.widget.TextView;
@@ -291,8 +290,34 @@ public void onPageSelected(int position) {
         mLastIndex = mCurrentIndex;
         mCurrentIndex = position;
         chooseSelectedPosition(position);
+        checkIfNeedScroll(position);
+
     }
 
+    private void checkIfNeedScroll(int position){
+        if (isChooseItemWhenPageSelected) {
+            if (mParentView != null) {
+                if (mParentView.isCanMove()) {
+                    View curView = mParentView.getChildAt(position);
+                    int scrollX = (int) (curView.getLeft());
+                    if (scrollX > (mViewWidth / 2 - mParentView.getPaddingLeft())) {
+                        scrollX -= (mViewWidth / 2 - mParentView.getPaddingLeft());
+                        //有边界提醒
+                        if (scrollX <= mRightBound - mViewWidth) {
+                            mParentView.scrollTo(scrollX, 0);
+                        } else {
+                            int dx = mRightBound - mViewWidth;
+                            mParentView.scrollTo(dx, 0);
+                        }
+                    } else {
+                        mParentView.scrollTo(0, 0);
+                    }
+                }
+                isChooseItemWhenPageSelected = false;
+            }
+
+        }
+    }
 
     @Override
     public void onPageScrollStateChanged(int state) {
@@ -472,10 +497,10 @@ public void onAnimationEnd(Animator animation) {
      */
     public void chooseSelectedPosition(int position) {
         if (mParentView != null) {
-            if (isTextView && !isColorText) {
-                int childCount = mParentView.getChildCount();
-                for (int i = 0; i < childCount; i++) {
-                    TextView textView = mParentView.getTextView(i);
+            int childCount = mParentView.getChildCount();
+            for (int i = 0; i < childCount; i++) {
+                TextView textView = mParentView.getTextView(i);
+                if (textView != null) {
                     if (i == position) {
                         if (mSelectedColor != FlowConstants.COLOR_ILLEGAL) {
                             textView.setTextColor(mSelectedColor);
diff --git a/tablibx/src/main/java/com/zhengsr/tablib/view/flow/TabVpFlowLayout.java b/tablibx/src/main/java/com/zhengsr/tablib/view/flow/TabVpFlowLayout.java
index 1ccd436..7164db4 100644
--- a/tablibx/src/main/java/com/zhengsr/tablib/view/flow/TabVpFlowLayout.java
+++ b/tablibx/src/main/java/com/zhengsr/tablib/view/flow/TabVpFlowLayout.java
@@ -184,4 +184,17 @@ public AbsFlowLayout setDefaultPosition(int position) {
         mCurrentIndex = position;
         return this;
     }
+
+    /**
+     * 选择某个item，建议 viewpager setCurrentItem(position,false);
+     * 此方法是为了优化当 viewpager 页面过多，从第一页选择到最后一页，此时
+     * ViewPaper onPageScrolled 执行过多，导致滚动异常的问题。
+     * @param position
+     */
+    public void chooseItem(int position){
+        mLastIndex = mCurrentIndex;
+        mCurrentIndex = position;
+        mAction.chooseIndex(mLastIndex,position);
+        mAction.chooseItemWhenPageSelected();
+    }
 }
diff --git a/tablibx/src/main/java/com/zhengsr/tablib/view/flow/base/AbsFlowLayout.java b/tablibx/src/main/java/com/zhengsr/tablib/view/flow/base/AbsFlowLayout.java
index 1daedbd..10c19be 100644
--- a/tablibx/src/main/java/com/zhengsr/tablib/view/flow/base/AbsFlowLayout.java
+++ b/tablibx/src/main/java/com/zhengsr/tablib/view/flow/base/AbsFlowLayout.java
@@ -474,7 +474,6 @@ private TextView getTextview(int pos,int textType){
             }
             textView = colorTextView;
 
-
         }else {
             textView = new TextView(getContext());
             textView.setTextColor(Color.BLACK);