提交

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

@@ -10,7 +10,7 @@
 #import "QXSongListModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
-@class QXRoomInfoModel,QXRoomPitModel,QXRoomOwnerModel,QXHeadLineModel,QXRoomAuction,QXRoomAuctionUser,QXRoomCpUser,QXRoomPkInfo,QXRoomFriendInfo,QXRoomFriendHeartListModel;
+@class QXRoomInfoModel,QXRoomPitModel,QXRoomOwnerModel,QXHeadLineModel,QXRoomAuction,QXRoomAuctionUser,QXRoomCpUser,QXRoomPkInfo,QXRoomFriendInfo,QXRoomFriendHeartListModel,QXRoomActivitySubModel,QXRoomActivityModel;
 @interface QXRoomModel : NSObject
 /// 房间信息
 @property (nonatomic,strong)QXRoomInfoModel *room_info;
@@ -32,6 +32,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)QXRoomFriendInfo *friend_info;
 /// k歌麦位
 @property (nonatomic,strong)NSArray< QXRoomPitModel*> *song_pit_list;
+/// 活动
+@property (nonatomic,strong)QXRoomActivityModel *gift_cycle;
 @end
 
 
@@ -342,4 +344,15 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)NSString *heartNum;
 @property (nonatomic,strong)NSString *heartId;
 @end
+
+@interface QXRoomActivityModel : NSObject
+@property (nonatomic,strong)QXRoomActivitySubModel *xlh_info;
+@end
+
+@interface QXRoomActivitySubModel : NSObject
+@property (nonatomic,strong)NSString *activities_name;
+@property (nonatomic,strong)NSString *icon;
+@property (nonatomic,strong)NSString *xlh_status;
+@property (nonatomic,assign)long end_time;
+@end
 NS_ASSUME_NONNULL_END

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

@@ -20,6 +20,7 @@
         @"pk_info" : @"QXRoomPkInfo",
         @"song_pit_list":@"QXRoomPitModel",
         @"friend_info":@"QXRoomFriendInfo",
+        @"gift_cycle":@"QXRoomActivityModel",
     };
 }
 
@@ -129,4 +130,17 @@
 
 @implementation QXRoomFriendHeartListModel
 
+@end
+
+@implementation QXRoomActivityModel
++(NSDictionary<NSString *,id> *)modelContainerPropertyGenericClass{
+    return @{
+        @"xlh_info" : @"QXRoomActivitySubModel"
+    };
+}
+@end
+
+@implementation QXRoomActivitySubModel
+
+
 @end