MIDI/midi-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1：修改拍卖不能发送背包礼物

Browse Source
This commit is contained in:
梁小江
2025-10-13 03:11:33 +08:00
parent c1d13cd34c
commit 85756d85c6
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
moduleUtil/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
View File

@@ -1,5 +1,6 @@
package com.xscm.moduleutil.bean; package com.xscm.moduleutil.bean;
import com.google.gson.annotations.SerializedName;
import com.xscm.moduleutil.bean.room.FriendInfo; import com.xscm.moduleutil.bean.room.FriendInfo;
import java.io.Serializable; import java.io.Serializable;
@@ -16,7 +17,7 @@ public class UserInfo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public static final String FEMALE = "2"; public static final String FEMALE = "2";
public static final String MALE = "1"; public static final String MALE = "1";
// @SerializedName(value = "id", alternate = "user_id") private int id;
private int user_id; //用户id private int user_id; //用户id
private String user_code;//用户id码 private String user_code;//用户id码
private String avatar;//头像 private String avatar;//头像

4
moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
View File

@@ -2264,6 +2264,10 @@ public class RetrofitClient {
observer.onNext(new RoomAuction.AuctionListBean()); observer.onNext(new RoomAuction.AuctionListBean());
} }
} }
@Override
public void onFailure(Throwable t) {
t.printStackTrace();
}
}); });
// .enqueue(new Callback<BaseModel<RoomAuction.AuctionListBean>>() { // .enqueue(new Callback<BaseModel<RoomAuction.AuctionListBean>>() {
// //

15
moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java
View File

@@ -91,7 +91,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
private SelectGiftNumPopupWindow mSelectGiftNumPopupWindow; private SelectGiftNumPopupWindow mSelectGiftNumPopupWindow;
private KeyboardPopupWindow mKeyboardPopupWindow; private KeyboardPopupWindow mKeyboardPopupWindow;
private List<GiftNumBean> mGiftNumList; private List<GiftNumBean> mGiftNumList;
private RoonGiftModel roonGiftModel = null; private RoonGiftModel roonGiftModel = new RoonGiftModel();
private GiftPackBean giftModel = null; private GiftPackBean giftModel = null;
private RoomInfoResp roomInfoResp; private RoomInfoResp roomInfoResp;
private String label_id; private String label_id;
@@ -648,11 +648,12 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
beibaoId = roonGiftModel.getGift_id(); beibaoId = roonGiftModel.getGift_id();
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id); MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id);
}else { }else {
beibaoId = roonGiftModel.getGift_id();
MvpPre.roomAuctionJoin(userInfo.getAuction_id(), userInfo.getUser_id() + "", roonGiftModel.getGift_id(), num, "2");
roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, userInfo.getAuction_id()); roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, userInfo.getAuction_id());
EventBus.getDefault().post(roomGiftGiveEvent); EventBus.getDefault().post(roomGiftGiveEvent);
roomGiftGiveEvent = null; roomGiftGiveEvent = null;
MvpPre.roomAuctionJoin(userInfo.getAuction_id(), userInfo.getUser_id() + "", roonGiftModel.getGift_id(), num, "1"); // dismiss();
dismiss();
} }
} else{ } else{
giftNumber = num; giftNumber = num;
@@ -814,9 +815,13 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
if (roomGiftGiveEvent != null) { if (roomGiftGiveEvent != null) {
EventBus.getDefault().post(roomGiftGiveEvent); EventBus.getDefault().post(roomGiftGiveEvent);
roomGiftGiveEvent = null; roomGiftGiveEvent = null;
dismiss(); // dismiss();
} }
dismiss(); GiftPackEvent giftPackEvent = new GiftPackEvent();
giftPackEvent.setBdid(beibaoId);
EventBus.getDefault().post(giftPackEvent);
MvpPre.getGiftPackListCount();
// dismiss();
} }
@Override @Override

2
moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java
View File

@@ -348,7 +348,7 @@ public class PublicScreenEaseChatFragment extends BaseMvpFragment<PublicScreenEa
EMMessageInfo item = easeChatAdapter.getItem(position); EMMessageInfo item = easeChatAdapter.getItem(position);
RoomMessageEvent emMessage = item.getEmMessage(); RoomMessageEvent emMessage = item.getEmMessage();
if (emMessage.getText().getFromUserInfo() != null) { if (emMessage.getText().getFromUserInfo() != null) {
RoomUserInfoFragment.show(roomInfoResp.getRoom_info().getRoom_id(), emMessage.getText().getFromUserInfo().getUser_id() + "", emMessage.getText().getFromUserInfo().getPit_number(), getHostUser(roomInfoResp.getUser_info()), false, 5, isNumberWhether(), getChildFragmentManager()); RoomUserInfoFragment.show(roomInfoResp.getRoom_info().getRoom_id(), emMessage.getText().getFromUserInfo().getUser_id()!=0?emMessage.getText().getFromUserInfo().getUser_id()+"":emMessage.getText().getFromUserInfo().getId() + "", emMessage.getText().getFromUserInfo().getPit_number(), getHostUser(roomInfoResp.getUser_info()), false, 5, isNumberWhether(), getChildFragmentManager());
} }
// String userId = item.getEmMessage().getStringAttribute("user_id", ""); // String userId = item.getEmMessage().getStringAttribute("user_id", "");
// if (!TextUtils.isEmpty(userId)) { // if (!TextUtils.isEmpty(userId)) {

2
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
View File

@@ -1234,7 +1234,7 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
if (AgoraManager.getInstance(getContext()).isLocalAudioEnabled()) { if (AgoraManager.getInstance(getContext()).isLocalAudioEnabled()) {
roomActivity.ivMic(com.xscm.moduleutil.R.mipmap.room_microphone); roomActivity.ivMic(com.xscm.moduleutil.R.mipmap.room_microphone);
} else { } else {
roomActivity.ivMic(com.xscm.moduleutil.R.mipmap.room_microphone_off); // roomActivity.ivMic(com.xscm.moduleutil.R.mipmap.room_microphone_off);
} }
} }
} }