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

合并 fix bugs

Browse Source
This commit is contained in:
骆召亮
2025-11-22 11:22:41 +08:00
parent 3c344e1359 46b02ac407
commit 95a1e21909
17 changed files with 153 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,6 +123,10 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
if (userInfo != null) {
LogUtils.e("RoomGiftDialogFragment_userInfo", userInfo.toString());
}
<<<<<<< HEAD
=======
>>>>>>> branch_new_dev
}
@Override
@@ -241,7 +245,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
List<RoomPitBean> pitList2 = new ArrayList<>();
List<RoomPitBean> pitList3 = new ArrayList<>();
List<String> added = new ArrayList<>();
if (roomInfoResp.getSong_pit_list() != null && roomInfoResp.getSong_pit_list().size() > 0) {
if (roomInfoResp.getSong_pit_list() != null && !roomInfoResp.getSong_pit_list().isEmpty()) {
pitList2.addAll(roomInfoResp.getSong_pit_list());
// 使用 HashSet 进行去重
Set<RoomPitBean> uniquePitSet = new HashSet<>(pitList);
@@ -252,7 +256,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
}
if (roomInfoResp.getRoom_auction() != null) {
if (roomInfoResp.getRoom_auction().getAuction_list() != null && roomInfoResp.getRoom_auction().getAuction_list().size() > 0) {
if (roomInfoResp.getRoom_auction().getAuction_list() != null && !roomInfoResp.getRoom_auction().getAuction_list().isEmpty()) {
for (int i = 0; i < roomInfoResp.getRoom_auction().getAuction_list().size(); i++) {
RoomAuction.AuctionListBean auctionListBean = roomInfoResp.getRoom_auction().getAuction_list().get(i);
RoomPitBean pitBean = new RoomPitBean();
@@ -286,9 +290,10 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
// 优先添加指定麦位
for (String targetPit : priorityPits) {
for (RoomPitBean bean : pitList) {
if (bean.getPit_number().equals(targetPit) &&
!bean.getUser_id().equals("0") && !bean.getUser_id().equals("") &&
!bean.getUser_id().equals(SpUtil.getUserId() + "")) {
if (bean.getPit_number().equals(targetPit)
&& !bean.getUser_id().isEmpty()
&& !bean.getUser_id().equals("0")
&& !bean.getUser_id().equals(SpUtil.getUserId() + "")) {
RewardUserBean rewardUserBean = new RewardUserBean();
rewardUserBean.setUser_id(bean.getUser_id());
@@ -305,9 +310,10 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
// 添加剩余的
for (RoomPitBean bean : pitList) {
String pitNumber = bean.getPit_number();
if (!added.contains(pitNumber) &&
!bean.getUser_id().equals("0") && !bean.getUser_id().equals("") &&
!bean.getUser_id().equals(SpUtil.getUserId() + "")) {
if (!added.contains(pitNumber)
&& !bean.getUser_id().isEmpty()
&&!bean.getUser_id().equals("0")
&&!bean.getUser_id().equals(SpUtil.getUserId() + "")) {
RewardUserBean rewardUserBean = new RewardUserBean();
rewardUserBean.setUser_id(bean.getUser_id());

3
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomOnlineDialogFragment.java
View File

@@ -77,10 +77,7 @@ public class RoomOnlineDialogFragment extends BaseMvpDialogFragment<RoomPresente
// 设置固定高度为 500dp
int screenHeight = getResources().getDisplayMetrics().heightPixels;
int heightInDp = (int) (screenHeight * 0.6f);
;
// int heightInPx = (int) (heightInDp * getResources().getDisplayMetrics().density);
window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, heightInDp);
// 可选：设置动画样式（从底部弹出）
window.setWindowAnimations(com.xscm.moduleutil.R.style.CommonShowDialogBottom);
}