1.超管接口对接和家族公会UI修改

core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java

@@ -301,13 +301,30 @@ public class HallModel extends BaseModel implements IHallModel {
                 .compose(RxHelper.handleCommon());
     }
 
-
     @Override
     public Single<String> setSuperAdmin(String roomUids ,long uid) {
         return api.setSuperAdmin(roomUids,uid)
                 .compose(RxHelper.handleStringData());
     }
 
+    @Override
+    public Single<List<SuperAdminInfo>> getRoomSuperAdminList(long roomUid) {
+        return api.getRoomSuperAdminList(roomUid)
+                .compose(RxHelper.handleCommon());
+    }
+
+    @Override
+    public Single<List<SuperAdminInfo>> getClanSuperAdminList(long clanId) {
+        return api.getClanSuperAdminList(clanId)
+                .compose(RxHelper.handleCommon());
+    }
+
+    @Override
+    public Single<String> removeSuperAdmin(long uid) {
+        return api.removeSuperAdmin(uid)
+                .compose(RxHelper.handleStringData());
+    }
+
 
     private interface Api {
         /**
@@ -477,6 +494,12 @@ public class HallModel extends BaseModel implements IHallModel {
         @GET("/hall/superManager/search")
         Single<ServiceResult<SuperAdminInfo>> searchSuperAdminInfo(@Query("erbanNo") long erbanNo);
 
+        /**
+         * 移除超管
+         */
+        @GET("/hall/superManager/remove")
+        Single<ServiceResult<String>> removeSuperAdmin(@Query("targetUid") long targetUid);
+
         /**
          * 设置超管信息
          * @param roomUids 设置的房间uid,都会隔开
@@ -486,5 +509,17 @@ public class HallModel extends BaseModel implements IHallModel {
         @POST("/hall/superManager/setSuperManage")
         Single<ServiceResult<String>> setSuperAdmin(@Field("roomUids") String roomUids,@Field("uid") long uid);
 
+        /**
+         * 获取房间超管信息
+         */
+        @GET("/hall/superManager/listSuperManageInClan")
+        Single<ServiceResult<List<SuperAdminInfo>>> getClanSuperAdminList(@Query("clanId") long clanId);
+
+        /**
+         * 获取公会超管信息
+         */
+        @GET("/hall/superManager/listSuperManageInRoom")
+        Single<ServiceResult<List<SuperAdminInfo>>> getRoomSuperAdminList(@Query("roomUid") long roomUid);
+
     }
 }

core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallModel.java

@@ -81,4 +81,10 @@ public interface IHallModel {
     Single<SuperAdminInfo> searchSuperAdminInfo(long erbanNo);
 
     Single<String> setSuperAdmin(String roomUids ,long uid);
+
+    Single<List<SuperAdminInfo>> getRoomSuperAdminList(long roomUid);
+
+    Single<List<SuperAdminInfo>> getClanSuperAdminList(long clanId);
+
+    Single<String> removeSuperAdmin(long uid);
 }

core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanAndHallInfo.java

@@ -6,4 +6,5 @@ import lombok.Data;
 public class ClanAndHallInfo {
     private ClanInfo clan;
     private HallInfo hall;
+    private boolean manageHall;
 }

core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/RoleType.java

@@ -6,14 +6,29 @@ package com.yizhuan.xchat_android_core.module_hall.hall.bean;
  */
 
 public interface RoleType {
-    /**厅主*/
+    /**
+     * 厅主
+     */
     int OWNER = 1;
-    /**高管*/
+    /**
+     * 高管
+     */
     int ADMIN = 2;
-    /**普通成员*/
+    /**
+     * 普通成员
+     */
     int NORMAL = 3;
-    /**族长*/
+    /**
+     * 族长
+     */
     int CLAN_OWNER = 4;
-    /**族长,会长*/
+    /**
+     * 族长,会长
+     */
     int CLAN_HALL_OWNER = 5;
+    /**
+     * 超管
+     */
+    int CLAN_SUPER_ADMIN = 6;
+
 }

core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminInfo.kt

@@ -6,5 +6,6 @@ data class SuperAdminInfo(
     val gender: Int = 0,
     var hasSet: Boolean = false,
     val nick: String? = null,
-    val uid: Long = 0
+    val uid: Long = 0,
+    val roomList: List<SuperAdminHall>? = null
 )