iOS Team / CNLiveBMineModule · Commits

Commit 4a6289776ba4e7cf0cd625155122112eadf810c6

Authored by daojian
1 parent 2bcae335

0.0.3 版本， XCode 13适配

Inline Side-by-side
Showing 32 changed files with 295 additions and 263 deletions
CNLiveBMineModule.podspec
  View file @4a62897
@@ -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 = 'CNLiveBMineModule' 10 s.name = 'CNLiveBMineModule'
11 - s.version = '0.0.2' 11 + s.version = '0.0.3'
12 s.summary = 'CNLiveBMineModule.' 12 s.summary = 'CNLiveBMineModule.'
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.
@@ -76,12 +76,20 @@ TODO: 网家家企业版-我的模块. @@ -76,12 +76,20 @@ TODO: 网家家企业版-我的模块.
76 76
77 # pod 77 # pod
78 s.dependency 'CNLiveSDK/CNLiveUserSystemSDK' #GitHub所以指定版本号 78 s.dependency 'CNLiveSDK/CNLiveUserSystemSDK' #GitHub所以指定版本号
79 - s.dependency 'CNLiveTripartiteManagement/QMUIKit'  
80 - s.dependency 'CNLiveTripartiteManagement/SDWebImage'  
81 - s.dependency 'CNLiveTripartiteManagement/Masonry'  
82 - s.dependency 'CNLiveTripartiteManagement/MJExtension'  
83 - s.dependency 'CNLiveTripartiteManagement/AFNetworking'  
84 - s.dependency 'CNLiveTripartiteManagement/YYKit' 79 + s.dependency 'CNLiveNewTripartiteManagement/QMUIKit'
  80 + s.dependency 'CNLiveNewTripartiteManagement/SDWebImage'
  81 + s.dependency 'CNLiveNewTripartiteManagement/Masonry'
  82 + s.dependency 'CNLiveNewTripartiteManagement/MJExtension'
  83 + s.dependency 'CNLiveNewTripartiteManagement/AFNetworking'
  84 +
  85 + s.dependency 'CNLiveNewTripartiteManagement/YYAsyncLayer'
  86 + s.dependency 'CNLiveNewTripartiteManagement/YYCache'
  87 + s.dependency 'CNLiveNewTripartiteManagement/YYCategories'
  88 + s.dependency 'CNLiveNewTripartiteManagement/YYImage'
  89 + s.dependency 'CNLiveNewTripartiteManagement/YYModel'
  90 + s.dependency 'CNLiveNewTripartiteManagement/YYText'
  91 + s.dependency 'CNLiveNewTripartiteManagement/YYWebImage'
  92 + s.dependency 'CNLiveNewTripartiteManagement/YYDispatchQueuePool'
85 93
86 # 服务层 94 # 服务层
87 s.dependency 'CNLiveBServices' 95 s.dependency 'CNLiveBServices'
@@ -90,7 +98,7 @@ TODO: 网家家企业版-我的模块. @@ -90,7 +98,7 @@ TODO: 网家家企业版-我的模块.
90 s.dependency 'CNLiveEnvironment' 98 s.dependency 'CNLiveEnvironment'
91 99
92 # 基类 100 # 基类
93 - s.dependency 'CNLiveBaseClass','0.0.6' 101 + s.dependency 'CNLiveBaseClass'
94 102
95 # IM 103 # IM
96 s.dependency 'CNLiveIMBaseSDK' 104 s.dependency 'CNLiveIMBaseSDK'
CNLiveBMineModule/Classes/Controller/CNLiveMineController.h
  View file @4a62897
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 * 我的 10 * 我的
11 */ 11 */
12 12
13 -#import "CNLiveBaseViewController.h" 13 +#import <CNLiveBaseClass/CNLiveBaseViewController.h>
14 14
15 NS_ASSUME_NONNULL_BEGIN 15 NS_ASSUME_NONNULL_BEGIN
16 16
CNLiveBMineModule/Classes/Controller/CNLiveMineController.m
  View file @4a62897
@@ -7,16 +7,6 @@ @@ -7,16 +7,6 @@
7 // 7 //
8 8
9 #import "CNLiveMineController.h" 9 #import "CNLiveMineController.h"
10 -  
11 -#import "MJExtension.h"  
12 -#import "QMUIKit.h"  
13 -  
14 -#import "CNLiveBServices.h"  
15 -#import <CNLiveRequestBastKit/CNLiveNetworking.h>  
16 -#import "CNUserInfoManager.h"  
17 -#import "CNLiveEnvironment.h"  
18 -#import "CNLiveCategory.h"  
19 -  
20 #import "CNLiveMineHeaderView.h" 10 #import "CNLiveMineHeaderView.h"
21 #import "CNLiveMineCell.h" 11 #import "CNLiveMineCell.h"
22 #import "CNLiveMineModel.h" 12 #import "CNLiveMineModel.h"
@@ -24,7 +14,17 @@ @@ -24,7 +14,17 @@
24 14
25 #import "CNLiveUserInfoController.h" 15 #import "CNLiveUserInfoController.h"
26 #import "CNLiveSettingController.h" 16 #import "CNLiveSettingController.h"
27 -#import "CNLiveHomePageProtocol.h" 17 +
  18 +#import <MJExtension/MJExtension.h>
  19 +#import <QMUIKit/QMUIKit.h>
  20 +#import <CNLiveBServices/CNLiveBServices.h>
  21 +#import <CNLiveRequestBastKit/CNLiveNetworking.h>
  22 +#import <CNLiveUserManagement/CNUserInfoManager.h>
  23 +#import <CNLiveEnvironment/CNLiveEnvironment.h>
  24 +#import <CNLiveCategory/CNLiveCategory.h>
  25 +#import <CNLiveBServices/CNLiveHomePageProtocol.h>
  26 +
  27 +
28 28
29 @interface CNLiveMineController()<UITableViewDelegate, UITableViewDataSource, CNLiveMineHeaderViewDelegate> 29 @interface CNLiveMineController()<UITableViewDelegate, UITableViewDataSource, CNLiveMineHeaderViewDelegate>
30 @property (nonatomic, strong) UITableView *tableView; 30 @property (nonatomic, strong) UITableView *tableView;
CNLiveBMineModule/Classes/Model/CNLiveMineRequest.m
  View file @4a62897
@@ -7,10 +7,11 @@ @@ -7,10 +7,11 @@
7 // 7 //
8 8
9 #import "CNLiveMineRequest.h" 9 #import "CNLiveMineRequest.h"
10 -#import "CNLiveCategory.h"  
11 -#import "CNLiveNetworking.h"  
12 -#import "CNLiveEnvironment.h"  
13 -#import "CNUserInfoManager.h" 10 +
  11 +#import <CNLiveCategory/CNLiveCategory.h>
  12 +#import <CNLiveRequestBastKit/CNLiveNetworking.h>
  13 +#import <CNLiveEnvironment/CNLiveEnvironment.h>
  14 +#import <CNLiveUserManagement/CNUserInfoManager.h>
14 15
15 @implementation CNLiveMineRequest 16 @implementation CNLiveMineRequest
16 // 请求用户认证 17 // 请求用户认证
CNLiveBMineModule/Classes/Module/CNLiveBMineModule.m
  View file @4a62897
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 // 7 //
8 8
9 #import "CNLiveBMineModule.h" 9 #import "CNLiveBMineModule.h"
10 -#import "CNLiveBServices.h" 10 +#import <CNLiveBServices/CNLiveBServices.h>
11 11
12 @BeeHiveMod(CNLiveBMineModule) 12 @BeeHiveMod(CNLiveBMineModule)
13 @interface CNLiveBMineModule()<BHModuleProtocol> 13 @interface CNLiveBMineModule()<BHModuleProtocol>
CNLiveBMineModule/Classes/Module/CNLiveBMineService.m
  View file @4a62897
@@ -7,12 +7,13 @@ @@ -7,12 +7,13 @@
7 // 7 //
8 8
9 #import "CNLiveBMineService.h" 9 #import "CNLiveBMineService.h"
10 -#import "CNLiveBServices.h"  
11 #import "CNLivePageJumpManager.h" 10 #import "CNLivePageJumpManager.h"
12 -  
13 #import "CNLiveMineController.h" 11 #import "CNLiveMineController.h"
14 #import "CNLiveUserInfoController.h" 12 #import "CNLiveUserInfoController.h"
15 13
  14 +#import <CNLiveBServices/CNLiveBServices.h>
  15 +
  16 +
16 @BeeHiveService(CNLiveBMineServiceProtocol,CNLiveBMineService) 17 @BeeHiveService(CNLiveBMineServiceProtocol,CNLiveBMineService)
17 @interface CNLiveBMineService ()<CNLiveBMineServiceProtocol> 18 @interface CNLiveBMineService ()<CNLiveBMineServiceProtocol>
18 19
CNLiveBMineModule/Classes/Setting/AboutUs/CNLiveAboutUsController.h
  View file @4a62897
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 */ 11 */
12 12
13 #import <UIKit/UIKit.h> 13 #import <UIKit/UIKit.h>
14 -#import "CNLiveBaseViewController.h" 14 +#import <CNLiveBaseClass/CNLiveBaseViewController.h>
15 15
16 NS_ASSUME_NONNULL_BEGIN 16 NS_ASSUME_NONNULL_BEGIN
17 17
CNLiveBMineModule/Classes/Setting/AboutUs/CNLiveAboutUsController.m
  View file @4a62897
@@ -7,21 +7,20 @@ @@ -7,21 +7,20 @@
7 // 7 //
8 8
9 #import "CNLiveAboutUsController.h" 9 #import "CNLiveAboutUsController.h"
10 -#import "MJExtension.h"  
11 -#import "QMUIKit.h"  
12 -  
13 -#import "CNLiveUserAgreementManager.h"  
14 -#import "CNLiveEnvironment.h"  
15 -#import "CNLiveCategory.h"  
16 -#import "CNLiveBaseKit.h"  
17 -#import "CNLiveNavigationBar.h"  
18 -  
19 #import "CNLiveSettingModel.h" 10 #import "CNLiveSettingModel.h"
20 #import "CNLiveSettingCell.h" 11 #import "CNLiveSettingCell.h"
21 12
  13 +#import <MJExtension/MJExtension.h>
  14 +#import <QMUIKit/QMUIKit.h>
  15 +#import <CNLiveBUserAgreement/CNLiveUserAgreementManager.h>
  16 +#import <CNLiveEnvironment/CNLiveEnvironment.h>
  17 +#import <CNLiveCategory/CNLiveCategory.h>
  18 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
  19 +#import <CNLiveCustomControl/CNLiveNavigationBar.h>
  20 +
22 @interface CNLiveAboutUsController () 21 @interface CNLiveAboutUsController ()
23 <UITableViewDelegate, UITableViewDataSource> 22 <UITableViewDelegate, UITableViewDataSource>
24 -@property (nonatomic, strong) CNLiveNavigationBar *navigationBar; 23 +@property (nonatomic, strong) CNLiveNavigationBar *customNavBar;
25 @property (nonatomic, strong) UITableView *tableView; 24 @property (nonatomic, strong) UITableView *tableView;
26 @property (nonatomic, strong) UIView *headerView; 25 @property (nonatomic, strong) UIView *headerView;
27 @property (nonatomic, strong) UIView *footerView; 26 @property (nonatomic, strong) UIView *footerView;
@@ -124,7 +123,7 @@ @@ -124,7 +123,7 @@
124 } 123 }
125 124
126 - (void)createSubViews { 125 - (void)createSubViews {
127 - [self.view addSubview:self.navigationBar]; 126 + [self.view addSubview:self.customNavBar];
128 [self.view addSubview:self.tableView]; 127 [self.view addSubview:self.tableView];
129 } 128 }
130 129
@@ -218,18 +217,18 @@ @@ -218,18 +217,18 @@
218 return _data; 217 return _data;
219 } 218 }
220 219
221 -- (CNLiveNavigationBar *)navigationBar {  
222 - if (!_navigationBar) {  
223 - _navigationBar = [CNLiveNavigationBar navigationBar];  
224 - _navigationBar.title.text = [NSString stringWithFormat:@"关于%@",DisplayName]; 220 +- (CNLiveNavigationBar *)customNavBar {
  221 + if (!_customNavBar) {
  222 + _customNavBar = [CNLiveNavigationBar navigationBar];
  223 + _customNavBar.title.text = [NSString stringWithFormat:@"关于%@",DisplayName];
225 __weak typeof(self) weakSelf = self; 224 __weak typeof(self) weakSelf = self;
226 - _navigationBar.onClickLeftButton = ^{ 225 + _customNavBar.onClickLeftButton = ^{
227 __strong typeof(weakSelf) strongSelf = weakSelf; 226 __strong typeof(weakSelf) strongSelf = weakSelf;
228 if(!strongSelf) return ; 227 if(!strongSelf) return ;
229 [strongSelf goBack]; 228 [strongSelf goBack];
230 }; 229 };
231 } 230 }
232 - return _navigationBar; 231 + return _customNavBar;
233 } 232 }
234 233
235 - (UITableView *)tableView{ 234 - (UITableView *)tableView{
CNLiveBMineModule/Classes/Setting/BindingManage/CNLiveBindingManageCell.m
  View file @4a62897
@@ -7,15 +7,15 @@ @@ -7,15 +7,15 @@
7 // 7 //
8 8
9 #import "CNLiveBindingManageCell.h" 9 #import "CNLiveBindingManageCell.h"
10 -#import <Masonry/Masonry.h>  
11 -#import "QMUIKit.h"  
12 -#import "CNLiveBaseKit.h"  
13 -#import <CNLiveRequestBastKit/CNLiveNetworking.h>  
14 -#import "CNLiveCategory.h"  
15 -  
16 #import "CNLiveBindingManageModel.h" 10 #import "CNLiveBindingManageModel.h"
17 #import "CNLiveBindingManageRequest.h" 11 #import "CNLiveBindingManageRequest.h"
18 12
  13 +#import <Masonry/Masonry.h>
  14 +#import <QMUIKit/QMUIKit.h>
  15 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
  16 +#import <CNLiveRequestBastKit/CNLiveNetworking.h>
  17 +#import <CNLiveCategory/CNLiveCategory.h>
  18 +
19 @interface CNLiveBindingManageCell() 19 @interface CNLiveBindingManageCell()
20 @property (nonatomic, strong) UIImageView *icon; 20 @property (nonatomic, strong) UIImageView *icon;
21 @property (nonatomic, strong) UILabel *title; 21 @property (nonatomic, strong) UILabel *title;
CNLiveBMineModule/Classes/Setting/BindingManage/CNLiveBindingManageController.h
  View file @4a62897
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 // Copyright © 2019 cnlive. All rights reserved. 6 // Copyright © 2019 cnlive. All rights reserved.
7 // 7 //
8 // 绑定管理 8 // 绑定管理
9 -#import "CNLiveBaseViewController.h" 9 +#import <CNLiveBaseClass/CNLiveBaseViewController.h>
10 10
11 NS_ASSUME_NONNULL_BEGIN 11 NS_ASSUME_NONNULL_BEGIN
12 12
CNLiveBMineModule/Classes/Setting/BindingManage/CNLiveBindingManageController.m
  View file @4a62897
@@ -8,10 +8,10 @@ @@ -8,10 +8,10 @@
8 8
9 #import "CNLiveBindingManageController.h" 9 #import "CNLiveBindingManageController.h"
10 #import <Masonry/Masonry.h> 10 #import <Masonry/Masonry.h>
11 -#import "QMUIKit.h" 11 +#import <QMUIKit/QMUIKit.h>
12 12
13 -#import "CNLiveBaseKit.h"  
14 -#import "CNLiveNavigationBar.h" 13 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
  14 +#import <CNLiveCustomControl/CNLiveNavigationBar.h>
15 15
16 #import "CNLiveUpdateTelController.h" 16 #import "CNLiveUpdateTelController.h"
17 #import "CNLiveBindingManageHeaderView.h" 17 #import "CNLiveBindingManageHeaderView.h"
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 #import "CNLiveBindingManageRequest.h" 20 #import "CNLiveBindingManageRequest.h"
21 21
22 @interface CNLiveBindingManageController ()<UITableViewDelegate, UITableViewDataSource,CNLiveBindingManageCellDelegate> 22 @interface CNLiveBindingManageController ()<UITableViewDelegate, UITableViewDataSource,CNLiveBindingManageCellDelegate>
23 -@property (nonatomic, strong) CNLiveNavigationBar *navigationBar; 23 +@property (nonatomic, strong) CNLiveNavigationBar *customNavBar;
24 @property (nonatomic, strong) UITableView *tableView; 24 @property (nonatomic, strong) UITableView *tableView;
25 @property (nonatomic, strong) NSArray *bindingData; 25 @property (nonatomic, strong) NSArray *bindingData;
26 @property (nonatomic, strong) NSArray *unBindingData; 26 @property (nonatomic, strong) NSArray *unBindingData;
@@ -134,7 +134,7 @@ @@ -134,7 +134,7 @@
134 } 134 }
135 135
136 - (void)createUI{ 136 - (void)createUI{
137 - [self.view addSubview:self.navigationBar]; 137 + [self.view addSubview:self.customNavBar];
138 [self.view addSubview:self.tableView]; 138 [self.view addSubview:self.tableView];
139 139
140 } 140 }
@@ -235,16 +235,16 @@ @@ -235,16 +235,16 @@
235 } 235 }
236 236
237 #pragma mark - Lazy loading 237 #pragma mark - Lazy loading
238 -- (CNLiveNavigationBar *)navigationBar {  
239 - if (!_navigationBar) {  
240 - _navigationBar = [CNLiveNavigationBar navigationBar];  
241 - _navigationBar.title.text = @"绑定管理"; 238 +- (CNLiveNavigationBar *)customNavBar {
  239 + if (!_customNavBar) {
  240 + _customNavBar = [CNLiveNavigationBar navigationBar];
  241 + _customNavBar.title.text = @"绑定管理";
242 __weak typeof(self) weakSelf = self; 242 __weak typeof(self) weakSelf = self;
243 - _navigationBar.onClickLeftButton = ^{ 243 + _customNavBar.onClickLeftButton = ^{
244 [weakSelf goBack]; 244 [weakSelf goBack];
245 }; 245 };
246 } 246 }
247 - return _navigationBar; 247 + return _customNavBar;
248 } 248 }
249 249
250 - (UITableView *)tableView { 250 - (UITableView *)tableView {
CNLiveBMineModule/Classes/Setting/BindingManage/CNLiveBindingManageRequest.m
  View file @4a62897
@@ -7,13 +7,12 @@ @@ -7,13 +7,12 @@
7 // 7 //
8 8
9 #import "CNLiveBindingManageRequest.h" 9 #import "CNLiveBindingManageRequest.h"
10 -#import "QMUIKit.h" 10 +#import <QMUIKit/QMUIKit.h>
11 #import <CNLiveRequestBastKit/CNLiveNetworking.h> 11 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
12 -#import "CNUserInfoManager.h"  
13 -#import "CNLiveEnvironment.h" 12 +#import <CNLiveUserManagement/CNUserInfoManager.h>
  13 +#import <CNLiveEnvironment/CNLiveEnvironment.h>
14 14
15 #import "CNLiveBindingManageModel.h" 15 #import "CNLiveBindingManageModel.h"
16 -  
17 #import "CNLiveShareImageManager.h" 16 #import "CNLiveShareImageManager.h"
18 17
19 @implementation CNLiveBindingManageRequest 18 @implementation CNLiveBindingManageRequest
CNLiveBMineModule/Classes/Setting/Cancellation/CNLiveCancellationController.h
  View file @4a62897
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 // 注销账号 9 // 注销账号
10 10
11 -#import "CNLiveBaseViewController.h" 11 +#import <CNLiveBaseClass/CNLiveBaseViewController.h>
12 12
13 NS_ASSUME_NONNULL_BEGIN 13 NS_ASSUME_NONNULL_BEGIN
14 14
CNLiveBMineModule/Classes/Setting/Cancellation/CNLiveCancellationController.m
  View file @4a62897
@@ -7,21 +7,21 @@ @@ -7,21 +7,21 @@
7 // 7 //
8 8
9 #import "CNLiveCancellationController.h" 9 #import "CNLiveCancellationController.h"
10 -#import <WebKit/WebKit.h>  
11 -#import <Masonry/Masonry.h>  
12 -#import "QMUIKit.h" 10 +#import "CNLiveCancellationView.h"
13 11
14 -#import "CNLiveNetworking.h"  
15 -#import "CNLiveEnvironment.h"  
16 -#import "CNUserInfoManager.h"  
17 12
18 -#import "CNLiveNavigationBar.h"  
19 -#import "CNLiveCancellationView.h" 13 +#import <WebKit/WebKit.h>
  14 +#import <Masonry/Masonry.h>
  15 +#import <QMUIKit/QMUIKit.h>
20 16
21 -#import "CNLiveUserAgreementManager.h" 17 +#import <CNLiveRequestBastKit/CNLiveNetworking.h>
  18 +#import <CNLiveEnvironment/CNLiveEnvironment.h>
  19 +#import <CNLiveUserManagement/CNUserInfoManager.h>
  20 +#import <CNLiveCustomControl/CNLiveNavigationBar.h>
  21 +#import <CNLiveBUserAgreement/CNLiveUserAgreementManager.h>
22 22
23 @interface CNLiveCancellationController ()<WKNavigationDelegate,WKUIDelegate,CNLiveCancellationViewDelegate> 23 @interface CNLiveCancellationController ()<WKNavigationDelegate,WKUIDelegate,CNLiveCancellationViewDelegate>
24 -@property (nonatomic, strong) CNLiveNavigationBar *navigationBar; 24 +@property (nonatomic, strong) CNLiveNavigationBar *customNavBar;
25 @property (nonatomic, weak) WKWebView *webView; 25 @property (nonatomic, weak) WKWebView *webView;
26 @property (nonatomic, weak) CNLiveCancellationView *cancellationView; 26 @property (nonatomic, weak) CNLiveCancellationView *cancellationView;
27 27
@@ -62,7 +62,7 @@ static const NSInteger timeValue = 1.5; @@ -62,7 +62,7 @@ static const NSInteger timeValue = 1.5;
62 62
63 #pragma mark - UI 63 #pragma mark - UI
64 - (void)createUI { 64 - (void)createUI {
65 - [self.view addSubview:self.navigationBar]; 65 + [self.view addSubview:self.customNavBar];
66 66
67 WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc]init]; 67 WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc]init];
68 config.preferences = [WKPreferences new]; 68 config.preferences = [WKPreferences new];
@@ -146,7 +146,7 @@ static const NSInteger timeValue = 1.5; @@ -146,7 +146,7 @@ static const NSInteger timeValue = 1.5;
146 QMUIAlertAction *cancel = [QMUIAlertAction actionWithTitle:@"否" style:QMUIAlertActionStyleCancel handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) { 146 QMUIAlertAction *cancel = [QMUIAlertAction actionWithTitle:@"否" style:QMUIAlertActionStyleCancel handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
147 __strong typeof(weakSelf) strongSelf = weakSelf; 147 __strong typeof(weakSelf) strongSelf = weakSelf;
148 if(!strongSelf) return ; 148 if(!strongSelf) return ;
149 - self.navigationBar.right.userInteractionEnabled = YES; 149 + self.customNavBar.right.userInteractionEnabled = YES;
150 150
151 }]; 151 }];
152 152
@@ -239,18 +239,18 @@ static const NSInteger timeValue = 1.5; @@ -239,18 +239,18 @@ static const NSInteger timeValue = 1.5;
239 */ 239 */
240 240
241 #pragma mark - 懒加载 241 #pragma mark - 懒加载
242 -- (CNLiveNavigationBar *)navigationBar {  
243 - if (!_navigationBar) {  
244 - _navigationBar = [CNLiveNavigationBar navigationBar];  
245 - _navigationBar.title.text = @"审核申请"; 242 +- (CNLiveNavigationBar *)customNavBar {
  243 + if (!_customNavBar) {
  244 + _customNavBar = [CNLiveNavigationBar navigationBar];
  245 + _customNavBar.title.text = @"审核申请";
246 __weak typeof(self) weakSelf = self; 246 __weak typeof(self) weakSelf = self;
247 - _navigationBar.onClickLeftButton = ^{ 247 + _customNavBar.onClickLeftButton = ^{
248 __strong typeof(weakSelf) strongSelf = weakSelf; 248 __strong typeof(weakSelf) strongSelf = weakSelf;
249 if(!strongSelf) return ; 249 if(!strongSelf) return ;
250 [strongSelf goBack]; 250 [strongSelf goBack];
251 }; 251 };
252 } 252 }
253 - return _navigationBar; 253 + return _customNavBar;
254 } 254 }
255 255
256 #pragma mark - 响应方法 256 #pragma mark - 响应方法
CNLiveBMineModule/Classes/Setting/Cancellation/CNLiveCancellationView.m
  View file @4a62897
@@ -7,9 +7,10 @@ @@ -7,9 +7,10 @@
7 // 7 //
8 8
9 #import "CNLiveCancellationView.h" 9 #import "CNLiveCancellationView.h"
10 -#import "YYKit.h" 10 +#import <YYText/YYText.h>
  11 +#import <YYCategories/YYCategories.h>
11 #import <Masonry/Masonry.h> 12 #import <Masonry/Masonry.h>
12 -#import "CNLiveCategory.h" 13 +#import <CNLiveCategory/CNLiveCategory.h>
13 14
14 @interface CNLiveCancellationView()<UITextViewDelegate> 15 @interface CNLiveCancellationView()<UITextViewDelegate>
15 @property (nonatomic, strong) UIButton *agreeBtn; 16 @property (nonatomic, strong) UIButton *agreeBtn;
@@ -123,11 +124,11 @@ static const NSInteger margin = 15; @@ -123,11 +124,11 @@ static const NSInteger margin = 15;
123 if (!_protocol) { 124 if (!_protocol) {
124 _protocol = [[YYLabel alloc] init]; 125 _protocol = [[YYLabel alloc] init];
125 NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:@"我已阅读并同意《注销协议》"]; 126 NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:@"我已阅读并同意《注销协议》"];
126 - text.font = [UIFont fontWithName:@"PingFangSC-Regular" size:16];  
127 - text.color = [UIColor colorWithRed:40/255.0 green:40/255.0 blue:40/255.0 alpha:1.0]; 127 + text.yy_font = [UIFont fontWithName:@"PingFangSC-Regular" size:16];
  128 + text.yy_color = [UIColor colorWithRed:40/255.0 green:40/255.0 blue:40/255.0 alpha:1.0];
128 129
129 __weak typeof(self) weakSelf = self; 130 __weak typeof(self) weakSelf = self;
130 - [text setTextHighlightRange:NSMakeRange(7, 6) color:[UIColor colorWithRed:72/255.0 green:167/255.0 blue:249/255.0 alpha:1.0] backgroundColor:[UIColor colorWithRed:242/255.0 green:242/255.0 blue:242/255.0 alpha:1.0] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { 131 + [text yy_setTextHighlightRange:NSMakeRange(7, 6) color:[UIColor colorWithRed:72/255.0 green:167/255.0 blue:249/255.0 alpha:1.0] backgroundColor:[UIColor colorWithRed:242/255.0 green:242/255.0 blue:242/255.0 alpha:1.0] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
131 if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(clickedProtocol:)]) { 132 if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(clickedProtocol:)]) {
132 [weakSelf.delegate clickedProtocol:weakSelf]; 133 [weakSelf.delegate clickedProtocol:weakSelf];
133 134
CNLiveBMineModule/Classes/Setting/Controller/CNLiveSettingController.h
  View file @4a62897
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 */ 11 */
12 12
13 #import <UIKit/UIKit.h> 13 #import <UIKit/UIKit.h>
14 -#import "CNLiveBaseViewController.h" 14 +#import <CNLiveBaseClass/CNLiveBaseViewController.h>
15 15
16 NS_ASSUME_NONNULL_BEGIN 16 NS_ASSUME_NONNULL_BEGIN
17 17
CNLiveBMineModule/Classes/Setting/Controller/CNLiveSettingController.m
  View file @4a62897
@@ -7,29 +7,31 @@ @@ -7,29 +7,31 @@
7 // 7 //
8 8
9 #import "CNLiveSettingController.h" 9 #import "CNLiveSettingController.h"
10 -#import "MJExtension.h"  
11 -#import <SDWebImage/SDWebImage.h>  
12 -#import "QMUIKit.h"  
13 -#import "TIMAdapter.h"  
14 -//#import "CommonLibrary.h"  
15 -  
16 -#import "CNLiveUserAgreementManager.h"  
17 -#import "CNUserInfoManager.h"  
18 -  
19 #import "CNLiveSettingModel.h" 10 #import "CNLiveSettingModel.h"
20 #import "CNLiveSettingCell.h" 11 #import "CNLiveSettingCell.h"
21 -#import "CNLiveBServices.h"  
22 -#import "CNLiveNavigationBar.h"  
23 -  
24 #import "CNLiveUpdateTelController.h"//修改手机号 12 #import "CNLiveUpdateTelController.h"//修改手机号
25 #import "CNLiveCancellationController.h"//注销 13 #import "CNLiveCancellationController.h"//注销
26 #import "CNLiveAboutUsController.h"//关于我们 14 #import "CNLiveAboutUsController.h"//关于我们
27 #import "CNLiveBindingManageController.h"//绑定管理 15 #import "CNLiveBindingManageController.h"//绑定管理
28 -#import "CNLiveBaseKit.h" 16 +
  17 +#import <MJExtension/MJExtension.h>
  18 +#import <SDWebImage/SDWebImage.h>
  19 +#import <QMUIKit/QMUIKit.h>
  20 +#import <CNLiveIMBaseSDK/TIMAdapter.h>
  21 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
  22 +
  23 +//#import "CommonLibrary.h"
  24 +
  25 +#import <CNLiveBUserAgreement/CNLiveUserAgreementManager.h>
  26 +#import <CNLiveUserManagement/CNUserInfoManager.h>
  27 +#import <CNLiveBServices/CNLiveBServices.h>
  28 +#import <CNLiveCustomControl/CNLiveNavigationBar.h>
  29 +
  30 +
29 31
30 @interface CNLiveSettingController () 32 @interface CNLiveSettingController ()
31 <UITableViewDelegate, UITableViewDataSource> 33 <UITableViewDelegate, UITableViewDataSource>
32 -@property (nonatomic, strong) CNLiveNavigationBar *navigationBar; 34 +@property (nonatomic, strong) CNLiveNavigationBar *customNavBar;
33 @property (nonatomic, strong) UITableView *tableView; 35 @property (nonatomic, strong) UITableView *tableView;
34 @property (nonatomic, strong) UIButton *logout; 36 @property (nonatomic, strong) UIButton *logout;
35 @property (nonatomic, strong) NSMutableArray *data; 37 @property (nonatomic, strong) NSMutableArray *data;
@@ -139,7 +141,7 @@ static const NSInteger timeValue = 1.5; @@ -139,7 +141,7 @@ static const NSInteger timeValue = 1.5;
139 } 141 }
140 142
141 - (void)createSubViews { 143 - (void)createSubViews {
142 - [self.view addSubview:self.navigationBar]; 144 + [self.view addSubview:self.customNavBar];
143 [self.view addSubview:self.tableView]; 145 [self.view addSubview:self.tableView];
144 [self.view addSubview:self.logout]; 146 [self.view addSubview:self.logout];
145 147
@@ -190,7 +192,7 @@ static const NSInteger timeValue = 1.5; @@ -190,7 +192,7 @@ static const NSInteger timeValue = 1.5;
190 QMUIAlertAction *cancel = [QMUIAlertAction actionWithTitle:@"取消" style:QMUIAlertActionStyleCancel handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) { 192 QMUIAlertAction *cancel = [QMUIAlertAction actionWithTitle:@"取消" style:QMUIAlertActionStyleCancel handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
191 __strong typeof(weakSelf) strongSelf = weakSelf; 193 __strong typeof(weakSelf) strongSelf = weakSelf;
192 if(!strongSelf) return ; 194 if(!strongSelf) return ;
193 - self.navigationBar.right.userInteractionEnabled = YES; 195 + self.customNavBar.right.userInteractionEnabled = YES;
194 196
195 }]; 197 }];
196 198
@@ -230,16 +232,16 @@ static const NSInteger timeValue = 1.5; @@ -230,16 +232,16 @@ static const NSInteger timeValue = 1.5;
230 return _data; 232 return _data;
231 } 233 }
232 234
233 -- (CNLiveNavigationBar *)navigationBar {  
234 - if (!_navigationBar) {  
235 - _navigationBar = [CNLiveNavigationBar navigationBar];  
236 - _navigationBar.title.text = @"设置"; 235 +- (CNLiveNavigationBar *)customNavBar {
  236 + if (!_customNavBar) {
  237 + _customNavBar = [CNLiveNavigationBar navigationBar];
  238 + _customNavBar.title.text = @"设置";
237 __weak typeof(self) weakSelf = self; 239 __weak typeof(self) weakSelf = self;
238 - _navigationBar.onClickLeftButton = ^{ 240 + _customNavBar.onClickLeftButton = ^{
239 [weakSelf goBack]; 241 [weakSelf goBack];
240 }; 242 };
241 } 243 }
242 - return _navigationBar; 244 + return _customNavBar;
243 } 245 }
244 246
245 - (UITableView *)tableView{ 247 - (UITableView *)tableView{
CNLiveBMineModule/Classes/Setting/UpdateTel/CNLiveUpdateTelController.h
  View file @4a62897
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 // Copyright (c) 2019 153993236@qq.com. All rights reserved. 6 // Copyright (c) 2019 153993236@qq.com. All rights reserved.
7 // 7 //
8 8
9 -#import "CNLiveBaseViewController.h" 9 +#import <CNLiveBaseClass/CNLiveBaseViewController.h>
10 10
11 @interface CNLiveUpdateTelController : CNLiveBaseViewController 11 @interface CNLiveUpdateTelController : CNLiveBaseViewController
12 12
CNLiveBMineModule/Classes/Setting/UpdateTel/CNLiveUpdateTelController.m
  View file @4a62897
@@ -8,22 +8,23 @@ @@ -8,22 +8,23 @@
8 8
9 #import "CNLiveUpdateTelController.h" 9 #import "CNLiveUpdateTelController.h"
10 #import "CNLiveChooseCountryController.h" 10 #import "CNLiveChooseCountryController.h"
11 -#import "YYKit.h" 11 +#import "CNLiveUpdateTelView.h"
  12 +
  13 +#import <YYText/YYText.h>
  14 +#import <YYCategories/YYCategories.h>
12 #import <Masonry/Masonry.h> 15 #import <Masonry/Masonry.h>
13 -#import "QMUIKit.h" 16 +#import <QMUIKit/QMUIKit.h>
14 17
15 #import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h> 18 #import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
16 -#import "CNUserInfoManager.h"  
17 -#import "NSString+CNLiveExtension.h"  
18 -#import "CNLiveCategory.h"  
19 -#import "CNLiveBaseKit.h" 19 +#import <CNLiveUserManagement/CNUserInfoManager.h>
  20 +#import <CNLiveCategory/CNLiveCategory.h>
  21 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
20 22
21 -#import "CNLiveNavigationBar.h"  
22 -#import "CNLiveUpdateTelView.h" 23 +#import <CNLiveCustomControl/CNLiveNavigationBar.h>
23 24
24 @interface CNLiveUpdateTelController()<UITextFieldDelegate, CNLiveUpdateTelViewDelegate, ChooseCountriesDelegate> 25 @interface CNLiveUpdateTelController()<UITextFieldDelegate, CNLiveUpdateTelViewDelegate, ChooseCountriesDelegate>
25 26
26 -@property (nonatomic, strong) CNLiveNavigationBar *navigationBar; 27 +@property (nonatomic, strong) CNLiveNavigationBar *customNavBar;
27 @property (nonatomic, strong) CNLiveUpdateTelView *updateTel;//背景 28 @property (nonatomic, strong) CNLiveUpdateTelView *updateTel;//背景
28 @property (nonatomic, strong) YYLabel *connection; 29 @property (nonatomic, strong) YYLabel *connection;
29 30
@@ -77,7 +78,7 @@ static const NSInteger timeValue = 1.5; @@ -77,7 +78,7 @@ static const NSInteger timeValue = 1.5;
77 78
78 #pragma mark - UI 79 #pragma mark - UI
79 - (void)createSubViews{ 80 - (void)createSubViews{
80 - [self.view addSubview:self.navigationBar]; 81 + [self.view addSubview:self.customNavBar];
81 [self.view addSubview:self.updateTel]; 82 [self.view addSubview:self.updateTel];
82 [self.view addSubview:self.connection]; 83 [self.view addSubview:self.connection];
83 } 84 }
@@ -126,19 +127,19 @@ static const NSInteger timeValue = 1.5; @@ -126,19 +127,19 @@ static const NSInteger timeValue = 1.5;
126 } 127 }
127 128
128 #pragma mark - Lazy Loading 129 #pragma mark - Lazy Loading
129 -- (CNLiveNavigationBar *)navigationBar {  
130 - if (!_navigationBar) {  
131 - _navigationBar = [CNLiveNavigationBar navigationBar];  
132 - _navigationBar.title.text = @"更换手机号"; 130 +- (CNLiveNavigationBar *)customNavBar {
  131 + if (!_customNavBar) {
  132 + _customNavBar = [CNLiveNavigationBar navigationBar];
  133 + _customNavBar.title.text = @"更换手机号";
133 __weak typeof(self) weakSelf = self; 134 __weak typeof(self) weakSelf = self;
134 - _navigationBar.onClickLeftButton = ^{ 135 + _customNavBar.onClickLeftButton = ^{
135 __strong typeof(weakSelf) strongSelf = weakSelf; 136 __strong typeof(weakSelf) strongSelf = weakSelf;
136 if(!strongSelf) return ; 137 if(!strongSelf) return ;
137 [strongSelf.navigationController popViewControllerAnimated:YES]; 138 [strongSelf.navigationController popViewControllerAnimated:YES];
138 }; 139 };
139 140
140 } 141 }
141 - return _navigationBar; 142 + return _customNavBar;
142 } 143 }
143 144
144 - (CNLiveUpdateTelView *)updateTel{ 145 - (CNLiveUpdateTelView *)updateTel{
@@ -156,9 +157,9 @@ static const NSInteger timeValue = 1.5; @@ -156,9 +157,9 @@ static const NSInteger timeValue = 1.5;
156 _connection.numberOfLines = 0; 157 _connection.numberOfLines = 0;
157 NSString *str = @"若当前号码已不用或丢失,请点击联系客服"; 158 NSString *str = @"若当前号码已不用或丢失,请点击联系客服";
158 NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:str]; 159 NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:str];
159 - text.color = [UIColor colorWithRed:34/255.0 green:34/255.0 blue:34/255.0 alpha:1.0];  
160 - text.font = UIFontCNMake(12.0);  
161 - [text setTextHighlightRange:NSMakeRange(text.length-4, 4) color:[UIColor colorWithRed:44/255.0 green:209/255.0 blue:201/255.0 alpha:1.0] backgroundColor:[UIColor colorWithRed:242/255.0 green:242/255.0 blue:242/255.0 alpha:1.0] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { 160 + text.yy_color = [UIColor colorWithRed:34/255.0 green:34/255.0 blue:34/255.0 alpha:1.0];
  161 + text.yy_font = UIFontCNMake(12.0);
  162 + [text yy_setTextHighlightRange:NSMakeRange(text.length-4, 4) color:[UIColor colorWithRed:44/255.0 green:209/255.0 blue:201/255.0 alpha:1.0] backgroundColor:[UIColor colorWithRed:242/255.0 green:242/255.0 blue:242/255.0 alpha:1.0] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
162 163
163 NSString *phoneStr = @"010-65832485"; 164 NSString *phoneStr = @"010-65832485";
164 165
CNLiveBMineModule/Classes/Setting/UpdateTel/CNLiveUpdateTelView.m
  View file @4a62897
@@ -7,15 +7,13 @@ @@ -7,15 +7,13 @@
7 // 7 //
8 8
9 #import "CNLiveUpdateTelView.h" 9 #import "CNLiveUpdateTelView.h"
10 -#import "YYKit.h" 10 +//#import "YYKit.h"
11 #import <Masonry/Masonry.h> 11 #import <Masonry/Masonry.h>
12 -#import "QMUIKit.h"  
13 - 12 +#import <QMUIKit/QMUIKit.h>
14 #import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h> 13 #import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
15 -#import "NSString+CNLiveExtension.h"  
16 -#import "CNUserInfoManager.h"  
17 -#import "CNLiveCategory.h"  
18 -#import "CNLiveBaseKit.h" 14 +#import <CNLiveUserManagement/CNUserInfoManager.h>
  15 +#import <CNLiveCategory/CNLiveCategory.h>
  16 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
19 17
20 #define TIMECOUNT 60; 18 #define TIMECOUNT 60;
21 19
CNLiveBMineModule/Classes/Setting/View/CNLiveSettingCell.m
  View file @4a62897
@@ -7,12 +7,12 @@ @@ -7,12 +7,12 @@
7 // 7 //
8 8
9 #import "CNLiveSettingCell.h" 9 #import "CNLiveSettingCell.h"
10 -#import <Masonry/Masonry.h>  
11 -#import "CNLiveCategory.h"  
12 -#import "CNLiveBaseKit.h"  
13 -  
14 #import "CNLiveSettingModel.h" 10 #import "CNLiveSettingModel.h"
15 11
  12 +#import <Masonry/Masonry.h>
  13 +#import <CNLiveCategory/CNLiveCategory.h>
  14 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
  15 +
16 @interface CNLiveSettingCell() 16 @interface CNLiveSettingCell()
17 @property (nonatomic, strong) UIView *line; 17 @property (nonatomic, strong) UIView *line;
18 @property (nonatomic, strong) UILabel *title; 18 @property (nonatomic, strong) UILabel *title;
CNLiveBMineModule/Classes/UserInfo/CNLiveInfoUpdateCell.m
  View file @4a62897
@@ -7,10 +7,11 @@ @@ -7,10 +7,11 @@
7 // 7 //
8 8
9 #import "CNLiveInfoUpdateCell.h" 9 #import "CNLiveInfoUpdateCell.h"
  10 +#import "CNLiveUserInfoModel.h"
  11 +
10 #import <Masonry/Masonry.h> 12 #import <Masonry/Masonry.h>
11 #import <SDWebImage/SDWebImage.h> 13 #import <SDWebImage/SDWebImage.h>
12 -#import "CNLiveUserInfoModel.h"  
13 -#import "CNLiveCategory.h" 14 +#import <CNLiveCategory/CNLiveCategory.h>
14 15
15 @interface CNLiveInfoUpdateCell() 16 @interface CNLiveInfoUpdateCell()
16 @property (nonatomic, strong) UIView *line; 17 @property (nonatomic, strong) UIView *line;
CNLiveBMineModule/Classes/UserInfo/CNLiveInfoUpdateController.h
  View file @4a62897
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 // Copyright (c) 2019 153993236@qq.com. All rights reserved. 6 // Copyright (c) 2019 153993236@qq.com. All rights reserved.
7 // 7 //
8 8
9 -#import "CNLiveBaseViewController.h" 9 +#import <CNLiveBaseClass/CNLiveBaseViewController.h>
10 10
11 NS_ASSUME_NONNULL_BEGIN 11 NS_ASSUME_NONNULL_BEGIN
12 @class CNLiveUserInfoModel; 12 @class CNLiveUserInfoModel;
CNLiveBMineModule/Classes/UserInfo/CNLiveInfoUpdateController.m
  View file @4a62897
@@ -7,35 +7,36 @@ @@ -7,35 +7,36 @@
7 // 7 //
8 8
9 #import "CNLiveInfoUpdateController.h" 9 #import "CNLiveInfoUpdateController.h"
10 -#import "QMUIKit.h" 10 +#import "CNLiveUserInfoNotification.h"
  11 +#import "CNLiveInfoUpdateCell.h"
  12 +
  13 +
  14 +#import <QMUIKit/QMUIKit.h>
11 #import <SDWebImage/SDWebImage.h> 15 #import <SDWebImage/SDWebImage.h>
12 #import <Masonry/Masonry.h> 16 #import <Masonry/Masonry.h>
13 17
14 #import <AVFoundation/AVCaptureDevice.h> 18 #import <AVFoundation/AVCaptureDevice.h>
15 #import <AVFoundation/AVMediaFormat.h> 19 #import <AVFoundation/AVMediaFormat.h>
16 -#import "XFCameraController.h"  
17 -#import "TZImagePickerController.h"  
18 -#import "CNUserInfoManager.h" 20 +#import <CNLiveAVCamera/XFCameraController.h>
  21 +#import <CNLiveImagePickerController/TZImagePickerController.h>
  22 +#import <CNLiveUserManagement/CNUserInfoManager.h>
19 #import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h> 23 #import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
20 #import <CNLiveUserSystemSDK/CNLiveUserSystemTypeDef.h> 24 #import <CNLiveUserSystemSDK/CNLiveUserSystemTypeDef.h>
21 -#import "NSString+CNLiveExtension.h"  
22 -#import "NSDictionary+Safety.h"  
23 -#import "UIImage+Common.h"  
24 -#import "CNLiveManager.h"  
25 -#import "TIMAdapter.h"  
26 -#import "CommonLibrary.h" 25 +#import <CNLiveBaseKit/NSString+CNLiveExtension.h>
  26 +#import <CNLiveCommonCategory/UIImage+Common.h>
  27 +#import <CNLiveManager/CNLiveManager.h>
  28 +#import <CNLiveIMBaseSDK/TIMAdapter.h>
  29 +#import <CNLiveIMBaseSDK/CommonLibrary.h>
27 30
28 -#import "CNLiveCategory.h"  
29 -#import "CNLiveNavigationBar.h" 31 +#import <CNLiveCategory/CNLiveCategory.h>
  32 +#import <CNLiveCustomControl/CNLiveNavigationBar.h>
30 33
31 //#import "CNLiveUserInfoModel.h" 34 //#import "CNLiveUserInfoModel.h"
32 -#import "CNLiveUserInfoNotification.h"  
33 -#import "CNLiveInfoUpdateCell.h"  
34 35
35 @interface CNLiveInfoUpdateController ()<UITextFieldDelegate,UITextViewDelegate,QMUIAlertControllerDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate,UITableViewDelegate,UITableViewDataSource>{ 36 @interface CNLiveInfoUpdateController ()<UITextFieldDelegate,UITextViewDelegate,QMUIAlertControllerDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate,UITableViewDelegate,UITableViewDataSource>{
36 UIImage *_image; 37 UIImage *_image;
37 } 38 }
38 -@property (nonatomic, strong) CNLiveNavigationBar *navigationBar; 39 +@property (nonatomic, strong) CNLiveNavigationBar *customNavBar;
39 @property (nonatomic, strong) CNLiveUserInfoModel *model; 40 @property (nonatomic, strong) CNLiveUserInfoModel *model;
40 41
41 @property (nonatomic, strong) UIView *contentView; 42 @property (nonatomic, strong) UIView *contentView;
@@ -89,13 +90,13 @@ static const CGFloat timeValue = 1.5; @@ -89,13 +90,13 @@ static const CGFloat timeValue = 1.5;
89 else { 90 else {
90 self.automaticallyAdjustsScrollViewInsets = NO; 91 self.automaticallyAdjustsScrollViewInsets = NO;
91 } 92 }
92 - [self.view addSubview:self.navigationBar]; 93 + [self.view addSubview:self.customNavBar];
93 [self.view addSubview:self.contentView]; 94 [self.view addSubview:self.contentView];
94 } 95 }
95 96
96 #pragma mark - UITextFieldDelegate 97 #pragma mark - UITextFieldDelegate
97 - (void)textFieldDidChange:(UITextField *)textField { 98 - (void)textFieldDidChange:(UITextField *)textField {
98 - self.navigationBar.right.userInteractionEnabled = YES; 99 + self.customNavBar.right.userInteractionEnabled = YES;
99 100
100 NSString *toBeString = textField.text; 101 NSString *toBeString = textField.text;
101 102
@@ -118,8 +119,8 @@ static const CGFloat timeValue = 1.5; @@ -118,8 +119,8 @@ static const CGFloat timeValue = 1.5;
118 } 119 }
119 120
120 - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string { 121 - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string {
121 - self.navigationBar.right.userInteractionEnabled = YES;  
122 - self.navigationBar.right.backgroundColor = [UIColor colorWithRed:72/255.0 green:167/255.0 blue:249/255.0 alpha:1.0]; 122 + self.customNavBar.right.userInteractionEnabled = YES;
  123 + self.customNavBar.right.backgroundColor = [UIColor colorWithRed:72/255.0 green:167/255.0 blue:249/255.0 alpha:1.0];
123 NSInteger maxLength = (self.model.dataType == CNLiveUserInfoDataTypeNickname) ? _nickMaxLength : _locMaxLength; 124 NSInteger maxLength = (self.model.dataType == CNLiveUserInfoDataTypeNickname) ? _nickMaxLength : _locMaxLength;
124 if (range.length > maxLength) { 125 if (range.length > maxLength) {
125 return NO; 126 return NO;
@@ -153,8 +154,8 @@ static const CGFloat timeValue = 1.5; @@ -153,8 +154,8 @@ static const CGFloat timeValue = 1.5;
153 154
154 #pragma mark - UITextViewDelegate 155 #pragma mark - UITextViewDelegate
155 - (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text { 156 - (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text {
156 - self.navigationBar.right.userInteractionEnabled = YES;  
157 - self.navigationBar.right.backgroundColor = [UIColor colorWithRed:72/255.0 green:167/255.0 blue:249/255.0 alpha:1.0]; 157 + self.customNavBar.right.userInteractionEnabled = YES;
  158 + self.customNavBar.right.backgroundColor = [UIColor colorWithRed:72/255.0 green:167/255.0 blue:249/255.0 alpha:1.0];
158 159
159 if([text length] != 0) { 160 if([text length] != 0) {
160 NSLog(@"增"); 161 NSLog(@"增");
@@ -278,8 +279,8 @@ static const CGFloat timeValue = 1.5; @@ -278,8 +279,8 @@ static const CGFloat timeValue = 1.5;
278 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { 279 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
279 [self.tableView qmui_clearsSelection]; 280 [self.tableView qmui_clearsSelection];
280 281
281 - self.navigationBar.right.userInteractionEnabled = YES;  
282 - self.navigationBar.right.backgroundColor = [UIColor colorWithRed:72/255.0 green:167/255.0 blue:249/255.0 alpha:1.0]; 282 + self.customNavBar.right.userInteractionEnabled = YES;
  283 + self.customNavBar.right.backgroundColor = [UIColor colorWithRed:72/255.0 green:167/255.0 blue:249/255.0 alpha:1.0];
283 284
284 CNLiveInfoUpdateCell *cell = [tableView cellForRowAtIndexPath:indexPath]; 285 CNLiveInfoUpdateCell *cell = [tableView cellForRowAtIndexPath:indexPath];
285 NSArray *visibleCells = [self.tableView visibleCells]; 286 NSArray *visibleCells = [self.tableView visibleCells];
@@ -297,7 +298,7 @@ static const CGFloat timeValue = 1.5; @@ -297,7 +298,7 @@ static const CGFloat timeValue = 1.5;
297 } 298 }
298 299
299 - (void)didHideAlertController:(QMUIAlertController *)alertController{ 300 - (void)didHideAlertController:(QMUIAlertController *)alertController{
300 - self.navigationBar.right.userInteractionEnabled = YES; 301 + self.customNavBar.right.userInteractionEnabled = YES;
301 302
302 } 303 }
303 304
@@ -308,7 +309,7 @@ static const CGFloat timeValue = 1.5; @@ -308,7 +309,7 @@ static const CGFloat timeValue = 1.5;
308 QMUIAlertAction *action1 = [QMUIAlertAction actionWithTitle:@"拍照" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) { 309 QMUIAlertAction *action1 = [QMUIAlertAction actionWithTitle:@"拍照" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
309 __strong typeof(weakSelf) strongSelf = weakSelf; 310 __strong typeof(weakSelf) strongSelf = weakSelf;
310 if(!strongSelf) return ; 311 if(!strongSelf) return ;
311 - strongSelf.navigationBar.right.userInteractionEnabled = YES; 312 + strongSelf.customNavBar.right.userInteractionEnabled = YES;
312 __strong typeof(strongSelf) weakSelf = strongSelf; 313 __strong typeof(strongSelf) weakSelf = strongSelf;
313 [CNLiveAuthorizationManager getAVAuthorizationStatus:^{ 314 [CNLiveAuthorizationManager getAVAuthorizationStatus:^{
314 __strong typeof(weakSelf) strongSelf = weakSelf; 315 __strong typeof(weakSelf) strongSelf = weakSelf;
@@ -335,7 +336,7 @@ static const CGFloat timeValue = 1.5; @@ -335,7 +336,7 @@ static const CGFloat timeValue = 1.5;
335 QMUIAlertAction *action2 = [QMUIAlertAction actionWithTitle:@"从手机相册中选择" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) { 336 QMUIAlertAction *action2 = [QMUIAlertAction actionWithTitle:@"从手机相册中选择" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
336 __strong typeof(weakSelf) strongSelf = weakSelf; 337 __strong typeof(weakSelf) strongSelf = weakSelf;
337 if(!strongSelf) return ; 338 if(!strongSelf) return ;
338 - strongSelf.navigationBar.right.userInteractionEnabled = YES; 339 + strongSelf.customNavBar.right.userInteractionEnabled = YES;
339 __strong typeof(strongSelf) weakSelf = strongSelf; 340 __strong typeof(strongSelf) weakSelf = strongSelf;
340 [CNLiveAuthorizationManager getPHAuthorizationStatus:^{ 341 [CNLiveAuthorizationManager getPHAuthorizationStatus:^{
341 __strong typeof(weakSelf) strongSelf = weakSelf; 342 __strong typeof(weakSelf) strongSelf = weakSelf;
@@ -364,13 +365,13 @@ static const CGFloat timeValue = 1.5; @@ -364,13 +365,13 @@ static const CGFloat timeValue = 1.5;
364 [strongSelf saveImage:image]; 365 [strongSelf saveImage:image];
365 [QMUITips hideAllTipsInView:strongSelf.view]; 366 [QMUITips hideAllTipsInView:strongSelf.view];
366 }]; 367 }];
367 - self.navigationBar.right.userInteractionEnabled = YES; 368 + self.customNavBar.right.userInteractionEnabled = YES;
368 369
369 }]; 370 }];
370 QMUIAlertAction *cancel = [QMUIAlertAction actionWithTitle:@"取消" style:QMUIAlertActionStyleCancel handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) { 371 QMUIAlertAction *cancel = [QMUIAlertAction actionWithTitle:@"取消" style:QMUIAlertActionStyleCancel handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
371 __strong typeof(weakSelf) strongSelf = weakSelf; 372 __strong typeof(weakSelf) strongSelf = weakSelf;
372 if(!strongSelf) return ; 373 if(!strongSelf) return ;
373 - self.navigationBar.right.userInteractionEnabled = YES; 374 + self.customNavBar.right.userInteractionEnabled = YES;
374 375
375 }]; 376 }];
376 377
@@ -534,11 +535,11 @@ static const CGFloat timeValue = 1.5; @@ -534,11 +535,11 @@ static const CGFloat timeValue = 1.5;
534 NSString *text = [self.textField.text trim]; 535 NSString *text = [self.textField.text trim];
535 if (text.length == 0) { 536 if (text.length == 0) {
536 [QMUITips showError:@"没有输入名字,请重新填写" inView:self.view hideAfterDelay:timeValue]; 537 [QMUITips showError:@"没有输入名字,请重新填写" inView:self.view hideAfterDelay:timeValue];
537 - self.navigationBar.right.userInteractionEnabled = YES; 538 + self.customNavBar.right.userInteractionEnabled = YES;
538 return; 539 return;
539 } 540 }
540 if ([text isEqualToString:CNUserShareModel.nickname]) { 541 if ([text isEqualToString:CNUserShareModel.nickname]) {
541 - self.navigationBar.right.userInteractionEnabled = YES; 542 + self.customNavBar.right.userInteractionEnabled = YES;
542 [self goBack]; 543 [self goBack];
543 return; 544 return;
544 } 545 }
@@ -558,7 +559,7 @@ static const CGFloat timeValue = 1.5; @@ -558,7 +559,7 @@ static const CGFloat timeValue = 1.5;
558 #pragma mark - 更新性别 559 #pragma mark - 更新性别
559 - (void)requestUpdateUserGender{ 560 - (void)requestUpdateUserGender{
560 if ([self.gender isEqualToString:CNUserShareModel.gender]) { 561 if ([self.gender isEqualToString:CNUserShareModel.gender]) {
561 - self.navigationBar.right.userInteractionEnabled = YES; 562 + self.customNavBar.right.userInteractionEnabled = YES;
562 [self goBack]; 563 [self goBack];
563 return; 564 return;
564 } 565 }
@@ -579,11 +580,11 @@ static const CGFloat timeValue = 1.5; @@ -579,11 +580,11 @@ static const CGFloat timeValue = 1.5;
579 NSString *text = [self.textField.text trim]; 580 NSString *text = [self.textField.text trim];
580 if (text.length == 0) { 581 if (text.length == 0) {
581 [QMUITips showError:@"请填写您的位置" inView:self.view hideAfterDelay:timeValue]; 582 [QMUITips showError:@"请填写您的位置" inView:self.view hideAfterDelay:timeValue];
582 - self.navigationBar.right.userInteractionEnabled = YES; 583 + self.customNavBar.right.userInteractionEnabled = YES;
583 return; 584 return;
584 } 585 }
585 if ([text isEqualToString:CNUserShareModel.location]) { 586 if ([text isEqualToString:CNUserShareModel.location]) {
586 - self.navigationBar.right.userInteractionEnabled = YES; 587 + self.customNavBar.right.userInteractionEnabled = YES;
587 [self goBack]; 588 [self goBack];
588 return; 589 return;
589 } 590 }
@@ -605,7 +606,7 @@ static const CGFloat timeValue = 1.5; @@ -605,7 +606,7 @@ static const CGFloat timeValue = 1.5;
605 BOOL isNil = [[self.textView.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]length] == 0; 606 BOOL isNil = [[self.textView.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]length] == 0;
606 607
607 if ([self.textView.text isEqualToString:CNUserShareModel.signature]) { 608 if ([self.textView.text isEqualToString:CNUserShareModel.signature]) {
608 - self.navigationBar.right.userInteractionEnabled = YES; 609 + self.customNavBar.right.userInteractionEnabled = YES;
609 [self goBack]; 610 [self goBack];
610 } 611 }
611 612
@@ -638,7 +639,7 @@ static const CGFloat timeValue = 1.5; @@ -638,7 +639,7 @@ static const CGFloat timeValue = 1.5;
638 639
639 [[IMAPlatform sharedInstance].host asyncProfile]; 640 [[IMAPlatform sharedInstance].host asyncProfile];
640 [QMUITips hideAllToastInView:self.view animated:YES]; 641 [QMUITips hideAllToastInView:self.view animated:YES];
641 - self.navigationBar.right.userInteractionEnabled = YES; 642 + self.customNavBar.right.userInteractionEnabled = YES;
642 [QMUITips showSucceed:@"修改成功" inView:self.view]; 643 [QMUITips showSucceed:@"修改成功" inView:self.view];
643 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(timeValue * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ 644 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(timeValue * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
644 [QMUITips hideAllToastInView:self.view animated:YES]; 645 [QMUITips hideAllToastInView:self.view animated:YES];
@@ -647,45 +648,45 @@ static const CGFloat timeValue = 1.5; @@ -647,45 +648,45 @@ static const CGFloat timeValue = 1.5;
647 648
648 } 649 }
649 - (void)showError:(NSString *)text{ 650 - (void)showError:(NSString *)text{
650 - self.navigationBar.right.userInteractionEnabled = YES; 651 + self.customNavBar.right.userInteractionEnabled = YES;
651 [QMUITips hideAllToastInView:self.view animated:YES]; 652 [QMUITips hideAllToastInView:self.view animated:YES];
652 [QMUITips showError:text inView:self.view hideAfterDelay:timeValue]; 653 [QMUITips showError:text inView:self.view hideAfterDelay:timeValue];
653 } 654 }
654 655
655 #pragma mark - 懒加载 656 #pragma mark - 懒加载
656 -- (CNLiveNavigationBar *)navigationBar {  
657 - if (!_navigationBar) {  
658 - _navigationBar = [CNLiveNavigationBar navigationBar];  
659 - _navigationBar.title.text = @"个人资料"; 657 +- (CNLiveNavigationBar *)customNavBar {
  658 + if (!_customNavBar) {
  659 + _customNavBar = [CNLiveNavigationBar navigationBar];
  660 + _customNavBar.title.text = @"个人资料";
660 switch (self.model.dataType) { 661 switch (self.model.dataType) {
661 case CNLiveUserInfoDataTypeHeader: 662 case CNLiveUserInfoDataTypeHeader:
662 { 663 {
663 UIImage *xw_image = [self getImageWithImageName:@"CNLiveBMineModule.bundle/cnlive_black_more" bundleName:@"CNLiveBMineModule" targetClass:[self class]]; 664 UIImage *xw_image = [self getImageWithImageName:@"CNLiveBMineModule.bundle/cnlive_black_more" bundleName:@"CNLiveBMineModule" targetClass:[self class]];
664 - _navigationBar.rightImage = xw_image; 665 + _customNavBar.rightImage = xw_image;
665 } 666 }
666 break; 667 break;
667 default: 668 default:
668 { 669 {
669 - _navigationBar.rightTitle = @"完成";  
670 - _navigationBar.right.frame = CGRectMake(SCREEN_WIDTH-45-15, StatusBarHeight+10, 45, 24);  
671 - [_navigationBar.right setContentHorizontalAlignment:UIControlContentHorizontalAlignmentCenter];  
672 - _navigationBar.right.backgroundColor = [UIColor lightGrayColor];  
673 - _navigationBar.right.userInteractionEnabled = NO;  
674 - _navigationBar.right.titleLabel.font = [UIFont boldSystemFontOfSize:13];  
675 - [_navigationBar.right setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];  
676 - _navigationBar.right.adjustsImageWhenHighlighted = NO;  
677 - _navigationBar.right.layer.masksToBounds = YES;  
678 - _navigationBar.right.layer.cornerRadius = 5; 670 + _customNavBar.rightTitle = @"完成";
  671 + _customNavBar.right.frame = CGRectMake(SCREEN_WIDTH-45-15, StatusBarHeight+10, 45, 24);
  672 + [_customNavBar.right setContentHorizontalAlignment:UIControlContentHorizontalAlignmentCenter];
  673 + _customNavBar.right.backgroundColor = [UIColor lightGrayColor];
  674 + _customNavBar.right.userInteractionEnabled = NO;
  675 + _customNavBar.right.titleLabel.font = [UIFont boldSystemFontOfSize:13];
  676 + [_customNavBar.right setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
  677 + _customNavBar.right.adjustsImageWhenHighlighted = NO;
  678 + _customNavBar.right.layer.masksToBounds = YES;
  679 + _customNavBar.right.layer.cornerRadius = 5;
679 680
680 } 681 }
681 break; 682 break;
682 } 683 }
683 684
684 __weak typeof(self) weakSelf = self; 685 __weak typeof(self) weakSelf = self;
685 - _navigationBar.onClickLeftButton = ^{ 686 + _customNavBar.onClickLeftButton = ^{
686 [weakSelf goBack]; 687 [weakSelf goBack];
687 }; 688 };
688 - _navigationBar.onClickRightButton = ^{ 689 + _customNavBar.onClickRightButton = ^{
689 [self.textField resignFirstResponder]; 690 [self.textField resignFirstResponder];
690 [self.textView resignFirstResponder]; 691 [self.textView resignFirstResponder];
691 692
@@ -722,7 +723,7 @@ static const CGFloat timeValue = 1.5; @@ -722,7 +723,7 @@ static const CGFloat timeValue = 1.5;
722 723
723 }; 724 };
724 } 725 }
725 - return _navigationBar; 726 + return _customNavBar;
726 } 727 }
727 728
728 - (UIView *)contentView{ 729 - (UIView *)contentView{
@@ -735,14 +736,14 @@ static const CGFloat timeValue = 1.5; @@ -735,14 +736,14 @@ static const CGFloat timeValue = 1.5;
735 self.view.backgroundColor = [UIColor blackColor]; 736 self.view.backgroundColor = [UIColor blackColor];
736 _contentView.backgroundColor = [UIColor blackColor]; 737 _contentView.backgroundColor = [UIColor blackColor];
737 738
738 - self.navigationBar.title.text = @"个人头像"; 739 + self.customNavBar.title.text = @"个人头像";
739 [self.view addSubview:self.imageView]; 740 [self.view addSubview:self.imageView];
740 741
741 } 742 }
742 break; 743 break;
743 case CNLiveUserInfoDataTypeNickname: 744 case CNLiveUserInfoDataTypeNickname:
744 { 745 {
745 - self.navigationBar.title.text = @"设置昵称"; 746 + self.customNavBar.title.text = @"设置昵称";
746 747
747 [_contentView addSubview:self.textField]; 748 [_contentView addSubview:self.textField];
748 self.textField.placeholder = @"请输入昵称"; 749 self.textField.placeholder = @"请输入昵称";
@@ -752,7 +753,7 @@ static const CGFloat timeValue = 1.5; @@ -752,7 +753,7 @@ static const CGFloat timeValue = 1.5;
752 break; 753 break;
753 case CNLiveUserInfoDataTypeAddress: 754 case CNLiveUserInfoDataTypeAddress:
754 { 755 {
755 - self.navigationBar.title.text = @"设置地区"; 756 + self.customNavBar.title.text = @"设置地区";
756 757
757 [_contentView addSubview:self.textField]; 758 [_contentView addSubview:self.textField];
758 self.textField.placeholder = @"请输入你所在的地区"; 759 self.textField.placeholder = @"请输入你所在的地区";
@@ -762,17 +763,17 @@ static const CGFloat timeValue = 1.5; @@ -762,17 +763,17 @@ static const CGFloat timeValue = 1.5;
762 break; 763 break;
763 case CNLiveUserInfoDataTypeGender: 764 case CNLiveUserInfoDataTypeGender:
764 { 765 {
765 - self.navigationBar.title.text = @"设置性别";  
766 - [self.navigationBar.left setTitle:@"取消" forState:UIControlStateNormal];  
767 - [self.navigationBar.left setTitleColor:[UIColor colorWithRed:30/255.0 green:30/255.0 blue:30/255.0 alpha:1.0] forState:UIControlStateNormal];  
768 - [self.navigationBar.left setImage:nil forState:UIControlStateNormal]; 766 + self.customNavBar.title.text = @"设置性别";
  767 + [self.customNavBar.left setTitle:@"取消" forState:UIControlStateNormal];
  768 + [self.customNavBar.left setTitleColor:[UIColor colorWithRed:30/255.0 green:30/255.0 blue:30/255.0 alpha:1.0] forState:UIControlStateNormal];
  769 + [self.customNavBar.left setImage:nil forState:UIControlStateNormal];
769 _contentView.frame = CGRectMake(0, NavigationContentTop+margin, SCREEN_WIDTH, 100); 770 _contentView.frame = CGRectMake(0, NavigationContentTop+margin, SCREEN_WIDTH, 100);
770 [_contentView addSubview:self.tableView]; 771 [_contentView addSubview:self.tableView];
771 } 772 }
772 break; 773 break;
773 case CNLiveUserInfoDataTypeIntroduction: 774 case CNLiveUserInfoDataTypeIntroduction:
774 { 775 {
775 - self.navigationBar.title.text = @"设置个性签名"; 776 + self.customNavBar.title.text = @"设置个性签名";
776 777
777 _contentView.frame = CGRectMake(0, NavigationContentTop+margin, SCREEN_WIDTH, 120); 778 _contentView.frame = CGRectMake(0, NavigationContentTop+margin, SCREEN_WIDTH, 120);
778 [_contentView addSubview:self.textView]; 779 [_contentView addSubview:self.textView];
CNLiveBMineModule/Classes/UserInfo/CNLiveUserInfoCell.m
  View file @4a62897
@@ -7,10 +7,11 @@ @@ -7,10 +7,11 @@
7 // 7 //
8 8
9 #import "CNLiveUserInfoCell.h" 9 #import "CNLiveUserInfoCell.h"
  10 +#import "CNLiveUserInfoModel.h"
  11 +
10 #import <Masonry/Masonry.h> 12 #import <Masonry/Masonry.h>
11 #import <SDWebImage/SDWebImage.h> 13 #import <SDWebImage/SDWebImage.h>
12 -#import "CNLiveUserInfoModel.h"  
13 -#import "CNLiveCategory.h" 14 +#import <CNLiveCategory/CNLiveCategory.h>
14 15
15 @interface CNLiveUserInfoCell() 16 @interface CNLiveUserInfoCell()
16 @property (nonatomic, strong) UIView *line; 17 @property (nonatomic, strong) UIView *line;
CNLiveBMineModule/Classes/UserInfo/CNLiveUserInfoController.h
  View file @4a62897
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 */ 11 */
12 12
13 #import <UIKit/UIKit.h> 13 #import <UIKit/UIKit.h>
14 -#import "CNLiveBaseViewController.h" 14 +#import <CNLiveBaseClass/CNLiveBaseViewController.h>
15 15
16 NS_ASSUME_NONNULL_BEGIN 16 NS_ASSUME_NONNULL_BEGIN
17 17
CNLiveBMineModule/Classes/UserInfo/CNLiveUserInfoController.m
  View file @4a62897
@@ -7,22 +7,22 @@ @@ -7,22 +7,22 @@
7 // 7 //
8 8
9 #import "CNLiveUserInfoController.h" 9 #import "CNLiveUserInfoController.h"
10 -#import "MJExtension.h"  
11 -#import "QMUIKit.h"  
12 -  
13 -#import "CNUserInfoManager.h"  
14 -//#import "CNLiveBServices.h"  
15 -#import "CNLiveNavigationBar.h"  
16 10
17 #import "CNLiveUserInfoCell.h" 11 #import "CNLiveUserInfoCell.h"
18 #import "CNLiveUserInfoModel.h" 12 #import "CNLiveUserInfoModel.h"
19 #import "CNLiveInfoUpdateController.h" 13 #import "CNLiveInfoUpdateController.h"
20 #import "CNLiveUserInfoNotification.h" 14 #import "CNLiveUserInfoNotification.h"
21 15
  16 +#import <MJExtension/MJExtension.h>
  17 +#import <QMUIKit/QMUIKit.h>
  18 +#import <CNLiveUserManagement/CNUserInfoManager.h>
  19 +#import <CNLiveCustomControl/CNLiveNavigationBar.h>
  20 +
  21 +
22 @interface CNLiveUserInfoController ()<UITableViewDelegate, UITableViewDataSource>{ 22 @interface CNLiveUserInfoController ()<UITableViewDelegate, UITableViewDataSource>{
23 UIImage *_image; 23 UIImage *_image;
24 } 24 }
25 -@property (nonatomic, strong) CNLiveNavigationBar *navigationBar; 25 +@property (nonatomic, strong) CNLiveNavigationBar *customNavBar;
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
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
100 } 100 }
101 101
102 - (void)createSubViews { 102 - (void)createSubViews {
103 - [self.view addSubview:self.navigationBar]; 103 + [self.view addSubview:self.customNavBar];
104 [self.view addSubview:self.tableView]; 104 [self.view addSubview:self.tableView];
105 105
106 } 106 }
@@ -163,16 +163,16 @@ @@ -163,16 +163,16 @@
163 } 163 }
164 164
165 #pragma mark - 懒加载 165 #pragma mark - 懒加载
166 -- (CNLiveNavigationBar *)navigationBar {  
167 - if (!_navigationBar) {  
168 - _navigationBar = [CNLiveNavigationBar navigationBar];  
169 - _navigationBar.title.text = @"个人资料"; 166 +- (CNLiveNavigationBar *)customNavBar {
  167 + if (!_customNavBar) {
  168 + _customNavBar = [CNLiveNavigationBar navigationBar];
  169 + _customNavBar.title.text = @"个人资料";
170 __weak typeof(self) weakSelf = self; 170 __weak typeof(self) weakSelf = self;
171 - _navigationBar.onClickLeftButton = ^{ 171 + _customNavBar.onClickLeftButton = ^{
172 [weakSelf goBack]; 172 [weakSelf goBack];
173 }; 173 };
174 } 174 }
175 - return _navigationBar; 175 + return _customNavBar;
176 } 176 }
177 177
178 - (NSMutableArray *)data { 178 - (NSMutableArray *)data {
CNLiveBMineModule/Classes/View/CNLiveMineCell.m
  View file @4a62897
@@ -7,11 +7,12 @@ @@ -7,11 +7,12 @@
7 // 7 //
8 8
9 #import "CNLiveMineCell.h" 9 #import "CNLiveMineCell.h"
10 -#import <Masonry/Masonry.h>  
11 -#import "QMUIKit.h"  
12 -#import "CNLiveCategory.h"  
13 #import "CNLiveMineModel.h" 10 #import "CNLiveMineModel.h"
14 11
  12 +#import <Masonry/Masonry.h>
  13 +#import <QMUIKit/QMUIKit.h>
  14 +#import <CNLiveCategory/CNLiveCategory.h>
  15 +
15 @interface CNLiveMineCell() 16 @interface CNLiveMineCell()
16 @property (nonatomic, strong) UIImageView *leftImage; 17 @property (nonatomic, strong) UIImageView *leftImage;
17 @property (nonatomic, strong) UILabel *title; 18 @property (nonatomic, strong) UILabel *title;
CNLiveBMineModule/Classes/View/CNLiveMineHeaderView.m
  View file @4a62897
@@ -7,14 +7,14 @@ @@ -7,14 +7,14 @@
7 // 7 //
8 8
9 #import "CNLiveMineHeaderView.h" 9 #import "CNLiveMineHeaderView.h"
  10 +#import "CNLiveUserInfoNotification.h"
  11 +
10 #import <Masonry/Masonry.h> 12 #import <Masonry/Masonry.h>
11 #import <SDWebImage/SDWebImage.h> 13 #import <SDWebImage/SDWebImage.h>
12 -#import "QMUIKit.h"  
13 -#import "CNLiveCategory.h"  
14 -#import "CNLiveBaseKit.h"  
15 -  
16 -#import "CNUserInfoManager.h"  
17 -#import "CNLiveUserInfoNotification.h" 14 +#import <QMUIKit/QMUIKit.h>
  15 +#import <CNLiveCategory/CNLiveCategory.h>
  16 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
  17 +#import <CNLiveUserManagement/CNUserInfoManager.h>
18 18
19 @interface CNLiveMineHeaderView () 19 @interface CNLiveMineHeaderView ()
20 @property (nonatomic, strong) UIImageView *bgView; 20 @property (nonatomic, strong) UIImageView *bgView;
Example/CNLiveBMineModule.xcodeproj/project.pbxproj
  View file @4a62897
@@ -207,8 +207,8 @@ @@ -207,8 +207,8 @@
207 6003F586195388D20070C39A /* Sources */, 207 6003F586195388D20070C39A /* Sources */,
208 6003F587195388D20070C39A /* Frameworks */, 208 6003F587195388D20070C39A /* Frameworks */,
209 6003F588195388D20070C39A /* Resources */, 209 6003F588195388D20070C39A /* Resources */,
210 - 18F9BD5954D45EBCCD792CAB /* [CP] Embed Pods Frameworks */,  
211 979D7A1CBFCF7E680213C758 /* [CP] Copy Pods Resources */, 210 979D7A1CBFCF7E680213C758 /* [CP] Copy Pods Resources */,
  211 + 6432777C8D85B7977E05F76A /* [CP] Embed Pods Frameworks */,
212 ); 212 );
213 buildRules = ( 213 buildRules = (
214 ); 214 );
@@ -299,7 +299,29 @@ @@ -299,7 +299,29 @@
299 /* End PBXResourcesBuildPhase section */ 299 /* End PBXResourcesBuildPhase section */
300 300
301 /* Begin PBXShellScriptBuildPhase section */ 301 /* Begin PBXShellScriptBuildPhase section */
302 - 18F9BD5954D45EBCCD792CAB /* [CP] Embed Pods Frameworks */ = { 302 + 2A8336772A36DEB07525BA2F /* [CP] Check Pods Manifest.lock */ = {
  303 + isa = PBXShellScriptBuildPhase;
  304 + buildActionMask = 2147483647;
  305 + files = (
  306 + );
  307 + inputFileListPaths = (
  308 + );
  309 + inputPaths = (
  310 + "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
  311 + "${PODS_ROOT}/Manifest.lock",
  312 + );
  313 + name = "[CP] Check Pods Manifest.lock";
  314 + outputFileListPaths = (
  315 + );
  316 + outputPaths = (
  317 + "$(DERIVED_FILE_DIR)/Pods-CNLiveBMineModule_Example-checkManifestLockResult.txt",
  318 + );
  319 + runOnlyForDeploymentPostprocessing = 0;
  320 + shellPath = /bin/sh;
  321 + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
  322 + showEnvVarsInLog = 0;
  323 + };
  324 + 6432777C8D85B7977E05F76A /* [CP] Embed Pods Frameworks */ = {
303 isa = PBXShellScriptBuildPhase; 325 isa = PBXShellScriptBuildPhase;
304 buildActionMask = 2147483647; 326 buildActionMask = 2147483647;
305 files = ( 327 files = (
@@ -321,6 +343,7 @@ @@ -321,6 +343,7 @@
321 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", 343 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
322 "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", 344 "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
323 "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework", 345 "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework",
  346 + "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework",
324 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", 347 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
325 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework", 348 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
326 "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework", 349 "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
@@ -335,7 +358,14 @@ @@ -335,7 +358,14 @@
335 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", 358 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
336 "${PODS_ROOT}/TXIMSDK_iOS/ImSDK.framework", 359 "${PODS_ROOT}/TXIMSDK_iOS/ImSDK.framework",
337 "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", 360 "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework",
338 - "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework", 361 + "${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework",
  362 + "${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework",
  363 + "${BUILT_PRODUCTS_DIR}/YYCategories/YYCategories.framework",
  364 + "${BUILT_PRODUCTS_DIR}/YYDispatchQueuePool/YYDispatchQueuePool.framework",
  365 + "${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
  366 + "${BUILT_PRODUCTS_DIR}/YYModel/YYModel.framework",
  367 + "${BUILT_PRODUCTS_DIR}/YYText/YYText.framework",
  368 + "${BUILT_PRODUCTS_DIR}/YYWebImage/YYWebImage.framework",
339 ); 369 );
340 name = "[CP] Embed Pods Frameworks"; 370 name = "[CP] Embed Pods Frameworks";
341 outputPaths = ( 371 outputPaths = (
@@ -354,6 +384,7 @@ @@ -354,6 +384,7 @@
354 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", 384 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
355 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", 385 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
356 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework", 386 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework",
  387 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework",
357 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", 388 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
358 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework", 389 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
359 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework", 390 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
@@ -368,35 +399,20 @@ @@ -368,35 +399,20 @@
368 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", 399 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
369 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ImSDK.framework", 400 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ImSDK.framework",
370 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", 401 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework",
371 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework", 402 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework",
  403 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework",
  404 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework",
  405 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYDispatchQueuePool.framework",
  406 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
  407 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYModel.framework",
  408 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework",
  409 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYWebImage.framework",
372 ); 410 );
373 runOnlyForDeploymentPostprocessing = 0; 411 runOnlyForDeploymentPostprocessing = 0;
374 shellPath = /bin/sh; 412 shellPath = /bin/sh;
375 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-frameworks.sh\"\n"; 413 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-frameworks.sh\"\n";
376 showEnvVarsInLog = 0; 414 showEnvVarsInLog = 0;
377 }; 415 };
378 - 2A8336772A36DEB07525BA2F /* [CP] Check Pods Manifest.lock */ = {  
379 - isa = PBXShellScriptBuildPhase;  
380 - buildActionMask = 2147483647;  
381 - files = (  
382 - );  
383 - inputFileListPaths = (  
384 - );  
385 - inputPaths = (  
386 - "${PODS_PODFILE_DIR_PATH}/Podfile.lock",  
387 - "${PODS_ROOT}/Manifest.lock",  
388 - );  
389 - name = "[CP] Check Pods Manifest.lock";  
390 - outputFileListPaths = (  
391 - );  
392 - outputPaths = (  
393 - "$(DERIVED_FILE_DIR)/Pods-CNLiveBMineModule_Example-checkManifestLockResult.txt",  
394 - );  
395 - runOnlyForDeploymentPostprocessing = 0;  
396 - shellPath = /bin/sh;  
397 - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";  
398 - showEnvVarsInLog = 0;  
399 - };  
400 979D7A1CBFCF7E680213C758 /* [CP] Copy Pods Resources */ = { 416 979D7A1CBFCF7E680213C758 /* [CP] Copy Pods Resources */ = {
401 isa = PBXShellScriptBuildPhase; 417 isa = PBXShellScriptBuildPhase;
402 buildActionMask = 2147483647; 418 buildActionMask = 2147483647;
Example/Podfile
  View file @4a62897
@@ -6,7 +6,7 @@ platform :ios, &#39;10.0&#39; @@ -6,7 +6,7 @@ platform :ios, &#39;10.0&#39;
6 target 'CNLiveBMineModule_Example' do 6 target 'CNLiveBMineModule_Example' do
7 pod 'CNLiveBMineModule', :path => '../' 7 pod 'CNLiveBMineModule', :path => '../'
8 #腾讯IMSDK 8 #腾讯IMSDK
9 - pod 'TXIMSDK_iOS', '4.7.2' 9 +# pod 'TXIMSDK_iOS', '4.7.2'
10 #依赖三方私有库,如果里面有.a的时候加上这个 10 #依赖三方私有库,如果里面有.a的时候加上这个
11 pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {} 11 pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
12 end 12 end
README.md
  View file @4a62897
@@ -27,3 +27,5 @@ iOS-Xiaowen, 153993236@qq.com @@ -27,3 +27,5 @@ iOS-Xiaowen, 153993236@qq.com
27 ## License 27 ## License
28 28
29 CNLiveBMineModule is available under the MIT license. See the LICENSE file for more info. 29 CNLiveBMineModule is available under the MIT license. See the LICENSE file for more info.
  30 +## 推送
  31 +pod repo push CNLiveRepos CNLiveBMineModule.podspec CNLiveIMBaseSDK.podspec --verbose --use-libraries --skip-import-validation --allow-warnings