[Modify]加入房間功能修改

core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/HallListInfo.java

@@ -14,6 +14,6 @@ public class HallListInfo {
     private Integer memberCount;
     private Long ownerErbanNo;
     private Double roomIncome;
-    private int applyBtnStatus;//0=不显示 1=可申请 2=已申请
-
+    private int hallBtnStatus;//0=不显示 1=可申请 2=待审核 3通过邀请
+    private int hallRecordId;//通过邀请时的邀请记录id
 }

core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SearchRoomInfo.java

@@ -59,6 +59,9 @@ public class SearchRoomInfo extends RoomInfo implements Parcelable, MultiItemEnt
     private ArrayList<BannerInfo> bannerInfos;
     public boolean newUser;
 
+    private int hallBtnStatus;//0不显示，4可邀请，5待通过，6通过申请
+    private int hallRecordId;//当hallBtnStatus=6时返回申请记录Id
+
     public SearchRoomInfo() {
     }
 
@@ -75,6 +78,9 @@ public class SearchRoomInfo extends RoomInfo implements Parcelable, MultiItemEnt
 
         bannerInfos = in.createTypedArrayList(BannerInfo.CREATOR);
 
+        hallBtnStatus = in.readInt();
+        hallRecordId = in.readInt();
+
     }
 
 
@@ -91,6 +97,9 @@ public class SearchRoomInfo extends RoomInfo implements Parcelable, MultiItemEnt
 
         dest.writeTypedList(bannerInfos);
 
+        dest.writeInt(hallBtnStatus);
+        dest.writeInt(hallRecordId);
+
     }
 
     public String getNick() {