Commit d27c79033a8df3a7b000df76b01d4c0cc602ba3c
1 parent
07ed64be
no message
Showing
28 changed files
with
92 additions
and
270 deletions
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/code_refresh.imageset/Contents.json deleted
100644 → 0
| 1 | -{ | ||
| 2 | - "images" : [ | ||
| 3 | - { | ||
| 4 | - "idiom" : "universal", | ||
| 5 | - "scale" : "1x" | ||
| 6 | - }, | ||
| 7 | - { | ||
| 8 | - "idiom" : "universal", | ||
| 9 | - "filename" : "code_refresh@2x.png", | ||
| 10 | - "scale" : "2x" | ||
| 11 | - }, | ||
| 12 | - { | ||
| 13 | - "idiom" : "universal", | ||
| 14 | - "filename" : "code_refresh@3x.png", | ||
| 15 | - "scale" : "3x" | ||
| 16 | - } | ||
| 17 | - ], | ||
| 18 | - "info" : { | ||
| 19 | - "version" : 1, | ||
| 20 | - "author" : "xcode" | ||
| 21 | - } | ||
| 22 | -} | ||
| 23 | \ No newline at end of file | 0 | \ No newline at end of file |
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/code_refresh.imageset/code_refresh@2x.png deleted
100644 → 0
1.46 KB
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/code_refresh.imageset/code_refresh@3x.png deleted
100644 → 0
2.57 KB
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_back_black_b.imageset/Contents.json deleted
100644 → 0
| 1 | -{ | ||
| 2 | - "images" : [ | ||
| 3 | - { | ||
| 4 | - "idiom" : "universal", | ||
| 5 | - "scale" : "1x" | ||
| 6 | - }, | ||
| 7 | - { | ||
| 8 | - "idiom" : "universal", | ||
| 9 | - "filename" : "mine_back_black_b@2x.png", | ||
| 10 | - "scale" : "2x" | ||
| 11 | - }, | ||
| 12 | - { | ||
| 13 | - "idiom" : "universal", | ||
| 14 | - "filename" : "mine_back_black_b@3x.png", | ||
| 15 | - "scale" : "3x" | ||
| 16 | - } | ||
| 17 | - ], | ||
| 18 | - "info" : { | ||
| 19 | - "version" : 1, | ||
| 20 | - "author" : "xcode" | ||
| 21 | - } | ||
| 22 | -} | ||
| 23 | \ No newline at end of file | 0 | \ No newline at end of file |
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_back_black_b.imageset/mine_back_black_b@2x.png deleted
100644 → 0
1.49 KB
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_back_black_b.imageset/mine_back_black_b@3x.png deleted
100644 → 0
1.79 KB
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_back_white_b.imageset/Contents.json deleted
100644 → 0
| 1 | -{ | ||
| 2 | - "images" : [ | ||
| 3 | - { | ||
| 4 | - "idiom" : "universal", | ||
| 5 | - "scale" : "1x" | ||
| 6 | - }, | ||
| 7 | - { | ||
| 8 | - "idiom" : "universal", | ||
| 9 | - "filename" : "mine_back_white_b@2x.png", | ||
| 10 | - "scale" : "2x" | ||
| 11 | - }, | ||
| 12 | - { | ||
| 13 | - "idiom" : "universal", | ||
| 14 | - "filename" : "mine_back_white_b@3x.png", | ||
| 15 | - "scale" : "3x" | ||
| 16 | - } | ||
| 17 | - ], | ||
| 18 | - "info" : { | ||
| 19 | - "version" : 1, | ||
| 20 | - "author" : "xcode" | ||
| 21 | - } | ||
| 22 | -} | ||
| 23 | \ No newline at end of file | 0 | \ No newline at end of file |
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_back_white_b.imageset/mine_back_white_b@2x.png deleted
100644 → 0
2.03 KB
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_back_white_b.imageset/mine_back_white_b@3x.png deleted
100644 → 0
2.28 KB
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_code_more.imageset/Contents.json deleted
100644 → 0
| 1 | -{ | ||
| 2 | - "images" : [ | ||
| 3 | - { | ||
| 4 | - "idiom" : "universal", | ||
| 5 | - "scale" : "1x" | ||
| 6 | - }, | ||
| 7 | - { | ||
| 8 | - "idiom" : "universal", | ||
| 9 | - "filename" : "mine_code_more@2x.png", | ||
| 10 | - "scale" : "2x" | ||
| 11 | - }, | ||
| 12 | - { | ||
| 13 | - "idiom" : "universal", | ||
| 14 | - "filename" : "mine_code_more@3x.png", | ||
| 15 | - "scale" : "3x" | ||
| 16 | - } | ||
| 17 | - ], | ||
| 18 | - "info" : { | ||
| 19 | - "version" : 1, | ||
| 20 | - "author" : "xcode" | ||
| 21 | - } | ||
| 22 | -} | ||
| 23 | \ No newline at end of file | 0 | \ No newline at end of file |
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_code_more.imageset/mine_code_more@2x.png deleted
100644 → 0
448 Bytes
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_code_more.imageset/mine_code_more@3x.png deleted
100644 → 0
771 Bytes
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_info_set.imageset/Contents.json deleted
100644 → 0
| 1 | -{ | ||
| 2 | - "images" : [ | ||
| 3 | - { | ||
| 4 | - "idiom" : "universal", | ||
| 5 | - "scale" : "1x" | ||
| 6 | - }, | ||
| 7 | - { | ||
| 8 | - "idiom" : "universal", | ||
| 9 | - "filename" : "mine_info_set@2x.png", | ||
| 10 | - "scale" : "2x" | ||
| 11 | - }, | ||
| 12 | - { | ||
| 13 | - "idiom" : "universal", | ||
| 14 | - "filename" : "mine_info_set@3x.png", | ||
| 15 | - "scale" : "3x" | ||
| 16 | - } | ||
| 17 | - ], | ||
| 18 | - "info" : { | ||
| 19 | - "version" : 1, | ||
| 20 | - "author" : "xcode" | ||
| 21 | - } | ||
| 22 | -} | ||
| 23 | \ No newline at end of file | 0 | \ No newline at end of file |
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_info_set.imageset/mine_info_set@2x.png deleted
100644 → 0
238 Bytes
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_info_set.imageset/mine_info_set@3x.png deleted
100644 → 0
434 Bytes
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/qr_code_bg.imageset/Contents.json deleted
100644 → 0
| 1 | -{ | ||
| 2 | - "images" : [ | ||
| 3 | - { | ||
| 4 | - "idiom" : "universal", | ||
| 5 | - "scale" : "1x" | ||
| 6 | - }, | ||
| 7 | - { | ||
| 8 | - "idiom" : "universal", | ||
| 9 | - "filename" : "qr_code_bg@2x.png", | ||
| 10 | - "scale" : "2x" | ||
| 11 | - }, | ||
| 12 | - { | ||
| 13 | - "idiom" : "universal", | ||
| 14 | - "filename" : "qr_code_bg@3x.png", | ||
| 15 | - "scale" : "3x" | ||
| 16 | - } | ||
| 17 | - ], | ||
| 18 | - "info" : { | ||
| 19 | - "version" : 1, | ||
| 20 | - "author" : "xcode" | ||
| 21 | - } | ||
| 22 | -} | ||
| 23 | \ No newline at end of file | 0 | \ No newline at end of file |
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/qr_code_bg.imageset/qr_code_bg@2x.png deleted
100644 → 0
104 KB
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/qr_code_bg.imageset/qr_code_bg@3x.png deleted
100644 → 0
142 KB
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/qr_code_green.imageset/Contents.json deleted
100644 → 0
| 1 | -{ | ||
| 2 | - "images" : [ | ||
| 3 | - { | ||
| 4 | - "idiom" : "universal", | ||
| 5 | - "scale" : "1x" | ||
| 6 | - }, | ||
| 7 | - { | ||
| 8 | - "idiom" : "universal", | ||
| 9 | - "filename" : "qr_code_green@2x.png", | ||
| 10 | - "scale" : "2x" | ||
| 11 | - }, | ||
| 12 | - { | ||
| 13 | - "idiom" : "universal", | ||
| 14 | - "filename" : "qr_code_green@3x.png", | ||
| 15 | - "scale" : "3x" | ||
| 16 | - } | ||
| 17 | - ], | ||
| 18 | - "info" : { | ||
| 19 | - "version" : 1, | ||
| 20 | - "author" : "xcode" | ||
| 21 | - } | ||
| 22 | -} | ||
| 23 | \ No newline at end of file | 0 | \ No newline at end of file |
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/qr_code_green.imageset/qr_code_green@2x.png deleted
100644 → 0
1.57 KB
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/qr_code_green.imageset/qr_code_green@3x.png deleted
100644 → 0
1.72 KB
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/qr_code_icon.imageset/Contents.json deleted
100644 → 0
| 1 | -{ | ||
| 2 | - "images" : [ | ||
| 3 | - { | ||
| 4 | - "idiom" : "universal", | ||
| 5 | - "scale" : "1x" | ||
| 6 | - }, | ||
| 7 | - { | ||
| 8 | - "idiom" : "universal", | ||
| 9 | - "filename" : "qr_code_icon@2x.png", | ||
| 10 | - "scale" : "2x" | ||
| 11 | - }, | ||
| 12 | - { | ||
| 13 | - "idiom" : "universal", | ||
| 14 | - "filename" : "qr_code_icon@3x.png", | ||
| 15 | - "scale" : "3x" | ||
| 16 | - } | ||
| 17 | - ], | ||
| 18 | - "info" : { | ||
| 19 | - "version" : 1, | ||
| 20 | - "author" : "xcode" | ||
| 21 | - } | ||
| 22 | -} | ||
| 23 | \ No newline at end of file | 0 | \ No newline at end of file |
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/qr_code_icon.imageset/qr_code_icon@2x.png deleted
100644 → 0
7.47 KB
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/qr_code_icon.imageset/qr_code_icon@3x.png deleted
100644 → 0
11.1 KB
CNLiveMineModule/Classes/UserInfo/CNLiveInfoUpdateController.m
| @@ -28,17 +28,17 @@ | @@ -28,17 +28,17 @@ | ||
| 28 | #import "CNLiveAddScoreManager.h" | 28 | #import "CNLiveAddScoreManager.h" |
| 29 | #import "CNLiveGoldWhereaboutsView.h" | 29 | #import "CNLiveGoldWhereaboutsView.h" |
| 30 | #import "CNLiveCategory.h" | 30 | #import "CNLiveCategory.h" |
| 31 | +#import "CNLiveNavigationBar.h" | ||
| 31 | 32 | ||
| 32 | //#import "CNLiveUserInfoModel.h" | 33 | //#import "CNLiveUserInfoModel.h" |
| 33 | #import "CNLiveUserInfoNotification.h" | 34 | #import "CNLiveUserInfoNotification.h" |
| 34 | -#import "CNLiveUserInfoNavigationBar.h" | ||
| 35 | 35 | ||
| 36 | #import "CNLiveInfoUpdateCell.h" | 36 | #import "CNLiveInfoUpdateCell.h" |
| 37 | 37 | ||
| 38 | -@interface CNLiveInfoUpdateController ()<UITextFieldDelegate,UITextViewDelegate,CNLiveUserInfoNavigationBarDelegate,QMUIAlertControllerDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate,UITableViewDelegate,UITableViewDataSource>{ | 38 | +@interface CNLiveInfoUpdateController ()<UITextFieldDelegate,UITextViewDelegate,QMUIAlertControllerDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate,UITableViewDelegate,UITableViewDataSource>{ |
| 39 | UIImage *_image; | 39 | UIImage *_image; |
| 40 | } | 40 | } |
| 41 | -@property (nonatomic, strong) CNLiveUserInfoNavigationBar *navigationBar; | 41 | +@property (nonatomic, strong) CNLiveNavigationBar *navigationBar; |
| 42 | @property (nonatomic, strong) CNLiveUserInfoModel *model; | 42 | @property (nonatomic, strong) CNLiveUserInfoModel *model; |
| 43 | 43 | ||
| 44 | @property (nonatomic, strong) UIView *contentView; | 44 | @property (nonatomic, strong) UIView *contentView; |
| @@ -271,46 +271,6 @@ static const CGFloat timeValue = 1.5; | @@ -271,46 +271,6 @@ static const CGFloat timeValue = 1.5; | ||
| 271 | } | 271 | } |
| 272 | 272 | ||
| 273 | } | 273 | } |
| 274 | -#pragma mark - CNLiveUserInfoNavigationBarDelegate | ||
| 275 | -- (void)navigationBar:(CNLiveUserInfoNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{ | ||
| 276 | - if ([actionEvents isEqualToString:@"1"]) { | ||
| 277 | - [self goBack]; | ||
| 278 | - }else if ([actionEvents isEqualToString:@"2"]){ | ||
| 279 | - [self.textField resignFirstResponder]; | ||
| 280 | - [self.textView resignFirstResponder]; | ||
| 281 | - | ||
| 282 | - switch (self.model.dataType) { | ||
| 283 | - case CNLiveUserInfoDataTypeHeader://头像 | ||
| 284 | - { | ||
| 285 | - [self updateHeaderActionSheetView]; | ||
| 286 | - } | ||
| 287 | - break; | ||
| 288 | - case CNLiveUserInfoDataTypeNickname://昵称 | ||
| 289 | - { | ||
| 290 | - [self requestUpdateUserNickname]; | ||
| 291 | - } | ||
| 292 | - break; | ||
| 293 | - case CNLiveUserInfoDataTypeGender://昵称 | ||
| 294 | - { | ||
| 295 | - [self requestUpdateUserGender]; | ||
| 296 | - } | ||
| 297 | - break; | ||
| 298 | - case CNLiveUserInfoDataTypeAddress://地区 | ||
| 299 | - { | ||
| 300 | - [self requestUpdateUserAddress]; | ||
| 301 | - } | ||
| 302 | - break; | ||
| 303 | - case CNLiveUserInfoDataTypeIntroduction://简介 | ||
| 304 | - { | ||
| 305 | - [self requestUpdateUserIntroduction]; | ||
| 306 | - } | ||
| 307 | - break; | ||
| 308 | - | ||
| 309 | - default: | ||
| 310 | - break; | ||
| 311 | - } | ||
| 312 | - } | ||
| 313 | -} | ||
| 314 | 274 | ||
| 315 | - (void)didHideAlertController:(QMUIAlertController *)alertController{ | 275 | - (void)didHideAlertController:(QMUIAlertController *)alertController{ |
| 316 | self.navigationBar.right.userInteractionEnabled = YES; | 276 | self.navigationBar.right.userInteractionEnabled = YES; |
| @@ -617,27 +577,26 @@ static const CGFloat timeValue = 1.5; | @@ -617,27 +577,26 @@ static const CGFloat timeValue = 1.5; | ||
| 617 | } | 577 | } |
| 618 | 578 | ||
| 619 | #pragma mark - 懒加载 | 579 | #pragma mark - 懒加载 |
| 620 | -- (CNLiveUserInfoNavigationBar *)navigationBar { | 580 | +- (CNLiveNavigationBar *)navigationBar { |
| 621 | if (!_navigationBar) { | 581 | if (!_navigationBar) { |
| 622 | - _navigationBar = [[CNLiveUserInfoNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)]; | ||
| 623 | - _navigationBar.backgroundColor = [UIColor whiteColor]; | ||
| 624 | - _navigationBar.delegate = self; | 582 | + _navigationBar = [CNLiveNavigationBar navigationBar]; |
| 583 | + _navigationBar.title.text = @"个人资料"; | ||
| 625 | switch (self.model.dataType) { | 584 | switch (self.model.dataType) { |
| 626 | case CNLiveUserInfoDataTypeHeader: | 585 | case CNLiveUserInfoDataTypeHeader: |
| 627 | { | 586 | { |
| 628 | - UIImage *xw_image = [self getImageWithImageName:@"mine_info_set" bundleName:@"CNLiveMineModule" targetClass:[CNLiveInfoUpdateController class]]; | ||
| 629 | - [_navigationBar.right setImage:xw_image forState:UIControlStateNormal]; | 587 | + UIImage *xw_image = [self getImageWithImageName:@"cnlive_black_more" bundleName:@"CNLiveCustomControl" targetClass:[CNLiveNavigationBar class]]; |
| 588 | + _navigationBar.rightImage = xw_image; | ||
| 630 | } | 589 | } |
| 631 | break; | 590 | break; |
| 632 | default: | 591 | default: |
| 633 | { | 592 | { |
| 593 | + _navigationBar.rightTitle = @"完成"; | ||
| 634 | _navigationBar.right.frame = CGRectMake(SCREEN_WIDTH-45-15, StatusBarHeight+10, 45, 24); | 594 | _navigationBar.right.frame = CGRectMake(SCREEN_WIDTH-45-15, StatusBarHeight+10, 45, 24); |
| 635 | [_navigationBar.right setContentHorizontalAlignment:UIControlContentHorizontalAlignmentCenter]; | 595 | [_navigationBar.right setContentHorizontalAlignment:UIControlContentHorizontalAlignmentCenter]; |
| 636 | _navigationBar.right.backgroundColor = [UIColor lightGrayColor]; | 596 | _navigationBar.right.backgroundColor = [UIColor lightGrayColor]; |
| 637 | _navigationBar.right.userInteractionEnabled = NO; | 597 | _navigationBar.right.userInteractionEnabled = NO; |
| 638 | _navigationBar.right.titleLabel.font = [UIFont boldSystemFontOfSize:13]; | 598 | _navigationBar.right.titleLabel.font = [UIFont boldSystemFontOfSize:13]; |
| 639 | [_navigationBar.right setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; | 599 | [_navigationBar.right setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; |
| 640 | - [_navigationBar.right setTitle:@"完成" forState:UIControlStateNormal]; | ||
| 641 | _navigationBar.right.adjustsImageWhenHighlighted = NO; | 600 | _navigationBar.right.adjustsImageWhenHighlighted = NO; |
| 642 | _navigationBar.right.layer.masksToBounds = YES; | 601 | _navigationBar.right.layer.masksToBounds = YES; |
| 643 | _navigationBar.right.layer.cornerRadius = 5; | 602 | _navigationBar.right.layer.cornerRadius = 5; |
| @@ -645,6 +604,48 @@ static const CGFloat timeValue = 1.5; | @@ -645,6 +604,48 @@ static const CGFloat timeValue = 1.5; | ||
| 645 | } | 604 | } |
| 646 | break; | 605 | break; |
| 647 | } | 606 | } |
| 607 | + | ||
| 608 | + __weak typeof(self) weakSelf = self; | ||
| 609 | + _navigationBar.onClickLeftButton = ^{ | ||
| 610 | + [weakSelf goBack]; | ||
| 611 | + }; | ||
| 612 | + _navigationBar.onClickRightButton = ^{ | ||
| 613 | + | ||
| 614 | + [self.textField resignFirstResponder]; | ||
| 615 | + [self.textView resignFirstResponder]; | ||
| 616 | + | ||
| 617 | + switch (self.model.dataType) { | ||
| 618 | + case CNLiveUserInfoDataTypeHeader://头像 | ||
| 619 | + { | ||
| 620 | + [self updateHeaderActionSheetView]; | ||
| 621 | + } | ||
| 622 | + break; | ||
| 623 | + case CNLiveUserInfoDataTypeNickname://昵称 | ||
| 624 | + { | ||
| 625 | + [self requestUpdateUserNickname]; | ||
| 626 | + } | ||
| 627 | + break; | ||
| 628 | + case CNLiveUserInfoDataTypeGender://昵称 | ||
| 629 | + { | ||
| 630 | + [self requestUpdateUserGender]; | ||
| 631 | + } | ||
| 632 | + break; | ||
| 633 | + case CNLiveUserInfoDataTypeAddress://地区 | ||
| 634 | + { | ||
| 635 | + [self requestUpdateUserAddress]; | ||
| 636 | + } | ||
| 637 | + break; | ||
| 638 | + case CNLiveUserInfoDataTypeIntroduction://简介 | ||
| 639 | + { | ||
| 640 | + [self requestUpdateUserIntroduction]; | ||
| 641 | + } | ||
| 642 | + break; | ||
| 643 | + | ||
| 644 | + default: | ||
| 645 | + break; | ||
| 646 | + } | ||
| 647 | + | ||
| 648 | + }; | ||
| 648 | } | 649 | } |
| 649 | return _navigationBar; | 650 | return _navigationBar; |
| 650 | } | 651 | } |
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoController.m
| @@ -12,17 +12,17 @@ | @@ -12,17 +12,17 @@ | ||
| 12 | 12 | ||
| 13 | #import "CNUserInfoManager.h" | 13 | #import "CNUserInfoManager.h" |
| 14 | #import "CNLiveServices.h" | 14 | #import "CNLiveServices.h" |
| 15 | +#import "CNLiveNavigationBar.h" | ||
| 15 | 16 | ||
| 16 | #import "CNLiveUserInfoCell.h" | 17 | #import "CNLiveUserInfoCell.h" |
| 17 | #import "CNLiveUserInfoModel.h" | 18 | #import "CNLiveUserInfoModel.h" |
| 18 | #import "CNLiveInfoUpdateController.h" | 19 | #import "CNLiveInfoUpdateController.h" |
| 19 | #import "CNLiveUserInfoNotification.h" | 20 | #import "CNLiveUserInfoNotification.h" |
| 20 | -#import "CNLiveUserInfoNavigationBar.h" | ||
| 21 | 21 | ||
| 22 | -@interface CNLiveUserInfoController ()<UITableViewDelegate, UITableViewDataSource, CNLiveUserInfoNavigationBarDelegate>{ | 22 | +@interface CNLiveUserInfoController ()<UITableViewDelegate, UITableViewDataSource>{ |
| 23 | UIImage *_image; | 23 | UIImage *_image; |
| 24 | } | 24 | } |
| 25 | -@property (nonatomic, strong) CNLiveUserInfoNavigationBar *navigationBar; | 25 | +@property (nonatomic, strong) CNLiveNavigationBar *navigationBar; |
| 26 | @property (nonatomic, strong) UITableView *tableView; | 26 | @property (nonatomic, strong) UITableView *tableView; |
| 27 | @property (nonatomic, strong) NSMutableArray *data; | 27 | @property (nonatomic, strong) NSMutableArray *data; |
| 28 | 28 | ||
| @@ -160,13 +160,6 @@ | @@ -160,13 +160,6 @@ | ||
| 160 | } | 160 | } |
| 161 | } | 161 | } |
| 162 | 162 | ||
| 163 | -#pragma mark - CNLiveUserInfoNavigationBarDelegate | ||
| 164 | -- (void)navigationBar:(CNLiveUserInfoNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{ | ||
| 165 | - if ([actionEvents isEqualToString:@"1"]) { | ||
| 166 | - [self goBack]; | ||
| 167 | - } | ||
| 168 | -} | ||
| 169 | - | ||
| 170 | #pragma mark - 监听 | 163 | #pragma mark - 监听 |
| 171 | // 更新用户信息 | 164 | // 更新用户信息 |
| 172 | - (void)userInfoUpdateNotification:(NSNotification *)noti{ | 165 | - (void)userInfoUpdateNotification:(NSNotification *)noti{ |
| @@ -187,12 +180,14 @@ | @@ -187,12 +180,14 @@ | ||
| 187 | } | 180 | } |
| 188 | 181 | ||
| 189 | #pragma mark - 懒加载 | 182 | #pragma mark - 懒加载 |
| 190 | -- (CNLiveUserInfoNavigationBar *)navigationBar { | 183 | +- (CNLiveNavigationBar *)navigationBar { |
| 191 | if (!_navigationBar) { | 184 | if (!_navigationBar) { |
| 192 | - _navigationBar = [[CNLiveUserInfoNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)]; | ||
| 193 | - _navigationBar.delegate = self; | 185 | + _navigationBar = [CNLiveNavigationBar navigationBar]; |
| 194 | _navigationBar.title.text = @"个人资料"; | 186 | _navigationBar.title.text = @"个人资料"; |
| 195 | - _navigationBar.right = nil; | 187 | + __weak typeof(self) weakSelf = self; |
| 188 | + _navigationBar.onClickLeftButton = ^{ | ||
| 189 | + [weakSelf goBack]; | ||
| 190 | + }; | ||
| 196 | } | 191 | } |
| 197 | return _navigationBar; | 192 | return _navigationBar; |
| 198 | } | 193 | } |
Example/CNLiveMineModule.xcodeproj/project.pbxproj
| @@ -239,8 +239,8 @@ | @@ -239,8 +239,8 @@ | ||
| 239 | 6003F586195388D20070C39A /* Sources */, | 239 | 6003F586195388D20070C39A /* Sources */, |
| 240 | 6003F587195388D20070C39A /* Frameworks */, | 240 | 6003F587195388D20070C39A /* Frameworks */, |
| 241 | 6003F588195388D20070C39A /* Resources */, | 241 | 6003F588195388D20070C39A /* Resources */, |
| 242 | - 01236DDD2D9700745E768222 /* [CP] Embed Pods Frameworks */, | ||
| 243 | - 0E379E558B515AB3D2CFB03D /* [CP] Copy Pods Resources */, | 242 | + 91EB964EF9FBD34CD405D831 /* [CP] Embed Pods Frameworks */, |
| 243 | + 83D65ACD4F9D2753BE8680C3 /* [CP] Copy Pods Resources */, | ||
| 244 | ); | 244 | ); |
| 245 | buildRules = ( | 245 | buildRules = ( |
| 246 | ); | 246 | ); |
| @@ -331,7 +331,33 @@ | @@ -331,7 +331,33 @@ | ||
| 331 | /* End PBXResourcesBuildPhase section */ | 331 | /* End PBXResourcesBuildPhase section */ |
| 332 | 332 | ||
| 333 | /* Begin PBXShellScriptBuildPhase section */ | 333 | /* Begin PBXShellScriptBuildPhase section */ |
| 334 | - 01236DDD2D9700745E768222 /* [CP] Embed Pods Frameworks */ = { | 334 | + 83D65ACD4F9D2753BE8680C3 /* [CP] Copy Pods Resources */ = { |
| 335 | + isa = PBXShellScriptBuildPhase; | ||
| 336 | + buildActionMask = 2147483647; | ||
| 337 | + files = ( | ||
| 338 | + ); | ||
| 339 | + inputPaths = ( | ||
| 340 | + "${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh", | ||
| 341 | + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBalanceModule/CNLiveBalanceModule.bundle", | ||
| 342 | + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMineModule/CNLiveMineModule.bundle", | ||
| 343 | + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMyOrderModule/CNLiveMyOrderModule.bundle", | ||
| 344 | + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.bundle", | ||
| 345 | + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveSettingModule/CNLiveSettingModule.bundle", | ||
| 346 | + ); | ||
| 347 | + name = "[CP] Copy Pods Resources"; | ||
| 348 | + outputPaths = ( | ||
| 349 | + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBalanceModule.bundle", | ||
| 350 | + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMineModule.bundle", | ||
| 351 | + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMyOrderModule.bundle", | ||
| 352 | + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveQrCodeModule.bundle", | ||
| 353 | + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveSettingModule.bundle", | ||
| 354 | + ); | ||
| 355 | + runOnlyForDeploymentPostprocessing = 0; | ||
| 356 | + shellPath = /bin/sh; | ||
| 357 | + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh\"\n"; | ||
| 358 | + showEnvVarsInLog = 0; | ||
| 359 | + }; | ||
| 360 | + 91EB964EF9FBD34CD405D831 /* [CP] Embed Pods Frameworks */ = { | ||
| 335 | isa = PBXShellScriptBuildPhase; | 361 | isa = PBXShellScriptBuildPhase; |
| 336 | buildActionMask = 2147483647; | 362 | buildActionMask = 2147483647; |
| 337 | files = ( | 363 | files = ( |
| @@ -353,6 +379,7 @@ | @@ -353,6 +379,7 @@ | ||
| 353 | "${BUILT_PRODUCTS_DIR}/CNLiveCollectionModule/CNLiveCollectionModule.framework", | 379 | "${BUILT_PRODUCTS_DIR}/CNLiveCollectionModule/CNLiveCollectionModule.framework", |
| 354 | "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", | 380 | "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", |
| 355 | "${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework", | 381 | "${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework", |
| 382 | + "${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework", | ||
| 356 | "${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework", | 383 | "${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework", |
| 357 | "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", | 384 | "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", |
| 358 | "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", | 385 | "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", |
| @@ -403,6 +430,7 @@ | @@ -403,6 +430,7 @@ | ||
| 403 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCollectionModule.framework", | 430 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCollectionModule.framework", |
| 404 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", | 431 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", |
| 405 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework", | 432 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework", |
| 433 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework", | ||
| 406 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework", | 434 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework", |
| 407 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", | 435 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", |
| 408 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", | 436 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", |
| @@ -441,32 +469,6 @@ | @@ -441,32 +469,6 @@ | ||
| 441 | shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-frameworks.sh\"\n"; | 469 | shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-frameworks.sh\"\n"; |
| 442 | showEnvVarsInLog = 0; | 470 | showEnvVarsInLog = 0; |
| 443 | }; | 471 | }; |
| 444 | - 0E379E558B515AB3D2CFB03D /* [CP] Copy Pods Resources */ = { | ||
| 445 | - isa = PBXShellScriptBuildPhase; | ||
| 446 | - buildActionMask = 2147483647; | ||
| 447 | - files = ( | ||
| 448 | - ); | ||
| 449 | - inputPaths = ( | ||
| 450 | - "${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh", | ||
| 451 | - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBalanceModule/CNLiveBalanceModule.bundle", | ||
| 452 | - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMineModule/CNLiveMineModule.bundle", | ||
| 453 | - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMyOrderModule/CNLiveMyOrderModule.bundle", | ||
| 454 | - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.bundle", | ||
| 455 | - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveSettingModule/CNLiveSettingModule.bundle", | ||
| 456 | - ); | ||
| 457 | - name = "[CP] Copy Pods Resources"; | ||
| 458 | - outputPaths = ( | ||
| 459 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBalanceModule.bundle", | ||
| 460 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMineModule.bundle", | ||
| 461 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMyOrderModule.bundle", | ||
| 462 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveQrCodeModule.bundle", | ||
| 463 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveSettingModule.bundle", | ||
| 464 | - ); | ||
| 465 | - runOnlyForDeploymentPostprocessing = 0; | ||
| 466 | - shellPath = /bin/sh; | ||
| 467 | - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh\"\n"; | ||
| 468 | - showEnvVarsInLog = 0; | ||
| 469 | - }; | ||
| 470 | A9B5D0EFC5B6FCA241FAE929 /* [CP] Check Pods Manifest.lock */ = { | 472 | A9B5D0EFC5B6FCA241FAE929 /* [CP] Check Pods Manifest.lock */ = { |
| 471 | isa = PBXShellScriptBuildPhase; | 473 | isa = PBXShellScriptBuildPhase; |
| 472 | buildActionMask = 2147483647; | 474 | buildActionMask = 2147483647; |
Example/CNLiveMineModule/CNLIVEAppDelegate.m
| @@ -33,7 +33,7 @@ | @@ -33,7 +33,7 @@ | ||
| 33 | @"email":@"", | 33 | @"email":@"", |
| 34 | @"extInfo":@"", | 34 | @"extInfo":@"", |
| 35 | @"faceUrl":@"http://yweb0.cnliveimg.com/images/headImg/2019/1030/1572439148697_small.jpg", | 35 | @"faceUrl":@"http://yweb0.cnliveimg.com/images/headImg/2019/1030/1572439148697_small.jpg", |
| 36 | - @"gender":@"f", | 36 | + @"gender":@"m", |
| 37 | @"hUid":@"", | 37 | @"hUid":@"", |
| 38 | @"isNewUser":@"0", | 38 | @"isNewUser":@"0", |
| 39 | @"location":@"北京市石景山区鲁谷街道远洋山水南区", | 39 | @"location":@"北京市石景山区鲁谷街道远洋山水南区", |