Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/CNLiveUserSystemSDKDemo

# Conflicts: # CNLive用户系统说明文档.pdf

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/CNLiveUserSystemSDKDemo
# Conflicts: # CNLive用户系统说明文档.pdf
cnlive
2 parents 7d37a205 91542ffb
Showing 12 changed files with 109 additions and 168 deletions
CNLiveUserSystemDemo/CNLiveUserSystemDemo.xcodeproj/project.pbxproj
CNLiveUserSystemDemo/CNLiveUserSystemDemo.xcodeproj/project.xcworkspace/xcuserdata/iOS.xcuserdatad/UserInterfaceState.xcuserstate
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/LoginViewController.m
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/ModifyUserInfoViewController.m
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/RegisterViewController.m
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/UserInfoViewController.m
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/ViewController.m
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Tools/CNLiveThirdLoginManager.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK.framework/CNLiveUserSystemSDK
CNLiveUserSystemDemo/CNLiveUserSystemSDK.framework/Info.plist
CNLive用户系统使用指南.pdf
CNLive用户系统说明文档.pdf
@@ -42,9 +42,6 @@
 		811600FD1D927E7E003CAE7D /* UIView+WebCacheOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 811600EC1D927E7E003CAE7D /* UIView+WebCacheOperation.m */; };
 		811600FE1D927E7E003CAE7D /* WebP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 811600ED1D927E7E003CAE7D /* WebP.framework */; };
 		8116F8E41D8916250084FE49 /* IdAndPwdView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8116F8E31D8916250084FE49 /* IdAndPwdView.m */; };
-		8116F8EA1D89165A0084FE49 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8116F8E71D89165A0084FE49 /* LoginViewController.m */; };
-		8116F8EB1D89165A0084FE49 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8116F8E91D89165A0084FE49 /* ViewController.m */; };
-		8116F8EE1D891AEF0084FE49 /* RegisterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8116F8ED1D891AEF0084FE49 /* RegisterViewController.m */; };
 		8116F8F11D891BCD0084FE49 /* RegistBasicInformationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8116F8F01D891BCD0084FE49 /* RegistBasicInformationView.m */; };
 		812642C61D86A7A800B402CA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 812642C51D86A7A800B402CA /* main.m */; };
 		812642C91D86A7A800B402CA /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 812642C81D86A7A800B402CA /* AppDelegate.m */; };
@@ -64,13 +61,16 @@
 		8187A90D1D8E9A7B007FAFB6 /* SVProgressHUD.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8187A9061D8E9A7B007FAFB6 /* SVProgressHUD.bundle */; };
 		8187A90E1D8E9A7B007FAFB6 /* SVProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 8187A9081D8E9A7B007FAFB6 /* SVProgressHUD.m */; };
 		8187A90F1D8E9A7B007FAFB6 /* SVRadialGradientLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 8187A90A1D8E9A7B007FAFB6 /* SVRadialGradientLayer.m */; };
-		818C7F9D1DA9EF91006825D7 /* CNLiveUserSystemSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 818C7F9C1DA9EF91006825D7 /* CNLiveUserSystemSDK.framework */; };
-		818C7F9E1DA9EF9B006825D7 /* CNLiveUserSystemSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 818C7F9C1DA9EF91006825D7 /* CNLiveUserSystemSDK.framework */; };
-		818C7F9F1DA9EF9B006825D7 /* CNLiveUserSystemSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 818C7F9C1DA9EF91006825D7 /* CNLiveUserSystemSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		B6B54BE71D8CFEC200089C9C /* UserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B54BE61D8CFEC200089C9C /* UserInfoViewController.m */; };
+		81DA8A1A1DC8623800EE1612 /* CNLiveUserSystemSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81DA8A191DC8623800EE1612 /* CNLiveUserSystemSDK.framework */; };
+		81DA8A1B1DC8623F00EE1612 /* CNLiveUserSystemSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81DA8A191DC8623800EE1612 /* CNLiveUserSystemSDK.framework */; };
+		81DA8A1C1DC8623F00EE1612 /* CNLiveUserSystemSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 81DA8A191DC8623800EE1612 /* CNLiveUserSystemSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		81DA8A281DC8630900EE1612 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81DA8A1F1DC8630900EE1612 /* LoginViewController.m */; };
+		81DA8A291DC8630900EE1612 /* ModifyUserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81DA8A211DC8630900EE1612 /* ModifyUserInfoViewController.m */; };
+		81DA8A2A1DC8630900EE1612 /* RegisterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81DA8A231DC8630900EE1612 /* RegisterViewController.m */; };
+		81DA8A2B1DC8630900EE1612 /* UserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81DA8A251DC8630900EE1612 /* UserInfoViewController.m */; };
+		81DA8A2C1DC8630900EE1612 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81DA8A271DC8630900EE1612 /* ViewController.m */; };
 		B6B54BEA1D8D009800089C9C /* UserInfoHeaderImageTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B54BE91D8D009800089C9C /* UserInfoHeaderImageTableViewCell.m */; };
 		B6B54BED1D8D011000089C9C /* UserInfoTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B54BEC1D8D011000089C9C /* UserInfoTableViewCell.m */; };
-		B6B54BF01D8D025A00089C9C /* ModifyUserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B54BEF1D8D025A00089C9C /* ModifyUserInfoViewController.m */; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
@@ -97,7 +97,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				818C7F9F1DA9EF9B006825D7 /* CNLiveUserSystemSDK.framework in Embed Frameworks */,
+				81DA8A1C1DC8623F00EE1612 /* CNLiveUserSystemSDK.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -172,12 +172,6 @@
 		8116F8DA1D88F3010084FE49 /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
 		8116F8E21D8916250084FE49 /* IdAndPwdView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IdAndPwdView.h; sourceTree = "<group>"; };
 		8116F8E31D8916250084FE49 /* IdAndPwdView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IdAndPwdView.m; sourceTree = "<group>"; };
-		8116F8E61D89165A0084FE49 /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
-		8116F8E71D89165A0084FE49 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
-		8116F8E81D89165A0084FE49 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
-		8116F8E91D89165A0084FE49 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
-		8116F8EC1D891AEF0084FE49 /* RegisterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegisterViewController.h; sourceTree = "<group>"; };
-		8116F8ED1D891AEF0084FE49 /* RegisterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegisterViewController.m; sourceTree = "<group>"; };
 		8116F8EF1D891BCD0084FE49 /* RegistBasicInformationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegistBasicInformationView.h; sourceTree = "<group>"; };
 		8116F8F01D891BCD0084FE49 /* RegistBasicInformationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegistBasicInformationView.m; sourceTree = "<group>"; };
 		812642C11D86A7A800B402CA /* CNLiveUserSystemDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CNLiveUserSystemDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -215,15 +209,21 @@
 		8187A9081D8E9A7B007FAFB6 /* SVProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVProgressHUD.m; sourceTree = "<group>"; };
 		8187A9091D8E9A7B007FAFB6 /* SVRadialGradientLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVRadialGradientLayer.h; sourceTree = "<group>"; };
 		8187A90A1D8E9A7B007FAFB6 /* SVRadialGradientLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVRadialGradientLayer.m; sourceTree = "<group>"; };
-		818C7F9C1DA9EF91006825D7 /* CNLiveUserSystemSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveUserSystemSDK.framework; sourceTree = "<group>"; };
-		B6B54BE51D8CFEC200089C9C /* UserInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoViewController.h; sourceTree = "<group>"; };
-		B6B54BE61D8CFEC200089C9C /* UserInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoViewController.m; sourceTree = "<group>"; };
+		81DA8A191DC8623800EE1612 /* CNLiveUserSystemSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveUserSystemSDK.framework; sourceTree = "<group>"; };
+		81DA8A1E1DC8630900EE1612 /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
+		81DA8A1F1DC8630900EE1612 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
+		81DA8A201DC8630900EE1612 /* ModifyUserInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifyUserInfoViewController.h; sourceTree = "<group>"; };
+		81DA8A211DC8630900EE1612 /* ModifyUserInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModifyUserInfoViewController.m; sourceTree = "<group>"; };
+		81DA8A221DC8630900EE1612 /* RegisterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegisterViewController.h; sourceTree = "<group>"; };
+		81DA8A231DC8630900EE1612 /* RegisterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegisterViewController.m; sourceTree = "<group>"; };
+		81DA8A241DC8630900EE1612 /* UserInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoViewController.h; sourceTree = "<group>"; };
+		81DA8A251DC8630900EE1612 /* UserInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoViewController.m; sourceTree = "<group>"; };
+		81DA8A261DC8630900EE1612 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
+		81DA8A271DC8630900EE1612 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
 		B6B54BE81D8D009800089C9C /* UserInfoHeaderImageTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoHeaderImageTableViewCell.h; sourceTree = "<group>"; };
 		B6B54BE91D8D009800089C9C /* UserInfoHeaderImageTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoHeaderImageTableViewCell.m; sourceTree = "<group>"; };
 		B6B54BEB1D8D011000089C9C /* UserInfoTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoTableViewCell.h; sourceTree = "<group>"; };
 		B6B54BEC1D8D011000089C9C /* UserInfoTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoTableViewCell.m; sourceTree = "<group>"; };
-		B6B54BEE1D8D025A00089C9C /* ModifyUserInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifyUserInfoViewController.h; sourceTree = "<group>"; };
-		B6B54BEF1D8D025A00089C9C /* ModifyUserInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModifyUserInfoViewController.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -231,6 +231,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				81DA8A1A1DC8623800EE1612 /* CNLiveUserSystemSDK.framework in Frameworks */,
 				811600FE1D927E7E003CAE7D /* WebP.framework in Frameworks */,
 				817C6EC31D90D60E0016F211 /* ImageIO.framework in Frameworks */,
 				810D9B811D8FCD3200B7A776 /* libc++.tbd in Frameworks */,
@@ -244,8 +245,7 @@
 				810D9B6E1D8FB76E00B7A776 /* libiconv.tbd in Frameworks */,
 				810D9B6C1D8FB76300B7A776 /* Security.framework in Frameworks */,
 				810D9B651D8FB70600B7A776 /* TencentOpenAPI.framework in Frameworks */,
-				818C7F9E1DA9EF9B006825D7 /* CNLiveUserSystemSDK.framework in Frameworks */,
-				818C7F9D1DA9EF91006825D7 /* CNLiveUserSystemSDK.framework in Frameworks */,
+				81DA8A1B1DC8623F00EE1612 /* CNLiveUserSystemSDK.framework in Frameworks */,
 				810D9B671D8FB70600B7A776 /* libWeiboSDK.a in Frameworks */,
 				810D9B691D8FB70600B7A776 /* libWeChatSDK.a in Frameworks */,
 			);
@@ -384,27 +384,10 @@
 			path = Views;
 			sourceTree = "<group>";
 		};
-		8116F8E51D89165A0084FE49 /* Conreollers */ = {
-			isa = PBXGroup;
-			children = (
-				8116F8E81D89165A0084FE49 /* ViewController.h */,
-				8116F8E91D89165A0084FE49 /* ViewController.m */,
-				8116F8E61D89165A0084FE49 /* LoginViewController.h */,
-				8116F8E71D89165A0084FE49 /* LoginViewController.m */,
-				8116F8EC1D891AEF0084FE49 /* RegisterViewController.h */,
-				8116F8ED1D891AEF0084FE49 /* RegisterViewController.m */,
-				B6B54BE51D8CFEC200089C9C /* UserInfoViewController.h */,
-				B6B54BE61D8CFEC200089C9C /* UserInfoViewController.m */,
-				B6B54BEE1D8D025A00089C9C /* ModifyUserInfoViewController.h */,
-				B6B54BEF1D8D025A00089C9C /* ModifyUserInfoViewController.m */,
-			);
-			path = Conreollers;
-			sourceTree = "<group>";
-		};
 		812642B81D86A7A800B402CA = {
 			isa = PBXGroup;
 			children = (
-				818C7F9C1DA9EF91006825D7 /* CNLiveUserSystemSDK.framework */,
+				81DA8A191DC8623800EE1612 /* CNLiveUserSystemSDK.framework */,
 				810D9B7D1D8FCBC200B7A776 /* frameworks */,
 				812642C31D86A7A800B402CA /* CNLiveUserSystemDemo */,
 				812642DD1D86A7A800B402CA /* CNLiveUserSystemDemoTests */,
@@ -430,7 +413,7 @@
 				812642C81D86A7A800B402CA /* AppDelegate.m */,
 				8187A8EC1D8E6385007FAFB6 /* Tools */,
 				8187A8FF1D8E9A7B007FAFB6 /* ThirdSDK */,
-				8116F8E51D89165A0084FE49 /* Conreollers */,
+				81DA8A1D1DC8630900EE1612 /* Conreollers */,
 				8116F8E11D8916250084FE49 /* Views */,
 				812642CD1D86A7A800B402CA /* Main.storyboard */,
 				812642D01D86A7A800B402CA /* Assets.xcassets */,
@@ -516,6 +499,23 @@
 			path = SVProgressHUD;
 			sourceTree = "<group>";
 		};
+		81DA8A1D1DC8630900EE1612 /* Conreollers */ = {
+			isa = PBXGroup;
+			children = (
+				81DA8A1E1DC8630900EE1612 /* LoginViewController.h */,
+				81DA8A1F1DC8630900EE1612 /* LoginViewController.m */,
+				81DA8A201DC8630900EE1612 /* ModifyUserInfoViewController.h */,
+				81DA8A211DC8630900EE1612 /* ModifyUserInfoViewController.m */,
+				81DA8A221DC8630900EE1612 /* RegisterViewController.h */,
+				81DA8A231DC8630900EE1612 /* RegisterViewController.m */,
+				81DA8A241DC8630900EE1612 /* UserInfoViewController.h */,
+				81DA8A251DC8630900EE1612 /* UserInfoViewController.m */,
+				81DA8A261DC8630900EE1612 /* ViewController.h */,
+				81DA8A271DC8630900EE1612 /* ViewController.m */,
+			);
+			path = Conreollers;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 /* Begin PBXNativeTarget section */
@@ -662,34 +662,34 @@
 				8187A90C1D8E9A7B007FAFB6 /* SVProgressAnimatedView.m in Sources */,
 				811600F71D927E7E003CAE7D /* UIButton+WebCache.m in Sources */,
 				8116F8E41D8916250084FE49 /* IdAndPwdView.m in Sources */,
-				8116F8EA1D89165A0084FE49 /* LoginViewController.m in Sources */,
 				811600F81D927E7E003CAE7D /* UIImage+GIF.m in Sources */,
 				811600F61D927E7E003CAE7D /* SDWebImagePrefetcher.m in Sources */,
 				8116F8F11D891BCD0084FE49 /* RegistBasicInformationView.m in Sources */,
 				8187A8F61D8E6486007FAFB6 /* NSObject+UserModel.m in Sources */,
+				81DA8A291DC8630900EE1612 /* ModifyUserInfoViewController.m in Sources */,
 				811600F11D927E7E003CAE7D /* SDWebImageCompat.m in Sources */,
 				811600F31D927E7E003CAE7D /* SDWebImageDownloader.m in Sources */,
 				811600F41D927E7E003CAE7D /* SDWebImageDownloaderOperation.m in Sources */,
 				811600F21D927E7E003CAE7D /* SDWebImageDecoder.m in Sources */,
 				811600F51D927E7E003CAE7D /* SDWebImageManager.m in Sources */,
+				81DA8A2B1DC8630900EE1612 /* UserInfoViewController.m in Sources */,
+				81DA8A2C1DC8630900EE1612 /* ViewController.m in Sources */,
 				8187A8FB1D8E68CD007FAFB6 /* CNLiveLogout.m in Sources */,
-				8116F8EB1D89165A0084FE49 /* ViewController.m in Sources */,
 				8187A90E1D8E9A7B007FAFB6 /* SVProgressHUD.m in Sources */,
-				8116F8EE1D891AEF0084FE49 /* RegisterViewController.m in Sources */,
 				811600FD1D927E7E003CAE7D /* UIView+WebCacheOperation.m in Sources */,
 				8187A8EF1D8E6394007FAFB6 /* Tools.m in Sources */,
+				81DA8A281DC8630900EE1612 /* LoginViewController.m in Sources */,
 				812642C91D86A7A800B402CA /* AppDelegate.m in Sources */,
 				8187A90B1D8E9A7B007FAFB6 /* SVIndefiniteAnimatedView.m in Sources */,
 				811600EE1D927E7E003CAE7D /* MKAnnotationView+WebCache.m in Sources */,
+				81DA8A2A1DC8630900EE1612 /* RegisterViewController.m in Sources */,
 				811600F91D927E7E003CAE7D /* UIImage+MultiFormat.m in Sources */,
 				B6B54BED1D8D011000089C9C /* UserInfoTableViewCell.m in Sources */,
 				8187A8F81D8E6486007FAFB6 /* UserInfoSava.m in Sources */,
 				811600EF1D927E7E003CAE7D /* NSData+ImageContentType.m in Sources */,
 				812642C61D86A7A800B402CA /* main.m in Sources */,
 				811600FA1D927E7E003CAE7D /* UIImage+WebP.m in Sources */,
-				B6B54BF01D8D025A00089C9C /* ModifyUserInfoViewController.m in Sources */,
 				8187A90F1D8E9A7B007FAFB6 /* SVRadialGradientLayer.m in Sources */,
-				B6B54BE71D8CFEC200089C9C /* UserInfoViewController.m in Sources */,
 				8187A8F71D8E6486007FAFB6 /* UserInfoModel.m in Sources */,
 				811600F01D927E7E003CAE7D /* SDImageCache.m in Sources */,
 			);
@@ -57,16 +57,12 @@
     [CNLiveUserSystemCenter loginWithUserName:_idAndPwdView.idTF.text password:_idAndPwdView.pwdTF.text frmId:nil success:^(id result) {
         NSLog(@"登录 success------------%@",result);
-        if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
-            [Tools setUserLogin:YES];
-            [SVProgressHUD showSuccessWithStatus:@"登录成功"];
-            [UserInfoSava saveUserinfoDic:result[@"data"]];
-            [self.navigationController popViewControllerAnimated:YES];
-
-        } else {
-            [Tools toast:result[@"errorMessage"]];
-            [SVProgressHUD dismiss];
-        }
+        
+        [Tools setUserLogin:YES];
+        [SVProgressHUD showSuccessWithStatus:@"登录成功"];
+        [UserInfoSava saveUserinfoDic:result[@"data"]];
+        [self.navigationController popViewControllerAnimated:YES];
+
     } failure:^(NSError *error) {
@@ -46,31 +46,22 @@
         [CNLiveUserSystemCenter updateMobileWithUid:model.uid mobile:_registBasicInformationView.phoneTF.text verificationCode:_registBasicInformationView.verificationTF.text success:^(id result) {
             NSLog(@"-----------%@",result);
-            if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
-                [SVProgressHUD showSuccessWithStatus:@"手机号修改成功"];
-                [self.navigationController popViewControllerAnimated:YES];
-                
-            } else {
-                [Tools toast:result[@"errorMessage"]];
-                [SVProgressHUD dismiss];
-            }
+            [SVProgressHUD showSuccessWithStatus:@"手机号修改成功"];
+            [self.navigationController popViewControllerAnimated:YES];
+
         } failure:^(NSError *error) {
             [Tools toast:error.localizedDescription];
             [SVProgressHUD dismiss];
         }];
+        
     } else {
         [CNLiveUserSystemCenter modifyUserInfoType:_modifyType uid:model.uid modifyInfo:_textField1.text success:^(id result) {
             NSLog(@"-----------%@",result);
-            if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
-                [SVProgressHUD showSuccessWithStatus:@"修改成功"];
-                [self.navigationController popViewControllerAnimated:YES];
-                
-            } else {
-                [Tools toast:result[@"errorMessage"]];
-                [SVProgressHUD dismiss];
-            }
+            
+            [SVProgressHUD showSuccessWithStatus:@"修改成功"];
+            [self.navigationController popViewControllerAnimated:YES];
         } failure:^(NSError *error) {
             [Tools toast:error.localizedDescription];
@@ -78,7 +69,6 @@
         }];
     }
-    
 }
 - (void)verificationBtnAction
@@ -89,7 +79,6 @@
         [Tools toast:result[@"errorMessage"]];
-        
     } failure:^(NSError *error) {
         [Tools toast:error.localizedDescription];
     }];
@@ -87,18 +87,11 @@
         [CNLiveUserSystemCenter registerWithUserName:_registBasicInformationView.phoneTF.text password:_registBasicInformationView.setPwdTF.text verificationCode:_registBasicInformationView.verificationTF.text invitationCode:nil frmId:nil success:^(id result) {
-            if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
-                [Tools setUserLogin:YES];
-                [SVProgressHUD showSuccessWithStatus:@"成功"];
-                [UserInfoSava saveUserinfoDic:result[@"data"]];
-                [self.navigationController popToRootViewControllerAnimated:YES];
-                
-            } else {
-                [Tools toast:result[@"errorMessage"]];
-                [SVProgressHUD dismiss];
+            [Tools setUserLogin:YES];
+            [SVProgressHUD showSuccessWithStatus:@"成功"];
+            [UserInfoSava saveUserinfoDic:result[@"data"]];
+            [self.navigationController popToRootViewControllerAnimated:YES];
-            }
-            
         } failure:^(NSError *error) {
             [Tools toast:error.localizedDescription];
@@ -110,17 +103,11 @@
         [CNLiveUserSystemCenter shortcutLoginWithUserName:_registBasicInformationView.phoneTF.text verificationCode:_registBasicInformationView.verificationTF.text frmId:nil success:^(id result) {
-            if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
-                [Tools setUserLogin:YES];
-                [SVProgressHUD showSuccessWithStatus:@"成功"];
-                [UserInfoSava saveUserinfoDic:result[@"data"]];
-                [self.navigationController popToRootViewControllerAnimated:YES];
-                
-            } else {
-                [Tools toast:result[@"errorMessage"]];
-                [SVProgressHUD dismiss];
-            }
-            
+            [Tools setUserLogin:YES];
+            [SVProgressHUD showSuccessWithStatus:@"成功"];
+            [UserInfoSava saveUserinfoDic:result[@"data"]];
+            [self.navigationController popToRootViewControllerAnimated:YES];
+ 
         } failure:^(NSError *error) {
             [Tools toast:error.localizedDescription];
@@ -130,14 +117,10 @@
     } else {
         [CNLiveUserSystemCenter changePasswordWithMobile:_registBasicInformationView.phoneTF.text verificationCode:_registBasicInformationView.verificationTF.text newPassword:_registBasicInformationView.setPwdTF.text success:^(id result) {
-            if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
-                [SVProgressHUD showSuccessWithStatus:@"密码修改成功"];
-                [self.navigationController popToRootViewControllerAnimated:YES];
-                
-            } else {
-                [Tools toast:result[@"errorMessage"]];
-                [SVProgressHUD dismiss];
-            }
+
+            [SVProgressHUD showSuccessWithStatus:@"密码修改成功"];
+            [self.navigationController popToRootViewControllerAnimated:YES];
+            
         } failure:^(NSError *error) {
             [Tools toast:error.localizedDescription];
             [SVProgressHUD dismiss];
@@ -191,13 +191,7 @@
     [CNLiveUserSystemCenter modifyUserInfoType:UserInfoTypeGender uid:model.uid modifyInfo:string success:^(id result) {
         NSLog(@"%@",result);
-        if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
-            [SVProgressHUD showSuccessWithStatus:@"修改成功"];
-            
-        } else {
-            [Tools toast:result[@"errorMessage"]];
-            [SVProgressHUD dismiss];
-        }
+        [SVProgressHUD showSuccessWithStatus:@"修改成功"];
     } failure:^(NSError *error) {
         [Tools toast:error.localizedDescription];
@@ -129,14 +129,8 @@
             NSLog(@"--------%@",result);
-            if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
-                [SVProgressHUD showSuccessWithStatus:@"更新附加信息成功"];
-                [self.navigationController popViewControllerAnimated:YES];
-                
-            } else {
-                [Tools toast:result[@"errorMessage"]];
-                [SVProgressHUD dismiss];
-            }
+            [SVProgressHUD showSuccessWithStatus:@"更新附加信息成功"];
+            [self.navigationController popViewControllerAnimated:YES];
         } failure:^(NSError *error) {
             [Tools toast:error.localizedDescription];
@@ -154,18 +148,15 @@
         [CNLiveUserSystemCenter queryUserInfoWithUid:model.uid srcUid:model.uid success:^(id result) {
             NSLog(@"%@",result);
-            if ([result[@"errorCode"] isEqualToString:@"0"]) {
-                NSDictionary *dic = result[@"data"];
-                NSString *message = [NSString stringWithFormat:@" uid:%@\n nickName:%@\n gender:%@\n location:%@\n extInfo:%@\n mobile:%@\n email:%@",dic[@"uid"],dic[@"nickName"],dic[@"gender"],dic[@"location"],dic[@"extInfo"],dic[@"mobile"],dic[@"email"]];
-                NSString *icon = dic[@"faceUrl"];
-
-                [UserInfoSava setLocalUserInfo:icon withKey:@"faceUrl"];
-                [_tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:0 inSection:0]] withRowAnimation:UITableViewRowAnimationFade];
-                [Tools toast:message];
-            }else {
-                [Tools toast:result[@"errorMessage"]];
-            }
-            
+
+            NSDictionary *dic = result[@"data"];
+            NSString *message = [NSString stringWithFormat:@" uid:%@\n nickName:%@\n gender:%@\n location:%@\n extInfo:%@\n mobile:%@\n email:%@",dic[@"uid"],dic[@"nickName"],dic[@"gender"],dic[@"location"],dic[@"extInfo"],dic[@"mobile"],dic[@"email"]];
+            NSString *icon = dic[@"faceUrl"];
+
+            [UserInfoSava setLocalUserInfo:icon withKey:@"faceUrl"];
+            [_tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:0 inSection:0]] withRowAnimation:UITableViewRowAnimationFade];
+            [Tools toast:message];
+ 
         } failure:^(NSError *error) {
             [Tools toast:error.localizedDescription];
         }];
@@ -39,7 +39,7 @@
     });
     return share;
-
+    
 }
 - (BOOL)handleOpenURL:(NSURL *)url
@@ -56,7 +56,7 @@
         return [QQApiInterface handleOpenURL:url delegate:self];
     }
-
+    
     else {
         return YES;
     }
@@ -67,7 +67,7 @@
     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
@@ -85,7 +85,7 @@
 - (void)sinaLogin
 {
-
+    
     WBAuthorizeRequest *request = [WBAuthorizeRequest request];
     request.redirectURI = kSinaRedirectURI;
     request.scope = @"all";
@@ -94,14 +94,14 @@
                          @"Other_Info_2": @[@"obj1", @"obj2"],
                          @"Other_Info_3": @{@"key1": @"obj1", @"key2": @"obj2"}};
     [WeiboSDK sendRequest:request];
-
+    
 }
 #pragma mark -- TencentSessionDelegate
 //登陆完成调用
 - (void)tencentDidLogin
 {
-
+    
     [tencentOAuth getUserInfo];
 }
@@ -123,15 +123,11 @@
     [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);
-        if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
-            [Tools setUserLogin:YES];
-            [SVProgressHUD showSuccessWithStatus:@"登录成功"];
-            [UserInfoSava saveUserinfoDic:result[@"data"]];
-            [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
-            
-        } else {
-            [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
-        }
+        [Tools setUserLogin:YES];
+        [SVProgressHUD showSuccessWithStatus:@"登录成功"];
+        [UserInfoSava saveUserinfoDic:result[@"data"]];
+        [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
+        
     } failure:^(NSError *error) {
         [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
     }];
@@ -166,11 +162,11 @@
             SendAuthResp *authResp = (SendAuthResp *)resp;
-                self.appCode = temp.code;
-                
+            self.appCode = temp.code;
+            
             [self getWeChatUserInfo:authResp];
-//            }
+            //            }
         }
         else if (temp.errCode == -4) {
@@ -251,15 +247,11 @@
                     [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 ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
-                            [Tools setUserLogin:YES];
-                            [SVProgressHUD showSuccessWithStatus:@"登录成功"];
-                            [UserInfoSava saveUserinfoDic:result[@"data"]];
-                            [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
-                            
-                        } else {
-                            [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
-                        }
+                        [Tools setUserLogin:YES];
+                        [SVProgressHUD showSuccessWithStatus:@"登录成功"];
+                        [UserInfoSava saveUserinfoDic:result[@"data"]];
+                        [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
+                        
                     } failure:^(NSError *error) {
                         [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
                     }];
@@ -311,19 +303,15 @@
         [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);
-            if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
-                [Tools setUserLogin:YES];
-                [SVProgressHUD showSuccessWithStatus:@"登录成功"];
-                [UserInfoSava saveUserinfoDic:result[@"data"]];
-                [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
-                
-            } else {
-                [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
-            }
+            [Tools setUserLogin:YES];
+            [SVProgressHUD showSuccessWithStatus:@"登录成功"];
+            [UserInfoSava saveUserinfoDic:result[@"data"]];
+            [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
+            
         } failure:^(NSError *error) {
             [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
         }];
-
+        
     }
 }