From 39a9e277bd56daa5e2b3ba9ca32358c7c274dddf Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Tue, 21 Nov 2023 11:08:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=88=BF=E9=97=B4?=
 =?UTF-8?q?=E8=BD=AE=E5=8D=9A=E7=B4=A2=E5=BC=95=E4=B8=8D=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yizhuan/habu/home/adapter/RoomActAdapter.kt     | 5 ++++-
 .../ui/webview/room_banner/RoomBannerWebDialogActivity.kt    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.kt b/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.kt
index c9c9b5cc2..20a749239 100644
--- a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.kt
+++ b/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.kt
@@ -62,7 +62,10 @@ class RoomActAdapter(private val mContext: Context, private val data: List<Banne
                     val list = data.filterList {
                         skipType == 3
                     }
-                    RoomBannerWebDialogActivity.start(mContext, position, list)
+                    val newPosition = list.indexOfFirst {
+                        it == bannerInfo
+                    }
+                    RoomBannerWebDialogActivity.start(mContext, newPosition, list)
                 } else {
                     CommonJumpHelper.bannerJump(mContext, bannerInfo)
                 }
diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerWebDialogActivity.kt b/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerWebDialogActivity.kt
index 0a03f4f6a..00ffb7c99 100644
--- a/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerWebDialogActivity.kt
+++ b/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerWebDialogActivity.kt
@@ -49,7 +49,7 @@ class RoomBannerWebDialogActivity : CommonWebViewActivity() {
         window.setGravity(Gravity.BOTTOM)
         webView.setBackgroundColor(Color.parseColor("#C9CBD1"))
         recyclerView = findViewById(R.id.recyclerView)
-        val position = intent.getIntExtra("position", 0)
+        val position = 0.coerceAtLeast(intent.getIntExtra("position", 0))
         val list = intent.getSerializableExtra("list") as? ArrayList<BannerInfo>
 //        if ((list?.size ?: 0) <= 1) {
 //            recyclerView?.isVisible = false