[BugFix]修复寻爱bug

core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java

@@ -29,6 +29,7 @@ import com.yizhuan.xchat_android_core.auth.AuthModel;
 import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
 import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean;
 import com.yizhuan.xchat_android_core.room.bean.BoxSwitchVo;
+import com.yizhuan.xchat_android_core.room.bean.FindLoveSwitchVo;
 import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
 import com.yizhuan.xchat_android_core.room.bean.RoomModeType;
 import com.yizhuan.xchat_android_core.room.bean.SimplePartyRoomInfo;
@@ -108,6 +109,7 @@ public final class AvRoomDataManager {
     @Nullable
     public RoomInfo mCurrentRoomInfo;
     public BoxSwitchVo mBoxSwitchVo;
+    public FindLoveSwitchVo mFindLoveSwitchVo;
     public EnterChatRoomResultData mEnterChatRoomResultData;
     /**
      * 房间创建者
@@ -266,6 +268,7 @@ public final class AvRoomDataManager {
         //我们自己服务端信息
         mCurrentRoomInfo = roomInfo;
         mBoxSwitchVo = roomInfo.boxSwitchVo;
+        mFindLoveSwitchVo = roomInfo.findLoveDrawSwitchVo;
         phrases = roomInfo.getSpeakTemplate();
         nick = roomInfo.getNick();
         gender = roomInfo.getGender();

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

@@ -0,0 +1,76 @@
+package com.yizhuan.xchat_android_core.room.bean;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.io.Serializable;
+
+public class FindLoveSwitchVo implements Parcelable, Serializable {
+    private boolean open;
+    private int openLevel;
+    private int sendMsgLevel;
+
+    public boolean isOpen() {
+        return open;
+    }
+
+    public void setOpen(boolean open) {
+        this.open = open;
+    }
+
+    public int getOpenLevel() {
+        return openLevel;
+    }
+
+    public void setOpenLevel(int openLevel) {
+        this.openLevel = openLevel;
+    }
+
+    public int getSendMsgLevel() {
+        return sendMsgLevel;
+    }
+
+    public void setSendMsgLevel(int sendMsgLevel) {
+        this.sendMsgLevel = sendMsgLevel;
+    }
+
+    protected FindLoveSwitchVo(Parcel in) {
+        open = in.readByte() != 0;
+        openLevel = in.readInt();
+        sendMsgLevel = in.readInt();
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeByte((byte) (open ? 1 : 0));
+        dest.writeInt(openLevel);
+        dest.writeInt(sendMsgLevel);
+    }
+
+    public static final Creator<FindLoveSwitchVo> CREATOR = new Creator<FindLoveSwitchVo>() {
+        @Override
+        public FindLoveSwitchVo createFromParcel(Parcel in) {
+            return new FindLoveSwitchVo(in);
+        }
+
+        @Override
+        public FindLoveSwitchVo[] newArray(int size) {
+            return new FindLoveSwitchVo[size];
+        }
+    };
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+
+    @Override
+    public String toString() {
+        return "BoxInfo{" +
+                "open=" + open +
+                ", openLevel=" + openLevel +
+                ", sendMsgLevel='" + sendMsgLevel + '\'' +
+                '}';
+    }
+}

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

@@ -108,6 +108,8 @@ public class RoomInfo implements Parcelable,Serializable {
 
     public BoxSwitchVo boxSwitchVo;
 
+    public FindLoveSwitchVo findLoveDrawSwitchVo;
+
     private String singingMusicName;
    // 限制类型
     public static final String LOCK = "lock";//密码可进
@@ -178,6 +180,7 @@ public class RoomInfo implements Parcelable,Serializable {
         isOpenKTV = in.readByte() != 0;
         isOpenGame = in.readByte() != 0;
         boxSwitchVo = in.readParcelable(BoxSwitchVo.class.getClassLoader());
+        findLoveDrawSwitchVo = in.readParcelable(FindLoveSwitchVo.class.getClassLoader());
         singingMusicName = in.readString();
         limitType = in.readString();
         introduction = in.readString();
@@ -240,6 +243,7 @@ public class RoomInfo implements Parcelable,Serializable {
         dest.writeByte((byte) (isOpenKTV ? 1 : 0));
         dest.writeByte((byte) (isOpenGame ? 1 : 0));
         dest.writeParcelable(boxSwitchVo, flags);
+        dest.writeParcelable(findLoveDrawSwitchVo, flags);
         dest.writeString(singingMusicName);
         dest.writeString(limitType);
         dest.writeString(introduction);

core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/bean/TreasureRankingInfo.kt

@@ -7,6 +7,6 @@ data class TreasureRankingInfo(
     val erbanNo: Int = 0,
     val nick: String = "",
     val avatar: String = "",
-    val amount: Int = 0,
+    val diamonds: Int = 0,
     val ranking: Int = 0
 ): Serializable