From be09d0e7923b97f311de1f2b2bcfc6c97c40e9f8 Mon Sep 17 00:00:00 2001 From: lzl <1239365383@qq.com> Date: Fri, 12 Dec 2025 19:23:35 +0800 Subject: [PATCH] =?UTF-8?q?84=20=E8=B7=B3=E8=BD=AC=E6=88=BF=E9=97=B4=20tas?= =?UTF-8?q?kid=3Dnull,fix=20bugs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xscm/moduleutil/utils/TimeUtils.java | 21 ++++++ .../res/layout/me_view_decoration_head.xml | 2 +- .../java/com/xscm/modulemain/Application.kt | 2 +- .../com/xscm/modulemain/BaseMvpActivity.java | 3 + .../room/fragment/RoomJukeboxFragment.java | 5 +- .../room/fragment/RoomMentorShipFragment.kt | 70 +++++++++++-------- .../user/activity/DailyTasksActivity.java | 22 ++++-- .../activity/user/activity/HeartCpActivity.kt | 6 +- .../main/res/layout/fragment_mentor_ship.xml | 13 ++-- 9 files changed, 92 insertions(+), 52 deletions(-) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/TimeUtils.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/TimeUtils.java index ebd61b7e..3ff66af2 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/TimeUtils.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/TimeUtils.java @@ -1,5 +1,7 @@ package com.xscm.moduleutil.utils; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -258,6 +260,25 @@ public class TimeUtils { return "1天"; // 或者 return "0天"; } + + /** + * 计算时间差值并向上取整为天数 + * @param currentTimeMillis 当前时间（毫秒级时间戳） + * @param createTimeSecond 创建时间（秒级时间戳） + * @return 向上取整后的天数 + */ + public static int calculateDays(long currentTimeMillis, long createTimeSecond) { + // 1. 计算时间差（毫秒） + long timeDiffMillis = currentTimeMillis - createTimeSecond; + + // 2. 转换为天数（1天 = 24*60*60*1000 毫秒） + BigDecimal daysDecimal = new BigDecimal(timeDiffMillis) + .divide(new BigDecimal(24 * 60 * 60 * 1000), 10, RoundingMode.HALF_UP); + + // 3. 向上取整（即使是 8.0001 天也会变成 9 天） + return daysDecimal.setScale(0, RoundingMode.CEILING).intValue(); + } + /** * 根据生日字符串计算年龄 * @param birthDay 生日字符串，格式为 "yyyy-MM-dd" diff --git a/BaseModule/src/main/res/layout/me_view_decoration_head.xml b/BaseModule/src/main/res/layout/me_view_decoration_head.xml index 2ab25571..12682e45 100644 --- a/BaseModule/src/main/res/layout/me_view_decoration_head.xml +++ b/BaseModule/src/main/res/layout/me_view_decoration_head.xml @@ -43,7 +43,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_1" android:orientation="horizontal" - app:layout_constraintGuide_percent="0.59" /> + app:layout_constraintGuide_percent="0.62" /> { when (mBinding.ivApplyForMai.tag) { ivForMai[0] -> { + mBinding.ivApplyForMai.isClickable = false MvpPre!!.applyPit(mRoomInfo?.room_info?.room_id!!, "") } @@ -265,6 +266,7 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : } } + @SuppressLint("CheckResult") private fun showBtn(isSignUser: Boolean = false) { if (isStart) { mBinding.tvTimeLeft.text = startOrDelay[1] @@ -272,12 +274,18 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : mBinding.groupLeftPrice.visibility = View.VISIBLE if (getHostUser() < 4) { mBinding.tvTimeRight.visibility = View.VISIBLE + }else{ + mBinding.tvTimeRight.visibility = View.GONE } } else { mBinding.tvTimeLeft.text = startOrDelay[0] - mBinding.tvTimeLeft.visibility = View.GONE - mBinding.tvTime.visibility = View.GONE + mBinding.tvTimeRight.visibility = View.GONE + mBinding.tvTime.visibility = View.GONE + + mBinding.tvTimeLeft.visibility = View.GONE + + mBinding.groupLeftPrice.visibility = View.GONE if (!isSignUser) { mBinding.tvLeftPrice.text = "0" @@ -287,18 +295,31 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : mBinding.tvTime.text = "倒计时 00:00:00" setIvForMai(0) } - LogUtils.e( - "showBtn", - "showBtn: $isSignUser isStart: $isStart viewList[0].pitBean.user_id: ${viewList[0].pitBean.user_id} mSignPitBean?.user_id: ${mSignPitBean?.user_id} mRoomInfo?.user_info?.user_id: ${mRoomInfo?.user_info?.user_id} mUserInfo?.user_id: ${mUserInfo?.user_id}" - ) - if (viewList[0].pitBean.user_id.equals(mUserInfo?.user_id.toString()) && !mSignPitBean?.user_id.equals( - "0" - ) - ) { + + if (viewList[0].pitBean.user_id.equals(mUserInfo?.user_id.toString()) && !mSignPitBean?.user_id.equals("0")) { mBinding.tvTimeLeft.visibility = View.VISIBLE } else { mBinding.tvTimeLeft.visibility = View.GONE } + Observable.timer(200, TimeUnit.MILLISECONDS).observeOn(AndroidSchedulers.mainThread()) + .subscribe { aLong: Long? -> + startActivity( + Intent( + ActivityUtils.getTopActivity(), + TransparentActivity::class.java + ) + ) + } + LogUtils.e( + "showBtn", + "showBtn: $isSignUser isStart: $isStart \n viewList[0].pitBean.user_id: ${viewList[0].pitBean.user_id} " + + "\n mSignPitBean?.user_id: ${mSignPitBean?.user_id} " + + "\n mRoomInfo?.user_info?.user_id: ${mRoomInfo?.user_info?.user_id} " + + "\n mUserInfo?.user_id: ${mUserInfo?.user_id}" + + "\n mBinding.tvTimeRight: ${mBinding.tvTimeRight.visibility == View.VISIBLE}" + + "\n mBinding.tvTime: ${mBinding.tvTime.visibility == View.VISIBLE}" + + "\n mBinding.tvTimeLeft: ${mBinding.tvTimeLeft.visibility == View.VISIBLE}" + ) } @@ -345,6 +366,8 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : * sign_id ：场次id（这个出价的时候要传回来） */ fun event1090(messageEvent: RoomMessageEvent?) { + mBinding.ivApplyForMai.isClickable = true + mSignId = messageEvent?.text?.sign_id val endTime = messageEvent?.text?.end_time val signDay = messageEvent?.text?.sign_day @@ -354,7 +377,6 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : signTypeDialog?.show(0) - mBinding.tvTimeLeft.text = startOrDelay[1] mBinding.tvLeftPrice.text = currBodyValue mBinding.tvSignDay.visibility = View.VISIBLE @@ -385,17 +407,6 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : pitBean.charm = fromUserInfo.charm viewList[indexList.indexOf("2")].setData(pitBean) - //当前麦上出价，需要更麦上数据 -// for (i in 0 until viewList.size) { -// if(i == 1 || i == 2){ -// continue -// } -// if (viewList[i].pitBean?.user_id != "0" && viewList[i].pitBean?.user_id == pitBean.user_id) { -// viewList[i].setData(mRoomInfo?.room_info?.pit_list!![indexList[i].toInt() - 1]) -// } -// } - - if (dialogMentorShip != null && dialogMentorShip?.isShowing!!) { MvpPre!!.signCoinList(mSignId!!) } @@ -447,8 +458,6 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : override fun onItemClick(coin: String) { dialogMentorShip?.setClickable(false) - - MvpPre!!.signCoin(mSignId!!, coin) } }) @@ -488,6 +497,7 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : private fun updateTimerDisplay(time: String) { // 在这里更新你的UI，比如： mBinding.tvTime.text = "倒计时 ${time}" + LogUtils.e("updateTimerDisplay:"+mBinding.tvTime.text.toString() +"\n"+(mBinding.tvTime.visibility == View.VISIBLE)) } // 延迟后重新开始计时 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 94a89af1..f991ebca 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 @@ -134,7 +134,15 @@ public class DailyTasksActivity extends BaseMvpActivity { + mBinding.coolWaitView.setVisibility(View.GONE); + }); + } + } @Override protected int getLayoutId() { return R.layout.activity_daily_tasks; @@ -205,9 +213,15 @@ public class DailyTasksActivity extends BaseMvpActivity { mBinding.coolWaitView.setVisibility(View.GONE); + + if (!isFinishing()){ + finish(); + } }); + } + @Override public void dailyTasksOpenBox(GiftName giftName) { ToastUtils.show(giftName.getGift_name()); @@ -259,12 +273,12 @@ public class DailyTasksActivity extends BaseMvpActivity @@ -68,10 +69,7 @@ android:text="开始" android:textColor="@color/white" android:textSize="@dimen/sp_13" - android:visibility="gone" - app:layout_constraintBottom_toBottomOf="@id/tv_time" - app:layout_constraintEnd_toStartOf="@id/tv_time" - app:layout_constraintTop_toTopOf="@id/tv_time" /> + android:visibility="gone"/> + android:visibility="gone" />