From 097ead1327da5a67431d149e2e4f82c447082c77 Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Wed, 6 Dec 2023 14:25:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=85=AC=E4=BC=9A?=
 =?UTF-8?q?=E9=AB=98=E7=AE=A1=E8=AE=BE=E7=BD=AE=E5=85=A5=E5=8F=A3=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/module_hall/hall/activity/ModuleHallActivity.java  | 5 +++++
 .../module_labour_union/res/layout/activity_module_hall.xml  | 1 +
 2 files changed, 6 insertions(+)

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 d8de4d39b..93cc00294 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
@@ -220,6 +220,11 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
                     HallInfo hallInfo = clanAndHallInfo.getHall();
                     clanInfo = clanAndHallInfo.getClan();
                     setManegeOption((HallDataManager.get().isManager() && isSelfHall) || clanAndHallInfo.isManageHall());
+                    int roleType = 0;
+                    if (hallInfo != null) {
+                        roleType = hallInfo.getRoleType();
+                    }
+                    binding.tvManageSetup.setVisibility(roleType == RoleType.OWNER ? View.VISIBLE : View.INVISIBLE);
                     //高管是没有修改公会名称权限的,只有房主和超管才有
                     setSettingOption((HallDataManager.get().getRoleType() == RoleType.OWNER && isSelfHall) || clanAndHallInfo.isManageHall());
                     if (hallInfo != null && hallInfo.getHallId() != 0) {
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 ddceb8eac..1c1af1664 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
@@ -146,6 +146,7 @@
                     android:textSize="14sp" />
 
                 <TextView
+                    android:visibility="invisible"
                     android:id="@+id/tv_manage_setup"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"