注销许愿卡，爱豆计划记录闪退，默认主题内页黑色。

2026-01-30 09:47:15 +08:00
parent 3977e3e158
commit dfc64d7a14
5 changed files with 73 additions and 46 deletions
--- a/BaseModule/src/main/java/com/xscm/moduleutil/activity/BaseAppCompatActivity.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/activity/BaseAppCompatActivity.java
@@ -30,6 +30,7 @@ import com.blankj.utilcode.util.BarUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.hjq.toast.ToastUtils;
 import com.xscm.moduleutil.R;
+import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.dialog.LoadingDialog;
 import com.xscm.moduleutil.utils.BackgroundManager;
 import com.xscm.moduleutil.utils.ColorManager;
@@ -84,7 +85,7 @@ public abstract class BaseAppCompatActivity<VDB extends ViewDataBinding> extends
    @SuppressLint("UnspecifiedRegisterReceiverFlag")
    @Override
    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        initFestivalTheme(2);
+        initFestivalTheme(CommonAppContext.getInstance().is_open);
        super.onCreate(savedInstanceState);
        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
 //        getWindow().getDecorView().setBackgroundResource(R.attr.app_bg_img);
@@ -124,10 +125,10 @@ public abstract class BaseAppCompatActivity<VDB extends ViewDataBinding> extends
                setTheme(R.style.AppTheme_CustomAttrs);
                break;
            case 1:
-                setTheme(R.style.AppTheme_newYear_CustomAttrs);
+                setTheme(R.style.AppTheme_Spring_CustomAttrs);
                break;
            case 2:
-                setTheme(R.style.AppTheme_Spring_CustomAttrs);
+                setTheme(R.style.AppTheme_newYear_CustomAttrs);
                break;
            default:
                // 默认皮肤
--- a/BaseModule/src/main/res/values/themes.xml
+++ b/BaseModule/src/main/res/values/themes.xml
@@ -11,6 +11,7 @@
        <item name="android:windowTranslucentStatus">false</item>
        <item name="android:windowLightStatusBar">true</item>
        <item name="android:windowDisablePreview">true</item>
+        <item name="android:windowBackground">@mipmap/log_bj</item>
        <!-- 新增：全局禁用跳转动画 -->
        <item name="android:windowAnimationStyle">@style/NoAnimationStyle</item>
    </style>
@@ -58,11 +59,6 @@
        <item name="app_main_dialog_refill_bg_day">@mipmap/heaven_bj</item>


-
-
-
-
-
        <item name="app_user_bg_color">#231F2C</item>

        <item name="app_user_edit_me">@mipmap/me_edit</item>
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java
@@ -38,6 +38,7 @@ import com.xscm.modulemain.activity.user.conacts.DailyTasksConacts;
 import com.xscm.modulemain.activity.user.presenter.DailyTasksPresenter;
 import com.xscm.modulemain.BaseMvpActivity;
 import com.xscm.modulemain.activity.WebViewActivity;
+import com.xscm.modulemain.dialog.DialogLoveStationDraw;
 import com.xscm.modulemain.dialog.DialogLuckyDraw;
 import com.xscm.modulemain.dialog.SignInDialog;
 import com.xscm.modulemain.manager.RoomManager;
@@ -206,12 +207,13 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
        });


-        mBinding.davLucky.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                new DialogLuckyDraw(DailyTasksActivity.this).show();
-            }
-        });
+//        mBinding.davLucky.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+////                new DialogLuckyDraw(DailyTasksActivity.this).show();
+//                new DialogLoveStationDraw(DailyTasksActivity.this,null).show();
+//            }
+//        });

    }

--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/DialogLoveStationDraw.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/DialogLoveStationDraw.kt
@@ -16,6 +16,7 @@ import com.opensource.svgaplayer.SVGAVideoEntity
 import com.scwang.smartrefresh.layout.api.RefreshLayout
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener
 import com.xscm.modulemain.R
+import com.xscm.modulemain.activity.room.activity.RoomActivity
 import com.xscm.modulemain.databinding.DialogLoveStationDrawLayoutBinding
 import com.xscm.moduleutil.bean.GiftBean
 import com.xscm.moduleutil.bean.WalletBean
@@ -27,9 +28,15 @@ import com.xscm.moduleutil.http.BaseObserver
 import com.xscm.moduleutil.http.RetrofitClient
 import com.xscm.moduleutil.utils.ImageUtils
 import com.xscm.moduleutil.widget.dialog.BaseDialog
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
+import java.util.concurrent.TimeUnit

-class DialogLoveStationDraw(context: Context,val fragmentManager: FragmentManager,val roomSettingFragment: RoomSettingFragment) :
+class DialogLoveStationDraw(
+    context: Context,
+    val roomSettingFragment: RoomSettingFragment? = null
+) :
    BaseDialog<DialogLoveStationDrawLayoutBinding>(context) {

    init {
@@ -112,7 +119,7 @@ class DialogLoveStationDraw(context: Context,val fragmentManager: FragmentManage
        mBinding.ivMyRecord.setOnClickListener {
            //记录
            val giftLotteryDialogFragment = GiftLotteryDialogFragment.newInstance(mGiftBagId)
-            giftLotteryDialogFragment.show(fragmentManager, "GiftLotteryDialogFragment")
+            giftLotteryDialogFragment.show((ActivityUtils.getTopActivity() as RoomActivity).supportFragmentManager, "GiftLotteryDialogFragment")
        }


@@ -150,14 +157,18 @@ class DialogLoveStationDraw(context: Context,val fragmentManager: FragmentManage
    }


+    @SuppressLint("CheckResult")
    fun show(roomId: String, giftBagId: String) {
        super.show()
        mRoomId = roomId
        mGiftBagId = giftBagId
-        roomSettingFragment.dismiss()
+        roomSettingFragment?.dismiss()
        getUserWallet()
-        startAnimDefault()
        getLottery()
+        Observable.timer(500, TimeUnit.MILLISECONDS)
+            .observeOn(AndroidSchedulers.mainThread()).subscribe {
+                startAnimDefault()
+            }
    }

    private fun startAnimDefault() {
@@ -206,11 +217,16 @@ class DialogLoveStationDraw(context: Context,val fragmentManager: FragmentManage
                            if (resultList.isNotEmpty()) {
 //                                mBinding.recycleView.visibility = View.VISIBLE
 //                                itemAdapter?.setNewData(resultList)
-                                DialogLoveStationResult(context).show(mRoomId,mGiftBagId,currLottery, resultList, object : DialogLoveStationResult.OnResultListener {
-                                    override fun onLottery() {
-                                        getUserWallet()
-                                    }
-                                })
+                                DialogLoveStationResult(context).show(
+                                    mRoomId,
+                                    mGiftBagId,
+                                    currLottery,
+                                    resultList,
+                                    object : DialogLoveStationResult.OnResultListener {
+                                        override fun onLottery() {
+                                            getUserWallet()
+                                        }
+                                    })
                            }
                        }

@@ -235,6 +251,13 @@ class DialogLoveStationDraw(context: Context,val fragmentManager: FragmentManage
    }


+    override fun dismiss() {
+        mBinding.svgaAnim.stopAnimation(true)
+        mBinding.svgaAnimDefault.stopAnimation(true)
+        super.dismiss()
+    }
+
+
    class ItemAdapter :
        BaseQuickAdapter<BlindReslutBean.ReslutList, BaseViewHolder>(R.layout.item_lottery_gift_layout) {
        override fun convert(helper: BaseViewHolder, item: BlindReslutBean.ReslutList) {
@@ -245,7 +268,6 @@ class DialogLoveStationDraw(context: Context,val fragmentManager: FragmentManage
    }


-
    private fun startLottery(roomId: String, giftBagId: String, num: String) {
        RetrofitClient.getInstance().drawGiftList(
            giftBagId,
@@ -276,11 +298,16 @@ class DialogLoveStationDraw(context: Context,val fragmentManager: FragmentManage
                        isLottery = false
 //                        mBinding.recycleView.visibility = View.VISIBLE
 //                        itemAdapter?.setNewData(resultList)
-                        DialogLoveStationResult(context).show(mRoomId,mGiftBagId,currLottery, resultList, object : DialogLoveStationResult.OnResultListener {
-                            override fun onLottery() {
-                                getUserWallet()
-                            }
-                        })
+                        DialogLoveStationResult(context).show(
+                            mRoomId,
+                            mGiftBagId,
+                            currLottery,
+                            resultList,
+                            object : DialogLoveStationResult.OnResultListener {
+                                override fun onLottery() {
+                                    getUserWallet()
+                                }
+                            })
                    }
                }

@@ -289,7 +316,7 @@ class DialogLoveStationDraw(context: Context,val fragmentManager: FragmentManage

    private var ruleUrl = ""
    private var type = 38
-    private var prizePoolList:MutableList<GiftBean>? = null
+    private var prizePoolList: MutableList<GiftBean>? = null

    private fun getUserWallet() {
        RetrofitClient.getInstance().wallet(object : BaseObserver<WalletBean>() {
@@ -322,7 +349,7 @@ class DialogLoveStationDraw(context: Context,val fragmentManager: FragmentManage
                    mBinding.smartRefresh.finishRefresh()
                    mBinding.smartRefresh.finishLoadMore()

-                    if (giftBean.isNotEmpty()){
+                    if (giftBean.isNotEmpty()) {
                        return
                    }

@@ -346,24 +373,25 @@ class DialogLoveStationDraw(context: Context,val fragmentManager: FragmentManage
    }


-    private fun getLottery(){
-        RetrofitClient.getInstance().getBoxGiftList(mGiftBagId, mRoomId, object : BaseObserver<BlindBoxBean?>() {
-            override fun onSubscribe(d: Disposable) {
+    private fun getLottery() {
+        RetrofitClient.getInstance()
+            .getBoxGiftList(mGiftBagId, mRoomId, object : BaseObserver<BlindBoxBean?>() {
+                override fun onSubscribe(d: Disposable) {

-            }
+                }

-            @SuppressLint("SetTextI18n")
-            override fun onNext(blindBoxBeans: BlindBoxBean) {
-                val oneLottery = blindBoxBeans.box_price
+                @SuppressLint("SetTextI18n")
+                override fun onNext(blindBoxBeans: BlindBoxBean) {
+                    val oneLottery = blindBoxBeans.box_price

-                ruleUrl = blindBoxBeans.rule_url
-                prizePoolList = blindBoxBeans.gift_list
+                    ruleUrl = blindBoxBeans.rule_url
+                    prizePoolList = blindBoxBeans.gift_list

-                mBinding.tv1.text = oneLottery.toString()
-                mBinding.tv10.text = (oneLottery * 10).toString()
-                mBinding.tv20.text = (oneLottery * 20).toString()
-            }
-        })
+                    mBinding.tv1.text = oneLottery.toString()
+                    mBinding.tv10.text = (oneLottery * 10).toString()
+                    mBinding.tv20.text = (oneLottery * 20).toString()
+                }
+            })
    }


--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java
@@ -532,7 +532,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
                } else if (bean.getType() == QXRoomSettingTypeRoomBusinessLegend) {
                    new BoxMainDialog2((RoomActivity) getSelfActivity()).show(getChildFragmentManager(), "马迎新春");
                } else if(bean.getType() == QXRoomSettingTypeRoomBusinessLOVE){
-                    new DialogLoveStationDraw(getSelfActivity(),getChildFragmentManager(),RoomSettingFragment.this).show(roomId,"61");
+                    new DialogLoveStationDraw(getSelfActivity(),RoomSettingFragment.this).show(roomId,"61");
                }

            }