iOS Team / CNLiveCMineModule · Commits

Commit b70d086a3498a98fc8e7d404081748623523c6a9

Authored by yanglingyu
1 parent 5cb192f0

0.3.7新首页按要求改版

Inline Side-by-side
Showing 8 changed files with 243 additions and 104 deletions
CNLiveCMineModule.podspec
  View file @b70d086
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveCMineModule'
11   - s.version = '0.3.6'
  11 + s.version = '0.3.7'
12 12 s.summary = '网家家C端个人中心'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ... @@ -78,6 +78,5 @@ TODO: Add long description of the pod here.
78 78 s.dependency 'libksygpulive'
79 79 s.dependency 'CNLiveNewTripartiteManagement/MBProgressHUD'
80 80 s.dependency 'CNLiveNewIMAManagerKit'
81   - s.dependency 'CNLiveSDK/CNLiveEncryptSDK'
82 81 end
83 82  
... ...
CNLiveCMineModule/Classes/CNCMine/Present/CNMinePresent.m
  View file @b70d086
... ... @@ -13,34 +13,59 @@
13 13  
14 14 + (CNMineModel *)dataSourceCodesModel:(NSString *)codeStr
15 15 {
16   - NSDictionary *code = @{
17   - @"title":@"",
18   - @"type":@(0),
19   - @"lists":@[
20   - @{
21   - @"title":@"",
22   - @"img":@"mine_QR_code",
23   - @"isBlack":@(NO),
24   - @"width":@(DS_adapt_length(35)),
25   - @"height":@(DS_adapt_length(20))
26   - },
27   - @{
28   - @"title":@"",
29   - @"img":@"mine_customer_service",
30   - @"number":codeStr?codeStr:@"",
31   - @"isBlack":@(NO),
32   - @"width":@(DS_adapt_length(35)),
33   - @"height":@(DS_adapt_length(20))
34   - },
35   - @{
36   - @"title":@"",
37   - @"img":@"mine_set",
38   - @"isBlack":@(NO),
39   - @"width":@(DS_adapt_length(35)),
40   - @"height":@(DS_adapt_length(20))
41   - },
42   - ],
43   - };
  16 + NSDictionary *code = nil;
  17 + if ([CNLiveEnvironmentManager manager].isNewHomePage) {
  18 + code = @{
  19 + @"title":@"",
  20 + @"type":@(0),
  21 + @"lists":@[
  22 + @{
  23 + @"title":@"",
  24 + @"img":@"mine_QR_code",
  25 + @"isBlack":@(NO),
  26 + @"width":@(DS_adapt_length(35)),
  27 + @"height":@(DS_adapt_length(20))
  28 + },
  29 + @{
  30 + @"title":@"",
  31 + @"img":@"mine_set",
  32 + @"isBlack":@(NO),
  33 + @"width":@(DS_adapt_length(35)),
  34 + @"height":@(DS_adapt_length(20))
  35 + },
  36 + ],
  37 + };
  38 + }else{
  39 + code = @{
  40 + @"title":@"",
  41 + @"type":@(0),
  42 + @"lists":@[
  43 + @{
  44 + @"title":@"",
  45 + @"img":@"mine_QR_code",
  46 + @"isBlack":@(NO),
  47 + @"width":@(DS_adapt_length(35)),
  48 + @"height":@(DS_adapt_length(20))
  49 + },
  50 + @{
  51 + @"title":@"",
  52 + @"img":@"mine_customer_service",
  53 + @"number":codeStr?codeStr:@"",
  54 + @"isBlack":@(NO),
  55 + @"width":@(DS_adapt_length(35)),
  56 + @"height":@(DS_adapt_length(20))
  57 + },
  58 + @{
  59 + @"title":@"",
  60 + @"img":@"mine_set",
  61 + @"isBlack":@(NO),
  62 + @"width":@(DS_adapt_length(35)),
  63 + @"height":@(DS_adapt_length(20))
  64 + },
  65 + ],
  66 + };
  67 + }
  68 +
44 69 CNMineModel *codes = [CNMineModel mj_objectWithKeyValues:code];
45 70 return codes;
46 71 }
... ...
CNLiveCMineModule/Classes/CNCMine/View/CNListCollectionView.m
  View file @b70d086
... ... @@ -55,7 +55,13 @@ static NSString *CNWalletCellID = @"CNWalletCellID";
55 55 break;
56 56 case 1:
57 57 {
58   - [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainPlatFromCurrentVC:[self displayViewController]];
  58 + if ([CNLiveEnvironmentManager manager].isNewHomePage) {
  59 + [[CNLiveCMineService shareMineProtocol] pushCMinePagesEvent:@"config_click_setting"];
  60 + CNMineSettingVC *setting = [[CNMineSettingVC alloc] init];
  61 + [[BaseAppDelegate sharedAppDelegate] pushViewController:setting];
  62 + }else{
  63 + [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainPlatFromCurrentVC:[self displayViewController]];
  64 + }
59 65 }
60 66 break;
61 67 case 2:
... ...
CNLiveCMineModule/Classes/CNCMine/View/CNTopImageView.h
  View file @b70d086
... ... @@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
15 15  
16 16 @property (nonatomic, strong) UIImageView *iconImage;//头像
17 17 @property (nonatomic, strong) CNListCollectionView *codesView;//二维码、客服、设置
  18 +@property (nonatomic, strong) UIButton *backBtn;
18 19  
19 20 - (void)uploadViews;
20 21 @end
... ...
CNLiveCMineModule/Classes/CNCMine/View/CNTopImageView.m
  View file @b70d086
... ... @@ -28,13 +28,17 @@
28 28 if (self = [super init]) {
29 29 [self addSubview:self.codesView];
30 30 [self addSubview:self.iconImage];
31   - [self addSubview:self.homelandBtn];
32   - NSString *userStatus = [[NSUserDefaults standardUserDefaults] valueForKey:CNLiveUnionUserStatusWithSourceForKey];
33   - if ([userStatus isNotBlank] && ([userStatus isEqualToString:@"3"]||[userStatus isEqualToString:@"2"])) {
34   - [self addSubview:self.unionBtn];
35   - }
36   - [self addSubview:self.myCommuintyBtn];
37 31 [self addSubview:self.titleLabel];
  32 + if (![CNLiveEnvironmentManager manager].isNewHomePage) {
  33 + [self addSubview:self.homelandBtn];
  34 + NSString *userStatus = [[NSUserDefaults standardUserDefaults] valueForKey:CNLiveUnionUserStatusWithSourceForKey];
  35 + if ([userStatus isNotBlank] && ([userStatus isEqualToString:@"3"]||[userStatus isEqualToString:@"2"])) {
  36 + [self addSubview:self.unionBtn];
  37 + }
  38 + [self addSubview:self.myCommuintyBtn];
  39 + }else{
  40 + [self addSubview:self.backBtn];
  41 + }
38 42 [self addSubview:self.mineListView];
39 43 [self uploadViewLayout];
40 44 weakself
... ... @@ -46,55 +50,83 @@
46 50 }
47 51 - (void)uploadViewLayout
48 52 {
49   - [self.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
50   - make.top.equalTo(self).offset(kStatusHeight);
51   - make.right.equalTo(self).offset(-DS_adapt_length(10) );
52   - make.height.mas_equalTo(DS_adapt_length(35));
53   - make.width.mas_equalTo(DS_adapt_length(105));
54   - }];
55 53 [self.iconImage mas_makeConstraints:^(MASConstraintMaker *make) {
56 54 make.top.equalTo(self).offset(kStatusHeight+DS_adapt_length(35));
57 55 make.left.equalTo(self).offset(DS_adapt_length(12));
58 56 make.width.height.mas_equalTo(DS_adapt_length(60));
59 57 }];
60   - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
61   - make.left.mas_equalTo(DS_adapt_length(82.5));
62   - make.top.mas_equalTo(kStatusHeight+DS_adapt_length(39));
63   - }];
64   - [self.homelandBtn mas_makeConstraints:^(MASConstraintMaker *make) {
65   - make.left.equalTo(self.titleLabel);
66   - make.top.mas_equalTo(kStatusHeight+DS_adapt_length( 35+30));
67   - make.height.mas_equalTo(DS_adapt_length(26));
68   - make.width.mas_equalTo(DS_adapt_length(86.5));
69   - }];
70   - NSString *userStatus = [[NSUserDefaults standardUserDefaults] valueForKey:CNLiveUnionUserStatusWithSourceForKey];
71   - if ([userStatus isNotBlank] && ([userStatus isEqualToString:@"3"]||[userStatus isEqualToString:@"2"])) {
72   - [self.unionBtn mas_makeConstraints:^(MASConstraintMaker *make) {
73   - make.left.equalTo(self.homelandBtn.mas_right).offset(10);
74   - make.top.equalTo(self.homelandBtn);
75   - make.height.mas_equalTo(DS_adapt_length(26));
76   - make.width.mas_equalTo(DS_adapt_length(86.5));
  58 + if ([CNLiveEnvironmentManager manager].isNewHomePage) {
  59 + [self.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
  60 + make.top.equalTo(self).offset(kStatusHeight);
  61 + make.right.equalTo(self).offset(-DS_adapt_length(10) );
  62 + make.height.mas_equalTo(DS_adapt_length(35));
  63 + make.width.mas_equalTo(DS_adapt_length(70));
77 64 }];
78   - [self.myCommuintyBtn mas_makeConstraints:^(MASConstraintMaker *make) {
79   - make.left.equalTo(self.unionBtn.mas_right).offset(10);
80   - make.top.equalTo(self.homelandBtn);
81   - make.height.mas_equalTo(DS_adapt_length(26));
82   - make.width.mas_equalTo(DS_adapt_length(86.5));
  65 + [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) {
  66 + make.left.mas_equalTo(DS_adapt_length(16));
  67 + make.centerY.equalTo(self.codesView);
  68 + make.width.mas_equalTo(DS_adapt_length(11));
  69 + make.height.mas_equalTo(DS_adapt_length(18));
  70 + }];
  71 + [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
  72 + make.left.mas_equalTo(DS_adapt_length(82.5));
  73 + make.top.mas_equalTo(kStatusHeight+DS_adapt_length(53));
  74 + }];
  75 + [self.mineListView mas_makeConstraints:^(MASConstraintMaker *make) {
  76 + make.top.equalTo(self.titleLabel.mas_bottom).offset(DS_adapt_length(25));
  77 + make.left.equalTo(self).offset(DS_adapt_length(10));
  78 + make.right.equalTo(self).offset(-DS_adapt_length(10));
  79 + make.height.mas_equalTo(DS_adapt_length(70));
83 80 }];
84 81 }else{
85   - [self.myCommuintyBtn mas_makeConstraints:^(MASConstraintMaker *make) {
86   - make.left.equalTo(self.homelandBtn.mas_right).offset(10);
87   - make.top.equalTo(self.homelandBtn);
  82 + [self.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
  83 + make.top.equalTo(self).offset(kStatusHeight);
  84 + make.right.equalTo(self).offset(-DS_adapt_length(10) );
  85 + make.height.mas_equalTo(DS_adapt_length(35));
  86 + make.width.mas_equalTo(DS_adapt_length(105));
  87 + }];
  88 +
  89 + [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
  90 + make.left.mas_equalTo(DS_adapt_length(82.5));
  91 + make.top.mas_equalTo(kStatusHeight+DS_adapt_length(39));
  92 + }];
  93 + [self.homelandBtn mas_makeConstraints:^(MASConstraintMaker *make) {
  94 + make.left.equalTo(self.titleLabel);
  95 + make.top.mas_equalTo(kStatusHeight+DS_adapt_length( 35+30));
88 96 make.height.mas_equalTo(DS_adapt_length(26));
89 97 make.width.mas_equalTo(DS_adapt_length(86.5));
90 98 }];
  99 + NSString *userStatus = [[NSUserDefaults standardUserDefaults] valueForKey:CNLiveUnionUserStatusWithSourceForKey];
  100 + if ([userStatus isNotBlank] && ([userStatus isEqualToString:@"3"]||[userStatus isEqualToString:@"2"])) {
  101 + [self.unionBtn mas_makeConstraints:^(MASConstraintMaker *make) {
  102 + make.left.equalTo(self.homelandBtn.mas_right).offset(10);
  103 + make.top.equalTo(self.homelandBtn);
  104 + make.height.mas_equalTo(DS_adapt_length(26));
  105 + make.width.mas_equalTo(DS_adapt_length(86.5));
  106 + }];
  107 + [self.myCommuintyBtn mas_makeConstraints:^(MASConstraintMaker *make) {
  108 + make.left.equalTo(self.unionBtn.mas_right).offset(10);
  109 + make.top.equalTo(self.homelandBtn);
  110 + make.height.mas_equalTo(DS_adapt_length(26));
  111 + make.width.mas_equalTo(DS_adapt_length(86.5));
  112 + }];
  113 + }else{
  114 + [self.myCommuintyBtn mas_makeConstraints:^(MASConstraintMaker *make) {
  115 + make.left.equalTo(self.homelandBtn.mas_right).offset(10);
  116 + make.top.equalTo(self.homelandBtn);
  117 + make.height.mas_equalTo(DS_adapt_length(26));
  118 + make.width.mas_equalTo(DS_adapt_length(86.5));
  119 + }];
  120 + }
  121 + [self.mineListView mas_makeConstraints:^(MASConstraintMaker *make) {
  122 + make.top.equalTo(self.homelandBtn.mas_bottom).offset(DS_adapt_length(15));
  123 + make.left.equalTo(self).offset(DS_adapt_length(10));
  124 + make.right.equalTo(self).offset(-DS_adapt_length(10));
  125 + make.height.mas_equalTo(DS_adapt_length(70));
  126 + }];
91 127 }
92   - [self.mineListView mas_makeConstraints:^(MASConstraintMaker *make) {
93   - make.top.equalTo(self.homelandBtn.mas_bottom).offset(DS_adapt_length(15));
94   - make.left.equalTo(self).offset(DS_adapt_length(10));
95   - make.right.equalTo(self).offset(-DS_adapt_length(10));
96   - make.height.mas_equalTo(DS_adapt_length(70));
97   - }];
  128 +
  129 +
98 130 }
99 131 - (void)uploadViews
100 132 {
... ... @@ -124,6 +156,10 @@
124 156 [[CNLiveCMineService shareMineProtocol] pushCMineContentForCMainPlatWithType:20 param:@{} contentVC:[self displayViewController]];
125 157 }
126 158 break;
  159 + case 3:{
  160 + [[BaseAppDelegate sharedAppDelegate] popViewController];
  161 + }
  162 + break;
127 163  
128 164 default:
129 165 break;
... ... @@ -157,6 +193,17 @@
157 193 }
158 194 return _codesView;
159 195 }
  196 +- (UIButton *)backBtn
  197 +{
  198 + if (!_backBtn) {
  199 + _backBtn = [UIButton buttonWithType:UIButtonTypeCustom];
  200 + _backBtn.tag = 1004;
  201 + _backBtn.touchAreaInsets = UIEdgeInsetsMake(-2, -16, -10, -16);
  202 + [_backBtn setImage:[CNLiveCMineService imageWithMineName:@"back"] forState:UIControlStateNormal];
  203 + [_backBtn addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
  204 + }
  205 + return _backBtn;
  206 +}
160 207 - (UIButton *)homelandBtn
161 208 {
162 209 if (!_homelandBtn) {
... ...
CNLiveCMineModule/Classes/CNCMine/ViewController/CNLiveMineVC.m
  View file @b70d086
... ... @@ -184,38 +184,84 @@ static NSString *const CNSobotNotification_NewMessage = @"CNSobotNotification_Ne
184 184 if (contentOffetY <= DS_adapt_length(35) && contentOffetY > 0) {
185 185 self.topSmallView.alpha = contentOffetY/DS_adapt_length(35) ;
186 186 [self.view addSubview:self.topImageView.codesView];
  187 + [self.view addSubview:self.topImageView.backBtn];
187 188 [self.view addSubview:self.topImageView.iconImage];
188   - [self.topImageView.iconImage mas_remakeConstraints:^(MASConstraintMaker *make) {
189   - make.top.equalTo(self.view).offset(kStatusHeight+DS_adapt_length(35) - contentOffetY);
190   - make.left.equalTo(self.view).offset(DS_adapt_length( 12));
191   - make.width.height.mas_equalTo(DS_adapt_length(60) - self.topSmallView.alpha * DS_adapt_length(28));
192   - }];
193 189 self.topImageView.iconImage.layer.mask = [self maskLayerWithWidth:DS_adapt_length(60) - self.topSmallView.alpha * DS_adapt_length(28)];
194   - [self.topImageView.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
195   - make.top.equalTo(self.view).offset(kStatusHeight);
196   - make.right.equalTo(self.view).offset(-DS_adapt_length(10));
197   - make.height.mas_equalTo(DS_adapt_length(30));
198   - make.width.mas_equalTo(DS_adapt_length(105));
199   - }];
  190 + if ([CNLiveEnvironmentManager manager].isNewHomePage) {
  191 + [self.topImageView.iconImage mas_remakeConstraints:^(MASConstraintMaker *make) {
  192 + make.top.equalTo(self.view).offset(kStatusHeight+DS_adapt_length(35) - contentOffetY);
  193 + make.left.equalTo(self.topImageView.backBtn).offset(DS_adapt_length( 12));
  194 + make.width.height.mas_equalTo(DS_adapt_length(60) - self.topSmallView.alpha * DS_adapt_length(28));
  195 + }];
  196 + [self.topImageView.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
  197 + make.top.equalTo(self.view).offset(kStatusHeight);
  198 + make.right.equalTo(self.view).offset(-DS_adapt_length(10));
  199 + make.height.mas_equalTo(DS_adapt_length(30));
  200 + make.width.mas_equalTo(DS_adapt_length(70));
  201 + }];
  202 + [self.topImageView.backBtn mas_remakeConstraints:^(MASConstraintMaker *make) {
  203 + make.left.mas_equalTo(DS_adapt_length(16));
  204 + make.centerY.equalTo(self.topImageView.codesView);
  205 + make.width.mas_equalTo(DS_adapt_length(11));
  206 + make.height.mas_equalTo(DS_adapt_length(18));
  207 + }];
  208 + }else{
  209 + [self.topImageView.iconImage mas_remakeConstraints:^(MASConstraintMaker *make) {
  210 + make.top.equalTo(self.view).offset(kStatusHeight+DS_adapt_length(35) - contentOffetY);
  211 + make.left.equalTo(self.view).offset(DS_adapt_length( 12));
  212 + make.width.height.mas_equalTo(DS_adapt_length(60) - self.topSmallView.alpha * DS_adapt_length(28));
  213 + }];
  214 + [self.topImageView.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
  215 + make.top.equalTo(self.view).offset(kStatusHeight);
  216 + make.right.equalTo(self.view).offset(-DS_adapt_length(10));
  217 + make.height.mas_equalTo(DS_adapt_length(30));
  218 + make.width.mas_equalTo(DS_adapt_length(105));
  219 + }];
  220 + }
  221 +
200 222 }else if (contentOffetY > DS_adapt_length(35)){
201 223 self.topSmallView.alpha = 1;
202 224 [self.topSmallView addSubview:self.topImageView.codesView];
  225 + [self.topSmallView addSubview:self.topImageView.backBtn];
203 226 [self.topSmallView addSubview:self.topImageView.iconImage];
204   - [self.topImageView.iconImage mas_remakeConstraints:^(MASConstraintMaker *make) {
205   - make.top.equalTo(self.view).offset(kStatusHeight);
206   - make.left.equalTo(self.view).offset(DS_adapt_length(12));
207   - make.width.height.mas_equalTo(DS_adapt_length(32));
208   - }];
  227 +
209 228 self.topImageView.iconImage.layer.mask = [self maskLayerWithWidth:DS_adapt_length(32)];
210   - [self.topImageView.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
211   - make.top.equalTo(self.view).offset(kStatusHeight);
212   - make.right.equalTo(self.view).offset(-DS_adapt_length(10));
213   - make.height.mas_equalTo(DS_adapt_length(30));
214   - make.width.mas_equalTo(DS_adapt_length(105));
215   - }];
  229 + if ([CNLiveEnvironmentManager manager].isNewHomePage) {
  230 + [self.topImageView.iconImage mas_remakeConstraints:^(MASConstraintMaker *make) {
  231 + make.top.equalTo(self.view).offset(kStatusHeight);
  232 + make.left.equalTo(self.topImageView.backBtn.mas_right).offset(DS_adapt_length(12));
  233 + make.width.height.mas_equalTo(DS_adapt_length(32));
  234 + }];
  235 + [self.topImageView.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
  236 + make.top.equalTo(self.view).offset(kStatusHeight);
  237 + make.right.equalTo(self.view).offset(-DS_adapt_length(10));
  238 + make.height.mas_equalTo(DS_adapt_length(30));
  239 + make.width.mas_equalTo(DS_adapt_length(70));
  240 + }];
  241 + [self.topImageView.backBtn mas_remakeConstraints:^(MASConstraintMaker *make) {
  242 + make.left.mas_equalTo(DS_adapt_length(16));
  243 + make.centerY.equalTo(self.topImageView.codesView);
  244 + make.width.mas_equalTo(DS_adapt_length(11));
  245 + make.height.mas_equalTo(DS_adapt_length(18));
  246 + }];
  247 + }else{
  248 + [self.topImageView.iconImage mas_remakeConstraints:^(MASConstraintMaker *make) {
  249 + make.top.equalTo(self.view).offset(kStatusHeight);
  250 + make.left.equalTo(self.view).offset(DS_adapt_length(12));
  251 + make.width.height.mas_equalTo(DS_adapt_length(32));
  252 + }];
  253 + [self.topImageView.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
  254 + make.top.equalTo(self.view).offset(kStatusHeight);
  255 + make.right.equalTo(self.view).offset(-DS_adapt_length(10));
  256 + make.height.mas_equalTo(DS_adapt_length(30));
  257 + make.width.mas_equalTo(DS_adapt_length(105));
  258 + }];
  259 + }
  260 +
216 261 }else{
217 262 self.topSmallView.alpha = 0;
218 263 [self.topImageView addSubview:self.topImageView.codesView];
  264 + [self.topImageView addSubview:self.topImageView.backBtn];
219 265 [self.topImageView addSubview:self.topImageView.iconImage];
220 266 [self.topImageView.iconImage mas_remakeConstraints:^(MASConstraintMaker *make) {
221 267 make.top.equalTo(self.topImageView).offset(kStatusHeight+DS_adapt_length(35));
... ... @@ -223,12 +269,28 @@ static NSString *const CNSobotNotification_NewMessage = @&quot;CNSobotNotification_Ne
223 269 make.width.height.mas_equalTo(DS_adapt_length(60));
224 270 }];
225 271 self.topImageView.iconImage.layer.mask = [self maskLayerWithWidth:DS_adapt_length(60)];
226   - [self.topImageView.codesView mas_remakeConstraints:^(MASConstraintMaker *make) {
227   - make.top.equalTo(self.topImageView.mas_top).offset(kStatusHeight);
228   - make.right.equalTo(self.topImageView).offset(-DS_adapt_length(10));
229   - make.height.mas_equalTo(DS_adapt_length(30));
230   - make.width.mas_equalTo(DS_adapt_length(105));
231   - }];
  272 + if ([CNLiveEnvironmentManager manager].isNewHomePage) {
  273 + [self.topImageView.codesView mas_remakeConstraints:^(MASConstraintMaker *make) {
  274 + make.top.equalTo(self.topImageView.mas_top).offset(kStatusHeight);
  275 + make.right.equalTo(self.topImageView).offset(-DS_adapt_length(10));
  276 + make.height.mas_equalTo(DS_adapt_length(30));
  277 + make.width.mas_equalTo(DS_adapt_length(70));
  278 + }];
  279 + [self.topImageView.backBtn mas_remakeConstraints:^(MASConstraintMaker *make) {
  280 + make.left.mas_equalTo(DS_adapt_length(16));
  281 + make.centerY.equalTo(self.topImageView.codesView);
  282 + make.width.mas_equalTo(DS_adapt_length(11));
  283 + make.height.mas_equalTo(DS_adapt_length(18));
  284 + }];
  285 + }else{
  286 + [self.topImageView.codesView mas_remakeConstraints:^(MASConstraintMaker *make) {
  287 + make.top.equalTo(self.topImageView.mas_top).offset(kStatusHeight);
  288 + make.right.equalTo(self.topImageView).offset(-DS_adapt_length(10));
  289 + make.height.mas_equalTo(DS_adapt_length(30));
  290 + make.width.mas_equalTo(DS_adapt_length(105));
  291 + }];
  292 + }
  293 +
232 294 }
233 295 }
234 296 -(CAShapeLayer *)maskLayerWithWidth:(CGFloat)width{
... ...
Example/CNLiveCMineModule/CNLIVEAppDelegate.m
  View file @b70d086
... ... @@ -18,7 +18,7 @@
18 18 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
19 19 {
20 20 // Override point for customization after application launch.
21   - [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore];//CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveTestFlight
  21 + [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore isNewHomePage:YES];//CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveTestFlight
22 22  
23 23 [BHContext shareInstance].application = application;
24 24 [BHContext shareInstance].launchOptions = launchOptions;
... ...
_Pods.xcodeproj deleted 120000 → 0
  View file @5cb192f
1   -Example/Pods/Pods.xcodeproj
2 0 \ No newline at end of file