iOS Team / CNLiveCMineModule · Commits

Commit 6b8fc4ad7167dbc306fb253c72cfcab08ef9553b

Authored by yanglingyu
1 parent ed215b21

0.5.4

Inline Side-by-side
Showing 5 changed files with 13 additions and 6 deletions
CNLiveCMineModule.podspec
  View file @6b8fc4a
@@ -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 = 'CNLiveCMineModule' 10 s.name = 'CNLiveCMineModule'
11 - s.version = '0.5.3' 11 + s.version = '0.5.4'
12 s.summary = '网家家C端个人中心' 12 s.summary = '网家家C端个人中心'
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.
CNLiveCMineModule/Classes/CNCMine/View/CNListHeaderView.m
  View file @6b8fc4a
@@ -50,7 +50,6 @@ @@ -50,7 +50,6 @@
50 [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainWebViewWithURL:cn_WjjH5_Host(@"/myActivityBenefits.html?isShowTitle=true") statue:CNLiveCMineIntePushWebViewStatueTask]; 50 [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainWebViewWithURL:cn_WjjH5_Host(@"/myActivityBenefits.html?isShowTitle=true") statue:CNLiveCMineIntePushWebViewStatueTask];
51 }else if ([sender.titleLabel.text isEqualToString:@"全部工具"]){ 51 }else if ([sender.titleLabel.text isEqualToString:@"全部工具"]){
52 CNMineToolsViewController *vc = [[CNMineToolsViewController alloc] init]; 52 CNMineToolsViewController *vc = [[CNMineToolsViewController alloc] init];
53 - vc.carCount = _carCount;  
54 [[BaseAppDelegate sharedAppDelegate] pushViewController:vc]; 53 [[BaseAppDelegate sharedAppDelegate] pushViewController:vc];
55 } 54 }
56 } 55 }
CNLiveCMineModule/Classes/CNCMine/View/CNTopImageView.m
  View file @6b8fc4a
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 make.width.height.mas_equalTo(DS_adapt_length(60)); 58 make.width.height.mas_equalTo(DS_adapt_length(60));
59 }]; 59 }];
60 [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { 60 [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
61 - make.left.mas_equalTo(DS_adapt_length(82.5)); 61 + make.left.mas_equalTo(DS_adapt_length(87.5));
62 make.right.equalTo(self).offset(-10); 62 make.right.equalTo(self).offset(-10);
63 make.top.mas_equalTo(kStatusHeight+DS_adapt_length(39)); 63 make.top.mas_equalTo(kStatusHeight+DS_adapt_length(39));
64 }]; 64 }];
CNLiveCMineModule/Classes/CNCSubMine/ViewController/CNMineToolsViewController.h
  View file @6b8fc4a
@@ -11,7 +11,6 @@ @@ -11,7 +11,6 @@
11 NS_ASSUME_NONNULL_BEGIN 11 NS_ASSUME_NONNULL_BEGIN
12 12
13 @interface CNMineToolsViewController : CNCommonViewController 13 @interface CNMineToolsViewController : CNCommonViewController
14 -@property (nonatomic, copy)NSString *carCount;  
15 @end 14 @end
16 15
17 NS_ASSUME_NONNULL_END 16 NS_ASSUME_NONNULL_END
CNLiveCMineModule/Classes/CNCSubMine/ViewController/CNMineToolsViewController.m
  View file @6b8fc4a
@@ -16,12 +16,20 @@ @@ -16,12 +16,20 @@
16 @end 16 @end
17 17
18 @implementation CNMineToolsViewController 18 @implementation CNMineToolsViewController
19 - 19 +- (void)loadData{
  20 +
  21 + weakself
  22 + [CNMinePresent requestMineDataSourceWithBlock:^(CNScoreModel * _Nonnull model) {
  23 + if (model) {
  24 + self.toolModel = [CNMinePresent datasourceToolModel:CNToolDatasourceTypeAll carNum:model.cart_count];
  25 + [self.collectView reloadData];
  26 + }
  27 + }];
  28 +}
20 - (void)viewDidLoad { 29 - (void)viewDidLoad {
21 [super viewDidLoad]; 30 [super viewDidLoad];
22 self.title = @"我的工具"; 31 self.title = @"我的工具";
23 self.view.backgroundColor = RGB(247, 246, 249); 32 self.view.backgroundColor = RGB(247, 246, 249);
24 - self.toolModel = [CNMinePresent datasourceToolModel:CNToolDatasourceTypeAll carNum:_carCount];  
25 [self.view addSubview:self.collectView]; 33 [self.view addSubview:self.collectView];
26 [self.collectView mas_makeConstraints:^(MASConstraintMaker *make) { 34 [self.collectView mas_makeConstraints:^(MASConstraintMaker *make) {
27 make.left.equalTo(self.view).offset(12); 35 make.left.equalTo(self.view).offset(12);
@@ -34,6 +42,7 @@ @@ -34,6 +42,7 @@
34 { 42 {
35 [super viewWillAppear:animated]; 43 [super viewWillAppear:animated];
36 self.navigationController.navigationBarHidden = NO; 44 self.navigationController.navigationBarHidden = NO;
  45 + [self loadData];
37 } 46 }
38 47
39 #pragma mark - UICollectionViewDataSource 48 #pragma mark - UICollectionViewDataSource