From 9fbb12819fd1cf0bc6457c21be126119e7e3e70b Mon Sep 17 00:00:00 2001 From: lzl <1239365383@qq.com> Date: Wed, 7 Jan 2026 19:25:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=92=E5=90=A7=20=E6=92=A9=E5=A5=B9?= =?UTF-8?q?=E5=8A=A8=E7=94=BB=E6=92=AD=E6=94=BE=20and=20setTime=20?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xscm/moduleutil/widget/BaseWheatView.java | 18 +++-------------- .../activity/room/fragment/RoomPubFragment.kt | 10 ++++++++++ .../modulemain/widget/RoomPubWheatView.kt | 20 +++++++------------ .../src/main/res/layout/fragment_pub_room.xml | 1 + .../main/res/layout/layout_room_pub_wheat.xml | 2 +- 5 files changed, 22 insertions(+), 29 deletions(-) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java index 756fea8c..0a91c246 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java @@ -50,7 +50,7 @@ import java.net.URL; public abstract class BaseWheatView extends ConstraintLayout implements IBaseWheat { public ImageView mRiv; - public ImageView mIvGift; + public WheatCharmView mCharmView; public TextView mTvName; public ImageView mIvSex; @@ -73,9 +73,6 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe public static final String WHEAT_HOST = "9";//主持位 - public float oX; - public float oY; - boolean closePhone = false;//自己麦位关闭话筒，用于判断声纹显示 public String pitNumber; @@ -105,7 +102,7 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe super(context, attrs, defStyleAttr); inflate(context, getLayoutId(), this); mRiv = findViewById(R.id.riv); - mIvGift = findViewById(R.id.iv_gift); +// mIvGift = findViewById(R.id.iv_gift); mCharmView = findViewById(R.id.charm_view); mTvName = findViewById(R.id.tv_name); mIvSex = findViewById(R.id.iv_sex); @@ -122,8 +119,6 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe tv_zhul = findViewById(R.id.tv_zhul); setClipChildren(false); setClipToPadding(false); - oX = mIvGift.getX(); - oY = mIvGift.getY(); initPit(context, attrs); } @@ -505,14 +500,7 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe @Subscribe(threadMode = ThreadMode.MAIN) @Override public void showGift(RoomGiveGiftModel.GiftListBean listBean) { - if (!showGiftAnim) { - mIvGift.setVisibility(GONE); - return; - } - if (listBean.getUser_id() == null || !listBean.getUser_id().equals(pitBean.getUser_id())) { - return; - } - WheatGiftAnim.addGift(mIvGift, listBean.getPicture()); + } /** diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPubFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPubFragment.kt index 32a524d5..26819677 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPubFragment.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPubFragment.kt @@ -125,6 +125,10 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) : val bean = mRoomInfoResp?.room_info?.pit_list!![indexList[idx].toInt() - 1] view.setData(bean) + if (idx == 0 && mUserInfo?.user_id.toString() == bean.user_id) { + mBinding.ivSetTime.visibility = View.VISIBLE + } + if (idx != 0 && idx != 1) { if (!TextUtils.isEmpty(bean.user_id) && !bean.user_id.equals("0")) { startTimer(bean.end_time.toLong()) @@ -308,12 +312,18 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) : fun event1003(messageEvent: RoomMessageEvent) { val pitNumber = messageEvent.text.pit_number + if (indexList.contains(pitNumber)) { val viewPos = indexList.indexOf(pitNumber) val pitBean = mRoomInfoResp?.room_info?.pit_list!![pitNumber.toInt() - 1] pitBean.end_time = messageEvent.text.end_time viewList[viewPos].setData(pitBean) + + if (mUserInfo?.user_id.toString() == pitBean.user_id) { + mBinding.ivSetTime.visibility = View.VISIBLE + } } + startTimer(messageEvent.text.end_time.toLong()) } diff --git a/MainModule/src/main/java/com/xscm/modulemain/widget/RoomPubWheatView.kt b/MainModule/src/main/java/com/xscm/modulemain/widget/RoomPubWheatView.kt index 4e22583a..94bec01e 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/widget/RoomPubWheatView.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/widget/RoomPubWheatView.kt @@ -2,7 +2,6 @@ package com.xscm.modulemain.widget import android.content.Context import android.content.res.TypedArray -import android.media.Image import android.text.TextUtils import android.util.AttributeSet import android.view.View @@ -15,7 +14,6 @@ import com.xscm.moduleutil.utils.ImageUtils import com.xscm.moduleutil.utils.SpUtil import com.xscm.moduleutil.widget.AvatarFrameView import com.xscm.moduleutil.widget.BaseWheatView -import com.xscm.moduleutil.widget.WheatGiftAnim class RoomPubWheatView : BaseWheatView { constructor(context: Context?) : super(context) @@ -35,10 +33,11 @@ class RoomPubWheatView : BaseWheatView { private var hostTv: TextView? = null private var tv_time: TextView? = null private var ll_bottom: LinearLayout? = null - private var iv_gift: ImageView? = null + private var iv_gift: AvatarFrameView? = null var ivYueT: ImageView? = null var ivLiaoT: ImageView? = null + override fun initPit(context: Context, attrs: AttributeSet) { var typedArray: TypedArray? = null try { @@ -77,10 +76,6 @@ class RoomPubWheatView : BaseWheatView { this.pitNumber = number } - fun setHostTv(hostTv: TextView) { - this.hostTv = hostTv - } - public override fun setPitData(bean: RoomPitBean) { pitBean = bean // 统一使用参数 bean stopAndClearAnimation() // 清理之前的动画资源 @@ -103,7 +98,7 @@ class RoomPubWheatView : BaseWheatView { else -> { tv_time?.visibility = View.INVISIBLE - ll_bottom?.visibility = View.GONE + ll_bottom?.visibility = View.INVISIBLE iv_custom_gift?.visibility = View.GONE } } @@ -121,10 +116,9 @@ class RoomPubWheatView : BaseWheatView { fun setSex(value: String?, format: Boolean) { mCharmView.setSex("", "", value, format) } - - fun setPitGift(giftPlayString: String) { - mIvGift?.visibility = VISIBLE - WheatGiftAnim.addGift(mIvGift, giftPlayString); + fun setPitGift(giftPlayString: String){ + iv_gift?.visibility=VISIBLE + iv_gift?.setSource(giftPlayString, 2) } private fun handleOnState(bean: RoomPitBean) { @@ -155,7 +149,7 @@ class RoomPubWheatView : BaseWheatView { private val pitNumberText: String get() { - return "虚位以待" + return pitNumber+"号麦" } private fun handleOffState(bean: RoomPitBean) { diff --git a/MainModule/src/main/res/layout/fragment_pub_room.xml b/MainModule/src/main/res/layout/fragment_pub_room.xml index bef0d8b5..97c6f06f 100644 --- a/MainModule/src/main/res/layout/fragment_pub_room.xml +++ b/MainModule/src/main/res/layout/fragment_pub_room.xml @@ -15,6 +15,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_30" + android:visibility="gone" android:src="@mipmap/icon_left_set_time" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/MainModule/src/main/res/layout/layout_room_pub_wheat.xml b/MainModule/src/main/res/layout/layout_room_pub_wheat.xml index 00bacb9d..d43c3588 100644 --- a/MainModule/src/main/res/layout/layout_room_pub_wheat.xml +++ b/MainModule/src/main/res/layout/layout_room_pub_wheat.xml @@ -60,7 +60,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_percent="0.6" /> -