提交

QXLive/Mine(音域)/Model/QXGiftModel.h

@@ -33,6 +33,9 @@ NS_ASSUME_NONNULL_BEGIN
 /// 是否为爵位礼物  0 打开  1 锁住
 @property (nonatomic,strong)NSString *is_lock;
 
+/// 是否为爵位礼物  0 打开  1 锁住
+@property (nonatomic,strong)NSString *is_cp;
+
 @property (nonatomic,assign)BOOL isSelected;
 @end
 

QXLive/Mine(音域)/Model/QXRoomModel.h

@@ -8,9 +8,10 @@
 #import <Foundation/Foundation.h>
 #import "QXGiftModel.h"
 #import "QXSongListModel.h"
+#import "QXUserSongListModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
-@class QXRoomInfoModel,QXRoomPitModel,QXRoomOwnerModel,QXHeadLineModel,QXRoomAuction,QXRoomAuctionUser,QXRoomCpUser,QXRoomPkInfo,QXRoomFriendInfo,QXRoomFriendHeartListModel,QXRoomActivitySubModel,QXRoomActivityModel;
+@class QXRoomInfoModel,QXRoomPitModel,QXRoomOwnerModel,QXHeadLineModel,QXRoomAuction,QXRoomAuctionUser,QXRoomCpUser,QXRoomPkInfo,QXRoomFriendInfo,QXRoomFriendHeartListModel,QXRoomActivitySubModel,QXRoomActivityModel,QXSingerInfo;
 @interface QXRoomModel : NSObject
 /// 房间信息
 @property (nonatomic,strong)QXRoomInfoModel *room_info;
@@ -20,6 +21,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)QXRoomOwnerModel *user_info;
 /// 当前演唱者信息
 @property (nonatomic,strong)QXSongListModel *song_user_info;
+/// 点唱房演唱者信息
+@property (nonatomic,strong)QXSingerInfo *singer_info;
 /// 下一首歌曲信息
 @property (nonatomic,strong)QXSongListModel *nextInfo;
 /// 拍卖房信息
@@ -375,4 +378,11 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)NSString *xlh_status;
 @property (nonatomic,assign)long end_time;
 @end
+
+
+@interface QXSingerInfo : NSObject
+/// 心动值
+@property (nonatomic,strong)QXUserSongListModel *song_info;
+@property (nonatomic,strong)QXUserSongListModel *next_song_info;
+@end
 NS_ASSUME_NONNULL_END

QXLive/Mine(音域)/Model/QXRoomModel.m

@@ -21,6 +21,7 @@
         @"song_pit_list":@"QXRoomPitModel",
         @"friend_info":@"QXRoomFriendInfo",
         @"gift_cycle":@"QXRoomActivityModel",
+        @"singer_info":@"QXSingerInfo",
     };
 }
 
@@ -144,3 +145,14 @@
 
 
 @end
+
+
+@implementation QXSingerInfo
++(NSDictionary<NSString *,id> *)modelContainerPropertyGenericClass{
+    return @{
+        @"song_info" : @"QXUserSongListModel",
+        @"next_song_info" : @"QXUserSongListModel",
+    };
+}
+
+@end

QXLive/Mine(音域)/Model/QXUserModel.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
-@class QXRelationshipListModel;
+@class QXRelationshipListModel,QXUserCpInfoModel;
 NS_ASSUME_NONNULL_BEGIN
 
 @interface QXUserModel : NSObject
@@ -47,6 +47,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)NSString *is_hide;
 /// 当前状态：0-取消隐身，1-隐身进入
 @property (nonatomic,strong)NSString *hide_status;
+/// 当前状态：-1 未认证歌手， 0待审核   1已认证  2被拒绝
+@property (nonatomic,strong)NSString *singer_status;
 /// 在线状态
 @property (nonatomic,assign)BOOL is_online;
 /// 1 能聊天  0不能聊天
@@ -124,6 +126,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// 是否使用靓号  0未使用   1 已使用
 @property (nonatomic,strong)NSString *is_use_code;
 
+@property (nonatomic,strong)QXUserCpInfoModel *cp_info;
+
 -(instancetype)copyModel;
 @end
 
@@ -208,8 +212,10 @@ NS_ASSUME_NONNULL_BEGIN
 /// 角色 1-房主 > 2-管理员 > 3主持人 >4 普通用户 排序
 @property (nonatomic,strong)NSString *role;
 
-@property (nonatomic,strong)QXRelationshipListModel *qinmi;
-@property (nonatomic,strong)QXRelationshipListModel *zhenai;
+@property (nonatomic,strong)QXUserCpInfoModel *cp_info;
+
+//@property (nonatomic,strong)QXRelationshipListModel *qinmi;
+//@property (nonatomic,strong)QXRelationshipListModel *zhenai;
 @end
 
 
@@ -254,7 +260,23 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)NSString *image;
 /// 亲密拍心动值
 @property (nonatomic,strong)NSString *heart_value;
+@property (nonatomic,strong)NSString *sex2;
+@property (nonatomic,strong)NSString *sex1;
 /// 1-置顶，0-不置顶
 @property (nonatomic,strong)NSString *is_top;
 @end
+
+@interface QXUserCpInfoModel : NSObject
+@property (nonatomic,strong)NSString *name;
+@property (nonatomic,strong)NSString *user_id1;
+@property (nonatomic,strong)NSString *user_id2;
+@property (nonatomic,strong)NSString *level;
+@property (nonatomic,strong)NSString *exp;
+/// 挂件（装扮）地址
+@property (nonatomic,strong)NSString *pendant;
+/// 挂件上的头像位置：0-上，1-右上，2-右，3-右下，4-下，5-左下，6-左，7-左上'
+@property (nonatomic,strong)NSString *direction;
+@property (nonatomic,strong)QXUserModel *user_info1;
+@property (nonatomic,strong)QXUserModel *user_info2;
+@end
 NS_ASSUME_NONNULL_END

QXLive/Mine(音域)/Model/QXUserModel.m

@@ -16,7 +16,10 @@
 
 
 +(NSDictionary<NSString *,id> *)modelContainerPropertyGenericClass{
-    return @{@"tag_list" : @"QXUserTag"};
+    return @{
+        @"tag_list" : @"QXUserTag",
+        @"cp_info": @"QXUserCpInfoModel"
+    };
 }
 
 
@@ -56,8 +59,9 @@
 
 +(NSDictionary<NSString *,id> *)modelContainerPropertyGenericClass{
     return @{
-        @"qinmi" : @"QXRelationshipListModel",
-        @"zhenai" : @"QXRelationshipListModel"
+//        @"qinmi" : @"QXRelationshipListModel",
+//        @"zhenai" : @"QXRelationshipListModel"
+        @"cp_info": @"QXUserCpInfoModel"
     };
 }
 
@@ -79,3 +83,17 @@
 
 
 @end
+
+
+@implementation QXUserCpInfoModel
+
++(NSDictionary<NSString *,id> *)modelContainerPropertyGenericClass{
+    return @{
+//        @"qinmi" : @"QXRelationshipListModel",
+//        @"zhenai" : @"QXRelationshipListModel"
+        @"user_info1": @"QXUserModel",
+        @"user_info2": @"QXUserModel",
+    };
+}
+
+@end