Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan…

…t into parentassistant

Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan…
…t into parentassistant
Cao yang
2 parents 55f4e53f 39997537
Showing 4 changed files with 11 additions and 40 deletions Show diff stats
ParentAssistant/ParentAssistant/AppDelegate.swift
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift
ParentAssistant/ParentAssistant/Supporting Files/Info.plist
@@ -73,7 +73,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
                     if json["status"] == 1 && error == nil{
                         if json.contentData().arrayValue.count>0 {
-                            NSLog("************\(HTTPServer.HOSTImage+json.contentData().arrayValue[0]["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)")
                             let imageResource = ZLaunchAdImageResourceConfigure()
                             imageResource.imageNameOrImageURL = HTTPServer.HOSTImage+json.contentData().arrayValue[0]["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
                             imageResource.imageDuration = 5
@@ -102,7 +101,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                         var images:[String] = []
                         if json.contentData().arrayValue.count>0 {
                             for item in json.contentData().arrayValue {
-                                NSLog("************\(HTTPServer.HOSTImage+item["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)"); images.append(HTTPServer.HOSTImage+item["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)
+                                images.append(HTTPServer.HOSTImage+item["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)
                             }
                             LaunchIntroductionView.shared(withImages: images, buttonImage: "icon_getin", buttonFrame: CGRect(x: getScreenWidth()/2-551/4, y: getScreenHeight()-150, width: 551/2, height: 45))
                         }
@@ -49,7 +49,11 @@ class MyViewController: UIViewController {
     // MARK: - 页面将要显示时隐藏navigationbar显示自定义的顶部view
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        self.navigationController?.setNavigationBarHidden(true, animated: true)
+        if self.tabBarController?.selectedIndex == 3 {
+            self.navigationController?.setNavigationBarHidden(true, animated: true)
+        }else{
+            self.navigationController?.isNavigationBarHidden = true
+        }
         // MARK: - 设置是否登录及个人信息
         setupCurrentInfo()
     }
@@ -181,7 +185,7 @@ extension MyViewController: UITableViewDelegate,UITableViewDataSource{
                 return 0
             }
             //"zy105428"
-            if AccountManager.shared.isOnline() && AccountManager.shared.id()=="zy10542" && (indexPath.row == 1 || indexPath.row == 2){//隐藏支付相关功能
+            if AccountManager.shared.isOnline() && AccountManager.shared.id()=="zy105428" && (indexPath.row == 1 || indexPath.row == 2){//隐藏支付相关功能
                 return 0
             }else{
                 return 44
@@ -105,42 +105,8 @@ class YXMessageManager: NSObject,NIMLoginManagerDelegate,NIMSystemNotificationMa
         if let info=JSON.fromString(notification.content) {
             if info["type"].stringValue=="attach"{//群发通知
                 let attachItem = NSManagedObject.creatWith(identifier: "Message") as! Message
-//                if info["fileInfos"].arrayValue != [] {
-//                    var array:[String]=[]
-//                    for j in info["fileInfos"].arrayValue {
-//                        _ = File.newFileByAttach(j)
-//                        array.append(j["guid"].stringValue)
-//                    }
-//                    var fileInfo=Dictionary<String,AnyObject>()
-//                    fileInfo["fileIds"]=array as AnyObject
-//                    attachItem.title=(JSON(fileInfo).rawString() ?? "{}")
-//                }
                 attachItem.date=Date(timeIntervalSince1970: notification.timestamp)
-//                attachItem.msgId=info["msgId"].stringValue
-//                attachItem.senderId=notification.sender
                 attachItem.content = info["content"].stringValue
-//                attachItem.files=info["files"].stringValue
-//                if info["imageHeight"] != "" {
-//                    var sizeInfo=Dictionary<String,AnyObject>()
-//                    sizeInfo["imageHeight"]=info["imageHeight"].rawValue as AnyObject
-//                    sizeInfo["imageWidth"]=info["imageWidth"].rawValue as AnyObject
-//                    attachItem.userPortrait=JSON(sizeInfo).rawString() ?? "{}"
-//                }
-//                attachItem.sessionId="attach"
-//                if info["isSelectedCityCard"]==true {
-//                    attachItem.type=4
-//                }else{
-//                    attachItem.type=3
-//                }
-//                attachItem.isReceive=1  //unread是否需要加一
-//                attachItem.isGroup=info["isGroup"].intValue as NSNumber   //用来在消息首页是否需要拼合图片
-//                if let name=Contact.findTeacherByUserId(notification.sender!)?.name{
-//                    attachItem.fromName=name
-//                }else if let name=Contact.findByUserid(notification.sender!)?.name{
-//                    attachItem.fromName=name
-//                }else{
-//                    attachItem.fromName="老师"
-//                }
                 attachItem.ownId = AccountManager.shared.userid
                 attachItem.save()
                 NotificationCenter.default.post(name: Notification.Name(rawValue: MessageNotification.receiveMessage), object: nil, userInfo: nil)
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>5</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -28,7 +28,9 @@
 		<true/>
 	</dict>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>"需要您的同意,才能在使用期间访问位置"</string>
+	<string>&quot;需要您的同意,才能在使用期间访问位置&quot;</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>访问麦克风</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>你可以获取本地照片</string>
 	<key>UILaunchStoryboardName</key>
...	...	@@ -73,7 +73,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
73	73	httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
74	74	if json["status"] == 1 && error == nil{
75	75	if json.contentData().arrayValue.count>0 {
76		- NSLog("************\(HTTPServer.HOSTImage+json.contentData().arrayValue[0]["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)")
77	76	let imageResource = ZLaunchAdImageResourceConfigure()
78	77	imageResource.imageNameOrImageURL = HTTPServer.HOSTImage+json.contentData().arrayValue[0]["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
79	78	imageResource.imageDuration = 5
...	...	@@ -102,7 +101,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
102	101	var images:[String] = []
103	102	if json.contentData().arrayValue.count>0 {
104	103	for item in json.contentData().arrayValue {
105		- NSLog("************\(HTTPServer.HOSTImage+item["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)"); images.append(HTTPServer.HOSTImage+item["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)
	104	+ images.append(HTTPServer.HOSTImage+item["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)
106	105	}
107	106	LaunchIntroductionView.shared(withImages: images, buttonImage: "icon_getin", buttonFrame: CGRect(x: getScreenWidth()/2-551/4, y: getScreenHeight()-150, width: 551/2, height: 45))
108	107	}
...	...
...	...	@@ -49,7 +49,11 @@ class MyViewController: UIViewController {
49	49	// MARK: - 页面将要显示时隐藏navigationbar显示自定义的顶部view
50	50	override func viewWillAppear(_ animated: Bool) {
51	51	super.viewWillAppear(animated)
52		- self.navigationController?.setNavigationBarHidden(true, animated: true)
	52	+ if self.tabBarController?.selectedIndex == 3 {
	53	+ self.navigationController?.setNavigationBarHidden(true, animated: true)
	54	+ }else{
	55	+ self.navigationController?.isNavigationBarHidden = true
	56	+ }
53	57	// MARK: - 设置是否登录及个人信息
54	58	setupCurrentInfo()
55	59	}
...	...	@@ -181,7 +185,7 @@ extension MyViewController: UITableViewDelegate,UITableViewDataSource{
181	185	return 0
182	186	}
183	187	//"zy105428"
184		- if AccountManager.shared.isOnline() && AccountManager.shared.id()=="zy10542" && (indexPath.row == 1 \|\| indexPath.row == 2){//隐藏支付相关功能
	188	+ if AccountManager.shared.isOnline() && AccountManager.shared.id()=="zy105428" && (indexPath.row == 1 \|\| indexPath.row == 2){//隐藏支付相关功能
185	189	return 0
186	190	}else{
187	191	return 44
...	...
...	...	@@ -105,42 +105,8 @@ class YXMessageManager: NSObject,NIMLoginManagerDelegate,NIMSystemNotificationMa
105	105	if let info=JSON.fromString(notification.content) {
106	106	if info["type"].stringValue=="attach"{//群发通知
107	107	let attachItem = NSManagedObject.creatWith(identifier: "Message") as! Message
108		-// if info["fileInfos"].arrayValue != [] {
109		-// var array:[String]=[]
110		-// for j in info["fileInfos"].arrayValue {
111		-// _ = File.newFileByAttach(j)
112		-// array.append(j["guid"].stringValue)
113		-// }
114		-// var fileInfo=Dictionary<String,AnyObject>()
115		-// fileInfo["fileIds"]=array as AnyObject
116		-// attachItem.title=(JSON(fileInfo).rawString() ?? "{}")
117		-// }
118	108	attachItem.date=Date(timeIntervalSince1970: notification.timestamp)
119		-// attachItem.msgId=info["msgId"].stringValue
120		-// attachItem.senderId=notification.sender
121	109	attachItem.content = info["content"].stringValue
122		-// attachItem.files=info["files"].stringValue
123		-// if info["imageHeight"] != "" {
124		-// var sizeInfo=Dictionary<String,AnyObject>()
125		-// sizeInfo["imageHeight"]=info["imageHeight"].rawValue as AnyObject
126		-// sizeInfo["imageWidth"]=info["imageWidth"].rawValue as AnyObject
127		-// attachItem.userPortrait=JSON(sizeInfo).rawString() ?? "{}"
128		-// }
129		-// attachItem.sessionId="attach"
130		-// if info["isSelectedCityCard"]==true {
131		-// attachItem.type=4
132		-// }else{
133		-// attachItem.type=3
134		-// }
135		-// attachItem.isReceive=1 //unread是否需要加一
136		-// attachItem.isGroup=info["isGroup"].intValue as NSNumber //用来在消息首页是否需要拼合图片
137		-// if let name=Contact.findTeacherByUserId(notification.sender!)?.name{
138		-// attachItem.fromName=name
139		-// }else if let name=Contact.findByUserid(notification.sender!)?.name{
140		-// attachItem.fromName=name
141		-// }else{
142		-// attachItem.fromName="老师"
143		-// }
144	110	attachItem.ownId = AccountManager.shared.userid
145	111	attachItem.save()
146	112	NotificationCenter.default.post(name: Notification.Name(rawValue: MessageNotification.receiveMessage), object: nil, userInfo: nil)
...	...
...	...	@@ -19,7 +19,7 @@
19	19	<key>CFBundleShortVersionString</key>
20	20	<string>1.0.0</string>
21	21	<key>CFBundleVersion</key>
22		- <string>1</string>
	22	+ <string>5</string>
23	23	<key>LSRequiresIPhoneOS</key>
24	24	<true/>
25	25	<key>NSAppTransportSecurity</key>
...	...	@@ -28,7 +28,9 @@
28	28	<true/>
29	29	</dict>
30	30	<key>NSLocationWhenInUseUsageDescription</key>
31		- <string>"需要您的同意,才能在使用期间访问位置"</string>
	31	+ <string>"需要您的同意,才能在使用期间访问位置"</string>
	32	+ <key>NSMicrophoneUsageDescription</key>
	33	+ <string>访问麦克风</string>
32	34	<key>NSPhotoLibraryUsageDescription</key>
33	35	<string>你可以获取本地照片</string>
34	36	<key>UILaunchStoryboardName</key>
...	...