From dfc64d7a14ba9232a96fc370c0e5fa0f3ec9ecf9 Mon Sep 17 00:00:00 2001 From: lzl <1239365383@qq.com> Date: Fri, 30 Jan 2026 09:47:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=94=80=E8=AE=B8=E6=84=BF=E5=8D=A1?= =?UTF-8?q?=EF=BC=8C=E7=88=B1=E8=B1=86=E8=AE=A1=E5=88=92=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E9=97=AA=E9=80=80=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E5=86=85=E9=A1=B5=E9=BB=91=E8=89=B2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/BaseAppCompatActivity.java | 7 +- BaseModule/src/main/res/values/themes.xml | 6 +- .../user/activity/DailyTasksActivity.java | 14 +-- .../dialog/DialogLoveStationDraw.kt | 90 ++++++++++++------- .../dialog/RoomSettingFragment.java | 2 +- 5 files changed, 73 insertions(+), 46 deletions(-) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/activity/BaseAppCompatActivity.java b/BaseModule/src/main/java/com/xscm/moduleutil/activity/BaseAppCompatActivity.java index 615f81f1..8bfcb25b 100644 --- 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 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 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: // 默认皮肤 diff --git a/BaseModule/src/main/res/values/themes.xml b/BaseModule/src/main/res/values/themes.xml index 9012c7ab..c6cd2f7c 100644 --- a/BaseModule/src/main/res/values/themes.xml +++ b/BaseModule/src/main/res/values/themes.xml @@ -11,6 +11,7 @@ false true true + @mipmap/log_bj @style/NoAnimationStyle @@ -58,11 +59,6 @@ @mipmap/heaven_bj - - - - - #231F2C @mipmap/me_edit diff --git 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 index b7650924..141ecad4 100644 --- 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(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(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? = null + private var prizePoolList: MutableList? = null private fun getUserWallet() { RetrofitClient.getInstance().wallet(object : BaseObserver() { @@ -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() { - override fun onSubscribe(d: Disposable) { + private fun getLottery() { + RetrofitClient.getInstance() + .getBoxGiftList(mGiftBagId, mRoomId, object : BaseObserver() { + 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() + } + }) } diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java index dae803c3..eaf23b5c 100644 --- 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