From 85f14aeeb85e83524f13b32a5c3d48cf10de4178 Mon Sep 17 00:00:00 2001 From: 葛建军 <627299690@qq.com> Date: Sat, 14 Apr 2018 09:43:08 +0800 Subject: [PATCH] no message --- ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj | 8 ++++---- ParentAssistant/ParentAssistant/Classes/controllers/my/Model/MessageManager.swift | 118 ---------------------------------------------------------------------------------------------------------------------- ParentAssistant/ParentAssistant/Classes/util/MessageManager.swift | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 122 deletions(-) delete mode 100644 ParentAssistant/ParentAssistant/Classes/controllers/my/Model/MessageManager.swift create mode 100644 ParentAssistant/ParentAssistant/Classes/util/MessageManager.swift diff --git a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj index 5762f31..a05f4fb 100644 --- a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj +++ b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj @@ -78,7 +78,6 @@ BF38847C205CDE1B00A240EF /* JS.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BF38847B205CDE1B00A240EF /* JS.storyboard */; }; BF38847E205CDE2D00A240EF /* JSViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF38847D205CDE2D00A240EF /* JSViewController.swift */; }; BF388480205CDFBE00A240EF /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF38847F205CDFBE00A240EF /* WebKit.framework */; }; - BF388482205F5BC800A240EF /* MessageManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF388481205F5BC800A240EF /* MessageManager.swift */; }; BF3B8298204FC80D002078EA /* UMCommon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF3B8297204FC80D002078EA /* UMCommon.framework */; }; BF3B82A02050CC8B002078EA /* ReportHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3B829F2050CC8B002078EA /* ReportHeaderView.swift */; }; BF406CD62057B03A000A6681 /* MessageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF406CD52057B03A000A6681 /* MessageViewController.swift */; }; @@ -118,6 +117,7 @@ BF7A4C86204E338500460463 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BF7A4C81204E338400460463 /* Main.storyboard */; }; BF7A4C87204E338500460463 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BF7A4C83204E338400460463 /* Info.plist */; }; BFA7443A207DB6EE00845D30 /* ActivationSchoolCardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFA74439207DB6EE00845D30 /* ActivationSchoolCardViewController.swift */; }; + BFA7446C208193D300845D30 /* MessageManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFA7446B208193D300845D30 /* MessageManager.swift */; }; BFBC06C52063AE8900CCFAFF /* ZLaunchAd.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFBC06BB2063AE8800CCFAFF /* ZLaunchAd.swift */; }; BFBC06C62063AE8900CCFAFF /* ZLaunchAdAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFBC06BC2063AE8800CCFAFF /* ZLaunchAdAnimation.swift */; }; BFBC06C72063AE8900CCFAFF /* ZLaunchAdButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFBC06BD2063AE8800CCFAFF /* ZLaunchAdButton.swift */; }; @@ -244,7 +244,6 @@ BF38847B205CDE1B00A240EF /* JS.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = JS.storyboard; sourceTree = ""; }; BF38847D205CDE2D00A240EF /* JSViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSViewController.swift; sourceTree = ""; }; BF38847F205CDFBE00A240EF /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; - BF388481205F5BC800A240EF /* MessageManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageManager.swift; sourceTree = ""; }; BF3B8297204FC80D002078EA /* UMCommon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UMCommon.framework; path = Pods/UMCCommon/UMCommon.framework; sourceTree = ""; }; BF3B829F2050CC8B002078EA /* ReportHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportHeaderView.swift; sourceTree = ""; }; BF406CD52057B03A000A6681 /* MessageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageViewController.swift; sourceTree = ""; }; @@ -290,6 +289,7 @@ BF7A4C83204E338400460463 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; BFA74439207DB6EE00845D30 /* ActivationSchoolCardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivationSchoolCardViewController.swift; sourceTree = ""; }; BFA7443B2080869D00845D30 /* ParentAssistant 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "ParentAssistant 2.xcdatamodel"; sourceTree = ""; }; + BFA7446B208193D300845D30 /* MessageManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageManager.swift; sourceTree = ""; }; BFBC06BB2063AE8800CCFAFF /* ZLaunchAd.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZLaunchAd.swift; sourceTree = ""; }; BFBC06BC2063AE8800CCFAFF /* ZLaunchAdAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZLaunchAdAnimation.swift; sourceTree = ""; }; BFBC06BD2063AE8800CCFAFF /* ZLaunchAdButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZLaunchAdButton.swift; sourceTree = ""; }; @@ -486,6 +486,7 @@ ADE33B302062202300BEA6E6 /* Macro.swift */, BF5D1669204E675C00274489 /* account.swift */, BF5D166B204E6A0300274489 /* network.swift */, + BFA7446B208193D300845D30 /* MessageManager.swift */, 599365282052553900C8B371 /* pinyin.c */, 599365292052553900C8B371 /* pinyin.h */, ); @@ -745,7 +746,6 @@ BFCED88A20528DE700055373 /* MyViewControllerModel.swift */, BF406CD92057BEB8000A6681 /* OrderDetailModel.swift */, BF388468205A4DE900A240EF /* StudentClassInfo.swift */, - BF388481205F5BC800A240EF /* MessageManager.swift */, ); path = Model; sourceTree = ""; @@ -1052,7 +1052,6 @@ 599364ED204E62E700C8B371 /* InformationViewController.swift in Sources */, ADC9AB72207C55CE00348EF1 /* GrowViewController.swift in Sources */, 5980BF692061048A00F4A35E /* LZCityPickerView.m in Sources */, - BF388482205F5BC800A240EF /* MessageManager.swift in Sources */, 5980BF682061048A00F4A35E /* LZCityPickerController.m in Sources */, AD198173207D9FB4009AB8B5 /* ProgramCheckViewController.swift in Sources */, BFCED88B20528DE700055373 /* MyViewControllerModel.swift in Sources */, @@ -1091,6 +1090,7 @@ AD64A2C0207F289400B25E80 /* ProgramVacateTableViewCell.swift in Sources */, AD64A2C3207F28CF00B25E80 /* ProgramVacateBodyTableViewCell.swift in Sources */, 599364EA204E62E700C8B371 /* ChannelViewController.swift in Sources */, + BFA7446C208193D300845D30 /* MessageManager.swift in Sources */, BF406CDE2057C537000A6681 /* OrderDetailTableViewCell.swift in Sources */, BFEAAAC7205257460072FAAF /* LXCalenderCell.m in Sources */, BFBC06CC2063AE8900CCFAFF /* ZLaunchAdWindow.swift in Sources */, diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Model/MessageManager.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Model/MessageManager.swift deleted file mode 100644 index 1e5ee2d..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Model/MessageManager.swift +++ /dev/null @@ -1,118 +0,0 @@ -// -// MessageManager.swift -// ParentAssistant -// -// Created by 葛建军 on 2018/3/19. -// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. -// - -import UIKit -import CoreData -extension NSManagedObject { - - static func creatWith(identifier:String)->NSManagedObject { - //获取管理的数据上下文 对象 - var context:NSManagedObjectContext! - if #available(iOS 10.0, *) { - context = appDelegate.persistentContainer.viewContext - } else { - // Fallback on earlier versions - context = appDelegate.managedObjectContext - } - //创建对象 - let obj = NSEntityDescription.insertNewObject(forEntityName: identifier,into: context) - return obj - } - //查询数据操作 - static func fetchModel(identifier:String,ownid:String)->[Any]{ - //获取管理的数据上下文 对象 - var context:NSManagedObjectContext! - if #available(iOS 10.0, *) { - context = appDelegate.persistentContainer.viewContext - } else { - // Fallback on earlier versions - context = appDelegate.managedObjectContext - } - //声明数据的请求 - let fetchRequest = NSFetchRequest(entityName:identifier) - fetchRequest.sortDescriptors = [NSSortDescriptor(key: "date", ascending: false)] -// fetchRequest.fetchLimit = 10 //限定查询结果的数量 - fetchRequest.fetchOffset = 0 //查询的偏移量 - - //设置查询条件 - let predicate = NSPredicate(format: "ownId = %@", ownid) - fetchRequest.predicate = predicate - - //查询操作 - do { - let fetchedObjects = try context.fetch(fetchRequest) - return fetchedObjects - } - catch { - fatalError("不能查询：\(error)") - } - } - //查询数据操作 - static func fetchAllUnReadModel(identifier:String,ownid:String)->[Any]{ - //获取管理的数据上下文 对象 - var context:NSManagedObjectContext! - if #available(iOS 10.0, *) { - context = appDelegate.persistentContainer.viewContext - } else { - // Fallback on earlier versions - context = appDelegate.managedObjectContext - } - //声明数据的请求 - let fetchRequest = NSFetchRequest(entityName:identifier) - fetchRequest.sortDescriptors = [NSSortDescriptor(key: "date", ascending: false)] - // fetchRequest.fetchLimit = 10 //限定查询结果的数量 - fetchRequest.fetchOffset = 0 //查询的偏移量 - - //设置查询条件 - let predicate = NSPredicate(format: "ownId = %@ and isReaded == %@", ownid,false as CVarArg) - fetchRequest.predicate = predicate - - //查询操作 - do { - let fetchedObjects = try context.fetch(fetchRequest) - return fetchedObjects - } - catch { - fatalError("不能查询：\(error)") - } - } - - func save(){ - //获取管理的数据上下文 对象 - var context:NSManagedObjectContext! - if #available(iOS 10.0, *) { - context = appDelegate.persistentContainer.viewContext - } else { - // Fallback on earlier versions - context = appDelegate.managedObjectContext - } - //保存 - do { - try context.save() - print("保存成功！") - } catch { - fatalError("不能保存：\(error)") - } - } - func delete(){ - //获取管理的数据上下文 对象 - var context:NSManagedObjectContext! - if #available(iOS 10.0, *) { - context = appDelegate.persistentContainer.viewContext - } else { - // Fallback on earlier versions - context = appDelegate.managedObjectContext - } - context.delete(self) - //重新保存-更新到数据库 - save() - } -} -class MessageNotification: NSObject { - static let receiveMessage = "YXReceiveMessage" -} diff --git a/ParentAssistant/ParentAssistant/Classes/util/MessageManager.swift b/ParentAssistant/ParentAssistant/Classes/util/MessageManager.swift new file mode 100644 index 0000000..1e5ee2d --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/util/MessageManager.swift @@ -0,0 +1,118 @@ +// +// MessageManager.swift +// ParentAssistant +// +// Created by 葛建军 on 2018/3/19. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit +import CoreData +extension NSManagedObject { + + static func creatWith(identifier:String)->NSManagedObject { + //获取管理的数据上下文 对象 + var context:NSManagedObjectContext! + if #available(iOS 10.0, *) { + context = appDelegate.persistentContainer.viewContext + } else { + // Fallback on earlier versions + context = appDelegate.managedObjectContext + } + //创建对象 + let obj = NSEntityDescription.insertNewObject(forEntityName: identifier,into: context) + return obj + } + //查询数据操作 + static func fetchModel(identifier:String,ownid:String)->[Any]{ + //获取管理的数据上下文 对象 + var context:NSManagedObjectContext! + if #available(iOS 10.0, *) { + context = appDelegate.persistentContainer.viewContext + } else { + // Fallback on earlier versions + context = appDelegate.managedObjectContext + } + //声明数据的请求 + let fetchRequest = NSFetchRequest(entityName:identifier) + fetchRequest.sortDescriptors = [NSSortDescriptor(key: "date", ascending: false)] +// fetchRequest.fetchLimit = 10 //限定查询结果的数量 + fetchRequest.fetchOffset = 0 //查询的偏移量 + + //设置查询条件 + let predicate = NSPredicate(format: "ownId = %@", ownid) + fetchRequest.predicate = predicate + + //查询操作 + do { + let fetchedObjects = try context.fetch(fetchRequest) + return fetchedObjects + } + catch { + fatalError("不能查询：\(error)") + } + } + //查询数据操作 + static func fetchAllUnReadModel(identifier:String,ownid:String)->[Any]{ + //获取管理的数据上下文 对象 + var context:NSManagedObjectContext! + if #available(iOS 10.0, *) { + context = appDelegate.persistentContainer.viewContext + } else { + // Fallback on earlier versions + context = appDelegate.managedObjectContext + } + //声明数据的请求 + let fetchRequest = NSFetchRequest(entityName:identifier) + fetchRequest.sortDescriptors = [NSSortDescriptor(key: "date", ascending: false)] + // fetchRequest.fetchLimit = 10 //限定查询结果的数量 + fetchRequest.fetchOffset = 0 //查询的偏移量 + + //设置查询条件 + let predicate = NSPredicate(format: "ownId = %@ and isReaded == %@", ownid,false as CVarArg) + fetchRequest.predicate = predicate + + //查询操作 + do { + let fetchedObjects = try context.fetch(fetchRequest) + return fetchedObjects + } + catch { + fatalError("不能查询：\(error)") + } + } + + func save(){ + //获取管理的数据上下文 对象 + var context:NSManagedObjectContext! + if #available(iOS 10.0, *) { + context = appDelegate.persistentContainer.viewContext + } else { + // Fallback on earlier versions + context = appDelegate.managedObjectContext + } + //保存 + do { + try context.save() + print("保存成功！") + } catch { + fatalError("不能保存：\(error)") + } + } + func delete(){ + //获取管理的数据上下文 对象 + var context:NSManagedObjectContext! + if #available(iOS 10.0, *) { + context = appDelegate.persistentContainer.viewContext + } else { + // Fallback on earlier versions + context = appDelegate.managedObjectContext + } + context.delete(self) + //重新保存-更新到数据库 + save() + } +} +class MessageNotification: NSObject { + static let receiveMessage = "YXReceiveMessage" +} -- libgit2 0.21.0