release v1.0.3

zaaach · zaaach · commit 29ebed65caba · 2020-01-21T13:22:10.000+08:00
diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@
 
 - 每页行数、列数可配置
 - 滚动状态自动恢复
+- 支持数据重新排序，类似viewpager的分页模式
 - item布局样式自定义
 - scrollbar样式可配置
 
@@ -54,6 +55,7 @@ dependencies {
     android:background="#ffffff"
     app:tl_spanCount="5"
     app:tl_lines="2"
+    app:tl_pagingMode="true"
     app:tl_scrollbarWidth="72dp"
     app:tl_scrollbarHeight="4dp"
     app:tl_scrollbarRadius="2dp"
@@ -80,7 +82,7 @@ public class NavAdapterViewHolder extends Holder<Nav> {
     }
 
     @Override
-    public void bindData(Context context, Nav data) {
+    public void onBind(Context context, List<T> list, @Nullable Nav data, int position) {
         text.setText(data.getText());
         Glide.with(context)
                 .asBitmap()
@@ -93,7 +95,7 @@ public class NavAdapterViewHolder extends Holder<Nav> {
 }
 ```
 
-**Step 3：** java代码中使用
+**Step 3：** java代码中调用
 
 ```java
 List<Nav> navList = DataFactory.loadData();
@@ -102,6 +104,7 @@ TransformersLayout<Nav> header = findViewById();
 TransformersOptions options = new TransformersOptions.Builder()
         .lines(2)
         .spanCount(5)
+    	.pagingMode(true)
         .scrollBarWidth(Util.dp2px(this, 40))
         .scrollBarHeight(Util.dp2px(this, 3))
         .scrollBarRadius(Util.dp2px(this, 3) / 2f)
@@ -123,7 +126,7 @@ header.apply(options)//options可为null
             }
             @Override
             public int getLayoutId() {
-                return R.layout.item_nav_list;
+                return R.layout.item_nav_list;//第二步使用的布局
             }
         });
 ```
@@ -136,7 +139,8 @@ header.apply(options)//options可为null
 | -------- | ---- | ---- |
 | tl_spanCount | integer | 每页列数，默认5 |
 | tl_lines | integer | 每页行数，默认2 |
-| tl_scrollbarWidth | dimension \| reference | scrollbar宽度，默认36dp |
+| tl_pagingMode | boolean | 分页模式，数据会重新排序，默认false |
+| tl_scrollbarWidth | dimension \| reference | scrollbar宽度，默认48dp |
 | tl_scrollbarHeight | dimension \| reference | scrollbar高度，默认3dp |
 | tl_scrollbarMarginTop | dimension \| reference | scrollbar上间距 |
 | tl_scrollbarRadius | dimension \| reference | scrollbar圆角，默认高度的一半 |
@@ -145,6 +149,12 @@ header.apply(options)//options可为null
 
 # Change log
 
+2020-1-21
+
+- 新方法修复滚动条变长变短问题（很完美）
+- 支持数据重新排序
+- 回调方法变动
+
 2020-1-5
 
 - 修复滚动条突然变长变短的问题
diff --git a/app/src/main/java/com/zaaach/transformerslayoutdemo/ListActivity.java b/app/src/main/java/com/zaaach/transformerslayoutdemo/ListActivity.java
@@ -69,7 +69,7 @@ public int getLayoutId() {
         RecyclerView rv = findViewById(R.id.rv_main);
         rv.setLayoutManager(new LinearLayoutManager(this));
         List<String> beans = new ArrayList<>();
-        for (int i = 0; i < 100; i++) {
+        for (int i = 0; i < 50; i++) {
             beans.add("");
         }
         final ListAdapter adapter = new ListAdapter(beans);
@@ -83,7 +83,9 @@ public void onRefresh() {
                 new Handler().postDelayed(new Runnable() {
                     @Override
                     public void run() {
-                        navList.remove(0);
+                        if (navList.size() > 0) {
+                            navList.remove(0);
+                        }
                         header.notifyDataChanged(navList);
                         refreshLayout.setRefreshing(false);
                     }
diff --git a/transformerslayout/src/main/java/com/zaaach/transformerslayout/TransformersLayout.java b/transformerslayout/src/main/java/com/zaaach/transformerslayout/TransformersLayout.java
@@ -39,7 +39,7 @@ public class TransformersLayout<T> extends LinearLayout {
     /** 默认每页2行 */
     private static final int DEFAULT_LINES      = 2;
     /** 滚动条默认宽度 */
-    private static final int DEFAULT_SCROLL_BAR_WIDTH  = 36;//dp
+    private static final int DEFAULT_SCROLL_BAR_WIDTH  = 48;//dp
     /** 滚动条默认高度 */
     private static final int DEFAULT_SCROLL_BAR_HEIGHT = 3;//dp
     private static final int DEFAULT_TRACK_COLOR = Color.parseColor("#f0f0f0");
@@ -64,6 +64,7 @@ public class TransformersLayout<T> extends LinearLayout {
     private TransformersAdapter<T> transformersAdapter;
     private GridLayoutManager layoutManager;
     private Parcelable savedState;//保存的滚动状态
+    private TransformersOptions transformersOptions;
 
     public TransformersLayout(Context context) {
         this(context, null);
@@ -90,6 +91,7 @@ private void parseAttrs(Context context, AttributeSet attrs) {
         TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.TransformersLayout);
         spanCount = array.getInteger(R.styleable.TransformersLayout_tl_spanCount, DEFAULT_SPAN_COUNT);
         lines = array.getInteger(R.styleable.TransformersLayout_tl_lines, DEFAULT_LINES);
+        pagingMode = array.getBoolean(R.styleable.TransformersLayout_tl_pagingMode, false);
         scrollBarRadius = array.getDimensionPixelSize(R.styleable.TransformersLayout_tl_scrollbarRadius, -1);
         scrollBarTrackColor = array.getColor(R.styleable.TransformersLayout_tl_scrollbarTrackColor, DEFAULT_TRACK_COLOR);
         scrollBarThumbColor = array.getColor(R.styleable.TransformersLayout_tl_scrollbarThumbColor, DEFAULT_THUMB_COLOR);
@@ -157,11 +159,7 @@ public TransformersLayout<T> addOnTransformersItemClickListener(OnTransformersIt
     }
 
     public void load(@NonNull List<T> data, TransformersHolderCreator<T> creator){
-        if (pagingMode){
-            rearrange(data);
-        }else {
-            fillData(data);
-        }
+        fixData(data);
         transformersAdapter.setOnTransformersItemClickListener(onTransformersItemClickListener);
         transformersAdapter.setHolderCreator(creator);
         transformersAdapter.setSpanCount(spanCount);
@@ -182,9 +180,41 @@ public void load(@NonNull List<T> data, TransformersHolderCreator<T> creator){
      * 1 2 3 4 5   11 12 13 14 15
      * 6 7 8 9 10  16 null...
      */
-    private void rearrange(List<T> data) {
-        if (data == null || data.isEmpty()) return;
-        List<List<T>> splitList = new ArrayList<>();
+    private List<T> rearrange(List<T> data) {
+        if (lines <= 1) return data;
+        if (data == null || data.isEmpty()) return data;
+        List<T> destList = new ArrayList<>();
+        int pageSize = lines * spanCount;
+        int size = data.size();
+        //转换后的总数量，包括空数据
+        int sizeAfterTransform;
+        if (size < pageSize) {
+//            sizeAfterTransform = pageSize;
+            sizeAfterTransform = size < spanCount ? size * lines : pageSize;
+        } else if (size % pageSize == 0) {
+            sizeAfterTransform = size;
+        } else {
+//            sizeAfterTransform = (size / pageSize + 1) * pageSize;
+            sizeAfterTransform = size % pageSize < spanCount
+                    ? (size / pageSize) * pageSize + size % pageSize * lines
+                    : (size / pageSize + 1) * pageSize;
+        }
+        //类似置换矩阵
+        for (int i = 0; i < sizeAfterTransform; i++) {
+            int pageIndex = i / pageSize;
+            int columnIndex = (i - pageSize * pageIndex) / lines;
+            int rowIndex = (i - pageSize * pageIndex) % lines;
+            int destIndex = (rowIndex * spanCount + columnIndex) + pageIndex * pageSize;
+
+            if (destIndex >= 0 && destIndex < size) {
+                destList.add(data.get(destIndex));
+            } else {
+                destList.add(null);
+            }
+        }
+
+        //自己瞎捣鼓的方法...和上面的一比惨不忍睹
+        /*List<List<T>> splitList = new ArrayList<>();
         int size = data.size();
         int toIndex = spanCount;
         for (int i = 0; i < size; i += spanCount) {
@@ -204,28 +234,28 @@ private void rearrange(List<T> data) {
             rowList.add(row);
         }
 
-        List<T> result = new ArrayList<>();
+        List<T> destList = new ArrayList<>();
         for (int i = 0; i < rowList.get(0).size(); i++) {
-            result.add(rowList.get(0).get(i));
+            destList.add(rowList.get(0).get(i));
             for (int j = 0; j < rowList.size() - 1; j++) {
                 if (i > rowList.get(j+1).size() - 1){
-                    result.add(null);
+                    destList.add(null);
                 }else {
-                    result.add(rowList.get(j+1).get(i));
+                    destList.add(rowList.get(j+1).get(i));
                 }
             }
-        }
+        }*/
 
-        mDataList = result;
+        return destList;
     }
 
     /**
      * 默认排序时如果数据大于一页，使用空数据填满最后一列，用于修复滚动条滑动时变长变短的问题
      * @param data
      */
     private void fillData(@NonNull List<T> data) {
+        if (lines <= 1 || data.isEmpty()) return;
         mDataList = data;
-        if (mDataList.isEmpty()) return;
         if (mDataList.size() > lines * spanCount && mDataList.size() % lines > 0){
             int left = lines - mDataList.size() % lines;
             for (int i = 0; i < left; i++) {
@@ -242,8 +272,13 @@ public List<T> getDataList(){
         return mDataList;
     }
 
+    public TransformersOptions getOptions(){
+        return transformersOptions;
+    }
+
     public TransformersLayout<T> apply(@Nullable TransformersOptions options){
         if (options != null){
+            transformersOptions = options;
             spanCount = options.spanCount <= 0 ? spanCount : options.spanCount;
             int newLines = options.lines <= 0 ? lines : options.lines;
             scrollBarWidth = options.scrollBarWidth <= 0 ? scrollBarWidth : options.scrollBarWidth;
@@ -289,11 +324,7 @@ protected void onDetachedFromWindow() {
 
     public void notifyDataChanged(List<T> data){
         if (transformersAdapter != null){
-            if (pagingMode){
-                rearrange(data);
-            }else {
-                fillData(data);
-            }
+            fixData(data);
             transformersAdapter.setData(mDataList);
             scrollToStart();
         }
@@ -304,6 +335,14 @@ public void notifyDataChanged(List<T> data){
         }
     }
 
+    private void fixData(List<T> data) {
+        if (pagingMode) {
+            mDataList = rearrange(data);
+        } else {
+            fillData(data);
+        }
+    }
+
     public void scrollToStart(){
         scrollToStart(true);
     }
diff --git a/transformerslayout/src/main/java/com/zaaach/transformerslayout/view/RecyclerViewScrollBar.java b/transformerslayout/src/main/java/com/zaaach/transformerslayout/view/RecyclerViewScrollBar.java
@@ -162,8 +162,8 @@ public void computeScrollScale() {
 
         //RecyclerView已经滚动的距离
         float mScrollOffset = mRecyclerView.computeHorizontalScrollOffset();
-        //scrollOffset有时会超出可滚动距离
-        mScrollOffset = mScrollOffset >= canScrollDistance ? canScrollDistance : mScrollOffset;
+//        //scrollOffset有时会超出可滚动距离
+//        mScrollOffset = mScrollOffset >= canScrollDistance ? canScrollDistance : mScrollOffset;
         if (mScrollRange != 0){
             mScrollScale = mScrollOffset / mScrollRange;
         }
@@ -184,26 +184,6 @@ public void computeScrollScale() {
         postInvalidate();
     }
 
-//    private float getScrollRange(){
-//        float range = 0;
-//        if (mRecyclerView != null){
-//            int count = 0;
-//            int lines = 1;
-//            int itemWidth = 0;
-//            RecyclerView.Adapter adapter = mRecyclerView.getAdapter();
-//            if (adapter instanceof TransformersAdapter){
-//                count = adapter.getItemCount();
-//                itemWidth = ((TransformersAdapter) adapter).getItemWidth();
-//            }
-//            RecyclerView.LayoutManager manager = mRecyclerView.getLayoutManager();
-//            if (manager instanceof GridLayoutManager){
-//                lines = ((GridLayoutManager) manager).getSpanCount();
-//            }
-//            range = (int)Math.ceil(1.0*count / lines) * itemWidth;
-//        }
-//        return range;
-//    }
-
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
diff --git a/transformerslayout/src/main/res/values/attrs.xml b/transformerslayout/src/main/res/values/attrs.xml
@@ -5,6 +5,8 @@
         <attr name="tl_spanCount" format="integer"/>
         <!--每页几行-->
         <attr name="tl_lines" format="integer"/>
+        <!--分页模式-->
+        <attr name="tl_pagingMode" format="boolean"/>
         <!--滚动条宽度-->
         <attr name="tl_scrollbarWidth" format="dimension|reference"/>
         <!--滚动条高度-->
