From bdbb8f05c2d98ed9af22b4538cf40c538161ed32 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Wed, 18 Nov 2020 18:48:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=B6=E6=97=8FUI=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/activity_user_info.xml    | 322 +++++++++++-------
 .../hall/activity/ModuleHallActivity.java     |  79 +----
 .../res/layout/activity_module_hall.xml       | 108 +++---
 .../module_hall/hall/bean/OptionInfo.java     |   6 +-
 4 files changed, 248 insertions(+), 267 deletions(-)

diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index a38de2b8e..8de9f7c5c 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -23,13 +23,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                >
+                android:orientation="vertical">
 
                 <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    >
+                    android:layout_height="wrap_content">
+
                     <com.jude.rollviewpager.RollPagerView
                         android:id="@+id/roll_view"
                         android:layout_width="match_parent"
@@ -37,14 +36,12 @@
                         app:rollviewpager_hint_gravity="right"
                         app:rollviewpager_hint_paddingBottom="60dp"
                         app:rollviewpager_hint_paddingRight="20dp"
-                        app:rollviewpager_play_delay="5000"
-                        />
+                        app:rollviewpager_play_delay="5000" />
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="250dp"
-                        android:background="@mipmap/bg_userinfo_photo_cover"
-                        />
+                        android:background="@mipmap/bg_userinfo_photo_cover" />
 
                 </RelativeLayout>
 
@@ -52,47 +49,45 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_15"
-                    android:layout_marginEnd="@dimen/dp_15"
                     android:layout_marginTop="-50dp"
+                    android:layout_marginEnd="@dimen/dp_15"
                     android:background="@drawable/bg_corner_shadow_12"
-                    android:padding="@dimen/dp_15"
-                    >
+                    android:padding="@dimen/dp_15">
 
                     <TextView
                         android:id="@+id/tv_nick"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerHorizontal="true"
+                        android:layout_marginEnd="@dimen/dp_20"
                         android:layout_marginBottom="6dp"
                         android:drawablePadding="@dimen/space_normal"
                         android:ellipsize="end"
-                        android:maxLines="1"
                         android:maxLength="20"
-                        android:layout_marginEnd="@dimen/dp_20"
+                        android:maxLines="1"
                         android:textColor="@color/color_333333"
                         android:textSize="15dp"
                         android:textStyle="bold"
-                        tools:drawableRight="@drawable/ic_gender_male"
-                        tools:text="King天地天地"
+                        app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"/>
+                        tools:drawableRight="@drawable/ic_gender_male"
+                        tools:text="King天地天地" />
 
                     <ImageView
                         android:id="@+id/iv_where"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toTopOf="@id/tv_nick"
-                        app:layout_constraintEnd_toEndOf="parent"
                         android:src="@drawable/ic_dy_in_room"
-                        />
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="@id/tv_nick" />
 
                     <LinearLayout
                         android:id="@+id/ll_level"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/dp_2"
-                        app:layout_constraintTop_toBottomOf="@id/tv_nick"
-                        android:orientation="horizontal">
+                        android:orientation="horizontal"
+                        app:layout_constraintTop_toBottomOf="@id/tv_nick">
 
                         <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/iv_user_level"
@@ -113,20 +108,20 @@
 
                         <include
                             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"
-                            layout="@layout/layout_official_mask"/>
+                            android:layout_marginEnd="@dimen/dp_3" />
 
                         <TextView
                             android:id="@+id/tv_constellation"
                             android:layout_width="wrap_content"
                             android:layout_height="18dp"
+                            android:layout_gravity="center_vertical"
                             android:background="@drawable/shape_58559d"
                             android:gravity="center"
                             android:paddingLeft="6dp"
                             android:paddingRight="6dp"
-                            android:layout_gravity="center_vertical"
                             android:textColor="@color/white"
                             android:textSize="10dp"
                             tools:text="金牛座" />
@@ -137,31 +132,30 @@
                         android:id="@+id/ll_id"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toBottomOf="@id/ll_level"
-                        app:layout_constraintStart_toStartOf="parent"
-                        android:gravity="center_vertical"
                         android:layout_marginTop="@dimen/dp_7"
-                        android:orientation="horizontal">
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        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"
-                            android:layout_marginEnd="@dimen/dp_5"
-                            />
+                            tools:visibility="visible" />
 
                         <TextView
                             android:id="@+id/tv_erban_id"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:maxLines="1"
+                            android:gravity="center_vertical"
                             android:includeFontPadding="false"
+                            android:maxLines="1"
                             android:textColor="@color/color_999999"
                             android:textSize="11dp"
-                            android:gravity="center_vertical"
                             tools:text="ID:7958626" />
 
                         <LinearLayout
@@ -183,9 +177,9 @@
                                 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:layout_marginStart="@dimen/dp_5"
                                 android:text="@string/fan"
                                 android:textColor="@color/color_999999"
                                 android:textSize="11dp" />
@@ -198,136 +192,225 @@
                         android:id="@+id/tv_desc"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toBottomOf="@id/ll_id"
-                        android:textSize="@dimen/dp_11"
                         android:layout_marginTop="@dimen/dp_12"
-                        android:paddingBottom="@dimen/dp_2"
-                        android:lines="1"
                         android:ellipsize="end"
+                        android:lines="1"
+                        android:paddingBottom="@dimen/dp_2"
                         android:textColor="@color/color_666666"
-                        tools:text="喜欢我就关注我"
-                        />
+                        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"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/bg_corner_shadow_12"
                     android:layout_marginStart="@dimen/dp_15"
-                    android:layout_marginEnd="@dimen/dp_15"
                     android:layout_marginTop="@dimen/dp_13"
+                    android:layout_marginEnd="@dimen/dp_15"
+                    android:background="@drawable/bg_corner_shadow_12"
                     android:orientation="vertical"
                     android:visibility="gone"
-                    tools:visibility="visible"
-                    >
+                    tools:visibility="visible">
+
                     <TextView
                         android:id="@+id/tv_hall_detail"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="公会"
+                        android:paddingStart="@dimen/dp_15"
                         android:paddingTop="@dimen/dp_15"
                         android:paddingEnd="@dimen/dp_15"
-                        android:paddingStart="@dimen/dp_15"
-                        android:textSize="@dimen/sp_13"
+                        android:text="公会"
                         android:textColor="@color/color_333333"
-                        />
+                        android:textSize="@dimen/sp_13" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
                         android:orientation="horizontal"
                         android:paddingTop="@dimen/dp_15"
                         android:paddingBottom="@dimen/dp_15">
 
-                        <com.yizhuan.erban.common.widget.CircleImageView
-                            android:id="@+id/iv_hall_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"
-                            />
-
                         <LinearLayout
+                            android:id="@+id/ll_family"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
-                            android:orientation="vertical"
-                            >
-                            <TextView
-                                android:id="@+id/tv_hall_name"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                tools:text="忘忧阁"
-                                android:lines="1"
-                                android:ellipsize="end"
-                                android:textColor="@color/color_333333"
-                                android:textSize="@dimen/dp_13"
-                                />
+                            android:gravity="center_vertical">
 
-                            <TextView
-                                android:id="@+id/tv_hall_id"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                tools:text="公会ID：123456"
-                                android:textColor="#9a9a9a"
-                                android:lines="1"
-                                android:ellipsize="end"
-                                android:textSize="@dimen/dp_11"
-                                android:layout_marginTop="@dimen/dp_8"
-                                />
+                            <ImageView
+                                android:id="@+id/iv_family_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" />
 
-                            <TextView
-                                android:id="@+id/tv_hall_member_num"
+                            <LinearLayout
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                tools:text="公会人数：123"
-                                android:textColor="#9a9a9a"
-                                android:textSize="@dimen/dp_11"
-                                android:lines="1"
-                                android:ellipsize="end"
-                                android:layout_marginTop="@dimen/dp_3"
-                                />
+                                android:orientation="vertical">
+
+                                <TextView
+                                    android:id="@+id/tv_family_name"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:ellipsize="end"
+                                    android:lines="1"
+                                    android:textColor="@color/color_333333"
+                                    android:textSize="@dimen/dp_13"
+                                    tools:text="忘忧阁" />
+
+                                <TextView
+                                    android:id="@+id/tv_family_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_family_member_num"
+                                    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="公会人数：123" />
+
+                                <TextView
+                                    android:id="@+id/tv_family_hall_num"
+                                    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="公会数量：123" />
+
+                            </LinearLayout>
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/ll_hall"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal"
+                            android:visibility="visible">
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content">
+
+                                <ImageView
+                                    android:id="@+id/iv_hall_avatar"
+                                    android:layout_width="@dimen/dp_50"
+                                    android:layout_height="@dimen/dp_50"
+                                    android:layout_marginStart="@dimen/dp_15"
+                                    android:layout_marginEnd="@dimen/dp_8"
+                                    android:src="@drawable/default_cover" />
+
+                                <LinearLayout
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="vertical">
+
+                                    <TextView
+                                        android:id="@+id/tv_hall_name"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:ellipsize="end"
+                                        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:layout_marginTop="@dimen/dp_3"
+                                        android:ellipsize="end"
+                                        android:lines="1"
+                                        android:textColor="#9a9a9a"
+                                        android:textSize="@dimen/dp_11"
+                                        tools:text="公会人数：123" />
+
+                                </LinearLayout>
+                            </LinearLayout>
 
                         </LinearLayout>
 
                         <TextView
-                            android:id="@+id/tv_apply_hall"
+                            android:id="@+id/tv_no_family_apply_hall"
                             android:layout_width="80dp"
                             android:layout_height="@dimen/dp_30"
+                            android:layout_gravity="center_vertical|end"
+                            android:layout_marginEnd="@dimen/dp_15"
                             android:background="@drawable/bg_common_confirm_normal_22r"
+                            android:gravity="center"
                             android:text="申请加入"
                             android:textColor="@color/white"
-                            android:gravity="center"
-                            android:visibility="gone"
                             android:textSize="@dimen/dp_13"
-                            android:layout_marginEnd="@dimen/dp_15"
-                            android:layout_gravity="center_vertical|right"
-                            />
+                            android:visibility="gone" />
 
                     </LinearLayout>
+
+                    <TextView
+                        android:id="@+id/tv_apply_hall"
+                        android:layout_width="225dp"
+                        android:layout_height="@dimen/dp_30"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginBottom="10dp"
+                        android:background="@drawable/bg_common_confirm_normal_22r"
+                        android:gravity="center"
+                        android:text="申请加入"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/dp_13"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+
                 </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/bg_corner_shadow_12"
                     android:layout_marginStart="@dimen/dp_15"
-                    android:layout_marginEnd="@dimen/dp_15"
                     android:layout_marginTop="@dimen/dp_13"
-                    android:orientation="vertical"
-                    >
+                    android:layout_marginEnd="@dimen/dp_15"
+                    android:background="@drawable/bg_corner_shadow_12"
+                    android:orientation="vertical">
+
                     <TextView
                         android:id="@+id/tv_gift_detail"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="礼物"
-                        android:padding="@dimen/dp_15"
-                        android:textSize="@dimen/sp_13"
-                        android:textColor="@color/color_333333"
                         android:drawableEnd="@drawable/arrow_right_2"
-                        />
+                        android:padding="@dimen/dp_15"
+                        android:text="礼物"
+                        android:textColor="@color/color_333333"
+                        android:textSize="@dimen/sp_13" />
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv_gift"
@@ -335,8 +418,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_15"
                         android:layout_marginEnd="@dimen/dp_15"
-                        android:layout_marginBottom="@dimen/dp_15"
-                        />
+                        android:layout_marginBottom="@dimen/dp_15" />
 
                 </LinearLayout>
 
@@ -344,35 +426,32 @@
                     android:id="@+id/ll_dynamic_container"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_15"
+                    android:layout_marginTop="@dimen/dp_13"
+                    android:layout_marginEnd="@dimen/dp_15"
+                    android:layout_marginBottom="@dimen/dp_50"
                     android:background="@drawable/bg_corner_shadow_12"
                     android:orientation="vertical"
                     android:paddingTop="@dimen/dp_15"
-                    android:paddingBottom="@dimen/dp_15"
-                    android:layout_marginStart="@dimen/dp_15"
-                    android:layout_marginEnd="@dimen/dp_15"
-                    android:layout_marginTop="@dimen/dp_13"
-                    android:layout_marginBottom="@dimen/dp_50"
-                    >
+                    android:paddingBottom="@dimen/dp_15">
+
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="动态"
                         android:layout_marginStart="@dimen/dp_15"
                         android:layout_marginEnd="@dimen/dp_15"
-                        android:textSize="@dimen/sp_13"
+                        android:text="动态"
                         android:textColor="@color/color_333333"
-                        />
+                        android:textSize="@dimen/sp_13" />
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv_dynamic"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        />
+                        android:layout_height="wrap_content" />
 
                 </LinearLayout>
 
 
-
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
 
@@ -431,11 +510,10 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
-                    android:textColor="@color/color_999999"
-                    android:visibility="gone"
-                    android:textSize="@dimen/sp_13"
                     android:text="编辑"
-                    />
+                    android:textColor="@color/color_999999"
+                    android:textSize="@dimen/sp_13"
+                    android:visibility="gone" />
 
             </RelativeLayout>
 
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 646276c9d..bda031c80 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
@@ -1,5 +1,6 @@
 package com.yizhuan.erban.module_hall.hall.activity;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -104,17 +105,15 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
     NestedScrollView nsvHall;
 
     private OptionAdapter mOptionAdapter;
-//    private GroupListAdapter mGroupListAdapter;
 
     private GroupMemberListAdapter mGroupMemberListAdapter;
-    private List<MemberInfo> listInfos = new ArrayList<>();
     private List<AuthInfo> mAuthInfoList;
 
     private int page = 100;
 
     private int pageSize = 100;
 
-    private boolean isLoading, noMoreData;
+    private boolean isLoading;
     private long lastClickTime;
 
     boolean isHallOwner;
@@ -172,25 +171,7 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
         });
 
         recyclerView.setAdapter(mGroupMemberListAdapter);
-//        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
-//            @Override
-//            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
-//                super.onScrollStateChanged(recyclerView, newState);
-//                if (newState == RecyclerView.SCROLL_STATE_IDLE) {
-//                    if (isLoading || noMoreData) {
-//                        return;
-//                    }
-//                    LinearLayoutManager manager = (LinearLayoutManager) recyclerView.getLayoutManager();
-//                    int lastfirst = manager.findLastVisibleItemPosition();
-//                    int itemCount = mGroupMemberListAdapter.getItemCount();
-//                    if (lastfirst >= itemCount - 2) {
-//                        loadMembers();
-//                    }
-//                }
-//            }
-//        });
         setTvCount(0);
-//        loadMembers();
         getMvpPresenter().getHallAuths();
 
         getMvpPresenter().getHallMenusByUid(AuthModel.get().getCurrentUid());
@@ -211,26 +192,8 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
                 tvTitle.setText(name);
             }
         });
-
-//        HallDataManager.get().registerHallID(this, hallID -> {
-//            if (hallID >0) {
-//                tvHallId.setText("公会ID:"+hallID);
-//            }
-//        });
-
-
-
-
-//        mTitleBar.addAction(new TitleBar.ImageAction(R.drawable.lu_ic_member_list) {
-//            @Override
-//            public void performAction(View view) {
-//                GroupMemberListActivity.start(ModuleHallActivity.this);
-//            }
-//        });
-
         isHallOwner = HallDataManager.get().getRole() == 1;
         isHallAdmin = HallDataManager.get().getRole() == 2;
-//        setSettingOption(isHallOwner);
         setSearchOption(isHallOwner,isHallAdmin);
     }
 
@@ -293,12 +256,6 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
                         StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_HALL_ADDMEMBERS_CLICK,
                                 "添加成员-面板");
                         HallSearchActivity.start(context, AbstractSelectFriendAction.TYPE_MODULE_HALL);
-                        //批量导入
-//                        if (!TextUtils.isEmpty(optionInfo.getUrl())) {
-//                            CommonWebViewActivity.start(context, optionInfo.getUrl());
-//                        } else {
-//                            PwdCodeMgr.showShareCodeDialog(context);
-//                        }
 
                     } else if (OptionInfo.OPTION_HALL_OWNER_ROOM_SERIAL.equals(optionInfo.getCode())) {
                         StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_HALL_HALLINCOME_CLICK,
@@ -349,6 +306,7 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
         mGroupMemberListAdapter.notifyDataSetChanged();
     }
 
+    @SuppressLint("CheckResult")
     private void loadMembers() {
         isLoading = true;
         HallModel.get().getAllMembers(HallDataManager.get().getHallId(), page, pageSize)
@@ -369,12 +327,10 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
                             list = new ArrayList<>();
                         }
                         if (list.size() == 0) {
-                            noMoreData = true;
                             if (page == 1) {
                                 showNoData();
                             }
                         } else {
-                            noMoreData = false;
                             hideStatus();
                             if (page == 1) {
                                 mGroupMemberListAdapter.setNewData(list);
@@ -526,37 +482,11 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
             }
             getDialogManager().showCommonPopupDialog(list_adapter, "取消");
 
-            //右上角弹窗（旧）
-//            HallMenuDialog dialog = new HallMenuDialog(this, attachView, authInfoList, true);
-//            dialog.setOnMenuClickListener(new HallMenuDialog.OnMenuClickListener() {
-//                @Override
-//                public void callback(String code) {
-//                    jumpCode(code);
-//                }
-//            });
-//            dialog.show();
         } else {
             toast("未分配权限");
         }
     }
 
-    private void showSettingOption(View attachView, List<AuthInfo> authInfoList) {
-        if (authInfoList != null && authInfoList.size() > 0) {
-            //右上角弹窗（旧）
-            HallMenuDialog dialog = new HallMenuDialog(this, attachView, authInfoList, true);
-            dialog.setOnMenuClickListener(new HallMenuDialog.OnMenuClickListener() {
-                @Override
-                public void callback(String code) {
-                    jumpCode(code);
-                }
-            });
-            dialog.show();
-        } else {
-            toast("未分配权限");
-        }
-    }
-
-
     private void showMenuDialog(View attachView) {
         List<AuthInfo> authInfoList = new ArrayList<>();
         AuthInfo authInfo = new AuthInfo();
@@ -592,9 +522,6 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
                 break;
 
             case AuthInfo.AUTH_MEMBER_JOIN_MANAGER:
-//                StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_HALL_ADDMEMBERS_CLICK,
-//                        "添加成员-成员列表");
-//                PwdCodeMgr.showShareCodeDialog(context);
                 HallSearchActivity.start(context, AbstractSelectFriendAction.TYPE_MODULE_HALL);
                 break;
 
diff --git a/app/src/module_labour_union/res/layout/activity_module_hall.xml b/app/src/module_labour_union/res/layout/activity_module_hall.xml
index 379308a89..87682ebb6 100644
--- a/app/src/module_labour_union/res/layout/activity_module_hall.xml
+++ b/app/src/module_labour_union/res/layout/activity_module_hall.xml
@@ -12,112 +12,91 @@
         android:layout_height="match_parent"
         tools:context="com.yizhuan.erban.module_hall.hall.activity.ModuleHallActivity">
 
-
-
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            >
-
+            android:layout_height="match_parent">
 
             <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toTopOf="parent"
-                >
+                app:layout_constraintTop_toTopOf="parent">
+
                 <ImageView
                     android:id="@+id/iv_avatar_bg"
                     android:layout_width="match_parent"
                     android:layout_height="228dp"
-                    android:scaleType="centerCrop"
-                    />
+                    android:scaleType="centerCrop" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="228dp"
-                    android:background="@mipmap/bg_userinfo_photo_cover"
-                    />
+                    android:background="@mipmap/bg_userinfo_photo_cover" />
 
             </FrameLayout>
 
-
-
-            <!--    <com.yizhuan.erban.base.TitleBar-->
-            <!--        android:id="@+ide.hdodenhof:circleimageviewd/title_bar"-->
-            <!--        android:layout_width="match_parent"-->
-            <!--        android:layout_height="wrap_content"-->
-            <!--        app:layout_constraintTop_toTopOf="parent">-->
-
-            <!--    </com.yizhuan.erban.base.TitleBar>-->
-
             <com.yizhuan.erban.common.widget.CircleImageView
                 android:id="@+id/iv_avatar"
                 android:layout_width="75dp"
                 android:layout_height="75dp"
-                app:layout_constraintStart_toStartOf="parent"
                 android:layout_marginStart="@dimen/dp_25"
                 android:layout_marginTop="?attr/actionBarSize"
                 android:src="@drawable/nim_avatar_default"
                 app:civ_border_color="@color/black"
-                app:layout_constraintTop_toTopOf="parent"
                 app:civ_border_width="5dp"
-                />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:layout_constraintStart_toEndOf="@id/iv_avatar"
-                app:layout_constraintTop_toTopOf="@id/iv_avatar"
-                android:orientation="vertical"
                 android:layout_marginStart="@dimen/dp_20"
+                android:orientation="vertical"
                 app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
-                >
+                app:layout_constraintStart_toEndOf="@id/iv_avatar"
+                app:layout_constraintTop_toTopOf="@id/iv_avatar">
 
                 <TextView
                     android:id="@+id/tv_owner_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    tools:text="我是会长"
                     android:textColor="@color/white"
                     android:textSize="@dimen/sp_18"
-                    />
+                    tools:text="我是会长" />
 
                 <TextView
                     android:id="@+id/tv_owner_uid"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    tools:text="66号:3979655"
-                    android:textSize="@dimen/sp_11"
-                    android:textColor="@color/white"
                     android:layout_marginTop="@dimen/dp_6"
-                    />
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_11"
+                    tools:text="66号:3979655" />
 
                 <TextView
                     android:id="@+id/tv_hall_id"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    tools:text="公会ID:123456"
-                    android:textSize="@dimen/sp_11"
                     android:textColor="@color/white"
-                    />
+                    android:textSize="@dimen/sp_11"
+                    tools:text="公会ID:123456" />
             </LinearLayout>
 
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_option"
-                app:layout_constraintTop_toBottomOf="@id/iv_avatar"
-                android:layout_marginTop="@dimen/dp_30"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_30"
+                app:layout_constraintTop_toBottomOf="@id/iv_avatar" />
 
             <LinearLayout
                 android:id="@+id/ll_member_list"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_corner_shadow_12"
                 android:layout_marginStart="@dimen/dp_15"
-                android:layout_marginEnd="@dimen/dp_15"
                 android:layout_marginTop="@dimen/dp_13"
+                android:layout_marginEnd="@dimen/dp_15"
+                android:background="@drawable/bg_corner_shadow_12"
                 android:orientation="vertical"
                 app:layout_constraintTop_toBottomOf="@id/rv_option"
 
@@ -125,46 +104,42 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    >
+                    android:layout_height="wrap_content">
+
                     <TextView
                         android:id="@+id/tv_count"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:textColor="@color/color_333333"
-                        android:textSize="15dp"
-                        android:text="总人数:0人"
-                        android:paddingStart="14dp"
-                        android:paddingEnd="14dp"
-                        android:paddingTop="10dp"
-                        android:paddingBottom="10dp"
-                        android:layout_weight="1"
                         android:layout_marginEnd="@dimen/dp_10"
-                        />
+                        android:layout_weight="1"
+                        android:paddingStart="14dp"
+                        android:paddingTop="10dp"
+                        android:paddingEnd="14dp"
+                        android:paddingBottom="10dp"
+                        android:text="总人数:0人"
+                        android:textColor="@color/color_333333"
+                        android:textSize="15dp" />
 
                     <ImageView
                         android:id="@+id/iv_hall_member_search"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
-                        android:src="@drawable/ic_hall_member_search"
-                        android:padding="@dimen/dp_5"
                         android:layout_gravity="end"
-                        />
+                        android:padding="@dimen/dp_5"
+                        android:src="@drawable/ic_hall_member_search" />
 
                     <ImageView
                         android:id="@+id/iv_hall_member_more"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
-                        android:padding="@dimen/dp_5"
-                        android:src="@drawable/ic_hall_member_more"
                         android:layout_gravity="end"
                         android:layout_marginEnd="@dimen/dp_10"
-                        />
+                        android:padding="@dimen/dp_5"
+                        android:src="@drawable/ic_hall_member_more" />
 
                 </LinearLayout>
 
 
-
                 <!--        <com.yizhuan.erban.common.widget.StatusLayout-->
                 <!--            android:id="@+id/status_layout"-->
                 <!--            android:layout_width="match_parent"-->
@@ -179,15 +154,13 @@
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/recycler_view"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        />
+                        android:layout_height="wrap_content" />
 
                 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-                <!--        </com.yizhuan.erban.common.widget.StatusLayout>-->
-
             </LinearLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
+
     </androidx.core.widget.NestedScrollView>
 
     <androidx.appcompat.widget.Toolbar
@@ -236,11 +209,10 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
-                android:textColor="@color/color_999999"
-                android:visibility="gone"
-                android:textSize="@dimen/sp_13"
                 android:text="编辑"
-                />
+                android:textColor="@color/color_999999"
+                android:textSize="@dimen/sp_13"
+                android:visibility="gone" />
 
         </RelativeLayout>
 
diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/OptionInfo.java b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/OptionInfo.java
index 56f2f8536..b136149ca 100644
--- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/OptionInfo.java
+++ b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/OptionInfo.java
@@ -3,8 +3,12 @@ package com.yizhuan.xchat_android_core.module_hall.hall.bean;
 import java.io.Serializable;
 
 public class OptionInfo implements Serializable {
-    /** 收入统计 */
+    /** 成员收入 */
     public final static String OPTION_LOOK_HALL_INCOME = "look_hall_income";
+
+    /** 公会收入 */
+    public final static String OPTION_GUILD_INCOME = "guild_income";
+
     /** 施工中 */
     public final static String OPTION_HALL_BUILD = "hall_build";
     /**