diff --git a/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java b/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java index f3892d99c..74ced7cb3 100644 --- a/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java +++ b/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java @@ -144,13 +144,7 @@ public class UserInfoActivity extends BaseBindingActivity { if (clanAndHallInfo != null && clanAndHallInfo.getClan() != null && clanAndHallInfo.getClan().getId() != 0) { - ClanInfo clanInfo = clanAndHallInfo.getClan(); mBinding.tvHallDesc.setVisibility(View.VISIBLE); - if (clanInfo.isUserIsElder()) { - mBinding.tvHallDesc.setText(clanInfo.getName() + "公会会长"); - } else { - mBinding.tvHallDesc.setText(clanInfo.getName() + "公会签约成员"); - } mBinding.tvHallDesc.setOnClickListener(v -> { ModuleClanActivity.start(context); }); diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml index 412f610e6..5ebf28a99 100644 --- a/app/src/main/res/layout/activity_user_info.xml +++ b/app/src/main/res/layout/activity_user_info.xml @@ -210,6 +210,16 @@ android:orientation="horizontal" app:layout_constraintTop_toBottomOf="@id/ll_id"> + + - - - @@ -294,7 +288,7 @@ android:maxLines="2" android:padding="10dp" android:textColor="@color/text_secondary_878b9c" - android:textSize="@dimen/dp_12" + android:textSize="@dimen/sp_12" tools:text="关注我喜欢关注我喜欢我就关注我喜欢我就关注我我就关注我我就关注我喜欢我就关注我我就关注我" /> @@ -349,7 +343,7 @@ android:layout_height="wrap_content" android:text="@string/fan" android:textColor="@color/text_secondary_878b9c" - android:textSize="13dp" /> + android:textSize="@dimen/sp_13" />