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

1.个人主页公会家族展示逻辑更改

Browse Source 
2.我的公会页面去掉顶部族长的公会ID
This commit is contained in:
huangjian
2020-11-21 14:16:49 +08:00
parent 9a4f77639a
commit 67f3ee4b98
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
View File

@@ -328,6 +328,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
.placeholder(R.drawable.default_avatar)
.into(mBinding.ivHallAvatar);
if (clanInfo == null || clanInfo.getId() <= 0) {
mBinding.tvHallDetail.setText("公会");
//单独展示公会头要变大点
LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) mBinding.ivHallAvatar.getLayoutParams();
layoutParams.width = ScreenUtil.dip2px(60);
@@ -342,11 +343,16 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
mBinding.llHall.setVisibility(View.GONE);
}
if (clanInfo != null && clanInfo.getId() > 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<ActivityUserInfoBindin
mBinding.tvApplyHall.setOnClickListener(v -> applyJoinHall(hallInfo.getHallId()));
}
} else {
mBinding.llHall.setVisibility(View.GONE);
mBinding.llClan.setVisibility(View.GONE);
}
});

3
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java
View File

@@ -111,8 +111,6 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
TextView tvClanId;
@BindView(R.id.tv_clan_owner_uid)
TextView tvClanOwnerUid;
@BindView(R.id.tv_clan_owner_hall_id)
TextView tvClanOwnerHallId;
@BindView(R.id.tv_clan_owner_name)
TextView tvClanOwnerName;
@BindView(R.id.iv_clan_avatar)
@@ -242,7 +240,6 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
tvClanId.setText("家族ID:" + clanInfo.getId());
tvClanOwnerUid.setText("66号:" + clanInfo.getElderErbanNo());
tvClanOwnerName.setText(clanInfo.getElderName());
tvClanOwnerHallId.setText("公会ID:" + clanInfo.getHallId());
tvTitle.setText(clanInfo.getName());
GlideApp.with(ivClanAvatar.getContext())
.load(clanInfo.getAvatar())

9
app/src/module_labour_union/res/layout/activity_module_hall.xml
View File

@@ -118,15 +118,8 @@
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="@dimen/sp_11"
tools:text="公会ID:123456" />
tools:text="家族ID:123456" />
<TextView
android:id="@+id/tv_clan_owner_hall_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="@dimen/sp_11"
tools:text="公会ID:123456" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>