iOS Team / CNLiveUserSystemSDKDemo · Commits

Commit 5af7f23f8d6bd86e67875aef351b615c461fbae4

Authored by 朱林
1 parent 7b159796

no message

Inline Side-by-side
Showing 6 changed files with 137 additions and 77 deletions
CNLiveUserSystemDemo/CNLiveUserSystemDemo.xcodeproj/project.pbxproj
  View file @5af7f23
... ... @@ -7,6 +7,8 @@
7 7 objects = {
8 8  
9 9 /* Begin PBXBuildFile section */
  10 + 8107CD3C1DDEFB9B0061EA8A /* CNLiveThirdLoginManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8107CD3B1DDEFB9B0061EA8A /* CNLiveThirdLoginManager.m */; };
  11 + 8107CD3F1DDEFBB50061EA8A /* ThirdPartyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8107CD3E1DDEFBB50061EA8A /* ThirdPartyView.m */; };
10 12 810D9B651D8FB70600B7A776 /* TencentOpenAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 810D9B511D8FB70600B7A776 /* TencentOpenAPI.framework */; };
11 13 810D9B661D8FB70600B7A776 /* TencentOpenApi_IOS_Bundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 810D9B521D8FB70600B7A776 /* TencentOpenApi_IOS_Bundle.bundle */; };
12 14 810D9B671D8FB70600B7A776 /* libWeiboSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 810D9B541D8FB70600B7A776 /* libWeiboSDK.a */; };
... ... @@ -23,7 +25,6 @@
23 25 810D9B7A1D8FB7AC00B7A776 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 810D9B791D8FB7AC00B7A776 /* libz.tbd */; };
24 26 810D9B7F1D8FCD1900B7A776 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 810D9B7E1D8FCD1900B7A776 /* libsqlite3.0.tbd */; };
25 27 810D9B811D8FCD3200B7A776 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 810D9B801D8FCD3200B7A776 /* libc++.tbd */; };
26   - 810D9B841D8FD2DF00B7A776 /* CNLiveThirdLoginManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 810D9B831D8FD2DF00B7A776 /* CNLiveThirdLoginManager.m */; };
27 28 811600EE1D927E7E003CAE7D /* MKAnnotationView+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 811600CD1D927E7E003CAE7D /* MKAnnotationView+WebCache.m */; };
28 29 811600EF1D927E7E003CAE7D /* NSData+ImageContentType.m in Sources */ = {isa = PBXBuildFile; fileRef = 811600CF1D927E7E003CAE7D /* NSData+ImageContentType.m */; };
29 30 811600F01D927E7E003CAE7D /* SDImageCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 811600D11D927E7E003CAE7D /* SDImageCache.m */; };
... ... @@ -61,14 +62,12 @@
61 62 8187A90D1D8E9A7B007FAFB6 /* SVProgressHUD.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8187A9061D8E9A7B007FAFB6 /* SVProgressHUD.bundle */; };
62 63 8187A90E1D8E9A7B007FAFB6 /* SVProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 8187A9081D8E9A7B007FAFB6 /* SVProgressHUD.m */; };
63 64 8187A90F1D8E9A7B007FAFB6 /* SVRadialGradientLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 8187A90A1D8E9A7B007FAFB6 /* SVRadialGradientLayer.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 */; };
  65 + 81A229651DE28F090009E9A9 /* CNLiveUserSystemSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81A229631DE28DD90009E9A9 /* CNLiveUserSystemSDK.framework */; };
  66 + 81F23C861DDDA17D004D0298 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F23C7D1DDDA17D004D0298 /* LoginViewController.m */; };
  67 + 81F23C871DDDA17D004D0298 /* ModifyUserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F23C7F1DDDA17D004D0298 /* ModifyUserInfoViewController.m */; };
  68 + 81F23C881DDDA17D004D0298 /* RegisterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F23C811DDDA17D004D0298 /* RegisterViewController.m */; };
  69 + 81F23C891DDDA17D004D0298 /* UserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F23C831DDDA17D004D0298 /* UserInfoViewController.m */; };
  70 + 81F23C8A1DDDA17D004D0298 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F23C851DDDA17D004D0298 /* ViewController.m */; };
72 71 B6B54BEA1D8D009800089C9C /* UserInfoHeaderImageTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B54BE91D8D009800089C9C /* UserInfoHeaderImageTableViewCell.m */; };
73 72 B6B54BED1D8D011000089C9C /* UserInfoTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B54BEC1D8D011000089C9C /* UserInfoTableViewCell.m */; };
74 73 /* End PBXBuildFile section */
... ... @@ -97,7 +96,6 @@
97 96 dstPath = "";
98 97 dstSubfolderSpec = 10;
99 98 files = (
100   - 81DA8A1C1DC8623F00EE1612 /* CNLiveUserSystemSDK.framework in Embed Frameworks */,
101 99 );
102 100 name = "Embed Frameworks";
103 101 runOnlyForDeploymentPostprocessing = 0;
... ... @@ -105,6 +103,10 @@
105 103 /* End PBXCopyFilesBuildPhase section */
106 104  
107 105 /* Begin PBXFileReference section */
  106 + 8107CD3A1DDEFB9B0061EA8A /* CNLiveThirdLoginManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveThirdLoginManager.h; sourceTree = "<group>"; };
  107 + 8107CD3B1DDEFB9B0061EA8A /* CNLiveThirdLoginManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveThirdLoginManager.m; sourceTree = "<group>"; };
  108 + 8107CD3D1DDEFBB50061EA8A /* ThirdPartyView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThirdPartyView.h; sourceTree = "<group>"; };
  109 + 8107CD3E1DDEFBB50061EA8A /* ThirdPartyView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThirdPartyView.m; sourceTree = "<group>"; };
108 110 810D9B511D8FB70600B7A776 /* TencentOpenAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = TencentOpenAPI.framework; sourceTree = "<group>"; };
109 111 810D9B521D8FB70600B7A776 /* TencentOpenApi_IOS_Bundle.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = TencentOpenApi_IOS_Bundle.bundle; sourceTree = "<group>"; };
110 112 810D9B541D8FB70600B7A776 /* libWeiboSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWeiboSDK.a; sourceTree = "<group>"; };
... ... @@ -133,8 +135,6 @@
133 135 810D9B791D8FB7AC00B7A776 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
134 136 810D9B7E1D8FCD1900B7A776 /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
135 137 810D9B801D8FCD3200B7A776 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
136   - 810D9B821D8FD2DF00B7A776 /* CNLiveThirdLoginManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveThirdLoginManager.h; sourceTree = "<group>"; };
137   - 810D9B831D8FD2DF00B7A776 /* CNLiveThirdLoginManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveThirdLoginManager.m; sourceTree = "<group>"; };
138 138 811600CC1D927E7E003CAE7D /* MKAnnotationView+WebCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MKAnnotationView+WebCache.h"; sourceTree = "<group>"; };
139 139 811600CD1D927E7E003CAE7D /* MKAnnotationView+WebCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MKAnnotationView+WebCache.m"; sourceTree = "<group>"; };
140 140 811600CE1D927E7E003CAE7D /* NSData+ImageContentType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+ImageContentType.h"; sourceTree = "<group>"; };
... ... @@ -209,17 +209,17 @@
209 209 8187A9081D8E9A7B007FAFB6 /* SVProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVProgressHUD.m; sourceTree = "<group>"; };
210 210 8187A9091D8E9A7B007FAFB6 /* SVRadialGradientLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVRadialGradientLayer.h; sourceTree = "<group>"; };
211 211 8187A90A1D8E9A7B007FAFB6 /* SVRadialGradientLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVRadialGradientLayer.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>"; };
  212 + 81A229631DE28DD90009E9A9 /* CNLiveUserSystemSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveUserSystemSDK.framework; sourceTree = "<group>"; };
  213 + 81F23C7C1DDDA17D004D0298 /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
  214 + 81F23C7D1DDDA17D004D0298 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
  215 + 81F23C7E1DDDA17D004D0298 /* ModifyUserInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifyUserInfoViewController.h; sourceTree = "<group>"; };
  216 + 81F23C7F1DDDA17D004D0298 /* ModifyUserInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModifyUserInfoViewController.m; sourceTree = "<group>"; };
  217 + 81F23C801DDDA17D004D0298 /* RegisterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegisterViewController.h; sourceTree = "<group>"; };
  218 + 81F23C811DDDA17D004D0298 /* RegisterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegisterViewController.m; sourceTree = "<group>"; };
  219 + 81F23C821DDDA17D004D0298 /* UserInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoViewController.h; sourceTree = "<group>"; };
  220 + 81F23C831DDDA17D004D0298 /* UserInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoViewController.m; sourceTree = "<group>"; };
  221 + 81F23C841DDDA17D004D0298 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
  222 + 81F23C851DDDA17D004D0298 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
223 223 B6B54BE81D8D009800089C9C /* UserInfoHeaderImageTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoHeaderImageTableViewCell.h; sourceTree = "<group>"; };
224 224 B6B54BE91D8D009800089C9C /* UserInfoHeaderImageTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoHeaderImageTableViewCell.m; sourceTree = "<group>"; };
225 225 B6B54BEB1D8D011000089C9C /* UserInfoTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoTableViewCell.h; sourceTree = "<group>"; };
... ... @@ -231,7 +231,7 @@
231 231 isa = PBXFrameworksBuildPhase;
232 232 buildActionMask = 2147483647;
233 233 files = (
234   - 81DA8A1A1DC8623800EE1612 /* CNLiveUserSystemSDK.framework in Frameworks */,
  234 + 81A229651DE28F090009E9A9 /* CNLiveUserSystemSDK.framework in Frameworks */,
235 235 811600FE1D927E7E003CAE7D /* WebP.framework in Frameworks */,
236 236 817C6EC31D90D60E0016F211 /* ImageIO.framework in Frameworks */,
237 237 810D9B811D8FCD3200B7A776 /* libc++.tbd in Frameworks */,
... ... @@ -245,7 +245,6 @@
245 245 810D9B6E1D8FB76E00B7A776 /* libiconv.tbd in Frameworks */,
246 246 810D9B6C1D8FB76300B7A776 /* Security.framework in Frameworks */,
247 247 810D9B651D8FB70600B7A776 /* TencentOpenAPI.framework in Frameworks */,
248   - 81DA8A1B1DC8623F00EE1612 /* CNLiveUserSystemSDK.framework in Frameworks */,
249 248 810D9B671D8FB70600B7A776 /* libWeiboSDK.a in Frameworks */,
250 249 810D9B691D8FB70600B7A776 /* libWeChatSDK.a in Frameworks */,
251 250 );
... ... @@ -374,6 +373,8 @@
374 373 children = (
375 374 8116F8E21D8916250084FE49 /* IdAndPwdView.h */,
376 375 8116F8E31D8916250084FE49 /* IdAndPwdView.m */,
  376 + 8107CD3D1DDEFBB50061EA8A /* ThirdPartyView.h */,
  377 + 8107CD3E1DDEFBB50061EA8A /* ThirdPartyView.m */,
377 378 8116F8EF1D891BCD0084FE49 /* RegistBasicInformationView.h */,
378 379 8116F8F01D891BCD0084FE49 /* RegistBasicInformationView.m */,
379 380 B6B54BE81D8D009800089C9C /* UserInfoHeaderImageTableViewCell.h */,
... ... @@ -387,7 +388,7 @@
387 388 812642B81D86A7A800B402CA = {
388 389 isa = PBXGroup;
389 390 children = (
390   - 81DA8A191DC8623800EE1612 /* CNLiveUserSystemSDK.framework */,
  391 + 81A229631DE28DD90009E9A9 /* CNLiveUserSystemSDK.framework */,
391 392 810D9B7D1D8FCBC200B7A776 /* frameworks */,
392 393 812642C31D86A7A800B402CA /* CNLiveUserSystemDemo */,
393 394 812642DD1D86A7A800B402CA /* CNLiveUserSystemDemoTests */,
... ... @@ -411,9 +412,9 @@
411 412 children = (
412 413 812642C71D86A7A800B402CA /* AppDelegate.h */,
413 414 812642C81D86A7A800B402CA /* AppDelegate.m */,
414   - 8187A8EC1D8E6385007FAFB6 /* Tools */,
415 415 8187A8FF1D8E9A7B007FAFB6 /* ThirdSDK */,
416   - 81DA8A1D1DC8630900EE1612 /* Conreollers */,
  416 + 8187A8EC1D8E6385007FAFB6 /* Tools */,
  417 + 81F23C7B1DDDA17D004D0298 /* Conreollers */,
417 418 8116F8E11D8916250084FE49 /* Views */,
418 419 812642CD1D86A7A800B402CA /* Main.storyboard */,
419 420 812642D01D86A7A800B402CA /* Assets.xcassets */,
... ... @@ -464,8 +465,8 @@
464 465 8187A8F51D8E6486007FAFB6 /* UserInfoSava.m */,
465 466 8187A8F91D8E68CD007FAFB6 /* CNLiveLogout.h */,
466 467 8187A8FA1D8E68CD007FAFB6 /* CNLiveLogout.m */,
467   - 810D9B821D8FD2DF00B7A776 /* CNLiveThirdLoginManager.h */,
468   - 810D9B831D8FD2DF00B7A776 /* CNLiveThirdLoginManager.m */,
  468 + 8107CD3A1DDEFB9B0061EA8A /* CNLiveThirdLoginManager.h */,
  469 + 8107CD3B1DDEFB9B0061EA8A /* CNLiveThirdLoginManager.m */,
469 470 );
470 471 path = Tools;
471 472 sourceTree = "<group>";
... ... @@ -499,19 +500,19 @@
499 500 path = SVProgressHUD;
500 501 sourceTree = "<group>";
501 502 };
502   - 81DA8A1D1DC8630900EE1612 /* Conreollers */ = {
  503 + 81F23C7B1DDDA17D004D0298 /* Conreollers */ = {
503 504 isa = PBXGroup;
504 505 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 */,
  506 + 81F23C841DDDA17D004D0298 /* ViewController.h */,
  507 + 81F23C851DDDA17D004D0298 /* ViewController.m */,
  508 + 81F23C7C1DDDA17D004D0298 /* LoginViewController.h */,
  509 + 81F23C7D1DDDA17D004D0298 /* LoginViewController.m */,
  510 + 81F23C7E1DDDA17D004D0298 /* ModifyUserInfoViewController.h */,
  511 + 81F23C7F1DDDA17D004D0298 /* ModifyUserInfoViewController.m */,
  512 + 81F23C801DDDA17D004D0298 /* RegisterViewController.h */,
  513 + 81F23C811DDDA17D004D0298 /* RegisterViewController.m */,
  514 + 81F23C821DDDA17D004D0298 /* UserInfoViewController.h */,
  515 + 81F23C831DDDA17D004D0298 /* UserInfoViewController.m */,
515 516 );
516 517 path = Conreollers;
517 518 sourceTree = "<group>";
... ... @@ -655,34 +656,35 @@
655 656 isa = PBXSourcesBuildPhase;
656 657 buildActionMask = 2147483647;
657 658 files = (
  659 + 8107CD3C1DDEFB9B0061EA8A /* CNLiveThirdLoginManager.m in Sources */,
658 660 811600FB1D927E7E003CAE7D /* UIImageView+HighlightedWebCache.m in Sources */,
659   - 810D9B841D8FD2DF00B7A776 /* CNLiveThirdLoginManager.m in Sources */,
660 661 811600FC1D927E7E003CAE7D /* UIImageView+WebCache.m in Sources */,
661 662 B6B54BEA1D8D009800089C9C /* UserInfoHeaderImageTableViewCell.m in Sources */,
662 663 8187A90C1D8E9A7B007FAFB6 /* SVProgressAnimatedView.m in Sources */,
663 664 811600F71D927E7E003CAE7D /* UIButton+WebCache.m in Sources */,
664 665 8116F8E41D8916250084FE49 /* IdAndPwdView.m in Sources */,
  666 + 8107CD3F1DDEFBB50061EA8A /* ThirdPartyView.m in Sources */,
665 667 811600F81D927E7E003CAE7D /* UIImage+GIF.m in Sources */,
666 668 811600F61D927E7E003CAE7D /* SDWebImagePrefetcher.m in Sources */,
667 669 8116F8F11D891BCD0084FE49 /* RegistBasicInformationView.m in Sources */,
668 670 8187A8F61D8E6486007FAFB6 /* NSObject+UserModel.m in Sources */,
669   - 81DA8A291DC8630900EE1612 /* ModifyUserInfoViewController.m in Sources */,
  671 + 81F23C871DDDA17D004D0298 /* ModifyUserInfoViewController.m in Sources */,
670 672 811600F11D927E7E003CAE7D /* SDWebImageCompat.m in Sources */,
671 673 811600F31D927E7E003CAE7D /* SDWebImageDownloader.m in Sources */,
672 674 811600F41D927E7E003CAE7D /* SDWebImageDownloaderOperation.m in Sources */,
673 675 811600F21D927E7E003CAE7D /* SDWebImageDecoder.m in Sources */,
674 676 811600F51D927E7E003CAE7D /* SDWebImageManager.m in Sources */,
675   - 81DA8A2B1DC8630900EE1612 /* UserInfoViewController.m in Sources */,
676   - 81DA8A2C1DC8630900EE1612 /* ViewController.m in Sources */,
  677 + 81F23C891DDDA17D004D0298 /* UserInfoViewController.m in Sources */,
  678 + 81F23C8A1DDDA17D004D0298 /* ViewController.m in Sources */,
677 679 8187A8FB1D8E68CD007FAFB6 /* CNLiveLogout.m in Sources */,
678 680 8187A90E1D8E9A7B007FAFB6 /* SVProgressHUD.m in Sources */,
679 681 811600FD1D927E7E003CAE7D /* UIView+WebCacheOperation.m in Sources */,
680 682 8187A8EF1D8E6394007FAFB6 /* Tools.m in Sources */,
681   - 81DA8A281DC8630900EE1612 /* LoginViewController.m in Sources */,
  683 + 81F23C861DDDA17D004D0298 /* LoginViewController.m in Sources */,
682 684 812642C91D86A7A800B402CA /* AppDelegate.m in Sources */,
683 685 8187A90B1D8E9A7B007FAFB6 /* SVIndefiniteAnimatedView.m in Sources */,
684 686 811600EE1D927E7E003CAE7D /* MKAnnotationView+WebCache.m in Sources */,
685   - 81DA8A2A1DC8630900EE1612 /* RegisterViewController.m in Sources */,
  687 + 81F23C881DDDA17D004D0298 /* RegisterViewController.m in Sources */,
686 688 811600F91D927E7E003CAE7D /* UIImage+MultiFormat.m in Sources */,
687 689 B6B54BED1D8D011000089C9C /* UserInfoTableViewCell.m in Sources */,
688 690 8187A8F81D8E6486007FAFB6 /* UserInfoSava.m in Sources */,
... ...
CNLiveUserSystemDemo/CNLiveUserSystemDemo.xcodeproj/project.xcworkspace/xcuserdata/iOS.xcuserdatad/UserInterfaceState.xcuserstate
View file @5af7f23
No preview for this file type
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/LoginViewController.m
  View file @5af7f23
... ... @@ -45,7 +45,7 @@
45 45  
46 46 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginSuccess) name:ThirdLoginSuccess object:nil];
47 47 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginFailure) name:ThirdLoginFailure object:nil];
48   -
  48 +
49 49 }
50 50  
51 51 #pragma mark - action
... ... @@ -55,7 +55,7 @@
55 55 [SVProgressHUD show];
56 56  
57 57 [CNLiveUserSystemCenter loginWithUserName:@"941123686@qq.com" password:@"123456" frmId:nil success:^(id result) {
58   -
  58 +
59 59 NSLog(@"登录 success------------%@",result);
60 60 [SVProgressHUD showSuccessWithStatus:@"登录成功"];
61 61 [UserInfoSava saveUserinfoDic:result[@"data"]];
... ... @@ -84,17 +84,17 @@
84 84  
85 85 - (void)weChatBtnAction
86 86 {
87   - [[CNLiveThirdLoginManager manager] weChatLogin];
  87 + [[CNLiveThirdLoginManager manager] weChatLoginIsBindingThirdParty:NO];
88 88 }
89 89  
90 90 - (void)sinaBtnAction
91 91 {
92   - [[CNLiveThirdLoginManager manager] sinaLogin];
  92 + [[CNLiveThirdLoginManager manager] sinaLoginIsBindingThirdParty:NO];
93 93 }
94 94  
95 95 - (void)qqBtnAction
96 96 {
97   - [[CNLiveThirdLoginManager manager] qqLogin];
  97 + [[CNLiveThirdLoginManager manager] qqLoginIsBindingThirdParty:NO];
98 98 }
99 99  
100 100 - (void)loginSuccess
... ... @@ -229,13 +229,13 @@
229 229 }
230 230  
231 231 /*
232   -#pragma mark - Navigation
233   -
234   -// In a storyboard-based application, you will often want to do a little preparation before navigation
235   -- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
236   - // Get the new view controller using [segue destinationViewController].
237   - // Pass the selected object to the new view controller.
238   -}
239   -*/
  232 + #pragma mark - Navigation
  233 +
  234 + // In a storyboard-based application, you will often want to do a little preparation before navigation
  235 + - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
  236 + // Get the new view controller using [segue destinationViewController].
  237 + // Pass the selected object to the new view controller.
  238 + }
  239 + */
240 240  
241 241 @end
... ...
CNLiveUserSystemDemo/CNLiveUserSystemDemo/Conreollers/ViewController.m
  View file @5af7f23
... ... @@ -12,13 +12,16 @@
12 12 #import "UserInfoViewController.h"
13 13 #import "CNLiveLogout.h"
14 14 #import "UserInfoSava.h"
  15 +#import "ThirdPartyView.h"
  16 +#import "CNLiveThirdLoginManager.h"
15 17  
16   -@interface ViewController ()<UITableViewDelegate,UITableViewDataSource>
  18 +@interface ViewController ()<UITableViewDelegate,UITableViewDataSource,ThirdPartyViewDelegate,UIGestureRecognizerDelegate>
17 19 {
18 20 NSArray *_dataArr;
19 21 }
20 22  
21 23 @property (nonatomic, strong) UITableView *tableView;
  24 +@property (nonatomic, strong) ThirdPartyView *thirPartydView;
22 25 @property (nonatomic, strong) UIButton *loginBtn;
23 26 @end
24 27  
... ... @@ -30,9 +33,14 @@
30 33 self.view.backgroundColor = [UIColor whiteColor];
31 34  
32 35 [self.view addSubview:self.tableView];
33   - [self.tableView addSubview:self.loginBtn];
34   -
35   - _dataArr = @[@"通过手机号修改密码",@"更新附加信息",@"修改用户信息",@"查询用户信息",@"反馈"];
  36 + [self.view addSubview:self.loginBtn];
  37 + [self.view addSubview:self.thirPartydView];
  38 +
  39 + // UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGesturedDetected:)]; // 手势类型随你喜欢。
  40 + // tapGesture.delegate = self;
  41 + // [self.view addGestureRecognizer:tapGesture];
  42 +
  43 + _dataArr = @[@"通过手机号修改密码",@"更新附加信息",@"修改用户信息",@"查询用户信息",@"反馈",@"绑定第三方账号"];
36 44 }
37 45  
38 46 - (void)viewWillAppear:(BOOL)animated
... ... @@ -60,6 +68,36 @@
60 68 }
61 69 }
62 70  
  71 +- (void)tapGesturedDetected:(UITapGestureRecognizer *)recognizer
  72 +{
  73 + [UIView animateWithDuration:0.25 animations:^{
  74 + _thirPartydView.frame = CGRectMake(0, KScreenHeight, KScreenWidth, 160);
  75 + }];
  76 +}
  77 +
  78 +#pragma mark - ThirdPartyViewDelegate
  79 +- (void)thirdPartyBtnAction:(NSString *)title
  80 +{
  81 + if ([title isEqualToString:@"微信"]) {
  82 + [[CNLiveThirdLoginManager manager] weChatLoginIsBindingThirdParty:YES];
  83 + } else if ([title isEqualToString:@"微博"]) {
  84 + [[CNLiveThirdLoginManager manager] sinaLoginIsBindingThirdParty:YES];
  85 + } else {
  86 + [[CNLiveThirdLoginManager manager] qqLoginIsBindingThirdParty:YES];
  87 + }
  88 +
  89 + [UIView animateWithDuration:0.25 animations:^{
  90 + _thirPartydView.frame = CGRectMake(0, KScreenHeight, KScreenWidth, 160);
  91 + }];
  92 +}
  93 +
  94 +- (void)cancelThirdView
  95 +{
  96 + [UIView animateWithDuration:0.25 animations:^{
  97 + _thirPartydView.frame = CGRectMake(0, KScreenHeight, KScreenWidth, 160);
  98 + }];
  99 +}
  100 +
63 101 #pragma mark - UITableView
64 102  
65 103 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
... ... @@ -82,7 +120,7 @@
82 120 iconImg.backgroundColor = [UIColor orangeColor];
83 121 [loginCell.contentView addSubview:iconImg];
84 122 UserInfoModel *model = [UserInfoModel modelWithKeyValues:[Tools getLocalUserInfo]];
85   -
  123 +
86 124 [iconImg sd_setImageWithURL:[NSURL URLWithString:model.faceUrl] placeholderImage:[UIImage imageNamed:@""]];
87 125  
88 126 UILabel *name = [[UILabel alloc] initWithFrame:CGRectMake(120, 0, KScreenWidth- 160, 120)];
... ... @@ -104,7 +142,7 @@
104 142 }
105 143 cell.textLabel.text = [NSString stringWithFormat:@"%@",_dataArr[indexPath.row-1]];
106 144 return cell;
107   -
  145 +
108 146 }
109 147 return nil;
110 148 }
... ... @@ -112,7 +150,7 @@
112 150 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
113 151 {
114 152 [tableView deselectRowAtIndexPath:indexPath animated:YES];
115   -
  153 +
116 154 if (indexPath.row == 1) {
117 155 RegisterViewController *regVC = [[RegisterViewController alloc] init];
118 156 regVC.type = @"forgetPwd";
... ... @@ -124,14 +162,14 @@
124 162 [SVProgressHUD show];
125 163  
126 164 UserInfoModel *model = [UserInfoModel modelWithKeyValues:[Tools getLocalUserInfo]];
127   -
  165 +
128 166 [CNLiveUserSystemCenter updateOtherInfoWithUid:model.uid extInfo:@"将要更新的附加信息,NSString类型" success:^(id result) {
129 167  
130 168 NSLog(@"--------%@",result);
131 169  
132 170 [SVProgressHUD showSuccessWithStatus:@"更新附加信息成功"];
133 171 [self.navigationController popViewControllerAnimated:YES];
134   -
  172 +
135 173 } failure:^(NSDictionary *errorDic) {
136 174 [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
137 175 [SVProgressHUD dismiss];
... ... @@ -148,29 +186,36 @@
148 186  
149 187 [CNLiveUserSystemCenter queryUserInfoWithUid:model.uid srcUid:model.uid success:^(id result) {
150 188 NSLog(@"%@",result);
151   -
  189 +
152 190 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"]];
  191 + NSString *message = [NSString stringWithFormat:@" uid:%@\n nickName:%@\n gender:%@\n location:%@\n extInfo:%@\n mobile:%@\n email:%@ \n...... ",dic[@"uid"],dic[@"nickName"],dic[@"gender"],dic[@"location"],dic[@"extInfo"],dic[@"mobile"],dic[@"email"]];
154 192 NSString *icon = dic[@"faceUrl"];
155   -
  193 +
156 194 [UserInfoSava setLocalUserInfo:icon withKey:@"faceUrl"];
157 195 [_tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:0 inSection:0]] withRowAnimation:UITableViewRowAnimationFade];
158 196 [Tools toast:message];
159   -
  197 +
160 198 } failure:^(NSDictionary *errorDic) {
161 199 [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
162 200 }];
163 201 }
164 202  
165 203 if (indexPath.row == 5) {
166   -
  204 +
167 205 [CNLiveUserSystemCenter feedbackWithContentId:@"11" message:@"fhsjhifkncznshfu" success:^(id result) {
168 206 [Tools toast:[NSString stringWithFormat:@"反馈--%@",result[@"errorMessage"]]];
169   -
  207 +
170 208 } failure:^(NSDictionary *errorDic) {
171 209 [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
172 210 }];
173 211 }
  212 +
  213 + if (indexPath.row == 6) {
  214 +
  215 + [UIView animateWithDuration:0.25 animations:^{
  216 + _thirPartydView.frame = CGRectMake(0, KScreenHeight-160, KScreenWidth, 160);
  217 + }];
  218 + }
174 219 }
175 220  
176 221 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
... ... @@ -186,7 +231,7 @@
186 231 - (UITableView *)tableView
187 232 {
188 233 if (!_tableView) {
189   - _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight) style:UITableViewStylePlain];
  234 + _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight -80) style:UITableViewStylePlain];
190 235 _tableView.backgroundColor = [UIColor whiteColor];
191 236 _tableView.tableFooterView = [[UIView alloc] init];
192 237 _tableView.delegate = self;
... ... @@ -194,12 +239,20 @@
194 239 }
195 240 return _tableView;
196 241 }
  242 +- (ThirdPartyView *)thirPartydView
  243 +{
  244 + if (!_thirPartydView) {
  245 + _thirPartydView = [[ThirdPartyView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, 160) binding:YES];
  246 + _thirPartydView.delegate = self;
  247 + }
  248 + return _thirPartydView;
  249 +}
197 250  
198 251 - (UIButton *)loginBtn
199 252 {
200 253 if (!_loginBtn) {
201 254 _loginBtn = [UIButton buttonWithType:UIButtonTypeCustom];
202   - _loginBtn.frame = CGRectMake(20, 53*5+63+12+80, KScreenWidth-40, 40);
  255 + _loginBtn.frame = CGRectMake(20, KScreenHeight-60, KScreenWidth-40, 40);
203 256 [_loginBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
204 257 [_loginBtn setBackgroundColor:[UIColor orangeColor]];
205 258 _loginBtn.titleLabel.font = [UIFont systemFontOfSize:17];
... ... @@ -210,6 +263,11 @@
210 263 return _loginBtn;
211 264 }
212 265  
  266 +- (void)dealloc
  267 +{
  268 + _thirPartydView.delegate = nil;
  269 +}
  270 +
213 271 - (void)didReceiveMemoryWarning {
214 272 [super didReceiveMemoryWarning];
215 273 // Dispose of any resources that can be recreated.
... ...
CNLive用户系统说明文档.pdf deleted 100644 → 0
View file @7b15979
No preview for this file type
用户系统.pdf 0 → 100644
View file @5af7f23
No preview for this file type