修复数据填充

zaaach · Aug 28, 2021 · de4274a · de4274a
1 parent 7c3dcf5
commit de4274a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/app/src/main/java/com/zaaach/transformerslayoutdemo/ListActivity.java b/app/src/main/java/com/zaaach/transformerslayoutdemo/ListActivity.java
@@ -127,7 +127,7 @@ public void run() {
                             navList2.remove(0);
                         }
                         header.notifyDataChanged(navList);
-                        header2.notifyDataChanged(navList);
+                        header2.notifyDataChanged(navList2);
                         refreshLayout.setRefreshing(false);
                     }
                 }, 1000);

diff --git a/transformerslayout/src/main/java/com/zaaach/transformerslayout/TransformersLayout.java b/transformerslayout/src/main/java/com/zaaach/transformerslayout/TransformersLayout.java
@@ -175,7 +175,7 @@ public void load(@NonNull List<T> data, TransformersHolderCreator<T> creator){
         //如果数据少于一页的列数
         mDataList = data;
         fixLineCount();
-        fixData(data);
+        fixData(mDataList);
         transformersAdapter.setOnTransformersItemClickListener(onTransformersItemClickListener);
         transformersAdapter.setHolderCreator(creator);
         transformersAdapter.setSpanCount(spanCount);
@@ -310,9 +310,10 @@ protected void onDetachedFromWindow() {
     }
 
     public void notifyDataChanged(List<T> data){
+        mDataList = data;
+        fixLineCount();
+        fixData(data);
         if (transformersAdapter != null){
-            fixLineCount();
-            fixData(data);
             transformersAdapter.setData(mDataList);
             scrollToStart();
         }
@@ -325,10 +326,11 @@ public void notifyDataChanged(List<T> data){
 
     private void fixLineCount() {
         //如果总数据少于一页，动态调整行数
-        if (pagingMode){
-            int size = mDataList.size();
+        int size = mDataList.size();
+        if (size <= spanCount * lines){
             lines = size % spanCount == 0 ? size / spanCount : size / spanCount + 1;
             Log.e(TAG, "lines = " + lines);
+            lines = lines > 0 ? lines : 1;
             layoutManager.setSpanCount(lines);
         }
     }