From 162de5b782c3f22a16d9e190db3de4533893ba9b Mon Sep 17 00:00:00 2001
From: zhujiang2 <zhujiang2@lenovo.com>
Date: Tue, 8 Aug 2023 16:00:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=BD=AE=E6=92=AD=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |  2 +-
 app/src/main/java/com/zj/test/MainActivity.kt |  2 +-
 banner/build.gradle                           |  2 +-
 .../main/java/com/zj/banner/BannerPager.kt    | 62 +++++++++----------
 build.gradle                                  |  2 +-
 5 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index bb3724b..aea1c32 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/src/main/java/com/zj/test/MainActivity.kt b/app/src/main/java/com/zj/test/MainActivity.kt
index 0749323..71bc7ee 100644
--- a/app/src/main/java/com/zj/test/MainActivity.kt
+++ b/app/src/main/java/com/zj/test/MainActivity.kt
@@ -84,7 +84,7 @@ class MainActivity : ComponentActivity(), SensorEventListener {
 
     override fun onDestroy() {
         super.onDestroy()
-        mSensorManager.unregisterListener(this)
+//        mSensorManager.unregisterListener(this)
     }
 
 }
\ No newline at end of file
diff --git a/banner/build.gradle b/banner/build.gradle
index d5dc8b1..d278d37 100644
--- a/banner/build.gradle
+++ b/banner/build.gradle
@@ -17,7 +17,7 @@ afterEvaluate {
                 // You can then customize attributes of the publication as shown below.
                 groupId = 'com.zj.banner'
                 artifactId = 'banner'
-                version = '2.6.3'
+                version = '2.6.5'
             }
 //            // Creates a Maven publication called “debug”.
 //            debug(MavenPublication) {
diff --git a/banner/src/main/java/com/zj/banner/BannerPager.kt b/banner/src/main/java/com/zj/banner/BannerPager.kt
index 57cd97b..e6cb9e3 100644
--- a/banner/src/main/java/com/zj/banner/BannerPager.kt
+++ b/banner/src/main/java/com/zj/banner/BannerPager.kt
@@ -23,12 +23,13 @@ import com.zj.banner.ui.BannerCard
 import com.zj.banner.ui.config.BannerConfig
 import com.zj.banner.utils.HorizontalPagerIndicator
 import com.zj.banner.utils.VerticalPagerIndicator
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import java.util.*
 import kotlin.math.absoluteValue
 
 private const val TAG = "BannerPager"
-private const val FAKE_BANNER_SIZE = 100
 
 /**
  * 新增一个 Banner，最简单的情况下只需传入数据即可，如果需要更多样式请查看下面参数。
@@ -53,18 +54,20 @@ fun <T : BaseBannerBean> BannerPager(
         throw NullPointerException("items is not null")
     }
     val size = items.size
+
+    val loopingCount = Int.MAX_VALUE
+    var startIndex = loopingCount / 2
+    startIndex -= startIndex % size
     val pagerState = rememberPagerState(
-        initialPage = 0,
+        initialPage = startIndex,
         initialPageOffsetFraction = 0f
     ) {
-        FAKE_BANNER_SIZE
+        loopingCount
     }
 
-    if (config.repeat) {
-        StartBanner(pagerState, config.intervalTime)
+    fun pageMapper(index: Int): Int {
+        return (index - startIndex).floorMod(size)
     }
-    val coroutineScope = rememberCoroutineScope()
-
     Box(modifier = modifier) {
         HorizontalPager(
             modifier = Modifier,
@@ -115,18 +118,24 @@ fun <T : BaseBannerBean> BannerPager(
             }
         )
 
-        LaunchedEffect(key1 = pagerState) {
-            var position: Int = pagerState.currentPage
-            Log.d(TAG, "finish update before, position=$position")
-            if (position == 0) {
-                position = size
-                coroutineScope.launch {
-                    pagerState.scrollToPage(position)
-                }
-            } else if (position == FAKE_BANNER_SIZE - 1) {
-                position = size - 1
-                coroutineScope.launch {
-                    pagerState.scrollToPage(position)
+        if (config.repeat) {
+            LaunchedEffect(key1 = pagerState) {
+                try {
+                    while (true) {
+                        delay(config.intervalTime)
+                        val current = pagerState.currentPage
+                        val currentPos = pageMapper(current)
+                        val nextPage = current + 1
+                        val toPage = nextPage.takeIf { nextPage < pagerState.pageCount }
+                            ?: (currentPos + startIndex + 1)
+                        if (toPage > current) {
+                            pagerState.animateScrollToPage(toPage)
+                        } else {
+                            pagerState.scrollToPage(toPage)
+                        }
+                    }
+                } catch (e: CancellationException) {
+                    Log.i("page", "Launched paging cancelled")
                 }
             }
         }
@@ -152,16 +161,7 @@ fun <T : BaseBannerBean> BannerPager(
     }
 }
 
-@Composable
-fun StartBanner(pagerState: PagerState, intervalTime: Long) {
-    val coroutineScope = rememberCoroutineScope()
-    val timer = Timer()
-    val timerTask = object : TimerTask() {
-        override fun run() {
-            coroutineScope.launch {
-                pagerState.animateScrollToPage((pagerState.currentPage + 1) % pagerState.pageCount)
-            }
-        }
-    }
-    timer.schedule(timerTask, intervalTime, intervalTime)
+private fun Int.floorMod(other: Int): Int = when (other) {
+    0 -> this
+    else -> this - floorDiv(other) * other
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 5b52081..a398bc1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'com.android.tools.build:gradle:8.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong