From af164f549fccab6fba9ef8244a074fa6ccdca065 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Fri, 7 Apr 2023 16:01:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E6=92=AD=E5=90=8E?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=B1=8F=E5=B9=95=E9=97=AA=E9=80=80=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=E8=B0=83=E6=95=B4=E5=A5=B3=E7=A5=9E=E8=AF=B4?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E5=9B=BA=E5=AE=9A=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/yunbao/share/ui/InvitePopDialog.java | 6 ------ .../java/com/yunbao/live/views/LiveRoomViewHolder.java | 7 ++++++- live/src/main/res/layout/sim_live_room_anchor_say.xml | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java b/Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java index 9d3767442..8642fa233 100644 --- a/Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java +++ b/Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java @@ -150,12 +150,6 @@ public class InvitePopDialog extends AbsDialogPopupWindow { ClipData clipData = ClipData.newPlainText("text", url); cm.setPrimaryClip(clipData); ToastUtil.show(WordUtil.getString(com.yunbao.common.R.string.copy_success)); - DialogUitl.showSimpleDialog(getContext(), url, new DialogUitl.SimpleCallback() { - @Override - public void onConfirmClick(Dialog dialog, String content) { - dialog.dismiss(); - } - }); } public InvitePopDialog setUrl(String data) { diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 7d5f02066..2a46f90bf 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -356,6 +356,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis private Banner topBanner1;//心愿单&联系方式 private SVGAImageView xydSvg; public SVGAImageView svga_new_user_gif, svga_new_user_double, svga_new_user_follow; + @Subscribe(threadMode = ThreadMode.MAIN) public void onUpdata(String str) { if ("svga_new_user_gif".equals(str)) { @@ -492,6 +493,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis }, null); } + public LiveRoomViewHolder(boolean isRys, int forActivity, Context context, ViewGroup parentView, GifImageView gifImageView, SVGAImageView svgaImageView, ViewGroup liveGiftPrizePoolContainer, WindowManager windowManager) { super(context, parentView); Contexts = context; @@ -898,7 +900,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis svga_new_user_double.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - ((LiveAudienceActivity) mContext).light(); + if (mContext instanceof LiveAudienceActivity) { + ((LiveAudienceActivity) mContext).light(); + } } }); btnEvent = findViewById(R.id.btn_event); @@ -4708,6 +4712,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis if (mTopBannerList == null) { mTopBannerList = new ArrayList<>(); } + // if(sayModel!=null&&sayModel.getLivePreview().getIsShow()==1&&sa) topBanner1.setVisibility(View.VISIBLE); BannerBean bannerBean = new BannerBean(); bannerBean.setWishlistIcon(wishListProgress.getWishlistIcon()) diff --git a/live/src/main/res/layout/sim_live_room_anchor_say.xml b/live/src/main/res/layout/sim_live_room_anchor_say.xml index fab8222ef..57aca08c6 100644 --- a/live/src/main/res/layout/sim_live_room_anchor_say.xml +++ b/live/src/main/res/layout/sim_live_room_anchor_say.xml @@ -8,7 +8,7 @@