diff --git a/ParentAssistant/ParentAssistant/AppDelegate.swift b/ParentAssistant/ParentAssistant/AppDelegate.swift index 3e69871..e8a4921 100644 --- a/ParentAssistant/ParentAssistant/AppDelegate.swift +++ b/ParentAssistant/ParentAssistant/AppDelegate.swift @@ -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)) } diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift index 39f1d33..eea3d05 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift @@ -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 diff --git a/ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift b/ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift index b417d27..2e9b1ea 100644 --- a/ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift +++ b/ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift @@ -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() -// 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() -// 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) diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Info.plist b/ParentAssistant/ParentAssistant/Supporting Files/Info.plist index 62a086f..352a83c 100644 --- a/ParentAssistant/ParentAssistant/Supporting Files/Info.plist +++ b/ParentAssistant/ParentAssistant/Supporting Files/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.0.0 CFBundleVersion - 1 + 5 LSRequiresIPhoneOS NSAppTransportSecurity @@ -28,7 +28,9 @@ NSLocationWhenInUseUsageDescription - "需要您的同意,才能在使用期间访问位置" + "需要您的同意,才能在使用期间访问位置" + NSMicrophoneUsageDescription + 访问麦克风 NSPhotoLibraryUsageDescription 你可以获取本地照片 UILaunchStoryboardName -- libgit2 0.21.0