Commit 39997537bec7a67868381de8babe5595c3aa3d44

Authored by 葛建军
1 parent 79394633
Exists in parentassistant

no message

ParentAssistant/ParentAssistant/AppDelegate.swift
@@ -73,7 +73,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate { @@ -73,7 +73,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
73 httpJsonResule(jsonString: str, error: error, successHandler: { (json) in 73 httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
74 if json["status"] == 1 && error == nil{ 74 if json["status"] == 1 && error == nil{
75 if json.contentData().arrayValue.count>0 { 75 if json.contentData().arrayValue.count>0 {
76 - NSLog("************\(HTTPServer.HOSTImage+json.contentData().arrayValue[0]["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)")  
77 let imageResource = ZLaunchAdImageResourceConfigure() 76 let imageResource = ZLaunchAdImageResourceConfigure()
78 imageResource.imageNameOrImageURL = HTTPServer.HOSTImage+json.contentData().arrayValue[0]["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)! 77 imageResource.imageNameOrImageURL = HTTPServer.HOSTImage+json.contentData().arrayValue[0]["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
79 imageResource.imageDuration = 5 78 imageResource.imageDuration = 5
@@ -102,7 +101,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { @@ -102,7 +101,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
102 var images:[String] = [] 101 var images:[String] = []
103 if json.contentData().arrayValue.count>0 { 102 if json.contentData().arrayValue.count>0 {
104 for item in json.contentData().arrayValue { 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 LaunchIntroductionView.shared(withImages: images, buttonImage: "icon_getin", buttonFrame: CGRect(x: getScreenWidth()/2-551/4, y: getScreenHeight()-150, width: 551/2, height: 45)) 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 }
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
@@ -49,7 +49,11 @@ class MyViewController: UIViewController { @@ -49,7 +49,11 @@ class MyViewController: UIViewController {
49 // MARK: - 页面将要显示时隐藏navigationbar显示自定义的顶部view 49 // MARK: - 页面将要显示时隐藏navigationbar显示自定义的顶部view
50 override func viewWillAppear(_ animated: Bool) { 50 override func viewWillAppear(_ animated: Bool) {
51 super.viewWillAppear(animated) 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 // MARK: - 设置是否登录及个人信息 57 // MARK: - 设置是否登录及个人信息
54 setupCurrentInfo() 58 setupCurrentInfo()
55 } 59 }
@@ -181,7 +185,7 @@ extension MyViewController: UITableViewDelegate,UITableViewDataSource{ @@ -181,7 +185,7 @@ extension MyViewController: UITableViewDelegate,UITableViewDataSource{
181 return 0 185 return 0
182 } 186 }
183 //"zy105428" 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 return 0 189 return 0
186 }else{ 190 }else{
187 return 44 191 return 44
ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift
@@ -105,42 +105,8 @@ class YXMessageManager: NSObject,NIMLoginManagerDelegate,NIMSystemNotificationMa @@ -105,42 +105,8 @@ class YXMessageManager: NSObject,NIMLoginManagerDelegate,NIMSystemNotificationMa
105 if let info=JSON.fromString(notification.content) { 105 if let info=JSON.fromString(notification.content) {
106 if info["type"].stringValue=="attach"{//群发通知 106 if info["type"].stringValue=="attach"{//群发通知
107 let attachItem = NSManagedObject.creatWith(identifier: "Message") as! Message 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 attachItem.date=Date(timeIntervalSince1970: notification.timestamp) 108 attachItem.date=Date(timeIntervalSince1970: notification.timestamp)
119 -// attachItem.msgId=info["msgId"].stringValue  
120 -// attachItem.senderId=notification.sender  
121 attachItem.content = info["content"].stringValue 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 attachItem.ownId = AccountManager.shared.userid 110 attachItem.ownId = AccountManager.shared.userid
145 attachItem.save() 111 attachItem.save()
146 NotificationCenter.default.post(name: Notification.Name(rawValue: MessageNotification.receiveMessage), object: nil, userInfo: nil) 112 NotificationCenter.default.post(name: Notification.Name(rawValue: MessageNotification.receiveMessage), object: nil, userInfo: nil)
ParentAssistant/ParentAssistant/Supporting Files/Info.plist
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <key>CFBundleShortVersionString</key> 19 <key>CFBundleShortVersionString</key>
20 <string>1.0.0</string> 20 <string>1.0.0</string>
21 <key>CFBundleVersion</key> 21 <key>CFBundleVersion</key>
22 - <string>1</string> 22 + <string>5</string>
23 <key>LSRequiresIPhoneOS</key> 23 <key>LSRequiresIPhoneOS</key>
24 <true/> 24 <true/>
25 <key>NSAppTransportSecurity</key> 25 <key>NSAppTransportSecurity</key>
@@ -28,7 +28,9 @@ @@ -28,7 +28,9 @@
28 <true/> 28 <true/>
29 </dict> 29 </dict>
30 <key>NSLocationWhenInUseUsageDescription</key> 30 <key>NSLocationWhenInUseUsageDescription</key>
31 - <string>"需要您的同意,才能在使用期间访问位置"</string> 31 + <string>&quot;需要您的同意,才能在使用期间访问位置&quot;</string>
  32 + <key>NSMicrophoneUsageDescription</key>
  33 + <string>访问麦克风</string>
32 <key>NSPhotoLibraryUsageDescription</key> 34 <key>NSPhotoLibraryUsageDescription</key>
33 <string>你可以获取本地照片</string> 35 <string>你可以获取本地照片</string>
34 <key>UILaunchStoryboardName</key> 36 <key>UILaunchStoryboardName</key>