From 263ff1d63f31b2442ef8e23c3d33ad16e31d3195 Mon Sep 17 00:00:00 2001
From: zhpanvip <zhpanvip@outlook.com>
Date: Mon, 6 Feb 2023 10:57:39 +0800
Subject: [PATCH] Bug Fix #277

---
 .../zhpan/banner/fragment/PageFragment.kt     | 328 +++++++++---------
 app/src/main/res/layout/fragment_find.xml     |  21 +-
 app/src/main/res/values/strings.xml           |   2 +
 .../com/zhpan/bannerview/BannerViewPager.java |  12 +-
 4 files changed, 192 insertions(+), 171 deletions(-)

diff --git a/app/src/main/java/com/example/zhpan/banner/fragment/PageFragment.kt b/app/src/main/java/com/example/zhpan/banner/fragment/PageFragment.kt
index f6c2da1..fdb426e 100644
--- a/app/src/main/java/com/example/zhpan/banner/fragment/PageFragment.kt
+++ b/app/src/main/java/com/example/zhpan/banner/fragment/PageFragment.kt
@@ -2,6 +2,7 @@ package com.example.zhpan.banner.fragment
 
 import android.os.Bundle
 import android.view.View
+import android.widget.Button
 import android.widget.RadioGroup
 import com.blankj.utilcode.util.ToastUtils
 import com.example.zhpan.banner.R
@@ -18,178 +19,187 @@ import com.zhpan.indicator.enums.IndicatorSlideMode
  * Created by zhpan on 2018/7/24.
  */
 class PageFragment : BaseFragment() {
-    private lateinit var mViewPager: BannerViewPager<Int>
-    private lateinit var mRadioGroupPageStyle: RadioGroup
-    private lateinit var mRadioGroupMoreStyle: RadioGroup
-    override val layout: Int
-        get() = R.layout.fragment_find
+  private lateinit var mViewPager: BannerViewPager<Int>
+  private lateinit var mRadioGroupPageStyle: RadioGroup
+  private lateinit var mRadioGroupMoreStyle: RadioGroup
+  override val layout: Int
+    get() = R.layout.fragment_find
 
-    override fun initTitle() {}
-    override fun initView(savedInstanceState: Bundle?, view: View) {
-        mViewPager = view.findViewById(R.id.banner_view)
-        mRadioGroupPageStyle = view.findViewById(R.id.rg_page_style)
-        mRadioGroupMoreStyle = view.findViewById(R.id.rg_more_page_style)
-        initBVP()
-        initRadioGroup()
-        view.findViewById<View>(R.id.rb_multi_page_overlap).performClick()
+  override fun initTitle() {}
+  override fun initView(savedInstanceState: Bundle?, view: View) {
+    mViewPager = view.findViewById(R.id.banner_view)
+    mRadioGroupPageStyle = view.findViewById(R.id.rg_page_style)
+    mRadioGroupMoreStyle = view.findViewById(R.id.rg_more_page_style)
+    view.findViewById<Button>(R.id.btn_next).setOnClickListener {
+      mViewPager.currentItem = mViewPager.currentItem + 1
+      itemClick(mViewPager.currentItem)
     }
+    view.findViewById<Button>(R.id.btn_pre).setOnClickListener {
+      mViewPager.currentItem = mViewPager.currentItem - 1
+      itemClick(mViewPager.currentItem)
+    }
+    initBVP()
+    initRadioGroup()
+    view.findViewById<View>(R.id.rb_multi_page_overlap).performClick()
+  }
 
-    private fun initBVP() {
-        mViewPager.apply {
-            registerLifecycleObserver(lifecycle)
-            adapter = ViewBindingSampleAdapter(resources.getDimensionPixelOffset(dimen.dp_8))
-            setIndicatorSlideMode(IndicatorSlideMode.SCALE)
-            setIndicatorSliderColor(
-                getColor(color.red_normal_color),
-                getColor(color.red_checked_color)
-            )
-            setIndicatorSliderRadius(
-                resources.getDimensionPixelOffset(dimen.dp_4),
-                resources.getDimensionPixelOffset(dimen.dp_5)
-            )
-            setOnPageClickListener ({ _: View, position: Int -> itemClick(position) },true)
-            setInterval(5000)
-        }
+  private fun initBVP() {
+    mViewPager.apply {
+      registerLifecycleObserver(lifecycle)
+      adapter = ViewBindingSampleAdapter(resources.getDimensionPixelOffset(dimen.dp_8))
+      setIndicatorSlideMode(IndicatorSlideMode.SCALE)
+      setIndicatorSliderColor(
+        getColor(color.red_normal_color),
+        getColor(color.red_checked_color)
+      )
+      setIndicatorSliderRadius(
+        resources.getDimensionPixelOffset(dimen.dp_4),
+        resources.getDimensionPixelOffset(dimen.dp_5)
+      )
+        .setAutoPlay(false)
+      setOnPageClickListener({ _: View, position: Int -> itemClick(position) }, true)
+      setInterval(5000)
     }
+  }
 
-    private fun initRadioGroup() {
-        mRadioGroupPageStyle.setOnCheckedChangeListener { _: RadioGroup?, checkedId: Int ->
-            when (checkedId) {
-                R.id.rb_multi_page_overlap ->
-                    setupBanner(
-                        PageStyle.MULTI_PAGE_OVERLAP,
-                        resources.getDimensionPixelOffset(dimen.dp_10)
-                    )
-                R.id.rb_multi_page_overlap1 ->
-                    setupBanner(
-                        PageStyle.MULTI_PAGE_OVERLAP,
-                        resources.getDimensionPixelOffset(dimen.dp_100)
-                    )
-                R.id.rb_multi_page_scale ->
-                    setupBanner(
-                        PageStyle.MULTI_PAGE_SCALE,
-                        resources.getDimensionPixelOffset(dimen.dp_10)
-                    )
-                R.id.rb_multi_scale_page2 ->
-                    setupBanner(
-                        PageStyle.MULTI_PAGE_SCALE,
-                        resources.getDimensionPixelOffset(dimen.dp_120)
-                    )
-                R.id.rb_multi_scale_page3 -> {
-                    setupBanner(
-                        PageStyle.MULTI_PAGE_SCALE,
-                        resources.getDimensionPixelOffset(dimen.dp_0),
-                        resources.getDimensionPixelOffset(dimen.dp_200)
-                    )
-                }
-            }
-        }
-        mRadioGroupMoreStyle.setOnCheckedChangeListener { _: RadioGroup?, checkedId: Int ->
-            when (checkedId) {
-                R.id.rb_multi_page3 ->
-                    setupMultiPageBanner()
-                R.id.rb_multi_page4 ->
-                    setupRightPageReveal()
-                R.id.rb_netease_music_style ->
-                    setNetEaseMusicStyle()
-                R.id.rb_qq_music_style ->
-                    setQQMusicStyle()
-            }
+  private fun initRadioGroup() {
+    mRadioGroupPageStyle.setOnCheckedChangeListener { _: RadioGroup?, checkedId: Int ->
+      when (checkedId) {
+        R.id.rb_multi_page_overlap ->
+          setupBanner(
+            PageStyle.MULTI_PAGE_OVERLAP,
+            resources.getDimensionPixelOffset(dimen.dp_10)
+          )
+        R.id.rb_multi_page_overlap1 ->
+          setupBanner(
+            PageStyle.MULTI_PAGE_OVERLAP,
+            resources.getDimensionPixelOffset(dimen.dp_100)
+          )
+        R.id.rb_multi_page_scale ->
+          setupBanner(
+            PageStyle.MULTI_PAGE_SCALE,
+            resources.getDimensionPixelOffset(dimen.dp_10)
+          )
+        R.id.rb_multi_scale_page2 ->
+          setupBanner(
+            PageStyle.MULTI_PAGE_SCALE,
+            resources.getDimensionPixelOffset(dimen.dp_120)
+          )
+        R.id.rb_multi_scale_page3 -> {
+          setupBanner(
+            PageStyle.MULTI_PAGE_SCALE,
+            resources.getDimensionPixelOffset(dimen.dp_0),
+            resources.getDimensionPixelOffset(dimen.dp_200)
+          )
         }
+      }
     }
-
-    /**
-     * Different page styles can be implement by use [BannerViewPager.setPageStyle] and
-     * [BannerViewPager.setRevealWidth]
-     *
-     * @param pageStyle Optional params [PageStyle.MULTI_PAGE_SCALE] and [PageStyle.MULTI_PAGE_OVERLAP]
-     * @param revealWidth In the multi-page mode, The exposed width of the items on the left and right sides
-     */
-    private fun setupBanner(@APageStyle pageStyle: Int, revealWidth: Int) {
-        setupBanner(pageStyle, revealWidth, revealWidth)
+    mRadioGroupMoreStyle.setOnCheckedChangeListener { _: RadioGroup?, checkedId: Int ->
+      when (checkedId) {
+        R.id.rb_multi_page3 ->
+          setupMultiPageBanner()
+        R.id.rb_multi_page4 ->
+          setupRightPageReveal()
+        R.id.rb_netease_music_style ->
+          setNetEaseMusicStyle()
+        R.id.rb_qq_music_style ->
+          setQQMusicStyle()
+      }
     }
+  }
 
-    private fun setupBanner(
-        @APageStyle pageStyle: Int,
-        leftRevealWidth: Int,
-        rightRevealWidth: Int
-    ) {
-        mViewPager
-            .setPageMargin(resources.getDimensionPixelOffset(dimen.dp_15))
-            .setScrollDuration(800)
-            .setRevealWidth(leftRevealWidth, rightRevealWidth)
-            .setPageStyle(pageStyle)
-            .create(getPicList(4))
-    }
+  /**
+   * Different page styles can be implement by use [BannerViewPager.setPageStyle] and
+   * [BannerViewPager.setRevealWidth]
+   *
+   * @param pageStyle Optional params [PageStyle.MULTI_PAGE_SCALE] and [PageStyle.MULTI_PAGE_OVERLAP]
+   * @param revealWidth In the multi-page mode, The exposed width of the items on the left and right sides
+   */
+  private fun setupBanner(@APageStyle pageStyle: Int, revealWidth: Int) {
+    setupBanner(pageStyle, revealWidth, revealWidth)
+  }
 
-    /**
-     * Multi Page Style 1
-     */
-    private fun setupMultiPageBanner() {
-        mViewPager
-            .setPageMargin(resources.getDimensionPixelOffset(dimen.dp_10))
-            .setRevealWidth(resources.getDimensionPixelOffset(dimen.dp_10))
-            .create(getPicList(4))
-        mViewPager.removeDefaultPageTransformer()
-    }
+  private fun setupBanner(
+    @APageStyle pageStyle: Int,
+    leftRevealWidth: Int,
+    rightRevealWidth: Int
+  ) {
+    mViewPager
+      .setPageMargin(resources.getDimensionPixelOffset(dimen.dp_15))
+      // .setScrollDuration(800)
+      .setRevealWidth(leftRevealWidth, rightRevealWidth)
+      .setPageStyle(pageStyle)
+      .create(getPicList(4))
+  }
 
-    /**
-     * Multi Page Style 2
-     */
-    private fun setupRightPageReveal() {
-        mViewPager
-            .setPageMargin(resources.getDimensionPixelOffset(dimen.dp_10))
-            .setRevealWidth(0, resources.getDimensionPixelOffset(dimen.dp_30))
-            .create(getPicList(4))
-        mViewPager.removeDefaultPageTransformer()
-    }
+  /**
+   * Multi Page Style 1
+   */
+  private fun setupMultiPageBanner() {
+    mViewPager
+      .setPageMargin(resources.getDimensionPixelOffset(dimen.dp_10))
+      .setRevealWidth(resources.getDimensionPixelOffset(dimen.dp_10))
+      .create(getPicList(4))
+    mViewPager.removeDefaultPageTransformer()
+  }
 
-    /**
-     * QQ Music Banner Style
-     */
-    private fun setNetEaseMusicStyle() {
-        mViewPager
-            .setPageMargin(resources.getDimensionPixelOffset(dimen.dp_20))
-            .setRevealWidth(resources.getDimensionPixelOffset(dimen.dp_m_10))
-            .setIndicatorSliderColor(
-                getColor(color.red_normal_color),
-                getColor(color.red_checked_color)
-            )
-            .setOnPageClickListener { view: View?, position: Int ->
-                ToastUtils.showShort(
-                    "position:$position"
-                )
-            }
-            .setInterval(5000).create(getPicList(4))
-        mViewPager.removeDefaultPageTransformer()
-    }
+  /**
+   * Multi Page Style 2
+   */
+  private fun setupRightPageReveal() {
+    mViewPager
+      .setPageMargin(resources.getDimensionPixelOffset(dimen.dp_10))
+      .setRevealWidth(0, resources.getDimensionPixelOffset(dimen.dp_30))
+      .create(getPicList(4))
+    mViewPager.removeDefaultPageTransformer()
+  }
 
-    /**
-     * NetEase Music Banner Style
-     */
-    private fun setQQMusicStyle() {
-        mViewPager
-            .setPageMargin(resources.getDimensionPixelOffset(dimen.dp_15))
-            .setRevealWidth(BannerUtils.dp2px(0f))
-            .setIndicatorSliderColor(
-                getColor(color.red_normal_color),
-                getColor(color.red_checked_color)
-            )
-            .setOnPageClickListener { _: View?, position: Int ->
-                ToastUtils.showShort(
-                    "position:$position"
-                )
-            }
-            .setInterval(5000).create(getPicList(4))
-        mViewPager.removeDefaultPageTransformer()
-    }
+  /**
+   * QQ Music Banner Style
+   */
+  private fun setNetEaseMusicStyle() {
+    mViewPager
+      .setPageMargin(resources.getDimensionPixelOffset(dimen.dp_20))
+      .setRevealWidth(resources.getDimensionPixelOffset(dimen.dp_m_10))
+      .setIndicatorSliderColor(
+        getColor(color.red_normal_color),
+        getColor(color.red_checked_color)
+      )
+      .setOnPageClickListener { view: View?, position: Int ->
+        ToastUtils.showShort(
+          "position:$position"
+        )
+      }
+      .setInterval(5000).create(getPicList(4))
+    mViewPager.removeDefaultPageTransformer()
+  }
 
-    private fun itemClick(position: Int) {
-        ToastUtils.showShort("position:$position")
-    }
+  /**
+   * NetEase Music Banner Style
+   */
+  private fun setQQMusicStyle() {
+    mViewPager
+      .setPageMargin(resources.getDimensionPixelOffset(dimen.dp_15))
+      .setRevealWidth(BannerUtils.dp2px(0f))
+      .setIndicatorSliderColor(
+        getColor(color.red_normal_color),
+        getColor(color.red_checked_color)
+      )
+      .setOnPageClickListener { _: View?, position: Int ->
+        ToastUtils.showShort(
+          "position:$position"
+        )
+      }
+      .setInterval(5000).create(getPicList(4))
+    mViewPager.removeDefaultPageTransformer()
+  }
 
-    companion object {
-        val instance: PageFragment
-            get() = PageFragment()
-    }
+  private fun itemClick(position: Int) {
+    ToastUtils.showShort("position:$position")
+  }
+
+  companion object {
+    val instance: PageFragment
+      get() = PageFragment()
+  }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_find.xml b/app/src/main/res/layout/fragment_find.xml
index 9902aa3..2dc2cd5 100644
--- a/app/src/main/res/layout/fragment_find.xml
+++ b/app/src/main/res/layout/fragment_find.xml
@@ -16,6 +16,25 @@
         app:bvp_indicator_slide_mode="worm"
         app:bvp_page_style="multi_page" />
 
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_horizontal">
+      <Button
+          android:id="@+id/btn_pre"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="@string/pre"/>
+
+      <Button
+          android:id="@+id/btn_next"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="@string/next"
+          />
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
     <TextView
         android:id="@+id/tv_page_style"
         android:layout_width="wrap_content"
@@ -132,8 +151,6 @@
           android:layout_marginTop="@dimen/dp_15"
           android:text="NetEase Music Banner Style"
           android:textSize="@dimen/sp_16" />
-
-
     </RadioGroup>
 
   </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index db8cb4f..df52081 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,4 +43,6 @@
     <string name="wrong_password">密码错误</string>
     <string name="remote_login">您的账号已在其它设备上登录，如非本人操作，请及时修改密码！</string>
   <string name="text_page_style_more">More Page Styles:</string>
+  <string name="next">下一个</string>
+    <string name="pre">上一个</string>
 </resources>
diff --git a/bannerview/src/main/java/com/zhpan/bannerview/BannerViewPager.java b/bannerview/src/main/java/com/zhpan/bannerview/BannerViewPager.java
index 87004b3..926b8c0 100644
--- a/bannerview/src/main/java/com/zhpan/bannerview/BannerViewPager.java
+++ b/bannerview/src/main/java/com/zhpan/bannerview/BannerViewPager.java
@@ -989,19 +989,11 @@ public void setCurrentItem(int item) {
   public void setCurrentItem(int item, boolean smoothScroll) {
     if (isCanLoopSafely()) {
       int pageSize = mBannerPagerAdapter.getListSize();
-      item = item >= pageSize ? pageSize - 1 : item;
+      //item = item >= pageSize ? pageSize - 1 : item;
       int currentItem = mViewPager.getCurrentItem();
       boolean canLoop = mBannerManager.getBannerOptions().isCanLoop();
       int realPosition = BannerUtils.getRealPosition(currentItem, pageSize);
-      if (currentItem != item) {
-        if (item == 0 && realPosition == pageSize - 1) {
-          mViewPager.setCurrentItem(currentItem + 1, smoothScroll);
-        } else if (realPosition == 0 && item == pageSize - 1) {
-          mViewPager.setCurrentItem(currentItem - 1, smoothScroll);
-        } else {
-          mViewPager.setCurrentItem(currentItem + (item - realPosition), smoothScroll);
-        }
-      }
+      mViewPager.setCurrentItem(currentItem + (item - realPosition), smoothScroll);
     } else {
       mViewPager.setCurrentItem(item, smoothScroll);
     }