no message

iOS-Xiaowen
1 parent 6856ae60
Showing 7 changed files with 44 additions and 44 deletions
CNLiveBLoginModule/Classes/Controller/CNLiveLoginController.m
CNLiveBLoginModule/Classes/ThreeLogin/CNLiveBindingTelView.m
CNLiveBLoginModule/Classes/ThreeLogin/CNLiveThreeLoginView.m
CNLiveBLoginModule/Classes/View/CNLiveCompleteInfoView.m
CNLiveBLoginModule/Classes/View/CNLiveLoginCountryView.m
CNLiveBLoginModule/Classes/View/CNLiveLoginView.m
Example/CNLiveBLoginModule.xcodeproj/project.pbxproj
@@ -285,7 +285,7 @@
         _close = [UIButton buttonWithType:UIButtonTypeCustom];
         _close.frame = CGRectMake(SCREEN_WIDTH-NavigationBarHeight-10, StatusBarHeight, NavigationBarHeight, NavigationBarHeight);
         _close.hidden = !self.isShowClose;
-        UIImage *image = [self getImageWithImageName:@"login_close" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+        UIImage *image = [self getImageWithImageName:@"CNLiveBLoginModule.bundle/login_close" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
         [_close setImage:image forState:UIControlStateNormal];
         [_close addTarget:self action:@selector(closeDidSelected:) forControlEvents:UIControlEventTouchUpInside];
         _close.adjustsImageWhenHighlighted = NO;
@@ -85,7 +85,7 @@ static const NSInteger timeValue = 1.5;
     switch (type) {
         case CNLiveSendAuthRespWX:
         {
-            UIImage *image = [self getImageWithImageName:@"login_binding_wechat" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+            UIImage *image = [self getImageWithImageName:@"CNLiveBLoginModule.bundle/login_binding_wechat" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
             [self.three setImage:image forState:UIControlStateNormal];
             [self.three setTitle:@"微信" forState:UIControlStateNormal];
             self.desc.text = @"确定后,此微信账号将与网家家账号绑定";
@@ -93,7 +93,7 @@ static const NSInteger timeValue = 1.5;
             break;
         case CNLiveSendAuthRespQQ:
         {
-            UIImage *image = [self getImageWithImageName:@"login_binding_qq" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+            UIImage *image = [self getImageWithImageName:@"CNLiveBLoginModule.bundle/login_binding_qq" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
             [self.three setImage:image forState:UIControlStateNormal];
             [self.three setTitle:@"QQ" forState:UIControlStateNormal];
             self.desc.text = @"确定后,此QQ账号将与网家家账号绑定";
@@ -101,7 +101,7 @@ static const NSInteger timeValue = 1.5;
             break;
         case CNLiveSendAuthRespWB:
         {
-            UIImage *image = [self getImageWithImageName:@"login_binding_weibo" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+            UIImage *image = [self getImageWithImageName:@"CNLiveBLoginModule.bundle/login_binding_weibo" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
             [self.three setImage:image forState:UIControlStateNormal];
             [self.three setTitle:@"微博" forState:UIControlStateNormal];
             self.desc.text = @"确定后,此微博账号将与网家家账号绑定";
@@ -109,7 +109,7 @@ static const NSInteger timeValue = 1.5;
             break;
         case CNLiveSendAuthRespApple:
         {
-            UIImage *image = [self getImageWithImageName:@"login_binding_apple" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+            UIImage *image = [self getImageWithImageName:@"CNLiveBLoginModule.bundle/login_binding_apple" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
             [self.three setImage:image forState:UIControlStateNormal];
             [self.three setTitle:@"苹果" forState:UIControlStateNormal];
             self.desc.text = @"确定后,此苹果账号将与网家家账号绑定";
@@ -132,7 +132,7 @@ static const NSInteger timeValue = 1.5;
     QMUIButton *three = [QMUIButton buttonWithType:UIButtonTypeCustom];
     three.frame = CGRectMake(btnLeft, btnTop, btnWidth, btnHeight);
-    [three setImage:[self getImageWithImageName:@"login_binding_logo" bundleName:@"CNLiveBLoginModule" targetClass:[self class]] forState:UIControlStateNormal];
+    [three setImage:[self getImageWithImageName:@"CNLiveBLoginModule.bundle/login_binding_logo" bundleName:@"CNLiveBLoginModule" targetClass:[self class]] forState:UIControlStateNormal];
     three.imagePosition = QMUIButtonImagePositionTop;
     three.spacingBetweenImageAndTitle = 10;
     [three setTitleColor:[UIColor colorWithRed:102/255.0 green:102/255.0 blue:102/255.0 alpha:1.0]  forState:UIControlStateNormal];
@@ -143,7 +143,7 @@ static const NSInteger timeValue = 1.5;
     self.three = three;
     UIImageView *bindingImage = [[UIImageView alloc]initWithFrame:CGRectMake(three.right, three.top, three.width,  three.height)];
-    UIImage *image1 = [self getImageWithImageName:@"login_binding_ways" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+    UIImage *image1 = [self getImageWithImageName:@"CNLiveBLoginModule.bundle/login_binding_ways" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
     bindingImage.image = image1;
     bindingImage.contentMode = UIViewContentModeCenter;
     [self addSubview:bindingImage];
@@ -151,7 +151,7 @@ static const NSInteger timeValue = 1.5;
     QMUIButton *netadd = [QMUIButton buttonWithType:UIButtonTypeCustom];
     netadd.frame = CGRectMake(bindingImage.right, three.top, three.width, three.height);
-    [netadd setImage:[self getImageWithImageName:@"login_binding_logo" bundleName:@"CNLiveBLoginModule" targetClass:[self class]] forState:UIControlStateNormal];
+    [netadd setImage:[self getImageWithImageName:@"CNLiveBLoginModule.bundle/login_binding_logo" bundleName:@"CNLiveBLoginModule" targetClass:[self class]] forState:UIControlStateNormal];
     [netadd setTitle:@"网家家企业版" forState:UIControlStateNormal];
     [netadd setTitleColor:[UIColor colorWithRed:102/255.0 green:102/255.0 blue:102/255.0 alpha:1.0]  forState:UIControlStateNormal];
     netadd.titleLabel.font = [UIFont systemFontOfSize:13];
@@ -380,7 +380,7 @@ static const NSInteger timeValue = 1.5;
         [_code setTitle:[NSString stringWithFormat:@"+%@",_countryCode] forState:UIControlStateNormal];
         [_code setTitleColor:[UIColor colorWithRed:49/255.0 green:49/255.0 blue:49/255.0 alpha:1.0] forState:UIControlStateNormal];
         _code.titleLabel.font = [UIFont systemFontOfSize:16.0];
-        [_code setImage:[self getImageWithImageName:@"login_down" bundleName:@"CNLiveBLoginModule" targetClass:[self class]] forState:UIControlStateNormal];
+        [_code setImage:[self getImageWithImageName:@"CNLiveBLoginModule.bundle/login_down" bundleName:@"CNLiveBLoginModule" targetClass:[self class]] forState:UIControlStateNormal];
         _code.adjustsImageWhenHighlighted = NO;
         //button图片的偏移量，距上左下右分别(0, 0, 0, 0)像素点
         _code.imageEdgeInsets = UIEdgeInsetsMake(0, 60, 0, 0);
@@ -47,20 +47,20 @@ static NSInteger const rowHeight = 60;
     rightLine.backgroundColor = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
     [self addSubview:rightLine];
-    NSMutableArray *pics = [NSMutableArray arrayWithArray:@[@"login_qq",@"login_weibo"]];
+    NSMutableArray *pics = [NSMutableArray arrayWithArray:@[@"CNLiveBLoginModule.bundle/login_qq",@"CNLiveBLoginModule.bundle/login_weibo"]];
     if([WXApi isWXAppInstalled]||[[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"wechat://"]]){
-        [pics insertObject:@"login_wechat" atIndex:0];
+        [pics insertObject:@"CNLiveBLoginModule.bundle/login_wechat" atIndex:0];
     }
     NSUInteger number = pics.count;
     if (@available(iOS 13, *)) {
-        [pics addObject:@"login_apple"];
+        [pics addObject:@"CNLiveBLoginModule.bundle/login_apple"];
         number = pics.count + 1;
     }
     CGFloat btnWidth = width/number*1.0;
     for(int i = 0; i < pics.count; i++){
         // 苹果登录在最后一个
-        if (pics.count-1 == i && [pics[pics.count-1] isEqualToString:@"login_apple"]) {
+        if (pics.count-1 == i && [pics[pics.count-1] isEqualToString:@"CNLiveBLoginModule.bundle/login_apple"]) {
             if (@available(iOS 13, *)) {
                 ASAuthorizationAppleIDButton *btn = [ASAuthorizationAppleIDButton buttonWithType:ASAuthorizationAppleIDButtonTypeDefault style:ASAuthorizationAppleIDButtonStyleWhite];
                 btn.tag = 10000+i;
@@ -61,7 +61,7 @@ static const NSInteger timeValue = 1.5;
     head.layer.cornerRadius = 40;
     head.layer.masksToBounds = YES;
     head.adjustsImageWhenHighlighted = NO;
-    UIImage *image = [self getImageWithImageName:@"login_camera" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+    UIImage *image = [self getImageWithImageName:@"CNLiveBLoginModule.bundle/login_camera" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
     [head setImage:image forState:UIControlStateNormal];
     [head addTarget:self action:@selector(headDidClicked:) forControlEvents:UIControlEventTouchUpInside];
     [self addSubview:head];
@@ -47,7 +47,7 @@
     [code setTitle:[NSString stringWithFormat:@"+%@",_countryCode] forState:UIControlStateNormal];
     [code setTitleColor:[UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0] forState:UIControlStateNormal];
     code.titleLabel.font = [UIFont systemFontOfSize:14];
-    UIImage *image = [self getImageWithImageName:@"login_country" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+    UIImage *image = [self getImageWithImageName:@"CNLiveBLoginModule.bundle/login_country" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
     [code setImage:image forState:UIControlStateNormal];
     code.adjustsImageWhenHighlighted = NO;
     //button图片的偏移量，距上左下右分别(0, 0, 0, 0)像素点
@@ -64,7 +64,7 @@ static const NSInteger timeValue = 1.5;
 }
 - (void)createSubviews:(CGRect)frame{
     UIImageView *logo = [[UIImageView alloc] initWithFrame:CGRectMake((frame.size.width-75)/2.0, 0, 75, 100)];
-    UIImage *image = [self getImageWithImageName:@"login_logo_b" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+    UIImage *image = [self getImageWithImageName:@"CNLiveBLoginModule.bundle/login_logo_b" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
     logo.image = image;
     [self addSubview:logo];
     self.logo = logo;
@@ -104,7 +104,7 @@ static const NSInteger timeValue = 1.5;
     countDown.dataSource = self;
     countDown.delegate = self;
     countDown.frame = CGRectMake(frame.size.width-80, account.bottom+space+10, 80, rowHeight-10);
-    UIImage *image2 = [self getImageWithImageName:BusinessLive?@"login_get_code_b":@"login_get_code" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+    UIImage *image2 = [self getImageWithImageName:@"CNLiveBLoginModule.bundle/login_get_code_b" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
     [countDown setImage:image2 forState:UIControlStateNormal];
     countDown.adjustsImageWhenHighlighted = NO;
     [countDown setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
@@ -207,8 +207,8 @@
 				6003F586195388D20070C39A /* Sources */,
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
-				26FFD7644A068AC932045BA2 /* [CP] Embed Pods Frameworks */,
-				FC7F634D4BA3ADBEED846358 /* [CP] Copy Pods Resources */,
+				2E5915800A90F4298D3AF712 /* [CP] Embed Pods Frameworks */,
+				6992D685011842652A7384DF /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -299,7 +299,7 @@
 /* End PBXResourcesBuildPhase section */
 /* Begin PBXShellScriptBuildPhase section */
-		26FFD7644A068AC932045BA2 /* [CP] Embed Pods Frameworks */ = {
+		2E5915800A90F4298D3AF712 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -375,29 +375,31 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBLoginModule_Example/Pods-CNLiveBLoginModule_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		6F4CF912241B66B2163C0256 /* [CP] Check Pods Manifest.lock */ = {
+		6992D685011842652A7384DF /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveBLoginModule_Example/Pods-CNLiveBLoginModule_Example-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBLoginModule/CNLiveBLoginModule.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBUserAgreement/CNLiveBUserAgreement.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle",
+				"${PODS_ROOT}/WeiboSDK/libWeiboSDK/WeiboSDK.bundle",
 			);
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-CNLiveBLoginModule_Tests-checkManifestLockResult.txt",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBLoginModule.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBUserAgreement.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			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";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBLoginModule_Example/Pods-CNLiveBLoginModule_Example-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		FB82CB4346E92958307849D9 /* [CP] Check Pods Manifest.lock */ = {
+		6F4CF912241B66B2163C0256 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -412,35 +414,33 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-CNLiveBLoginModule_Example-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-CNLiveBLoginModule_Tests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			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";
 			showEnvVarsInLog = 0;
 		};
-		FC7F634D4BA3ADBEED846358 /* [CP] Copy Pods Resources */ = {
+		FB82CB4346E92958307849D9 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CNLiveBLoginModule_Example/Pods-CNLiveBLoginModule_Example-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBLoginModule/CNLiveBLoginModule.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBUserAgreement/CNLiveBUserAgreement.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle",
-				"${PODS_ROOT}/WeiboSDK/libWeiboSDK/WeiboSDK.bundle",
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
 			);
-			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBLoginModule.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBUserAgreement.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle",
+				"$(DERIVED_FILE_DIR)/Pods-CNLiveBLoginModule_Example-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBLoginModule_Example/Pods-CNLiveBLoginModule_Example-resources.sh\"\n";
+			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";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */