修改failure返回数据格式

朱林
1 parent cb1a8bd8
Showing 29 changed files with 253 additions and 140 deletions
CNLiveUserSystemDemo.xcodeproj/project.xcworkspace/xcuserdata/iOS.xcuserdatad/UserInterfaceState.xcuserstate
CNLiveUserSystemDemo.xcodeproj/xcuserdata/iOS.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveFeedback.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveFeedback.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveLogin.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveLogin.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveRegister.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveRegister.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUploadIcon.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUploadIcon.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserInfo.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserInfo.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserSystemCenter.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserSystemCenter.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveVerificationCode.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveVerificationCode.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/Common.h
CNLiveUserSystemDemo/Conreollers/LoginViewController.m
CNLiveUserSystemDemo/Conreollers/ModifyUserInfoViewController.m
CNLiveUserSystemDemo/Conreollers/RegisterViewController.m
@@ -13,5 +13,69 @@
             stopOnStyle = "0">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "CNLiveUserSystemDemo/Conreollers/RegisterViewController.m"
+            timestampString = "501061773.344801"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "60"
+            endingLineNumber = "60"
+            landmarkName = "-verificationBtnAction"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "CNLiveUserSystemDemo/Conreollers/RegisterViewController.m"
+            timestampString = "501061776.857064"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "63"
+            endingLineNumber = "63"
+            landmarkName = "-verificationBtnAction"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "CNLiveUserSystemDemo/Conreollers/ModifyUserInfoViewController.m"
+            timestampString = "501062337.466231"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "63"
+            endingLineNumber = "63"
+            landmarkName = "-saveBtnAction"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "CNLiveUserSystemDemo/Conreollers/ModifyUserInfoViewController.m"
+            timestampString = "501062339.330438"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "67"
+            endingLineNumber = "67"
+            landmarkName = "-saveBtnAction"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
@@ -10,7 +10,7 @@
 @interface CNLiveFeedback : NSObject
-- (void)feedbackWithAppId:(NSString *)appId appKey:(NSString *)appKey contentId:(NSString *)contentId message:(NSString *)message success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
+- (void)feedbackWithAppId:(NSString *)appId appKey:(NSString *)appKey contentId:(NSString *)contentId message:(NSString *)message success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
 @end
@@ -16,7 +16,7 @@ static  NSString *feedbackURL = @&quot;https://api.cnlive.com/open/api2/user/userRepo
 @implementation CNLiveFeedback
-- (void)feedbackWithAppId:(NSString *)appId appKey:(NSString *)appKey contentId:(NSString *)contentId message:(NSString *)message success:(void (^)(id result))success failure:(void (^)(NSError *))failure
+- (void)feedbackWithAppId:(NSString *)appId appKey:(NSString *)appKey contentId:(NSString *)contentId message:(NSString *)message success:(void (^)(id))success failure:(void (^)(NSDictionary *))failure
 {
     NSDate *date = [NSDate date];
@@ -41,7 +41,7 @@ static  NSString *feedbackURL = @&quot;https://api.cnlive.com/open/api2/user/userRepo
 #pragma mark - request
-- (void)requestWithParameter:(NSDictionary *)param success:(void(^)(id result))success failure :(void (^)(NSError *  error))failure
+- (void)requestWithParameter:(NSDictionary *)param success:(void(^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
 {
     [[CNLiveNetworkManager manager] requestPostURL:feedbackURL parameters:param success:^(NSURLResponse * _Nullable response, id  _Nullable responseObject) {
@@ -49,19 +49,27 @@ static  NSString *feedbackURL = @&quot;https://api.cnlive.com/open/api2/user/userRepo
         if ([[responseObject allKeys] containsObject:@"errorCode"] && [responseObject[@"errorCode"] isEqualToString:@"0"]) {
-            success(responseObject);
+            if (success) {
+                success(responseObject);
+            }
         } else {
-            NSError *error = [NSError errorWithDomain:NSURLErrorDomain code:[responseObject[@"errorCode"] integerValue] userInfo:@{NSLocalizedDescriptionKey : responseObject[@"errorMessage"]}];
-            failure(error);
+            if (failure) {
+                failure(responseObject);
+            }
             [CNLiveUserSystemTools errorStat:responseObject[@"errorMessage"]];
         }
     } failure:^(NSURLResponse * _Nullable response, NSError * _Nullable error) {
-        failure(error);
+        NSDictionary *errorDic = @{@"errorCode": [NSString stringWithFormat:@"%ld", error.code], @"errorMessage": error.localizedDescription};
+        
+        if (failure) {
+            failure(errorDic);
+        }
+        
         [CNLiveUserSystemTools errorStat:error.localizedDescription];
     }];
@@ -13,16 +13,16 @@
 /**
  *  第三方登录
  */
-- (void)thirdPartyLoginWithAppId:(NSString *)appId appKey:(NSString *)appKey thirdPartyPlatType:(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)thirdPartyLoginWithAppId:(NSString *)appId appKey:(NSString *)appKey thirdPartyPlatType:(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;
 /**
  *  快捷登录
  */
-- (void)shortcutLoginWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(NSString *)userName verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
+- (void)shortcutLoginWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(NSString *)userName verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
 /**
  *  登录
  */
-- (void)loginWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(NSString *)userName password:(NSString *)password frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
+- (void)loginWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(NSString *)userName password:(NSString *)password frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
 @end
@@ -22,7 +22,7 @@ static  NSString *thirdLoginURL = @&quot;https://api.cnlive.com/open/api2/user/loginI
 @implementation CNLiveLogin
-- (void)thirdPartyLoginWithAppId:(NSString *)appId appKey:(NSString *)appKey thirdPartyPlatType:(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 *))failure
+- (void)thirdPartyLoginWithAppId:(NSString *)appId appKey:(NSString *)appKey thirdPartyPlatType:(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 *))failure
 {
     NSDate *date = [NSDate date];
     NSInteger time = [date timeIntervalSince1970];
@@ -53,7 +53,7 @@ static  NSString *thirdLoginURL = @&quot;https://api.cnlive.com/open/api2/user/loginI
 /**
  *  快捷登录
  */
-- (void)shortcutLoginWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(NSString *)userName verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSError *error))failure
+- (void)shortcutLoginWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(NSString *)userName verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
 {
     NSDate *date = [NSDate date];
     NSInteger time = [date timeIntervalSince1970];
@@ -80,7 +80,7 @@ static  NSString *thirdLoginURL = @&quot;https://api.cnlive.com/open/api2/user/loginI
 /**
  *  登录
  */
-- (void)loginWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(NSString *)userName password:(NSString *)password frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSError *))failure
+- (void)loginWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(NSString *)userName password:(NSString *)password frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *))failure
 {
     NSDate *date = [NSDate date];
     NSInteger time = [date timeIntervalSince1970];
@@ -105,7 +105,7 @@ static  NSString *thirdLoginURL = @&quot;https://api.cnlive.com/open/api2/user/loginI
 #pragma mark - request
-- (void)requestWithURL:(NSString *)URL parameter:(NSDictionary *)param success:(void(^)(id result))success failure :(void (^)(NSError *  error))failure
+- (void)requestWithURL:(NSString *)URL parameter:(NSDictionary *)param success:(void(^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
 {
     [[CNLiveNetworkManager manager] requestPostURL:URL parameters:param success:^(NSURLResponse * _Nullable response, id  _Nullable responseObject) {
@@ -113,24 +113,31 @@ static  NSString *thirdLoginURL = @&quot;https://api.cnlive.com/open/api2/user/loginI
         if ([[responseObject allKeys] containsObject:@"errorCode"] && [responseObject[@"errorCode"] isEqualToString:@"0"]) {
-            success(responseObject);
-            
             NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
             [userDefaults setObject:responseObject[@"data"][@"token"] forKey:@"CNLiveAuthToken"];
             [userDefaults setObject:responseObject[@"data"][@"uid"] forKey:@"CNLiveUserSid"];
             [userDefaults synchronize];
+            
+            if (success) {
+                success(responseObject);
+            }
         } else {
-            NSError *error = [NSError errorWithDomain:NSURLErrorDomain code:[responseObject[@"errorCode"] integerValue] userInfo:@{NSLocalizedDescriptionKey : responseObject[@"errorMessage"]}];
-            failure(error);
+            if (failure) {
+                failure(responseObject);
+            }
             [CNLiveUserSystemTools errorStat:responseObject[@"errorMessage"]];
         }
     } failure:^(NSURLResponse * _Nullable response, NSError * _Nullable error) {
-        failure(error);
+        NSDictionary *errorDic = @{@"errorCode": [NSString stringWithFormat:@"%ld", error.code], @"errorMessage": error.localizedDescription};
+        
+        if (failure) {
+            failure(errorDic);
+        }
         [CNLiveUserSystemTools errorStat:error.localizedDescription];
     }];
@@ -10,7 +10,7 @@
 @interface CNLiveRegister : NSObject
-- (void)registerWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(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)registerWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(NSString *)userName password:(NSString *)password verificationCode:(NSString *)verificationCode invitationCode:(NSString *)invitationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
 @end
@@ -16,7 +16,7 @@ static  NSString *registerURL = @&quot;https://api.cnlive.com/open/api2/user/register
 @implementation CNLiveRegister
-- (void)registerWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(NSString *)userName password:(NSString *)password verificationCode:(NSString *)verificationCode invitationCode:(NSString *)invitationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSError *))failure
+- (void)registerWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(NSString *)userName password:(NSString *)password verificationCode:(NSString *)verificationCode invitationCode:(NSString *)invitationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *))failure
 {
     NSDate *date = [NSDate date];
@@ -44,7 +44,7 @@ static  NSString *registerURL = @&quot;https://api.cnlive.com/open/api2/user/register
 #pragma mark - request
-- (void)requestWithParameter:(NSDictionary *)param success:(void(^)(id result))success failure :(void (^)(NSError *  error))failure
+- (void)requestWithParameter:(NSDictionary *)param success:(void(^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
 {
     [[CNLiveNetworkManager manager] requestPostURL:registerURL parameters:param success:^(NSURLResponse * _Nullable response, id  _Nullable responseObject) {
@@ -53,25 +53,33 @@ static  NSString *registerURL = @&quot;https://api.cnlive.com/open/api2/user/register
         if ([[responseObject allKeys] containsObject:@"errorCode"] && [responseObject[@"errorCode"] isEqualToString:@"0"]) {
-            success(responseObject);
-            
             NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
             [userDefaults setObject:responseObject[@"data"][@"token"] forKey:@"CNLiveAuthToken"];
             [userDefaults setObject:responseObject[@"data"][@"uid"] forKey:@"CNLiveUserSid"];
-
             [userDefaults synchronize];
+            if (success) {
+                success(responseObject);
+            }
+            
+            
         } else {
-             NSError *error = [NSError errorWithDomain:NSURLErrorDomain code:[responseObject[@"errorCode"] integerValue] userInfo:@{NSLocalizedDescriptionKey : responseObject[@"errorMessage"]}];
-            failure(error);
+            if (failure) {
+                failure(responseObject);
+            }
             [CNLiveUserSystemTools errorStat:responseObject[@"errorMessage"]];
         }
     } failure:^(NSURLResponse * _Nullable response, NSError * _Nullable error) {
-        failure(error);
+        NSDictionary *errorDic = @{@"errorCode": [NSString stringWithFormat:@"%ld", error.code], @"errorMessage": error.localizedDescription};
+        
+        if (failure) {
+            failure(errorDic);
+        }
+        
         [CNLiveUserSystemTools errorStat:error.localizedDescription];
     }];
@@ -11,6 +11,6 @@
 @interface CNLiveUploadIcon : NSObject
-- (void)uploadIconWithAppId:(NSString *)appId uid:(NSString *)uid icon:(UIImage *)image token:(NSString *)token secret:(NSString *)secret success:(void (^)(id))success failure:(void (^)(NSError *))failure;
+- (void)uploadIconWithAppId:(NSString *)appId uid:(NSString *)uid icon:(UIImage *)image token:(NSString *)token secret:(NSString *)secret success:(void (^)(id))success failure:(void (^)(NSDictionary *errorDic))failure;
 @end
@@ -19,14 +19,14 @@ static  NSString *uploadIconURL = @&quot;https://api.cnlive.com/open/api2/user/update
 @implementation CNLiveUploadIcon
-- (void)uploadIconWithAppId:(NSString *)appId uid:(NSString *)uid icon:(UIImage *)image token:(NSString *)token secret:(NSString *)secret success:(void (^)(id))success failure:(void (^)(NSError *))failure
+- (void)uploadIconWithAppId:(NSString *)appId uid:(NSString *)uid icon:(UIImage *)image token:(NSString *)token secret:(NSString *)secret success:(void (^)(id))success failure:(void (^)(NSDictionary *))failure
 {
     [self getAccessTokenRequestWithAppId:appId uid:uid icon:image token:token secret:secret success:success failure:failure];
 }
 #pragma mark - request
-- (void)getAccessTokenRequestWithAppId:(NSString *)appId  uid:(NSString *)uid icon:(UIImage *)image token:(NSString *)token secret:(NSString *)secret success:(void (^)(id))success failure:(void (^)(NSError *))failure
+- (void)getAccessTokenRequestWithAppId:(NSString *)appId  uid:(NSString *)uid icon:(UIImage *)image token:(NSString *)token secret:(NSString *)secret success:(void (^)(id))success failure:(void (^)(NSDictionary *))failure
 {
     NSDictionary *paramters = @{@"appId":[CNLiveUserSystemTools verify:appId],
                                 @"secret":[CNLiveUserSystemTools verify:secret]};
@@ -41,20 +41,30 @@ static  NSString *uploadIconURL = @&quot;https://api.cnlive.com/open/api2/user/update
                 NSDictionary *dic = responseObject[@"data"];
                 [self uploadIconRequestWithUid:uid icon:image token:token access_token:dic[@"access_token"] success:success failure:failure];
             } else {
-                NSError *error = [NSError errorWithDomain:NSURLErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey :responseObject[@"errorMessage"]}];
-                failure(error);
+                if (failure) {
+                    failure(responseObject);
+                }
             }
         } else {
-            NSError *error = [NSError errorWithDomain:NSURLErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey :@"获取access_token失败"}];
-            failure(error);
+            NSDictionary *errorDic = @{@"errorCode": @"-1",
+                                       @"errorMessage": @"获取access_token失败"};
+            
+            if (failure) {
+                failure(errorDic);
+            }
         }
     } failure:^(NSURLResponse * _Nullable response, NSError * _Nullable error) {
-        failure(error);
+      
+        NSDictionary *errorDic = @{@"errorCode": [NSString stringWithFormat:@"%ld", error.code], @"errorMessage": error.localizedDescription};
+        
+        if (failure) {
+            failure(errorDic);
+        }
     }];
 }
-- (void)uploadIconRequestWithUid:(NSString *)uid icon:(UIImage *)image token:(NSString *)token access_token:(NSString *)accessToken success:(void (^)(id))success failure:(void (^)(NSError *))failure
+- (void)uploadIconRequestWithUid:(NSString *)uid icon:(UIImage *)image token:(NSString *)token access_token:(NSString *)accessToken success:(void (^)(id))success failure:(void (^)(NSDictionary *))failure
 {
     NSData *data = UIImageJPEGRepresentation(image, 0.5);
@@ -69,19 +79,28 @@ static  NSString *uploadIconURL = @&quot;https://api.cnlive.com/open/api2/user/update
         if ([[responseObject allKeys] containsObject:@"errorCode"] && [responseObject[@"errorCode"] isEqualToString:@"0"]) {
-            success(responseObject);
+            if (success) {
+                success(responseObject);
+            }
         } else {
-            NSError *error = [NSError errorWithDomain:NSURLErrorDomain code:[responseObject[@"errorCode"] integerValue] userInfo:@{NSLocalizedDescriptionKey : responseObject[@"errorMessage"]}];
-            failure(error);
+            if (failure) {
+                failure(responseObject);
+            }
             [CNLiveUserSystemTools errorStat:responseObject[@"errorMessage"]];
         }
     } failure:^(NSURLResponse * _Nullable response, NSError * _Nullable error) {
-        failure(error);
+
+        NSDictionary *errorDic = @{@"errorCode": [NSString stringWithFormat:@"%ld", error.code], @"errorMessage": error.localizedDescription};
+        
+        if (failure) {
+            failure(errorDic);
+        }
+        
         [CNLiveUserSystemTools errorStat:error.localizedDescription];
     }];
 }
@@ -14,22 +14,22 @@
 /**
  *  更新手机号
  */
-- (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 (^)(NSError *error))failure;
+- (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)queryUserInfoWithAppId:(NSString *)appId appKey:(NSString *)appKey uid:(NSString *)uid srcUid:(NSString *)srcUid token:(NSString *)token success:(void (^)(id result))success failure :(void (^)(NSError *error))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;
 /**
  *  修改用户单项信息
  */
-- (void)modifyUserInfoWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(UserInfoType)type uid:(NSString *)uid modifyInfo:(NSString *)info token:(NSString *)token success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
+- (void)modifyUserInfoWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(UserInfoType)type uid:(NSString *)uid modifyInfo:(NSString *)info token:(NSString *)token success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
-- (void)updateOtherInfoWithAppId:(NSString *)appId appKey:(NSString *)appKey uid:(NSString *)uid extInfo:(NSString *)extInfo token:(NSString *)token success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
+- (void)updateOtherInfoWithAppId:(NSString *)appId appKey:(NSString *)appKey uid:(NSString *)uid extInfo:(NSString *)extInfo token:(NSString *)token success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
 /**
  *  通过手机修改密码
  */
-- (void)changePasswordWithAppId:(NSString *)appId appKey:(NSString *)appKey mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode newPassword:(NSString *)newPassword success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
+- (void)changePasswordWithAppId:(NSString *)appId appKey:(NSString *)appKey mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode newPassword:(NSString *)newPassword success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
 @end
@@ -31,7 +31,7 @@ static  NSString *updatePwdURL = @&quot;https://api.cnlive.com/open/api2/user/updateP
 /**
  *  更新手机号
  */
-- (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 (^)(NSError *))failure
+- (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 *))failure
 {
     NSDate *date = [NSDate date];
     NSInteger time = [date timeIntervalSince1970];
@@ -58,7 +58,7 @@ static  NSString *updatePwdURL = @&quot;https://api.cnlive.com/open/api2/user/updateP
 /**
  *  查询用户信息
  */
-- (void)queryUserInfoWithAppId:(NSString *)appId appKey:(NSString *)appKey uid:(NSString *)uid srcUid:(NSString *)srcUid token:(NSString *)token success:(void (^)(id result))success failure:(void (^)(NSError *))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
 {
     NSDate *date = [NSDate date];
     NSInteger time = [date timeIntervalSince1970];
@@ -72,6 +72,8 @@ static  NSString *updatePwdURL = @&quot;https://api.cnlive.com/open/api2/user/updateP
                              @"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];
@@ -84,7 +86,7 @@ static  NSString *updatePwdURL = @&quot;https://api.cnlive.com/open/api2/user/updateP
 /**
  *  修改用户单项信息
  */
-- (void)modifyUserInfoWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(UserInfoType)type uid:(NSString *)uid modifyInfo:(NSString *)info token:(NSString *)token success:(void (^)(id result))success failure :(void (^)(NSError *error))failure
+- (void)modifyUserInfoWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(UserInfoType)type uid:(NSString *)uid modifyInfo:(NSString *)info token:(NSString *)token success:(void (^)(id result))success failure :(void (^)(NSDictionary *error))failure
 {
     NSDate *date = [NSDate date];
@@ -112,7 +114,7 @@ static  NSString *updatePwdURL = @&quot;https://api.cnlive.com/open/api2/user/updateP
 /**
  *  更新用户附加信息
  */
-- (void)updateOtherInfoWithAppId:(NSString *)appId appKey:(NSString *)appKey uid:(NSString *)uid extInfo:(NSString *)extInfo token:(NSString *)token success:(void (^)(id result))success failure:(void (^)(NSError *))failure
+- (void)updateOtherInfoWithAppId:(NSString *)appId appKey:(NSString *)appKey uid:(NSString *)uid extInfo:(NSString *)extInfo token:(NSString *)token success:(void (^)(id result))success failure:(void (^)(NSDictionary *))failure
 {
     NSDate *date = [NSDate date];
     NSInteger time = [date timeIntervalSince1970];
@@ -137,7 +139,7 @@ static  NSString *updatePwdURL = @&quot;https://api.cnlive.com/open/api2/user/updateP
 /**
  *  修改密码
  */
-- (void)changePasswordWithAppId:(NSString *)appId appKey:(NSString *)appKey mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode newPassword:(NSString *)newPassword success:(void (^)(id result))success failure:(void (^)(NSError *))failure
+- (void)changePasswordWithAppId:(NSString *)appId appKey:(NSString *)appKey mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode newPassword:(NSString *)newPassword success:(void (^)(id result))success failure:(void (^)(NSDictionary *))failure
 {
     NSDate *date = [NSDate date];
     NSInteger time = [date timeIntervalSince1970];
@@ -162,7 +164,7 @@ static  NSString *updatePwdURL = @&quot;https://api.cnlive.com/open/api2/user/updateP
 #pragma mark - request
-- (void)requestWithURL:(NSString *)URL parameter:(NSDictionary *)param success:(void(^)(id result))success failure :(void (^)(NSError *  error))failure
+- (void)requestWithURL:(NSString *)URL parameter:(NSDictionary *)param success:(void(^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
 {
     [[CNLiveNetworkManager manager] requestPostURL:URL parameters:param success:^(NSURLResponse * _Nullable response, id  _Nullable responseObject) {
@@ -171,19 +173,27 @@ static  NSString *updatePwdURL = @&quot;https://api.cnlive.com/open/api2/user/updateP
         if ([[responseObject allKeys] containsObject:@"errorCode"] && [responseObject[@"errorCode"] isEqualToString:@"0"]) {
-            success(responseObject);
+            if (success) {
+                success(responseObject);
+            }
         } else {
-            NSError *error = [NSError errorWithDomain:NSURLErrorDomain code:[responseObject[@"errorCode"] integerValue] userInfo:@{NSLocalizedDescriptionKey : responseObject[@"errorMessage"]}];
-            failure(error);
+            if (failure) {
+                failure(responseObject);
+            }
             [CNLiveUserSystemTools errorStat:responseObject[@"errorMessage"]];
         }
     } failure:^(NSURLResponse * _Nullable response, NSError * _Nullable error) {
-        failure(error);
+        NSDictionary *errorDic = @{@"errorCode": [NSString stringWithFormat:@"%ld", error.code], @"errorMessage": error.localizedDescription};
+        
+        if (failure) {
+            failure(errorDic);
+        }
+        
         [CNLiveUserSystemTools errorStat:error.localizedDescription];
     }];
@@ -32,7 +32,7 @@
  @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      第三方登录
@@ -46,7 +46,7 @@
  @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 +56,7 @@
  @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 +66,7 @@
  @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 +75,7 @@
  @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 +84,7 @@
  @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 +94,7 @@
  @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 +104,7 @@
  @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      修改密码（通过手机号修改）
@@ -114,7 +114,7 @@
  @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 +123,7 @@
  @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 +132,7 @@
  @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 +141,7 @@
  @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版本号
@@ -31,7 +31,7 @@
 /**
  *  注册
  */
-+ (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))success failure :(void (^)(NSDictionary *))failure
 {
     CNLiveRegister *userRegister = [[CNLiveRegister alloc] init];
@@ -41,7 +41,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 (^)(NSError *))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))success failure:(void (^)(NSDictionary *))failure
 {
     CNLiveLogin *thirdLogin = [[CNLiveLogin alloc] init];
@@ -52,7 +52,7 @@
  *  快捷登录
  */
-+ (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))success failure :(void (^)(NSDictionary *))failure
 {
     CNLiveLogin *shortcutLogin = [[CNLiveLogin alloc] init];
@@ -62,7 +62,7 @@
 /**
  *  登录
  */
-+ (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))success failure :(void (^)(NSDictionary *))failure
 {
     CNLiveLogin *login = [[CNLiveLogin alloc] init];
@@ -72,7 +72,7 @@
 /**
  *  发送验证码
  */
-+ (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))success failure :(void (^)(NSDictionary *))failure
 {
     CNLiveVerificationCode *verification = [[CNLiveVerificationCode alloc] init];
@@ -82,7 +82,7 @@
 /**
  *  更新用户附加信息
  */
-+ (void)updateOtherInfoWithUid:(NSString *)uid extInfo:(NSString *)extInfo success:(void (^)(id result))success failure:(void (^)(NSError *))failure
++(void)updateOtherInfoWithUid:(NSString *)uid extInfo:(NSString *)extInfo success:(void (^)(id))success failure:(void (^)(NSDictionary *))failure
 {
     CNLiveUserInfo *updateOtherInfo = [[CNLiveUserInfo alloc] init];
@@ -92,7 +92,7 @@
 /**
  *  修改用户单项信息
  */
-+ (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))success failure:(void (^)(NSDictionary *))failure
 {
     CNLiveUserInfo *updateUserInfo = [[CNLiveUserInfo alloc] init];
@@ -102,7 +102,7 @@
 /**
  *  更新手机号
  */
-+ (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))success failure:(void (^)(NSDictionary *))failure
 {
     CNLiveUserInfo *updateMobile = [[CNLiveUserInfo alloc] init];
@@ -112,7 +112,7 @@
 /**
  *  修改密码
  */
-+ (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))success failure:(void (^)(NSDictionary *))failure
 {
     CNLiveUserInfo *password = [[CNLiveUserInfo alloc] init];
@@ -123,7 +123,7 @@
 /**
  *  上传头像
  */
-+ (void)uploadIconWithUid:(NSString *)uid icon:(UIImage *)icon success:(void (^)(id))success failure:(void (^)(NSError *))failure
++(void)uploadIconWithUid:(NSString *)uid icon:(UIImage *)icon success:(void (^)(id))success failure:(void (^)(NSDictionary *))failure
 {
     CNLiveUploadIcon *uplodIcon = [[CNLiveUploadIcon alloc] init];
     [uplodIcon uploadIconWithAppId:[CNLiveUserManager manager].appId uid:uid icon:icon token:[[self class] getToken] secret:[CNLiveUserManager manager].appSecret success:success failure:failure];
@@ -132,7 +132,7 @@
 /**
  *  查询用户信息
  */
-+ (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))success failure:(void (^)(NSDictionary *))failure
 {
     CNLiveUserInfo *userInfo = [[CNLiveUserInfo alloc] init];
@@ -142,7 +142,7 @@
 /**
  *  用户反馈
  */
-+ (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))success failure :(void (^)(NSDictionary *errorDic))failure
 {
     CNLiveFeedback *feedback = [[CNLiveFeedback alloc] init];
@@ -11,6 +11,6 @@
 @interface CNLiveVerificationCode : NSObject
-- (void)getVerificationCodeWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(VerificationCodeType)type mobile:(NSString *)mobile success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
+- (void)getVerificationCodeWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(VerificationCodeType)type mobile:(NSString *)mobile success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
 @end
@@ -22,7 +22,7 @@ static  NSString *passwordURL = @&quot;https://api.cnlive.com/open/api2/user/sendVeri
 @implementation CNLiveVerificationCode
-- (void)getVerificationCodeWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(VerificationCodeType)type mobile:(NSString *)mobile success:(void (^)(id result))success failure:(void (^)(NSError *))failure
+- (void)getVerificationCodeWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(VerificationCodeType)type mobile:(NSString *)mobile success:(void (^)(id result))success failure:(void (^)(NSDictionary *))failure
 {
     NSDate *date = [NSDate date];
     NSInteger time = [date timeIntervalSince1970];
@@ -45,7 +45,7 @@ static  NSString *passwordURL = @&quot;https://api.cnlive.com/open/api2/user/sendVeri
 #pragma mark - request
-- (void)requestWithURL:(NSString *)URL parameter:(NSDictionary *)param success:(void(^)(id result))success failure :(void (^)(NSError *  error))failure
+- (void)requestWithURL:(NSString *)URL parameter:(NSDictionary *)param success:(void(^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
 {
     [[CNLiveNetworkManager manager] requestPostURL:URL parameters:param success:^(NSURLResponse * _Nullable response, id  _Nullable responseObject) {
@@ -53,19 +53,27 @@ static  NSString *passwordURL = @&quot;https://api.cnlive.com/open/api2/user/sendVeri
         if ([[responseObject allKeys] containsObject:@"errorCode"] && [responseObject[@"errorCode"] isEqualToString:@"0"]) {
-            success(responseObject);
+            if (success) {
+                success(responseObject);
+            }
         } else {
-            NSError *error = [NSError errorWithDomain:NSURLErrorDomain code:[responseObject[@"errorCode"] integerValue] userInfo:@{NSLocalizedDescriptionKey : responseObject[@"errorMessage"]}];
-            failure(error);
+            if (failure) {
+                failure(responseObject);
+            }
             [CNLiveUserSystemTools errorStat:responseObject[@"errorMessage"]];
         }
     } failure:^(NSURLResponse * _Nullable response, NSError * _Nullable error) {
-        failure(error);
+        NSDictionary *errorDic = @{@"errorCode": [NSString stringWithFormat:@"%ld", error.code], @"errorMessage": error.localizedDescription};
+        
+        if (failure) {
+            failure(errorDic);
+        }
+        
         [CNLiveUserSystemTools errorStat:error.localizedDescription];
     }];
@@ -11,6 +11,6 @@
 #define kSVer @"4.0"  //探针版本
 #define StatAppVersion  ([[[NSBundle mainBundle] infoDictionary] objectForKey: @"CFBundleShortVersionString"])
-#define SDKVersion @"1.1.1"  //SDK版本
+#define SDKVersion @"1.1.2"  //SDK版本
 #endif /* Common_h */
@@ -53,22 +53,18 @@
 {
     [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeClear];
     [SVProgressHUD show];
-
-    [CNLiveUserSystemCenter loginWithUserName:_idAndPwdView.idTF.text password:_idAndPwdView.pwdTF.text frmId:nil success:^(id result) {
+    
+    [CNLiveUserSystemCenter loginWithUserName:@"941123686@qq.com" password:@"123456" frmId:nil success:^(id result) {
         NSLog(@"登录 success------------%@",result);
-        
-        [Tools setUserLogin:YES];
         [SVProgressHUD showSuccessWithStatus:@"登录成功"];
         [UserInfoSava saveUserinfoDic:result[@"data"]];
+        [Tools setUserLogin:YES];
         [self.navigationController popViewControllerAnimated:YES];
-
-
-    } failure:^(NSError *error) {
-        [Tools toast:error.localizedDescription];
+    } failure:^(NSDictionary *errorDic) {
+        [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
         [SVProgressHUD dismiss];
-
     }];
 }
@@ -50,8 +50,8 @@
             [SVProgressHUD showSuccessWithStatus:@"手机号修改成功"];
             [self.navigationController popViewControllerAnimated:YES];
-        } failure:^(NSError *error) {
-            [Tools toast:error.localizedDescription];
+        } failure:^(NSDictionary *errorDic) {
+            [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
             [SVProgressHUD dismiss];
         }];
@@ -63,10 +63,9 @@
             [SVProgressHUD showSuccessWithStatus:@"修改成功"];
             [self.navigationController popViewControllerAnimated:YES];
-        } failure:^(NSError *error) {
-            [Tools toast:error.localizedDescription];
+        } failure:^(NSDictionary *errorDic) {
+            [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
             [SVProgressHUD dismiss];
-
         }];
     }
 }
@@ -79,8 +78,8 @@
         [Tools toast:result[@"errorMessage"]];
-    } failure:^(NSError *error) {
-        [Tools toast:error.localizedDescription];
+    } failure:^(NSDictionary *errorDic) {
+        [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
     }];
 }
@@ -49,8 +49,8 @@
             [Tools toast:result[@"errorMessage"]];
-        } failure:^(NSError *error) {
-            [Tools toast:error.localizedDescription];
+        } failure:^(NSDictionary *errorDic) {
+            [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
         }];
     } else if ([_type isEqualToString:@"quicklyLogin"]) {
@@ -59,9 +59,8 @@
             [Tools toast:result[@"errorMessage"]];
-        } failure:^(NSError *error) {
-            
-            [Tools toast:error.localizedDescription];
+        } failure:^(NSDictionary *errorDic) {
+            [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
         }];
     } else {
@@ -70,9 +69,8 @@
             [Tools toast:result[@"errorMessage"]];
-        } failure:^(NSError *error) {
-            
-            [Tools toast:error.localizedDescription];
+        } failure:^(NSDictionary *errorDic) {
+            [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
         }];
     }
 }
@@ -92,11 +90,9 @@
             [UserInfoSava saveUserinfoDic:result[@"data"]];
             [self.navigationController popToRootViewControllerAnimated:YES];
-        } failure:^(NSError *error) {
-            
-            [Tools toast:error.localizedDescription];
+        } failure:^(NSDictionary *errorDic) {
             [SVProgressHUD dismiss];
-            
+            [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
         }];
     } else if ([_type isEqualToString:@"quicklyLogin"]) {
@@ -108,11 +104,9 @@
             [UserInfoSava saveUserinfoDic:result[@"data"]];
             [self.navigationController popToRootViewControllerAnimated:YES];
-        } failure:^(NSError *error) {
-            
-            [Tools toast:error.localizedDescription];
+        } failure:^(NSDictionary *errorDic) {
+            [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
             [SVProgressHUD dismiss];
-            
         }];
     } else {
@@ -121,10 +115,9 @@
             [SVProgressHUD showSuccessWithStatus:@"密码修改成功"];
             [self.navigationController popToRootViewControllerAnimated:YES];
-        } failure:^(NSError *error) {
-            [Tools toast:error.localizedDescription];
+        } failure:^(NSDictionary *errorDic) {
+            [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
             [SVProgressHUD dismiss];
-
         }];
     }
@@ -193,8 +193,8 @@
         NSLog(@"%@",result);
         [SVProgressHUD showSuccessWithStatus:@"修改成功"];
-    } failure:^(NSError *error) {
-        [Tools toast:error.localizedDescription];
+    } failure:^(NSDictionary *errorDic) {
+        [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
         [SVProgressHUD dismiss];
     }];
 }
@@ -227,8 +227,8 @@
             NSLog(@"%@",result);
-        } failure:^(NSError *error) {
-            [Tools toast:error.localizedDescription];
+        } failure:^(NSDictionary *errorDic) {
+            [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
         }];
     } else {
@@ -132,8 +132,8 @@
             [SVProgressHUD showSuccessWithStatus:@"更新附加信息成功"];
             [self.navigationController popViewControllerAnimated:YES];
-        } failure:^(NSError *error) {
-            [Tools toast:error.localizedDescription];
+        } failure:^(NSDictionary *errorDic) {
+            [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
             [SVProgressHUD dismiss];
         }];
     }
@@ -157,8 +157,8 @@
             [_tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:0 inSection:0]] withRowAnimation:UITableViewRowAnimationFade];
             [Tools toast:message];
-        } failure:^(NSError *error) {
-            [Tools toast:error.localizedDescription];
+        } failure:^(NSDictionary *errorDic) {
+            [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
         }];
     }
@@ -167,8 +167,8 @@
         [CNLiveUserSystemCenter feedbackWithContentId:@"11" message:@"fhsjhifkncznshfu" success:^(id result) {
             [Tools toast:[NSString stringWithFormat:@"反馈--%@",result[@"errorMessage"]]];
-        } failure:^(NSError *error) {
-            [Tools toast:error.localizedDescription];
+        } failure:^(NSDictionary *errorDic) {
+            [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
         }];
     }
 }
@@ -114,7 +114,7 @@
     NSString *gender;
     if ([[result objectForKey:@"gender"] isEqualToString:@"女"]) {
         gender = @"f";
-    } else if ([[result objectForKey:@"gender"] isEqualToString:@"女"]) {
+    } else if ([[result objectForKey:@"gender"] isEqualToString:@"男"]) {
         gender = @"m";
     } else {
         gender = @"n";
@@ -128,7 +128,7 @@
         [UserInfoSava saveUserinfoDic:result[@"data"]];
         [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
-    } failure:^(NSError *error) {
+    } failure:^(NSDictionary *errorDic) {
         [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
     }];
 }
@@ -252,7 +252,7 @@
                         [UserInfoSava saveUserinfoDic:result[@"data"]];
                         [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
-                    } failure:^(NSError *error) {
+                    } failure:^(NSDictionary *errorDic) {
                         [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
                     }];
                 }
@@ -308,10 +308,9 @@
             [UserInfoSava saveUserinfoDic:result[@"data"]];
             [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
-        } failure:^(NSError *error) {
+        } failure:^(NSDictionary *errorDic) {
             [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
         }];
-
     }
 }
@@ -379,6 +379,7 @@
 				INFOPLIST_FILE = CNLiveUserSystemSDK/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MACH_O_TYPE = staticlib;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveUserSystemSDK;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -396,6 +397,7 @@
 				INFOPLIST_FILE = CNLiveUserSystemSDK/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MACH_O_TYPE = staticlib;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveUserSystemSDK;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.1.2</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.1.110113</string>
+	<string>1.1.12.111714</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>