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

葛建军
2 parents 7d617a95 9f390667
Showing 2 changed files with 28 additions and 7 deletions Show diff stats
YouerLiveVideo/YouerLiveVideo/controllers/User/UserEditViewController.swift
YouerLiveVideo/YouerLiveVideo/util/account.swift
@@ -23,13 +23,26 @@ class UserEditViewController: UIViewController ,UIImagePickerControllerDelegate,
     }
  
     func setContentArr(){
-        var ident = ""
-        if user.isParent(){
-            ident = "家长"
-        }else{
-            ident = "教师"
+        contentArr = [user.name(),user.phone(),getIdent(),user.schoolName()]
+    }
+    
+    func getIdent()->String{
+        switch user.roletype() {
+        case 1:
+            return "学校管理员"
+        case 2:
+            return "教师"
+        case 3:
+            return "家长"
+        case 4:
+            return "学生"
+        case 5:
+            return "游客"
+        case 6:
+            return "教研员"
+        default:
+            return ""
         }
-        contentArr = [user.name(),user.phone(),ident,user.schoolName()]
     }
  
     override func viewWillAppear(_ animated: Bool) {
@@ -77,12 +77,20 @@ class AccountManager{
         return ""
     }
  
+    func schoolid()->String{
+        if let info=rawUserInfo{
+            return info.contentData()["schoolid"].stringValue
+        }
+        return ""
+    }
+    
     func schoolName()->String{
         if let info=rawUserInfo{
-            return info.contentData()["f_SchoolName"].stringValue
+            return info.contentData()["schoolname"].stringValue
         }
         return ""
     }
+
  
     func isParent()->Bool{
         if let info=rawUserInfo{
...	...	@@ -23,13 +23,26 @@ class UserEditViewController: UIViewController ,UIImagePickerControllerDelegate,
23	23	}
24	24
25	25	func setContentArr(){
26		- var ident = ""
27		- if user.isParent(){
28		- ident = "家长"
29		- }else{
30		- ident = "教师"
	26	+ contentArr = [user.name(),user.phone(),getIdent(),user.schoolName()]
	27	+ }
	28	+
	29	+ func getIdent()->String{
	30	+ switch user.roletype() {
	31	+ case 1:
	32	+ return "学校管理员"
	33	+ case 2:
	34	+ return "教师"
	35	+ case 3:
	36	+ return "家长"
	37	+ case 4:
	38	+ return "学生"
	39	+ case 5:
	40	+ return "游客"
	41	+ case 6:
	42	+ return "教研员"
	43	+ default:
	44	+ return ""
31	45	}
32		- contentArr = [user.name(),user.phone(),ident,user.schoolName()]
33	46	}
34	47
35	48	override func viewWillAppear(_ animated: Bool) {
...	...
...	...	@@ -77,12 +77,20 @@ class AccountManager{
77	77	return ""
78	78	}
79	79
	80	+ func schoolid()->String{
	81	+ if let info=rawUserInfo{
	82	+ return info.contentData()["schoolid"].stringValue
	83	+ }
	84	+ return ""
	85	+ }
	86	+
80	87	func schoolName()->String{
81	88	if let info=rawUserInfo{
82		- return info.contentData()["f_SchoolName"].stringValue
	89	+ return info.contentData()["schoolname"].stringValue
83	90	}
84	91	return ""
85	92	}
	93	+
86	94
87	95	func isParent()->Bool{
88	96	if let info=rawUserInfo{
...	...