moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Max
2023-11-21 11:08:56 +08:00
parent b11b6928c5 39a9e277bd
commit 034185d13b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.kt
View File

@@ -62,7 +62,10 @@ class RoomActAdapter(private val mContext: Context, private val data: List<Banne
val list = data.filterList { val list = data.filterList {
skipType == 3 skipType == 3
} }
RoomBannerWebDialogActivity.start(mContext, position, list) val newPosition = list.indexOfFirst {
it == bannerInfo
}
RoomBannerWebDialogActivity.start(mContext, newPosition, list)
} else { } else {
CommonJumpHelper.bannerJump(mContext, bannerInfo) CommonJumpHelper.bannerJump(mContext, bannerInfo)
} }

2
app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerWebDialogActivity.kt
View File

@@ -49,7 +49,7 @@ class RoomBannerWebDialogActivity : CommonWebViewActivity() {
window.setGravity(Gravity.BOTTOM) window.setGravity(Gravity.BOTTOM)
webView.setBackgroundColor(Color.parseColor("#C9CBD1")) webView.setBackgroundColor(Color.parseColor("#C9CBD1"))
recyclerView = findViewById(R.id.recyclerView) 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> val list = intent.getSerializableExtra("list") as? ArrayList<BannerInfo>
// if ((list?.size ?: 0) <= 1) { // if ((list?.size ?: 0) <= 1) {
// recyclerView?.isVisible = false // recyclerView?.isVisible = false