no message

iOS-Xiaowen
1 parent ebf7fa10
Showing 67 changed files with 11 additions and 480 deletions
CNLiveBLoginModule.podspec
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_apple.imageset/login_apple@2x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_apple@2x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_apple.imageset/login_apple@3x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_apple@3x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_apple_icon.imageset/login_apple_icon@2x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_apple_icon@2x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_apple_icon.imageset/login_apple_icon@3x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_apple_icon@3x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_apple.imageset/login_binding_apple@2x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_binding_apple@2x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_apple.imageset/login_binding_apple@3x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_binding_apple@3x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_logo.imageset/login_binding_logo@2x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_binding_logo@2x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_logo.imageset/login_binding_logo@3x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_binding_logo@3x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_qq.imageset/login_binding_qq@2x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_binding_qq@2x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_qq.imageset/login_binding_qq@3x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_binding_qq@3x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_ways.imageset/login_binding_ways@2x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_binding_ways@2x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_ways.imageset/login_binding_ways@3x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_binding_ways@3x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_wechat.imageset/login_binding_wechat@2x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_binding_wechat@2x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_wechat.imageset/login_binding_wechat@3x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_binding_wechat@3x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_weibo.imageset/login_binding_weibo@2x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_binding_weibo@2x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_weibo.imageset/login_binding_weibo@3x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_binding_weibo@3x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_camera.imageset/login_camera@2x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_camera@2x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_camera.imageset/login_camera@3x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_camera@3x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_close.imageset/login_close@2x.png → CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle/login_close@2x.png
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveBLoginModule'
-  s.version          = '0.0.1'
+  s.version          = '0.0.2'
   s.summary          = 'CNLiveBLoginModule.'
 # This description is used to generate tags and improve search results.
@@ -63,7 +63,7 @@ TODO: 网家家-登录模块.
   end
   s.resource_bundles = {
-    'CNLiveBLoginModule' => ['CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets']
+     'CNLiveBLoginModule' => ['CNLiveBLoginModule/Assets/CNLiveBLoginModule.bundle']
   }
 #  s.public_header_files = 'CNLiveBLoginModule/Classes/**/*.h'
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
 \ No newline at end of file
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "login_apple@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "login_apple@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_apple_icon@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_apple_icon@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
 \ No newline at end of file
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "login_binding_apple@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "login_binding_apple@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "login_binding_logo@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "login_binding_logo@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "login_binding_qq@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "login_binding_qq@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "login_binding_ways@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "login_binding_ways@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "login_binding_wechat@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "login_binding_wechat@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "login_binding_weibo@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "login_binding_weibo@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_camera@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_camera@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
 \ No newline at end of file
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_close@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_close@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
 \ No newline at end of file
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_country@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_country@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
 \ No newline at end of file
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "login_down@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "login_down@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_get_code@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_get_code@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
 \ No newline at end of file
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "login_get_code_b@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "login_get_code_b@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_logo@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_logo@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
 \ No newline at end of file
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "login_logo_b@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "login_logo_b@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_qq@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_qq@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
 \ No newline at end of file
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_sel@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_sel@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
 \ No newline at end of file
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_wechat@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_wechat@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
 \ No newline at end of file
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_weibo@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_weibo@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
 \ No newline at end of file
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "mine_back_black_b@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "mine_back_black_b@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
 \ No newline at end of file
@@ -459,10 +459,11 @@ static const NSInteger timeValue = 1.5;
     button.userInteractionEnabled = NO;
     [QMUITips showLoadingInView:XWKeyWindow];
-    [CNLiveUserSystemCenter verificationCodeType:VerificationCodeTypeShortcutLogin mobile:_telTF.text countryCode:@"86" success:^(id result) {
+    [CNLiveUserSystemCenter verificationCodeType:VerificationCodeTypeShortcutLogin mobile:_telTF.text countryCode:_countryCode success:^(id result) {
         [QMUITips hideAllToastInView:XWKeyWindow animated:YES];
         [QMUITips showWithText:@"验证码已发送"];
-        button.frame = CGRectMake(self.frame.size.width-110-2*space, self.telTF.bottom+space+10, 110, rowHeight-10);
+        button.frame = CGRectMake(self.frame.size.width-120-3.5*space, self.codeTF.top+space/2.0, 120, self.telTF.height-space);
+
         [button setImage:nil forState:UIControlStateNormal];
         NSString *title = [NSString stringWithFormat:@"%d秒后重新发送", 60];
         [button setTitle:title forState:UIControlStateNormal];
@@ -485,8 +486,8 @@ static const NSInteger timeValue = 1.5;
 // 倒计时进行中
 - (void)countDownButtonDidCountDown:(CNLiveCountDownButton *)button countDownNum:(NSInteger)countDownNum {
-    if(button.frame.size.width != 110){
-        button.frame = CGRectMake(self.frame.size.width-110, self.telTF.bottom+space+10, 110, rowHeight-10);
+    if(button.frame.size.width != 120){
+        button.frame = CGRectMake(self.frame.size.width-120-3.5*space, self.codeTF.top+space/2.0, 120, self.telTF.height-space);
     }
     NSString *title = [NSString stringWithFormat:@"%ld秒后重新发送", countDownNum];
     [button setTitle:title forState:UIControlStateNormal];
@@ -495,12 +496,10 @@ static const NSInteger timeValue = 1.5;
 // 倒计时结束
 - (void)countDownButtonDidEndCountDown:(CNLiveCountDownButton *)button {
-    button.frame = CGRectMake(self.frame.size.width-80, self.telTF.bottom+space+10, 80, rowHeight-10);
+    button.frame = CGRectMake(self.frame.size.width-80-3.5*space, self.codeTF.top+space/2.0, 80, self.telTF.height-space);
     button.backgroundColor = [UIColor whiteColor];
     button.userInteractionEnabled = YES;
-    [button setTitle:@"" forState:UIControlStateNormal];
-    UIImage *image2 = [self getImageWithImageName:BusinessLive?@"login_get_code_b":@"login_get_code" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
-    [button setImage:image2 forState:UIControlStateNormal];
+    [button setTitle:@"获取验证码" forState:UIControlStateNormal];
 }
 #pragma mark - Action
@@ -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:BusinessLive?@"login_logo_b":@"login_logo" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+    UIImage *image = [self getImageWithImageName:@"login_logo_b" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
     logo.image = image;
     [self addSubview:logo];
     self.logo = logo;
@@ -124,7 +124,7 @@ static const NSInteger timeValue = 1.5;
     UIButton *login = [UIButton buttonWithType:UIButtonTypeCustom];
     login.frame = CGRectMake(5, tips.bottom+space, frame.size.width-10, rowHeight);
-    [login setTitle:@"登录" forState:UIControlStateNormal];
+    [login setTitle:@"手机号登录" forState:UIControlStateNormal];
     [login setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     login.titleLabel.font = [UIFont systemFontOfSize:15.0];
     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];