Commit 1582227aed12de34bd0be67843c199964584bf2f
1 parent
51746047
0.0.4 版本 Xcode 13 适配
Showing
16 changed files
with
159 additions
and
132 deletions
CNLiveBLoginModule.podspec
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | |
| 9 | 9 | Pod::Spec.new do |s| |
| 10 | 10 | s.name = 'CNLiveBLoginModule' |
| 11 | - s.version = '0.0.3' | |
| 11 | + s.version = '0.0.4' | |
| 12 | 12 | s.summary = 'CNLiveBLoginModule.' |
| 13 | 13 | |
| 14 | 14 | # This description is used to generate tags and improve search results. |
| ... | ... | @@ -30,37 +30,37 @@ TODO: 网家家-登录模块. |
| 30 | 30 | |
| 31 | 31 | s.ios.deployment_target = '10.0' |
| 32 | 32 | |
| 33 | - # s.source_files = 'CNLiveBLoginModule/Classes/**/*' | |
| 34 | - | |
| 35 | - # Module | |
| 36 | - s.subspec 'Module' do |ss| | |
| 37 | - ss.source_files = 'CNLiveBLoginModule/Classes/Module/*.{h,m}' | |
| 38 | - ss.dependency 'CNLiveBLoginModule/Controller' | |
| 39 | - end | |
| 40 | - | |
| 41 | - # Controller | |
| 42 | - s.subspec 'Controller' do |ss| | |
| 43 | - ss.source_files = 'CNLiveBLoginModule/Classes/Controller/*.{h,m}' | |
| 44 | - ss.dependency 'CNLiveBLoginModule/View' | |
| 45 | - ss.dependency 'CNLiveBLoginModule/Model' | |
| 46 | - ss.dependency 'CNLiveBLoginModule/ThreeLogin' | |
| 47 | - end | |
| 48 | - | |
| 49 | - # View | |
| 50 | - s.subspec 'View' do |ss| | |
| 51 | - ss.source_files = 'CNLiveBLoginModule/Classes/View/*.{h,m}' | |
| 52 | - ss.dependency 'CNLiveBLoginModule/Model' | |
| 53 | - end | |
| 54 | - | |
| 55 | - # Model | |
| 56 | - s.subspec 'Model' do |ss| | |
| 57 | - ss.source_files = 'CNLiveBLoginModule/Classes/Model/*.{h,m}' | |
| 58 | - end | |
| 59 | - | |
| 60 | - s.subspec 'ThreeLogin' do |ss| | |
| 61 | - ss.source_files = 'CNLiveBLoginModule/Classes/ThreeLogin/*.{h,m}' | |
| 62 | - ss.dependency 'CNLiveBLoginModule/View' | |
| 63 | - end | |
| 33 | + s.source_files = 'CNLiveBLoginModule/Classes/**/*.{h,m}' | |
| 34 | + | |
| 35 | +# # Module | |
| 36 | +# s.subspec 'Module' do |ss| | |
| 37 | +# ss.source_files = 'CNLiveBLoginModule/Classes/Module/*.{h,m}' | |
| 38 | +# ss.dependency 'CNLiveBLoginModule/Controller' | |
| 39 | +# end | |
| 40 | +# | |
| 41 | +# # Controller | |
| 42 | +# s.subspec 'Controller' do |ss| | |
| 43 | +# ss.source_files = 'CNLiveBLoginModule/Classes/Controller/*.{h,m}' | |
| 44 | +# ss.dependency 'CNLiveBLoginModule/View' | |
| 45 | +# ss.dependency 'CNLiveBLoginModule/Model' | |
| 46 | +# ss.dependency 'CNLiveBLoginModule/ThreeLogin' | |
| 47 | +# end | |
| 48 | +# | |
| 49 | +# # View | |
| 50 | +# s.subspec 'View' do |ss| | |
| 51 | +# ss.source_files = 'CNLiveBLoginModule/Classes/View/*.{h,m}' | |
| 52 | +# ss.dependency 'CNLiveBLoginModule/Model' | |
| 53 | +# end | |
| 54 | +# | |
| 55 | +# # Model | |
| 56 | +# s.subspec 'Model' do |ss| | |
| 57 | +# ss.source_files = 'CNLiveBLoginModule/Classes/Model/*.{h,m}' | |
| 58 | +# end | |
| 59 | +# | |
| 60 | +# s.subspec 'ThreeLogin' do |ss| | |
| 61 | +# ss.source_files = 'CNLiveBLoginModule/Classes/ThreeLogin/*.{h,m}' | |
| 62 | +# ss.dependency 'CNLiveBLoginModule/View' | |
| 63 | +# end | |
| 64 | 64 | |
| 65 | 65 | s.resource_bundles = { |
| 66 | 66 | 'CNLiveBLoginModule' => ['CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle'] |
| ... | ... | @@ -71,11 +71,19 @@ TODO: 网家家-登录模块. |
| 71 | 71 | |
| 72 | 72 | # pod |
| 73 | 73 | s.dependency 'CNLiveSDK/CNLiveUserSystemSDK' #GitHub所以指定版本号 |
| 74 | - s.dependency 'CNLiveTripartiteManagement/QMUIKit' | |
| 75 | - s.dependency 'CNLiveTripartiteManagement/YYKit' | |
| 76 | - s.dependency 'CNLiveTripartiteManagement/SDWebImage' | |
| 77 | - s.dependency 'CNLiveTripartiteManagement/Masonry' | |
| 78 | - s.dependency 'CNLiveTripartiteManagement/MJExtension' | |
| 74 | + s.dependency 'CNLiveNewTripartiteManagement/QMUIKit' | |
| 75 | + s.dependency 'CNLiveNewTripartiteManagement/SDWebImage' | |
| 76 | + s.dependency 'CNLiveNewTripartiteManagement/Masonry' | |
| 77 | + s.dependency 'CNLiveNewTripartiteManagement/MJExtension' | |
| 78 | + | |
| 79 | + s.dependency 'CNLiveNewTripartiteManagement/YYAsyncLayer' | |
| 80 | + s.dependency 'CNLiveNewTripartiteManagement/YYCache' | |
| 81 | + s.dependency 'CNLiveNewTripartiteManagement/YYCategories' | |
| 82 | + s.dependency 'CNLiveNewTripartiteManagement/YYImage' | |
| 83 | + s.dependency 'CNLiveNewTripartiteManagement/YYModel' | |
| 84 | + s.dependency 'CNLiveNewTripartiteManagement/YYText' | |
| 85 | + s.dependency 'CNLiveNewTripartiteManagement/YYWebImage' | |
| 86 | + s.dependency 'CNLiveNewTripartiteManagement/YYDispatchQueuePool' | |
| 79 | 87 | |
| 80 | 88 | # 基础库 |
| 81 | 89 | s.dependency 'CNLiveBaseClass' | ... | ... |
CNLiveBLoginModule/Classes/Controller/CNLiveCompleteInfoController.m
| ... | ... | @@ -7,19 +7,20 @@ |
| 7 | 7 | // |
| 8 | 8 | |
| 9 | 9 | #import "CNLiveCompleteInfoController.h" |
| 10 | +#import "CNLiveCompleteInfoView.h" | |
| 11 | +#import "CNLiveLoginRequest.h" | |
| 10 | 12 | |
| 11 | -#import "MJExtension.h" | |
| 12 | -#import "QMUIKit.h" | |
| 13 | -#import "YYKit.h" | |
| 13 | +#import <MJExtension/MJExtension.h> | |
| 14 | +#import <QMUIKit/QMUIKit.h> | |
| 15 | +#import <YYCategories/YYCategories.h> | |
| 16 | + | |
| 17 | +#import <CNLiveCustomControl/CNLiveNavigationBar.h> | |
| 18 | +#import <CNLiveCategory/CNLiveCategory.h> | |
| 19 | +#import <CNLiveUserManagement/CNUserInfoManager.h> | |
| 20 | +#import <CNLiveEnvironment/CNLiveEnvironment.h> | |
| 21 | +#import <CNLiveManager/CNLiveManager.h> | |
| 14 | 22 | |
| 15 | -#import "CNLiveNavigationBar.h" | |
| 16 | -#import "CNLiveCategory.h" | |
| 17 | -#import "CNUserInfoManager.h" | |
| 18 | -#import "CNLiveEnvironment.h" | |
| 19 | -#import "CNLiveManager.h" | |
| 20 | 23 | |
| 21 | -#import "CNLiveCompleteInfoView.h" | |
| 22 | -#import "CNLiveLoginRequest.h" | |
| 23 | 24 | |
| 24 | 25 | @interface CNLiveCompleteInfoController()<CNLiveCompleteInfoViewDelegate> |
| 25 | 26 | @property (nonatomic, strong) CNLiveCompleteInfoView *infoView; | ... | ... |
CNLiveBLoginModule/Classes/Controller/CNLiveLoginController.m
| ... | ... | @@ -7,19 +7,6 @@ |
| 7 | 7 | // |
| 8 | 8 | |
| 9 | 9 | #import "CNLiveLoginController.h" |
| 10 | - | |
| 11 | -#import "MJExtension.h" | |
| 12 | -#import "QMUIKit.h" | |
| 13 | -#import "YYKit.h" | |
| 14 | - | |
| 15 | -#import "CNLiveUserAgreementManager.h" | |
| 16 | -#import "CNLiveCategory.h" | |
| 17 | -#import "CNUserInfoManager.h" | |
| 18 | -#import "CNLiveEnvironment.h" | |
| 19 | -#import <CNLiveRequestBastKit/CNLiveNetworking.h> | |
| 20 | -#import "CNLiveBusinessTools.h" | |
| 21 | -#import "CNLiveManager.h" | |
| 22 | - | |
| 23 | 10 | #import "CNLiveLoginView.h" |
| 24 | 11 | #import "CNLiveThreeLoginView.h" |
| 25 | 12 | #import "CNLiveBindingTelController.h"//绑定手机号 |
| ... | ... | @@ -28,6 +15,20 @@ |
| 28 | 15 | #import "CNLiveThreeLoginModel.h" |
| 29 | 16 | #import "CNLiveThreeLoginRequest.h" |
| 30 | 17 | |
| 18 | +#import <MJExtension/MJExtension.h> | |
| 19 | +#import <QMUIKit/QMUIKit.h> | |
| 20 | +#import <YYText/YYText.h> | |
| 21 | +#import <YYCategories/YYCategories.h> | |
| 22 | +#import <CNLiveBUserAgreement/CNLiveUserAgreementManager.h> | |
| 23 | +#import <CNLiveCategory/CNLiveCategory.h> | |
| 24 | +#import <CNLiveUserManagement/CNUserInfoManager.h> | |
| 25 | +#import <CNLiveEnvironment/CNLiveEnvironment.h> | |
| 26 | +#import <CNLiveRequestBastKit/CNLiveNetworking.h> | |
| 27 | +#import <CNLiveBusinessTools/CNLiveBusinessTools.h> | |
| 28 | +#import <CNLiveManager/CNLiveManager.h> | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 31 | 32 | @interface CNLiveLoginController()<CNLiveLoginViewDelegate, CNLiveThreeLoginViewDelegate> |
| 32 | 33 | @property (nonatomic, weak) CNLiveLoginView *loginView; |
| 33 | 34 | @property (nonatomic, weak) CNLiveThreeLoginView *threeLoginView; |
| ... | ... | @@ -82,15 +83,15 @@ |
| 82 | 83 | NSMutableParagraphStyle *style = [[NSParagraphStyle defaultParagraphStyle] mutableCopy]; |
| 83 | 84 | style.alignment = NSTextAlignmentCenter;//对齐方式 |
| 84 | 85 | [text addAttribute:NSParagraphStyleAttributeName value:style range:NSMakeRange(0, text.length)]; |
| 85 | - text.color = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0]; | |
| 86 | - text.font = [UIFont systemFontOfSize:14.0]; | |
| 86 | + text.yy_color = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0]; | |
| 87 | + text.yy_font = [UIFont systemFontOfSize:14.0]; | |
| 87 | 88 | __weak typeof(self) weakSelf = self; |
| 88 | 89 | UIColor *color = BusinessLive?[UIColor colorWithRed:72/255.0 green:168/255.0 blue:249/255.0 alpha:1.0]:[UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0]; |
| 89 | - [text setTextHighlightRange:NSMakeRange(11, 4) color:color backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { | |
| 90 | + [text yy_setTextHighlightRange:NSMakeRange(11, 4) color:color backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { | |
| 90 | 91 | [weakSelf.view endEditing:YES]; |
| 91 | 92 | [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementUser]; |
| 92 | 93 | }]; |
| 93 | - [text setTextHighlightRange:NSMakeRange(text.length-5, 4) color:color backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { | |
| 94 | + [text yy_setTextHighlightRange:NSMakeRange(text.length-5, 4) color:color backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { | |
| 94 | 95 | [weakSelf.view endEditing:YES]; |
| 95 | 96 | [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementPrivacy]; |
| 96 | 97 | }]; | ... | ... |
CNLiveBLoginModule/Classes/Model/CNLiveLoginRequest.m
| ... | ... | @@ -8,10 +8,10 @@ |
| 8 | 8 | |
| 9 | 9 | #import "CNLiveLoginRequest.h" |
| 10 | 10 | #import <UIKit/UIKit.h> |
| 11 | -#import "QMUIKit.h" | |
| 11 | +#import <QMUIKit/QMUIKit.h> | |
| 12 | 12 | #import <CNLiveBServices/CNLiveBServices.h> |
| 13 | -#import "CNLiveEnvironment.h" | |
| 14 | -#import "CNUserInfoManager.h" | |
| 13 | +#import <CNLiveEnvironment/CNLiveEnvironment.h> | |
| 14 | +#import <CNLiveUserManagement/CNUserInfoManager.h> | |
| 15 | 15 | |
| 16 | 16 | @interface CNLiveLoginRequest() |
| 17 | 17 | ... | ... |
CNLiveBLoginModule/Classes/Module/CNLiveLoginModule.m
CNLiveBLoginModule/Classes/Module/CNLiveLoginService.m
| ... | ... | @@ -7,9 +7,9 @@ |
| 7 | 7 | // |
| 8 | 8 | |
| 9 | 9 | #import "CNLiveLoginService.h" |
| 10 | -#import "CNLiveBServices.h" | |
| 11 | -#import "CNLiveManager.h" | |
| 12 | -#import "CNUserInfoManager.h" | |
| 10 | +#import <CNLiveBServices/CNLiveBServices.h> | |
| 11 | +#import <CNLiveManager/CNLiveManager.h> | |
| 12 | +#import <CNLiveUserManagement/CNUserInfoManager.h> | |
| 13 | 13 | |
| 14 | 14 | #import "CNLiveLoginController.h" |
| 15 | 15 | ... | ... |
CNLiveBLoginModule/Classes/ThreeLogin/CNLiveBindingTelController.m
| ... | ... | @@ -7,15 +7,15 @@ |
| 7 | 7 | // |
| 8 | 8 | |
| 9 | 9 | #import "CNLiveBindingTelController.h" |
| 10 | +#import "CNLiveBindingTelView.h" | |
| 10 | 11 | |
| 11 | -#import "YYKit.h" | |
| 12 | -#import "NSAttributedString+YYText.h" | |
| 13 | -#import "QMUIKit.h" | |
| 14 | -#import "CNLiveEnvironment.h" | |
| 15 | -#import "CNLiveUserAgreementManager.h" | |
| 12 | +#import <YYCategories/YYCategories.h> | |
| 13 | +#import <YYText/YYText.h> | |
| 14 | +#import <QMUIKit/QMUIKit.h> | |
| 15 | +#import <CNLiveEnvironment/CNLiveEnvironment.h> | |
| 16 | +#import <CNLiveBUserAgreement/CNLiveUserAgreementManager.h> | |
| 16 | 17 | |
| 17 | -#import "CNLiveNavigationBar.h" | |
| 18 | -#import "CNLiveBindingTelView.h" | |
| 18 | +#import <CNLiveCustomControl/CNLiveNavigationBar.h> | |
| 19 | 19 | |
| 20 | 20 | @interface CNLiveBindingTelController() |
| 21 | 21 | @property (nonatomic, assign) CNLiveThreeLoginType type; |
| ... | ... | @@ -99,11 +99,11 @@ |
| 99 | 99 | NSMutableParagraphStyle *style = [[NSParagraphStyle defaultParagraphStyle] mutableCopy]; |
| 100 | 100 | style.alignment = NSTextAlignmentCenter;//对齐方式 |
| 101 | 101 | [text addAttribute:NSParagraphStyleAttributeName value:style range:NSMakeRange(0, text.length)]; |
| 102 | - text.color = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0]; | |
| 103 | - text.font = [UIFont systemFontOfSize:14.0]; | |
| 102 | + text.yy_color = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0]; | |
| 103 | + text.yy_font = [UIFont systemFontOfSize:14.0]; | |
| 104 | 104 | __weak typeof(self) weakSelf = self; |
| 105 | 105 | UIColor *color = BusinessLive?[UIColor colorWithRed:72/255.0 green:168/255.0 blue:249/255.0 alpha:1.0]:[UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0]; |
| 106 | - [text setTextHighlightRange:NSMakeRange(7, 12) color:color backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { | |
| 106 | + [text yy_setTextHighlightRange:NSMakeRange(7, 12) color:color backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { | |
| 107 | 107 | __strong typeof(weakSelf) strongSelf = weakSelf; |
| 108 | 108 | if(!strongSelf) return; |
| 109 | 109 | [strongSelf.view endEditing:YES]; | ... | ... |
CNLiveBLoginModule/Classes/ThreeLogin/CNLiveBindingTelView.m
| ... | ... | @@ -7,24 +7,25 @@ |
| 7 | 7 | // |
| 8 | 8 | |
| 9 | 9 | #import "CNLiveBindingTelView.h" |
| 10 | -#import "YYKit.h" | |
| 11 | -#import "QMUIKit.h" | |
| 12 | -#import <CNLiveRequestBastKit/CNLiveNetworking.h> | |
| 13 | - | |
| 14 | -#import "CNLiveCategory.h" | |
| 15 | -#import "CNLiveEnvironment.h" | |
| 16 | -#import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h> | |
| 17 | -#import <CNLiveUserSystemSDK/CNLiveUserSystemTypeDef.h> | |
| 18 | -#import "CNUserInfoManager.h" | |
| 19 | -#import "CNLiveManager.h" | |
| 20 | -#import "CNLiveChooseCountryController.h" | |
| 21 | - | |
| 22 | 10 | #import "CNLiveLoginCountryView.h" |
| 23 | 11 | #import "CNLiveLoginTextField.h" |
| 24 | 12 | #import "CNLiveCountDownButton.h" |
| 25 | 13 | #import "CNLiveThreeLoginModel.h" |
| 26 | 14 | #import "CNLiveLoginRequest.h" |
| 27 | 15 | |
| 16 | +#import <YYCategories/YYCategories.h> | |
| 17 | +#import <QMUIKit/QMUIKit.h> | |
| 18 | +#import <CNLiveRequestBastKit/CNLiveNetworking.h> | |
| 19 | +#import <CNLiveCategory/CNLiveCategory.h> | |
| 20 | +#import <CNLiveEnvironment/CNLiveEnvironment.h> | |
| 21 | +#import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h> | |
| 22 | +#import <CNLiveUserSystemSDK/CNLiveUserSystemTypeDef.h> | |
| 23 | +#import <CNLiveUserManagement/CNUserInfoManager.h> | |
| 24 | +#import <CNLiveManager/CNLiveManager.h> | |
| 25 | +#import <CNLiveChooseCountry/CNLiveChooseCountryController.h> | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 28 | 29 | @interface CNLiveBindingTelView()<UITextFieldDelegate,CNLiveCountDownButtonDataSource, CNLiveCountDownButtonDelegate,ChooseCountriesDelegate> |
| 29 | 30 | { |
| 30 | 31 | NSString *_countryName; // 国家name | ... | ... |
CNLiveBLoginModule/Classes/ThreeLogin/CNLiveThreeLoginRequest.m
| ... | ... | @@ -9,7 +9,7 @@ |
| 9 | 9 | #import "CNLiveThreeLoginRequest.h" |
| 10 | 10 | #import <CNLiveRequestBastKit/CNLiveNetworking.h> |
| 11 | 11 | #import "CNLiveThreeLoginModel.h" |
| 12 | -#import "CNLiveShareImageManager.h" | |
| 12 | +#import <CNLiveShareToolKit/CNLiveShareImageManager.h> | |
| 13 | 13 | |
| 14 | 14 | @implementation CNLiveThreeLoginRequest |
| 15 | 15 | ... | ... |
CNLiveBLoginModule/Classes/ThreeLogin/CNLiveThreeLoginView.h
CNLiveBLoginModule/Classes/ThreeLogin/CNLiveThreeLoginView.m
| ... | ... | @@ -7,10 +7,10 @@ |
| 7 | 7 | // |
| 8 | 8 | |
| 9 | 9 | #import "CNLiveThreeLoginView.h" |
| 10 | -#import "YYKit.h" | |
| 11 | -#import "CNLiveCategory.h" | |
| 12 | -#import "CNLiveShareImageManager.h" | |
| 13 | -#import "WXApi.h" | |
| 10 | +#import <YYCategories/YYCategories.h> | |
| 11 | +#import <CNLiveCategory/CNLiveCategory.h> | |
| 12 | +#import <CNLiveShareToolKit/CNLiveShareImageManager.h> | |
| 13 | +#import <WechatOpenSDK/WXApi.h> | |
| 14 | 14 | #import <AuthenticationServices/AuthenticationServices.h> |
| 15 | 15 | |
| 16 | 16 | @interface CNLiveThreeLoginView() | ... | ... |
CNLiveBLoginModule/Classes/View/CNLiveCompleteInfoView.m
| ... | ... | @@ -8,24 +8,23 @@ |
| 8 | 8 | |
| 9 | 9 | #import "CNLiveCompleteInfoView.h" |
| 10 | 10 | #import "CNLiveLoginTextField.h" |
| 11 | -#import "YYKit.h" | |
| 12 | -#import "QMUIKit.h" | |
| 11 | +#import "CNLiveLoginRequest.h" | |
| 13 | 12 | |
| 13 | +#import <YYCategories/YYCategories.h> | |
| 14 | +#import <QMUIKit/QMUIKit.h> | |
| 14 | 15 | #import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h> |
| 15 | 16 | #import <CNLiveUserSystemSDK/CNLiveUserSystemTypeDef.h> |
| 16 | -#import "CNUserInfoManager.h" | |
| 17 | -#import "CNLiveEnvironment.h" | |
| 18 | -#import "CNLiveManager.h" | |
| 17 | +#import <CNLiveUserManagement/CNUserInfoManager.h> | |
| 18 | +#import <CNLiveEnvironment/CNLiveEnvironment.h> | |
| 19 | +#import <CNLiveManager/CNLiveManager.h> | |
| 19 | 20 | #import <AVFoundation/AVCaptureDevice.h> |
| 20 | 21 | #import <AVFoundation/AVMediaFormat.h> |
| 21 | -#import "XFCameraController.h" | |
| 22 | -#import "TZImagePickerController.h" | |
| 23 | - | |
| 24 | -#import "TIMAdapter.h" | |
| 25 | -#import "CommonLibrary.h" | |
| 26 | -#import "CNLiveCategory.h" | |
| 22 | +#import <CNLiveAVCamera/XFCameraController.h> | |
| 23 | +#import <CNLiveImagePickerController/TZImagePickerController.h> | |
| 24 | +#import <CNLiveIMBaseSDK/TIMAdapter.h> | |
| 25 | +#import <CNLiveIMBaseSDK/CommonLibrary.h> | |
| 26 | +#import <CNLiveCategory/CNLiveCategory.h> | |
| 27 | 27 | |
| 28 | -#import "CNLiveLoginRequest.h" | |
| 29 | 28 | |
| 30 | 29 | @interface CNLiveCompleteInfoView()<UITextFieldDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate,QMUIAlertControllerDelegate>{ |
| 31 | 30 | UIImage *_image; | ... | ... |
CNLiveBLoginModule/Classes/View/CNLiveLoginCountryView.m
| ... | ... | @@ -7,10 +7,10 @@ |
| 7 | 7 | // |
| 8 | 8 | |
| 9 | 9 | #import "CNLiveLoginCountryView.h" |
| 10 | -#import "YYKit.h" | |
| 11 | -#import "CNLiveCategory.h" | |
| 10 | +#import <YYCategories/YYCategories.h> | |
| 11 | +#import <CNLiveCategory/CNLiveCategory.h> | |
| 12 | 12 | |
| 13 | -#import "CNLiveChooseCountryController.h" | |
| 13 | +#import <CNLiveChooseCountry/CNLiveChooseCountryController.h> | |
| 14 | 14 | |
| 15 | 15 | @interface CNLiveLoginCountryView()<ChooseCountriesDelegate> |
| 16 | 16 | { | ... | ... |
CNLiveBLoginModule/Classes/View/CNLiveLoginView.m
| ... | ... | @@ -7,23 +7,20 @@ |
| 7 | 7 | // |
| 8 | 8 | |
| 9 | 9 | #import "CNLiveLoginView.h" |
| 10 | - | |
| 11 | -#import "YYKit.h" | |
| 12 | -#import "QMUIKit.h" | |
| 13 | - | |
| 14 | -#import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h> | |
| 15 | -#import <CNLiveUserSystemSDK/CNLiveUserSystemTypeDef.h> | |
| 16 | -#import "CNUserInfoManager.h" | |
| 17 | -#import "CNLiveEnvironment.h" | |
| 18 | -#import "CNLiveCategory.h" | |
| 19 | -#import "TIMAdapter.h" | |
| 20 | -#import "CommonLibrary.h" | |
| 21 | - | |
| 22 | 10 | #import "CNLiveLoginRequest.h" |
| 23 | - | |
| 24 | 11 | #import "CNLiveLoginCountryView.h" |
| 25 | 12 | #import "CNLiveLoginTextField.h" |
| 26 | -#import "CNLiveCountDownButton.h" | |
| 13 | + | |
| 14 | +#import <YYCategories/YYCategories.h> | |
| 15 | +#import <QMUIKit/QMUIKit.h> | |
| 16 | +#import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h> | |
| 17 | +#import <CNLiveUserSystemSDK/CNLiveUserSystemTypeDef.h> | |
| 18 | +#import <CNLiveUserManagement/CNUserInfoManager.h> | |
| 19 | +#import <CNLiveEnvironment/CNLiveEnvironment.h> | |
| 20 | +#import <CNLiveCategory/CNLiveCategory.h> | |
| 21 | +#import <CNLiveIMBaseSDK/TIMAdapter.h> | |
| 22 | +#import <CNLiveIMBaseSDK/CommonLibrary.h> | |
| 23 | +#import <CNLiveCustomControl/CNLiveCountDownButton.h> | |
| 27 | 24 | //#import "XWLoginNotification.h" |
| 28 | 25 | |
| 29 | 26 | @interface CNLiveLoginView()<UITextFieldDelegate, CNLiveLoginCountryViewDelegate,CNLiveCountDownButtonDataSource, CNLiveCountDownButtonDelegate> | ... | ... |
Example/CNLiveBLoginModule.xcodeproj/project.pbxproj
| ... | ... | @@ -207,8 +207,8 @@ |
| 207 | 207 | 6003F586195388D20070C39A /* Sources */, |
| 208 | 208 | 6003F587195388D20070C39A /* Frameworks */, |
| 209 | 209 | 6003F588195388D20070C39A /* Resources */, |
| 210 | - 2E5915800A90F4298D3AF712 /* [CP] Embed Pods Frameworks */, | |
| 211 | 210 | 6992D685011842652A7384DF /* [CP] Copy Pods Resources */, |
| 211 | + 5849B81EF8894AEDB11B6FF8 /* [CP] Embed Pods Frameworks */, | |
| 212 | 212 | ); |
| 213 | 213 | buildRules = ( |
| 214 | 214 | ); |
| ... | ... | @@ -299,7 +299,7 @@ |
| 299 | 299 | /* End PBXResourcesBuildPhase section */ |
| 300 | 300 | |
| 301 | 301 | /* Begin PBXShellScriptBuildPhase section */ |
| 302 | - 2E5915800A90F4298D3AF712 /* [CP] Embed Pods Frameworks */ = { | |
| 302 | + 5849B81EF8894AEDB11B6FF8 /* [CP] Embed Pods Frameworks */ = { | |
| 303 | 303 | isa = PBXShellScriptBuildPhase; |
| 304 | 304 | buildActionMask = 2147483647; |
| 305 | 305 | files = ( |
| ... | ... | @@ -321,6 +321,7 @@ |
| 321 | 321 | "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", |
| 322 | 322 | "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", |
| 323 | 323 | "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework", |
| 324 | + "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework", | |
| 324 | 325 | "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", |
| 325 | 326 | "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework", |
| 326 | 327 | "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework", |
| ... | ... | @@ -335,7 +336,14 @@ |
| 335 | 336 | "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", |
| 336 | 337 | "${PODS_ROOT}/TXIMSDK_iOS/ImSDK.framework", |
| 337 | 338 | "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", |
| 338 | - "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework", | |
| 339 | + "${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework", | |
| 340 | + "${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework", | |
| 341 | + "${BUILT_PRODUCTS_DIR}/YYCategories/YYCategories.framework", | |
| 342 | + "${BUILT_PRODUCTS_DIR}/YYDispatchQueuePool/YYDispatchQueuePool.framework", | |
| 343 | + "${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework", | |
| 344 | + "${BUILT_PRODUCTS_DIR}/YYModel/YYModel.framework", | |
| 345 | + "${BUILT_PRODUCTS_DIR}/YYText/YYText.framework", | |
| 346 | + "${BUILT_PRODUCTS_DIR}/YYWebImage/YYWebImage.framework", | |
| 339 | 347 | ); |
| 340 | 348 | name = "[CP] Embed Pods Frameworks"; |
| 341 | 349 | outputPaths = ( |
| ... | ... | @@ -354,6 +362,7 @@ |
| 354 | 362 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", |
| 355 | 363 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", |
| 356 | 364 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework", |
| 365 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework", | |
| 357 | 366 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", |
| 358 | 367 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework", |
| 359 | 368 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework", |
| ... | ... | @@ -368,7 +377,14 @@ |
| 368 | 377 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", |
| 369 | 378 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ImSDK.framework", |
| 370 | 379 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", |
| 371 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework", | |
| 380 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework", | |
| 381 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework", | |
| 382 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework", | |
| 383 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYDispatchQueuePool.framework", | |
| 384 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework", | |
| 385 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYModel.framework", | |
| 386 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework", | |
| 387 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYWebImage.framework", | |
| 372 | 388 | ); |
| 373 | 389 | runOnlyForDeploymentPostprocessing = 0; |
| 374 | 390 | shellPath = /bin/sh; | ... | ... |
README.md
| ... | ... | @@ -27,3 +27,7 @@ iOS-Xiaowen, 153993236@qq.com |
| 27 | 27 | ## License |
| 28 | 28 | |
| 29 | 29 | CNLiveBLoginModule is available under the MIT license. See the LICENSE file for more info. |
| 30 | + | |
| 31 | +## 推送 | |
| 32 | +pod repo push CNLiveRepos CNLiveBLoginModule.podspec --verbose --use-libraries --skip-import-validation --allow-warnings | |
| 33 | + | ... | ... |