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

[Modify]个人资料页公会信息调整

Browse Source
This commit is contained in:
wushaocheng
2023-08-17 16:28:09 +08:00
parent ee320f0591
commit 87b4ea4935
2 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java
View File

@@ -144,13 +144,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
} }
viewModel.getHallData().observe(this, clanAndHallInfo -> { viewModel.getHallData().observe(this, clanAndHallInfo -> {
if (clanAndHallInfo != null && clanAndHallInfo.getClan() != null && clanAndHallInfo.getClan().getId() != 0) { if (clanAndHallInfo != null && clanAndHallInfo.getClan() != null && clanAndHallInfo.getClan().getId() != 0) {
ClanInfo clanInfo = clanAndHallInfo.getClan();
mBinding.tvHallDesc.setVisibility(View.VISIBLE); mBinding.tvHallDesc.setVisibility(View.VISIBLE);
if (clanInfo.isUserIsElder()) {
mBinding.tvHallDesc.setText(clanInfo.getName() + "公会会长");
} else {
mBinding.tvHallDesc.setText(clanInfo.getName() + "公会签约成员");
}
mBinding.tvHallDesc.setOnClickListener(v -> { mBinding.tvHallDesc.setOnClickListener(v -> {
ModuleClanActivity.start(context); ModuleClanActivity.start(context);
}); });

34
app/src/main/res/layout/activity_user_info.xml
View File

@@ -210,6 +210,16 @@
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/ll_id"> app:layout_constraintTop_toBottomOf="@id/ll_id">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_hall_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/dp_4"
android:visibility="gone"
tools:visibility="visible"
app:drawableStartCompat="@drawable/ic_userinfo_hall" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level" android:id="@+id/iv_user_level"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -228,7 +238,6 @@
android:visibility="visible" android:visibility="visible"
tools:src="@drawable/ic_user_charm_level" /> tools:src="@drawable/ic_user_charm_level" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/in_official_mask" android:id="@+id/in_official_mask"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -256,7 +265,7 @@
android:includeFontPadding="false" android:includeFontPadding="false"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="11dp" android:textSize="@dimen/sp_11"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/iv_official_mask" app:layout_constraintEnd_toEndOf="@+id/iv_official_mask"
app:layout_constraintStart_toStartOf="@id/iv_official_mask" app:layout_constraintStart_toStartOf="@id/iv_official_mask"
@@ -265,21 +274,6 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tv_hall_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="3dp"
android:drawableStart="@drawable/ic_userinfo_hall"
android:drawablePadding="2dp"
android:gravity="center"
android:textColor="@color/text_normal_282828"
android:textSize="13sp"
android:visibility="gone"
tools:text="XX公会签约成员"
tools:visibility="visible" />
</LinearLayout> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -294,7 +288,7 @@
android:maxLines="2" android:maxLines="2"
android:padding="10dp" android:padding="10dp"
android:textColor="@color/text_secondary_878b9c" android:textColor="@color/text_secondary_878b9c"
android:textSize="@dimen/dp_12" android:textSize="@dimen/sp_12"
tools:text="关注我喜欢关注我喜欢我就关注我喜欢我就关注我我就关注我我就关注我喜欢我就关注我我就关注我" /> tools:text="关注我喜欢关注我喜欢我就关注我喜欢我就关注我我就关注我我就关注我喜欢我就关注我我就关注我" />
</LinearLayout> </LinearLayout>
@@ -349,7 +343,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/fan" android:text="@string/fan"
android:textColor="@color/text_secondary_878b9c" android:textColor="@color/text_secondary_878b9c"
android:textSize="13dp" /> android:textSize="@dimen/sp_13" />
<TextView <TextView
android:id="@+id/tv_fans_count" android:id="@+id/tv_fans_count"
@@ -358,7 +352,7 @@
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/text_normal_282828" android:textColor="@color/text_normal_282828"
android:textSize="13dp" android:textSize="@dimen/sp_13"
tools:text="19" /> tools:text="19" />
</LinearLayout> </LinearLayout>