From 02ba8f1348d1dfb0866130bc682e7d183e3dfb79 Mon Sep 17 00:00:00 2001 From: xuhuixiang Date: Wed, 30 Apr 2025 15:08:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=ACN+5=E6=AC=A1=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=B8=93=E5=B1=9E=E7=BA=A2=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redpack/ReceiveRedPacketActivity.java | 12 ++++++------ .../lewan/redpack/SendRedPacketActivity.java | 11 +++++++++-- .../lewan/wallet/WalletInfoRedFragment.java | 10 ++++++---- .../chatkit/ui/custom/RedPacketViewHolder.java | 18 ++++++++++++++++-- .../kit/chatkit/ui/model/RedpacketBean1.java | 9 +++++++++ 5 files changed, 46 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/hbl/lewan/redpack/ReceiveRedPacketActivity.java b/app/src/main/java/com/hbl/lewan/redpack/ReceiveRedPacketActivity.java index 928e889..e76372c 100644 --- a/app/src/main/java/com/hbl/lewan/redpack/ReceiveRedPacketActivity.java +++ b/app/src/main/java/com/hbl/lewan/redpack/ReceiveRedPacketActivity.java @@ -397,14 +397,14 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli viewBinding.numberTv1Ly.setVisibility(View.GONE); if (redpacketGroupBean.getType().equals("0")) { // binding.titleTipsTv.setText(bonusBean.getBonus().getNumber() + getString(R.string.red_envelopes_in_total) + String.format("%.2f", Integer.parseInt(bonusBean.getBonus().getMoney().trim()) / 100f) + getString(R.string.danwei_txt)); - viewBinding.titleTipsTv.setText(String.format(getString(R.string.red_envelopes_in_total), redpacketGroupBean.getCount() + "", AppUtils.getQian(redpacketGroupBean.getAmount()))); + viewBinding.titleTipsTv.setText(String.format(getString(R.string.red_envelopes_in_total), redpacketGroupBean.getCount() + "", AppUtils.getQian(redpacketGroupBean.getAmount())+"元")); } else { if (redpacketGroupBean.getGrabbers() == null || redpacketGroupBean.getGrabbers().size() == 0) { if (redpacketGroupBean.getStatus() == 2) { - viewBinding.titleTipsTv.setText(getString(R.string.hbxq_yiguoqi_txt) + getString(R.string.received_txt1) + "0/" + redpacketGroupBean.getCount() + getString(R.string.ge_gong_txt) + "0" + "/" + AppUtils.getQian(redpacketGroupBean.getAmount())); + viewBinding.titleTipsTv.setText(getString(R.string.hbxq_yiguoqi_txt) + getString(R.string.received_txt1) + "0/" + redpacketGroupBean.getCount() + getString(R.string.ge_gong_txt) + "0" + "/" + AppUtils.getQian(redpacketGroupBean.getAmount())+"元"); } else { - viewBinding.titleTipsTv.setText(getString(R.string.received_txt1) + "0/" + redpacketGroupBean.getCount() + getString(R.string.ge_gong_txt) + "0" + "/" + AppUtils.getQian(redpacketGroupBean.getAmount())); + viewBinding.titleTipsTv.setText(getString(R.string.received_txt1) + "0/" + redpacketGroupBean.getCount() + getString(R.string.ge_gong_txt) + "0" + "/" + AppUtils.getQian(redpacketGroupBean.getAmount())+"元"); } } else { int size = 0; @@ -426,10 +426,10 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli } if (redpacketGroupBean.getStatus() == 2) { viewBinding.titleTipsTv.setText(getString(R.string.hbxq_yiguoqi_txt) + getString(R.string.received_txt1) + redpacketGroupBean.getGrabbers().size() + "/" + redpacketGroupBean.getCount() + getString(R.string.ge_gong_txt) - + AppUtils.getQian(size) + "/" +AppUtils.getQian(redpacketGroupBean.getAmount())); + + AppUtils.getQian(size) + "/" +AppUtils.getQian(redpacketGroupBean.getAmount())+"元"); } else { viewBinding.titleTipsTv.setText(getString(R.string.received_txt1) + redpacketGroupBean.getGrabbers().size() + "/" + redpacketGroupBean.getCount() + getString(R.string.ge_gong_txt) - + AppUtils.getQian(size) + "/" +AppUtils.getQian(redpacketGroupBean.getAmount())); + + AppUtils.getQian(size) + "/" +AppUtils.getQian(redpacketGroupBean.getAmount())+"元"); } @@ -456,7 +456,7 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli TextView tvprice = holder.getView(R.id.price_tv); holder.setText(R.id.title_tv, s.getGrabberNickname()); holder.setText(R.id.time_tv, s.getGrabTime() + ""); - tvprice.setText(String.format("%.2f", s.getGrabAmount() / 100f)); + tvprice.setText(AppUtils.getQian(s.getGrabAmount())); ContactAvatarView imageView = holder.getView(R.id.logo_iv); LogUtils.i("数据是啥：" + GsonUtils.beanToJSONString(s)); ImageView imageView1 = holder.getView(R.id.item_type_iv); diff --git a/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java b/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java index a09f638..8f67615 100644 --- a/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java +++ b/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java @@ -111,7 +111,6 @@ public class SendRedPacketActivity extends BaseActivity { public List listmemebers = new ArrayList<>(); private ActivityResultLauncher launcher; UserInfo userInfo; - @Override protected void onCreate(@Nullable Bundle savedInstanceState) { getWindow().setStatusBarColor(getResources().getColor(R.color.color_fcfcfc)); @@ -350,6 +349,8 @@ public class SendRedPacketActivity extends BaseActivity { changeUser(); } changeInfo(); + changeStatus(); + } BindBean bindBean; @@ -403,6 +404,12 @@ public class SendRedPacketActivity extends BaseActivity { // ToastX.showShortToast("敬请期待"); // return; // +// +// } + +// if(bindBean!=null&&!bindBean.getPayPasswordSet()){ +// +// return; // } if (isGroup) { @@ -872,7 +879,7 @@ public class SendRedPacketActivity extends BaseActivity { groupBean.getSenderUid() + "", groupBean.getGroupId(), groupBean.getCount() + "", groupBean.getResidualCount() + "", groupBean.getResidualAmount() + "", groupBean.getSendTime(), groupBean.getFinishTime(), groupBean.getRemark(), groupBean.getSenderNickname(), groupBean.getCoinType() + "", - userInfo.getAccount(), null, userInfo.getAvatar()); + userInfo.getAccount(), null, userInfo.getName()); } toShareMessageGroup(redPacketAttachment); diff --git a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoRedFragment.java b/app/src/main/java/com/hbl/lewan/wallet/WalletInfoRedFragment.java index b61b78e..a6fcd63 100644 --- a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoRedFragment.java +++ b/app/src/main/java/com/hbl/lewan/wallet/WalletInfoRedFragment.java @@ -131,6 +131,8 @@ public class WalletInfoRedFragment extends BaseFragment { private void initOne() { pageSize = 1; + titles.clear(); + commonAdapter.setDates(titles); binding.refreshLayout.setVisibility(View.VISIBLE); binding.nodateLy.setVisibility(View.GONE); binding.refreshLayout.setEnableLoadMore(true); @@ -526,15 +528,15 @@ public class WalletInfoRedFragment extends BaseFragment { } private void changeDate(ListBeanResult data) { - if (data!=null&&data.getList() != null) { + if (data!=null&&data.getList() != null&&data.getList().size()>0) { commonAdapter.addDates(data.getList()); titles = (ArrayList) commonAdapter.getDates(); } binding.refreshLayout.finishRefresh(); binding.refreshLayout.finishLoadMore(); -// if (titles.size() == data.getTotal()) { -// binding.refreshLayout.finishLoadMoreWithNoMoreData(); -// } + if (data!=null&&titles.size() == data.getTotal()) { + binding.refreshLayout.finishLoadMoreWithNoMoreData(); + } changeView(true); } diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketViewHolder.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketViewHolder.java index 77e7c71..f3f0219 100644 --- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketViewHolder.java +++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketViewHolder.java @@ -112,7 +112,14 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder { if (status < 1) { if (changeImageViewBean.id.equals(circleShareBean.data.getId())) { changeInfo(circleShareBean.data, binding, message, null, null); - getRedInfo(circleShareBean.data, binding, message, false); + if(!TextUtils.isEmpty(circleShareBean.data.getReceiverUid())){//专属红包收款人才需要网络更新 + if(circleShareBean.data.getReceiverUid().equals(IMKitClient.account())||circleShareBean.data.getSenderUid().equals(IMKitClient.account())){ + getRedInfo(circleShareBean.data, binding, message, false); + } + }else{ + getRedInfo(circleShareBean.data, binding, message, false); + } + } } }); @@ -121,7 +128,13 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder { changeInfo(circleShareBean.data, binding, message, null, null); if(status == 0) { - getRedInfo(circleShareBean.data, binding, message, false); + if(!TextUtils.isEmpty(circleShareBean.data.getReceiverUid())){//专属红包收款人才需要网络更新 + if(circleShareBean.data.getReceiverUid().equals(IMKitClient.account())||circleShareBean.data.getSenderUid().equals(IMKitClient.account())){ + getRedInfo(circleShareBean.data, binding, message, false); + } + }else { + getRedInfo(circleShareBean.data, binding, message, false); + } } if (!message.getMessageData().getMessage().getFromAccount().equals(IMKitClient.account())) { baseViewBinding.otherUserAvatar.setVisibility(View.VISIBLE); @@ -351,6 +364,7 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder { LogUtils.i("红包类型", "名片获取到的数据红包类型2：" + GsonUtils.beanToJSONString(data)); binding.mingpianTv.setText("专属红包"); getTeamInfos(binding.itemTitleTv,data.getGroupId(),data.getReceiverUid()); +// binding.itemTitleTv.setText("给"+data.getReceiverUid()+"的专属红包"); } diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/model/RedpacketBean1.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/model/RedpacketBean1.java index 8452b90..323ba70 100644 --- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/model/RedpacketBean1.java +++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/model/RedpacketBean1.java @@ -26,6 +26,7 @@ public class RedpacketBean1 implements Serializable { private String finishTime; private String senderNickname; // private String grabbers; + private String receiverNickname; @@ -198,6 +199,14 @@ public class RedpacketBean1 implements Serializable { // this.grabbers = grabbers; // } + public String getReceiverNickname() { + return receiverNickname; + } + + public void setReceiverNickname(String receiverNickname) { + this.receiverNickname = receiverNickname; + } + public String getCoinType() { return coinType; }