更换新的SDK,并增加测试代码

张旭
1 parent 9f553974
Showing 16 changed files with 734 additions and 112 deletions
CNLiveUserSystemDemo/CNLiveUserSystemDemo.xcodeproj/project.pbxproj
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/EmailViewController.h
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/EmailViewController.m
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/LoginViewController.m
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/ModifyPwdViewController.h
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/ModifyPwdViewController.m
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/RegisterViewController.m
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/ViewController.m
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Info.plist
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Tools/CNLiveThirdLoginManager.h
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Tools/CNLiveThirdLoginManager.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK.framework/CNLiveUserSystemSDK
CNLiveUserSystemDemo/CNLiveUserSystemSDK.framework/Headers/CNLiveUserSystemCenter.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK.framework/Headers/CNLiveUserSystemTypeDef.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK.framework/Info.plist
iOS用户SDK.pdf
@@ -7,7 +7,6 @@
 	objects = {
 /* Begin PBXBuildFile section */
-		8107CD3C1DDEFB9B0061EA8A /* CNLiveThirdLoginManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8107CD3B1DDEFB9B0061EA8A /* CNLiveThirdLoginManager.m */; };
 		810D9B651D8FB70600B7A776 /* TencentOpenAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 810D9B511D8FB70600B7A776 /* TencentOpenAPI.framework */; };
 		810D9B661D8FB70600B7A776 /* TencentOpenApi_IOS_Bundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 810D9B521D8FB70600B7A776 /* TencentOpenApi_IOS_Bundle.bundle */; };
 		810D9B671D8FB70600B7A776 /* libWeiboSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 810D9B541D8FB70600B7A776 /* libWeiboSDK.a */; };
@@ -24,11 +23,6 @@
 		810D9B7A1D8FB7AC00B7A776 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 810D9B791D8FB7AC00B7A776 /* libz.tbd */; };
 		810D9B7F1D8FCD1900B7A776 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 810D9B7E1D8FCD1900B7A776 /* libsqlite3.0.tbd */; };
 		810D9B811D8FCD3200B7A776 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 810D9B801D8FCD3200B7A776 /* libc++.tbd */; };
-		810EB6441E543EE900C33D18 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 810EB63B1E543EE900C33D18 /* LoginViewController.m */; };
-		810EB6451E543EE900C33D18 /* ModifyUserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 810EB63D1E543EE900C33D18 /* ModifyUserInfoViewController.m */; };
-		810EB6461E543EE900C33D18 /* RegisterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 810EB63F1E543EE900C33D18 /* RegisterViewController.m */; };
-		810EB6471E543EE900C33D18 /* UserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 810EB6411E543EE900C33D18 /* UserInfoViewController.m */; };
-		810EB6481E543EE900C33D18 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 810EB6431E543EE900C33D18 /* ViewController.m */; };
 		810EB6541E543EFC00C33D18 /* IdAndPwdView.m in Sources */ = {isa = PBXBuildFile; fileRef = 810EB64B1E543EFC00C33D18 /* IdAndPwdView.m */; };
 		810EB6551E543EFC00C33D18 /* RegistBasicInformationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 810EB64D1E543EFC00C33D18 /* RegistBasicInformationView.m */; };
 		810EB6561E543EFC00C33D18 /* ThirdPartyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 810EB64F1E543EFC00C33D18 /* ThirdPartyView.m */; };
@@ -58,7 +52,6 @@
 		812642D41D86A7A800B402CA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 812642D21D86A7A800B402CA /* LaunchScreen.storyboard */; };
 		812642DF1D86A7A800B402CA /* CNLiveUserSystemDemoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 812642DE1D86A7A800B402CA /* CNLiveUserSystemDemoTests.m */; };
 		812642EA1D86A7A800B402CA /* CNLiveUserSystemDemoUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 812642E91D86A7A800B402CA /* CNLiveUserSystemDemoUITests.m */; };
-		813A4A161E9E25DD00129F94 /* CNLiveUserSystemSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 813A4A151E9E25DD00129F94 /* CNLiveUserSystemSDK.framework */; };
 		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 */; };
@@ -70,6 +63,15 @@
 		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 */; };
+		D2470C281EE6572A00C16A1F /* EmailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2470C1B1EE6572A00C16A1F /* EmailViewController.m */; };
+		D2470C291EE6572A00C16A1F /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2470C1D1EE6572A00C16A1F /* LoginViewController.m */; };
+		D2470C2A1EE6572A00C16A1F /* ModifyPwdViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2470C1F1EE6572A00C16A1F /* ModifyPwdViewController.m */; };
+		D2470C2B1EE6572A00C16A1F /* ModifyUserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2470C211EE6572A00C16A1F /* ModifyUserInfoViewController.m */; };
+		D2470C2C1EE6572A00C16A1F /* RegisterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2470C231EE6572A00C16A1F /* RegisterViewController.m */; };
+		D2470C2D1EE6572A00C16A1F /* UserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2470C251EE6572A00C16A1F /* UserInfoViewController.m */; };
+		D2470C2E1EE6572A00C16A1F /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2470C271EE6572A00C16A1F /* ViewController.m */; };
+		D2470C311EE6575F00C16A1F /* CNLiveThirdLoginManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D2470C301EE6575F00C16A1F /* CNLiveThirdLoginManager.m */; };
+		D2470C411EE660AB00C16A1F /* CNLiveUserSystemSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2470C401EE660AB00C16A1F /* CNLiveUserSystemSDK.framework */; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
@@ -103,8 +105,6 @@
 /* End PBXCopyFilesBuildPhase section */
 /* Begin PBXFileReference section */
-		8107CD3A1DDEFB9B0061EA8A /* CNLiveThirdLoginManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveThirdLoginManager.h; sourceTree = "<group>"; };
-		8107CD3B1DDEFB9B0061EA8A /* CNLiveThirdLoginManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveThirdLoginManager.m; sourceTree = "<group>"; };
 		810D9B511D8FB70600B7A776 /* TencentOpenAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = TencentOpenAPI.framework; sourceTree = "<group>"; };
 		810D9B521D8FB70600B7A776 /* TencentOpenApi_IOS_Bundle.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = TencentOpenApi_IOS_Bundle.bundle; sourceTree = "<group>"; };
 		810D9B541D8FB70600B7A776 /* libWeiboSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWeiboSDK.a; sourceTree = "<group>"; };
@@ -133,16 +133,6 @@
 		810D9B791D8FB7AC00B7A776 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		810D9B7E1D8FCD1900B7A776 /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
 		810D9B801D8FCD3200B7A776 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
-		810EB63A1E543EE900C33D18 /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
-		810EB63B1E543EE900C33D18 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
-		810EB63C1E543EE900C33D18 /* ModifyUserInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifyUserInfoViewController.h; sourceTree = "<group>"; };
-		810EB63D1E543EE900C33D18 /* ModifyUserInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModifyUserInfoViewController.m; sourceTree = "<group>"; };
-		810EB63E1E543EE900C33D18 /* RegisterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegisterViewController.h; sourceTree = "<group>"; };
-		810EB63F1E543EE900C33D18 /* RegisterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegisterViewController.m; sourceTree = "<group>"; };
-		810EB6401E543EE900C33D18 /* UserInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoViewController.h; sourceTree = "<group>"; };
-		810EB6411E543EE900C33D18 /* UserInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoViewController.m; sourceTree = "<group>"; };
-		810EB6421E543EE900C33D18 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
-		810EB6431E543EE900C33D18 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
 		810EB64A1E543EFC00C33D18 /* IdAndPwdView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IdAndPwdView.h; sourceTree = "<group>"; };
 		810EB64B1E543EFC00C33D18 /* IdAndPwdView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IdAndPwdView.m; sourceTree = "<group>"; };
 		810EB64C1E543EFC00C33D18 /* RegistBasicInformationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegistBasicInformationView.h; sourceTree = "<group>"; };
@@ -202,7 +192,6 @@
 		812642E51D86A7A800B402CA /* CNLiveUserSystemDemoUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CNLiveUserSystemDemoUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		812642E91D86A7A800B402CA /* CNLiveUserSystemDemoUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveUserSystemDemoUITests.m; sourceTree = "<group>"; };
 		812642EB1D86A7A800B402CA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		813A4A151E9E25DD00129F94 /* CNLiveUserSystemSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveUserSystemSDK.framework; sourceTree = "<group>"; };
 		817C6EC21D90D60E0016F211 /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; };
 		8187A8ED1D8E6394007FAFB6 /* Tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tools.h; sourceTree = "<group>"; };
 		8187A8EE1D8E6394007FAFB6 /* Tools.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Tools.m; sourceTree = "<group>"; };
@@ -224,6 +213,23 @@
 		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>"; };
+		D2470C1A1EE6572A00C16A1F /* EmailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmailViewController.h; sourceTree = "<group>"; };
+		D2470C1B1EE6572A00C16A1F /* EmailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EmailViewController.m; sourceTree = "<group>"; };
+		D2470C1C1EE6572A00C16A1F /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
+		D2470C1D1EE6572A00C16A1F /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
+		D2470C1E1EE6572A00C16A1F /* ModifyPwdViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifyPwdViewController.h; sourceTree = "<group>"; };
+		D2470C1F1EE6572A00C16A1F /* ModifyPwdViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModifyPwdViewController.m; sourceTree = "<group>"; };
+		D2470C201EE6572A00C16A1F /* ModifyUserInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifyUserInfoViewController.h; sourceTree = "<group>"; };
+		D2470C211EE6572A00C16A1F /* ModifyUserInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModifyUserInfoViewController.m; sourceTree = "<group>"; };
+		D2470C221EE6572A00C16A1F /* RegisterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegisterViewController.h; sourceTree = "<group>"; };
+		D2470C231EE6572A00C16A1F /* RegisterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegisterViewController.m; sourceTree = "<group>"; };
+		D2470C241EE6572A00C16A1F /* UserInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoViewController.h; sourceTree = "<group>"; };
+		D2470C251EE6572A00C16A1F /* UserInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoViewController.m; sourceTree = "<group>"; };
+		D2470C261EE6572A00C16A1F /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
+		D2470C271EE6572A00C16A1F /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
+		D2470C2F1EE6575F00C16A1F /* CNLiveThirdLoginManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveThirdLoginManager.h; sourceTree = "<group>"; };
+		D2470C301EE6575F00C16A1F /* CNLiveThirdLoginManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveThirdLoginManager.m; sourceTree = "<group>"; };
+		D2470C401EE660AB00C16A1F /* CNLiveUserSystemSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveUserSystemSDK.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -231,7 +237,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				813A4A161E9E25DD00129F94 /* CNLiveUserSystemSDK.framework in Frameworks */,
+				D2470C411EE660AB00C16A1F /* CNLiveUserSystemSDK.framework in Frameworks */,
 				811600FE1D927E7E003CAE7D /* WebP.framework in Frameworks */,
 				817C6EC31D90D60E0016F211 /* ImageIO.framework in Frameworks */,
 				810D9B811D8FCD3200B7A776 /* libc++.tbd in Frameworks */,
@@ -330,16 +336,20 @@
 		810EB6391E543EE900C33D18 /* Conreollers */ = {
 			isa = PBXGroup;
 			children = (
-				810EB63A1E543EE900C33D18 /* LoginViewController.h */,
-				810EB63B1E543EE900C33D18 /* LoginViewController.m */,
-				810EB63C1E543EE900C33D18 /* ModifyUserInfoViewController.h */,
-				810EB63D1E543EE900C33D18 /* ModifyUserInfoViewController.m */,
-				810EB63E1E543EE900C33D18 /* RegisterViewController.h */,
-				810EB63F1E543EE900C33D18 /* RegisterViewController.m */,
-				810EB6401E543EE900C33D18 /* UserInfoViewController.h */,
-				810EB6411E543EE900C33D18 /* UserInfoViewController.m */,
-				810EB6421E543EE900C33D18 /* ViewController.h */,
-				810EB6431E543EE900C33D18 /* ViewController.m */,
+				D2470C1A1EE6572A00C16A1F /* EmailViewController.h */,
+				D2470C1B1EE6572A00C16A1F /* EmailViewController.m */,
+				D2470C1C1EE6572A00C16A1F /* LoginViewController.h */,
+				D2470C1D1EE6572A00C16A1F /* LoginViewController.m */,
+				D2470C1E1EE6572A00C16A1F /* ModifyPwdViewController.h */,
+				D2470C1F1EE6572A00C16A1F /* ModifyPwdViewController.m */,
+				D2470C201EE6572A00C16A1F /* ModifyUserInfoViewController.h */,
+				D2470C211EE6572A00C16A1F /* ModifyUserInfoViewController.m */,
+				D2470C221EE6572A00C16A1F /* RegisterViewController.h */,
+				D2470C231EE6572A00C16A1F /* RegisterViewController.m */,
+				D2470C241EE6572A00C16A1F /* UserInfoViewController.h */,
+				D2470C251EE6572A00C16A1F /* UserInfoViewController.m */,
+				D2470C261EE6572A00C16A1F /* ViewController.h */,
+				D2470C271EE6572A00C16A1F /* ViewController.m */,
 			);
 			path = Conreollers;
 			sourceTree = "<group>";
@@ -405,7 +415,7 @@
 		812642B81D86A7A800B402CA = {
 			isa = PBXGroup;
 			children = (
-				813A4A151E9E25DD00129F94 /* CNLiveUserSystemSDK.framework */,
+				D2470C401EE660AB00C16A1F /* CNLiveUserSystemSDK.framework */,
 				810D9B7D1D8FCBC200B7A776 /* frameworks */,
 				812642C31D86A7A800B402CA /* CNLiveUserSystemDemo */,
 				812642DD1D86A7A800B402CA /* CNLiveUserSystemDemoTests */,
@@ -482,8 +492,8 @@
 				8187A8F51D8E6486007FAFB6 /* UserInfoSava.m */,
 				8187A8F91D8E68CD007FAFB6 /* CNLiveLogout.h */,
 				8187A8FA1D8E68CD007FAFB6 /* CNLiveLogout.m */,
-				8107CD3A1DDEFB9B0061EA8A /* CNLiveThirdLoginManager.h */,
-				8107CD3B1DDEFB9B0061EA8A /* CNLiveThirdLoginManager.m */,
+				D2470C2F1EE6575F00C16A1F /* CNLiveThirdLoginManager.h */,
+				D2470C301EE6575F00C16A1F /* CNLiveThirdLoginManager.m */,
 			);
 			path = Tools;
 			sourceTree = "<group>";
@@ -656,11 +666,11 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				810EB6441E543EE900C33D18 /* LoginViewController.m in Sources */,
-				8107CD3C1DDEFB9B0061EA8A /* CNLiveThirdLoginManager.m in Sources */,
 				811600FB1D927E7E003CAE7D /* UIImageView+HighlightedWebCache.m in Sources */,
 				811600FC1D927E7E003CAE7D /* UIImageView+WebCache.m in Sources */,
 				8187A90C1D8E9A7B007FAFB6 /* SVProgressAnimatedView.m in Sources */,
+				D2470C291EE6572A00C16A1F /* LoginViewController.m in Sources */,
+				D2470C2D1EE6572A00C16A1F /* UserInfoViewController.m in Sources */,
 				811600F71D927E7E003CAE7D /* UIButton+WebCache.m in Sources */,
 				811600F81D927E7E003CAE7D /* UIImage+GIF.m in Sources */,
 				811600F61D927E7E003CAE7D /* SDWebImagePrefetcher.m in Sources */,
@@ -668,29 +678,31 @@
 				811600F11D927E7E003CAE7D /* SDWebImageCompat.m in Sources */,
 				811600F31D927E7E003CAE7D /* SDWebImageDownloader.m in Sources */,
 				811600F41D927E7E003CAE7D /* SDWebImageDownloaderOperation.m in Sources */,
+				D2470C311EE6575F00C16A1F /* CNLiveThirdLoginManager.m in Sources */,
 				811600F21D927E7E003CAE7D /* SDWebImageDecoder.m in Sources */,
-				810EB6461E543EE900C33D18 /* RegisterViewController.m in Sources */,
 				811600F51D927E7E003CAE7D /* SDWebImageManager.m in Sources */,
 				810EB6541E543EFC00C33D18 /* IdAndPwdView.m in Sources */,
 				8187A8FB1D8E68CD007FAFB6 /* CNLiveLogout.m in Sources */,
+				D2470C281EE6572A00C16A1F /* EmailViewController.m in Sources */,
 				810EB6561E543EFC00C33D18 /* ThirdPartyView.m in Sources */,
 				8187A90E1D8E9A7B007FAFB6 /* SVProgressHUD.m in Sources */,
 				811600FD1D927E7E003CAE7D /* UIView+WebCacheOperation.m in Sources */,
 				8187A8EF1D8E6394007FAFB6 /* Tools.m in Sources */,
 				812642C91D86A7A800B402CA /* AppDelegate.m in Sources */,
-				810EB6451E543EE900C33D18 /* ModifyUserInfoViewController.m in Sources */,
 				8187A90B1D8E9A7B007FAFB6 /* SVIndefiniteAnimatedView.m in Sources */,
 				810EB6571E543EFC00C33D18 /* UserInfoHeaderImageTableViewCell.m in Sources */,
 				811600EE1D927E7E003CAE7D /* MKAnnotationView+WebCache.m in Sources */,
 				811600F91D927E7E003CAE7D /* UIImage+MultiFormat.m in Sources */,
+				D2470C2A1EE6572A00C16A1F /* ModifyPwdViewController.m in Sources */,
+				D2470C2C1EE6572A00C16A1F /* RegisterViewController.m in Sources */,
 				8187A8F81D8E6486007FAFB6 /* UserInfoSava.m in Sources */,
 				811600EF1D927E7E003CAE7D /* NSData+ImageContentType.m in Sources */,
+				D2470C2B1EE6572A00C16A1F /* ModifyUserInfoViewController.m in Sources */,
 				812642C61D86A7A800B402CA /* main.m in Sources */,
-				810EB6481E543EE900C33D18 /* ViewController.m in Sources */,
 				811600FA1D927E7E003CAE7D /* UIImage+WebP.m in Sources */,
+				D2470C2E1EE6572A00C16A1F /* ViewController.m in Sources */,
 				8187A90F1D8E9A7B007FAFB6 /* SVRadialGradientLayer.m in Sources */,
 				810EB6551E543EFC00C33D18 /* RegistBasicInformationView.m in Sources */,
-				810EB6471E543EE900C33D18 /* UserInfoViewController.m in Sources */,
 				8187A8F71D8E6486007FAFB6 /* UserInfoModel.m in Sources */,
 				810EB6581E543EFC00C33D18 /* UserInfoTableViewCell.m in Sources */,
 				811600F01D927E7E003CAE7D /* SDImageCache.m in Sources */,
@@ -855,6 +867,7 @@
 					"$(PROJECT_DIR)/CNLiveUserSystemDemo/ThirdSDK/QQSDK",
 					"$(PROJECT_DIR)/CNLiveUserSystemDemo/ThirdSDK/SDWebImage",
 					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/CNLiveUserSystemDemo",
 				);
 				GCC_PREFIX_HEADER = "$(SRCROOT)/CNLiveUserSystemDemo/PrefixHeader.pch";
 				INFOPLIST_FILE = CNLiveUserSystemDemo/Info.plist;
@@ -865,6 +878,7 @@
 					"$(PROJECT_DIR)/CNLiveUserSystemDemo/ThirdSDK/SinaSDK",
 					"$(PROJECT_DIR)/CNLiveUserSystemDemo/ThirdSDK/WeChatSDK",
 				);
+				MACH_O_TYPE = mh_execute;
 				OTHER_LDFLAGS = (
 					"-fobjc-arc",
 					"-ObjC",
@@ -889,6 +903,7 @@
 					"$(PROJECT_DIR)/CNLiveUserSystemDemo/ThirdSDK/QQSDK",
 					"$(PROJECT_DIR)/CNLiveUserSystemDemo/ThirdSDK/SDWebImage",
 					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/CNLiveUserSystemDemo",
 				);
 				GCC_PREFIX_HEADER = "$(SRCROOT)/CNLiveUserSystemDemo/PrefixHeader.pch";
 				INFOPLIST_FILE = CNLiveUserSystemDemo/Info.plist;
@@ -899,6 +914,7 @@
 					"$(PROJECT_DIR)/CNLiveUserSystemDemo/ThirdSDK/SinaSDK",
 					"$(PROJECT_DIR)/CNLiveUserSystemDemo/ThirdSDK/WeChatSDK",
 				);
+				MACH_O_TYPE = mh_execute;
 				OTHER_LDFLAGS = (
 					"-fobjc-arc",
 					"-ObjC",
+//
+//  EmailViewController.h
+//  CNLiveUserSystemDemo
+//
+//  Created by 张旭 on 2017/5/27.
+//  Copyright © 2017年 zhulin. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface EmailViewController : UIViewController
+
+@end
+//
+//  EmailViewController.m
+//  CNLiveUserSystemDemo
+//
+//  Created by 张旭 on 2017/5/27.
+//  Copyright © 2017年 zhulin. All rights reserved.
+//
+
+#import "EmailViewController.h"
+
+@interface EmailViewController ()
+
+@property (nonatomic ,strong) UITextField * _Nullable             emailTF;
+@property (nonatomic ,strong) UITextField * _Nullable             pwdTF;
+@property (nonatomic, strong) UIButton * _Nullable                confirmBtn;
+
+@end
+
+@implementation EmailViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    self.view.backgroundColor = [UIColor whiteColor];
+    
+    [self.view addSubview:self.emailTF];
+    [self.view addSubview:self.pwdTF];
+    [self.view addSubview:self.confirmBtn];
+}
+
+- (void)confirmBtnAction
+{
+    [CNLiveUserSystemCenter modifyPwdWithEmail:self.emailTF.text newPwd:self.pwdTF.text success:^(id result) {
+        NSLog(@"result: %@",result);
+        [Tools toast:result[@"errorMessage"]];
+
+    } failure:^(NSDictionary *errorDic) {
+        [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
+    }];
+}
+
+- (UIButton *)confirmBtn
+{
+    if (!_confirmBtn) {
+        _confirmBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_confirmBtn setFrame:CGRectMake(10, 280, KScreenWidth - 20, 40)];
+        [_confirmBtn setTitle:@"确  认" forState:UIControlStateNormal];
+        [_confirmBtn addTarget:self action:@selector(confirmBtnAction) forControlEvents:UIControlEventTouchUpInside];
+        _confirmBtn.titleLabel.font = [UIFont systemFontOfSize:18];
+        [_confirmBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+        _confirmBtn.layer.cornerRadius = 20;
+        _confirmBtn.layer.masksToBounds = YES;
+        _confirmBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _confirmBtn.layer.borderWidth = 1;
+    }
+    return _confirmBtn;
+}
+
+- (UITextField *)emailTF
+{
+    if (!_emailTF) {
+        _emailTF = [[UITextField alloc] initWithFrame:CGRectMake(10, 70, KScreenWidth - 20, 57)];
+        _emailTF.placeholder = @"请输入您的邮箱";
+        _emailTF.keyboardType = UIKeyboardTypeNamePhonePad;
+        _emailTF.clearButtonMode = UITextFieldViewModeWhileEditing;
+        _emailTF.font = [UIFont systemFontOfSize:17];
+    }
+    return _emailTF;
+}
+
+- (UITextField *)pwdTF
+{
+    if (!_pwdTF) {
+        _pwdTF = [[UITextField alloc] initWithFrame:CGRectMake(10, 70 + 57, KScreenWidth - 20, 57)];
+        _pwdTF.placeholder = @"请输入您的新密码";
+        _pwdTF.clearButtonMode = UITextFieldViewModeWhileEditing;
+        _pwdTF.keyboardType = UIKeyboardTypeNamePhonePad;
+        _pwdTF.font = [UIFont systemFontOfSize:17];
+    }
+    return _pwdTF;
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end
@@ -24,6 +24,10 @@
 @property (nonatomic, strong) UIButton *qqBtn;
 @property (nonatomic, strong) UILabel *thirdpartyLoginLbl;
+@property (nonatomic, strong) UIButton *checkThirdBtn;
+@property (nonatomic, strong) UIButton *bindMobileBtn;
+@property (nonatomic ,strong) UITextField *verificationCodeTF;
+@property (nonatomic ,strong) NSDictionary *dic;
 @end
 @implementation LoginViewController
@@ -44,33 +48,49 @@
     [self.view addSubview:self.sinaBtn];
     [self.view addSubview:self.qqBtn];
     [self.view addSubview:self.thirdpartyLoginLbl];
+    [self.view addSubview:self.checkThirdBtn];
+    [self.view addSubview:self.bindMobileBtn];
+    [self.view addSubview:self.verificationCodeTF];
     UIBarButtonItem *rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:self.registBtn];
     self.navigationItem.rightBarButtonItem = rightBarButtonItem;
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginSuccess) name:ThirdLoginSuccess object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginSuccess:) name:ThirdLoginSuccess object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginFailure) name:ThirdLoginFailure object:nil];
-
 }
 #pragma mark - action
 - (void)loginBtnAction
 {
-    [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeClear];
-    [SVProgressHUD show];
-    
-    [CNLiveUserSystemCenter loginWithUserName:_idAndPwdView.idTF.text password:_idAndPwdView.pwdTF.text frmId:nil success:^(id result) {
-
-        NSLog(@"登录 success------------%@",result);
-        [SVProgressHUD showSuccessWithStatus:@"登录成功"];
-        [UserInfoSava saveUserinfoDic:result[@"data"]];
-        [Tools setUserLogin:YES];
-        [self.navigationController popViewControllerAnimated:YES];
+    NSDictionary *dic = self.dic;
+    if (dic) {//三方强制绑定手机号登录
+        [CNLiveUserSystemCenter thirdPartyBindMobileLoginWithThirdPartyPlatType:[dic objectForKey:@"platType"] thirdPartyId:dic[@"partyId"] nickName:@"testNickName" gender:[dic objectForKey:@"gender"] location:[dic objectForKey:@"location"] faceUrl:[dic objectForKey:@"faceUrl"] mobile:[dic objectForKey:@"mobile"] verificationCode:self.verificationCodeTF.text pawd:_idAndPwdView.pwdTF.text frmId:@"" success:^(id result) {
+            NSLog(@"BindMobile 登录------%@",result);
+            [UserInfoSava saveUserinfoDic:result[@"data"]];
+            [Tools setUserLogin:YES];
+            [self.navigationController popViewControllerAnimated:YES];
+            
+        } failure:^(NSDictionary *errorDic) {
+            NSLog(@"BindMobile 登录------%@",errorDic);
+        }];
+    }else
+    {//普通登录或三方验证登录
+        [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeClear];
+        [SVProgressHUD show];
-    } failure:^(NSDictionary *errorDic) {
-        [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
-        [SVProgressHUD dismiss];
-    }];
+        [CNLiveUserSystemCenter loginWithUserName:_idAndPwdView.idTF.text password:_idAndPwdView.pwdTF.text frmId:nil success:^(id result) {
+            
+            NSLog(@"登录 success------------%@",result);
+            [SVProgressHUD showSuccessWithStatus:@"登录成功"];
+            [UserInfoSava saveUserinfoDic:result[@"data"]];
+            [Tools setUserLogin:YES];
+            [self.navigationController popViewControllerAnimated:YES];
+            
+        } failure:^(NSDictionary *errorDic) {
+            [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
+            [SVProgressHUD dismiss];
+        }];
+    }
 }
 - (void)messageLoginBtnAction
@@ -102,9 +122,40 @@
     [[CNLiveThirdLoginManager manager] qqLoginIsBindingThirdParty:NO];
 }
-- (void)loginSuccess
+- (void)checkThirdBtnAction:(UIButton *)button
+{
+    button.selected = !button.selected;
+    BOOL isCheck = NO;
+    if (button.selected) {
+        isCheck = YES;
+    }else{
+        isCheck = NO;
+    }
+    [CNLiveThirdLoginManager manager].thirdType = ThirdLoginTypeCheckIsRegister;
+}
+
+- (void)bindMobileBtnAction:(UIButton *)button
 {
-    [self.navigationController popViewControllerAnimated:YES];
+    button.selected = !button.selected;
+    BOOL isCheck = NO;
+    if (button.selected) {
+        isCheck = YES;
+    }else{
+        isCheck = NO;
+    }
+    [CNLiveThirdLoginManager manager].thirdType = ThirdLoginTypeBindMobile;
+    [CNLiveThirdLoginManager manager].bindMobile = _idAndPwdView.idTF.text;
+}
+
+- (void)loginSuccess:(NSNotification *)noti
+{
+    if (noti.userInfo)
+    {//强制绑定手机号
+        self.dic = noti.userInfo;
+    }else
+    {//普通三方登录和验证三方登录
+        [self.navigationController popViewControllerAnimated:YES];
+    }
 }
 - (void)loginFailure
@@ -121,6 +172,9 @@
     if ([self.idAndPwdView.pwdTF isFirstResponder]) {
         [self.idAndPwdView.pwdTF resignFirstResponder];
     }
+    if ([self.verificationCodeTF isFirstResponder]) {
+        [self.verificationCodeTF resignFirstResponder];
+    }
 }
 #pragma mark - getter
@@ -244,6 +298,54 @@
     return _qqBtn;
 }
+- (UIButton *)checkThirdBtn
+{
+    if (!_checkThirdBtn) {
+        _checkThirdBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_checkThirdBtn setFrame:CGRectMake(SpaceWidth, KScreenHeight-100, 150, 40)];
+        [_checkThirdBtn setTitle:@"三方登录" forState:UIControlStateNormal];
+        [_checkThirdBtn setTitle:@"三方验证并登录" forState:UIControlStateSelected];
+        [_checkThirdBtn addTarget:self action:@selector(checkThirdBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+        _checkThirdBtn.titleLabel.font = [UIFont systemFontOfSize:18];
+        [_checkThirdBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+        _checkThirdBtn.layer.cornerRadius = 20;
+        _checkThirdBtn.layer.masksToBounds = YES;
+        _checkThirdBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _checkThirdBtn.layer.borderWidth = 1;
+    }
+    return _checkThirdBtn;
+}
+
+- (UIButton *)bindMobileBtn
+{
+    if (!_bindMobileBtn) {
+        _bindMobileBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_bindMobileBtn setFrame:CGRectMake(SpaceWidth, KScreenHeight-50, 180, 40)];
+        [_bindMobileBtn setTitle:@"三方登录" forState:UIControlStateNormal];
+        [_bindMobileBtn setTitle:@"三方绑定手机号登录" forState:UIControlStateSelected];
+        [_bindMobileBtn addTarget:self action:@selector(bindMobileBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+        _bindMobileBtn.titleLabel.font = [UIFont systemFontOfSize:18];
+        [_bindMobileBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+        _bindMobileBtn.layer.cornerRadius = 20;
+        _bindMobileBtn.layer.masksToBounds = YES;
+        _bindMobileBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _bindMobileBtn.layer.borderWidth = 1;
+    }
+    return _bindMobileBtn;
+}
+
+- (UITextField *)verificationCodeTF
+{
+    if (!_verificationCodeTF) {
+        _verificationCodeTF = [[UITextField alloc] initWithFrame:CGRectMake(SpaceWidth + 200, KScreenHeight-50, self.view.bounds.size.width - SpaceWidth - 200, 40)];
+        _verificationCodeTF.font = [UIFont systemFontOfSize:17];
+        _verificationCodeTF.keyboardType = UIKeyboardTypeNumberPad;
+        _verificationCodeTF.placeholder = @"请输入验证码";
+        _verificationCodeTF.returnKeyType = UIReturnKeyDone;
+    }
+    return _verificationCodeTF;
+}
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
+//
+//  ModifyPwdViewController.h
+//  CNLiveUserSystemDemo
+//
+//  Created by 张旭 on 2017/5/27.
+//  Copyright © 2017年 zhulin. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+typedef NS_ENUM(NSInteger, ModifyPwdType) {//枚举类型
+    ModifyPwdTypeEmail           = 1,//通过邮箱修改密码
+    ModifyPwdTypeOldPwd              //通过原密码修改密码
+};
+
+
+@interface ModifyPwdViewController : UIViewController
+
+@property (nonatomic ,assign) ModifyPwdType   type;
+@end
+//
+//  ModifyPwdViewController.m
+//  CNLiveUserSystemDemo
+//
+//  Created by 张旭 on 2017/5/27.
+//  Copyright © 2017年 zhulin. All rights reserved.
+//
+
+#import "ModifyPwdViewController.h"
+
+@interface ModifyPwdViewController ()
+
+@property (nonatomic ,strong) UITextField * _Nullable             emailTF;
+@property (nonatomic ,strong) UITextField * _Nullable             pwdTF;
+@property (nonatomic, strong) UIButton * _Nullable                confirmBtn;
+
+@end
+
+@implementation ModifyPwdViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    
+    self.view.backgroundColor = [UIColor whiteColor];
+    
+    [self.view addSubview:self.emailTF];
+    [self.view addSubview:self.pwdTF];
+    [self.view addSubview:self.confirmBtn];
+}
+
+
+- (void)confirmBtnAction
+{
+    if (self.type == ModifyPwdTypeEmail) {
+        [CNLiveUserSystemCenter modifyPwdWithEmail:self.emailTF.text newPwd:self.pwdTF.text success:^(id result) {
+            
+            [Tools toast:result[@"errorMessage"]];
+            
+        } failure:^(NSDictionary *errorDic) {
+            [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
+        }];
+    
+    }else if (self.type == ModifyPwdTypeOldPwd){
+         UserInfoModel *model = [UserInfoModel modelWithKeyValues:[Tools getLocalUserInfo]];
+        [CNLiveUserSystemCenter oldPwdChangePasswordWithUid:model.uid pwd:self.emailTF.text newPwd:self.pwdTF.text success:^(id result) {
+            
+            [Tools toast:result[@"errorMessage"]];
+        } failure:^(NSDictionary *errorDic) {
+             [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
+        }];
+        
+    }
+    
+    
+}
+
+- (UIButton *)confirmBtn
+{
+    if (!_confirmBtn) {
+        _confirmBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_confirmBtn setFrame:CGRectMake(10, 280, KScreenWidth - 20, 40)];
+        [_confirmBtn setTitle:@"确  认" forState:UIControlStateNormal];
+        [_confirmBtn addTarget:self action:@selector(confirmBtnAction) forControlEvents:UIControlEventTouchUpInside];
+        _confirmBtn.titleLabel.font = [UIFont systemFontOfSize:18];
+        [_confirmBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+        _confirmBtn.layer.cornerRadius = 20;
+        _confirmBtn.layer.masksToBounds = YES;
+        _confirmBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _confirmBtn.layer.borderWidth = 1;
+    }
+    return _confirmBtn;
+}
+
+- (UITextField *)emailTF
+{
+    if (!_emailTF) {
+        _emailTF = [[UITextField alloc] initWithFrame:CGRectMake(10, 70, KScreenWidth - 20, 57)];
+        if (self.type == ModifyPwdTypeEmail) {
+            _emailTF.placeholder = @"请输入您的邮箱";
+        }else if (self.type == ModifyPwdTypeOldPwd){
+            _emailTF.placeholder = @"请输入您的旧密码";
+        }
+        _emailTF.keyboardType = UIKeyboardTypeNamePhonePad;
+        _emailTF.clearButtonMode = UITextFieldViewModeWhileEditing;
+        _emailTF.font = [UIFont systemFontOfSize:17];
+    }
+    return _emailTF;
+}
+
+- (UITextField *)pwdTF
+{
+    if (!_pwdTF) {
+        _pwdTF = [[UITextField alloc] initWithFrame:CGRectMake(10, 70 + 57, KScreenWidth - 20, 57)];
+        _pwdTF.placeholder = @"请输入您的新密码";
+        _pwdTF.clearButtonMode = UITextFieldViewModeWhileEditing;
+        _pwdTF.keyboardType = UIKeyboardTypeNamePhonePad;
+        _pwdTF.font = [UIFont systemFontOfSize:17];
+    }
+    return _pwdTF;
+}
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end
@@ -15,6 +15,7 @@
 @property (nonatomic, strong) UIButton *verificationBtn;
 @property (nonatomic, strong) UIButton *loginBtn;
 @property (nonatomic, strong) dispatch_source_t timer;
+@property (nonatomic, strong) UIButton *checkCodeBtn;
 @end
@@ -39,7 +40,9 @@
     [self.view addSubview:self.registBasicInformationView];
     [self.view addSubview:self.verificationBtn];
     [self.view addSubview:self.loginBtn];
-
+    if ([_type isEqualToString:@"register"] || [_type isEqualToString:@"quicklyLogin"]) {
+        [self.view addSubview:self.checkCodeBtn];
+    }
 }
 #pragma mark - action
@@ -87,6 +90,15 @@
     }
 }
+- (void)checkCodeBtnAction
+{
+    [CNLiveUserSystemCenter shortcutLoginCheckVerificationCodeWithMobile:_registBasicInformationView.phoneTF.text verificationCode:_registBasicInformationView.verificationTF.text success:^(id result) {
+        [Tools toast:result[@"errorMessage"]];
+    } failure:^(NSDictionary *errorDic) {
+        [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
+    }];
+}
+
 - (void)stopTimer
 {
     [self.verificationBtn setTitle:@"发送验证码" forState:UIControlStateNormal];
@@ -213,6 +225,24 @@
     return _registBasicInformationView;
 }
+- (UIButton *)checkCodeBtn
+{
+    if (!_checkCodeBtn) {
+        _checkCodeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_checkCodeBtn setFrame:CGRectMake(KScreenWidth - 105, 80 + 57, 95, 37)];
+        [_checkCodeBtn setTitle:@"校验验证码" forState:UIControlStateNormal];
+        [_checkCodeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        [_checkCodeBtn addTarget:self action:@selector(checkCodeBtnAction) forControlEvents:UIControlEventTouchUpInside];
+        _checkCodeBtn.titleLabel.font = [UIFont systemFontOfSize:15];
+        [_checkCodeBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+        _checkCodeBtn.layer.cornerRadius = 10;
+        _checkCodeBtn.layer.masksToBounds = YES;
+        _checkCodeBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _checkCodeBtn.layer.borderWidth = 1;
+    }
+    return _checkCodeBtn;
+}
+
 - (UIButton *)verificationBtn
 {
     if (!_verificationBtn) {
@@ -14,6 +14,7 @@
 #import "UserInfoSava.h"
 #import "ThirdPartyView.h"
 #import "CNLiveThirdLoginManager.h"
+#import "ModifyPwdViewController.h"
 @interface ViewController ()<UITableViewDelegate,UITableViewDataSource,ThirdPartyViewDelegate,UIGestureRecognizerDelegate>
 {
@@ -47,7 +48,7 @@
     [self.view addSubview:self.loginBtn];
     [self.view addSubview:self.thirPartydView];
-    _dataArr = @[@"通过手机号修改密码",@"更新附加信息",@"修改用户信息",@"查询用户信息",@"查询多条用户信息",@"反馈",@"绑定第三方账号"];
+    _dataArr = @[@"通过手机号修改密码",@"更新附加信息",@"修改用户信息",@"查询用户信息",@"查询多条用户信息",@"反馈",@"绑定第三方账号",@"通过邮箱修改密码",@"通过原密码修改密码"];
 }
@@ -129,7 +130,7 @@
         iconImg.layer.masksToBounds = YES;
         [loginCell.contentView addSubview:iconImg];
         UserInfoModel *model = [UserInfoModel modelWithKeyValues:[Tools getLocalUserInfo]];
-        
+
         [iconImg sd_setImageWithURL:[NSURL URLWithString:model.faceUrl] placeholderImage:[UIImage imageNamed:@"touxiang"]];
         UILabel *name = [[UILabel alloc] initWithFrame:CGRectMake(120, 0, KScreenWidth- 160, 120)];
@@ -151,7 +152,7 @@
         }
         cell.textLabel.text = [NSString stringWithFormat:@"%@",_dataArr[indexPath.row-1]];
         return cell;
-        
+    
     }
     return nil;
 }
@@ -159,7 +160,7 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
-    
+
     if (indexPath.row == 1) {       //修改密码
         RegisterViewController *regVC = [[RegisterViewController alloc] init];
         regVC.type = @"forgetPwd";
@@ -171,14 +172,14 @@
         [SVProgressHUD show];
         UserInfoModel *model = [UserInfoModel modelWithKeyValues:[Tools getLocalUserInfo]];
-        
+
         [CNLiveUserSystemCenter updateOtherInfoWithUid:model.uid extInfo:@"将要更新的附加信息,NSString类型" success:^(id result) {
             NSLog(@"--------%@",result);
             [SVProgressHUD showSuccessWithStatus:@"更新附加信息成功"];
             [self.navigationController popViewControllerAnimated:YES];
-            
+
         } failure:^(NSDictionary *errorDic) {
             [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
             [SVProgressHUD dismiss];
@@ -195,15 +196,15 @@
         [CNLiveUserSystemCenter queryUserInfoWithUid:model.uid srcUid:model.uid success:^(id result) {
             NSLog(@"%@",result);
-            
+
             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:^(NSDictionary *errorDic) {
             [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
         }];
@@ -212,19 +213,17 @@
     if (indexPath.row == 5) {       //查询多条用户信息
         UserInfoModel *model = [UserInfoModel modelWithKeyValues:[Tools getLocalUserInfo]];
         [CNLiveUserSystemCenter queryMoreUserInfosWithUid:model.uid srcUids:@[@"498122",@"10000098",@"10451544"] success:^(id result) {
-            NSLog(@"-----%@",result);
-            [Tools toast:@"查询多条用户信息成功"];
-
+            NSLog(@"查询多条用户信息-----%@",result);
         } failure:^(NSDictionary *errorDic) {
             [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
         }];
     }
     if (indexPath.row == 6) {       //反馈
-        
+
         [CNLiveUserSystemCenter feedbackWithContentId:@"11" message:@"fhsjhifkncznshfu" success:^(id result) {
             [Tools toast:[NSString stringWithFormat:@"反馈--%@",result[@"errorMessage"]]];
-            
+
         } failure:^(NSDictionary *errorDic) {
             [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
         }];
@@ -236,6 +235,18 @@
             _thirPartydView.frame = CGRectMake(0, KScreenHeight-160, KScreenWidth, 160);
         }];
     }
+    
+    if (indexPath.row == 8) {       //邮箱修改密码
+        ModifyPwdViewController *modVC = [[ModifyPwdViewController alloc] init];
+        modVC.type = ModifyPwdTypeEmail;
+        [self.navigationController pushViewController:modVC animated:YES];
+    }
+    
+    if (indexPath.row == 9) {       //原密码修改密码
+        ModifyPwdViewController *modVC = [[ModifyPwdViewController alloc] init];
+        modVC.type = ModifyPwdTypeOldPwd;
+        [self.navigationController pushViewController:modVC animated:YES];
+    }
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -52,7 +52,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>wechat</string>
@@ -8,6 +8,13 @@
 #import <Foundation/Foundation.h>
+typedef NS_ENUM(NSInteger, ThirdLoginType) {//枚举类型
+    ThirdLoginTypeCommon          = 0,//普通三方登录
+    ThirdLoginTypeCheckIsRegister    ,//验证三方是否注册,注册过登录
+    ThirdLoginTypeBindMobile          //强制绑定手机号三方登录
+};
+
+
 @interface CNLiveThirdLoginManager : NSObject
 + (CNLiveThirdLoginManager *)manager;
@@ -20,4 +27,7 @@
 - (void)sinaLoginIsBindingThirdParty:(BOOL)Binding;
+@property (nonatomic ,assign) ThirdLoginType            thirdType;
+@property (nonatomic ,copy) NSString * bindMobile;
+
 @end
@@ -11,7 +11,7 @@
 #import <TencentOpenAPI/QQApiInterfaceObject.h>
 #import <TencentOpenAPI/QQApiInterface.h>
-#define verificationCode @"cnlive"
+#define VerificationCode @"cnlive"
 @interface CNLiveThirdLoginManager ()<WXApiDelegate,TencentSessionDelegate,TencentLoginDelegate,WBHttpRequestDelegate,WeiboSDKDelegate>
 {
@@ -88,7 +88,7 @@
     if ([WXApi isWXAppInstalled]) {
         SendAuthReq* req = [[SendAuthReq alloc] init];
         req.scope = @"snsapi_userinfo";
-        req.state = verificationCode;
+        req.state = VerificationCode;
         [WXApi sendReq:req];
     }
     else {
@@ -150,17 +150,57 @@
             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);
-            
-            [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];
-        }];
+        switch (self.thirdType) {
+            case ThirdLoginTypeCommon:
+            {
+                [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];
+                }];
+            }
+                break;
+            case ThirdLoginTypeCheckIsRegister:
+            {
+                [CNLiveUserSystemCenter thirdPartyCheckLoginWithThirdPartyPlatType:@"2" thirdPartyId:[tencentOAuth getUserOpenID] frmId:@"" 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];
+                }];
+            }
+                break;
+            case ThirdLoginTypeBindMobile:
+            {
+                [CNLiveUserSystemCenter verificationCodeType:VerificationCodeTypeShortcutLogin mobile:self.bindMobile success:^(id result) {
+                    NSLog(@"ver %@",result);
+                    if ([result[@"errorCode"] isEqualToString:@"0"]) {
+                        
+                        NSString *location = [response.jsonResponse objectForKey:@"city"];
+                        NSString *teId = [tencentOAuth getUserOpenID];
+                        NSString *faceUrl = [response.jsonResponse objectForKey:@"figureurl_qq_2"];
+                        NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:teId,@"partyId",gender,@"gender",location,@"location",faceUrl,@"faceUrl",@"2",@"platType",self.bindMobile,@"mobile", nil];
+                        [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:dic];
+                    }
+                    
+                } failure:^(NSDictionary *errorDic) {
+                    NSLog(@"%@",errorDic);
+                }];
+            }
+                break;
+            default:
+                break;
+        }
     }
 }
@@ -197,8 +237,6 @@
             [self getWeChatUserInfo:authResp];
-//            }
-            
         }
         else if (temp.errCode == -4) {
             // 用户拒绝授权
@@ -285,17 +323,58 @@
                                 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];
-                        }];
+                        switch (self.thirdType) {
+                            case ThirdLoginTypeCommon:
+                            {
+                                
+                                [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];
+                                }];
+                            }
+                                break;
+                            case ThirdLoginTypeCheckIsRegister:
+                            {
+                                [CNLiveUserSystemCenter thirdPartyCheckLoginWithThirdPartyPlatType:@"3" thirdPartyId:[dic objectForKey:@"openid"] frmId:@"" 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];
+                                }];
+                            }
+                                break;
+                            case ThirdLoginTypeBindMobile:
+                            {
+                                [CNLiveUserSystemCenter verificationCodeType:VerificationCodeTypeShortcutLogin mobile:self.bindMobile success:^(id result) {
+                                    NSLog(@"ver %@",result);
+                                    if ([result[@"errorCode"] isEqualToString:@"0"]) {
+                                        
+                                        NSString *location = [dic objectForKey:@"country"];
+                                        NSString *teId = [dic objectForKey:@"openid"];
+                                        NSString *faceUrl = [dic objectForKey:@"headimgurl"];
+                                        NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:teId,@"partyId",gender,@"gender",location,@"location",faceUrl,@"faceUrl",@"3",@"platType",self.bindMobile,@"mobile", nil];
+                                        [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:dic];
+                                    }
+                                    
+                                } failure:^(NSDictionary *errorDic) {
+                                    NSLog(@"%@",errorDic);
+                                }];
+                            }
+                                break;
+                            default:
+                                break;
+                        }
                     }
                 }
             }
@@ -354,17 +433,57 @@
                 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];
-            }];
+            switch (self.thirdType) {
+                case ThirdLoginTypeCommon:
+                {
+                    [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];
+                    }];
+                }
+                    break;
+                case ThirdLoginTypeCheckIsRegister:
+                {
+                    [CNLiveUserSystemCenter thirdPartyCheckLoginWithThirdPartyPlatType:@"1" thirdPartyId:[dic objectForKey:@"id"] frmId:@"" 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];
+                    }];
+                }
+                    break;
+                case ThirdLoginTypeBindMobile:
+                {
+                    [CNLiveUserSystemCenter verificationCodeType:VerificationCodeTypeShortcutLogin mobile:self.bindMobile success:^(id result) {
+                        NSLog(@"ver %@",result);
+                        if ([result[@"errorCode"] isEqualToString:@"0"]) {
+                            
+                            NSString *location = [dic objectForKey:@"location"];
+                            NSString *partyId = [dic objectForKey:@"id"];
+                            NSString *faceUrl = [dic objectForKey:@"avatar_hd"];
+                            NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:partyId,@"partyId",gender,@"gender",location,@"location",faceUrl,@"faceUrl",@"1",@"platType",self.bindMobile,@"mobile", nil];
+                            [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:dic];
+                        }
+                        
+                    } failure:^(NSDictionary *errorDic) {
+                        NSLog(@"%@",errorDic);
+                    }];
+                }
+                    break;
+                default:
+                    break;
+            }
         }
     }
 }
@@ -178,8 +178,86 @@
 /**
+ 通过邮箱修改密码
+
+ @param email 邮箱
+ @param newPwd 新密码
+ @param success 成功回调
+ @param failure 失败回调
+ */
++ (void)modifyPwdWithEmail:(NSString *)email newPwd:(NSString *)newPwd success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
+
+
+/**
+ 通过原密码修改密码
+
+ @param uid 用户ID
+ @param pwd 原密码
+ @param newPwd 新密码
+ @param success 成功回调
+ @param failure 失败回调
+ */
++ (void)oldPwdChangePasswordWithUid:(NSString *)uid pwd:(NSString *)pwd newPwd:(NSString *)newPwd success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
+
+
+/**
+ 注册前校验手机验证码
+
+ @param mobile 手机号
+ @param verificationCode 验证码
+ @param success 成功回调
+ @param getVersion 失败回调
+ */
++ (void)registerCheckVerificationCodeWithMobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
+
+
+/**
+ 快捷登录前校验手机验证码
+
+ @param mobile 手机号
+ @param verificationCode 验证码
+ @param success 成功回调
+ @param failure 失败回调
+ */
++ (void)shortcutLoginCheckVerificationCodeWithMobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
+
+
+/**
+ 验证第三方账号是否注册,若注册则直接登录返回用户信息,若未注册返回errorCode
+
+ @param plat  第三方平台编号（如plat: 1:sina weibo 2:qq 3:weixin 4:renren 注:如qq登录,plat=@"2"）
+ @param thirdPartyId 第三方用户ID
+ @param frmId 渠道ID（非必填）
+ @param success 成功回调
+ @param failure 失败回调
+ */
++ (void)thirdPartyCheckLoginWithThirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
+
+
+/**
+ 第三方注册强制绑定手机号登录: 手机号+密码+验证码+三方账号
+
+ @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：未知（非必填）
+ @param location 用户所在地（非必填）
+ @param faceUrl 头像，约100*100（非必填）
+ @param mobile 手机号
+ @param verificationCode 验证码 (验证码类型为快捷登录VerificationCodeTypeShortcutLogin)
+ @param pawd 注册密码
+ @param frmId 渠道ID（非必填）
+ @param success 成功回调
+ @param failure 失败回调
+ */
++ (void)thirdPartyBindMobileLoginWithThirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId nickName:(NSString *)nickName gender:(NSString *)gender location:(NSString *)location faceUrl:(NSString *)faceUrl mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode pawd:(NSString *)pawd frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
+
+/**
  *  获取SDK版本号
  */
 + (NSString *)getVersion;
+
+
 @end
@@ -24,4 +24,10 @@ typedef NS_ENUM(NSUInteger, UserInfoType) {
     UserInfoTypeLocation,                       //联系方式（地址）
 };
+//校验验证码
+typedef NS_ENUM(NSInteger, CheckVerificationCodeType) {
+    CheckVerificationCodeTypeRegister          = 0,//注册前校验验证码
+    CheckVerificationCodeTypeShortcutLogin         //快捷登录前校验验证码
+};
+
 #endif /* CNLiveUserSystemTypeDef_h */