diff --git a/pager-grid-view/src/main/java/me/simple/pager/ViewPagerAdapter.kt b/pager-grid-view/src/main/java/me/simple/pager/ViewPagerAdapter.kt index 614f190..36908a8 100644 --- a/pager-grid-view/src/main/java/me/simple/pager/ViewPagerAdapter.kt +++ b/pager-grid-view/src/main/java/me/simple/pager/ViewPagerAdapter.kt @@ -17,9 +17,7 @@ internal class ViewPagerAdapter( private val mPageGridCount = mSpanCount * mLineCount override fun getItemCount(): Int { - if (itemAdapter.getItemCount() == 0) return 0 - - return (mItemCount / mSpanCount / mLineCount) + 1 + return (mItemCount - 1) / mPageGridCount + 1 } override fun onCreateViewHolder( @@ -51,11 +49,7 @@ internal class ViewPagerAdapter( private fun getPageItemCount(pageIndex: Int): Int { return if (pageIndex == this.itemCount - 1) { - if (pageIndex == 0) { - mItemCount - } else { - mItemCount % mPageGridCount - } + (mItemCount - 1) % mPageGridCount + 1 } else { mPageGridCount }