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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
梁小江
2025-09-26 23:51:15 +08:00
parent 062fc7b0ed f68f6721e9
commit abed908e70
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java
View File

@@ -58,7 +58,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
private CountDownTimer mCountDownTimer; private CountDownTimer mCountDownTimer;
private long endTime; // 服务器返回的结束时间戳 private long endTime; // 服务器返回的结束时间戳
private String num; private String num;
private XlhRankingDialog xlhRankingDialog; private NewXlhRankingDialog newXlhRankingDialog;
private XlhRecordDialog xlhRecordDialog; private XlhRecordDialog xlhRecordDialog;
private XlhObtainDialog xlhObtainDialog; private XlhObtainDialog xlhObtainDialog;
@@ -301,12 +301,12 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
dialog.show(); dialog.show();
} else if (id == R.id.tv_bd) { } else if (id == R.id.tv_bd) {
// 如果当前dialog存在且正在显示，先关闭 // 如果当前dialog存在且正在显示，先关闭
if (xlhRankingDialog != null && xlhRankingDialog.isVisible()) { if (newXlhRankingDialog != null && newXlhRankingDialog.isVisible()) {
xlhRankingDialog.dismiss(); newXlhRankingDialog.dismiss();
} }
xlhRankingDialog = XlhRankingDialog.newInstance(roomId,0); newXlhRankingDialog = NewXlhRankingDialog.newInstance(roomId);
xlhRankingDialog.show(getChildFragmentManager(), "XlhRankingDialog"); newXlhRankingDialog.show(getChildFragmentManager(), "newXlhRankingDialog");
} else if (id == R.id.tv_jl) { } else if (id == R.id.tv_jl) {
// 如果当前dialog存在且正在显示，先关闭 // 如果当前dialog存在且正在显示，先关闭
if (xlhRecordDialog != null && xlhRecordDialog.isVisible()) { if (xlhRecordDialog != null && xlhRecordDialog.isVisible()) {
@@ -542,8 +542,8 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
} }
// 如果当前dialog存在且正在显示，先关闭 // 如果当前dialog存在且正在显示，先关闭
if (xlhRankingDialog != null && xlhRankingDialog.isVisible()) { if (newXlhRankingDialog != null && newXlhRankingDialog.isVisible()) {
xlhRankingDialog.dismiss(); newXlhRankingDialog.dismiss();
} }
if (xlhObtainDialog != null && xlhObtainDialog.isShowing()) { if (xlhObtainDialog != null && xlhObtainDialog.isShowing()) {