From 8f5ad1f1fea4aadf46cfcfbb206feb01f9cfb66b Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Thu, 23 Dec 2021 11:47:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B2=A1=E6=9C=89=E5=AE=B6?=
 =?UTF-8?q?=E6=97=8F=E7=9A=84=E6=88=BF=E9=97=B4=E4=B8=AA=E4=BA=BA=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/ui/user/UserInfoActivity.java       | 87 ++++++++-----------
 .../main/res/layout/activity_user_info.xml    |  6 +-
 2 files changed, 40 insertions(+), 53 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
index e6dee0807..b3fd0b576 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
@@ -99,19 +99,10 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
 
     private int TAB_SIZE = 1;
     private int TAB_DYNAMIC = 0;
-
-    public interface IdentityState {
-        int NON = 0; // 无法识别
-        int OWN = 1; // 自己
-        int OTHER = 2; // 其他人
-    }
-
     private int identityState = IdentityState.NON;
-
     private UserInfoActivity mActivity;
     private long userId = 0;
     private UserInfo userInfo;
-
     private boolean mIslike = false;
     private RoomInfo mRoomInfo = null;
     private int flag = 0;
@@ -119,12 +110,9 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
     private LinearLayout bottomViewLayout = null;
     private TextView sendMsgLayout;
     private TextView attentionLayout;
-
     private ImageView ivOfficialMask;
     private TextView tvOfficialMask;
-
     private long mRoomUid;
-
     private GiftAdapter giftAdapter;
     private UserInfoPhotoAdapter bannerAdapter;
     private UserInfoDynamicAdapter dynamicAdapter;
@@ -214,7 +202,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
                 });
     }
 
-
     private void getUserInfoDetail() {
         UserModel.get().getUserInfoDetail(userId)
                 .compose(bindToLifecycle())
@@ -318,6 +305,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
                     ClanInfo clanInfo = clanAndHallInfo.getClan();
                     boolean showApply = AuthModel.get().getCurrentUid() != userId && HallDataManager.get().getHallId() <= 0;
                     if (hallInfo != null && hallInfo.getHallId() > 0) {
+                        mBinding.llModuleHall.setVisibility(View.VISIBLE);
                         mBinding.llHall.setVisibility(View.VISIBLE);
                         mBinding.tvHallId.setText("房间ID:" + hallInfo.getHallId() + "");
                         mBinding.tvHallName.setText(hallInfo.getHallName());
@@ -339,6 +327,8 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
 
                     if (clanInfo != null && clanInfo.getId() > 0) {
                         mBinding.llModuleHall.setVisibility(View.VISIBLE);
+                        mBinding.tvHallDetail.setVisibility(View.VISIBLE);
+                        mBinding.llClan.setVisibility(View.VISIBLE);
                         mBinding.tvClanId.setText("公会ID:" + clanInfo.getId());
                         mBinding.tvClanName.setText(clanInfo.getName());
                         mBinding.tvClanMemberNum.setText("公会人数:" + clanInfo.getClanMemberNum());
@@ -354,14 +344,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
                     } else {
                         mBinding.llModuleHall.setVisibility(View.GONE);
                     }
-            /*        mBinding.llHall.setOnClickListener(v -> {
-                        if (hallInfo != null && hallInfo.getHallId() != 0) {
-                            ModuleHallActivity.start(context, hallInfo.getHallId(), hallInfo.getOwnerUid(), userId);
-                        }
-                    });
-                    mBinding.llClan.setOnClickListener(v -> {
-                        ModuleClanActivity.start(context, userId);
-                    });*/
                 });
     }
 
@@ -514,7 +496,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
 
     }
 
-
     private void initNestScrollView() {
         mBinding.scrollView.setOnScrollChangeListener((NestedScrollView.OnScrollChangeListener) (v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
             if (flag == 0 && oldScrollY > SizeUtils.dp2px(this, 200)) {
@@ -600,7 +581,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
         }
     }
 
-
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
@@ -678,7 +658,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
         }
     }
 
-
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onIsLiked(IsLikedEvent event) {
         setLikedText(event.isLiked);
@@ -686,7 +665,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
 
     private void setLikedText(boolean isliked) {
         mIslike = isliked;
-        attentionLayout.setBackgroundResource(isliked?R.drawable.bg_common_cancel:R.drawable.bg_common_confirm);
+        attentionLayout.setBackgroundResource(isliked ? R.drawable.bg_common_cancel : R.drawable.bg_common_confirm);
         attentionLayout.setText(getString((isliked) ? R.string.already_attention : R.string.attention));
     }
 
@@ -745,32 +724,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
         StatusBarUtil.StatusBarLightMode(this);
     }
 
-    /**
-     * static静态代码
-     */
-
-    public final static class Companion {
-        public final static String TAG = UserInfoActivity.class.getSimpleName();
-
-        static final int FROM_TYPE_NORMAL = 1;
-        static final int FROM_TYPE_FAMILY = 2;
-
-        public static void start(Context context, long userId) {
-            Intent intent = new Intent(context, UserInfoActivity.class);
-            intent.putExtra("userId", userId);
-            int from = FROM_TYPE_NORMAL;
-            if (context instanceof FamilyHomeActivity
-                    || context instanceof FamilyMemberListActivity
-                    || context instanceof FamilyMemberSearchActivity) {
-                //这里限制循环访问, 例如:家族->个人主页->家族->个人主页->....
-                from = FROM_TYPE_FAMILY;
-            }
-            intent.putExtra("from", from);
-            context.startActivity(intent);
-
-        }
-    }
-
     /**
      * 判断自己是不是该世界的创始人
      */
@@ -812,4 +765,36 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
                 });
     }
 
+    public interface IdentityState {
+        int NON = 0; // 无法识别
+        int OWN = 1; // 自己
+        int OTHER = 2; // 其他人
+    }
+
+    /**
+     * static静态代码
+     */
+
+    public final static class Companion {
+        public final static String TAG = UserInfoActivity.class.getSimpleName();
+
+        static final int FROM_TYPE_NORMAL = 1;
+        static final int FROM_TYPE_FAMILY = 2;
+
+        public static void start(Context context, long userId) {
+            Intent intent = new Intent(context, UserInfoActivity.class);
+            intent.putExtra("userId", userId);
+            int from = FROM_TYPE_NORMAL;
+            if (context instanceof FamilyHomeActivity
+                    || context instanceof FamilyMemberListActivity
+                    || context instanceof FamilyMemberSearchActivity) {
+                //这里限制循环访问, 例如:家族->个人主页->家族->个人主页->....
+                from = FROM_TYPE_FAMILY;
+            }
+            intent.putExtra("from", from);
+            context.startActivity(intent);
+
+        }
+    }
+
 }
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index 443c40955..088fa0999 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -264,14 +264,16 @@
                         android:paddingEnd="@dimen/dp_15"
                         android:text="所属公会"
                         android:textColor="@color/text_normal_c6c6e9"
-                        android:textSize="@dimen/sp_13" />
+                        android:textSize="@dimen/sp_13"
+                        android:visibility="gone" />
 
                     <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_5">
+                        android:paddingBottom="@dimen/dp_5"
+                        android:visibility="gone">
 
                         <com.yizhuan.erban.common.widget.RectRoundImageView
                             android:id="@+id/iv_clan_avatar"