Merge branch 'habu_3.3.1/optimize' into habu_3.3.1/test

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)
                 }

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