From 276bd4ba4e87686a5a1cae488833d6c0529484ee Mon Sep 17 00:00:00 2001 From: huangjian Date: Wed, 3 Aug 2022 16:45:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E6=92=AD=E5=8D=A1=E7=89=87bugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yizhuan/erban/MainActivity.java | 1 + .../yizhuan/erban/home/widget/AnchorCardView.kt | 16 ++++++++++++---- .../main/res/layout/layout_anchor_card_view.xml | 15 +++++++++++---- .../xchat_android_core/room/bean/AnchorInfo.kt | 2 +- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index ce0856f6b..ead9a7bb4 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -344,6 +344,7 @@ public class MainActivity extends BaseMvpActivity .observeOn(AndroidSchedulers.mainThread()) .subscribe(aLong -> EventBus.getDefault().post(new RefreshHomeDataEvent())); + homeViewModel.requestAnchorInfo(); homeViewModel.getAnchorInfoLiveData().observe(this, anchorInfo -> { if (anchorInfo != null) { anchorCardView.setAnchorInfo(anchorInfo); diff --git a/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt b/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt index a2cbb1e2f..ba3f1f7be 100644 --- a/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt +++ b/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt @@ -24,6 +24,7 @@ import com.yizhuan.erban.audio.helper.AudioPlayerHelper import com.yizhuan.erban.audio.helper.OnPlayListener import com.yizhuan.erban.avroom.activity.AVRoomActivity import com.yizhuan.erban.databinding.LayoutAnchorCardViewBinding +import com.yizhuan.erban.ui.user.UserInfoActivity import com.yizhuan.erban.ui.user.decorationsend.UserInfoSkillDecoration import com.yizhuan.erban.ui.utils.load import com.yizhuan.erban.ui.utils.loadAvatar @@ -32,6 +33,7 @@ import com.yizhuan.xchat_android_core.statistic.StatisticManager import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol import com.yizhuan.xchat_android_core.user.bean.UserInfo import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity +import com.yizhuan.xchat_android_core.utils.subAndReplaceDot import com.yizhuan.xchat_android_library.utils.ListUtils import com.yizhuan.xchat_android_library.utils.SingleToastUtil import io.reactivex.Observable @@ -61,7 +63,7 @@ class AnchorCardView @JvmOverloads constructor( LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT) ) binding.recyclerviewSkillCard.adapter = object : - BaseQuickAdapter(R.layout.item_userinfo_skill_abspicture) { + BaseQuickAdapter(R.layout.item_anchor_card_skill_abspicture) { override fun convert(helper: BaseViewHolder, item: String) { helper.getView(R.id.iv_skill_picture).load(item) } @@ -87,8 +89,11 @@ class AnchorCardView @JvmOverloads constructor( ) initVoiceShow(it.voiceCard) binding.ivAvatar.loadAvatar(it.avatar) - binding.tvNick.text = it.nick - binding.tvSignature.text = it.signture + binding.ivAvatar.setOnClickListener { _ -> + UserInfoActivity.Companion.start(context, it.uid) + } + binding.tvNick.text = it.nick.subAndReplaceDot(7) + binding.tvSignature.text = it.userDesc if (it.gender == UserInfo.GENDER_MALE) { binding.ivGender.setImageResource(R.drawable.ic_gender_male) } else { @@ -96,6 +101,8 @@ class AnchorCardView @JvmOverloads constructor( } binding.tvGoRoom.setOnClickListener { _ -> AVRoomActivity.start(context, it.uid) + isVisible = false + stopAudio() StatisticManager.Instance() .onEvent( StatisticsProtocol.EVENT_PERSONALSHOW_TOP_CARD_ROOM_CLICK, @@ -114,11 +121,12 @@ class AnchorCardView @JvmOverloads constructor( @SuppressLint("SetTextI18n") private fun intervalRange() { disposable?.dispose() + val finalCount = count disposable = Observable.intervalRange(0, count + 1, 0, 1, TimeUnit.SECONDS) .observeOn(AndroidSchedulers.mainThread()) .doOnNext { aLong -> count -= 1 - binding.tvTime.text = "剩余${10 - aLong}s" + binding.tvTime.text = "剩余${finalCount - aLong}s" } .doOnComplete { if (!audioPlaying) isVisible = false diff --git a/app/src/main/res/layout/layout_anchor_card_view.xml b/app/src/main/res/layout/layout_anchor_card_view.xml index f1bbf4d81..90dfe3cdb 100644 --- a/app/src/main/res/layout/layout_anchor_card_view.xml +++ b/app/src/main/res/layout/layout_anchor_card_view.xml @@ -50,22 +50,29 @@ android:layout_width="0dp" android:layout_height="14dp" android:layout_marginLeft="12dp" + android:layout_marginEnd="6dp" android:layout_marginRight="12dp" + android:requiresFadingEdge="horizontal" app:layout_constraintBottom_toBottomOf="@id/tv_nick" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@id/tv_time" app:layout_constraintStart_toEndOf="@id/tv_nick" app:layout_constraintTop_toTopOf="@id/tv_nick" /> + tools:text="用户签名，就这就这样吧巴啦啦就这样吧巴啦啦样吧巴啦啦…" /> - diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/AnchorInfo.kt b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/AnchorInfo.kt index 31b634ed0..4ae5a8d7a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/AnchorInfo.kt +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/AnchorInfo.kt @@ -8,7 +8,7 @@ data class AnchorInfo( val erbanNo: Int = 0, val gender: Int = 0, val nick: String = "", - val signture: String = "", + val userDesc: String = "", val uid: Long = 0, val voiceCard: UserInfoSkillEntity? = null ) \ No newline at end of file