From 83e4cfc62996707fe1540d77ce7a98e0e4d56a8c Mon Sep 17 00:00:00 2001 From: huangjian Date: Tue, 7 Mar 2023 14:59:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=AF=B9UI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/home/adapter/RoomCommonAdapter.kt | 18 ++- .../drawable-xhdpi/bg_home_common_item0.png | Bin 0 -> 7711 bytes .../drawable-xhdpi/bg_home_common_item1.png | Bin 0 -> 8298 bytes .../drawable-xhdpi/bg_home_common_item2.png | Bin 0 -> 8959 bytes .../res/drawable-xhdpi/ic_home_hot_hot.png | Bin 1367 -> 650 bytes app/src/main/res/layout/item_room_common.xml | 116 +++++++++--------- .../nnbc123/core/initial/InitialModel.java | 2 +- 7 files changed, 70 insertions(+), 66 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/bg_home_common_item0.png create mode 100644 app/src/main/res/drawable-xhdpi/bg_home_common_item1.png create mode 100644 app/src/main/res/drawable-xhdpi/bg_home_common_item2.png 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 0000000000000000000000000000000000000000..b657ee23f18cbeb8eb0a5ded48f8797a9166dfb5 GIT binary patch literal 7711 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 literal 0 HcmV?d00001 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 bb35f2b04f3f9b9cd9d1a5a2cebf09eb859af439..31d630fe572c41d879aee804be930fd50e955370 100644 GIT binary patch literal 650 zcmV;50(Jd~P)Px%L`g(JR7gv;l}%_9Q51#Gz3ViwMtMl)l#Wa6{FPjPoxPA!|3PPknw3m9%j0c4T19aaQ z1oJ@%2Ba8+q3cL>PX~ec0(7TZg7D&TNLp?K>{~phiyiI%2XL;uz@LUAi52AF#2)X}p#`D7E`hDPaSH0=g+1?ZD~ix9?Z2-=ks zw?uOh*)e^_^h6!1)}$c$3%-S7q@q8a5O=`&+XE1E2%Oz*fpG5KBn;65qC2)DDH0Tq zb@>AHg}aU5^v9xD>*ihw%9?jqZI9LuJH!kyq|{1+IEk{3p7K!_bu}V-0Gi!;H70cn56A{R(b;x z1MeVsYnlJx4Q<)k>G+3!Bq7nR{dTMH# z_XJprdgyr#B)x~=6$Sm^teX7u6gb^LksV)s8}080did3Pg!ly{Z*ZMO`R@J%nvc1O zTUwsuS}P?Hi5!4LJD3|F+04S`Am{@O8pPPtGm5$oI$yv-yE>UPP+eUGGoz6)zdN%o kHMV^Z9KU(*w_b6;Z`ikq8L~#ds{jB107*qoM6N<$g7y|8%K!iX literal 1367 zcmV-d1*rOoP)Px)5lKWrR9HvFmTQPrRTRhnYwvyU%zaJfV49H-DSnXZgJK$eNNL8R#O8x0J*N~? zw0w|RS=qx6DN>DElM~J)f`pPL6<&u*5y=!1{Zx?@K~GVex$pDXd&N3e2McxPj*|Ow zFZbMY?q0w3U;nkvAzbA}S2;dv1_*aQG@DFpoW5_%%U1%vW&qyRI>hSW6ep5db1k*d zgpS~HKxzh%V0OMN5%K`{LnYk07mT2%;2l72ou>_P$fbWAPU@{3L z6F@8mXkCpbDumW4_Que|U;K0-h<+8YJ6o1B)LKxr<|K|Um4QMYC>HwwkWPaeGN5=J zV5$IY#Ul>ng2lRZ-};&Xc-uXbt%)CiQiep*Fa&uOP@w?i&jLsZB;!mPoM`|O_0?lZ zO^j$64Blww9(cNDfM9F$_oU6(YW89}$-V>>1)u=P_b>#E0Vh)t1X4*cBLtX3=@0?H zA+zYn9W?=P$DL2wSbTF7oEhZ8NN$q4=Zk=-Q1L|Q0LCaJ6B_9hkPshez%dYY35z0s zsAb1T)&vl4oOBpkO^h;kHX1q<29fhoC|0xg0!Av;jF@Tw(Z`Vqr5lt2WB^m zAOM)aiIi1u{&tpZpa8Gj6i_Z_O)pEeXW)dUd9Iyat0#h(_*+UFKxTvI=aHk5xoe?$9h<1>^mw~=%SOXR9$ z5Hmf9h1XFBF8K6($x+OUk|U8XABE-NeZh<>(T6Ve-)!89>$B+1Pm2bXC{SIDxSma& zcKe00m*4um7w{ZRM1Zg0Pz`FdMaHIR1EfEzQC2qIz?As~r_X4TDJcL1A8{<8&FH*X z@Bslt0Ty5^%2)$S_j6sn=2YD(-PZH^xsC1WG3}^?^Xc>{P^stvt`i!osT03nD)@i_ z`Z8_B5Txr{Typ3r + 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 ),