1、修复mOnePageSize某些情况下值为0的问题；

v1.1.7
shenbengit · Jun 19, 2022 · 94887f0 · 94887f0
1 parent 385b24b
commit 94887f0
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 76 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.../Uncommitted_changes_before_Update_at_2022_05_01_18_20_[Default_Changelist]/shelved.patch b/.../Uncommitted_changes_before_Update_at_2022_05_01_18_20_[Default_Changelist]/shelved.patch
diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_2022_05_01_18_20__Default_Changelist_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_2022_05_01_18_20__Default_Changelist_.xml
diff --git a/pagergridlayoutmanager/build.gradle b/pagergridlayoutmanager/build.gradle
@@ -32,7 +32,7 @@ afterEvaluate {
                 // You can then customize attributes of the publication as shown below.
                 groupId = 'com.shencoder'
                 artifactId = 'pagergridlayoutmanager'
-                version = '1.1.6'
+                version = '1.1.7'
             }
         }
     }

diff --git a/...outmanager/src/main/java/com/shencoder/pagergridlayoutmanager/PagerGridLayoutManager.java b/...outmanager/src/main/java/com/shencoder/pagergridlayoutmanager/PagerGridLayoutManager.java
@@ -330,8 +330,6 @@ public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State
             mEndSnapRect.set(getWidth() - getPaddingEnd() - mItemWidth, getHeight() - getPaddingBottom() - mItemHeight, getWidth() - getPaddingEnd(), getHeight() - getPaddingBottom());
         }
 
-        mOnePageSize = mRows * mColumns;
-
         //计算总页数
         int pagerCount = itemCount / mOnePageSize;
         if (itemCount % mOnePageSize != 0) {
@@ -585,6 +583,7 @@ public void onRestoreInstanceState(Parcelable state) {
             mOrientation = savedState.mOrientation;
             mRows = savedState.mRows;
             mColumns = savedState.mColumns;
+            calculateOnePageSize();
             setCurrentPagerIndex(savedState.mCurrentPagerIndex);
             mReverseLayout = savedState.mReverseLayout;
             requestLayout();
@@ -766,9 +765,17 @@ public final int getItemHeight() {
         return mItemHeight;
     }
 
+    /**
+     * 计算一页的数量
+     */
+    private void calculateOnePageSize() {
+        mOnePageSize = mRows * mColumns;
+    }
+
     /**
      * @return 一页的数量
      */
+    @IntRange(from = 1)
     public final int getOnePageSize() {
         return mOnePageSize;
     }
@@ -782,6 +789,7 @@ public void setColumns(@IntRange(from = 1) int columns) {
         mColumns = Math.max(columns, 1);
         mPagerCount = NO_PAGER_COUNT;
         mCurrentPagerIndex = NO_ITEM;
+        calculateOnePageSize();
         requestLayout();
     }
 
@@ -802,6 +810,7 @@ public void setRows(@IntRange(from = 1) int rows) {
         mRows = Math.max(rows, 1);
         mPagerCount = NO_PAGER_COUNT;
         mCurrentPagerIndex = NO_ITEM;
+        calculateOnePageSize();
         requestLayout();
     }