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

2：修改购买爵位前，先请求一次接口 3：修改所有CP更改为心动 4：修改挚友，初始获取数据变更成40条 5：未实名认证不能进行歌手认证
2025-12-04 15:20:05 +08:00
parent 0f0c2d97cc
commit 46b0a856fe
11 changed files with 155 additions and 159 deletions
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/NobleDetailsActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/NobleDetailsActivity.java
@@ -61,11 +61,7 @@ public class NobleDetailsActivity extends BaseMvpActivity<NobleTitlePresenter, A
        gridView = mBinding.gridView;
        mGiftWallAdapter=new GridNobleAdapter();
        mBinding.imLjkt.setOnClickListener(v -> {
-            Intent intent = new Intent(this, NoblePaymentActivity.class);
-            Bundle bundle = new Bundle();
-            bundle.putString("lid",xlid);
-            intent.putExtras( bundle);
-            startActivity(intent);
+            MvpPre.getNobilityPrice(xlid);
        });
    }

@@ -152,7 +148,11 @@ public class NobleDetailsActivity extends BaseMvpActivity<NobleTitlePresenter, A

    @Override
    public void getNobilityPrice(NobilityPrice nobilityPrice) {
-
+        Intent intent = new Intent(this, NoblePaymentActivity.class);
+        Bundle bundle = new Bundle();
+        bundle.putString("lid",xlid);
+        intent.putExtras( bundle);
+        startActivity(intent);
    }

    @SuppressLint("SetTextI18n")
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/NobleTitleActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/NobleTitleActivity.java
@@ -74,11 +74,7 @@ public class NobleTitleActivity extends BaseMvpActivity<NobleTitlePresenter, Act
            intent.putExtras(bundle);
            startActivity(intent);
        }else if (id== R.id.im_me_noble_xf) {
-            Intent intent = new Intent(this, NoblePaymentActivity.class);
-            Bundle bundle = new Bundle();
-            bundle.putString("lid",lid);
-            intent.putExtras(bundle);
-            startActivity(intent);
+            MvpPre.getNobilityPrice(lid);
        }
    }

@@ -251,7 +247,11 @@ public class NobleTitleActivity extends BaseMvpActivity<NobleTitlePresenter, Act

    @Override
    public void getNobilityPrice(NobilityPrice nobilityPrice) {
-
+        Intent intent = new Intent(this, NoblePaymentActivity.class);
+        Bundle bundle = new Bundle();
+        bundle.putString("lid",lid);
+        intent.putExtras(bundle);
+        startActivity(intent);
    }

    // 在 Activity 或 Fragment 中
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ui/main/BosomFriendFragment.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ui/main/BosomFriendFragment.kt
@@ -67,7 +67,7 @@ class BosomFriendFragment : BaseMvpFragment<UserHomepagePresenter?, FragmentBoso
        page = 1 // 重置页码
        // 如果已经初始化完成，立即获取数据
        if (isAdded) {
-            MvpPre?.getFriendList(userId, page.toString(), "10") // 获取第一页数据
+            MvpPre?.getFriendList(userId, page.toString(), "40") // 获取第一页数据
        }
    }

@@ -77,7 +77,7 @@ class BosomFriendFragment : BaseMvpFragment<UserHomepagePresenter?, FragmentBoso
    override fun initData() {
        // 根据userId获取挚友列表数据
        if (userId.isNotEmpty()) {
-            MvpPre?.getFriendList(userId, page.toString(), "10") // 初始加载第一页数据
+            MvpPre?.getFriendList(userId, page.toString(), "40") // 初始加载第一页数据
        }

        // 观察ViewModel中的数据变化
@@ -157,19 +157,19 @@ class BosomFriendFragment : BaseMvpFragment<UserHomepagePresenter?, FragmentBoso
        // 设置下拉刷新
        mBinding.smartRefreshLayout.setOnRefreshListener {
            page = 1 // 重置页码
-            MvpPre?.getFriendList(userId, page.toString(), "10")
+            MvpPre?.getFriendList(userId, page.toString(), "40")
        }

        mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(object :
            OnRefreshLoadMoreListener {
            override fun onLoadMore(refreshLayout: RefreshLayout) {
                page++
-                MvpPre?.getFriendList(userId, page.toString(), "10")
+                MvpPre?.getFriendList(userId, page.toString(), "40")
            }

            override fun onRefresh(refreshLayout: RefreshLayout) {
                page = 1 // 重置页码
-                MvpPre?.getFriendList(userId, page.toString(), "10")
+                MvpPre?.getFriendList(userId, page.toString(), "40")
            }
        })

@@ -261,12 +261,12 @@ class BosomFriendFragment : BaseMvpFragment<UserHomepagePresenter?, FragmentBoso

    override fun topRelationCard(s: String?) {
        page = 1 // 重置页码
-        MvpPre?.getFriendList(userId, page.toString(), "10")
+        MvpPre?.getFriendList(userId, page.toString(), "40")
    }

    override fun deleteRelationCard(s: String?) {
        page = 1 // 重置页码
-        MvpPre?.getFriendList(userId, page.toString(), "10")
+        MvpPre?.getFriendList(userId, page.toString(), "40")
    }

    override fun setFriendListMore(data: List<RelationshipBean?>?) {
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java
@@ -17,7 +17,9 @@ import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

+import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.LogUtils;
+import com.hjq.toast.ToastUtils;
 import com.stx.xhb.xbanner.XBanner;
 import com.tencent.mm.opensdk.modelbiz.WXOpenCustomerServiceChat;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
@@ -45,6 +47,7 @@ import com.xscm.modulemain.activity.user.presenter.MePresenter;
 import com.xscm.modulemain.activity.WebViewActivity;
 import com.xscm.modulemain.dialog.UserNetWorthDialog;
 import com.xscm.moduleutil.base.WebUrlConstants;
+import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.widget.ShineTextView;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.base.CommonAppContext;
@@ -271,6 +274,11 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
        } else if (id == R.id.cl_noble_title) {//爵位展示页面
            startActivity(new Intent(getContext(), NobleTitleActivity.class));
        } else if (id == R.id.ll_singer) {//歌手认证
+            if (!SpUtil.getRealName()) {
+                ToastUtils.show("实名认证后才能进行歌手认证");
+                ARouter.getInstance().build(ARouteConstants.REAL_NAME_ACTIVITY2).navigation();
+                return;
+            }
            Intent intent = new Intent(getContext(), SingerVerificationActivity.class);
            intent.putExtra("isSinger", userInfo.getSinger_status());
            startActivity(intent);
--- a/MainModule/src/main/java/com/xscm/modulemain/adapter/BosomFriendAdapter.kt
+++ b/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)
--- a/MainModule/src/main/java/com/xscm/modulemain/adapter/MyFamilyAdapter.kt
+++ b/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)
--- a/MainModule/src/main/res/layout/fragment_bosom_friend.xml
+++ b/MainModule/src/main/res/layout/fragment_bosom_friend.xml
@@ -82,7 +82,7 @@
                                android:layout_height="wrap_content"
                                android:background="@mipmap/icon_dialog_u_cp_left_top"
                                android:gravity="center"
-                                android:text="CP"
+                                android:text="心动"
                                android:textColor="@color/white" />

                            <LinearLayout
@@ -93,7 +93,7 @@
                                android:layout_toStartOf="@+id/ll_middle"
                                android:orientation="vertical">

-                                <com.makeramen.roundedimageview.RoundedImageView
+                                <com.xscm.moduleutil.widget.CircularImage
                                    android:id="@+id/user_nav1"
                                    android:layout_width="@dimen/dp_50"
                                    android:layout_height="@dimen/dp_50"
@@ -162,7 +162,7 @@
                                android:layout_toEndOf="@+id/ll_middle"
                                android:orientation="vertical">

-                                <com.makeramen.roundedimageview.RoundedImageView
+                                <com.xscm.moduleutil.widget.CircularImage
                                    android:id="@+id/user_nav2"
                                    android:layout_width="@dimen/dp_50"
                                    android:layout_height="@dimen/dp_50"
--- a/MainModule/src/main/res/layout/item_family_members.xml
+++ b/MainModule/src/main/res/layout/item_family_members.xml
@@ -141,7 +141,7 @@

        <TextView
            android:id="@+id/tv_today"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginBottom="@dimen/dp_4"
            android:drawableStart="@mipmap/zs_tb"
@@ -158,9 +158,10 @@
        android:layout_height="wrap_content"
        android:orientation="vertical"
        app:layout_constraintTop_toBottomOf="@+id/tv_num"
+        app:layout_constraintEnd_toEndOf="parent"
        android:layout_marginStart="@dimen/dp_5"
+        android:layout_marginEnd="@dimen/dp_8"
        app:layout_constraintStart_toEndOf="@+id/l1"
-        app:layout_constraintEnd_toStartOf="@+id/tv_renew"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintHorizontal_weight="1"
        android:layout_marginBottom="@dimen/dp_12"
@@ -188,7 +189,7 @@

        <TextView
            android:id="@+id/tv_yesterday"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginBottom="@dimen/dp_4"
            android:drawableStart="@mipmap/zs_tb"
@@ -199,15 +200,13 @@
            tools:text="9999.99"/>
    </LinearLayout>

+
    <TextView
        android:id="@+id/tv_renew"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_50"
        android:layout_height="wrap_content"
        android:text="续租"
-        app:layout_constraintStart_toEndOf="@+id/l2"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginStart="@dimen/dp_6"
-        android:layout_marginBottom="@dimen/dp_12"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_num"
        app:layout_constraintEnd_toEndOf="parent"
        android:layout_marginEnd="@dimen/dp_8"
        android:paddingHorizontal="@dimen/dp_5"
@@ -215,10 +214,8 @@
        android:textColor="@color/white"
        android:background="@drawable/cs"
        android:textSize="@dimen/sp_12"
-        app:layout_constraintHorizontal_weight="0.7"
        android:gravity="center"
-        android:visibility="invisible"/>
-
+        android:visibility="gone"/>

 </androidx.constraintlayout.widget.ConstraintLayout>

--- a/MainModule/src/main/res/layout/user_top.xml
+++ b/MainModule/src/main/res/layout/user_top.xml
@@ -330,7 +330,7 @@
                    android:layout_height="wrap_content"
                    android:background="@mipmap/icon_dialog_u_cp_left_top"
                    android:gravity="center"
-                    android:text="CP"
+                    android:text="心动"
                    android:textColor="@color/white" />

                <LinearLayout