moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

家族UI修改

Browse Source
This commit is contained in:
huangjian
2021-08-19 18:58:13 +08:00
parent 456ccf77c9
commit 5515fa051c
12 changed files with 362 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/common/res/drawable/bg_3c3c4e_radius_10.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="10dp"/>
<solid android:color="#3C3C4E"/>
</shape>

2
app/src/common/res/drawable/bg_secondary_radius_10.xml
View File

@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="15dp"/>
<corners android:radius="10dp"/>
<solid android:color="@color/bg_secondary_2a2a39"/>

9
app/src/common/res/drawable/bg_secondary_radius_top_10.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:topLeftRadius="10dp" android:topRightRadius="10dp"/>
<solid android:color="@color/bg_secondary_2a2a39"/>
</shape>

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

@@ -162,7 +162,8 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
if (bottomViewLayout != null)
bottomViewLayout.setVisibility(View.GONE);
} else {
if (userId == XChatConstants.SECRETARY_UID || userId == XChatConstants.SYSTEM_MESSAGE_UID) {
if (String.valueOf(userId).equals(XChatConstants.SECRETARY_UID) ||
String.valueOf(userId).equals(XChatConstants.SYSTEM_MESSAGE_UID)) {
identityState = IdentityState.NON;
} else {
identityState = IdentityState.OTHER;
@@ -364,7 +365,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
}
mBinding.llHall.setOnClickListener(v -> {
if (hallInfo != null && hallInfo.getHallId() != 0) {
ModuleHallActivity.start(context, hallInfo.getHallId(),hallInfo.getOwnerUid(),userId);
ModuleHallActivity.start(context, hallInfo.getHallId(), hallInfo.getOwnerUid(), userId);
}
});
mBinding.llClan.setOnClickListener(v -> {

BIN
app/src/main/res/drawable-xhdpi/bg_userinfo_room_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 408 B

8
app/src/main/res/drawable/shape_stroke_app_color_1dp.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke
android:width="1dp"
android:color="@color/appColor" />
<corners android:radius="40dp" />
</shape>

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

@@ -11,7 +11,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_F9F9F9"
android:background="@color/bg_normal_1c1b22"
android:fitsSystemWindows="true">
<androidx.core.widget.NestedScrollView
@@ -57,7 +57,7 @@
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="-50dp"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/bg_corner_shadow_12"
android:background="@drawable/bg_secondary_radius_10"
android:padding="@dimen/dp_15">
<TextView
@@ -71,7 +71,7 @@
android:ellipsize="end"
android:maxLength="20"
android:maxLines="1"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:textSize="15dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -112,18 +112,49 @@
tools:src="@drawable/ic_user_charm_level" />
<include
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/in_official_mask"
layout="@layout/layout_official_mask"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_3" />
android:layout_height="20dp"
android:visibility="visible"
tools:visibility="visible">
<ImageView
android:id="@+id/iv_official_mask"
android:layout_width="0dp"
android:layout_height="match_parent"
android:adjustViewBounds="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_temp_official_mask" />
<TextView
android:id="@+id/tv_official_mask"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="22dp"
android:layout_marginEnd="8dp"
android:gravity="center"
android:includeFontPadding="false"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="11dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/iv_official_mask"
app:layout_constraintStart_toStartOf="@id/iv_official_mask"
app:layout_constraintTop_toTopOf="parent"
tools:text="金牌主持" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tv_constellation"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="5dp"
android:background="@drawable/shape_58559d"
android:gravity="center"
android:paddingLeft="6dp"
@@ -144,15 +175,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_level">
<ImageView
android:id="@+id/iv_good_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_5"
android:src="@mipmap/ic_good_num"
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/tv_erban_id"
android:layout_width="wrap_content"
@@ -160,14 +182,23 @@
android:gravity="center_vertical"
android:includeFontPadding="false"
android:maxLines="1"
android:textColor="@color/color_999999"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="11dp"
tools:text="ID:7958626" />
<ImageView
android:id="@+id/iv_good_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_5"
android:src="@mipmap/ic_good_num"
android:visibility="gone"
tools:visibility="visible" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_30"
android:orientation="horizontal">
<TextView
@@ -175,7 +206,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textColor="@color/color_666666"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13dp"
tools:text="19" />
@@ -183,11 +214,10 @@
android:id="@+id/tv_user_fan_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_5"
android:gravity="center"
android:includeFontPadding="false"
android:text="@string/fan"
android:textColor="@color/color_999999"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="11dp" />
</LinearLayout>
@@ -202,243 +232,264 @@
android:ellipsize="end"
android:lines="1"
android:paddingBottom="@dimen/dp_2"
android:textColor="@color/color_666666"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_11"
app:layout_constraintTop_toBottomOf="@id/ll_id"
tools:text="喜欢我就关注我" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/ll_module_hall"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_14"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/bg_corner_shadow_12"
android:orientation="vertical"
android:paddingStart="2dp"
android:paddingTop="1dp"
android:paddingEnd="2dp"
android:paddingBottom="5dp"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/tv_hall_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:text="公会"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_13" />
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/ll_clan"
android:id="@+id/ll_hall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15">
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:background="@drawable/bg_3c3c4e_radius_10"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingStart="2dp"
android:paddingTop="1dp"
android:paddingEnd="2dp"
android:paddingBottom="5dp"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/line_1"
tools:visibility="visible">
<com.yizhuan.erban.common.widget.RectRoundImageView
android:id="@+id/iv_clan_avatar"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_60"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_8"
android:src="@drawable/default_cover"
app:borderRadius="8dp"
app:type="round" />
<TextView
android:id="@+id/tv_only_hall_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableEnd="@drawable/arrow_right"
android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:text="所属房间"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_13"
android:visibility="visible" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingEnd="10dp">
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_10"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_clan_name"
<com.yizhuan.erban.common.widget.RectRoundImageView
android:id="@+id/iv_hall_avatar"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_60"
android:layout_marginEnd="@dimen/dp_8"
android:src="@drawable/default_cover"
app:borderRadius="8dp"
app:type="round" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:orientation="vertical"
android:paddingEnd="10dp">
<TextView
android:id="@+id/tv_hall_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:includeFontPadding="false"
android:lines="1"
android:textColor="@color/text_title_white"
android:textSize="@dimen/dp_13"
tools:text="忘忘忧阁忘忧阁忧阁" />
<TextView
android:id="@+id/tv_hall_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_11"
tools:text="公会ID：123456" />
<TextView
android:id="@+id/tv_hall_member_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_11"
tools:text="公会人数：123" />
</LinearLayout>
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<TextView
android:id="@+id/tv_apply_hall"
android:layout_width="80dp"
android:layout_height="@dimen/dp_28"
android:layout_marginEnd="15dp"
android:background="@drawable/shape_stroke_app_color_1dp"
android:gravity="center"
android:includeFontPadding="false"
android:lines="1"
android:textColor="@color/color_333333"
android:textSize="@dimen/dp_13"
tools:text="忘忧忘忧阁忘忧阁阁" />
<TextView
android:id="@+id/tv_clan_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_3"
android:ellipsize="end"
android:lines="1"
android:textColor="#9a9a9a"
android:textSize="@dimen/dp_11"
tools:text="公会ID：123456" />
<TextView
android:id="@+id/tv_clan_member_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="#9a9a9a"
android:textSize="@dimen/dp_11"
tools:text="公会人数：123" />
<TextView
android:id="@+id/tv_clan_hall_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="#9a9a9a"
android:textSize="@dimen/dp_11"
tools:text="公会数量：123" />
android:text="申请加入"
android:textColor="@color/app_248cfe"
android:textSize="14sp"
android:visibility="gone"
tools:visibility="visible" />
</LinearLayout>
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<ImageView
android:id="@+id/iv_clan_level"
android:layout_width="70dp"
android:layout_height="65dp"
android:layout_marginEnd="24dp"
android:src="@drawable/default_cover" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="20dp"
android:src="@drawable/arrow_right" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_hall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="23dp"
android:layout_marginTop="-6dp"
android:layout_marginBottom="6dp"
android:layout_marginEnd="23dp"
android:background="@drawable/shape_f2f1f3_r_bottom_12dp"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingStart="2dp"
android:paddingTop="1dp"
android:paddingEnd="2dp"
android:paddingBottom="5dp"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/tv_only_hall_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableEnd="@drawable/arrow_right"
android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:text="公会"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_13"
android:visibility="gone" />
<LinearLayout
android:id="@+id/ll_module_hall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_10"
android:gravity="center_vertical"
android:orientation="horizontal">
<com.yizhuan.erban.common.widget.RectRoundImageView
android:id="@+id/iv_hall_avatar"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_60"
android:layout_marginEnd="@dimen/dp_8"
android:src="@drawable/default_cover"
app:borderRadius="8dp"
app:type="round" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingEnd="10dp">
<TextView
android:id="@+id/tv_hall_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:includeFontPadding="false"
android:lines="1"
android:textColor="@color/color_333333"
android:textSize="@dimen/dp_13"
tools:text="忘忘忧阁忘忧阁忧阁" />
<TextView
android:id="@+id/tv_hall_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:ellipsize="end"
android:lines="1"
android:textColor="#9a9a9a"
android:textSize="@dimen/dp_11"
tools:text="公会ID：123456" />
<TextView
android:id="@+id/tv_hall_member_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="#9a9a9a"
android:textSize="@dimen/dp_11"
tools:text="公会人数：123" />
</LinearLayout>
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
android:layout_marginTop="@dimen/dp_14"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/bg_secondary_radius_top_10"
android:orientation="vertical"
android:paddingStart="2dp"
android:paddingTop="1dp"
android:paddingEnd="2dp"
android:paddingBottom="5dp"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible">
<TextView
android:id="@+id/tv_apply_hall"
android:layout_width="80dp"
android:layout_height="@dimen/dp_28"
android:layout_marginEnd="15dp"
android:background="@drawable/shape_white_stroke_app_color_1dp"
android:gravity="center"
android:includeFontPadding="false"
android:text="申请加入"
android:textColor="@color/appColor"
android:textSize="14sp"
android:visibility="gone"
tools:visibility="visible" />
android:id="@+id/tv_hall_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:text="所属公会"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_13" />
<LinearLayout
android:id="@+id/ll_clan"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15">
<com.yizhuan.erban.common.widget.RectRoundImageView
android:id="@+id/iv_clan_avatar"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_60"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_8"
android:src="@drawable/default_cover"
app:borderRadius="8dp"
app:type="round" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingEnd="10dp">
<TextView
android:id="@+id/tv_clan_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:includeFontPadding="false"
android:lines="1"
android:textColor="@color/text_title_white"
android:textSize="@dimen/dp_13"
tools:text="忘忧忘忧阁忘忧阁阁" />
<TextView
android:id="@+id/tv_clan_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_3"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_11"
tools:text="公会ID：123456" />
<TextView
android:id="@+id/tv_clan_member_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_11"
tools:text="公会人数：123" />
<TextView
android:id="@+id/tv_clan_hall_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_11"
tools:text="公会数量：123" />
</LinearLayout>
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<ImageView
android:id="@+id/iv_clan_level"
android:layout_width="70dp"
android:layout_height="65dp"
android:layout_marginEnd="24dp"
android:src="@drawable/default_cover" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="20dp"
android:src="@drawable/arrow_right" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<View
android:id="@+id/line_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
app:layout_constraintBottom_toBottomOf="@id/ll_module_hall"
app:layout_constraintStart_toStartOf="parent" />
<com.coorchice.library.SuperTextView
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_marginStart="100dp"
android:layout_marginEnd="15dp"
android:background="@color/bg_secondary_2a2a39"
app:layout_constraintTop_toBottomOf="@id/ll_module_hall" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
@@ -446,7 +497,7 @@
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_14"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/bg_corner_shadow_12"
android:background="@drawable/bg_secondary_radius_10"
android:orientation="vertical">
<TextView
@@ -456,7 +507,7 @@
android:drawableEnd="@drawable/arrow_right"
android:padding="@dimen/dp_15"
android:text="礼物"
android:textColor="@color/color_333333"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_13" />
<androidx.recyclerview.widget.RecyclerView
@@ -482,7 +533,7 @@
android:layout_marginTop="@dimen/dp_14"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="50dp"
android:background="@drawable/bg_corner_shadow_12"
android:background="@drawable/bg_secondary_radius_10"
android:orientation="vertical"
android:paddingStart="2dp"
android:paddingTop="1dp"
@@ -496,7 +547,7 @@
android:layout_marginTop="15dp"
android:layout_marginEnd="@dimen/dp_15"
android:text="动态"
android:textColor="@color/color_333333"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_13" />
<androidx.recyclerview.widget.RecyclerView
@@ -547,7 +598,7 @@
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:text="@string/user_info"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:textSize="16sp"
android:visibility="visible" />

BIN
app/src/main/res/mipmap-xhdpi/bg_uclan_top_cover.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 102 KiB

6
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleClanActivity.java
View File

@@ -96,8 +96,6 @@ public class ModuleClanActivity extends BaseMvpActivity<IModuleHallView, ModuleH
TextView tvClanOwnerName;
@BindView(R.id.iv_clan_avatar)
ImageView ivClanAvatar;
@BindView(R.id.iv_avatar_bg)
ImageView ivAvatarBg;
@BindView(R.id.iv_clan_level)
ImageView ivClanLevel;
@BindView(R.id.nsv_hall)
@@ -207,10 +205,6 @@ public class ModuleClanActivity extends BaseMvpActivity<IModuleHallView, ModuleH
tvTitle.setText(clanInfo.getName());
ImageLoadUtils.loadRectImage(context,clanInfo.getAvatar(),ivClanAvatar,R.drawable.default_avatar, ScreenUtil.dip2px(8));
ImageLoadUtils.loadImage(context, clanInfo.getLevelIcon(), ivClanLevel);
GlideApp.with(ivAvatarBg.getContext())
.load(clanInfo.getAvatar())
.placeholder(R.drawable.default_avatar)
.into(ivAvatarBg);
loadHallList();
} else {
clClan.setVisibility(View.GONE);

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

@@ -91,6 +91,8 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
NestedScrollView nsvHall;
@BindView(R.id.tv_owner_clan)
TextView tvOwnerClan;
@BindView(R.id.iv_avatar_bg)
ImageView ivAvatarBg;
private OptionAdapter mOptionAdapter;
@@ -195,10 +197,16 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
clHall.setOnClickListener(v -> UserInfoActivity.Companion.start(context, hallInfo.getOwnerUid()));
tvHallId.setText("公会ID:" + hallInfo.getHallId() + "");
tvTitle.setText(hallInfo.getHallName());
GlideApp.with(ivAvatar.getContext())
.load(hallInfo.getOwnerAvatar())
.placeholder(R.drawable.default_avatar)
.into(ivAvatar);
GlideApp.with(ivAvatarBg.getContext())
.load(hallInfo.getOwnerAvatar())
.placeholder(R.drawable.default_avatar)
.into(ivAvatarBg);
} else {
clHall.setVisibility(View.GONE);
}

39
app/src/module_labour_union/res/layout/activity_module_clan.xml
View File

@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_normal_1c1b22"
tools:context="com.yizhuan.erban.module_hall.hall.activity.ModuleHallActivity">
<androidx.core.widget.NestedScrollView
@@ -16,32 +17,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/fl_top_bg"
<View
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintDimensionRatio="750:497"
app:layout_constraintTop_toTopOf="parent">
<com.yizhuan.erban.ui.widget.EdgeTransparentView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:edge_position="bottom">
<ImageView
android:id="@+id/iv_avatar_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />
</com.yizhuan.erban.ui.widget.EdgeTransparentView>
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/bg_userinfo_photo_cover" />
</FrameLayout>
app:layout_constraintTop_toTopOf="parent"
android:background="@mipmap/bg_uclan_top_cover" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_clan"
@@ -90,7 +71,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:textColor="@color/white_transparent_60"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_11"
tools:text="家族ID:123456" />
@@ -130,7 +111,7 @@
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_13"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/bg_corner_shadow_12"
android:background="@drawable/bg_secondary_radius_10"
android:orientation="vertical"
android:paddingStart="8dp"
android:paddingEnd="8dp"
@@ -149,7 +130,7 @@
android:paddingTop="10dp"
android:paddingEnd="14dp"
android:paddingBottom="5dp"
android:textColor="@color/color_333333"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15dp"
tools:text="公会列表(8)" />
@@ -169,7 +150,7 @@
android:layout_marginTop="@dimen/dp_13"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_15"
android:background="@drawable/bg_corner_shadow_12"
android:background="@drawable/bg_secondary_radius_10"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_hall_list">
@@ -189,7 +170,7 @@
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:text="总人数:0人"
android:textColor="@color/color_333333"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15dp" />
<ImageView
@@ -278,7 +259,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:text="编辑"
android:textColor="@color/color_999999"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/sp_13"
android:visibility="gone" />

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

@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_normal_1c1b22"
tools:context="com.yizhuan.erban.module_hall.hall.activity.ModuleHallActivity">
<androidx.core.widget.NestedScrollView
@@ -16,11 +17,31 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_hall_top"
android:scaleType="centerCrop" />
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.yizhuan.erban.ui.widget.EdgeTransparentView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:edge_position="bottom">
<ImageView
android:id="@+id/iv_avatar_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />
</com.yizhuan.erban.ui.widget.EdgeTransparentView>
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/bg_userinfo_photo_cover" />
</FrameLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_hall"
@@ -47,7 +68,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:textColor="#6D4729"
android:textColor="@color/text_title_white"
android:textSize="@dimen/sp_13"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -64,7 +85,7 @@
android:drawablePadding="6dp"
android:gravity="center"
android:text="所在家族"
android:textColor="#ffffffff"
android:textColor="@color/text_title_white"
android:textSize="10sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
@@ -94,7 +115,7 @@
android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_15"
android:background="@drawable/bg_corner_shadow_12"
android:background="@drawable/bg_secondary_radius_10"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/rv_option">
@@ -114,7 +135,7 @@
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:text="总人数:0人"
android:textColor="@color/color_333333"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15dp" />
<ImageView
@@ -139,8 +160,7 @@
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/srl_group"
android:layout_width="match_parent"
android:layout_height="550dp"
>
android:layout_height="550dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
@@ -175,7 +195,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:src="@drawable/arrow_left" />
android:src="@drawable/arrow_left_white" />
<TextView
android:id="@+id/tv_title"
@@ -184,7 +204,7 @@
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:text="哈哈哈哈"
android:textColor="#6D4729"
android:textColor="@color/text_title_white"
android:textSize="18sp"
android:visibility="visible" />