From 43f95260e6d977bf74569c40e64af82680e2194f Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Thu, 10 Aug 2023 13:51:49 +0800 Subject: [PATCH] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 2 +- .../live/activity/GiftWallActivity.java | 2 +- .../com/yunbao/live/adapter/CodexAdapter.java | 7 ++--- .../yunbao/live/adapter/CodexItemAdapter.java | 9 +++++-- .../com/yunbao/live/dialog/CodexDialog.java | 9 ++++--- .../yunbao/live/dialog/GiftWallDialog.java | 6 ++--- .../live/views/CodexItemViewHolder.java | 27 ++++++++++++++----- .../yunbao/live/views/CodexViewHolder.java | 6 ++--- 8 files changed, 44 insertions(+), 24 deletions(-) diff --git a/config.gradle b/config.gradle index e31787a93..9a1f7aafc 100644 --- a/config.gradle +++ b/config.gradle @@ -5,7 +5,7 @@ ext { minSdkVersion : 21, targetSdkVersion : 31, versionCode : 436, - versionName : "6.5.3" + versionName : "6.5.4" ] manifestPlaceholders = [ //正式、 diff --git a/live/src/main/java/com/yunbao/live/activity/GiftWallActivity.java b/live/src/main/java/com/yunbao/live/activity/GiftWallActivity.java index fcddf7967..d37feef7e 100644 --- a/live/src/main/java/com/yunbao/live/activity/GiftWallActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/GiftWallActivity.java @@ -118,7 +118,7 @@ public class GiftWallActivity extends AbsActivity { public void onViewClicks() { new XPopup.Builder(GiftWallActivity.this) .enableDrag(false) - .asCustom(new CodexDialog(GiftWallActivity.this, mStream, mLiveUid, mLiveUid,isLive)) + .asCustom(new CodexDialog(GiftWallActivity.this, mStream, mLiveUid, mLiveUid,isLive,false)) .show(); } }); diff --git a/live/src/main/java/com/yunbao/live/adapter/CodexAdapter.java b/live/src/main/java/com/yunbao/live/adapter/CodexAdapter.java index f8554b4ba..097507a2b 100644 --- a/live/src/main/java/com/yunbao/live/adapter/CodexAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/CodexAdapter.java @@ -16,7 +16,7 @@ import java.util.List; public class CodexAdapter extends RecyclerView.Adapter { private List giftGuideModels = new ArrayList<>(); - private boolean history; + private boolean history,sbWy; private String mStream, mLiveUid,toUid; @NonNull @Override @@ -28,7 +28,7 @@ public class CodexAdapter extends RecyclerView.Adapter { @Override public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { CodexViewHolder codexViewHolder = (CodexViewHolder) holder; - codexViewHolder.showData(giftGuideModels.get(position), history,mStream,mLiveUid,toUid); + codexViewHolder.showData(giftGuideModels.get(position), history,mStream,mLiveUid,toUid,sbWy); } @Override @@ -36,11 +36,12 @@ public class CodexAdapter extends RecyclerView.Adapter { return giftGuideModels.size(); } - public void addAllData(List mGiftWall, boolean history, String mStream, String mLiveUid, String toUid) { + public void addAllData(List mGiftWall, boolean history, String mStream, String mLiveUid, String toUid, boolean sbWy) { this.history = history; this.mStream = mStream; this.mLiveUid = mLiveUid; this.toUid = toUid; + this.sbWy = sbWy; giftGuideModels.clear(); giftGuideModels.addAll(mGiftWall); notifyDataSetChanged(); diff --git a/live/src/main/java/com/yunbao/live/adapter/CodexItemAdapter.java b/live/src/main/java/com/yunbao/live/adapter/CodexItemAdapter.java index 5913f3b3b..29412f60a 100644 --- a/live/src/main/java/com/yunbao/live/adapter/CodexItemAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/CodexItemAdapter.java @@ -16,6 +16,8 @@ import java.util.List; public class CodexItemAdapter extends RecyclerView.Adapter { private List giftData = new ArrayList<>(); + private String toUid, mLiveUid; + private boolean sbWy; @NonNull @Override @@ -27,7 +29,7 @@ public class CodexItemAdapter extends RecyclerView.Adapter { @Override public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { CodexItemViewHolder codexItemViewHolder = (CodexItemViewHolder) holder; - codexItemViewHolder.showData(giftData.get(position)); + codexItemViewHolder.showData(giftData.get(position), toUid, mLiveUid, sbWy); } @Override @@ -35,7 +37,10 @@ public class CodexItemAdapter extends RecyclerView.Adapter { return giftData.size(); } - public void addAllData(List mGiftWall) { + public void addAllData(List mGiftWall, String toUid, String mLiveUid, boolean sbWy) { + this.toUid = toUid; + this.mLiveUid = mLiveUid; + this.sbWy = sbWy; giftData.clear(); giftData.addAll(mGiftWall); notifyDataSetChanged(); diff --git a/live/src/main/java/com/yunbao/live/dialog/CodexDialog.java b/live/src/main/java/com/yunbao/live/dialog/CodexDialog.java index e1dcb2c61..2203f3fbe 100644 --- a/live/src/main/java/com/yunbao/live/dialog/CodexDialog.java +++ b/live/src/main/java/com/yunbao/live/dialog/CodexDialog.java @@ -27,14 +27,15 @@ public class CodexDialog extends BottomPopupView { private String mStream, mLiveUid, toUid; private RecyclerView liveCodex; private CodexAdapter codexAdapter; - private boolean history; + private boolean history,sbWy; - public CodexDialog(@NonNull Context context, String mStream, String mLiveUid, String toUid, boolean history) { + public CodexDialog(@NonNull Context context, String mStream, String mLiveUid, String toUid, boolean history,boolean sbWy) { super(context); this.mLiveUid = mLiveUid; this.mStream = mStream; this.history = history; this.toUid = toUid; + this.sbWy = sbWy; } // 返回自定义弹窗的布局 @@ -58,7 +59,7 @@ public class CodexDialog extends BottomPopupView { getGiftGuideHistory(toUid,mLiveUid, new HttpCallback>() { @Override public void onSuccess(List data) { - codexAdapter.addAllData(data,history,mStream,mLiveUid,toUid); + codexAdapter.addAllData(data,history,mStream,mLiveUid,toUid,sbWy); } @Override @@ -71,7 +72,7 @@ public class CodexDialog extends BottomPopupView { getGiftGuide(mLiveUid, toUid,new HttpCallback>() { @Override public void onSuccess(List data) { - codexAdapter.addAllData(data,history,mStream,mLiveUid,toUid); + codexAdapter.addAllData(data,history,mStream,mLiveUid,toUid,sbWy); } @Override diff --git a/live/src/main/java/com/yunbao/live/dialog/GiftWallDialog.java b/live/src/main/java/com/yunbao/live/dialog/GiftWallDialog.java index 0e5a1cea6..93bc0e8dc 100644 --- a/live/src/main/java/com/yunbao/live/dialog/GiftWallDialog.java +++ b/live/src/main/java/com/yunbao/live/dialog/GiftWallDialog.java @@ -78,7 +78,7 @@ public class GiftWallDialog extends AbsDialogFragment { ViewClicksAntiShake.clicksAntiShake(layoutLitIcon, () -> { selectTab(textLitIcon, viewLitIcon); FragmentTransaction transaction = getChildFragmentManager().beginTransaction(); - transaction.replace(R.id.context_layout_gift, GiftAlreadyWallFragment.newInstance(mStream, mLiveUid, toUid, isLive,sbWy)); + transaction.replace(R.id.context_layout_gift, GiftAlreadyWallFragment.newInstance(mStream, mLiveUid, toUid, isLive, sbWy)); transaction.commit(); }); ViewClicksAntiShake.clicksAntiShake(layoutUnlitIcon, new ViewClicksAntiShake.ViewClicksCallBack() { @@ -115,7 +115,7 @@ public class GiftWallDialog extends AbsDialogFragment { public void onViewClicks() { new XPopup.Builder(getContext()) .enableDrag(false) - .asCustom(new CodexDialog(getContext(), mStream, mLiveUid, toUid,false)) + .asCustom(new CodexDialog(getContext(), mStream, mLiveUid, toUid, false, sbWy)) .show(); } }); @@ -161,7 +161,7 @@ public class GiftWallDialog extends AbsDialogFragment { isLive = bundle.getBoolean("isLive"); sbWy = bundle.getBoolean("SBW"); FragmentTransaction transaction = getChildFragmentManager().beginTransaction(); - transaction.replace(R.id.context_layout_gift, GiftAlreadyWallFragment.newInstance(mStream, mLiveUid, toUid, isLive,sbWy)); + transaction.replace(R.id.context_layout_gift, GiftAlreadyWallFragment.newInstance(mStream, mLiveUid, toUid, isLive, sbWy)); transaction.commit(); ImgLoader.display(getContext(), mAvatarUrl, avatar); anchorName.setText(mAnchorName); diff --git a/live/src/main/java/com/yunbao/live/views/CodexItemViewHolder.java b/live/src/main/java/com/yunbao/live/views/CodexItemViewHolder.java index 5bcac5263..98d7b109f 100644 --- a/live/src/main/java/com/yunbao/live/views/CodexItemViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/CodexItemViewHolder.java @@ -13,10 +13,14 @@ import com.yunbao.common.R; import com.yunbao.common.bean.GiftWallModel; import com.yunbao.common.event.LiveGiftDialogEvent; import com.yunbao.common.glide.ImgLoader; +import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.Bus; +import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.live.event.LiveAudienceEvent; +import java.util.Locale; + public class CodexItemViewHolder extends RecyclerView.ViewHolder { private ImageView giftImg; private TextView giftName, giftWall; @@ -28,7 +32,7 @@ public class CodexItemViewHolder extends RecyclerView.ViewHolder { giftWall = itemView.findViewById(R.id.gift_wall); } - public void showData(GiftWallModel giftWallModel) { + public void showData(GiftWallModel giftWallModel, String toUid, String mLiveUid, boolean sbWy) { ImgLoader.display(itemView.getContext(), giftWallModel.getGifticon(), giftImg); giftName.setText(giftWallModel.getGiftname()); giftName.setTextColor(Color.parseColor(giftWallModel.getFontColor())); @@ -39,12 +43,21 @@ public class CodexItemViewHolder extends RecyclerView.ViewHolder { ViewClicksAntiShake.clicksAntiShake(giftWall, new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { - Bus.get().post(new LiveGiftDialogEvent()); - Bus.get().post(new LiveAudienceEvent() - .setType(LiveAudienceEvent.LiveAudienceType.GIFT_POPUP) - .setmWishGiftId(giftWallModel.getId()) - .setmLiveUid("") - .setmStream("")); + if (sbWy && TextUtils.equals(mLiveUid, toUid)) { + Bus.get().post(new LiveGiftDialogEvent()); + Bus.get().post(new LiveAudienceEvent() + .setType(LiveAudienceEvent.LiveAudienceType.GIFT_POPUP) + .setmWishGiftId(giftWallModel.getId()) + .setmLiveUid("") + .setmStream("")); + } else { + if (IMLoginManager.get(itemView.getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { + ToastUtil.show("當前用戶未開播時無法點亮哦~"); + } else { + ToastUtil.show("It cannot be lit when the current user is not broadcasting~~"); + } + } + } }); } else { diff --git a/live/src/main/java/com/yunbao/live/views/CodexViewHolder.java b/live/src/main/java/com/yunbao/live/views/CodexViewHolder.java index 716bd8767..e32289641 100644 --- a/live/src/main/java/com/yunbao/live/views/CodexViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/CodexViewHolder.java @@ -37,7 +37,7 @@ public class CodexViewHolder extends RecyclerView.ViewHolder { giftList.setAdapter(codexItemAdapter); } - public void showData(GiftGuideModel giftGuideModel, boolean history, String mStream, String mLiveUid, String toUid) { + public void showData(GiftGuideModel giftGuideModel, boolean history, String mStream, String mLiveUid, String toUid, boolean sbWy) { StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append(giftGuideModel.getIlluminateCount()) .append("/") @@ -54,13 +54,13 @@ public class CodexViewHolder extends RecyclerView.ViewHolder { weekNumber2.setVisibility(TextUtils.isEmpty(giftGuideModel.getWeekNumber()) ? View.GONE : View.VISIBLE); } - codexItemAdapter.addAllData(giftGuideModel.getGiftData()); + codexItemAdapter.addAllData(giftGuideModel.getGiftData(), toUid, mLiveUid, sbWy); ViewClicksAntiShake.clicksAntiShake(weekNumber2, new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { new XPopup.Builder(itemView.getContext()) .enableDrag(false) - .asCustom(new CodexDialog(itemView.getContext(), mStream, mLiveUid,toUid,true)) + .asCustom(new CodexDialog(itemView.getContext(), mStream, mLiveUid, toUid, true, sbWy)) .show(); } });