diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java index bbc2dbbb..7c36d355 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -2999,6 +2999,7 @@ public class RetrofitClient { if (redPacketConfigBaseModel.getCode() == 1) { observer.onNext(redPacketConfigBaseModel.getData()); } else if (redPacketConfigBaseModel.getCode() == 0) { + observer.onNext(new RedPacketConfig()); } else if (redPacketConfigBaseModel.getCode() == 301) { setCode301(redPacketConfigBaseModel.getMsg()); } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index 6ce17df2..3d94f8c7 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -1085,7 +1085,8 @@ class RoomActivity : BaseMvpActivity(), // TODO: 发红包 fun redDialogView() { - RedBagSendDialog(this, roomId,redPacketConfig).show() + MvpPre?.getRedpacketConfig() + } var redEnvelopesFragment: RedEnvelopesFragment? = null @@ -3518,7 +3519,6 @@ class RoomActivity : BaseMvpActivity(), // .joinRoom(SpUtil.getRtmToken(), roomId, SpUtil.getUserId(), false, false); // MvpPre?.postRoomInfo(roomId) MvpPre?.getTasksMessage() - MvpPre?.getRedpacketConfig() } fun refreshRoomInfo(roomId: String) { @@ -3827,6 +3827,7 @@ class RoomActivity : BaseMvpActivity(), override fun getRedpacketConfig(data: RedPacketConfig?) { this.redPacketConfig= data!! + RedBagSendDialog(this, roomId,redPacketConfig).show() } fun getTasksMessageService(number: Int) { diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RedBagSendDialog.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RedBagSendDialog.java index 12ca59cf..bbda8837 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RedBagSendDialog.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RedBagSendDialog.java @@ -280,7 +280,7 @@ public class RedBagSendDialog extends BaseDialog { if (textValue < redPacketConfig.getRed_packet_min_amount()) { // 你的逻辑 diaj=false; - ToastUtils.show("金额不能小于10"); + ToastUtils.show("金额不能小于"+redPacketConfig.getRed_packet_min_amount()); return; } } catch (NumberFormatException e) {