Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive

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