fix bugs.

This commit is contained in:
2025-12-05 10:48:31 +08:00
parent fbc2a57593
commit 4136077e98
15 changed files with 96 additions and 21 deletions

View File

@@ -4,6 +4,7 @@ import android.Manifest;
import android.app.Activity;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Color;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -289,7 +290,7 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
RecyclerView recyclerView = dialog.findViewById(R.id.rv_options);
TextView btnCancel = dialog.findViewById(R.id.btn_cancel);
TextView btnConfirm = dialog.findViewById(R.id.btn_confirm);
btnConfirm.setTextColor(ColorManager.getInstance().getPrimaryColorInt());
btnConfirm.setTextColor(Color.WHITE);
assert recyclerView != null;
recyclerView.setLayoutManager(new LinearLayoutManager(this));

View File

@@ -29,6 +29,7 @@ import com.xscm.moduleutil.bean.WalletBean
import com.xscm.moduleutil.bean.room.RoomInfoResp
import com.xscm.moduleutil.bean.room.RoomPitBean
import com.xscm.moduleutil.bean.room.RoomUserBean
import com.xscm.moduleutil.dialog.ConfirmDialog
import com.xscm.moduleutil.utils.ClickUtils
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
@@ -233,7 +234,18 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
}
R.id.tv_time_right -> {
MvpPre.signEnd(mSignId!!)
// 创建并显示确认对话框
ConfirmDialog(
ActivityUtils.getTopActivity(),
"提示",
"确定要结束此次签约吗?",
"确认",
"取消",
{ v: View? ->
MvpPre.signEnd(mSignId!!)
},
{ v: View? -> }, false, 0
).show()
}
R.id.iv_help -> {
@@ -269,7 +281,7 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
mBinding.tvSignDay.visibility = View.GONE
}
mBinding.tvTime.text = "倒计时 00:00"
mBinding.tvTime.text = "倒计时 00:00:00"
setIvForMai(0)
}

View File

@@ -111,6 +111,11 @@ public class NoblePaymentActivity extends BaseMvpActivity<NobleTitlePresenter, A
ToastUtils.show("请先勾选服务条款");
return;
}
if (selectedItem.getType() == null) {
ToastUtils.show("请选择支付方式");
return;
}
MvpPre.appPay(SpUtil.getUserId() + "", money, selectedItem.getType(),lid);
}
}

View File

@@ -59,7 +59,7 @@ class MyFamilyFragment(var data: MyFamilyBean) : BaseFragment<FragmentMyFamilyBi
}
mBinding.tvFamilyGroup.setOnClickListener {
if (myFamilyBean.group_id.isNotEmpty()) {
if (!myFamilyBean.group_id.isNullOrEmpty()) {
val intent = Intent(activity, TUIGroupChatActivity::class.java)
intent.putExtra(TUIConstants.TUIChat.CHAT_ID, myFamilyBean.group_id)
intent.putExtra(TUIConstants.TUIChat.CHAT_NAME, myFamilyBean.name)

View File

@@ -34,11 +34,23 @@ class CountdownTimer {
job?.cancel()
}
/**
* 将毫秒数格式化为 HH:MM:SS 格式的时间字符串
* @param milliseconds 毫秒数(支持 0、负数、超大数值
* @return 格式化结果,如 3670000 毫秒 → 01:01:10125000 毫秒 → 00:02:05
*/
fun formatTime(milliseconds: Long): String {
val seconds = (milliseconds / 1000).toInt()
val minutes = seconds / 60
val remainingSeconds = seconds % 60
return String.format("%02d:%02d", minutes, remainingSeconds)
// 1. 处理负数/0转为非负避免时间为负
val nonNegativeMs = if (milliseconds < 0) 0 else milliseconds
// 2. 计算总秒数向下取整不足1秒按0算
val totalSeconds = (nonNegativeMs / 1000).toInt()
// 3. 拆分 小时、分钟、秒
val hours = totalSeconds / 3600 // 1小时=3600秒
val remainingSecondsAfterHour = totalSeconds % 3600 // 小时剩余秒数
val minutes = remainingSecondsAfterHour / 60 // 分钟
val seconds = remainingSecondsAfterHour % 60 // 秒
// 4. 格式化HH/MM/SS 均补0为2位如 1小时1分5秒 → 01:01:05
return String.format("%02d:%02d:%02d", hours, minutes, seconds)
}
}