Commit 2b28ae19d644b25e70b071d831ab75a97a582e8e
Exists in
newLive
Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive
Showing
3 changed files
with
8 additions
and
6 deletions
Show diff stats
YouerLiveVideo/YouerLiveVideo/AppDelegate.swift
| @@ -21,7 +21,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,NIMLoginManagerDelegate { | @@ -21,7 +21,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,NIMLoginManagerDelegate { | ||
| 21 | httpServer.accountManager=accountManager | 21 | httpServer.accountManager=accountManager |
| 22 | accountManager.setTokenInfo(tokenInfo: accountManager.loadToken()) | 22 | accountManager.setTokenInfo(tokenInfo: accountManager.loadToken()) |
| 23 | // setShareSDKSetting() | 23 | // setShareSDKSetting() |
| 24 | - setNIMSDKRegister() | 24 | +// setNIMSDKRegister() |
| 25 | return true | 25 | return true |
| 26 | } | 26 | } |
| 27 | 27 |
YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/LoginViewController.swift
| @@ -82,7 +82,9 @@ class LoginViewController: UIViewController,UITextFieldDelegate { | @@ -82,7 +82,9 @@ class LoginViewController: UIViewController,UITextFieldDelegate { | ||
| 82 | AppDelegate.instance().accountManager.saveToken(tokenInfo: ret) | 82 | AppDelegate.instance().accountManager.saveToken(tokenInfo: ret) |
| 83 | AppDelegate.instance().accountManager.refreshUserInfo(completionHandler: { (finish) in | 83 | AppDelegate.instance().accountManager.refreshUserInfo(completionHandler: { (finish) in |
| 84 | if finish{ | 84 | if finish{ |
| 85 | - self.loadUserInfo() | 85 | +// self.loadUserInfo() |
| 86 | + SVProgressHUD.dismiss() | ||
| 87 | + self.back() | ||
| 86 | }else{ | 88 | }else{ |
| 87 | AppDelegate.instance().window?.makeToast("身份获取失败") | 89 | AppDelegate.instance().window?.makeToast("身份获取失败") |
| 88 | SVProgressHUD.dismiss() | 90 | SVProgressHUD.dismiss() |
YouerLiveVideo/YouerLiveVideo/util/account.swift
| @@ -48,25 +48,25 @@ class AccountManager{ | @@ -48,25 +48,25 @@ class AccountManager{ | ||
| 48 | } | 48 | } |
| 49 | func id()->String{ | 49 | func id()->String{ |
| 50 | if let info=rawUserInfo{ | 50 | if let info=rawUserInfo{ |
| 51 | - return info.contentData()["f_Account"].stringValue | 51 | + return info.contentData()["account"].stringValue |
| 52 | } | 52 | } |
| 53 | return "" | 53 | return "" |
| 54 | } | 54 | } |
| 55 | func name()->String{ | 55 | func name()->String{ |
| 56 | if let info=rawUserInfo{ | 56 | if let info=rawUserInfo{ |
| 57 | - return info.contentData()["f_RealName"].stringValue | 57 | + return info.contentData()["nickname"].stringValue |
| 58 | } | 58 | } |
| 59 | return "" | 59 | return "" |
| 60 | } | 60 | } |
| 61 | func photo()->String{ | 61 | func photo()->String{ |
| 62 | if let info=rawUserInfo{ | 62 | if let info=rawUserInfo{ |
| 63 | - return info.contentData()["f_HeadIcon"].stringValue | 63 | + return info.contentData()["headimg"].stringValue |
| 64 | } | 64 | } |
| 65 | return "defphoto" | 65 | return "defphoto" |
| 66 | } | 66 | } |
| 67 | func phone()->String{ | 67 | func phone()->String{ |
| 68 | if let info=rawUserInfo{ | 68 | if let info=rawUserInfo{ |
| 69 | - return info.contentData()["f_MobilePhone"].stringValue | 69 | + return info.contentData()["mobile"].stringValue |
| 70 | } | 70 | } |
| 71 | return "" | 71 | return "" |
| 72 | } | 72 | } |