提交

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

@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// 盲盒信息
 @property(nonatomic,strong)NSArray <QXGiftBoxModel*>*gift_box_list;
 
-@property(nonatomic,strong)QXDayTaskTypeModel*tasks;
+@property(nonatomic,strong)NSArray<QXDayTaskTypeModel*>* tasks;
 
 @end
 
@@ -41,15 +41,17 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 @interface QXDayTaskTypeModel : NSObject
-/// 每日特殊任务2
-@property(nonatomic,strong)NSArray <QXDayTaskListModel*>*daily_tasks_special;
-/// 每日常规任务
-@property(nonatomic,strong)NSArray <QXDayTaskListModel*>*daily_tasks;
-///  平台任务列表
-@property(nonatomic,strong)NSArray <QXDayTaskListModel*>*usual_tasks;
-
-@property(nonatomic,strong)NSArray <QXDayTaskListModel*>*teacher_tasks;
-
+///// 每日特殊任务2
+//@property(nonatomic,strong)NSArray <QXDayTaskListModel*>*daily_tasks_special;
+///// 每日常规任务
+//@property(nonatomic,strong)NSArray <QXDayTaskListModel*>*daily_tasks;
+/////  平台任务列表
+//@property(nonatomic,strong)NSArray <QXDayTaskListModel*>*usual_tasks;
+//
+//@property(nonatomic,strong)NSArray <QXDayTaskListModel*>*teacher_tasks;
+@property(nonatomic,strong)NSString *task_type_name;
+@property(nonatomic,strong)NSString *task_type_id;
+@property(nonatomic,strong)NSArray<QXDayTaskListModel*>*task_list;
 @end
 
 @interface QXDayTaskListModel : NSObject
@@ -76,7 +78,23 @@ NS_ASSUME_NONNULL_BEGIN
 /// 0 记录次数   1 计时
 @property(nonatomic,strong)NSString *is_time;
 /// 奖励类型  1金币  2钻石
-@property(nonatomic,strong)NSString *reward_type;
+//@property(nonatomic,strong)NSString *reward_type;
+/// 任务奖励
+@property(nonatomic,strong)NSString *reward_str;
+/**
+0  不跳转
+1  跳转实名
+2  跳转我的相册
+3  跳转绑定管理
+4  跳转房间
+5  跳转申请加入公会
+6  跳转充值
+7  签到
+ */
+@property(nonatomic,strong)NSString *jump_type;
+/// 徒弟user id
+@property(nonatomic,strong)NSString *student_id;
+
 @end
 
 
@@ -89,4 +107,26 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic,strong)NSString *createtime;
 @end
 
+@interface QXSignAppModel : NSObject
+/// 第几天
+@property(nonatomic,strong)NSString *day;
+/// 日期
+@property(nonatomic,strong)NSString *sign_in_date;
+/// 签到状态：1已签到 0未签到
+@property(nonatomic,strong)NSString *sign_in_status;
+/// 初级礼盒
+@property(nonatomic,strong)NSString *sign_in_status_str;
+/// 是否是当天 0否  1是
+@property(nonatomic,strong)NSString *is_today;
+/// 礼物名称
+@property(nonatomic,strong)NSString *gift_name;
+/// 数量
+@property(nonatomic,strong)NSString *num;
+/// 价格
+@property(nonatomic,strong)NSString *gift_price;
+///  1金币 2礼物 3装扮 4钻石
+@property(nonatomic,strong)NSString *type;
+/// 礼物
+@property(nonatomic,strong)NSString *base_image;
+@end
 NS_ASSUME_NONNULL_END

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

@@ -25,10 +25,10 @@
 
 +(NSDictionary<NSString *,id> *)modelContainerPropertyGenericClass{
     return @{
-        @"daily_tasks" : @"QXDayTaskListModel",
-        @"usual_tasks" : @"QXDayTaskListModel",
-        @"daily_tasks_special": @"QXDayTaskListModel",
-        @"teacher_tasks": @"QXDayTaskListModel",
+        @"task_list" : @"QXDayTaskListModel",
+//        @"usual_tasks" : @"QXDayTaskListModel",
+//        @"daily_tasks_special": @"QXDayTaskListModel",
+//        @"teacher_tasks": @"QXDayTaskListModel",
     };
 }
 
@@ -43,4 +43,10 @@
 
 
 
+@end
+
+@implementation QXSignAppModel
+
+
+
 @end

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

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