From 9183342636958cc1d155ee3e00e4012c1d346645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Mon, 1 Dec 2025 10:29:34 +0800
Subject: [PATCH] =?UTF-8?q?1:=E6=B7=BB=E5=8A=A0=E5=9C=A8=E6=88=BF=E9=97=B4?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=9C=89=E5=B8=88=E5=82=85=E7=9A=84=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=EF=BC=8C=E5=B9=B6=E4=B8=94=E6=B7=BB=E5=8A=A0=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=BA=8B=E4=BB=B6=202=EF=BC=9A=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8F=EF=BC=8C=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=BB=E9=A1=B5=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=EF=BC=8C=E5=B1=95=E7=A4=BA=E5=B8=88=E5=82=85=E7=9A=84=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moduleutil/base/CommonAppContext.java     |   2 +-
 .../com/xscm/moduleutil/bean/MyFamilyBean.kt  |   2 ++
 .../com/xscm/moduleutil/bean/UserInfo.java    |   9 +++++++++
 .../xscm/moduleutil/http/RetrofitClient.java  |   3 +--
 .../com/xscm/moduleutil/utils/MeHeadView.java |  19 ++++++++++++++----
 .../res/layout/me_view_decoration_head.xml    |  12 +++++++++++
 .../src/main/res/mipmap-hdpi/icon_master.png  | Bin 0 -> 2468 bytes
 .../src/main/res/mipmap-xhdpi/icon_master.png | Bin 0 -> 3347 bytes
 .../main/res/mipmap-xxhdpi/icon_master.png    | Bin 0 -> 6173 bytes
 .../user/fragment/MyFamilyFragment.kt         |   8 ++++----
 .../user/fragment/UserHomepageFragment.java   |  12 +++++++++++
 .../dialog/RoomUserInfoFragment.java          |  14 ++++++++++++-
 .../res/layout/fragment_room_user_info.xml    |   2 +-
 13 files changed, 70 insertions(+), 13 deletions(-)
 create mode 100644 BaseModule/src/main/res/mipmap-hdpi/icon_master.png
 create mode 100644 BaseModule/src/main/res/mipmap-xhdpi/icon_master.png
 create mode 100644 BaseModule/src/main/res/mipmap-xxhdpi/icon_master.png

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
index 02c7e541..f38dff3d 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
@@ -161,7 +161,7 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
         //设置mqtt环境 false 测试环境 true 正式环境
 //      ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false);
         //设置http环境 false 测试环境 true 正式环境
-        ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(true);
+        ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(false);
         currentEnvironment = ExternalResConstants.INSTANCE.HTTP_PATH();
 
         initialization();
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/MyFamilyBean.kt b/BaseModule/src/main/java/com/xscm/moduleutil/bean/MyFamilyBean.kt
index f3ccc955..5ffebeb5 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/MyFamilyBean.kt
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/MyFamilyBean.kt
@@ -50,6 +50,8 @@ class MyFamilyBean {
         var sign_user_ratio : Int = 0 //非首签签约比例
         var end_day: String = "" //签约剩余时长
 
+        val free_re_sign_day : Int=0 //免费续签时长
+
     }
 
     /* "group_id": "string",
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
index 019b2afd..f5d7aadd 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
@@ -89,6 +89,15 @@ public class UserInfo extends BaseEvent implements Serializable {
     private String sign_value;
     private String sign_id;
 
+    private Master master;
+
+    @Data
+    public static class Master implements Serializable {
+        private String user_id;
+        private String nickname;
+        private String avatar;
+    }
+
     /*"cp_info": {
       "name": "string",
               "user_id1": "string",
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
index 1762614a..7f7bce34 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
@@ -2567,8 +2567,7 @@ public class RetrofitClient {
         });
     }
 
-    public void getRoomUserInfo(String room_id, String
-            user_id, BaseObserver<UserInfo> observer) {
+    public void getRoomUserInfo(String room_id, String user_id, BaseObserver<UserInfo> observer) {
         sApiServer.getRoomUserInfo(room_id, user_id).enqueue(new Callback<BaseModel<UserInfo>>() {
             @Override
             public void onResponse(Call<BaseModel<UserInfo>> call, Response<BaseModel<UserInfo>> response) {
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/MeHeadView.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/MeHeadView.java
index a13b5d0b..e11d1037 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/MeHeadView.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/MeHeadView.java
@@ -23,6 +23,7 @@ public class MeHeadView extends ConstraintLayout {
     private ImageView mIvSex;
     private ImageView mIvOnline;
     private ImageView iv_frame_bg;
+    private ImageView iv_master_bg;
 
     public MeHeadView(Context context) {
         this(context, null, 0);
@@ -43,7 +44,8 @@ public class MeHeadView extends ConstraintLayout {
         mIvFrame = findViewById(R.id.iv_frame);
         mIvSex = findViewById(R.id.iv_sex);
         mIvOnline = findViewById(R.id.iv_online);
-        iv_frame_bg=findViewById(R.id.iv_frame_bg);
+        iv_frame_bg = findViewById(R.id.iv_frame_bg);
+        iv_master_bg = findViewById(R.id.iv_master_bg);
         mIvSex.setVisibility(GONE);
     }
 
@@ -59,21 +61,30 @@ public class MeHeadView extends ConstraintLayout {
             mIvFrame.setSource(framePicture, 1);
         }
 
-        if (nobilityImage!=null && !TextUtils.isEmpty(nobilityImage)){
+        if (nobilityImage != null && !TextUtils.isEmpty(nobilityImage)) {
             iv_frame_bg.setVisibility(VISIBLE);
             ImageUtils.loadRoomItem(nobilityImage, iv_frame_bg);
-        }else {
+        } else {
             iv_frame_bg.setVisibility(GONE);
         }
 
     }
 
+    public void setMaster(String headPicture) {
+        if (!TextUtils.isEmpty(headPicture)) {
+            ImageUtils.loadHead(headPicture, mRiv);
+        }
+
+        iv_master_bg.setVisibility(VISIBLE);
+        iv_master_bg.setImageResource(R.mipmap.icon_master);
+    }
+
     public void setOnline(boolean isOnline) {
         mIvOnline.setVisibility(VISIBLE);
         mIvOnline.setImageResource(isOnline ? R.mipmap.me_online_icon : R.mipmap.me_icon_unchecked);
     }
 
-    public void setSex(int sex,String headPicture,String dress) {
+    public void setSex(int sex, String headPicture, String dress) {
         if (!TextUtils.isEmpty(headPicture)) {
             ImageUtils.loadHead(headPicture, mRiv);
         }
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 20563f59..28ca2994 100644
--- a/BaseModule/src/main/res/layout/me_view_decoration_head.xml
+++ b/BaseModule/src/main/res/layout/me_view_decoration_head.xml
@@ -65,6 +65,18 @@
         tools:src="@mipmap/me_sj"
         android:visibility="gone"/>
 
+    <ImageView
+        android:id="@+id/iv_master_bg"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:contentDescription="@null"
+        android:scaleType="fitCenter"
+        app:layout_constraintHeight_default="spread"
+        app:layout_constraintTop_toTopOf="@+id/guideline"
+        app:layout_constraintWidth_default="spread"
+        tools:src="@mipmap/icon_master"
+        android:visibility="gone"/>
+
     <ImageView
         android:id="@+id/iv_online"
         android:layout_width="@dimen/dp_13"
diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_master.png b/BaseModule/src/main/res/mipmap-hdpi/icon_master.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fcc242e4c80356cac39784cfc93c0918f035701
GIT binary patch
literal 2468
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

literal 0
HcmV?d00001

diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_master.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_master.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ca7cf69e2c710a25a77d7ffd3ea26dddce14ea9
GIT binary patch
literal 3347
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

literal 0
HcmV?d00001

diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_master.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_master.png
new file mode 100644
index 0000000000000000000000000000000000000000..188a25572cdf3f17ca8e38cc3f8ac912a1ba1fdf
GIT binary patch
literal 6173
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

literal 0
HcmV?d00001

diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/MyFamilyFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/MyFamilyFragment.kt
index db3d73d1..5fe7b4e4 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/MyFamilyFragment.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/MyFamilyFragment.kt
@@ -163,7 +163,7 @@ class MyFamilyFragment(var data: MyFamilyBean) : BaseFragment<FragmentMyFamilyBi
                 if (item.free_renewal > 0) {
                     queren1(
                         1,
-                        onMessage(1, item.nickname, item.free_renewal, null, null, null),
+                        onMessage(1, item.nickname, item.free_renewal, item.free_re_sign_day, null, null),
                         item.user_id.toString()
                     )
                 } else {
@@ -194,15 +194,15 @@ class MyFamilyFragment(var data: MyFamilyBean) : BaseFragment<FragmentMyFamilyBi
         type: Int,//类型 1：免费续约  2：续签 花金币
         userName: String? = null, //当前徒弟的名称
         remainingCount: Int? = 0, //当前免费续签次数
-        percentage: Int? = null, //身价的百分比，是按照这个进行扣款的
+        percentage: Int? = null, //当type==1的时候，这个值是合约延续的时间，type=2的时候，身价的百分比，是按照这个进行扣款的
         days: Int? = null,// 花钱后最总的时长
         userValue: Int? = null //当前徒弟的身价
     ): SpannableString {
         return when (type) {
-            1 -> SpannableString("尊敬的用户：\n 您的徒弟【${userName ?: "?"}】当前为首次签约的免费签约期。续约后，师徒合约将延续7天，您剩余的免费续约次数：${remainingCount ?: "?"} 次")
+            1 -> SpannableString("尊敬的用户：\n 您的徒弟【${userName ?: "?"}】当前为首次签约的免费签约期。续约后，师徒合约将延续${percentage}天，您剩余的免费续约次数：${remainingCount ?: "?"} 次")
             2 -> {
                 // 计算预估金币数，向上取整
-                val actualUserValue = userValue ?: 1000 // 如果未提供用户身价，默认使用1000
+                val actualUserValue = userValue ?: 10 // 如果未提供用户身价，默认使用1000
                 val percentageValue = percentage ?: 10
                 val estimatedCoins =
                     kotlin.math.ceil(actualUserValue * percentageValue / 100.0).toInt()
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java
index 415865fc..8cca6ca5 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java
@@ -20,6 +20,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.ActivityUtils;
 import com.google.android.flexbox.FlexboxLayout;
 import com.tencent.imsdk.v2.V2TIMConversation;
@@ -42,6 +43,7 @@ import com.xscm.moduleutil.bean.RelationshipBean;
 import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.bean.UserTagBean;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
+import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.SpUtil;
@@ -168,6 +170,13 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
             mBinding.headerInfo.imBeautiful.setVisibility(View.GONE);
         }
 
+        if(userInfo.getMaster()!=null){
+            mBinding.headerInfo.ivRightAvatar.setVisibility(VISIBLE);
+            mBinding.headerInfo.ivRightAvatar.setMaster(userInfo.getMaster().getAvatar());
+        }else {
+            mBinding.headerInfo.ivRightAvatar.setVisibility(GONE);
+        }
+
 
         if (!userInfo.getIcon().isEmpty()){
             mBinding.headerInfo.flexEntry.setVisibility(VISIBLE);
@@ -217,6 +226,7 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
 
         mBinding.headerInfo.tvGz.setOnClickListener(this::onClick);
         mBinding.headerInfo.tvGsSx.setOnClickListener(this::onClick);
+        mBinding.headerInfo.ivRightAvatar.setOnClickListener(this::onClick);
         refreshView();
         if (userInfo.getGuild() == null || userInfo.getGuild().isEmpty()) {
             mBinding.headerInfo.ctlGuild.setVisibility(View.GONE);
@@ -366,6 +376,8 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
             Intent intent=new Intent(getContext(), GiftWallActivity.class);
             intent.putExtra("userId",userInfo.getUser_id());
             startActivity(intent);
+        }else if (view.getId()==R.id.iv_right_avatar){
+            ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId",userInfo.getMaster().getUser_id()).navigation();
         }
     }
 
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
index 43896cee..86a42258 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
@@ -180,11 +180,11 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
         mBinding.textView2.setOnClickListener(this::onClick);
         mBinding.moreButton.setOnClickListener(this::onClick);
         mBinding.imQml.setOnClickListener(this::onClick);
+        mBinding.ivRightAvatar.setOnClickListener(this::onClick);
 
 //        ThemeableDrawableUtils.setThemeableRoundedBackground(mBinding.roomMCz, ColorManager.getInstance().getPrimaryColorInt(), 65);
 //        mBinding.roomMCz.setTextColor(ColorManager.getInstance().getButtonColorInt());
         mBinding.moreButton.setTextColor(ColorManager.getInstance().getPrimaryColorInt());
-
     }
 
 
@@ -275,6 +275,11 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
             MvpPre.clearUserCharm(room_id, user_id);
         } else if (id == R.id.im_gs) {
             RoomManager.getInstance().fetchRoomDataAndEnter(getActivity(), room_id, "", null);
+        }else if (id == R.id.iv_right_avatar){
+            if(userInfo.getMaster()!=null && userInfo.getMaster().getUser_id()!=null) {
+                ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", userInfo.getMaster().getUser_id() + "").navigation();
+                dismiss();
+            }
         }
     }
 
@@ -463,6 +468,13 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
             mBinding.tvName.setShineType(0);
         }
 
+        if(userInfo.getMaster()!=null){
+            mBinding.ivRightAvatar.setVisibility(VISIBLE);
+            mBinding.ivRightAvatar.setMaster(userInfo.getMaster().getAvatar());
+        }else {
+            mBinding.ivRightAvatar.setVisibility(GONE);
+        }
+
 //        mBinding.tvName.setTextColor( (userInfo.getNickname_color()!=null && !userInfo.getNickname_color().equals(""))? Color.parseColor(userInfo.getNickname_color()):Color.parseColor("#333333"));
 //        mBinding.tvId.setText("ID:" + userInfo.getUser_code());
         if (userInfo.getIs_in_pit() == 1) {
diff --git a/MainModule/src/main/res/layout/fragment_room_user_info.xml b/MainModule/src/main/res/layout/fragment_room_user_info.xml
index 2476e047..1b038aa9 100644
--- a/MainModule/src/main/res/layout/fragment_room_user_info.xml
+++ b/MainModule/src/main/res/layout/fragment_room_user_info.xml
@@ -35,7 +35,7 @@
                 android:id="@+id/iv_right_avatar"
                 android:layout_width="@dimen/dp_44"
                 android:layout_height="@dimen/dp_44"
-                android:layout_marginStart="-15dp"
+                android:layout_marginStart="-6dp"
                 android:visibility="gone"
                 app:layout_constraintStart_toEndOf="@+id/iv_avatar"
                 app:layout_constraintTop_toTopOf="@+id/iv_avatar" />