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 observer) { + public void getRoomUserInfo(String room_id, String user_id, BaseObserver observer) { sApiServer.getRoomUserInfo(room_id, user_id).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> 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"/> + + 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 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