1.修改SearchActivity邀请好友Cp 2.处理发起Cp邀请购买道具余额不足的情况 3.个人中心增加亲密关系入口

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

@@ -47,7 +47,12 @@ public class SearchRoomInfo extends RoomInfo implements Parcelable, MultiItemEnt
 
     private long birth;
 
-    /** 是否是靓号，1：靓号 */
+    //Cp
+    private int cpState;
+
+    /**
+     * 是否是靓号，1：靓号
+     */
     public boolean hasPrettyErbanNo;
     public NobleInfo nobleUsers;
     public UserLevelVo userLevelVo;
@@ -65,12 +70,14 @@ public class SearchRoomInfo extends RoomInfo implements Parcelable, MultiItemEnt
         defUser = in.readInt();
         erbanNo = in.readLong();
         badge = in.readString();
+        cpState = in.readInt();
         hasPrettyErbanNo = in.readByte() != 0;
 
         bannerInfos = in.createTypedArrayList(BannerInfo.CREATOR);
 
     }
 
+
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         super.writeToParcel(dest, flags);
@@ -79,6 +86,7 @@ public class SearchRoomInfo extends RoomInfo implements Parcelable, MultiItemEnt
         dest.writeInt(defUser);
         dest.writeLong(erbanNo);
         dest.writeString(badge);
+        dest.writeInt(cpState);
         dest.writeByte((byte) (hasPrettyErbanNo ? 1 : 0));
 
         dest.writeTypedList(bannerInfos);
@@ -89,8 +97,14 @@ public class SearchRoomInfo extends RoomInfo implements Parcelable, MultiItemEnt
         return TextUtils.isEmpty(nick) ? "" : nick;
     }
 
+
+    public int getCpState() {
+        return cpState;
+    }
+
     /**
      * 判断是否为官方账号
+     *
      * @return
      */
     public boolean isOfficial() {
@@ -99,8 +113,8 @@ public class SearchRoomInfo extends RoomInfo implements Parcelable, MultiItemEnt
 
     /**
      * 靓号变色
-     * @param defColor
-     * 非靓号颜色
+     *
+     * @param defColor 非靓号颜色
      */
     public SpannableString getNick(int defColor) {
         if (TextUtils.isEmpty(nick))
@@ -116,7 +130,7 @@ public class SearchRoomInfo extends RoomInfo implements Parcelable, MultiItemEnt
             spannableString.setSpan(colorSpan, 0, nick.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
         }
 
-        return  spannableString;
+        return spannableString;
     }
 
     @Override
@@ -138,7 +152,7 @@ public class SearchRoomInfo extends RoomInfo implements Parcelable, MultiItemEnt
 
     @Override
     public int getItemType() {
-        return ListUtils.isListEmpty(bannerInfos)?NORMAL:BANNER;
+        return ListUtils.isListEmpty(bannerInfos) ? NORMAL : BANNER;
     }
 
 }

core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java

@@ -100,6 +100,10 @@ public class UserInfo implements Serializable {
     @Getter
     @Setter
     private List<String> absCardPics;
+    //cpState
+    @Getter
+    @Setter
+    private int cpState;
     @Getter
     @Setter
     private int registerDay;