覆盖羽声

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

@@ -30,12 +30,20 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)NSString *name;
 /// 变动类型
 @property (nonatomic,strong)NSString *money;
-/// 1待处理2已通过3已拒绝 4打款中[云账户]5打款失败[云账户]6已打款[云账户]
+/// 状态：1待处理2已通过3已拒绝 4打款中[云账户]5打款失败[云账户]6已打款[云账户]
 @property (nonatomic,strong)NSString *status;
-/// 变动金额
+/// 状态说明
 @property (nonatomic,strong)NSString *status_str;
-/// 时间
+/// 提现时间
 @property (nonatomic,strong)NSString *createtime;
+/// 手续费/服务费
+@property (nonatomic,strong)NSString *withdraw_fee;
+/// 税率
+@property (nonatomic,strong)NSString *personal_tax_rate;
+/// 税款（个人所得税）
+@property (nonatomic,strong)NSString *received_tax_amount;
+/// 实际到账金额
+@property (nonatomic,strong)NSString *surplus_money;
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -26,6 +26,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)NSString *rule;
 @property (nonatomic,strong)NSString *gift_bag_name;
 @property (nonatomic,strong)NSString *rule_url;
+/// 活动id  5  跳转对应活动
+@property (nonatomic,strong)NSString *activities_id;
+/// 活动类型  10 天空之境   11 岁月之城  12时空之巅
+@property (nonatomic,strong)NSString *gift_bag;
 
 @property (nonatomic,assign)BOOL isSelected;
 @end
@@ -50,18 +54,4 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)NSString *time;
 @end
 
-@interface QXFirstRechargeModel : NSObject
-/// 9|30元
-@property (nonatomic,strong)NSString *name;
-/// 9元限时抢
-@property (nonatomic,strong)NSString *title1;
-/// 88元礼包
-@property (nonatomic,strong)NSString *title2;
-/// 充值金额
-@property (nonatomic,strong)NSString *money;
-/// 时间
-@property (nonatomic,strong)NSString *time;
-/// 礼物列表
-@property (nonatomic,strong)NSArray <QXGiftModel*>*gift_list;
-@end
 NS_ASSUME_NONNULL_END

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

@@ -23,13 +23,3 @@
 
 @end
 
-
-@implementation QXFirstRechargeModel
-+(NSDictionary<NSString *,id> *)modelContainerPropertyGenericClass{
-    return @{
-        @"gift_list" : @"QXGiftModel"
-    };
-}
-
-
-@end

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;
+@class QXRoomInfoModel,QXRoomPitModel,QXRoomOwnerModel,QXHeadLineModel,QXRoomAuction,QXRoomAuctionUser,QXRoomCpUser,QXRoomPkInfo,QXRoomFriendInfo,QXRoomFriendHeartListModel,QXRoomActivitySubModel,QXRoomActivityModel;
 @interface QXRoomModel : NSObject
 /// 房间信息
 @property (nonatomic,strong)QXRoomInfoModel *room_info;
@@ -28,8 +28,14 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)QXRoomCpUser *cp_user;
 /// pk信息
 @property (nonatomic,strong)QXRoomPkInfo *pk_info;
+/// 交友房信息
+@property (nonatomic,strong)QXRoomFriendInfo *friend_info;
 /// k歌麦位
 @property (nonatomic,strong)NSArray< QXRoomPitModel*> *song_pit_list;
+/// 活动
+@property (nonatomic,strong)QXRoomActivityModel *gift_cycle;
+
+@property (nonatomic,assign)NSInteger hour_ranking_open;
 @end
 
 
@@ -49,7 +55,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)NSString *room_cover;
 /// 房间公告
 @property (nonatomic,strong)NSString *room_intro;
-/// 房间类型  type_id 1 点唱  2 拍卖  3男神  4女神 6小黑屋
+/// 房间类型  type_id 1 点唱  2 拍卖  3男神  4女神 6小黑屋 7 交友房
 @property (nonatomic,strong)NSString *type_id;
 /// 房间子类型 label_id  1聊天  2 k歌    拍卖时   1真爱  2亲密
 @property (nonatomic,strong)NSString *label_id;
@@ -321,4 +327,34 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)NSString *is_pk;
 @end
 
+
+@interface QXRoomFriendInfo : NSObject
+/// 当前在哪个阶段  1  等待邂逅  2心动连线   3 牵手良缘
+@property (nonatomic,strong)NSString *step;
+/// 心动值
+@property (nonatomic,strong)NSArray <QXRoomFriendHeartListModel*>*heart_list;
+/// 场次id
+@property (nonatomic,strong)NSString *friend_id;
+/// 心动连线剩余时间
+@property (nonatomic,assign)long end_time;
+///  在线cp数
+@property (nonatomic,strong)NSString *room_on_line_cp;
+@end
+
+@interface QXRoomFriendHeartListModel : NSObject
+/// 心动值
+@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

@@ -18,7 +18,9 @@
         @"room_auction":@"QXRoomAuction",
         @"cp_user": @"QXRoomCpUser",
         @"pk_info" : @"QXRoomPkInfo",
-        @"song_pit_list":@"QXRoomPitModel"
+        @"song_pit_list":@"QXRoomPitModel",
+        @"friend_info":@"QXRoomFriendInfo",
+        @"gift_cycle":@"QXRoomActivityModel",
     };
 }
 
@@ -114,3 +116,31 @@
 
 
 @end
+
+
+
+@implementation QXRoomFriendInfo
++(NSDictionary<NSString *,id> *)modelContainerPropertyGenericClass{
+    return @{
+        @"heart_list" : @"QXRoomFriendHeartListModel"
+    };
+}
+
+@end
+
+@implementation QXRoomFriendHeartListModel
+
+@end
+
+@implementation QXRoomActivityModel
++(NSDictionary<NSString *,id> *)modelContainerPropertyGenericClass{
+    return @{
+        @"xlh_info" : @"QXRoomActivitySubModel"
+    };
+}
+@end
+
+@implementation QXRoomActivitySubModel
+
+
+@end

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

@@ -39,6 +39,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)NSString *is_use_code;
 /// 在线状态
 @property (nonatomic,assign)BOOL is_online;
+/// 1 能聊天  0不能聊天
+@property (nonatomic,assign)NSInteger is_can_chat;
+/// 需要充值金额
+@property (nonatomic,strong)NSString* can_chat_money;
 @end