YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1:添加在房间点击用户头像，展示有师傅的头像，并且添加点击事件

Browse Source 
2：点击用户头像，进入用户主页的时候，展示师傅的头像
This commit is contained in:
梁小江
2025-12-01 10:29:34 +08:00
parent fd9af6a253
commit 9183342636
13 changed files with 70 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/MyFamilyFragment.kt
View File

@@ -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()

12
MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java
View File

@@ -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();
}
}

14
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
View File

@@ -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) {