From 9dd36190492416ef007707d9b8e7da3fc2fe84fc Mon Sep 17 00:00:00 2001 From: Martin <13046765170@163.com> Date: Thu, 4 Jul 2024 13:16:48 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=85=A8=E6=9C=8D=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E3=80=90=E5=9B=B4=E8=A7=82=E3=80=91?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../live/presenter/LiveGiftAnimPresenter.java | 24 ++++++++++++++----- live/src/main/res/layout/view_live_room.xml | 1 + 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java index 8d6eb1361..9492c8927 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java @@ -1086,7 +1086,11 @@ public class LiveGiftAnimPresenter { mGifGiftTipGroupAllServer.setAlpha(1f); mGifGiftTipGroupAllServer.setVisibility(View.VISIBLE); textRender.render(mContext, mGifGiftTipAllServer, mTempGifGiftBean.getGiftIcon(), mTempGifGiftBean.getUserNiceName(), mAncherName, mTempGifGiftBean.getGiftName(), 1, mWindowManager, ""); - mIvLook.setVisibility(View.VISIBLE); + if(CommonAppConfig.getInstance().getUid().equals(mLiveUid)){ + mIvLook.setVisibility(View.GONE); + }else{ + mIvLook.setVisibility(View.VISIBLE); + } mIvLook.setTag(bean); mIvLook.setVisibility(mLiveUid.equals(bean.getUid())?View.GONE:View.VISIBLE); mGifGiftTipShowAnimatorAllServer.start(); @@ -1132,7 +1136,11 @@ public class LiveGiftAnimPresenter { break; } mIvLook.setText(R.string.participate_in); - mIvLook.setVisibility(View.VISIBLE); + if(CommonAppConfig.getInstance().getUid().equals(mLiveUid)){ + mIvLook.setVisibility(View.GONE); + }else{ + mIvLook.setVisibility(View.VISIBLE); + } superNotice.setBackgroundResource(R.mipmap.icon_blind_box_headlines); textRender.blindBoxText(mContext, mGifGiftTipAllServer, serverNotifyEvent); } @@ -1223,10 +1231,10 @@ public class LiveGiftAnimPresenter { int unameSize = textMsg.length(); builder.setSpan(new ForegroundColorSpan(Color.parseColor(dto.getColour())), unameIndexOf, unameIndexOf + unameSize, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); } - if (!showB) { + if (!showB ||CommonAppConfig.getInstance().getUid().equals(mLiveUid)) { iv_look_full_service_notice_new3.setVisibility(View.GONE); } else { - if (TextUtils.equals(event.getJumpType(), "0")) { + if (TextUtils.equals(event.getJumpType(), "0")||CommonAppConfig.getInstance().getUid().equals(mLiveUid)) { iv_look_full_service_notice_new3.setVisibility(View.GONE); } else { iv_look_full_service_notice_new3.setVisibility(View.VISIBLE); @@ -1316,8 +1324,12 @@ public class LiveGiftAnimPresenter { if (!TextUtils.isEmpty(event.getIsOnlookers()) && TextUtils.equals("0", event.getIsOnlookers())) { mIvLookBuyGuardNew.setVisibility(View.GONE); } else { - mIvLookBuyGuardNew.setVisibility(View.VISIBLE); - mIvLookBuyGuardNew.setText(WordUtil.isNewZh() ? "圍觀" : "Views"); + if(event.getLiveuid().equals(mLiveUid)||CommonAppConfig.getInstance().getUid().equals(mLiveUid)){ + mIvLookBuyGuardNew.setVisibility(View.GONE); + }else{ + mIvLookBuyGuardNew.setVisibility(View.VISIBLE); + mIvLookBuyGuardNew.setText(WordUtil.isNewZh() ? "圍觀" : "Views"); + } } mGifGiftTipShowAnimatorBuyGuardNew.start(); diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 88e3665e1..6335fc530 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -1159,6 +1159,7 @@ android:layout_width="match_parent" android:layout_height="51dp" android:translationX="500dp" + tools:visibility="visible" android:visibility="invisible">