iOS Team / CNLiveUserSystemSDKDemo · Commits

Commit e2b7f56f045843322c6b04496621b6c8601a88de

Authored by cnlive
2 parents 7d37a205 91542ffb

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

# Conflicts:
#	CNLive用户系统说明文档.pdf
Inline Side-by-side
Showing 12 changed files with 109 additions and 168 deletions
CNLiveUserSystemDemo/CNLiveUserSystemDemo.xcodeproj/project.pbxproj
  View file @e2b7f56
... ... @@ -42,9 +42,6 @@
42 42 811600FD1D927E7E003CAE7D /* UIView+WebCacheOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 811600EC1D927E7E003CAE7D /* UIView+WebCacheOperation.m */; };
43 43 811600FE1D927E7E003CAE7D /* WebP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 811600ED1D927E7E003CAE7D /* WebP.framework */; };
44 44 8116F8E41D8916250084FE49 /* IdAndPwdView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8116F8E31D8916250084FE49 /* IdAndPwdView.m */; };
45   - 8116F8EA1D89165A0084FE49 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8116F8E71D89165A0084FE49 /* LoginViewController.m */; };
46   - 8116F8EB1D89165A0084FE49 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8116F8E91D89165A0084FE49 /* ViewController.m */; };
47   - 8116F8EE1D891AEF0084FE49 /* RegisterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8116F8ED1D891AEF0084FE49 /* RegisterViewController.m */; };
48 45 8116F8F11D891BCD0084FE49 /* RegistBasicInformationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8116F8F01D891BCD0084FE49 /* RegistBasicInformationView.m */; };
49 46 812642C61D86A7A800B402CA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 812642C51D86A7A800B402CA /* main.m */; };
50 47 812642C91D86A7A800B402CA /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 812642C81D86A7A800B402CA /* AppDelegate.m */; };
... ... @@ -64,13 +61,16 @@
64 61 8187A90D1D8E9A7B007FAFB6 /* SVProgressHUD.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8187A9061D8E9A7B007FAFB6 /* SVProgressHUD.bundle */; };
65 62 8187A90E1D8E9A7B007FAFB6 /* SVProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 8187A9081D8E9A7B007FAFB6 /* SVProgressHUD.m */; };
66 63 8187A90F1D8E9A7B007FAFB6 /* SVRadialGradientLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 8187A90A1D8E9A7B007FAFB6 /* SVRadialGradientLayer.m */; };
67   - 818C7F9D1DA9EF91006825D7 /* CNLiveUserSystemSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 818C7F9C1DA9EF91006825D7 /* CNLiveUserSystemSDK.framework */; };
68   - 818C7F9E1DA9EF9B006825D7 /* CNLiveUserSystemSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 818C7F9C1DA9EF91006825D7 /* CNLiveUserSystemSDK.framework */; };
69   - 818C7F9F1DA9EF9B006825D7 /* CNLiveUserSystemSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 818C7F9C1DA9EF91006825D7 /* CNLiveUserSystemSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
70   - B6B54BE71D8CFEC200089C9C /* UserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B54BE61D8CFEC200089C9C /* UserInfoViewController.m */; };
  64 + 81DA8A1A1DC8623800EE1612 /* CNLiveUserSystemSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81DA8A191DC8623800EE1612 /* CNLiveUserSystemSDK.framework */; };
  65 + 81DA8A1B1DC8623F00EE1612 /* CNLiveUserSystemSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81DA8A191DC8623800EE1612 /* CNLiveUserSystemSDK.framework */; };
  66 + 81DA8A1C1DC8623F00EE1612 /* CNLiveUserSystemSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 81DA8A191DC8623800EE1612 /* CNLiveUserSystemSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
  67 + 81DA8A281DC8630900EE1612 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81DA8A1F1DC8630900EE1612 /* LoginViewController.m */; };
  68 + 81DA8A291DC8630900EE1612 /* ModifyUserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81DA8A211DC8630900EE1612 /* ModifyUserInfoViewController.m */; };
  69 + 81DA8A2A1DC8630900EE1612 /* RegisterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81DA8A231DC8630900EE1612 /* RegisterViewController.m */; };
  70 + 81DA8A2B1DC8630900EE1612 /* UserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81DA8A251DC8630900EE1612 /* UserInfoViewController.m */; };
  71 + 81DA8A2C1DC8630900EE1612 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81DA8A271DC8630900EE1612 /* ViewController.m */; };
71 72 B6B54BEA1D8D009800089C9C /* UserInfoHeaderImageTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B54BE91D8D009800089C9C /* UserInfoHeaderImageTableViewCell.m */; };
72 73 B6B54BED1D8D011000089C9C /* UserInfoTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B54BEC1D8D011000089C9C /* UserInfoTableViewCell.m */; };
73   - B6B54BF01D8D025A00089C9C /* ModifyUserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B54BEF1D8D025A00089C9C /* ModifyUserInfoViewController.m */; };
74 74 /* End PBXBuildFile section */
75 75  
76 76 /* Begin PBXContainerItemProxy section */
... ... @@ -97,7 +97,7 @@
97 97 dstPath = "";
98 98 dstSubfolderSpec = 10;
99 99 files = (
100   - 818C7F9F1DA9EF9B006825D7 /* CNLiveUserSystemSDK.framework in Embed Frameworks */,
  100 + 81DA8A1C1DC8623F00EE1612 /* CNLiveUserSystemSDK.framework in Embed Frameworks */,
101 101 );
102 102 name = "Embed Frameworks";
103 103 runOnlyForDeploymentPostprocessing = 0;
... ... @@ -172,12 +172,6 @@
172 172 8116F8DA1D88F3010084FE49 /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
173 173 8116F8E21D8916250084FE49 /* IdAndPwdView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IdAndPwdView.h; sourceTree = "<group>"; };
174 174 8116F8E31D8916250084FE49 /* IdAndPwdView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IdAndPwdView.m; sourceTree = "<group>"; };
175   - 8116F8E61D89165A0084FE49 /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
176   - 8116F8E71D89165A0084FE49 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
177   - 8116F8E81D89165A0084FE49 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
178   - 8116F8E91D89165A0084FE49 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
179   - 8116F8EC1D891AEF0084FE49 /* RegisterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegisterViewController.h; sourceTree = "<group>"; };
180   - 8116F8ED1D891AEF0084FE49 /* RegisterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegisterViewController.m; sourceTree = "<group>"; };
181 175 8116F8EF1D891BCD0084FE49 /* RegistBasicInformationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegistBasicInformationView.h; sourceTree = "<group>"; };
182 176 8116F8F01D891BCD0084FE49 /* RegistBasicInformationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegistBasicInformationView.m; sourceTree = "<group>"; };
183 177 812642C11D86A7A800B402CA /* CNLiveUserSystemDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CNLiveUserSystemDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
... ... @@ -215,15 +209,21 @@
215 209 8187A9081D8E9A7B007FAFB6 /* SVProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVProgressHUD.m; sourceTree = "<group>"; };
216 210 8187A9091D8E9A7B007FAFB6 /* SVRadialGradientLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVRadialGradientLayer.h; sourceTree = "<group>"; };
217 211 8187A90A1D8E9A7B007FAFB6 /* SVRadialGradientLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVRadialGradientLayer.m; sourceTree = "<group>"; };
218   - 818C7F9C1DA9EF91006825D7 /* CNLiveUserSystemSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveUserSystemSDK.framework; sourceTree = "<group>"; };
219   - B6B54BE51D8CFEC200089C9C /* UserInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoViewController.h; sourceTree = "<group>"; };
220   - B6B54BE61D8CFEC200089C9C /* UserInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoViewController.m; sourceTree = "<group>"; };
  212 + 81DA8A191DC8623800EE1612 /* CNLiveUserSystemSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveUserSystemSDK.framework; sourceTree = "<group>"; };
  213 + 81DA8A1E1DC8630900EE1612 /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
  214 + 81DA8A1F1DC8630900EE1612 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
  215 + 81DA8A201DC8630900EE1612 /* ModifyUserInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifyUserInfoViewController.h; sourceTree = "<group>"; };
  216 + 81DA8A211DC8630900EE1612 /* ModifyUserInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModifyUserInfoViewController.m; sourceTree = "<group>"; };
  217 + 81DA8A221DC8630900EE1612 /* RegisterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegisterViewController.h; sourceTree = "<group>"; };
  218 + 81DA8A231DC8630900EE1612 /* RegisterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegisterViewController.m; sourceTree = "<group>"; };
  219 + 81DA8A241DC8630900EE1612 /* UserInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoViewController.h; sourceTree = "<group>"; };
  220 + 81DA8A251DC8630900EE1612 /* UserInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoViewController.m; sourceTree = "<group>"; };
  221 + 81DA8A261DC8630900EE1612 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
  222 + 81DA8A271DC8630900EE1612 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
221 223 B6B54BE81D8D009800089C9C /* UserInfoHeaderImageTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoHeaderImageTableViewCell.h; sourceTree = "<group>"; };
222 224 B6B54BE91D8D009800089C9C /* UserInfoHeaderImageTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoHeaderImageTableViewCell.m; sourceTree = "<group>"; };
223 225 B6B54BEB1D8D011000089C9C /* UserInfoTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoTableViewCell.h; sourceTree = "<group>"; };
224 226 B6B54BEC1D8D011000089C9C /* UserInfoTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoTableViewCell.m; sourceTree = "<group>"; };
225   - B6B54BEE1D8D025A00089C9C /* ModifyUserInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifyUserInfoViewController.h; sourceTree = "<group>"; };
226   - B6B54BEF1D8D025A00089C9C /* ModifyUserInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModifyUserInfoViewController.m; sourceTree = "<group>"; };
227 227 /* End PBXFileReference section */
228 228  
229 229 /* Begin PBXFrameworksBuildPhase section */
... ... @@ -231,6 +231,7 @@
231 231 isa = PBXFrameworksBuildPhase;
232 232 buildActionMask = 2147483647;
233 233 files = (
  234 + 81DA8A1A1DC8623800EE1612 /* CNLiveUserSystemSDK.framework in Frameworks */,
234 235 811600FE1D927E7E003CAE7D /* WebP.framework in Frameworks */,
235 236 817C6EC31D90D60E0016F211 /* ImageIO.framework in Frameworks */,
236 237 810D9B811D8FCD3200B7A776 /* libc++.tbd in Frameworks */,
... ... @@ -244,8 +245,7 @@
244 245 810D9B6E1D8FB76E00B7A776 /* libiconv.tbd in Frameworks */,
245 246 810D9B6C1D8FB76300B7A776 /* Security.framework in Frameworks */,
246 247 810D9B651D8FB70600B7A776 /* TencentOpenAPI.framework in Frameworks */,
247   - 818C7F9E1DA9EF9B006825D7 /* CNLiveUserSystemSDK.framework in Frameworks */,
248   - 818C7F9D1DA9EF91006825D7 /* CNLiveUserSystemSDK.framework in Frameworks */,
  248 + 81DA8A1B1DC8623F00EE1612 /* CNLiveUserSystemSDK.framework in Frameworks */,
249 249 810D9B671D8FB70600B7A776 /* libWeiboSDK.a in Frameworks */,
250 250 810D9B691D8FB70600B7A776 /* libWeChatSDK.a in Frameworks */,
251 251 );
... ... @@ -384,27 +384,10 @@
384 384 path = Views;
385 385 sourceTree = "<group>";
386 386 };
387   - 8116F8E51D89165A0084FE49 /* Conreollers */ = {
388   - isa = PBXGroup;
389   - children = (
390   - 8116F8E81D89165A0084FE49 /* ViewController.h */,
391   - 8116F8E91D89165A0084FE49 /* ViewController.m */,
392   - 8116F8E61D89165A0084FE49 /* LoginViewController.h */,
393   - 8116F8E71D89165A0084FE49 /* LoginViewController.m */,
394   - 8116F8EC1D891AEF0084FE49 /* RegisterViewController.h */,
395   - 8116F8ED1D891AEF0084FE49 /* RegisterViewController.m */,
396   - B6B54BE51D8CFEC200089C9C /* UserInfoViewController.h */,
397   - B6B54BE61D8CFEC200089C9C /* UserInfoViewController.m */,
398   - B6B54BEE1D8D025A00089C9C /* ModifyUserInfoViewController.h */,
399   - B6B54BEF1D8D025A00089C9C /* ModifyUserInfoViewController.m */,
400   - );
401   - path = Conreollers;
402   - sourceTree = "<group>";
403   - };
404 387 812642B81D86A7A800B402CA = {
405 388 isa = PBXGroup;
406 389 children = (
407   - 818C7F9C1DA9EF91006825D7 /* CNLiveUserSystemSDK.framework */,
  390 + 81DA8A191DC8623800EE1612 /* CNLiveUserSystemSDK.framework */,
408 391 810D9B7D1D8FCBC200B7A776 /* frameworks */,
409 392 812642C31D86A7A800B402CA /* CNLiveUserSystemDemo */,
410 393 812642DD1D86A7A800B402CA /* CNLiveUserSystemDemoTests */,
... ... @@ -430,7 +413,7 @@
430 413 812642C81D86A7A800B402CA /* AppDelegate.m */,
431 414 8187A8EC1D8E6385007FAFB6 /* Tools */,
432 415 8187A8FF1D8E9A7B007FAFB6 /* ThirdSDK */,
433   - 8116F8E51D89165A0084FE49 /* Conreollers */,
  416 + 81DA8A1D1DC8630900EE1612 /* Conreollers */,
434 417 8116F8E11D8916250084FE49 /* Views */,
435 418 812642CD1D86A7A800B402CA /* Main.storyboard */,
436 419 812642D01D86A7A800B402CA /* Assets.xcassets */,
... ... @@ -516,6 +499,23 @@
516 499 path = SVProgressHUD;
517 500 sourceTree = "<group>";
518 501 };
  502 + 81DA8A1D1DC8630900EE1612 /* Conreollers */ = {
  503 + isa = PBXGroup;
  504 + children = (
  505 + 81DA8A1E1DC8630900EE1612 /* LoginViewController.h */,
  506 + 81DA8A1F1DC8630900EE1612 /* LoginViewController.m */,
  507 + 81DA8A201DC8630900EE1612 /* ModifyUserInfoViewController.h */,
  508 + 81DA8A211DC8630900EE1612 /* ModifyUserInfoViewController.m */,
  509 + 81DA8A221DC8630900EE1612 /* RegisterViewController.h */,
  510 + 81DA8A231DC8630900EE1612 /* RegisterViewController.m */,
  511 + 81DA8A241DC8630900EE1612 /* UserInfoViewController.h */,
  512 + 81DA8A251DC8630900EE1612 /* UserInfoViewController.m */,
  513 + 81DA8A261DC8630900EE1612 /* ViewController.h */,
  514 + 81DA8A271DC8630900EE1612 /* ViewController.m */,
  515 + );
  516 + path = Conreollers;
  517 + sourceTree = "<group>";
  518 + };
519 519 /* End PBXGroup section */
520 520  
521 521 /* Begin PBXNativeTarget section */
... ... @@ -662,34 +662,34 @@
662 662 8187A90C1D8E9A7B007FAFB6 /* SVProgressAnimatedView.m in Sources */,
663 663 811600F71D927E7E003CAE7D /* UIButton+WebCache.m in Sources */,
664 664 8116F8E41D8916250084FE49 /* IdAndPwdView.m in Sources */,
665   - 8116F8EA1D89165A0084FE49 /* LoginViewController.m in Sources */,
666 665 811600F81D927E7E003CAE7D /* UIImage+GIF.m in Sources */,
667 666 811600F61D927E7E003CAE7D /* SDWebImagePrefetcher.m in Sources */,
668 667 8116F8F11D891BCD0084FE49 /* RegistBasicInformationView.m in Sources */,
669 668 8187A8F61D8E6486007FAFB6 /* NSObject+UserModel.m in Sources */,
  669 + 81DA8A291DC8630900EE1612 /* ModifyUserInfoViewController.m in Sources */,
670 670 811600F11D927E7E003CAE7D /* SDWebImageCompat.m in Sources */,
671 671 811600F31D927E7E003CAE7D /* SDWebImageDownloader.m in Sources */,
672 672 811600F41D927E7E003CAE7D /* SDWebImageDownloaderOperation.m in Sources */,
673 673 811600F21D927E7E003CAE7D /* SDWebImageDecoder.m in Sources */,
674 674 811600F51D927E7E003CAE7D /* SDWebImageManager.m in Sources */,
  675 + 81DA8A2B1DC8630900EE1612 /* UserInfoViewController.m in Sources */,
  676 + 81DA8A2C1DC8630900EE1612 /* ViewController.m in Sources */,
675 677 8187A8FB1D8E68CD007FAFB6 /* CNLiveLogout.m in Sources */,
676   - 8116F8EB1D89165A0084FE49 /* ViewController.m in Sources */,
677 678 8187A90E1D8E9A7B007FAFB6 /* SVProgressHUD.m in Sources */,
678   - 8116F8EE1D891AEF0084FE49 /* RegisterViewController.m in Sources */,
679 679 811600FD1D927E7E003CAE7D /* UIView+WebCacheOperation.m in Sources */,
680 680 8187A8EF1D8E6394007FAFB6 /* Tools.m in Sources */,
  681 + 81DA8A281DC8630900EE1612 /* LoginViewController.m in Sources */,
681 682 812642C91D86A7A800B402CA /* AppDelegate.m in Sources */,
682 683 8187A90B1D8E9A7B007FAFB6 /* SVIndefiniteAnimatedView.m in Sources */,
683 684 811600EE1D927E7E003CAE7D /* MKAnnotationView+WebCache.m in Sources */,
  685 + 81DA8A2A1DC8630900EE1612 /* RegisterViewController.m in Sources */,
684 686 811600F91D927E7E003CAE7D /* UIImage+MultiFormat.m in Sources */,
685 687 B6B54BED1D8D011000089C9C /* UserInfoTableViewCell.m in Sources */,
686 688 8187A8F81D8E6486007FAFB6 /* UserInfoSava.m in Sources */,
687 689 811600EF1D927E7E003CAE7D /* NSData+ImageContentType.m in Sources */,
688 690 812642C61D86A7A800B402CA /* main.m in Sources */,
689 691 811600FA1D927E7E003CAE7D /* UIImage+WebP.m in Sources */,
690   - B6B54BF01D8D025A00089C9C /* ModifyUserInfoViewController.m in Sources */,
691 692 8187A90F1D8E9A7B007FAFB6 /* SVRadialGradientLayer.m in Sources */,
692   - B6B54BE71D8CFEC200089C9C /* UserInfoViewController.m in Sources */,
693 693 8187A8F71D8E6486007FAFB6 /* UserInfoModel.m in Sources */,
694 694 811600F01D927E7E003CAE7D /* SDImageCache.m in Sources */,
695 695 );
... ...
CNLiveUserSystemDemo/CNLiveUserSystemDemo.xcodeproj/project.xcworkspace/xcuserdata/iOS.xcuserdatad/UserInterfaceState.xcuserstate
View file @e2b7f56
No preview for this file type
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/LoginViewController.m
  View file @e2b7f56
... ... @@ -57,16 +57,12 @@
57 57 [CNLiveUserSystemCenter loginWithUserName:_idAndPwdView.idTF.text password:_idAndPwdView.pwdTF.text frmId:nil success:^(id result) {
58 58  
59 59 NSLog(@"登录 success------------%@",result);
60   - if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
61   - [Tools setUserLogin:YES];
62   - [SVProgressHUD showSuccessWithStatus:@"登录成功"];
63   - [UserInfoSava saveUserinfoDic:result[@"data"]];
64   - [self.navigationController popViewControllerAnimated:YES];
65   -
66   - } else {
67   - [Tools toast:result[@"errorMessage"]];
68   - [SVProgressHUD dismiss];
69   - }
  60 +
  61 + [Tools setUserLogin:YES];
  62 + [SVProgressHUD showSuccessWithStatus:@"登录成功"];
  63 + [UserInfoSava saveUserinfoDic:result[@"data"]];
  64 + [self.navigationController popViewControllerAnimated:YES];
  65 +
70 66  
71 67 } failure:^(NSError *error) {
72 68  
... ...
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/ModifyUserInfoViewController.m
  View file @e2b7f56
... ... @@ -46,31 +46,22 @@
46 46 [CNLiveUserSystemCenter updateMobileWithUid:model.uid mobile:_registBasicInformationView.phoneTF.text verificationCode:_registBasicInformationView.verificationTF.text success:^(id result) {
47 47  
48 48 NSLog(@"-----------%@",result);
49   - if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
50   - [SVProgressHUD showSuccessWithStatus:@"手机号修改成功"];
51   - [self.navigationController popViewControllerAnimated:YES];
52   -
53   - } else {
54   - [Tools toast:result[@"errorMessage"]];
55   - [SVProgressHUD dismiss];
56   - }
57 49  
  50 + [SVProgressHUD showSuccessWithStatus:@"手机号修改成功"];
  51 + [self.navigationController popViewControllerAnimated:YES];
  52 +
58 53 } failure:^(NSError *error) {
59 54 [Tools toast:error.localizedDescription];
60 55 [SVProgressHUD dismiss];
61 56 }];
  57 +
62 58 } else {
63 59 [CNLiveUserSystemCenter modifyUserInfoType:_modifyType uid:model.uid modifyInfo:_textField1.text success:^(id result) {
64 60  
65 61 NSLog(@"-----------%@",result);
66   - if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
67   - [SVProgressHUD showSuccessWithStatus:@"修改成功"];
68   - [self.navigationController popViewControllerAnimated:YES];
69   -
70   - } else {
71   - [Tools toast:result[@"errorMessage"]];
72   - [SVProgressHUD dismiss];
73   - }
  62 +
  63 + [SVProgressHUD showSuccessWithStatus:@"修改成功"];
  64 + [self.navigationController popViewControllerAnimated:YES];
74 65  
75 66 } failure:^(NSError *error) {
76 67 [Tools toast:error.localizedDescription];
... ... @@ -78,7 +69,6 @@
78 69  
79 70 }];
80 71 }
81   -
82 72 }
83 73  
84 74 - (void)verificationBtnAction
... ... @@ -89,7 +79,6 @@
89 79  
90 80 [Tools toast:result[@"errorMessage"]];
91 81  
92   -
93 82 } failure:^(NSError *error) {
94 83 [Tools toast:error.localizedDescription];
95 84 }];
... ...
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/RegisterViewController.m
  View file @e2b7f56
... ... @@ -87,18 +87,11 @@
87 87  
88 88 [CNLiveUserSystemCenter registerWithUserName:_registBasicInformationView.phoneTF.text password:_registBasicInformationView.setPwdTF.text verificationCode:_registBasicInformationView.verificationTF.text invitationCode:nil frmId:nil success:^(id result) {
89 89  
90   - if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
91   - [Tools setUserLogin:YES];
92   - [SVProgressHUD showSuccessWithStatus:@"成功"];
93   - [UserInfoSava saveUserinfoDic:result[@"data"]];
94   - [self.navigationController popToRootViewControllerAnimated:YES];
95   -
96   - } else {
97   - [Tools toast:result[@"errorMessage"]];
98   - [SVProgressHUD dismiss];
  90 + [Tools setUserLogin:YES];
  91 + [SVProgressHUD showSuccessWithStatus:@"成功"];
  92 + [UserInfoSava saveUserinfoDic:result[@"data"]];
  93 + [self.navigationController popToRootViewControllerAnimated:YES];
99 94  
100   - }
101   -
102 95 } failure:^(NSError *error) {
103 96  
104 97 [Tools toast:error.localizedDescription];
... ... @@ -110,17 +103,11 @@
110 103  
111 104 [CNLiveUserSystemCenter shortcutLoginWithUserName:_registBasicInformationView.phoneTF.text verificationCode:_registBasicInformationView.verificationTF.text frmId:nil success:^(id result) {
112 105  
113   - if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
114   - [Tools setUserLogin:YES];
115   - [SVProgressHUD showSuccessWithStatus:@"成功"];
116   - [UserInfoSava saveUserinfoDic:result[@"data"]];
117   - [self.navigationController popToRootViewControllerAnimated:YES];
118   -
119   - } else {
120   - [Tools toast:result[@"errorMessage"]];
121   - [SVProgressHUD dismiss];
122   - }
123   -
  106 + [Tools setUserLogin:YES];
  107 + [SVProgressHUD showSuccessWithStatus:@"成功"];
  108 + [UserInfoSava saveUserinfoDic:result[@"data"]];
  109 + [self.navigationController popToRootViewControllerAnimated:YES];
  110 +
124 111 } failure:^(NSError *error) {
125 112  
126 113 [Tools toast:error.localizedDescription];
... ... @@ -130,14 +117,10 @@
130 117  
131 118 } else {
132 119 [CNLiveUserSystemCenter changePasswordWithMobile:_registBasicInformationView.phoneTF.text verificationCode:_registBasicInformationView.verificationTF.text newPassword:_registBasicInformationView.setPwdTF.text success:^(id result) {
133   - if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
134   - [SVProgressHUD showSuccessWithStatus:@"密码修改成功"];
135   - [self.navigationController popToRootViewControllerAnimated:YES];
136   -
137   - } else {
138   - [Tools toast:result[@"errorMessage"]];
139   - [SVProgressHUD dismiss];
140   - }
  120 +
  121 + [SVProgressHUD showSuccessWithStatus:@"密码修改成功"];
  122 + [self.navigationController popToRootViewControllerAnimated:YES];
  123 +
141 124 } failure:^(NSError *error) {
142 125 [Tools toast:error.localizedDescription];
143 126 [SVProgressHUD dismiss];
... ...
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/UserInfoViewController.m
  View file @e2b7f56
... ... @@ -191,13 +191,7 @@
191 191 [CNLiveUserSystemCenter modifyUserInfoType:UserInfoTypeGender uid:model.uid modifyInfo:string success:^(id result) {
192 192  
193 193 NSLog(@"%@",result);
194   - if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
195   - [SVProgressHUD showSuccessWithStatus:@"修改成功"];
196   -
197   - } else {
198   - [Tools toast:result[@"errorMessage"]];
199   - [SVProgressHUD dismiss];
200   - }
  194 + [SVProgressHUD showSuccessWithStatus:@"修改成功"];
201 195  
202 196 } failure:^(NSError *error) {
203 197 [Tools toast:error.localizedDescription];
... ...
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/ViewController.m
  View file @e2b7f56
... ... @@ -129,14 +129,8 @@
129 129  
130 130 NSLog(@"--------%@",result);
131 131  
132   - if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
133   - [SVProgressHUD showSuccessWithStatus:@"更新附加信息成功"];
134   - [self.navigationController popViewControllerAnimated:YES];
135   -
136   - } else {
137   - [Tools toast:result[@"errorMessage"]];
138   - [SVProgressHUD dismiss];
139   - }
  132 + [SVProgressHUD showSuccessWithStatus:@"更新附加信息成功"];
  133 + [self.navigationController popViewControllerAnimated:YES];
140 134  
141 135 } failure:^(NSError *error) {
142 136 [Tools toast:error.localizedDescription];
... ... @@ -154,18 +148,15 @@
154 148  
155 149 [CNLiveUserSystemCenter queryUserInfoWithUid:model.uid srcUid:model.uid success:^(id result) {
156 150 NSLog(@"%@",result);
157   - if ([result[@"errorCode"] isEqualToString:@"0"]) {
158   - NSDictionary *dic = result[@"data"];
159   - 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"]];
160   - NSString *icon = dic[@"faceUrl"];
161   -
162   - [UserInfoSava setLocalUserInfo:icon withKey:@"faceUrl"];
163   - [_tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:0 inSection:0]] withRowAnimation:UITableViewRowAnimationFade];
164   - [Tools toast:message];
165   - }else {
166   - [Tools toast:result[@"errorMessage"]];
167   - }
168   -
  151 +
  152 + NSDictionary *dic = result[@"data"];
  153 + 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"]];
  154 + NSString *icon = dic[@"faceUrl"];
  155 +
  156 + [UserInfoSava setLocalUserInfo:icon withKey:@"faceUrl"];
  157 + [_tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:0 inSection:0]] withRowAnimation:UITableViewRowAnimationFade];
  158 + [Tools toast:message];
  159 +
169 160 } failure:^(NSError *error) {
170 161 [Tools toast:error.localizedDescription];
171 162 }];
... ...
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Tools/CNLiveThirdLoginManager.m
  View file @e2b7f56
... ... @@ -39,7 +39,7 @@
39 39 });
40 40  
41 41 return share;
42   -
  42 +
43 43 }
44 44  
45 45 - (BOOL)handleOpenURL:(NSURL *)url
... ... @@ -56,7 +56,7 @@
56 56 return [QQApiInterface handleOpenURL:url delegate:self];
57 57  
58 58 }
59   -
  59 +
60 60 else {
61 61 return YES;
62 62 }
... ... @@ -67,7 +67,7 @@
67 67 tencentOAuth = [[TencentOAuth alloc] initWithAppId:QQAppKey andDelegate:self];
68 68 NSArray *permissions = [NSArray arrayWithObjects:kOPEN_PERMISSION_GET_VIP_INFO, kOPEN_PERMISSION_GET_USER_INFO, kOPEN_PERMISSION_GET_SIMPLE_USER_INFO, nil];
69 69 [tencentOAuth authorize:permissions inSafari:NO];
70   -
  70 +
71 71 }
72 72  
73 73 - (void)weChatLogin
... ... @@ -85,7 +85,7 @@
85 85  
86 86 - (void)sinaLogin
87 87 {
88   -
  88 +
89 89 WBAuthorizeRequest *request = [WBAuthorizeRequest request];
90 90 request.redirectURI = kSinaRedirectURI;
91 91 request.scope = @"all";
... ... @@ -94,14 +94,14 @@
94 94 @"Other_Info_2": @[@"obj1", @"obj2"],
95 95 @"Other_Info_3": @{@"key1": @"obj1", @"key2": @"obj2"}};
96 96 [WeiboSDK sendRequest:request];
97   -
  97 +
98 98 }
99 99  
100 100 #pragma mark -- TencentSessionDelegate
101 101 //登陆完成调用
102 102 - (void)tencentDidLogin
103 103 {
104   -
  104 +
105 105 [tencentOAuth getUserInfo];
106 106 }
107 107  
... ... @@ -123,15 +123,11 @@
123 123 [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) {
124 124 NSLog(@"qq登录------%@",result);
125 125  
126   - if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
127   - [Tools setUserLogin:YES];
128   - [SVProgressHUD showSuccessWithStatus:@"登录成功"];
129   - [UserInfoSava saveUserinfoDic:result[@"data"]];
130   - [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
131   -
132   - } else {
133   - [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
134   - }
  126 + [Tools setUserLogin:YES];
  127 + [SVProgressHUD showSuccessWithStatus:@"登录成功"];
  128 + [UserInfoSava saveUserinfoDic:result[@"data"]];
  129 + [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
  130 +
135 131 } failure:^(NSError *error) {
136 132 [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
137 133 }];
... ... @@ -166,11 +162,11 @@
166 162  
167 163 SendAuthResp *authResp = (SendAuthResp *)resp;
168 164  
169   - self.appCode = temp.code;
170   -
  165 + self.appCode = temp.code;
  166 +
171 167 [self getWeChatUserInfo:authResp];
172 168  
173   -// }
  169 + // }
174 170  
175 171 }
176 172 else if (temp.errCode == -4) {
... ... @@ -251,15 +247,11 @@
251 247 [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) {
252 248 NSLog(@"微信登录------%@",result);
253 249  
254   - if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
255   - [Tools setUserLogin:YES];
256   - [SVProgressHUD showSuccessWithStatus:@"登录成功"];
257   - [UserInfoSava saveUserinfoDic:result[@"data"]];
258   - [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
259   -
260   - } else {
261   - [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
262   - }
  250 + [Tools setUserLogin:YES];
  251 + [SVProgressHUD showSuccessWithStatus:@"登录成功"];
  252 + [UserInfoSava saveUserinfoDic:result[@"data"]];
  253 + [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
  254 +
263 255 } failure:^(NSError *error) {
264 256 [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
265 257 }];
... ... @@ -311,19 +303,15 @@
311 303 [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) {
312 304 NSLog(@"微博登录------%@",result);
313 305  
314   - if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
315   - [Tools setUserLogin:YES];
316   - [SVProgressHUD showSuccessWithStatus:@"登录成功"];
317   - [UserInfoSava saveUserinfoDic:result[@"data"]];
318   - [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
319   -
320   - } else {
321   - [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
322   - }
  306 + [Tools setUserLogin:YES];
  307 + [SVProgressHUD showSuccessWithStatus:@"登录成功"];
  308 + [UserInfoSava saveUserinfoDic:result[@"data"]];
  309 + [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginSuccess object:nil userInfo:nil];
  310 +
323 311 } failure:^(NSError *error) {
324 312 [[NSNotificationCenter defaultCenter] postNotificationName:ThirdLoginFailure object:nil userInfo:nil];
325 313 }];
326   -
  314 +
327 315 }
328 316 }
329 317  
... ...
CNLiveUserSystemDemo/CNLiveUserSystemSDK.framework/CNLiveUserSystemSDK
View file @e2b7f56
No preview for this file type
CNLiveUserSystemDemo/CNLiveUserSystemSDK.framework/Info.plist
View file @e2b7f56
No preview for this file type
CNLive用户系统使用指南.pdf deleted 100644 → 0
View file @7d37a20
No preview for this file type
CNLive用户系统说明文档.pdf 0 → 100644
View file @e2b7f56
No preview for this file type