YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1:修改礼物取消选择后，还能送出的问题

Browse Source 
2：修改背包礼物取消选择后还能送出的问题
3：修改打赏礼物取消选择后还能送出的问题
This commit is contained in:
梁小江
2025-12-15 17:02:09 +08:00
parent 42f786f9ef
commit 7768a8f70b
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java
View File

@@ -297,12 +297,18 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
roonGiftModel.setNum(giftModel.getNum()); roonGiftModel.setNum(giftModel.getNum());
if (giftModel.getGift_id().equals(id)) { if (giftModel.getGift_id().equals(id)) {
if (!giftModel.isChecked()) { if (!giftModel.isChecked()) {
EventBus.getDefault().post(new GiftUserRefreshEvent(true, event.type, roonGiftModel));
giftModel.setChecked(true); giftModel.setChecked(true);
roonGiftModel.setChecked(giftModel.isChecked());
EventBus.getDefault().post(new GiftUserRefreshEvent(true, event.type, roonGiftModel));
}else {
giftModel.setChecked(false);
roonGiftModel.setChecked(giftModel.isChecked());
} }
} else { } else {
giftModel.setChecked(false); giftModel.setChecked(false);
roonGiftModel.setChecked(giftModel.isChecked());
} }
} }
if (event.adapter != null && event.adapter.get() != null) { if (event.adapter != null && event.adapter.get() != null) {
event.adapter.get().notifyDataSetChanged(); event.adapter.get().notifyDataSetChanged();
@@ -321,13 +327,20 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
if (giftModel.getGift_id().equals(id)) { if (giftModel.getGift_id().equals(id)) {
selGift = giftModel; selGift = giftModel;
if (!giftModel.isChecked()) { if (!giftModel.isChecked()) {
EventBus.getDefault().post(new GiftUserRefreshEvent(true, event.type, roonGiftModel));
giftModel.setChecked(true); giftModel.setChecked(true);
roonGiftModel.setChecked(giftModel.isChecked());
EventBus.getDefault().post(new GiftUserRefreshEvent(true, event.type, roonGiftModel));
}else {
giftModel.setChecked(false);
roonGiftModel.setChecked(giftModel.isChecked());
EventBus.getDefault().post(new GiftUserRefreshEvent(true, event.type, roonGiftModel));
} }
} else { } else {
giftModel.setChecked(false); giftModel.setChecked(false);
EventBus.getDefault().post(new GiftUserRefreshEvent(false, event.type, null)); roonGiftModel.setChecked(giftModel.isChecked());
// EventBus.getDefault().post(new GiftUserRefreshEvent(false, event.type, roonGiftModel));
} }
} }
if (event.adapter != null && event.adapter.get() != null) { if (event.adapter != null && event.adapter.get() != null) {
event.adapter.get().notifyDataSetChanged(); event.adapter.get().notifyDataSetChanged();

2
BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java
View File

@@ -270,7 +270,7 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
private void giveGift(String num) { private void giveGift(String num) {
getSelectedGift(); getSelectedGift();
if (roonGiftModel == null) { if (roonGiftModel == null || !roonGiftModel.isChecked()) {
ToastUtils.show("请选择礼物"); ToastUtils.show("请选择礼物");
return; return;
} }

2
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
View File

@@ -622,7 +622,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
// return; // return;
// } // }
// } else { // } else {
if (roonGiftModel == null|| roonGiftModel.getGift_id() == null ) { if (roonGiftModel == null|| roonGiftModel.getGift_id() == null || !roonGiftModel.isChecked() ) {
ToastUtils.show("请选择礼物"); ToastUtils.show("请选择礼物");
return; return;
} }