iOS Team / CNLiveSubsList · Commits

Commit e089945bf6f61ecb1f0f0ca0c8655608d9df5cbc

Authored by yinqiaojuan
1 parent 920e47ff

0.0.6

Inline Side-by-side
Showing 9 changed files with 12 additions and 12 deletions
CNLiveSubsList.podspec
  View file @e089945
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveSubsList' 10 s.name = 'CNLiveSubsList'
11 - s.version = '0.0.5' 11 + s.version = '0.0.6'
12 s.summary = 'A short description of CNLiveSubsList.' 12 s.summary = 'A short description of CNLiveSubsList.'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
CNLiveSubsList/Classes/Actions/CNLiveTarget_GetSubsList.h
  View file @e089945
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 NS_ASSUME_NONNULL_BEGIN 10 NS_ASSUME_NONNULL_BEGIN
11 11
12 @interface CNLiveTarget_GetSubsList : NSObject 12 @interface CNLiveTarget_GetSubsList : NSObject
13 -- (UIViewController *)CNLiveAction_getSubsListVc:(NSDictionary *)param type:(SubsType)type; 13 +- (UIViewController *)CNLiveAction_getSubsListVc:(NSDictionary *)param type:(CNLiveSubsType)type;
14 @end 14 @end
15 15
16 NS_ASSUME_NONNULL_END 16 NS_ASSUME_NONNULL_END
CNLiveSubsList/Classes/Actions/CNLiveTarget_GetSubsList.m
  View file @e089945
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 #import "CNLiveTarget_GetSubsList.h" 8 #import "CNLiveTarget_GetSubsList.h"
9 9
10 @implementation CNLiveTarget_GetSubsList 10 @implementation CNLiveTarget_GetSubsList
11 -- (UIViewController *)CNLiveAction_getSubsListVc:(NSDictionary *)param type:(SubsType)type { 11 +- (UIViewController *)CNLiveAction_getSubsListVc:(NSDictionary *)param type:(CNLiveSubsType)type {
12 CNLiveSubsListViewController *vc = [[CNLiveSubsListViewController alloc] initWithType:type param:param]; 12 CNLiveSubsListViewController *vc = [[CNLiveSubsListViewController alloc] initWithType:type param:param];
13 return vc; 13 return vc;
14 } 14 }
CNLiveSubsList/Classes/Controller/CNLiveSubsListViewController.h
  View file @e089945
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 NS_ASSUME_NONNULL_BEGIN 10 NS_ASSUME_NONNULL_BEGIN
11 11
12 @interface CNLiveSubsListViewController : QMUICommonTableViewController 12 @interface CNLiveSubsListViewController : QMUICommonTableViewController
13 -- (instancetype)initWithType:(SubsType)type param:(NSDictionary *)param; 13 +- (instancetype)initWithType:(CNLiveSubsType)type param:(NSDictionary *)param;
14 @end 14 @end
15 15
16 NS_ASSUME_NONNULL_END 16 NS_ASSUME_NONNULL_END
CNLiveSubsList/Classes/Controller/CNLiveSubsListViewController.m
  View file @e089945
@@ -31,7 +31,7 @@ static NSString *requestData = @"data"; @@ -31,7 +31,7 @@ static NSString *requestData = @"data";
31 // SubsType _type; 31 // SubsType _type;
32 // UILabel *_numDarenLbl; 32 // UILabel *_numDarenLbl;
33 } 33 }
34 -@property (nonatomic, assign) SubsType type; 34 +@property (nonatomic, assign) CNLiveSubsType type;
35 @property (nonatomic, strong) UILabel *numDarenLbl; 35 @property (nonatomic, strong) UILabel *numDarenLbl;
36 @property (nonatomic, strong) NSMutableArray<NSString *> *searchResultsKeywords; 36 @property (nonatomic, strong) NSMutableArray<NSString *> *searchResultsKeywords;
37 @property (nonatomic, strong) QMUISearchController *mySearchController; 37 @property (nonatomic, strong) QMUISearchController *mySearchController;
@@ -44,7 +44,7 @@ static NSString *requestData = @&quot;data&quot;; @@ -44,7 +44,7 @@ static NSString *requestData = @&quot;data&quot;;
44 { 44 {
45 NSLog(@"CNSubsListViewController释放了"); 45 NSLog(@"CNSubsListViewController释放了");
46 } 46 }
47 -- (instancetype)initWithType:(SubsType)type param:(nonnull NSDictionary *)param{ 47 +- (instancetype)initWithType:(CNLiveSubsType)type param:(nonnull NSDictionary *)param{
48 if (self = [super init]) { 48 if (self = [super init]) {
49 if (type == SubsTypeDaren) { 49 if (type == SubsTypeDaren) {
50 self.title = @"达人号"; 50 self.title = @"达人号";
CNLiveSubsList/Classes/ModuleA/CNLiveCoreMediator+ModuleAdSubsListActions.h
  View file @e089945
@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN @@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
11 11
12 @interface CNLiveCoreMediator (ModuleSubsListActions) 12 @interface CNLiveCoreMediator (ModuleSubsListActions)
13 //获取达人和生活号 13 //获取达人和生活号
14 -- (UIViewController *)CNLiveCoreMediator_getSubsListVc:(NSDictionary *)param type:(SubsType)type; 14 +- (UIViewController *)CNLiveCoreMediator_getSubsListVc:(NSDictionary *)param type:(CNLiveSubsType)type;
15 @end 15 @end
16 16
17 NS_ASSUME_NONNULL_END 17 NS_ASSUME_NONNULL_END
CNLiveSubsList/Classes/ModuleA/CNLiveCoreMediator+ModuleAdSubsListActions.m
  View file @e089945
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 NSString * const KCNLiveMediatorTargetAdSubsList = @"GetSubsList"; 10 NSString * const KCNLiveMediatorTargetAdSubsList = @"GetSubsList";
11 NSString * const KCNLiveMediatorActionGetSubsListVc = @"getSubsListVc"; 11 NSString * const KCNLiveMediatorActionGetSubsListVc = @"getSubsListVc";
12 @implementation CNLiveCoreMediator (ModuleSubsListActions) 12 @implementation CNLiveCoreMediator (ModuleSubsListActions)
13 -- (UIViewController *)CNLiveCoreMediator_getSubsListVc:(NSDictionary *)param type:(SubsType)type { 13 +- (UIViewController *)CNLiveCoreMediator_getSubsListVc:(NSDictionary *)param type:(CNLiveSubsType)type {
14 14
15 UIViewController *viewController = [self performTarget:KCNLiveMediatorTargetAdSubsList action:KCNLiveMediatorActionGetSubsListVc params:param shouldCacheTarget:NO]; 15 UIViewController *viewController = [self performTarget:KCNLiveMediatorTargetAdSubsList action:KCNLiveMediatorActionGetSubsListVc params:param shouldCacheTarget:NO];
16 if ([viewController isKindOfClass:[UIViewController class]]) { 16 if ([viewController isKindOfClass:[UIViewController class]]) {
CNLiveSubsList/Classes/View/CNLiveSubscribeCell.h
  View file @e089945
@@ -9,14 +9,14 @@ @@ -9,14 +9,14 @@
9 9
10 NS_ASSUME_NONNULL_BEGIN 10 NS_ASSUME_NONNULL_BEGIN
11 11
12 -typedef NS_ENUM(NSInteger, SubsType) { 12 +typedef NS_ENUM(NSInteger, CNLiveSubsType) {
13 SubsTypeDaren = 0,//达人号 13 SubsTypeDaren = 0,//达人号
14 SubsTypeLife //生活号 14 SubsTypeLife //生活号
15 }; 15 };
16 16
17 @class CNLiveSubsModel; 17 @class CNLiveSubsModel;
18 @interface CNLiveSubscribeCell : QMUITableViewCell 18 @interface CNLiveSubscribeCell : QMUITableViewCell
19 -- (void)configCellWith:(CNLiveSubsModel *)model type:(SubsType)type; 19 +- (void)configCellWith:(CNLiveSubsModel *)model type:(CNLiveSubsType)type;
20 @end 20 @end
21 21
22 NS_ASSUME_NONNULL_END 22 NS_ASSUME_NONNULL_END
CNLiveSubsList/Classes/View/CNLiveSubscribeCell.m
  View file @e089945
@@ -23,7 +23,7 @@ static NSString *const DarenSubsRealm = @&quot;DarenSubs&quot;; @@ -23,7 +23,7 @@ static NSString *const DarenSubsRealm = @&quot;DarenSubs&quot;;
23 static NSString *const LifeSubsRealm = @"LifeSubs"; 23 static NSString *const LifeSubsRealm = @"LifeSubs";
24 @interface CNLiveSubscribeCell () 24 @interface CNLiveSubscribeCell ()
25 { 25 {
26 - SubsType _type; 26 + CNLiveSubsType _type;
27 } 27 }
28 @property (nonatomic ,strong) CNLiveSubsModel * model; 28 @property (nonatomic ,strong) CNLiveSubsModel * model;
29 @property (nonatomic ,strong) UIImageView * icon;//头像 29 @property (nonatomic ,strong) UIImageView * icon;//头像
@@ -43,7 +43,7 @@ static NSString *const LifeSubsRealm = @&quot;LifeSubs&quot;; @@ -43,7 +43,7 @@ static NSString *const LifeSubsRealm = @&quot;LifeSubs&quot;;
43 } 43 }
44 return self; 44 return self;
45 } 45 }
46 -- (void)configCellWith:(CNLiveSubsModel *)model type:(SubsType)type { 46 +- (void)configCellWith:(CNLiveSubsModel *)model type:(CNLiveSubsType)type {
47 _model = model; 47 _model = model;
48 _type = type; 48 _type = type;
49 [_icon sd_setImageWithURL:[NSURL URLWithString:model.image] placeholderImage:type == SubsTypeLife ? [UIImage imageNamed:@"sh_dingdan"] : kDefaultUserIcon]; 49 [_icon sd_setImageWithURL:[NSURL URLWithString:model.image] placeholderImage:type == SubsTypeLife ? [UIImage imageNamed:@"sh_dingdan"] : kDefaultUserIcon];