diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java index cc971d1c9..6f87f2ac7 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java @@ -328,6 +328,7 @@ public class UserInfoActivity extends BaseBindingActivity 0) { + if (hallInfo != null && hallInfo.getHallId() > 0) { + mBinding.tvHallDetail.setText("公会.家族"); + } else { + mBinding.tvHallDetail.setText("家族"); + } mBinding.llModuleHall.setVisibility(View.VISIBLE); - mBinding.llHall.setVisibility(View.VISIBLE); + mBinding.llClan.setVisibility(View.VISIBLE); mBinding.tvClanId.setText("家族ID:" + clanInfo.getId()); mBinding.tvClanName.setText(clanInfo.getName()); - mBinding.tvClanMemberNum.setText("家族人数:" +clanInfo.getClanMemberNum()); + mBinding.tvClanMemberNum.setText("家族人数:" + clanInfo.getClanMemberNum()); mBinding.tvClanHallNum.setText("公会数量:" + clanInfo.getClanHallNum()); GlideApp.with(this) .load(clanInfo.getAvatar()) @@ -358,7 +364,7 @@ public class UserInfoActivity extends BaseBindingActivity applyJoinHall(hallInfo.getHallId())); } } else { - mBinding.llHall.setVisibility(View.GONE); + mBinding.llClan.setVisibility(View.GONE); } }); diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java index 65bc4d225..0a3824de5 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java @@ -111,8 +111,6 @@ public class ModuleHallActivity extends BaseMvpActivity + tools:text="家族ID:123456" /> -