yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BugFix]修复线上bug

Browse Source
This commit is contained in:
wushaocheng
2023-06-01 16:18:36 +08:00
parent 3e07b3d9d7
commit ce93e02d8a
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyFragment.kt
View File

@@ -372,7 +372,7 @@ class HomePartyFragment : BaseFragment(), View.OnClickListener, OnShareDialogIte
if (AvRoomDataManager.get().isRoomFans) ContextCompat.getColor(
mContext,
R.color.white
) else ContextCompat.getColor(mContext, R.color.color_FFE285)
) else ContextCompat.getColor(mContext, R.color.white)
)
binding.tvFollowRoom.setBackgroundResource(if (AvRoomDataManager.get().isRoomFans) R.drawable.bg_room_follow_room_collected else R.drawable.bg_room_follow_room)
var tempFragment = roomFragment

21
app/src/main/java/com/nnbc123/app/home/adapter/RoomNewFriendsAdapter.kt
View File

@@ -3,13 +3,13 @@ package com.nnbc123.app.home.adapter
import android.view.View
import android.widget.ImageView
import android.widget.TextView
import androidx.appcompat.widget.AppCompatImageView
import androidx.core.view.isInvisible
import androidx.core.view.isVisible
import androidx.recyclerview.widget.RecyclerView
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.nnbc123.app.R
import com.nnbc123.app.avroom.activity.AVRoomActivity
import com.nnbc123.app.bills.widget.BillItemView
import com.nnbc123.app.ui.im.avtivity.NimP2PMessageActivity
import com.nnbc123.app.ui.user.UserInfoActivity
import com.nnbc123.app.ui.utils.loadAvatar
@@ -23,7 +23,8 @@ import com.opensource.svgaplayer.SVGAImageView
import java.util.*
class RoomNewFriendsAdapter : BaseQuickAdapter<UserInfo, BaseViewHolder>(R.layout.item_room_new_friends) {
class RoomNewFriendsAdapter :
BaseQuickAdapter<UserInfo, BaseViewHolder>(R.layout.item_room_new_friends) {
override fun convert(helper: BaseViewHolder, item: UserInfo) {
@@ -46,21 +47,24 @@ class RoomNewFriendsAdapter : BaseQuickAdapter<UserInfo, BaseViewHolder>(R.layou
if (item.gender == 1) R.drawable.ic_home_man else R.drawable.ic_home_woman
)
val tvOnlineText = helper.getView<TextView>(R.id.tv_online_text)
val ivTalk = helper.getView<AppCompatImageView>(R.id.iv_talk)
val svgaLiving = helper.getView<SVGAImageView>(R.id.svga_living)
val llOnline = helper.getView<View>(R.id.ll_online)
val viewOnline = helper.getView<View>(R.id.view_online)
if (item.inRoomUid != 0L) {
ivTalk.isVisible = false
svgaLiving.isVisible = true
viewOnline.isVisible = true
tvOnlineText.text = "直播中"
svgaLiving.loadFromAssets("svga/home_living.svga")
tvOnlineText.text = "直播中"
llOnline.setOnClickListener {
AVRoomActivity.start(mContext, item.inRoomUid)
}
} else {
ivTalk.isVisible = true
svgaLiving.isVisible = false
viewOnline.isVisible = false
svgaLiving.setImageResource(R.drawable.ic_new_friends_msg)
tvOnlineText.text = "和TA聊"
llOnline.setOnClickListener {
NimP2PMessageActivity.start(mContext, item.uid.toString())
@@ -76,15 +80,12 @@ class RoomNewFriendsAdapter : BaseQuickAdapter<UserInfo, BaseViewHolder>(R.layou
VipHelper.loadVipNickColor(tvNickname, item.userVipInfoVO, "#282828")
VipHelper.loadVipIcon(helper.getView(R.id.iv_vip_icon), item.userVipInfoVO)
}
override fun onViewAttachedToWindow(holder: BaseViewHolder) {
super.onViewAttachedToWindow(holder)
val svgaLiving = holder.getView<SVGAImageView>(R.id.svga_living)
svgaLiving?.loadFromAssets("svga/home_living.svga")
}
}

10
app/src/main/res/layout/item_room_new_friends.xml
View File

@@ -138,6 +138,14 @@
app:layout_constraintEnd_toEndOf="@id/view_bg"
app:layout_constraintTop_toTopOf="@id/view_bg">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_talk"
android:layout_width="20dp"
android:layout_height="18dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_new_friends_msg"
android:visibility="gone" />
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/svga_living"
android:layout_width="20dp"
@@ -152,7 +160,7 @@
android:includeFontPadding="false"
android:text="直播中"
android:textColor="#ffbdbfd0"
android:textSize="10sp" />
android:textSize="@dimen/sp_11" />
</LinearLayout>