no message

朱林
1 parent 9c211396
Showing 21 changed files with 531 additions and 118 deletions
CNLiveUserSystemDemo.xcodeproj/project.pbxproj
CNLiveUserSystemDemo.xcodeproj/project.xcworkspace/xcuserdata/iOS.xcuserdatad/UserInterfaceState.xcuserstate
CNLiveUserSystemDemo.xcodeproj/xcuserdata/iOS.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserInfo.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserInfo.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserSystemCenter.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserSystemCenter.m
CNLiveUserSystemDemo/Conreollers/LoginViewController.m
CNLiveUserSystemDemo/Conreollers/RegisterViewController.m
CNLiveUserSystemDemo/Conreollers/ViewController.m
CNLiveUserSystemDemo/Tools/CNLiveThirdLoginManager.h
CNLiveUserSystemDemo/Tools/CNLiveThirdLoginManager.m
CNLiveUserSystemDemo/Views/ThirdPartyView.h
CNLiveUserSystemDemo/Views/ThirdPartyView.m
CNLiveUserSystemDemo/cancel.png
CNLiveUserSystemSDK.xcodeproj/project.xcworkspace/xcuserdata/iOS.xcuserdatad/UserInterfaceState.xcuserstate
CNLiveUserSystemSDK/Info.plist
Products/CNLiveUserSystemSDK.framework/CNLiveUserSystemSDK
Products/CNLiveUserSystemSDK.framework/Headers/CNLiveUserSystemCenter.h
Products/CNLiveUserSystemSDK.framework/Info.plist
@@ -61,6 +61,8 @@
 		812642DF1D86A7A800B402CA /* CNLiveUserSystemDemoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 812642DE1D86A7A800B402CA /* CNLiveUserSystemDemoTests.m */; };
 		812642EA1D86A7A800B402CA /* CNLiveUserSystemDemoUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 812642E91D86A7A800B402CA /* CNLiveUserSystemDemoUITests.m */; };
 		812642FA1D86A83100B402CA /* CNLiveUserSystemCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 812642F91D86A83100B402CA /* CNLiveUserSystemCenter.m */; };
+		81661FCA1DDEA9C300E3C65A /* ThirdPartyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 81661FC91DDEA9C300E3C65A /* ThirdPartyView.m */; };
+		81661FCC1DDED9DD00E3C65A /* cancel.png in Resources */ = {isa = PBXBuildFile; fileRef = 81661FCB1DDED9DD00E3C65A /* cancel.png */; };
 		817C6EC31D90D60E0016F211 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 817C6EC21D90D60E0016F211 /* ImageIO.framework */; };
 		8187A8EF1D8E6394007FAFB6 /* Tools.m in Sources */ = {isa = PBXBuildFile; fileRef = 8187A8EE1D8E6394007FAFB6 /* Tools.m */; };
 		8187A8F61D8E6486007FAFB6 /* NSObject+UserModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8187A8F11D8E6486007FAFB6 /* NSObject+UserModel.m */; };
@@ -206,6 +208,9 @@
 		812642F81D86A83100B402CA /* CNLiveUserSystemCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveUserSystemCenter.h; sourceTree = "<group>"; };
 		812642F91D86A83100B402CA /* CNLiveUserSystemCenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveUserSystemCenter.m; sourceTree = "<group>"; };
 		812642FB1D86AFE600B402CA /* CNLiveUserSystemTypeDef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveUserSystemTypeDef.h; sourceTree = "<group>"; };
+		81661FC81DDEA9C300E3C65A /* ThirdPartyView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThirdPartyView.h; sourceTree = "<group>"; };
+		81661FC91DDEA9C300E3C65A /* ThirdPartyView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThirdPartyView.m; sourceTree = "<group>"; };
+		81661FCB1DDED9DD00E3C65A /* cancel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cancel.png; sourceTree = "<group>"; };
 		817C6EC21D90D60E0016F211 /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; };
 		818735211DA8FD2700046D84 /* Common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Common.h; sourceTree = "<group>"; };
 		8187A8ED1D8E6394007FAFB6 /* Tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tools.h; sourceTree = "<group>"; };
@@ -392,6 +397,8 @@
 			children = (
 				8116F8E21D8916250084FE49 /* IdAndPwdView.h */,
 				8116F8E31D8916250084FE49 /* IdAndPwdView.m */,
+				81661FC81DDEA9C300E3C65A /* ThirdPartyView.h */,
+				81661FC91DDEA9C300E3C65A /* ThirdPartyView.m */,
 				8116F8EF1D891BCD0084FE49 /* RegistBasicInformationView.h */,
 				8116F8F01D891BCD0084FE49 /* RegistBasicInformationView.m */,
 				B6B54BE81D8D009800089C9C /* UserInfoHeaderImageTableViewCell.h */,
@@ -443,6 +450,7 @@
 		812642C31D86A7A800B402CA /* CNLiveUserSystemDemo */ = {
 			isa = PBXGroup;
 			children = (
+				81661FCB1DDED9DD00E3C65A /* cancel.png */,
 				812642C71D86A7A800B402CA /* AppDelegate.h */,
 				812642C81D86A7A800B402CA /* AppDelegate.m */,
 				8187A8EC1D8E6385007FAFB6 /* Tools */,
@@ -685,6 +693,7 @@
 				812642D41D86A7A800B402CA /* LaunchScreen.storyboard in Resources */,
 				812642D11D86A7A800B402CA /* Assets.xcassets in Resources */,
 				812642CF1D86A7A800B402CA /* Main.storyboard in Resources */,
+				81661FCC1DDED9DD00E3C65A /* cancel.png in Resources */,
 				810D9B661D8FB70600B7A776 /* TencentOpenApi_IOS_Bundle.bundle in Resources */,
 				8187A90D1D8E9A7B007FAFB6 /* SVProgressHUD.bundle in Resources */,
 				810D9B681D8FB70600B7A776 /* WeiboSDK.bundle in Resources */,
@@ -750,6 +759,7 @@
 				811600EE1D927E7E003CAE7D /* MKAnnotationView+WebCache.m in Sources */,
 				811600F91D927E7E003CAE7D /* UIImage+MultiFormat.m in Sources */,
 				B6B54BED1D8D011000089C9C /* UserInfoTableViewCell.m in Sources */,
+				81661FCA1DDEA9C300E3C65A /* ThirdPartyView.m in Sources */,
 				8187A8F81D8E6486007FAFB6 /* UserInfoSava.m in Sources */,
 				811600EF1D927E7E003CAE7D /* NSData+ImageContentType.m in Sources */,
 				812642C61D86A7A800B402CA /* main.m in Sources */,
@@ -51,14 +51,46 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "CNLiveUserSystemDemo/Conreollers/ModifyUserInfoViewController.m"
-            timestampString = "501062337.466231"
+            filePath = "CNLiveUserSystemDemo/Conreollers/ViewController.m"
+            timestampString = "501142248.547315"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "63"
-            endingLineNumber = "63"
-            landmarkName = "-saveBtnAction"
+            startingLineNumber = "73"
+            endingLineNumber = "73"
+            landmarkName = "-tapGesturedDetected:"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[ViewController tapGesturedDetected:]"
+                  moduleName = "CNLiveUserSystemDemo"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/android/Git/CNLiveUserSystemSDK/CNLiveUserSystemDemo/Conreollers/ViewController.m"
+                  timestampString = "501648183.675403"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "73"
+                  endingLineNumber = "73"
+                  offsetFromSymbolStart = "64">
+               </Location>
+               <Location
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__38-[ViewController tapGesturedDetected:]_block_invoke"
+                  moduleName = "CNLiveUserSystemDemo"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/android/Git/CNLiveUserSystemSDK/CNLiveUserSystemDemo/Conreollers/ViewController.m"
+                  timestampString = "501648183.677109"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "73"
+                  endingLineNumber = "73"
+                  offsetFromSymbolStart = "15">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -67,13 +99,29 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "CNLiveUserSystemDemo/Conreollers/ModifyUserInfoViewController.m"
-            timestampString = "501062339.330438"
+            filePath = "CNLiveUserSystemDemo/Conreollers/RegisterViewController.m"
+            timestampString = "501385209.643505"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "89"
+            endingLineNumber = "89"
+            landmarkName = "-loginBtnAction"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "CNLiveUserSystemDemo/Conreollers/RegisterViewController.m"
+            timestampString = "501385209.643505"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "67"
-            endingLineNumber = "67"
-            landmarkName = "-saveBtnAction"
+            startingLineNumber = "95"
+            endingLineNumber = "95"
+            landmarkName = "-loginBtnAction"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -17,6 +17,11 @@
 - (void)updateMobileWithAppId:(NSString *)appId appKey:(NSString *)appKey uid:(NSString *)uid mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode token:(NSString *)token success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
 /**
+ *  绑定第三方账号
+ */
+- (void)bindingThirdPartyWithAppId:(NSString *)appId appKey:(NSString *)appKey uid:(NSString *)uid thirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId token:(NSString *)token success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
+/**
  *  查询用户信息
  */
 - (void)queryUserInfoWithAppId:(NSString *)appId appKey:(NSString *)appKey uid:(NSString *)uid srcUid:(NSString *)srcUid token:(NSString *)token success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
@@ -12,19 +12,23 @@
 #import "NSDictionary+Safety.h"
 //更新手机号
-static  NSString *updateMobileURL = @"https://api.cnlive.com/open/api2/user/updateMobileById";
+static  NSString *updateMobileURL       = @"https://api.cnlive.com/open/api2/user/updateMobileById";
 //查询用户信息
-static  NSString *queryUserInfoURL = @"https://api.cnlive.com/open/api2/user/readUserById";
+static  NSString *queryUserInfoURL      = @"https://api.cnlive.com/open/api2/user/readUserById";
 //修改用户单项信息
-static  NSString *updateUserByIdURL = @"https://api.cnlive.com/open/api2/user/updateUserById";
+static  NSString *updateUserByIdURL     = @"https://api.cnlive.com/open/api2/user/updateUserById";
 //更新用户附加信息
-static  NSString *updateOtherInfoURL = @"https://api.cnlive.com/open/api2/user/updateUserExtInfo";
+static  NSString *updateOtherInfoURL    = @"https://api.cnlive.com/open/api2/user/updateUserExtInfo";
 //修改密码
-static  NSString *updatePwdURL = @"https://api.cnlive.com/open/api2/user/updatePwdByMobile";
+static  NSString *updatePwdURL          = @"https://api.cnlive.com/open/api2/user/updatePwdByMobile";
+
+//绑定第三方账号
+static  NSString *BindingThirdURL       = @"https://api.cnlive.com/open/api2/user/bind3rd";
+
 @implementation CNLiveUserInfo
@@ -56,6 +60,32 @@ static  NSString *updatePwdURL = @&quot;https://api.cnlive.com/open/api2/user/updateP
 }
 /**
+ *  绑定第三方账号
+ */
+- (void)bindingThirdPartyWithAppId:(NSString *)appId appKey:(NSString *)appKey uid:(NSString *)uid thirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId token:(NSString *)token success:(void (^)(id))success failure:(void (^)(NSDictionary *))failure
+{
+    NSDate *date = [NSDate date];
+    NSInteger time = [date timeIntervalSince1970];
+    NSString *timeString = [NSString stringWithFormat:@"%ld", (long)time];
+    
+    NSDictionary *params = @{@"appId":[CNLiveUserSystemTools verify:appId],
+                             @"uid":[CNLiveUserSystemTools verify:uid],
+                             @"thirdPartyPlat":[CNLiveUserSystemTools verify:plat],
+                             @"thirdPartyId":[CNLiveUserSystemTools verify:thirdPartyId],
+                             @"token":[CNLiveUserSystemTools verify:token],
+                             @"clientPlat":@"i",
+                             @"platform_id":[NSBundle mainBundle].bundleIdentifier,
+                             @"timestamp": timeString};
+    
+    NSMutableDictionary *parameter = [NSMutableDictionary dictionaryWithDictionary:params];
+    NSString *string = [NSString stringWithFormat:@"%@&key=%@", [CNLiveUserSystemTools signvalue:parameter], [CNLiveUserSystemTools verify:appKey]];
+    NSString *signString = [[CNLiveUserSystemTools sha1:string] uppercaseString];
+    
+    [parameter setObject:signString forKey:@"sign"];
+    [self requestWithURL:BindingThirdURL parameter:parameter success:success failure:failure];
+}
+
+/**
  *  查询用户信息
  */
 - (void)queryUserInfoWithAppId:(NSString *)appId appKey:(NSString *)appKey uid:(NSString *)uid srcUid:(NSString *)srcUid token:(NSString *)token success:(void (^)(id result))success failure:(void (^)(NSDictionary *))failure
@@ -71,9 +101,7 @@ static  NSString *updatePwdURL = @&quot;https://api.cnlive.com/open/api2/user/updateP
                              @"token":[CNLiveUserSystemTools verify:token],
                              @"platform_id":[NSBundle mainBundle].bundleIdentifier,
                              @"timestamp": timeString};
-    
-    NSLog(@"查询参数-----------%@",params);
-    
+        
     NSMutableDictionary *parameter = [NSMutableDictionary dictionaryWithDictionary:params];
     NSString *string = [NSString stringWithFormat:@"%@&key=%@", [CNLiveUserSystemTools signvalue:parameter], [CNLiveUserSystemTools verify:appKey]];
     NSString *signString = [[CNLiveUserSystemTools sha1:string] uppercaseString];
@@ -168,7 +196,8 @@ static  NSString *updatePwdURL = @&quot;https://api.cnlive.com/open/api2/user/updateP
 {
     [[CNLiveNetworkManager manager] requestPostURL:URL parameters:param success:^(NSURLResponse * _Nullable response, id  _Nullable responseObject) {
-                
+        
+        
         responseObject = [responseObject validatedDictionary];
         if ([[responseObject allKeys] containsObject:@"errorCode"] && [responseObject[@"errorCode"] isEqualToString:@"0"]) {
@@ -22,6 +22,7 @@
  */
 + (void)setAppId:(NSString *)appId appKey:(NSString *)appKey appSecret:(NSString *)appSecret;
+
 /**
  @abstract      注册
  @param         userName                邮箱或手机
@@ -34,9 +35,10 @@
  */
 + (void)registerWithUserName:(NSString *)userName password:(NSString *)password verificationCode:(NSString *)verificationCode invitationCode:(NSString *)invitationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      第三方登录
- @param         plat                    第三方平台编号（如plat: 1:sina weibo 2:qq weibo 3:weixin 4:renren 注:如qq登录,plat=@"2"）
+ @param         plat                    第三方平台编号（如plat: 1:sina weibo 2:qq 3:weixin 4:renren 注:如qq登录,plat=@"2"）
  @param         thirdPartyId            第三方用户ID
  @param         nickName                用户昵称
  @param         gender                  性别，m：男、f：女、n：未知（非必填）
@@ -48,6 +50,7 @@
  */
 + (void)thirdPartyLoginWithThirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId nickName:(NSString *)nickName gender:(NSString *)gender location:(NSString *)location faceUrl:(NSString *)faceUrl frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      快捷登录
  @param         userName                手机号
@@ -58,6 +61,7 @@
  */
 + (void)shortcutLoginWithUserName:(NSString *)userName verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      登录
  @param         userName                手机号或邮箱
@@ -68,6 +72,7 @@
  */
 + (void)loginWithUserName:(NSString *)userName password:(NSString *)password frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      发送验证码
  @param         mobile                  手机号
@@ -77,6 +82,7 @@
  */
 + (void)verificationCodeType:(VerificationCodeType)type mobile:(NSString *)mobile success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      更新用户附加信息
  @param         uid                     用户ID
@@ -86,6 +92,7 @@
  */
 + (void)updateOtherInfoWithUid:(NSString *)uid extInfo:(NSString *)extInfo success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      修改用户单项信息
  @param         type                    修改类型（nickName-昵称，gender-性别，email-邮箱, location-联系方式（地址））
@@ -96,6 +103,7 @@
  */
 + (void)modifyUserInfoType:(UserInfoType)type uid:(NSString *)uid modifyInfo:(NSString *)info success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      更新手机号
  @param         uid                     用户ID
@@ -106,6 +114,18 @@
  */
 + (void)updateMobileWithUid:(NSString *)uid mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
+/**
+ @abstract      绑定第三方账号
+ @param         uid                     用户ID
+ @param         plat                    第三方平台编号（如platform: 1:sina weibo 2:qq  3:weixin 4:renren                注:如绑定qq,thirdPartyPlat = @"2"）
+ @param         thirdPartyId            第三方用户ID
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */
++ (void)bindingThirdPartyWithUid:(NSString *)uid thirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
+
 /**
  @abstract      修改密码（通过手机号修改）
  @param         mobile                  手机号
@@ -116,6 +136,7 @@
  */
 + (void)changePasswordWithMobile:(NSString *)mobile verificationCode:(NSString *)verificationCode newPassword:(NSString *)newPassword success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      上传头像
  @param         uid                     用户ID
@@ -125,6 +146,7 @@
  */
 + (void)uploadIconWithUid:(NSString *)uid icon:(UIImage *)icon success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      查询用户信息
  @param         uid                     用户ID
@@ -134,6 +156,7 @@
  */
 + (void)queryUserInfoWithUid:(NSString *)uid srcUid:(NSString *)srcUid success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      用户反馈
  @param         contentId               举报内容ID
@@ -143,6 +166,7 @@
  */
 + (void)feedbackWithContentId:(NSString *)contentId message:(NSString *)message success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  *  获取SDK版本号
  */
@@ -110,6 +110,16 @@
 }
 /**
+ *  绑定第三方账号
+ */
++(void)bindingThirdPartyWithUid:(NSString *)uid thirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId success:(void (^)(id))success failure:(void (^)(NSDictionary *))failure
+{
+    CNLiveUserInfo *bindingThird = [[CNLiveUserInfo alloc] init];
+    
+    [bindingThird bindingThirdPartyWithAppId:[CNLiveUserManager manager].appId appKey:[CNLiveUserManager manager].appKey uid:uid thirdPartyPlatType:plat thirdPartyId:thirdPartyId token:[[self class] getToken] success:success failure:failure];
+}
+
+/**
  *  修改密码
  */
 +(void)changePasswordWithMobile:(NSString *)mobile verificationCode:(NSString *)verificationCode newPassword:(NSString *)newPassword success:(void (^)(id))success failure:(void (^)(NSDictionary *))failure
@@ -84,17 +84,17 @@
 - (void)weChatBtnAction
 {
-    [[CNLiveThirdLoginManager manager] weChatLogin];
+    [[CNLiveThirdLoginManager manager] weChatLoginIsBindingThirdParty:NO];
 }
 - (void)sinaBtnAction
 {
-    [[CNLiveThirdLoginManager manager] sinaLogin];
+    [[CNLiveThirdLoginManager manager] sinaLoginIsBindingThirdParty:NO];
 }
 - (void)qqBtnAction
 {
-    [[CNLiveThirdLoginManager manager] qqLogin];
+    [[CNLiveThirdLoginManager manager] qqLoginIsBindingThirdParty:NO];
 }
 - (void)loginSuccess
@@ -85,6 +85,7 @@
         [CNLiveUserSystemCenter registerWithUserName:_registBasicInformationView.phoneTF.text password:_registBasicInformationView.setPwdTF.text verificationCode:_registBasicInformationView.verificationTF.text invitationCode:nil frmId:nil success:^(id result) {
+            NSLog(@"result --- %@",result);
             [Tools setUserLogin:YES];
             [SVProgressHUD showSuccessWithStatus:@"成功"];
             [UserInfoSava saveUserinfoDic:result[@"data"]];
@@ -12,13 +12,16 @@
 #import "UserInfoViewController.h"
 #import "CNLiveLogout.h"
 #import "UserInfoSava.h"
+#import "ThirdPartyView.h"
+#import "CNLiveThirdLoginManager.h"
-@interface ViewController ()<UITableViewDelegate,UITableViewDataSource>
+@interface ViewController ()<UITableViewDelegate,UITableViewDataSource,ThirdPartyViewDelegate,UIGestureRecognizerDelegate>
 {
     NSArray *_dataArr;
 }
 @property (nonatomic, strong) UITableView *tableView;
+@property (nonatomic, strong) ThirdPartyView *thirPartydView;
 @property (nonatomic, strong) UIButton *loginBtn;
 @end
@@ -30,9 +33,14 @@
     self.view.backgroundColor = [UIColor whiteColor];
     [self.view addSubview:self.tableView];
-    [self.tableView addSubview:self.loginBtn];
-
-    _dataArr = @[@"通过手机号修改密码",@"更新附加信息",@"修改用户信息",@"查询用户信息",@"反馈"];
+    [self.view addSubview:self.loginBtn];
+    [self.view addSubview:self.thirPartydView];
+    
+//    UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGesturedDetected:)]; // 手势类型随你喜欢。
+//    tapGesture.delegate = self;
+//    [self.view addGestureRecognizer:tapGesture];
+    
+    _dataArr = @[@"通过手机号修改密码",@"更新附加信息",@"修改用户信息",@"查询用户信息",@"反馈",@"绑定第三方账号"];
 }
 - (void)viewWillAppear:(BOOL)animated
@@ -60,6 +68,36 @@
     }
 }
+- (void)tapGesturedDetected:(UITapGestureRecognizer *)recognizer
+{
+    [UIView animateWithDuration:0.25 animations:^{
+        _thirPartydView.frame = CGRectMake(0, KScreenHeight, KScreenWidth, 160);
+    }];
+}
+
+#pragma mark - ThirdPartyViewDelegate
+- (void)thirdPartyBtnAction:(NSString *)title
+{
+    if ([title isEqualToString:@"微信"]) {
+        [[CNLiveThirdLoginManager manager] weChatLoginIsBindingThirdParty:YES];
+    } else if ([title isEqualToString:@"微博"]) {
+        [[CNLiveThirdLoginManager manager] sinaLoginIsBindingThirdParty:YES];
+    } else {
+        [[CNLiveThirdLoginManager manager] qqLoginIsBindingThirdParty:YES];
+    }
+    
+    [UIView animateWithDuration:0.25 animations:^{
+        _thirPartydView.frame = CGRectMake(0, KScreenHeight, KScreenWidth, 160);
+    }];
+}
+
+- (void)cancelThirdView
+{
+    [UIView animateWithDuration:0.25 animations:^{
+        _thirPartydView.frame = CGRectMake(0, KScreenHeight, KScreenWidth, 160);
+    }];
+}
+
 #pragma mark - UITableView
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
@@ -171,6 +209,13 @@
             [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
         }];
     }
+    
+    if (indexPath.row == 6) {
+        
+        [UIView animateWithDuration:0.25 animations:^{
+            _thirPartydView.frame = CGRectMake(0, KScreenHeight-160, KScreenWidth, 160);
+        }];
+    }
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
@@ -186,7 +231,7 @@
 - (UITableView *)tableView
 {
     if (!_tableView) {
-        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight) style:UITableViewStylePlain];
+        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight -80) style:UITableViewStylePlain];
         _tableView.backgroundColor = [UIColor whiteColor];
         _tableView.tableFooterView = [[UIView alloc] init];
         _tableView.delegate = self;
@@ -194,12 +239,20 @@
     }
     return _tableView;
 }
+- (ThirdPartyView *)thirPartydView
+{
+    if (!_thirPartydView) {
+        _thirPartydView = [[ThirdPartyView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, 160) binding:YES];
+        _thirPartydView.delegate = self;
+    }
+    return _thirPartydView;
+}
 - (UIButton *)loginBtn
 {
     if (!_loginBtn) {
         _loginBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        _loginBtn.frame = CGRectMake(20, 53*5+63+12+80, KScreenWidth-40, 40);
+        _loginBtn.frame = CGRectMake(20, KScreenHeight-60, KScreenWidth-40, 40);
         [_loginBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
         [_loginBtn setBackgroundColor:[UIColor orangeColor]];
         _loginBtn.titleLabel.font = [UIFont systemFontOfSize:17];
@@ -210,6 +263,11 @@
     return _loginBtn;
 }
+- (void)dealloc
+{
+    _thirPartydView.delegate = nil;
+}
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -14,10 +14,10 @@
 - (BOOL)handleOpenURL:(NSURL *)url;
-- (void)qqLogin;
+- (void)qqLoginIsBindingThirdParty:(BOOL)Binding;
-- (void)weChatLogin;
+- (void)weChatLoginIsBindingThirdParty:(BOOL)Binding;
-- (void)sinaLogin;
+- (void)sinaLoginIsBindingThirdParty:(BOOL)Binding;
 @end
@@ -16,6 +16,7 @@
 @interface CNLiveThirdLoginManager ()<WXApiDelegate,TencentSessionDelegate,TencentLoginDelegate,WBHttpRequestDelegate,WeiboSDKDelegate>
 {
     TencentOAuth *tencentOAuth;
+    BOOL _isBindingThird;
 }
 @property (nonatomic, copy)NSString *appCode;
@@ -62,16 +63,28 @@
     }
 }
--(void)qqLogin
+-(void)qqLoginIsBindingThirdParty:(BOOL)Binding
 {
+    if (Binding) {
+        _isBindingThird = YES;
+    } else {
+        _isBindingThird = NO;
+    }
+    
     tencentOAuth = [[TencentOAuth alloc] initWithAppId:QQAppKey andDelegate:self];
     NSArray *permissions = [NSArray arrayWithObjects:kOPEN_PERMISSION_GET_VIP_INFO, kOPEN_PERMISSION_GET_USER_INFO, kOPEN_PERMISSION_GET_SIMPLE_USER_INFO, nil];
     [tencentOAuth authorize:permissions inSafari:NO];
 }
-- (void)weChatLogin
+- (void)weChatLoginIsBindingThirdParty:(BOOL)Binding
 {
+    if (Binding) {
+        _isBindingThird = YES;
+    } else {
+        _isBindingThird = NO;
+    }
+    
     if ([WXApi isWXAppInstalled]) {
         SendAuthReq* req = [[SendAuthReq alloc] init];
         req.scope = @"snsapi_userinfo";
@@ -83,9 +96,15 @@
     }
 }
-- (void)sinaLogin
+- (void)sinaLoginIsBindingThirdParty:(BOOL)Binding
 {
+    if (Binding) {
+        _isBindingThird = YES;
+    } else {
+        _isBindingThird = NO;
+    }
+    
     WBAuthorizeRequest *request = [WBAuthorizeRequest request];
     request.redirectURI = kSinaRedirectURI;
     request.scope = @"all";
@@ -111,26 +130,38 @@
     NSDictionary *result = response.jsonResponse;
-    NSString *gender;
-    if ([[result objectForKey:@"gender"] isEqualToString:@"女"]) {
-        gender = @"f";
-    } else if ([[result objectForKey:@"gender"] isEqualToString:@"男"]) {
-        gender = @"m";
+    if (_isBindingThird) {
+        
+        UserInfoModel *model = [UserInfoModel modelWithKeyValues:[Tools getLocalUserInfo]];
+        
+        [CNLiveUserSystemCenter bindingThirdPartyWithUid:model.uid thirdPartyPlatType:@"2" thirdPartyId:[tencentOAuth getUserOpenID] success:^(id result) {
+            NSLog(@"绑定成功----%@",result);
+        } failure:^(NSDictionary *errorDic) {
+            NSLog(@"绑定失败----%@",errorDic);
+        }];
+        
     } else {
-        gender = @"n";
-    }
-    
-    [CNLiveUserSystemCenter thirdPartyLoginWithThirdPartyPlatType:@"2" thirdPartyId:[tencentOAuth getUserOpenID] nickName:[result objectForKey:@"nickname"] gender:gender location:[result objectForKey:@"city"] faceUrl:[result objectForKey:@"figureurl"] frmId:nil success:^(id result) {
-        NSLog(@"qq登录------%@",result);
+        NSString *gender;
+        if ([[result objectForKey:@"gender"] isEqualToString:@"女"]) {
+            gender = @"f";
+        } else if ([[result objectForKey:@"gender"] isEqualToString:@"男"]) {
+            gender = @"m";
+        } else {
+            gender = @"n";
+        }
-        [Tools setUserLogin:YES];
-        [SVProgressHUD showSuccessWithStatus:@"登录成功"];
-        [UserInfoSava saveUserinfoDic:result[@"data"]];
-        [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
-
-    } failure:^(NSDictionary *errorDic) {
-        [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
-    }];
+        [CNLiveUserSystemCenter thirdPartyLoginWithThirdPartyPlatType:@"2" thirdPartyId:[tencentOAuth getUserOpenID] nickName:[result objectForKey:@"nickname"] gender:gender location:[result objectForKey:@"city"] faceUrl:[result objectForKey:@"figureurl"] frmId:nil success:^(id result) {
+            NSLog(@"qq登录------%@",result);
+            
+            [Tools setUserLogin:YES];
+            [SVProgressHUD showSuccessWithStatus:@"登录成功"];
+            [UserInfoSava saveUserinfoDic:result[@"data"]];
+            [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
+            
+        } failure:^(NSDictionary *errorDic) {
+            [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
+        }];
+    }
 }
 //非网络错误导致登录失败：
@@ -217,44 +248,55 @@
             if (data) {
                 NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:nil];
-                if ([[dic allKeys] containsObject:@"errcode"]) {
+                if (_isBindingThird) {
+                    UserInfoModel *model = [UserInfoModel modelWithKeyValues:[Tools getLocalUserInfo]];
+
+                    [CNLiveUserSystemCenter bindingThirdPartyWithUid:model.uid thirdPartyPlatType:@"3" thirdPartyId:dic[@"openid"] success:^(id result) {
+                        NSLog(@"绑定成功----%@",result);
+                    } failure:^(NSDictionary *errorDic) {
+                        NSLog(@"绑定失败----%@",errorDic);
+                    }];
-                    [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
                 } else {
-                    
-                    NSString *getGender = [dic objectForKey:@"sex"];
-                    NSString *gender;
-                    switch ([getGender intValue]) {
-                        case 0:
-                        {
-                            gender = @"n";
-                        }
-                            break;
-                        case 1:
-                        {
-                            gender = @"m";
-                        }
-                            break;
-                        case 2:
-                        {
-                            gender = @"f";
-                        }
-                            break;
-                        default:
-                            break;
-                    }
-                    
-                    [CNLiveUserSystemCenter thirdPartyLoginWithThirdPartyPlatType:@"3" thirdPartyId:[dic objectForKey:@"openid"] nickName:[dic objectForKey:@"nickname"] gender:gender location:[dic objectForKey:@"country"] faceUrl:[dic objectForKey:@"headimgurl"] frmId:nil success:^(id result) {
-                        NSLog(@"微信登录------%@",result);
+                    if ([[dic allKeys] containsObject:@"errcode"]) {
-                        [Tools setUserLogin:YES];
-                        [SVProgressHUD showSuccessWithStatus:@"登录成功"];
-                        [UserInfoSava saveUserinfoDic:result[@"data"]];
-                        [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
-
-                    } failure:^(NSDictionary *errorDic) {
                         [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
-                    }];
+                    } else {
+                        
+                        NSString *getGender = [dic objectForKey:@"sex"];
+                        NSString *gender;
+                        switch ([getGender intValue]) {
+                            case 0:
+                            {
+                                gender = @"n";
+                            }
+                                break;
+                            case 1:
+                            {
+                                gender = @"m";
+                            }
+                                break;
+                            case 2:
+                            {
+                                gender = @"f";
+                            }
+                                break;
+                            default:
+                                break;
+                        }
+                        
+                        [CNLiveUserSystemCenter thirdPartyLoginWithThirdPartyPlatType:@"3" thirdPartyId:[dic objectForKey:@"openid"] nickName:[dic objectForKey:@"nickname"] gender:gender location:[dic objectForKey:@"country"] faceUrl:[dic objectForKey:@"headimgurl"] frmId:nil success:^(id result) {
+                            NSLog(@"微信登录------%@",result);
+                            
+                            [Tools setUserLogin:YES];
+                            [SVProgressHUD showSuccessWithStatus:@"登录成功"];
+                            [UserInfoSava saveUserinfoDic:result[@"data"]];
+                            [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
+                            
+                        } failure:^(NSDictionary *errorDic) {
+                            [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
+                        }];
+                    }
                 }
             }
         });
@@ -262,7 +304,7 @@
     });
 }
-#pragma mark - <#mark#>
+#pragma mark - sinaDelegate
 - (void)didReceiveWeiboRequest:(WBBaseRequest *)request
 {
@@ -293,24 +335,37 @@
     if ([request.tag isEqualToString:@"userinfo"]) {
         NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:nil];
-        NSString *gender;
-        if ([dic objectForKey:@"gender"]) {
-            gender = [dic objectForKey:@"gender"];
+        if (_isBindingThird) {
+            
+            UserInfoModel *model = [UserInfoModel modelWithKeyValues:[Tools getLocalUserInfo]];
+            
+            [CNLiveUserSystemCenter bindingThirdPartyWithUid:model.uid thirdPartyPlatType:@"1" thirdPartyId:[dic objectForKey:@"id"] success:^(id result) {
+                NSLog(@"绑定成功----%@",result);
+            } failure:^(NSDictionary *errorDic) {
+                NSLog(@"绑定失败----%@",errorDic);
+            }];
+            
         } else {
-            gender = @"n";
-        }
-        
-        [CNLiveUserSystemCenter thirdPartyLoginWithThirdPartyPlatType:@"1" thirdPartyId:[dic objectForKey:@"id"] nickName:[dic objectForKey:@"name"] gender:gender location:[dic objectForKey:@"location"] faceUrl:[dic objectForKey:@"avatar_hd"] frmId:nil success:^(id result) {
-            NSLog(@"微博登录------%@",result);
-            [Tools setUserLogin:YES];
-            [SVProgressHUD showSuccessWithStatus:@"登录成功"];
-            [UserInfoSava saveUserinfoDic:result[@"data"]];
-            [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
-
-        } failure:^(NSDictionary *errorDic) {
-            [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
-        }];
+            NSString *gender;
+            if ([dic objectForKey:@"gender"]) {
+                gender = [dic objectForKey:@"gender"];
+            } else {
+                gender = @"n";
+            }
+            
+            [CNLiveUserSystemCenter thirdPartyLoginWithThirdPartyPlatType:@"1" thirdPartyId:[dic objectForKey:@"id"] nickName:[dic objectForKey:@"name"] gender:gender location:[dic objectForKey:@"location"] faceUrl:[dic objectForKey:@"avatar_hd"] frmId:nil success:^(id result) {
+                NSLog(@"微博登录------%@",result);
+                
+                [Tools setUserLogin:YES];
+                [SVProgressHUD showSuccessWithStatus:@"登录成功"];
+                [UserInfoSava saveUserinfoDic:result[@"data"]];
+                [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
+                
+            } failure:^(NSDictionary *errorDic) {
+                [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
+            }];
+        }
     }
 }
+//
+//  ThirdPartyView.h
+//  CNLiveUserSystemDemo
+//
+//  Created by iOS on 16/11/18.
+//  Copyright © 2016年 zhulin. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@protocol ThirdPartyViewDelegate <NSObject>
+
+- (void)thirdPartyBtnAction:(NSString *)title;
+
+@optional
+- (void)cancelThirdView;
+
+@end
+
+@interface ThirdPartyView : UIView
+
+@property (nonatomic, assign) id<ThirdPartyViewDelegate> delegate;
+
+- (instancetype)initWithFrame:(CGRect)frame binding:(BOOL)binding; 
+
+@end
+//
+//  ThirdPartyView.m
+//  CNLiveUserSystemDemo
+//
+//  Created by iOS on 16/11/18.
+//  Copyright © 2016年 zhulin. All rights reserved.
+//
+
+#import "ThirdPartyView.h"
+
+#define SpaceWidth (KScreenWidth-80*3)/4
+@interface ThirdPartyView ()
+
+@property (nonatomic, strong) UIButton *weChatBtn;
+@property (nonatomic, strong) UIButton *sinaBtn;
+@property (nonatomic, strong) UIButton *qqBtn;
+@property (nonatomic, strong) UILabel *thirdpartyLoginLbl;
+@property (nonatomic, strong) UIButton *cancelBtn;
+
+@end
+
+@implementation ThirdPartyView
+
+- (instancetype)initWithFrame:(CGRect)frame binding:(BOOL)binding
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.backgroundColor = [UIColor blackColor];
+        [self addSubview:self.sinaBtn];
+        [self addSubview:self.qqBtn];
+        [self addSubview:self.weChatBtn];
+        [self addSubview:self.thirdpartyLoginLbl];
+        
+        if (binding) {
+            [self addSubview:self.cancelBtn];
+        }
+    }
+    return self;
+}
+
+#pragma mark - ****************action******
+- (void)thirdPartyBtnAction:(UIButton *)button
+{
+    if (self.delegate && [self.delegate respondsToSelector:@selector(thirdPartyBtnAction:)]) {
+        [self.delegate thirdPartyBtnAction:button.titleLabel.text];
+    }
+}
+
+- (void)cancelBtnAction
+{
+    if (self.delegate && [self.delegate respondsToSelector:@selector(cancelThirdView)]) {
+        [self.delegate cancelThirdView];
+    }
+}
+
+#pragma mark - ****************getter******
+
+- (UILabel *)thirdpartyLoginLbl
+{
+    if (!_thirdpartyLoginLbl) {
+        _thirdpartyLoginLbl = [[UILabel alloc] initWithFrame:CGRectMake(0, 20, KScreenWidth, 15)];
+        _thirdpartyLoginLbl.textAlignment = NSTextAlignmentCenter;
+        _thirdpartyLoginLbl.textColor = [UIColor orangeColor];
+        _thirdpartyLoginLbl.text = @"第三方平台";
+        _thirdpartyLoginLbl.font = [UIFont systemFontOfSize:15];
+    }
+    return _thirdpartyLoginLbl;
+}
+
+- (UIButton *)weChatBtn
+{
+    if (!_weChatBtn) {
+        _weChatBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        _weChatBtn.backgroundColor = [UIColor orangeColor];
+        [_weChatBtn setFrame:CGRectMake(SpaceWidth, 70, 80, 40)];
+        _weChatBtn.layer.cornerRadius = 20;
+        _weChatBtn.layer.masksToBounds = YES;
+        [_weChatBtn setTitle:@"微信" forState:UIControlStateNormal];
+        [_weChatBtn addTarget:self action:@selector(thirdPartyBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _weChatBtn;
+}
+
+- (UIButton *)sinaBtn
+{
+    if (!_sinaBtn) {
+        _sinaBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        _sinaBtn.backgroundColor = [UIColor orangeColor];
+        [_sinaBtn setFrame:CGRectMake(SpaceWidth*2+80, 70, 80, 40)];
+        _sinaBtn.layer.cornerRadius = 20;
+        _sinaBtn.layer.masksToBounds = YES;
+        [_sinaBtn setTitle:@"微博" forState:UIControlStateNormal];
+        [_sinaBtn addTarget:self action:@selector(thirdPartyBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _sinaBtn;
+}
+
+- (UIButton *)qqBtn
+{
+    if (!_qqBtn) {
+        _qqBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        _qqBtn.backgroundColor = [UIColor orangeColor];
+        [_qqBtn setFrame:CGRectMake(SpaceWidth*3+80*2, 70, 80, 40)];
+        _qqBtn.layer.cornerRadius = 20;
+        _qqBtn.layer.masksToBounds = YES;
+        [_qqBtn setTitle:@"QQ" forState:UIControlStateNormal];
+        [_qqBtn addTarget:self action:@selector(thirdPartyBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _qqBtn;
+}
+
+- (UIButton *)cancelBtn
+{
+    if (!_cancelBtn) {
+        _cancelBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        _cancelBtn.frame = CGRectMake(self.bounds.size.width-30, 10, 20, 20);
+        [_cancelBtn setBackgroundImage:[UIImage imageNamed:@"cancel"] forState:UIControlStateNormal];
+        [_cancelBtn addTarget:self action:@selector(cancelBtnAction) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _cancelBtn;
+}
+
+@end
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.1.2</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.12.111714</string>
+	<string>1.1.2.112110</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
@@ -22,6 +22,7 @@
  */
 + (void)setAppId:(NSString *)appId appKey:(NSString *)appKey appSecret:(NSString *)appSecret;
+
 /**
  @abstract      注册
  @param         userName                邮箱或手机
@@ -32,11 +33,12 @@
  @param         success                 成功回调
  @param         failure                 失败回调
  */
-+ (void)registerWithUserName:(NSString *)userName password:(NSString *)password verificationCode:(NSString *)verificationCode invitationCode:(NSString *)invitationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
++ (void)registerWithUserName:(NSString *)userName password:(NSString *)password verificationCode:(NSString *)verificationCode invitationCode:(NSString *)invitationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      第三方登录
- @param         plat                    第三方平台编号（如plat: 1:sina weibo 2:qq weibo 3:weixin 4:renren 注:如qq登录,plat=@"2"）
+ @param         plat                    第三方平台编号（如plat: 1:sina weibo 2:qq 3:weixin 4:renren 注:如qq登录,plat=@"2"）
  @param         thirdPartyId            第三方用户ID
  @param         nickName                用户昵称
  @param         gender                  性别，m：男、f：女、n：未知（非必填）
@@ -46,7 +48,8 @@
  @param         success                 成功回调
  @param         failure                 失败回调
  */
-+ (void)thirdPartyLoginWithThirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId nickName:(NSString *)nickName gender:(NSString *)gender location:(NSString *)location faceUrl:(NSString *)faceUrl frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
++ (void)thirdPartyLoginWithThirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId nickName:(NSString *)nickName gender:(NSString *)gender location:(NSString *)location faceUrl:(NSString *)faceUrl frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      快捷登录
@@ -56,7 +59,8 @@
  @param         success                 成功回调
  @param         failure                 失败回调
  */
-+ (void)shortcutLoginWithUserName:(NSString *)userName verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
++ (void)shortcutLoginWithUserName:(NSString *)userName verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      登录
@@ -66,7 +70,8 @@
  @param         success                 成功回调
  @param         failure                 失败回调
  */
-+ (void)loginWithUserName:(NSString *)userName password:(NSString *)password frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
++ (void)loginWithUserName:(NSString *)userName password:(NSString *)password frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      发送验证码
@@ -75,7 +80,8 @@
  @param         success                 成功回调
  @param         failure                 失败回调
  */
-+ (void)verificationCodeType:(VerificationCodeType)type mobile:(NSString *)mobile success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
++ (void)verificationCodeType:(VerificationCodeType)type mobile:(NSString *)mobile success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      更新用户附加信息
@@ -84,7 +90,8 @@
  @param         success                 成功回调
  @param         failure                 失败回调
  */
-+ (void)updateOtherInfoWithUid:(NSString *)uid extInfo:(NSString *)extInfo success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
++ (void)updateOtherInfoWithUid:(NSString *)uid extInfo:(NSString *)extInfo success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      修改用户单项信息
@@ -94,7 +101,8 @@
  @param         success                 成功回调
  @param         failure                 失败回调
  */
-+ (void)modifyUserInfoType:(UserInfoType)type uid:(NSString *)uid modifyInfo:(NSString *)info success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
++ (void)modifyUserInfoType:(UserInfoType)type uid:(NSString *)uid modifyInfo:(NSString *)info success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      更新手机号
@@ -104,7 +112,19 @@
  @param         success                 成功回调
  @param         failure                 失败回调
  */
-+ (void)updateMobileWithUid:(NSString *)uid mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
++ (void)updateMobileWithUid:(NSString *)uid mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
+
+/**
+ @abstract      绑定第三方账号
+ @param         uid                     用户ID
+ @param         plat                    第三方平台编号（如platform: 1:sina weibo 2:qq  3:weixin 4:renren                注:如绑定qq,thirdPartyPlat = @"2"）
+ @param         thirdPartyId            第三方用户ID
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */
++ (void)bindingThirdPartyWithUid:(NSString *)uid thirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      修改密码（通过手机号修改）
@@ -114,7 +134,8 @@
  @param         success                 成功回调
  @param         failure                 失败回调
  */
-+ (void)changePasswordWithMobile:(NSString *)mobile verificationCode:(NSString *)verificationCode newPassword:(NSString *)newPassword success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
++ (void)changePasswordWithMobile:(NSString *)mobile verificationCode:(NSString *)verificationCode newPassword:(NSString *)newPassword success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      上传头像
@@ -123,7 +144,8 @@
  @param         success                 成功回调
  @param         failure                 失败回调
  */
-+ (void)uploadIconWithUid:(NSString *)uid icon:(UIImage *)icon success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
++ (void)uploadIconWithUid:(NSString *)uid icon:(UIImage *)icon success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      查询用户信息
@@ -132,7 +154,8 @@
  @param         success                 成功回调
  @param         failure                 失败回调
  */
-+ (void)queryUserInfoWithUid:(NSString *)uid srcUid:(NSString *)srcUid success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
++ (void)queryUserInfoWithUid:(NSString *)uid srcUid:(NSString *)srcUid success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      用户反馈
@@ -141,7 +164,8 @@
  @param         success                 成功回调
  @param         failure                 失败回调
  */
-+ (void)feedbackWithContentId:(NSString *)contentId message:(NSString *)message success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
++ (void)feedbackWithContentId:(NSString *)contentId message:(NSString *)message success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  *  获取SDK版本号