iOS Team / CNLiveBLoginModule · Commits

Commit 5c9a6778454f221638eeb68c560a3a6aff429b8c

Authored by iOS-Xiaowen
1 parent 81933962

no message

Inline Side-by-side
Showing 10 changed files with 44 additions and 45 deletions
CNLiveBLoginModule.podspec
  View file @5c9a677
... ... @@ -76,10 +76,9 @@ TODO: 网家家-登录模块.
76 76 s.dependency 'CNLiveTripartiteManagement/SDWebImage'
77 77 s.dependency 'CNLiveTripartiteManagement/Masonry'
78 78 s.dependency 'CNLiveTripartiteManagement/MJExtension'
79   - s.dependency 'CNLiveTripartiteManagement/AFNetworking'
80 79  
81 80 # 服务层
82   - s.dependency 'CNLiveServices'
  81 + s.dependency 'CNLiveBServices'
83 82  
84 83 # 切换成城市
85 84 s.dependency 'CNLiveChooseCountry'
... ... @@ -88,7 +87,7 @@ TODO: 网家家-登录模块.
88 87 s.dependency 'CNLiveUserManagement'
89 88  
90 89 # 环境库
91   - s.dependency 'CNLiveBEnvironment'
  90 + s.dependency 'CNLiveEnvironment'
92 91  
93 92 # 数据请求
94 93 s.dependency 'CNLiveRequestBastKit'
... ...
CNLiveBLoginModule/Classes/Controller/CNLiveLoginController.m
  View file @5c9a677
... ... @@ -70,7 +70,7 @@
70 70 text.color = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
71 71 text.font = [UIFont systemFontOfSize:14.0];
72 72 __weak typeof(self) weakSelf = self;
73   - UIColor *color = Business?[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];
  73 + 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];
74 74 [text setTextHighlightRange:NSMakeRange(11, 4) color:color backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
75 75 [weakSelf.view endEditing:YES];
76 76 [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementUser];
... ...
CNLiveBLoginModule/Classes/Module/CNLiveLoginModule.m
  View file @5c9a677
... ... @@ -7,7 +7,7 @@
7 7 //
8 8  
9 9 #import "CNLiveLoginModule.h"
10   -#import "CNLiveServices.h"
  10 +#import "CNLiveBServices.h"
11 11  
12 12 @BeeHiveMod(CNLiveLoginModule)
13 13 @interface CNLiveLoginModule()<BHModuleProtocol>
... ...
CNLiveBLoginModule/Classes/Module/CNLiveLoginService.m
  View file @5c9a677
... ... @@ -7,14 +7,14 @@
7 7 //
8 8  
9 9 #import "CNLiveLoginService.h"
10   -#import "CNLiveServices.h"
  10 +#import "CNLiveBServices.h"
11 11 #import "CNLiveManager.h"
12 12 #import "CNUserInfoManager.h"
13 13  
14 14 #import "CNLiveLoginController.h"
15 15  
16   -@BeeHiveService(CNLiveLoginServiceProtocol,CNLiveLoginService)
17   -@interface CNLiveLoginService ()<CNLiveLoginServiceProtocol>
  16 +@BeeHiveService(CNLiveBLoginServiceProtocol,CNLiveLoginService)
  17 +@interface CNLiveLoginService ()<CNLiveBLoginServiceProtocol>
18 18  
19 19 @end
20 20  
... ...
CNLiveBLoginModule/Classes/ThreeLogin/CNLiveBindingTelController.m
  View file @5c9a677
... ... @@ -110,7 +110,7 @@
110 110 text.color = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
111 111 text.font = [UIFont systemFontOfSize:14.0];
112 112 __weak typeof(self) weakSelf = self;
113   - UIColor *color = Business?[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];
  113 + 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];
114 114 [text setTextHighlightRange:NSMakeRange(7, 12) color:color backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
115 115 __strong typeof(weakSelf) strongSelf = weakSelf;
116 116 if(!strongSelf) return;
... ...
CNLiveBLoginModule/Classes/ThreeLogin/CNLiveBindingTelView.m
  View file @5c9a677
... ... @@ -86,7 +86,7 @@ static const NSInteger timeValue = 1.5;
86 86 countDown.dataSource = self;
87 87 countDown.delegate = self;
88 88 countDown.frame = CGRectMake(frame.size.width-80, account.bottom+space+10, 80, rowHeight-10);
89   - UIImage *image2 = [self getImageWithImageName:Business?@"login_get_code_b":@"login_get_code" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
  89 + UIImage *image2 = [self getImageWithImageName:BusinessLive?@"login_get_code_b":@"login_get_code" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
90 90 [countDown setImage:image2 forState:UIControlStateNormal];
91 91 countDown.adjustsImageWhenHighlighted = NO;
92 92 [countDown setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
... ... @@ -101,7 +101,7 @@ static const NSInteger timeValue = 1.5;
101 101 [binding setTitle:@"确认手机绑定并同意协议" forState:UIControlStateNormal];
102 102 [binding setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
103 103 binding.titleLabel.font = [UIFont systemFontOfSize:15.0];
104   - UIColor *color = Business?[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];
  104 + 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];
105 105 binding.backgroundColor = color;
106 106 binding.layer.cornerRadius = 20;
107 107 binding.layer.masksToBounds = YES;
... ... @@ -270,7 +270,7 @@ static const NSInteger timeValue = 1.5;
270 270 button.backgroundColor = [UIColor whiteColor];
271 271 button.userInteractionEnabled = YES;
272 272 [button setTitle:@"" forState:UIControlStateNormal];
273   - UIImage *image2 = [self getImageWithImageName:Business?@"login_get_code_b":@"login_get_code" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
  273 + UIImage *image2 = [self getImageWithImageName:BusinessLive?@"login_get_code_b":@"login_get_code" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
274 274 [button setImage:image2 forState:UIControlStateNormal];
275 275 }
276 276  
... ...
CNLiveBLoginModule/Classes/View/CNLiveCompleteInfoView.m
  View file @5c9a677
... ... @@ -89,7 +89,7 @@ static const NSInteger timeValue = 1.5;
89 89 [next setTitle:@"下一步" forState:UIControlStateNormal];
90 90 [next setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
91 91 next.titleLabel.font = [UIFont systemFontOfSize:15.0];
92   - UIColor *color = Business?[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];
  92 + 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];
93 93 next.backgroundColor = color;
94 94 next.layer.cornerRadius = 20;
95 95 next.layer.masksToBounds = YES;
... ... @@ -217,7 +217,7 @@ static const NSInteger timeValue = 1.5;
217 217 [alertController addAction:cancel];
218 218  
219 219 NSMutableDictionary *titleAttributs = [[NSMutableDictionary alloc] initWithDictionary:alertController.alertTitleAttributes];
220   - UIColor *color = Business?[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];
  220 + 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];
221 221  
222 222 titleAttributs[NSForegroundColorAttributeName] = color;
223 223  
... ...
CNLiveBLoginModule/Classes/View/CNLiveLoginView.m
  View file @5c9a677
... ... @@ -63,7 +63,7 @@ static const NSInteger timeValue = 1.5;
63 63 }
64 64 - (void)createSubviews:(CGRect)frame{
65 65 UIImageView *logo = [[UIImageView alloc] initWithFrame:CGRectMake((frame.size.width-75)/2.0, 0, 75, 100)];
66   - UIImage *image = [self getImageWithImageName:Business?@"login_logo_b":@"login_logo" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
  66 + UIImage *image = [self getImageWithImageName:BusinessLive?@"login_logo_b":@"login_logo" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
67 67 logo.image = image;
68 68 [self addSubview:logo];
69 69 self.logo = logo;
... ... @@ -103,7 +103,7 @@ static const NSInteger timeValue = 1.5;
103 103 countDown.dataSource = self;
104 104 countDown.delegate = self;
105 105 countDown.frame = CGRectMake(frame.size.width-80, account.bottom+space+10, 80, rowHeight-10);
106   - UIImage *image2 = [self getImageWithImageName:Business?@"login_get_code_b":@"login_get_code" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
  106 + UIImage *image2 = [self getImageWithImageName:BusinessLive?@"login_get_code_b":@"login_get_code" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
107 107 [countDown setImage:image2 forState:UIControlStateNormal];
108 108 countDown.adjustsImageWhenHighlighted = NO;
109 109 [countDown setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
... ... @@ -126,7 +126,7 @@ static const NSInteger timeValue = 1.5;
126 126 [login setTitle:@"登录" forState:UIControlStateNormal];
127 127 [login setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
128 128 login.titleLabel.font = [UIFont systemFontOfSize:15.0];
129   - UIColor *color = Business?[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];
  129 + 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];
130 130 login.backgroundColor = color;
131 131 login.layer.cornerRadius = 20;
132 132 login.layer.masksToBounds = YES;
... ... @@ -297,7 +297,7 @@ static const NSInteger timeValue = 1.5;
297 297 button.backgroundColor = [UIColor whiteColor];
298 298 button.userInteractionEnabled = YES;
299 299 [button setTitle:@"" forState:UIControlStateNormal];
300   - UIImage *image2 = [self getImageWithImageName:Business?@"login_get_code_b":@"login_get_code" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
  300 + UIImage *image2 = [self getImageWithImageName:BusinessLive?@"login_get_code_b":@"login_get_code" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
301 301 [button setImage:image2 forState:UIControlStateNormal];
302 302 }
303 303  
... ...
Example/CNLiveBLoginModule.xcodeproj/project.pbxproj
  View file @5c9a677
... ... @@ -207,8 +207,8 @@
207 207 6003F586195388D20070C39A /* Sources */,
208 208 6003F587195388D20070C39A /* Frameworks */,
209 209 6003F588195388D20070C39A /* Resources */,
210   - 819DA7EE2304C4CDBD93DEFD /* [CP] Embed Pods Frameworks */,
211   - D7ABAB38E741C83F2E6FB9FB /* [CP] Copy Pods Resources */,
  210 + 6DE48B687881AC75FFE10CB9 /* [CP] Embed Pods Frameworks */,
  211 + B688F4F999BBBA851A562A04 /* [CP] Copy Pods Resources */,
212 212 );
213 213 buildRules = (
214 214 );
... ... @@ -299,29 +299,7 @@
299 299 /* End PBXResourcesBuildPhase section */
300 300  
301 301 /* Begin PBXShellScriptBuildPhase section */
302   - 6F4CF912241B66B2163C0256 /* [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-CNLiveBLoginModule_Tests-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   - 819DA7EE2304C4CDBD93DEFD /* [CP] Embed Pods Frameworks */ = {
  302 + 6DE48B687881AC75FFE10CB9 /* [CP] Embed Pods Frameworks */ = {
325 303 isa = PBXShellScriptBuildPhase;
326 304 buildActionMask = 2147483647;
327 305 files = (
... ... @@ -399,7 +377,29 @@
399 377 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBLoginModule_Example/Pods-CNLiveBLoginModule_Example-frameworks.sh\"\n";
400 378 showEnvVarsInLog = 0;
401 379 };
402   - D7ABAB38E741C83F2E6FB9FB /* [CP] Copy Pods Resources */ = {
  380 + 6F4CF912241B66B2163C0256 /* [CP] Check Pods Manifest.lock */ = {
  381 + isa = PBXShellScriptBuildPhase;
  382 + buildActionMask = 2147483647;
  383 + files = (
  384 + );
  385 + inputFileListPaths = (
  386 + );
  387 + inputPaths = (
  388 + "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
  389 + "${PODS_ROOT}/Manifest.lock",
  390 + );
  391 + name = "[CP] Check Pods Manifest.lock";
  392 + outputFileListPaths = (
  393 + );
  394 + outputPaths = (
  395 + "$(DERIVED_FILE_DIR)/Pods-CNLiveBLoginModule_Tests-checkManifestLockResult.txt",
  396 + );
  397 + runOnlyForDeploymentPostprocessing = 0;
  398 + shellPath = /bin/sh;
  399 + 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";
  400 + showEnvVarsInLog = 0;
  401 + };
  402 + B688F4F999BBBA851A562A04 /* [CP] Copy Pods Resources */ = {
403 403 isa = PBXShellScriptBuildPhase;
404 404 buildActionMask = 2147483647;
405 405 files = (
... ...
Example/CNLiveBLoginModule/CNLIVEAppDelegate.m
  View file @5c9a677
... ... @@ -19,7 +19,7 @@
19 19 {
20 20 // Override point for customization after application launch.
21 21 self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];//UIScreen mainScreen].bounds个人理解获取屏幕的硬件信息然后设置尺寸大小
22   - [CNLiveEnvironmentManager setAppType:CNLiveAppTypeBusiness environmentType:CNLiveProductionAppStore];
  22 + [CNLiveEnvironmentManager setAppType:CNLiveAppTypeBLive environmentType:CNLiveProductionAppStore];
23 23 [CNLiveUserSystemCenter setAppId:AppId appKey:APPKey appSecret:AppSecret isTestEnvironment:TestEnvironment];
24 24  
25 25 if ([CNUserShareManager isLogin]) {
... ...