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

Merge branch 'branch_new_dev' into branch_new

Browse Source
This commit is contained in:
骆召亮
2025-11-27 11:53:16 +08:00
parent 2a0c3b6d7f 5ed3717acc
commit fe1ad2a732
22 changed files with 271 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java
View File

@@ -21,8 +21,10 @@ import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.FragmentManager;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.GsonUtils;
import com.blankj.utilcode.util.LogUtils;
import com.xscm.modulemain.Application;
import com.xscm.modulemain.R;
import com.xscm.modulemain.databinding.DialogGiftLotteryBinding;
import com.xscm.moduleutil.base.BaseMvpDialogFragment;
@@ -414,13 +416,13 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
Bundle bundle = new Bundle();
bundle.putString("url", getRule_url);
bundle.putInt("type", type);
WebViewDialog dialog = new WebViewDialog(getActivity(), bundle);
WebViewDialog dialog = new WebViewDialog(ActivityUtils.getTopActivity(), bundle);
dialog.show();
// WebViewDialog webViewDialog = new WebViewDialog(getActivity(), getRule_url);
// webViewDialog.show();
} else if (id == R.id.tv_jc) {
if (giftLists != null && !giftLists.isEmpty()) {
PrizePoolDialog prizePoolDialog = new PrizePoolDialog(getActivity());
PrizePoolDialog prizePoolDialog = new PrizePoolDialog(ActivityUtils.getTopActivity());
prizePoolDialog.updateData(giftLists, type);
prizePoolDialog.show();
} else {

5
MainModule/src/main/java/com/xscm/modulemain/dialog/HourlyChartDialog.java
View File

@@ -8,8 +8,11 @@ import android.view.*;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.blankj.utilcode.util.ActivityUtils;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import com.xscm.modulemain.Application;
import com.xscm.modulemain.R;
import com.xscm.modulemain.activity.room.contacts.HourlyChartContacts;
import com.xscm.modulemain.activity.room.presenter.HourlyChartPresenter;
@@ -139,7 +142,7 @@ public class HourlyChartDialog extends BaseMvpDialogFragment<HourlyChartPresente
mBinding.imHourlyWf.setOnClickListener(v -> {
Bundle bundle = new Bundle();
bundle.putString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "api/Page/page_show?id=24");
RoomAuctionWebViewDialog dialog = new RoomAuctionWebViewDialog(getActivity(), bundle);
RoomAuctionWebViewDialog dialog = new RoomAuctionWebViewDialog(ActivityUtils.getTopActivity(), bundle);
dialog.show();
});
}

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

@@ -21,8 +21,10 @@ import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.viewpager.widget.ViewPager;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.LogUtils;
import com.hjq.toast.ToastUtils;
import com.xscm.modulemain.Application;
import com.xscm.modulemain.R;
import com.xscm.modulemain.adapter.GiftUserAdapter;
import com.xscm.modulemain.databinding.RoomGiftDialogBinding;
@@ -463,7 +465,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
}
private void queren() {
// 创建并显示确认对话框
new ConfirmDialog(getActivity(),
new ConfirmDialog(ActivityUtils.getTopActivity(),
"提示",
"是否确认将背包礼物全部送出？",
"确认",
@@ -736,6 +738,12 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
@Override
public void getGiftLabel(List<GiftLabelBean> giftLabelBeans) {
// 3. 回调时校验状态
if (!isAdded() || isDetached() || getView() == null) {
return;
}
if (giftLabelBeans == null) return;
giftLabelBeanList = new ArrayList<>();
giftLabelBeanList.addAll(giftLabelBeans);

29
MainModule/src/main/java/com/xscm/modulemain/dialog/TourClubDialogFragment.java
View File

@@ -1,7 +1,6 @@
package com.xscm.modulemain.dialog;
import android.app.Dialog;
import android.content.Context;
import android.graphics.Typeface;
import android.os.Bundle;
import android.os.CountDownTimer;
@@ -11,12 +10,12 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.LinearSnapHelper;
import androidx.recyclerview.widget.RecyclerView;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.GsonUtils;
import com.blankj.utilcode.util.LogUtils;
import com.xscm.moduleutil.R;
@@ -41,7 +40,6 @@ import com.xscm.moduleutil.dialog.giftLottery.XlhRecordDialog;
import com.xscm.moduleutil.widget.CenterScrollHelper;
import com.xscm.moduleutil.widget.EqualSpaceItemDecoration;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -92,11 +90,16 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
return new GiftLotteryPresenter(this, getActivity());
}
public TourClubDialogFragment(){
}
public TourClubDialogFragment(String roomId){
this.roomId = roomId;
}
public static TourClubDialogFragment newInstance(String roomId) {
TourClubDialogFragment dialog = new TourClubDialogFragment();
Bundle args = new Bundle();
args.putString("roomId", roomId);
dialog.setArguments(args);
TourClubDialogFragment dialog = new TourClubDialogFragment(roomId);
return dialog;
}
@@ -109,12 +112,6 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
return dialog;
}
@Override
public void onAttach(@NonNull Context context) {
super.onAttach(context);
roomId = getArguments().getString("roomId");
}
@Override
protected void initData() {
MvpPre.xlh(roomId);
@@ -265,7 +262,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
LogUtils.e("tourClubDFragment","点击了" + viewName );
if (id == R.id.tv_jc) {
if (giftLists != null && !giftLists.isEmpty()) {
PrizePoolDialog prizePoolDialog = new PrizePoolDialog(getActivity());
PrizePoolDialog prizePoolDialog = new PrizePoolDialog(ActivityUtils.getTopActivity());
prizePoolDialog.updateData(giftLists, 13);
prizePoolDialog.show();
} else {
@@ -305,7 +302,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
Bundle bundle = new Bundle();
bundle.putString("url", getRule_url);
bundle.putInt("type", 13);
WebViewDialog dialog = new WebViewDialog(getActivity(), bundle);
WebViewDialog dialog = new WebViewDialog(ActivityUtils.getTopActivity(), bundle);
dialog.show();
} else if (id == R.id.tv_bd) {
// 如果当前dialog存在且正在显示，先关闭
@@ -1017,7 +1014,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
// xlhObtainDialog.dismiss();
// }
// 创建并显示对话框
xlhObtainDialog = new XlhObtainDialog(getActivity());
xlhObtainDialog = new XlhObtainDialog(ActivityUtils.getTopActivity());
xlhObtainDialog.setOnGiftItemClickListener(new XlhObtainDialog.OnGiftItemClickListener() {
@Override