iOS Team / CNLiveCollectionModule · Commits

Commit 9fdf7d50df869f77700b5fa56a9cdb86b8a980fc

Authored by zhangxiaowen
1 parent cdf29cb7

no message

Inline Side-by-side
Showing 3 changed files with 4 additions and 10 deletions
CNLiveCollectionModule/Classes/Controller/CNLiveCollectionController.m
  View file @9fdf7d5
@@ -9,12 +9,8 @@ @@ -9,12 +9,8 @@
9 #import "CNLiveCollectionController.h" 9 #import "CNLiveCollectionController.h"
10 #import "QMUIKit.h" 10 #import "QMUIKit.h"
11 11
12 -#import <Masonry/Masonry.h>  
13 -#import <SDWebImage/SDWebImage.h>  
14 #import "CNLiveCategory.h" 12 #import "CNLiveCategory.h"
15 13
16 -#import "CNUserInfoManager.h"  
17 -  
18 #import "CNLiveRefreshHeader.h" 14 #import "CNLiveRefreshHeader.h"
19 #import "CNLiveRrfreshFooter.h" 15 #import "CNLiveRrfreshFooter.h"
20 16
CNLiveCollectionModule/Classes/Model/CNLiveCollectionModel.h
  View file @9fdf7d5
@@ -22,7 +22,6 @@ typedef NS_ENUM(NSInteger, CNLiveCollectionCellType) { @@ -22,7 +22,6 @@ typedef NS_ENUM(NSInteger, CNLiveCollectionCellType) {
22 @property (nonatomic, copy) NSString *nickName; 22 @property (nonatomic, copy) NSString *nickName;
23 @property (nonatomic, copy) NSString *extInfo; 23 @property (nonatomic, copy) NSString *extInfo;
24 @property (nonatomic, copy) NSString *image; 24 @property (nonatomic, copy) NSString *image;
25 -  
26 @property (nonatomic, copy) NSString *state; 25 @property (nonatomic, copy) NSString *state;
27 @property (nonatomic, copy) NSString *fansCount; 26 @property (nonatomic, copy) NSString *fansCount;
28 @property (nonatomic, copy) NSString *orderCount; 27 @property (nonatomic, copy) NSString *orderCount;
@@ -33,7 +32,6 @@ typedef NS_ENUM(NSInteger, CNLiveCollectionCellType) { @@ -33,7 +32,6 @@ typedef NS_ENUM(NSInteger, CNLiveCollectionCellType) {
33 32
34 @property (nonatomic, copy) NSString *itemId; 33 @property (nonatomic, copy) NSString *itemId;
35 @property (nonatomic, copy) NSString *img; 34 @property (nonatomic, copy) NSString *img;
36 -@property (nonatomic, strong) CNLiveIcon *icon;  
37 @property (nonatomic, copy) NSString *imagePath; 35 @property (nonatomic, copy) NSString *imagePath;
38 @property (nonatomic, copy) NSString *thumbnailPath; 36 @property (nonatomic, copy) NSString *thumbnailPath;
39 @property (nonatomic, copy) NSString *videoImg; 37 @property (nonatomic, copy) NSString *videoImg;
@@ -42,17 +40,18 @@ typedef NS_ENUM(NSInteger, CNLiveCollectionCellType) { @@ -42,17 +40,18 @@ typedef NS_ENUM(NSInteger, CNLiveCollectionCellType) {
42 @property (nonatomic, copy) NSString *videoPlayUrl; 40 @property (nonatomic, copy) NSString *videoPlayUrl;
43 @property (nonatomic, copy) NSString *collectionId; 41 @property (nonatomic, copy) NSString *collectionId;
44 @property (nonatomic, copy) NSString *type; 42 @property (nonatomic, copy) NSString *type;
45 -@property (nonatomic, assign) NSInteger time;  
46 @property (nonatomic, copy) NSString *collectionType; 43 @property (nonatomic, copy) NSString *collectionType;
47 -@property (nonatomic, copy) NSString * shareUrl; 44 +@property (nonatomic, copy) NSString *shareUrl;
48 @property (nonatomic, copy) NSString *channelName; 45 @property (nonatomic, copy) NSString *channelName;
49 @property (nonatomic, copy) NSString *contentId; 46 @property (nonatomic, copy) NSString *contentId;
50 47
51 @property (nonatomic, copy) NSURL *imageUrl; 48 @property (nonatomic, copy) NSURL *imageUrl;
52 @property (nonatomic, copy) NSMutableAttributedString *title; 49 @property (nonatomic, copy) NSMutableAttributedString *title;
53 @property (nonatomic, copy) NSString *nameTime; 50 @property (nonatomic, copy) NSString *nameTime;
54 -@property (nonatomic, assign) CGFloat height;  
55 51
  52 +@property (nonatomic, strong) CNLiveIcon *icon;
  53 +@property (nonatomic, assign) NSInteger time;
  54 +@property (nonatomic, assign) CGFloat height;
56 55
57 @end 56 @end
58 57
CNLiveCollectionModule/Classes/Model/CNLiveCollectionModel.m
  View file @9fdf7d5
@@ -11,7 +11,6 @@ @@ -11,7 +11,6 @@
11 #import "CNLiveCommonCategory.h" 11 #import "CNLiveCommonCategory.h"
12 12
13 @implementation CNLiveCollectionModel 13 @implementation CNLiveCollectionModel
14 -  
15 + (NSDictionary *)mj_objectClassInArray{ 14 + (NSDictionary *)mj_objectClassInArray{
16 return @{ 15 return @{
17 @"icon" : @"CNLiveIcon" 16 @"icon" : @"CNLiveIcon"