1：修改家族展示续签按钮位置

2：修改购买爵位前，先请求一次接口
3：修改所有CP更改为心动
4：修改挚友，初始获取数据变更成40条
5：未实名认证不能进行歌手认证

MainModule/src/main/java/com/xscm/modulemain/adapter/BosomFriendAdapter.kt

@@ -128,7 +128,16 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
 
                         if (remainingSeconds > 0) {
                             val days = remainingSeconds / (24 * 60 * 60)
-                            val hours = (remainingSeconds % (24 * 60 * 60)) / (60 * 60)
+                            val remainingHours = (remainingSeconds % (24 * 60 * 60)) / (60 * 60)
+                            val hasRemainingMinutes = (remainingSeconds % (60 * 60)) > 0
+
+                            val hours = if (days > 0) {
+                                remainingHours
+                            } else {
+                                // 当天数小于等于0时，如果有剩余分钟，则小时数+1
+                                if (hasRemainingMinutes) remainingHours + 1 else remainingHours
+                            }.coerceAtLeast(1) // 确保至少显示1小时
+
                             val timeText = if (days > 0) {
                                 "${days}天${hours}小时"
                             } else {
@@ -136,6 +145,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
                             }
                             holder.setText(R.id.tv_cp_num, timeText)
                         }
+
                     } catch (e: NumberFormatException) {
                         // 时间戳格式错误
                         holder.setVisible(R.id.tv_cp_num, false)

MainModule/src/main/java/com/xscm/modulemain/adapter/MyFamilyAdapter.kt

@@ -1,5 +1,6 @@
 package com.xscm.modulemain.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Color
 import android.view.View
@@ -18,6 +19,7 @@ import com.xscm.moduleutil.utils.ImageUtils
 import com.xscm.moduleutil.utils.MeHeadView
 import com.xscm.moduleutil.utils.SpUtil
 import com.xscm.moduleutil.widget.ShineTextView
+import java.text.DecimalFormat
 
 /**
  * 项目名称：羽声语音
@@ -41,6 +43,7 @@ class MyFamilyAdapter(
     fun setOnItemClickListener(listener: OnItemClickListener) {
         onItemClickListener = listener
     }
+    @SuppressLint("DefaultLocale")
     override fun convert(
         helper: BaseViewHolder,
         item: MyFamilyBean.GroupMembersListsBean
@@ -75,8 +78,12 @@ class MyFamilyAdapter(
         helper.setText(R.id.tv_time, "剩余租期"+item.end_day)
         helper.setText(R.id.tv_num, "免费续约次数"+ item.free_renewal)
 
-        helper.setText(R.id.tv_today, item.today_earnings)
-        helper.setText(R.id.tv_yesterday, item.yesterday_earnings)
+        val decimalFormat = DecimalFormat("#.####")
+        helper.setText(R.id.tv_today, decimalFormat.format(item.today_earnings.toDouble()))
+        helper.setText(R.id.tv_yesterday, decimalFormat.format(item.yesterday_earnings.toDouble()))
+
+
+//        helper.setText(R.id.tv_yesterday, item.yesterday_earnings)
         tvName.setText(item.nickname)
         if (item.nickname_color.isNotEmpty()){
             tvName.startColor = Color.parseColor(item.nickname_color)