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 d572a428 aad3af55
Showing 8 changed files with 106 additions and 13 deletions Show diff stats
ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/jun.xcuserdatad/UserInterfaceState.xcuserstate
ParentAssistant/ParentAssistant/AppDelegate.swift
ParentAssistant/ParentAssistant/Classes/controllers/main/TabBarController.swift
ParentAssistant/ParentAssistant/Classes/controllers/my/Model/MessageManager.swift
ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift
ParentAssistant/ParentAssistant/ParentAssistant.xcdatamodeld/.xccurrentversion
ParentAssistant/ParentAssistant/ParentAssistant.xcdatamodeld/ParentAssistant 2.xcdatamodel/contents
@@ -289,6 +289,7 @@
 		BF7A4C82204E338400460463 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		BF7A4C83204E338400460463 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		BFA74439207DB6EE00845D30 /* ActivationSchoolCardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivationSchoolCardViewController.swift; sourceTree = "<group>"; };
+		BFA7443B2080869D00845D30 /* ParentAssistant 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "ParentAssistant 2.xcdatamodel"; sourceTree = "<group>"; };
 		BFBC06BB2063AE8800CCFAFF /* ZLaunchAd.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZLaunchAd.swift; sourceTree = "<group>"; };
 		BFBC06BC2063AE8800CCFAFF /* ZLaunchAdAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZLaunchAdAnimation.swift; sourceTree = "<group>"; };
 		BFBC06BD2063AE8800CCFAFF /* ZLaunchAdButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZLaunchAdButton.swift; sourceTree = "<group>"; };
@@ -1284,7 +1285,7 @@
 					"$(PROJECT_DIR)/Pods/NIMSDK_LITE/NIMSDK",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/ParentAssistant/Supporting Files/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = net.shunzi.app.ParentAssistant;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1314,7 +1315,7 @@
 					"$(PROJECT_DIR)/Pods/NIMSDK_LITE/NIMSDK",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/ParentAssistant/Supporting Files/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = net.shunzi.app.ParentAssistant;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1395,9 +1396,10 @@
 		BF7A4C3A204CD55300460463 /* ParentAssistant.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
+				BFA7443B2080869D00845D30 /* ParentAssistant 2.xcdatamodel */,
 				BF7A4C3B204CD55300460463 /* ParentAssistant.xcdatamodel */,
 			);
-			currentVersion = BF7A4C3B204CD55300460463 /* ParentAssistant.xcdatamodel */;
+			currentVersion = BFA7443B2080869D00845D30 /* ParentAssistant 2.xcdatamodel */;
 			path = ParentAssistant.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;
@@ -201,11 +201,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func applicationWillTerminate(_ application: UIApplication) {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
         // Saves changes in the application's managed object context before the application terminates.
-        self.saveContext()
+        if #available(iOS 10.0, *) {
+            self.saveContext()
+        } else {
+            // Fallback on earlier versions
+        }
     }
     // MARK: - Core Data stack
+    @available(iOS 10.0, *)
     lazy var persistentContainer: NSPersistentContainer = {
         /*
          The persistent container for the application. This implementation
@@ -232,9 +237,47 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         })
         return container
     }()
-
+    
+    lazy var applicationDocumentsDirectory: URL = {
+        let urls = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)
+        return urls[urls.count-1]
+    }()
+    
+    lazy var managedObjectModel: NSManagedObjectModel = {
+        let modelURL = Bundle.main.url(forResource: "ParentAssistant", withExtension: "momd")!
+        return NSManagedObjectModel(contentsOf: modelURL)!
+    }()
+    
+    lazy var persistentStoreCoordinator: NSPersistentStoreCoordinator = {
+        let coordinator = NSPersistentStoreCoordinator(managedObjectModel: self.managedObjectModel)
+        let url = self.applicationDocumentsDirectory.appendingPathComponent("ParentAssistant.sqlite")
+        var failureReason = "There was an error creating or loading the application's saved data."
+        do {
+            try coordinator.addPersistentStore(ofType: NSSQLiteStoreType, configurationName: nil, at: url, options: nil)
+        } catch {
+            // Report any error we got.
+            var dict = [String: AnyObject]()
+            dict[NSLocalizedDescriptionKey] = "Failed to initialize the application's saved data" as AnyObject?
+            dict[NSLocalizedFailureReasonErrorKey] = failureReason as AnyObject?
+            
+            dict[NSUnderlyingErrorKey] = error as NSError
+            let wrappedError = NSError(domain: "YOUR_ERROR_DOMAIN", code: 9999, userInfo: dict)
+            NSLog("Unresolved error \(wrappedError), \(wrappedError.userInfo)")
+            abort()
+        }
+        
+        return coordinator
+    }()
+    
+    lazy var managedObjectContext: NSManagedObjectContext = {
+        let coordinator = self.persistentStoreCoordinator
+        var managedObjectContext = NSManagedObjectContext(concurrencyType: .mainQueueConcurrencyType)
+        managedObjectContext.persistentStoreCoordinator = coordinator
+        return managedObjectContext
+    }()
     // MARK: - Core Data Saving support
+    @available(iOS 10.0, *)
     func saveContext () {
         let context = persistentContainer.viewContext
         if context.hasChanges {
@@ -46,8 +46,12 @@ class TabBarController: UITabBarController {
                         if UIApplication.appVersion() < version{
                             let alert = UIAlertController(title: "发现新版本", message: dataInformatica["releaseNotes"]! as? String, preferredStyle: .alert)
                             alert.addAction(UIAlertAction(title: "前往更新", style: .default, handler: { (action) in
-                                //                                UIApplication.shared.openURL(URL(string: "itms-apps://itunes.apple.com/app/id1271291794")!)
-                                UIApplication.shared.open(URL(string: "itms-apps://itunes.apple.com/app/id1357945086")!, options: [:], completionHandler: nil)
+                                if #available(iOS 10.0, *) {
+                                    UIApplication.shared.open(URL(string: "itms-apps://itunes.apple.com/app/id1357945086")!, options: [:], completionHandler: nil)
+                                } else {
+                                    // Fallback on earlier versions
+                                    UIApplication.shared.openURL(URL(string: "itms-apps://itunes.apple.com/app/id1271291794")!)
+                                }
                             }))
                             alert.addAction(UIAlertAction(title: "以后再说", style: .cancel, handler: { (action) in
@@ -12,7 +12,13 @@ extension NSManagedObject {
     static func creatWith(identifier:String)->NSManagedObject {
         //获取管理的数据上下文 对象
-        let context = appDelegate.persistentContainer.viewContext
+        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
@@ -20,7 +26,13 @@ extension NSManagedObject {
     //查询数据操作
     static func fetchModel(identifier:String,ownid:String)->[Any]{
         //获取管理的数据上下文 对象
-        let context = appDelegate.persistentContainer.viewContext
+        var context:NSManagedObjectContext!
+        if #available(iOS 10.0, *) {
+            context = appDelegate.persistentContainer.viewContext
+        } else {
+            // Fallback on earlier versions
+            context = appDelegate.managedObjectContext
+        }
         //声明数据的请求
         let fetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName:identifier)
         fetchRequest.sortDescriptors = [NSSortDescriptor(key: "date", ascending: false)]
@@ -43,7 +55,13 @@ extension NSManagedObject {
     //查询数据操作
     static func fetchAllUnReadModel(identifier:String,ownid:String)->[Any]{
         //获取管理的数据上下文 对象
-        let context = appDelegate.persistentContainer.viewContext
+        var context:NSManagedObjectContext!
+        if #available(iOS 10.0, *) {
+            context = appDelegate.persistentContainer.viewContext
+        } else {
+            // Fallback on earlier versions
+            context = appDelegate.managedObjectContext
+        }
         //声明数据的请求
         let fetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName:identifier)
         fetchRequest.sortDescriptors = [NSSortDescriptor(key: "date", ascending: false)]
@@ -66,7 +84,13 @@ extension NSManagedObject {
     func save(){
         //获取管理的数据上下文 对象
-        let context = appDelegate.persistentContainer.viewContext
+        var context:NSManagedObjectContext!
+        if #available(iOS 10.0, *) {
+            context = appDelegate.persistentContainer.viewContext
+        } else {
+            // Fallback on earlier versions
+            context = appDelegate.managedObjectContext
+        }
         //保存
         do {
             try context.save()
@@ -77,7 +101,13 @@ extension NSManagedObject {
     }
     func delete(){
         //获取管理的数据上下文 对象
-        let context = appDelegate.persistentContainer.viewContext
+        var context:NSManagedObjectContext!
+        if #available(iOS 10.0, *) {
+            context = appDelegate.persistentContainer.viewContext
+        } else {
+            // Fallback on earlier versions
+            context = appDelegate.managedObjectContext
+        }
         context.delete(self)
         //重新保存-更新到数据库
         save()
@@ -113,6 +113,7 @@ class YXMessageManager: NSObject,NIMLoginManagerDelegate,NIMSystemNotificationMa
             }else if info["type"].stringValue=="ordermess"{//订购通知
                 let attachItem = NSManagedObject.creatWith(identifier: "Message") as! Message
                 attachItem.date=Date(timeIntervalSince1970: notification.timestamp)
+                attachItem.type = "ordermess"
                 attachItem.content = info["content"].stringValue
                 attachItem.ownId = AccountManager.shared.userid
                 attachItem.save()
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>ParentAssistant.xcdatamodel</string>
+	<string>ParentAssistant 2.xcdatamodel</string>
 </dict>
 </plist>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="13772" systemVersion="16G29" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+    <entity name="Message" representedClassName="Message" syncable="YES" codeGenerationType="class">
+        <attribute name="content" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="isReaded" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="ownId" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="type" optional="YES" attributeType="String" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="Message" positionX="-63" positionY="-18" width="128" height="120"/>
+    </elements>
+</model>
 \ No newline at end of file
	@@ -201,11 +201,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {		@@ -201,11 +201,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
201	func applicationWillTerminate(_ application: UIApplication) {	201	func applicationWillTerminate(_ application: UIApplication) {
202	// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.	202	// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
203	// Saves changes in the application's managed object context before the application terminates.	203	// Saves changes in the application's managed object context before the application terminates.
204	- self.saveContext()	204	+ if #available(iOS 10.0, *) {
		205	+ self.saveContext()
		206	+ } else {
		207	+ // Fallback on earlier versions
		208	+ }
205	}	209	}
206		210
207	// MARK: - Core Data stack	211	// MARK: - Core Data stack
208		212
		213	+ @available(iOS 10.0, *)
209	lazy var persistentContainer: NSPersistentContainer = {	214	lazy var persistentContainer: NSPersistentContainer = {
210	/*	215	/*
211	The persistent container for the application. This implementation	216	The persistent container for the application. This implementation
	@@ -232,9 +237,47 @@ class AppDelegate: UIResponder, UIApplicationDelegate {		@@ -232,9 +237,47 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
232	})	237	})
233	return container	238	return container
234	}()	239	}()
235	-	240	+
		241	+ lazy var applicationDocumentsDirectory: URL = {
		242	+ let urls = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)
		243	+ return urls[urls.count-1]
		244	+ }()
		245	+
		246	+ lazy var managedObjectModel: NSManagedObjectModel = {
		247	+ let modelURL = Bundle.main.url(forResource: "ParentAssistant", withExtension: "momd")!
		248	+ return NSManagedObjectModel(contentsOf: modelURL)!
		249	+ }()
		250	+
		251	+ lazy var persistentStoreCoordinator: NSPersistentStoreCoordinator = {
		252	+ let coordinator = NSPersistentStoreCoordinator(managedObjectModel: self.managedObjectModel)
		253	+ let url = self.applicationDocumentsDirectory.appendingPathComponent("ParentAssistant.sqlite")
		254	+ var failureReason = "There was an error creating or loading the application's saved data."
		255	+ do {
		256	+ try coordinator.addPersistentStore(ofType: NSSQLiteStoreType, configurationName: nil, at: url, options: nil)
		257	+ } catch {
		258	+ // Report any error we got.
		259	+ var dict = [String: AnyObject]()
		260	+ dict[NSLocalizedDescriptionKey] = "Failed to initialize the application's saved data" as AnyObject?
		261	+ dict[NSLocalizedFailureReasonErrorKey] = failureReason as AnyObject?
		262	+
		263	+ dict[NSUnderlyingErrorKey] = error as NSError
		264	+ let wrappedError = NSError(domain: "YOUR_ERROR_DOMAIN", code: 9999, userInfo: dict)
		265	+ NSLog("Unresolved error \(wrappedError), \(wrappedError.userInfo)")
		266	+ abort()
		267	+ }
		268	+
		269	+ return coordinator
		270	+ }()
		271	+
		272	+ lazy var managedObjectContext: NSManagedObjectContext = {
		273	+ let coordinator = self.persistentStoreCoordinator
		274	+ var managedObjectContext = NSManagedObjectContext(concurrencyType: .mainQueueConcurrencyType)
		275	+ managedObjectContext.persistentStoreCoordinator = coordinator
		276	+ return managedObjectContext
		277	+ }()
236	// MARK: - Core Data Saving support	278	// MARK: - Core Data Saving support
237		279
		280	+ @available(iOS 10.0, *)
238	func saveContext () {	281	func saveContext () {
239	let context = persistentContainer.viewContext	282	let context = persistentContainer.viewContext
240	if context.hasChanges {	283	if context.hasChanges {
	@@ -3,6 +3,6 @@		@@ -3,6 +3,6 @@
3	<plist version="1.0">	3	<plist version="1.0">
4	<dict>	4	<dict>
5	<key>_XCCurrentVersionName</key>	5	<key>_XCCurrentVersionName</key>
6	- <string>ParentAssistant.xcdatamodel</string>	6	+ <string>ParentAssistant 2.xcdatamodel</string>
7	</dict>	7	</dict>
8	</plist>	8	</plist>
	@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
		1	+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
		2	+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="13772" systemVersion="16G29" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
		3	+ <entity name="Message" representedClassName="Message" syncable="YES" codeGenerationType="class">
		4	+ <attribute name="content" optional="YES" attributeType="String" syncable="YES"/>
		5	+ <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
		6	+ <attribute name="isReaded" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
		7	+ <attribute name="ownId" optional="YES" attributeType="String" syncable="YES"/>
		8	+ <attribute name="type" optional="YES" attributeType="String" syncable="YES"/>
		9	+ </entity>
		10	+ <elements>
		11	+ <element name="Message" positionX="-63" positionY="-18" width="128" height="120"/>
		12	+ </elements>
		13	+</model>
0	\ No newline at end of file	14	\ No newline at end of file