diff --git a/app/src/main/java/com/nnbc123/app/home/adapter/RoomCommonAdapter.kt b/app/src/main/java/com/nnbc123/app/home/adapter/RoomCommonAdapter.kt index 2eb76d2ff..4149a719e 100644 --- a/app/src/main/java/com/nnbc123/app/home/adapter/RoomCommonAdapter.kt +++ b/app/src/main/java/com/nnbc123/app/home/adapter/RoomCommonAdapter.kt @@ -1,5 +1,6 @@ package com.nnbc123.app.home.adapter +import android.view.View import android.widget.ImageView import androidx.core.view.isGone import com.chad.library.adapter.base.BaseQuickAdapter @@ -11,27 +12,36 @@ import com.nnbc123.core.home.bean.HomeRoomInfo import com.nnbc123.core.utils.TextUtils -class RoomCommonAdapter : BaseQuickAdapter(R.layout.item_room_common) { - +class RoomCommonAdapter : + BaseQuickAdapter(R.layout.item_room_common) { override fun convert(helper: BaseViewHolder, item: HomeRoomInfo) { helper.apply { getView(R.id.iv_room_image).load(item.avatar) setText(R.id.tv_online_number, "${item.onlineNum}") setText(R.id.tv_room_title, item.title) - setText(R.id.tv_id, "ID:${item.erbanNo}") } helper.setVisible(R.id.tv_in_pk, item.isCrossPking) helper.setVisible(R.id.iv_room_tag, !TextUtils.isEmptyText(item.tagPict)) ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_room_tag), item.tagPict) + helper.getView(R.id.view_bg).setBackgroundResource( + when (helper.layoutPosition % 3) { + 0 -> R.drawable.bg_home_common_item0 + 1 -> R.drawable.bg_home_common_item1 + else -> R.drawable.bg_home_common_item2 + } + ) + val avatars: Array = arrayOf( helper.getView(R.id.iv_avatar_0), helper.getView(R.id.iv_avatar_1), helper.getView(R.id.iv_avatar_2), helper.getView(R.id.iv_avatar_3), - helper.getView(R.id.iv_avatar_4) + helper.getView(R.id.iv_avatar_4), + helper.getView(R.id.iv_avatar_5) ) + for (i in avatars.indices) { val avatarUrl = item.micUsers?.getOrNull(i)?.avatar avatars[i].isGone = avatarUrl.isNullOrBlank() diff --git a/app/src/main/res/drawable-xhdpi/bg_home_common_item0.png b/app/src/main/res/drawable-xhdpi/bg_home_common_item0.png new file mode 100644 index 000000000..b657ee23f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_home_common_item0.png differ diff --git a/app/src/main/res/drawable-xhdpi/bg_home_common_item1.png b/app/src/main/res/drawable-xhdpi/bg_home_common_item1.png new file mode 100644 index 000000000..20661db65 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_home_common_item1.png differ diff --git a/app/src/main/res/drawable-xhdpi/bg_home_common_item2.png b/app/src/main/res/drawable-xhdpi/bg_home_common_item2.png new file mode 100644 index 000000000..a98e26105 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_home_common_item2.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_home_hot_hot.png b/app/src/main/res/drawable-xhdpi/ic_home_hot_hot.png index bb35f2b04..31d630fe5 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_home_hot_hot.png and b/app/src/main/res/drawable-xhdpi/ic_home_hot_hot.png differ diff --git a/app/src/main/res/layout/item_room_common.xml b/app/src/main/res/layout/item_room_common.xml index 19d5111d2..a9c7a8a51 100644 --- a/app/src/main/res/layout/item_room_common.xml +++ b/app/src/main/res/layout/item_room_common.xml @@ -4,28 +4,32 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="12dp" - android:layout_marginTop="5dp" - android:layout_marginEnd="10dp"> + android:layout_marginStart="15dp" + android:layout_marginTop="6dp" + android:layout_marginEnd="15dp" + android:layout_marginBottom="6dp"> - - - - - - + android:layout_marginTop="6dp" + android:orientation="horizontal" + app:layout_constraintBottom_toBottomOf="@id/view_bg" + app:layout_constraintStart_toStartOf="@id/tv_room_title" + app:layout_constraintTop_toBottomOf="@id/iv_room_tag"> - + + + \ No newline at end of file diff --git a/core/src/main/java/com/nnbc123/core/initial/InitialModel.java b/core/src/main/java/com/nnbc123/core/initial/InitialModel.java index a3bac25d0..29f342052 100644 --- a/core/src/main/java/com/nnbc123/core/initial/InitialModel.java +++ b/core/src/main/java/com/nnbc123/core/initial/InitialModel.java @@ -155,7 +155,7 @@ public class InitialModel extends BaseModel implements IInitialModel { new MainTabInfo( "", "", - "广场", + "动态", MainTabType.TAB_TYPE_SQUARE, null ),