Commit 0909d70ef7d9c966d74259f261ab1b8c4f28632c
1 parent
53929431
提交我的返回按钮不好点中问题
Showing
3 changed files
with
15 additions
and
15 deletions
CNLiveCMineModule.podspec
| @@ -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.6.8' | 11 | + s.version = '0.6.9' |
| 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/CNTopImageView.m
| @@ -70,10 +70,10 @@ | @@ -70,10 +70,10 @@ | ||
| 70 | make.width.mas_equalTo(DS_adapt_length(70)); | 70 | make.width.mas_equalTo(DS_adapt_length(70)); |
| 71 | }]; | 71 | }]; |
| 72 | [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { | 72 | [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { |
| 73 | - make.left.mas_equalTo(DS_adapt_length(16)); | 73 | + make.left.mas_equalTo(DS_adapt_length(0)); |
| 74 | make.centerY.equalTo(self.codesView); | 74 | make.centerY.equalTo(self.codesView); |
| 75 | - make.width.mas_equalTo(DS_adapt_length(11)); | ||
| 76 | - make.height.mas_equalTo(DS_adapt_length(18)); | 75 | + make.width.mas_equalTo(DS_adapt_length(44)); |
| 76 | + make.height.mas_equalTo(DS_adapt_length(44)); | ||
| 77 | }]; | 77 | }]; |
| 78 | [self.mineListView mas_makeConstraints:^(MASConstraintMaker *make) { | 78 | [self.mineListView mas_makeConstraints:^(MASConstraintMaker *make) { |
| 79 | make.top.equalTo(self.myImage.mas_bottom).offset(DS_adapt_length(15)); | 79 | make.top.equalTo(self.myImage.mas_bottom).offset(DS_adapt_length(15)); |
CNLiveCMineModule/Classes/CNCMine/ViewController/CNLiveMineVC.m
| @@ -201,7 +201,7 @@ static NSString *const CNSobotNotification_NewMessage = @"CNSobotNotification_Ne | @@ -201,7 +201,7 @@ static NSString *const CNSobotNotification_NewMessage = @"CNSobotNotification_Ne | ||
| 201 | if ([CNLiveEnvironmentManager manager].isNewHomePage) { | 201 | if ([CNLiveEnvironmentManager manager].isNewHomePage) { |
| 202 | [self.topImageView.iconImage mas_remakeConstraints:^(MASConstraintMaker *make) { | 202 | [self.topImageView.iconImage mas_remakeConstraints:^(MASConstraintMaker *make) { |
| 203 | make.top.equalTo(self.view).offset(kStatusHeight+DS_adapt_length(35) - contentOffetY); | 203 | make.top.equalTo(self.view).offset(kStatusHeight+DS_adapt_length(35) - contentOffetY); |
| 204 | - make.left.equalTo(self.topImageView.backBtn).offset(DS_adapt_length( 12)); | 204 | + make.left.equalTo(self.topImageView.backBtn.mas_right).offset(DS_adapt_length( -10)); |
| 205 | make.width.height.mas_equalTo(DS_adapt_length(60) - self.topSmallView.alpha * DS_adapt_length(28)); | 205 | make.width.height.mas_equalTo(DS_adapt_length(60) - self.topSmallView.alpha * DS_adapt_length(28)); |
| 206 | }]; | 206 | }]; |
| 207 | [self.topImageView.codesView mas_makeConstraints:^(MASConstraintMaker *make) { | 207 | [self.topImageView.codesView mas_makeConstraints:^(MASConstraintMaker *make) { |
| @@ -211,10 +211,10 @@ static NSString *const CNSobotNotification_NewMessage = @"CNSobotNotification_Ne | @@ -211,10 +211,10 @@ static NSString *const CNSobotNotification_NewMessage = @"CNSobotNotification_Ne | ||
| 211 | make.width.mas_equalTo(DS_adapt_length(70)); | 211 | make.width.mas_equalTo(DS_adapt_length(70)); |
| 212 | }]; | 212 | }]; |
| 213 | [self.topImageView.backBtn mas_remakeConstraints:^(MASConstraintMaker *make) { | 213 | [self.topImageView.backBtn mas_remakeConstraints:^(MASConstraintMaker *make) { |
| 214 | - make.left.mas_equalTo(DS_adapt_length(16)); | 214 | + make.left.mas_equalTo(DS_adapt_length(0)); |
| 215 | make.centerY.equalTo(self.topImageView.codesView); | 215 | make.centerY.equalTo(self.topImageView.codesView); |
| 216 | - make.width.mas_equalTo(DS_adapt_length(11)); | ||
| 217 | - make.height.mas_equalTo(DS_adapt_length(18)); | 216 | + make.width.mas_equalTo(DS_adapt_length(44)); |
| 217 | + make.height.mas_equalTo(DS_adapt_length(44)); | ||
| 218 | }]; | 218 | }]; |
| 219 | }else{ | 219 | }else{ |
| 220 | [self.topImageView.iconImage mas_remakeConstraints:^(MASConstraintMaker *make) { | 220 | [self.topImageView.iconImage mas_remakeConstraints:^(MASConstraintMaker *make) { |
| @@ -240,7 +240,7 @@ static NSString *const CNSobotNotification_NewMessage = @"CNSobotNotification_Ne | @@ -240,7 +240,7 @@ static NSString *const CNSobotNotification_NewMessage = @"CNSobotNotification_Ne | ||
| 240 | if ([CNLiveEnvironmentManager manager].isNewHomePage) { | 240 | if ([CNLiveEnvironmentManager manager].isNewHomePage) { |
| 241 | [self.topImageView.iconImage mas_remakeConstraints:^(MASConstraintMaker *make) { | 241 | [self.topImageView.iconImage mas_remakeConstraints:^(MASConstraintMaker *make) { |
| 242 | make.top.equalTo(self.view).offset(kStatusHeight); | 242 | make.top.equalTo(self.view).offset(kStatusHeight); |
| 243 | - make.left.equalTo(self.topImageView.backBtn.mas_right).offset(DS_adapt_length(12)); | 243 | + make.left.equalTo(self.topImageView.backBtn.mas_right).offset(DS_adapt_length(-10)); |
| 244 | make.width.height.mas_equalTo(DS_adapt_length(32)); | 244 | make.width.height.mas_equalTo(DS_adapt_length(32)); |
| 245 | }]; | 245 | }]; |
| 246 | [self.topImageView.codesView mas_makeConstraints:^(MASConstraintMaker *make) { | 246 | [self.topImageView.codesView mas_makeConstraints:^(MASConstraintMaker *make) { |
| @@ -250,10 +250,10 @@ static NSString *const CNSobotNotification_NewMessage = @"CNSobotNotification_Ne | @@ -250,10 +250,10 @@ static NSString *const CNSobotNotification_NewMessage = @"CNSobotNotification_Ne | ||
| 250 | make.width.mas_equalTo(DS_adapt_length(70)); | 250 | make.width.mas_equalTo(DS_adapt_length(70)); |
| 251 | }]; | 251 | }]; |
| 252 | [self.topImageView.backBtn mas_remakeConstraints:^(MASConstraintMaker *make) { | 252 | [self.topImageView.backBtn mas_remakeConstraints:^(MASConstraintMaker *make) { |
| 253 | - make.left.mas_equalTo(DS_adapt_length(16)); | 253 | + make.left.mas_equalTo(DS_adapt_length(0)); |
| 254 | make.centerY.equalTo(self.topImageView.codesView); | 254 | make.centerY.equalTo(self.topImageView.codesView); |
| 255 | - make.width.mas_equalTo(DS_adapt_length(11)); | ||
| 256 | - make.height.mas_equalTo(DS_adapt_length(18)); | 255 | + make.width.mas_equalTo(DS_adapt_length(44)); |
| 256 | + make.height.mas_equalTo(DS_adapt_length(44)); | ||
| 257 | }]; | 257 | }]; |
| 258 | }else{ | 258 | }else{ |
| 259 | [self.topImageView.iconImage mas_remakeConstraints:^(MASConstraintMaker *make) { | 259 | [self.topImageView.iconImage mas_remakeConstraints:^(MASConstraintMaker *make) { |
| @@ -288,10 +288,10 @@ static NSString *const CNSobotNotification_NewMessage = @"CNSobotNotification_Ne | @@ -288,10 +288,10 @@ static NSString *const CNSobotNotification_NewMessage = @"CNSobotNotification_Ne | ||
| 288 | make.width.mas_equalTo(DS_adapt_length(70)); | 288 | make.width.mas_equalTo(DS_adapt_length(70)); |
| 289 | }]; | 289 | }]; |
| 290 | [self.topImageView.backBtn mas_remakeConstraints:^(MASConstraintMaker *make) { | 290 | [self.topImageView.backBtn mas_remakeConstraints:^(MASConstraintMaker *make) { |
| 291 | - make.left.mas_equalTo(DS_adapt_length(16)); | 291 | + make.left.mas_equalTo(DS_adapt_length(0)); |
| 292 | make.centerY.equalTo(self.topImageView.codesView); | 292 | make.centerY.equalTo(self.topImageView.codesView); |
| 293 | - make.width.mas_equalTo(DS_adapt_length(11)); | ||
| 294 | - make.height.mas_equalTo(DS_adapt_length(18)); | 293 | + make.width.mas_equalTo(DS_adapt_length(44)); |
| 294 | + make.height.mas_equalTo(DS_adapt_length(44)); | ||
| 295 | }]; | 295 | }]; |
| 296 | }else{ | 296 | }else{ |
| 297 | [self.topImageView.codesView mas_remakeConstraints:^(MASConstraintMaker *make) { | 297 | [self.topImageView.codesView mas_remakeConstraints:^(MASConstraintMaker *make) { |