Commit 6353b1682ec9f5c3c796db315f58a7ea14a94f75

Authored by daojian
1 parent 6ac718c8

0.2.1 Xcode 13 报错处理

Showing 21 changed files with 136 additions and 90 deletions
CNLiveBPersonalVerificationModule.podspec
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveBPersonalVerificationModule' 10 s.name = 'CNLiveBPersonalVerificationModule'
11 - s.version = '0.2.0' 11 + s.version = '0.2.1'
12 s.summary = 'B端个人资料认证开发' 12 s.summary = 'B端个人资料认证开发'
13 13
14 14
@@ -23,7 +23,7 @@ TODO: Add long description of the pod here. @@ -23,7 +23,7 @@ TODO: Add long description of the pod here.
23 s.source = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveBPersonalVerificationModule.git', :tag => s.version.to_s } 23 s.source = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveBPersonalVerificationModule.git', :tag => s.version.to_s }
24 # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>' 24 # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
25 25
26 - s.ios.deployment_target = '9.0' 26 + s.ios.deployment_target = '10.0'
27 27
28 # s.source_files = 'CNLiveBPersonalVerificationModule/Classes/**/*' 28 # s.source_files = 'CNLiveBPersonalVerificationModule/Classes/**/*'
29 s.subspec 'CNBInstitutionInfo' do |institution| 29 s.subspec 'CNBInstitutionInfo' do |institution|
@@ -46,12 +46,12 @@ s.subspec &#39;CNBInstitutionInfo&#39; do |institution| @@ -46,12 +46,12 @@ s.subspec &#39;CNBInstitutionInfo&#39; do |institution|
46 service.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Services/*.{h,m}' 46 service.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Services/*.{h,m}'
47 service.dependency 'CNLiveBPersonalVerificationModule/CNBInstitutionInfo/Controller' 47 service.dependency 'CNLiveBPersonalVerificationModule/CNBInstitutionInfo/Controller'
48 end 48 end
49 - institution.dependency 'CNLiveTripartiteManagement/Masonry'  
50 - institution.dependency 'CNLiveTripartiteManagement/QMUIKit'  
51 - institution.dependency 'CNLiveTripartiteManagement/MJExtension'  
52 - institution.dependency 'CNLiveTripartiteManagement/SDWebImage'  
53 - institution.dependency 'CNLiveTripartiteManagement/MJRefresh'  
54 - institution.dependency 'CNLiveTripartiteManagement/AFNetworking' 49 + institution.dependency 'CNLiveNewTripartiteManagement/Masonry'
  50 + institution.dependency 'CNLiveNewTripartiteManagement/QMUIKit'
  51 + institution.dependency 'CNLiveNewTripartiteManagement/MJExtension'
  52 + institution.dependency 'CNLiveNewTripartiteManagement/SDWebImage'
  53 + institution.dependency 'CNLiveNewTripartiteManagement/MJRefresh'
  54 + institution.dependency 'CNLiveNewTripartiteManagement/AFNetworking'
55 #基础库 55 #基础库
56 institution.dependency 'CNLiveBaseKit' 56 institution.dependency 'CNLiveBaseKit'
57 #基础类目 57 #基础类目
@@ -99,11 +99,11 @@ s.subspec &#39;CNBPersonCardInfo&#39; do |card| @@ -99,11 +99,11 @@ s.subspec &#39;CNBPersonCardInfo&#39; do |card|
99 card.resource_bundles = { 99 card.resource_bundles = {
100 'CNBPersonCardInfo' => ['CNLiveBPersonalVerificationModule/Assets/CNBPersonCardInfo/CNBPersonCardInfo.bundle'] 100 'CNBPersonCardInfo' => ['CNLiveBPersonalVerificationModule/Assets/CNBPersonCardInfo/CNBPersonCardInfo.bundle']
101 } 101 }
102 - card.dependency 'CNLiveTripartiteManagement/Masonry'  
103 - card.dependency 'CNLiveTripartiteManagement/QMUIKit'  
104 - card.dependency 'CNLiveTripartiteManagement/MJExtension'  
105 - card.dependency 'CNLiveTripartiteManagement/SDWebImage'  
106 - card.dependency 'CNLiveTripartiteManagement/AFNetworking' 102 + card.dependency 'CNLiveNewTripartiteManagement/Masonry'
  103 + card.dependency 'CNLiveNewTripartiteManagement/QMUIKit'
  104 + card.dependency 'CNLiveNewTripartiteManagement/MJExtension'
  105 + card.dependency 'CNLiveNewTripartiteManagement/SDWebImage'
  106 + card.dependency 'CNLiveNewTripartiteManagement/AFNetworking'
107 #基础库 107 #基础库
108 card.dependency 'CNLiveBaseKit' 108 card.dependency 'CNLiveBaseKit'
109 #基础类目 109 #基础类目
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Controller/CNBPerAuthSuccessController.m
@@ -7,14 +7,16 @@ @@ -7,14 +7,16 @@
7 7
8 #import "CNBPerAuthSuccessController.h" 8 #import "CNBPerAuthSuccessController.h"
9 #import "CNBPersonalInfoCell.h" 9 #import "CNBPersonalInfoCell.h"
10 -#import "UIColor+CNLiveExtension.h"  
11 -#import "CNLiveBaseKit.h" 10 +#import "CNLivePerAuthGetImage.h"
12 #import "CNBPerAuthHeaderView.h" 11 #import "CNBPerAuthHeaderView.h"
13 #import "CNBPerAuthViewModel.h" 12 #import "CNBPerAuthViewModel.h"
14 #import "CNBPerCertificationSuccessModel.h" 13 #import "CNBPerCertificationSuccessModel.h"
15 -#import "CNEmptyView.h"  
16 -#import "CNLivePerAuthGetImage.h"  
17 -#import "MJExtension.h" 14 +
  15 +#import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
  16 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
  17 +#import <CNLiveCustomUI/CNEmptyView.h>
  18 +#import <MJExtension/MJExtension.h>
  19 +
18 typedef NS_ENUM(NSUInteger,CNBPerAuthErrorType) { 20 typedef NS_ENUM(NSUInteger,CNBPerAuthErrorType) {
19 CNBPerAuthErrorTypeNoNet, //没网 21 CNBPerAuthErrorTypeNoNet, //没网
20 CNBPerAuthErrorTypeFail, //请求失败 22 CNBPerAuthErrorTypeFail, //请求失败
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Controller/CNBPerCertificationController.m
@@ -7,11 +7,13 @@ @@ -7,11 +7,13 @@
7 7
8 #import "CNBPerCertificationController.h" 8 #import "CNBPerCertificationController.h"
9 #import "CNLivePerAuthGetImage.h" 9 #import "CNLivePerAuthGetImage.h"
  10 +
10 #import <Masonry/Masonry.h> 11 #import <Masonry/Masonry.h>
11 -#import "CNLiveBaseKit.h"  
12 -#import "UIColor+CNLiveExtension.h"  
13 -#import "CNLiveIDCardAuthenProtocol.h" 12 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
  13 +#import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
  14 +#import <CNLiveBServices/CNLiveIDCardAuthenProtocol.h>
14 #import <CNLiveBeeHive/CNLiveBeeHive.h> 15 #import <CNLiveBeeHive/CNLiveBeeHive.h>
  16 +
15 @interface CNBPerCertificationController () 17 @interface CNBPerCertificationController ()
16 @property (nonatomic, copy) NSString *type; 18 @property (nonatomic, copy) NSString *type;
17 @property (nonatomic, strong) UIImageView *showImageV; 19 @property (nonatomic, strong) UIImageView *showImageV;
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Controller/CNBPersonalVerificationController.m
@@ -6,22 +6,24 @@ @@ -6,22 +6,24 @@
6 // 6 //
7 7
8 #import "CNBPersonalVerificationController.h" 8 #import "CNBPersonalVerificationController.h"
9 -#import <QMUIKit/QMUIKit.h>  
10 -#import "UIColor+CNLiveExtension.h"  
11 #import "CNLivePerAuthGetImage.h" 9 #import "CNLivePerAuthGetImage.h"
12 -#import <Masonry/Masonry.h>  
13 -#import "CNLiveBaseKit.h"  
14 #import "CNBPersonalVerificationCell.h" 10 #import "CNBPersonalVerificationCell.h"
15 #import "CNBPerAuthHeaderView.h" 11 #import "CNBPerAuthHeaderView.h"
16 #import "CNBIdentifierModel.h" 12 #import "CNBIdentifierModel.h"
17 -#import "MJExtension.h"  
18 #import "CNBPerAuthFooterTBView.h" 13 #import "CNBPerAuthFooterTBView.h"
19 #import "CNBPerAuthManager.h" 14 #import "CNBPerAuthManager.h"
20 #import "CNBPerAuthSelectTypeModel.h" 15 #import "CNBPerAuthSelectTypeModel.h"
21 -#import "CNUserInfoManager.h"  
22 #import "CNBPerAuthViewModel.h" 16 #import "CNBPerAuthViewModel.h"
23 #import "CNBPerCertificationController.h" 17 #import "CNBPerCertificationController.h"
24 #import "CNBPerAuthManager.h" 18 #import "CNBPerAuthManager.h"
  19 +
  20 +#import <QMUIKit/QMUIKit.h>
  21 +#import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
  22 +#import <Masonry/Masonry.h>
  23 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
  24 +#import <MJExtension/MJExtension.h>
  25 +#import <CNLiveUserManagement/CNUserInfoManager.h>
  26 +
25 #define CNBHeaderShowHeight 43 27 #define CNBHeaderShowHeight 43
26 #define CNBAffiliationCellIdentifier @"CNBPersonalVerificationCell" 28 #define CNBAffiliationCellIdentifier @"CNBPersonalVerificationCell"
27 #define CNBCircleGroupIdentifier @"CNBCircleGroupCell" 29 #define CNBCircleGroupIdentifier @"CNBCircleGroupCell"
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Model/CNBPerAuthSelectTypeModel.m
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 // 6 //
7 7
8 #import "CNBPerAuthSelectTypeModel.h" 8 #import "CNBPerAuthSelectTypeModel.h"
9 -#import "MJExtension.h" 9 +#import <MJExtension/MJExtension.h>
10 @implementation CNBPerAuthSelectTypeModel 10 @implementation CNBPerAuthSelectTypeModel
11 + (NSDictionary *)mj_replacedKeyFromPropertyName 11 + (NSDictionary *)mj_replacedKeyFromPropertyName
12 { 12 {
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Model/CNBPerCertificationSuccessModel.m
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 // 6 //
7 7
8 #import "CNBPerCertificationSuccessModel.h" 8 #import "CNBPerCertificationSuccessModel.h"
9 -#import "MJExtension.h" 9 +#import <MJExtension/MJExtension.h>
10 @implementation CNBPerCertificationSuccessModel 10 @implementation CNBPerCertificationSuccessModel
11 + (NSDictionary *)mj_objectClassInArray { 11 + (NSDictionary *)mj_objectClassInArray {
12 return @{@"institution":@"CNBInstitutionModel"}; 12 return @{@"institution":@"CNBInstitutionModel"};
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Services/CNBPersonAuthenticationServices.m
@@ -6,11 +6,13 @@ @@ -6,11 +6,13 @@
6 // 6 //
7 7
8 #import "CNBPersonAuthenticationServices.h" 8 #import "CNBPersonAuthenticationServices.h"
9 -#import <CNLiveBeeHive/BeeHive.h>  
10 -#import "CNLiveBPersonAuthentProtocol.h"  
11 #import "CNBPerAuthSuccessController.h" 9 #import "CNBPerAuthSuccessController.h"
12 #import "CNBPerCertificationController.h" 10 #import "CNBPerCertificationController.h"
13 #import "CNBPersonalVerificationController.h" 11 #import "CNBPersonalVerificationController.h"
  12 +
  13 +#import <CNLiveBeeHive/BeeHive.h>
  14 +#import <CNLiveBServices/CNLiveBPersonAuthentProtocol.h>
  15 +
14 @interface CNBPersonAuthenticationServices ()<CNLiveBPersonAuthentProtocol> 16 @interface CNBPersonAuthenticationServices ()<CNLiveBPersonAuthentProtocol>
15 17
16 @end 18 @end
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/View/CNBPerAuthFooterTBView.m
@@ -6,10 +6,11 @@ @@ -6,10 +6,11 @@
6 // 6 //
7 7
8 #import "CNBPerAuthFooterTBView.h" 8 #import "CNBPerAuthFooterTBView.h"
  9 +#import "CNLivePerAuthGetImage.h"
  10 +
9 #import <QMUIKit/QMUIKit.h> 11 #import <QMUIKit/QMUIKit.h>
10 #import <Masonry/Masonry.h> 12 #import <Masonry/Masonry.h>
11 -#import "CNLivePerAuthGetImage.h"  
12 -#import "UIColor+CNLiveExtension.h" 13 +#import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
13 @interface CNBPerAuthFooterTBView () 14 @interface CNBPerAuthFooterTBView ()
14 @property (nonatomic, strong) UIView *containerView; 15 @property (nonatomic, strong) UIView *containerView;
15 @property (nonatomic, strong) UILabel *descLabel; 16 @property (nonatomic, strong) UILabel *descLabel;
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/View/CNBPerAuthHeaderView.m
@@ -6,11 +6,13 @@ @@ -6,11 +6,13 @@
6 // 6 //
7 7
8 #import "CNBPerAuthHeaderView.h" 8 #import "CNBPerAuthHeaderView.h"
9 -#import <QMUIKit/QMUIKit.h> 9 +#import "CNBIdentifierModel.h"
10 #import "CNLivePerAuthGetImage.h" 10 #import "CNLivePerAuthGetImage.h"
11 -#import "UIColor+CNLiveExtension.h" 11 +
  12 +#import <QMUIKit/QMUIKit.h>
  13 +#import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
12 #import <Masonry/Masonry.h> 14 #import <Masonry/Masonry.h>
13 -#import "CNBIdentifierModel.h" 15 +
14 @interface CNBPerAuthHeaderView () 16 @interface CNBPerAuthHeaderView ()
15 @property (nonatomic, strong) QMUIButton *showBtn; 17 @property (nonatomic, strong) QMUIButton *showBtn;
16 @property (nonatomic, strong) QMUIButton *deleteBtn; 18 @property (nonatomic, strong) QMUIButton *deleteBtn;
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/View/CNBPerAuthShowView.m
@@ -6,9 +6,10 @@ @@ -6,9 +6,10 @@
6 // 6 //
7 7
8 #import "CNBPerAuthShowView.h" 8 #import "CNBPerAuthShowView.h"
9 -#import <Masonry/Masonry.h>  
10 -#import "UIColor+CNLiveExtension.h"  
11 #import "CNLivePerAuthGetImage.h" 9 #import "CNLivePerAuthGetImage.h"
  10 +
  11 +#import <Masonry/Masonry.h>
  12 +#import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
12 @interface CNBPerAuthShowView () 13 @interface CNBPerAuthShowView ()
13 @property (nonatomic, strong) UIImageView *showImageV; 14 @property (nonatomic, strong) UIImageView *showImageV;
14 @end 15 @end
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/View/CNBPerAuthTypeRadioView.m
@@ -6,17 +6,19 @@ @@ -6,17 +6,19 @@
6 // 6 //
7 7
8 #import "CNBPerAuthTypeRadioView.h" 8 #import "CNBPerAuthTypeRadioView.h"
9 -#import <Masonry/Masonry.h>  
10 #import "CNLivePerAuthGetImage.h" 9 #import "CNLivePerAuthGetImage.h"
11 -#import "UIColor+CNLiveExtension.h"  
12 -#import "CNLiveBaseKit.h"  
13 -#import <QMUIKit/QMUIKit.h>  
14 #import "CNBPerAuthViewModel.h" 10 #import "CNBPerAuthViewModel.h"
15 -#import "MJRefresh.h"  
16 -#import "CNEmptyView.h"  
17 #import "CNBIdentifierModel.h" 11 #import "CNBIdentifierModel.h"
18 #import "CNBPerAuthManager.h" 12 #import "CNBPerAuthManager.h"
19 -#import "UIButton+createButton.h" 13 +
  14 +#import <Masonry/Masonry.h>
  15 +#import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
  16 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
  17 +#import <QMUIKit/QMUIKit.h>
  18 +#import <MJRefresh/MJRefresh.h>
  19 +#import <CNLiveCustomUI/CNEmptyView.h>
  20 +#import <CNLiveCommonCategory/UIButton+createButton.h>
  21 +
20 #define CNBSelecctIdentifier @"CNBPerAuthTypeRadioCell" 22 #define CNBSelecctIdentifier @"CNBPerAuthTypeRadioCell"
21 #define CNBottomSureBtnHeight 75 23 #define CNBottomSureBtnHeight 75
22 #define CNBAppKeyWindow ([UIApplication sharedApplication].delegate).window 24 #define CNBAppKeyWindow ([UIApplication sharedApplication].delegate).window
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/View/CNBPersonalInfoCell.m
@@ -6,16 +6,17 @@ @@ -6,16 +6,17 @@
6 // 6 //
7 7
8 #import "CNBPersonalInfoCell.h" 8 #import "CNBPersonalInfoCell.h"
9 -#import <Masonry/Masonry.h>  
10 #import "CNLivePerAuthGetImage.h" 9 #import "CNLivePerAuthGetImage.h"
11 -#import "UIColor+CNLiveExtension.h"  
12 -#import "CNLiveBaseKit.h"  
13 -#import <QMUIKit/QMUIKit.h>  
14 #import "CNBPerCertificationSuccessModel.h" 10 #import "CNBPerCertificationSuccessModel.h"
15 -#import <SDWebImage/SDWebImage.h>  
16 #import "CNBImageZoom.h" 11 #import "CNBImageZoom.h"
17 -#import "MJExtension.h"  
18 -#import "NSString+CNLiveExtension.h" 12 +
  13 +#import <Masonry/Masonry.h>
  14 +#import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
  15 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
  16 +#import <QMUIKit/QMUIKit.h>
  17 +#import <SDWebImage/SDWebImage.h>
  18 +#import <MJExtension/MJExtension.h>
  19 +
19 #pragma mark - 身份证cell 20 #pragma mark - 身份证cell
20 @interface CNBPersonalInfoCell () 21 @interface CNBPersonalInfoCell ()
21 @property (nonatomic, strong) UILabel *nameLabel; //名字名称 22 @property (nonatomic, strong) UILabel *nameLabel; //名字名称
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/View/CNBPersonalVerificationCell.m
@@ -6,15 +6,17 @@ @@ -6,15 +6,17 @@
6 // 6 //
7 7
8 #import "CNBPersonalVerificationCell.h" 8 #import "CNBPersonalVerificationCell.h"
9 -#import <Masonry/Masonry.h>  
10 #import "CNLivePerAuthGetImage.h" 9 #import "CNLivePerAuthGetImage.h"
11 -#import "UIColor+CNLiveExtension.h"  
12 -#import "CNLiveBaseKit.h"  
13 -#import <QMUIKit/QMUIKit.h>  
14 #import "CNBIdentifierModel.h" 10 #import "CNBIdentifierModel.h"
15 #import "CNBPerAuthShowView.h" 11 #import "CNBPerAuthShowView.h"
16 #import "CNBPerAuthTypeRadioView.h" 12 #import "CNBPerAuthTypeRadioView.h"
17 #import "CNBPerAuthManager.h" 13 #import "CNBPerAuthManager.h"
  14 +
  15 +#import <Masonry/Masonry.h>
  16 +#import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
  17 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
  18 +#import <QMUIKit/QMUIKit.h>
  19 +
18 #define CNBAppKeyWindow ([UIApplication sharedApplication].delegate).window 20 #define CNBAppKeyWindow ([UIApplication sharedApplication].delegate).window
19 @interface CNBPersonalVerificationCell () 21 @interface CNBPersonalVerificationCell ()
20 @property (nonatomic, strong) UIImageView *logoImageV; //是不是必须的标识 22 @property (nonatomic, strong) UIImageView *logoImageV; //是不是必须的标识
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/ViewModel/CNBImageZoom.m
@@ -6,7 +6,8 @@ @@ -6,7 +6,8 @@
6 // 6 //
7 7
8 #import "CNBImageZoom.h" 8 #import "CNBImageZoom.h"
9 -#import "CNLiveBaseKit.h" 9 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
  10 +
10 @implementation CNBImageZoom 11 @implementation CNBImageZoom
11 static CGRect oldframe; 12 static CGRect oldframe;
12 + (void)imageZoomWithImageView:(UIImageView *)contentImageView { 13 + (void)imageZoomWithImageView:(UIImageView *)contentImageView {
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/ViewModel/CNBPerAuthViewModel.m
@@ -6,14 +6,16 @@ @@ -6,14 +6,16 @@
6 // 6 //
7 7
8 #import "CNBPerAuthViewModel.h" 8 #import "CNBPerAuthViewModel.h"
9 -#import "CNLiveNetworking.h"  
10 -#import "NSString+CNLiveExtension.h"  
11 -#import "MJExtension.h"  
12 -#import <QMUIKit/QMUIKit.h>  
13 #import "CNBPerCertificationSuccessModel.h" 9 #import "CNBPerCertificationSuccessModel.h"
14 -#import "CNLiveBaseKit.h"  
15 -#import "CNLiveEnvironment.h"  
16 -#import "CNUserInfoManager.h" 10 +
  11 +#import <CNLiveRequestBastKit/CNLiveNetworking.h>
  12 +#import <MJExtension/MJExtension.h>
  13 +#import <QMUIKit/QMUIKit.h>
  14 +#import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
  15 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
  16 +#import <CNLiveEnvironment/CNLiveEnvironment.h>
  17 +#import <CNLiveUserManagement/CNUserInfoManager.h>
  18 +
17 #define CNBAppKeyWindow ([UIApplication sharedApplication].delegate).window 19 #define CNBAppKeyWindow ([UIApplication sharedApplication].delegate).window
18 @implementation CNBPerAuthViewModel 20 @implementation CNBPerAuthViewModel
19 #pragma mark - 请求机构等列表 21 #pragma mark - 请求机构等列表
CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Controller/ApplyForShootController.m
@@ -7,28 +7,32 @@ @@ -7,28 +7,32 @@
7 // 7 //
8 8
9 #import "ApplyForShootController.h" 9 #import "ApplyForShootController.h"
10 -#import <AipOcrSdk/AipOcrSdk.h>  
11 -#import "AFNetworking.h"  
12 #import "ApplyForShootCell.h" 10 #import "ApplyForShootCell.h"
13 #import "ApplyForConfirmCell.h" 11 #import "ApplyForConfirmCell.h"
  12 +#import "CNLiveIDCardAuthGetImage.h"
  13 +
  14 +#import "CNLiveIDCardAuthAlertView.h"
  15 +#import "CNLiveBPersonAuthentProtocol.h"
  16 +
  17 +#import <AipOcrSdk/AipOcrSdk.h>
  18 +//#import "AFNetworking.h"
14 #import <AVFoundation/AVCaptureDevice.h> 19 #import <AVFoundation/AVCaptureDevice.h>
15 #import <AVFoundation/AVMediaFormat.h> 20 #import <AVFoundation/AVMediaFormat.h>
16 #import <CNLiveRequestBastKit/CNLiveNetworkSessionManager.h> 21 #import <CNLiveRequestBastKit/CNLiveNetworkSessionManager.h>
17 -#import "UIColor+CNLiveExtension.h"  
18 -#import "MJExtension.h"  
19 -#import "CNLiveBaseKit.h" 22 +#import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
  23 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
  24 +#import <MJExtension/MJExtension.h>
  25 +
20 #import <QMUIKit/QMUIKit.h> 26 #import <QMUIKit/QMUIKit.h>
21 -#import "CNLiveTimeTools.h"  
22 -#import "CNLiveBusinessTools.h"  
23 -#import "CNUserInfoManager.h"  
24 -#import "CNLiveBusinessTools.h"  
25 -#import "CNLiveEnvironment.h"  
26 -#import "CNLiveIDCardAuthGetImage.h" 27 +#import <CNLiveBaseTools/CNLiveTimeTools.h>
  28 +#import <CNLiveBusinessTools/CNLiveBusinessTools.h>
27 #import <CNLiveImagePickerController/TZImagePickerController.h> 29 #import <CNLiveImagePickerController/TZImagePickerController.h>
28 #import <CNLiveImagePickerController/TZImageManager.h> 30 #import <CNLiveImagePickerController/TZImageManager.h>
29 #import <CNLiveCommonCategory/CNLiveCommonCategory.h> 31 #import <CNLiveCommonCategory/CNLiveCommonCategory.h>
30 -#import "CNLiveIDCardAuthAlertView.h"  
31 -#import "CNLiveBPersonAuthentProtocol.h" 32 +
  33 +#import <CNLiveUserManagement/CNUserInfoManager.h>
  34 +#import <CNLiveEnvironment/CNLiveEnvironment.h>
  35 +
32 @interface ApplyForShootController ()<UITableViewDelegate,UITableViewDataSource,UINavigationControllerDelegate, UIImagePickerControllerDelegate, IDCardAuthAlertViewDelegate> 36 @interface ApplyForShootController ()<UITableViewDelegate,UITableViewDataSource,UINavigationControllerDelegate, UIImagePickerControllerDelegate, IDCardAuthAlertViewDelegate>
33 37
34 @property (nonatomic, strong) UITableView *tableView; 38 @property (nonatomic, strong) UITableView *tableView;
CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Services/CNIDCardAuthenticationServices.m
@@ -6,10 +6,12 @@ @@ -6,10 +6,12 @@
6 // 6 //
7 7
8 #import "CNIDCardAuthenticationServices.h" 8 #import "CNIDCardAuthenticationServices.h"
9 -#import <CNLiveBeeHive/BeeHive.h>  
10 #import "ApplyForShootController.h" 9 #import "ApplyForShootController.h"
11 #import "CNIDCardAuthenticationServices.h" 10 #import "CNIDCardAuthenticationServices.h"
12 -#import "CNLiveIDCardAuthenProtocol.h" 11 +
  12 +#import <CNLiveBServices/CNLiveIDCardAuthenProtocol.h>
  13 +#import <CNLiveBeeHive/BeeHive.h>
  14 +
13 @interface CNIDCardAuthenticationServices ()<CNLiveIDCardAuthenProtocol> 15 @interface CNIDCardAuthenticationServices ()<CNLiveIDCardAuthenProtocol>
14 16
15 @end 17 @end
CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/View/ApplyForConfirmCell.m
@@ -8,7 +8,8 @@ @@ -8,7 +8,8 @@
8 8
9 #import "ApplyForConfirmCell.h" 9 #import "ApplyForConfirmCell.h"
10 #import "UIButton+Create.h" 10 #import "UIButton+Create.h"
11 -#import "CNLiveBaseKit.h" 11 +
  12 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
12 @interface ApplyForConfirmCell() 13 @interface ApplyForConfirmCell()
13 14
14 @end 15 @end
CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/View/ApplyForShootCell.m
@@ -8,10 +8,12 @@ @@ -8,10 +8,12 @@
8 // 8 //
9 9
10 #import "ApplyForShootCell.h" 10 #import "ApplyForShootCell.h"
  11 +#import "CNLiveIDCardAuthGetImage.h"
  12 +
11 #import <Masonry/Masonry.h> 13 #import <Masonry/Masonry.h>
12 -#import "CNLiveBaseKit.h" 14 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
13 #import <QMUIKit/QMUIKit.h> 15 #import <QMUIKit/QMUIKit.h>
14 -#import "CNLiveIDCardAuthGetImage.h" 16 +
15 @interface ApplyForShootCell () 17 @interface ApplyForShootCell ()
16 18
17 @property (nonatomic, strong) UILabel *titleLab; 19 @property (nonatomic, strong) UILabel *titleLab;
Example/CNLiveBPersonalVerificationModule.xcodeproj/project.pbxproj
@@ -213,7 +213,7 @@ @@ -213,7 +213,7 @@
213 6003F586195388D20070C39A /* Sources */, 213 6003F586195388D20070C39A /* Sources */,
214 6003F587195388D20070C39A /* Frameworks */, 214 6003F587195388D20070C39A /* Frameworks */,
215 6003F588195388D20070C39A /* Resources */, 215 6003F588195388D20070C39A /* Resources */,
216 - B2F8A8613C02A00CFC3ED01D /* [CP] Embed Pods Frameworks */, 216 + A9112BB30FDF73E5CC9C10AB /* [CP] Embed Pods Frameworks */,
217 ); 217 );
218 buildRules = ( 218 buildRules = (
219 ); 219 );
@@ -349,7 +349,7 @@ @@ -349,7 +349,7 @@
349 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"; 349 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";
350 showEnvVarsInLog = 0; 350 showEnvVarsInLog = 0;
351 }; 351 };
352 - B2F8A8613C02A00CFC3ED01D /* [CP] Embed Pods Frameworks */ = { 352 + A9112BB30FDF73E5CC9C10AB /* [CP] Embed Pods Frameworks */ = {
353 isa = PBXShellScriptBuildPhase; 353 isa = PBXShellScriptBuildPhase;
354 buildActionMask = 2147483647; 354 buildActionMask = 2147483647;
355 files = ( 355 files = (
@@ -373,8 +373,8 @@ @@ -373,8 +373,8 @@
373 "${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework", 373 "${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
374 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", 374 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
375 "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", 375 "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
  376 + "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework",
376 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", 377 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
377 - "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",  
378 "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework", 378 "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
379 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", 379 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
380 "${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework", 380 "${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
@@ -386,7 +386,15 @@ @@ -386,7 +386,15 @@
386 "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework", 386 "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
387 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", 387 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
388 "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", 388 "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework",
389 - "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework", 389 + "${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework",
  390 + "${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework",
  391 + "${BUILT_PRODUCTS_DIR}/YYCategories/YYCategories.framework",
  392 + "${BUILT_PRODUCTS_DIR}/YYDispatchQueuePool/YYDispatchQueuePool.framework",
  393 + "${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
  394 + "${BUILT_PRODUCTS_DIR}/YYKeyboardManager/YYKeyboardManager.framework",
  395 + "${BUILT_PRODUCTS_DIR}/YYModel/YYModel.framework",
  396 + "${BUILT_PRODUCTS_DIR}/YYText/YYText.framework",
  397 + "${BUILT_PRODUCTS_DIR}/YYWebImage/YYWebImage.framework",
390 ); 398 );
391 name = "[CP] Embed Pods Frameworks"; 399 name = "[CP] Embed Pods Frameworks";
392 outputPaths = ( 400 outputPaths = (
@@ -407,8 +415,8 @@ @@ -407,8 +415,8 @@
407 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework", 415 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
408 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", 416 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
409 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", 417 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
  418 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework",
410 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", 419 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
411 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",  
412 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework", 420 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
413 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", 421 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
414 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework", 422 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
@@ -420,7 +428,15 @@ @@ -420,7 +428,15 @@
420 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework", 428 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
421 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", 429 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
422 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", 430 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework",
423 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework", 431 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework",
  432 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework",
  433 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework",
  434 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYDispatchQueuePool.framework",
  435 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
  436 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKeyboardManager.framework",
  437 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYModel.framework",
  438 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework",
  439 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYWebImage.framework",
424 ); 440 );
425 runOnlyForDeploymentPostprocessing = 0; 441 runOnlyForDeploymentPostprocessing = 0;
426 shellPath = /bin/sh; 442 shellPath = /bin/sh;
Example/Podfile
1 use_frameworks! 1 use_frameworks!
2 -source 'https://github.com/CocoaPods/Specs.git' 2 +#source 'https://github.com/CocoaPods/Specs.git'
  3 +source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
3 source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git' 4 source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
4 -platform :ios, '9.0' 5 +platform :ios, '10.0'
5 target 'CNLiveBPersonalVerificationModule_Example' do 6 target 'CNLiveBPersonalVerificationModule_Example' do
6 pod 'CNLiveBPersonalVerificationModule', :path => '../' 7 pod 'CNLiveBPersonalVerificationModule', :path => '../'
7 # pod 'CNLiveMall', :git => 'https://gitee.com/feng520ckx/CNLiveMallSDK.git' 8 # pod 'CNLiveMall', :git => 'https://gitee.com/feng520ckx/CNLiveMallSDK.git'