diff --git a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj index f505f57..6c35bf8 100644 --- a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj +++ b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj @@ -268,6 +268,7 @@ BF7A4C82204E338400460463 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 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 = ""; }; 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 = ""; }; @@ -1355,9 +1356,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 = ""; versionGroupType = wrapper.xcdatamodel; diff --git a/ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift b/ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift index 2e9b1ea..3d0d92d 100644 --- a/ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift +++ b/ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift @@ -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() diff --git a/ParentAssistant/ParentAssistant/ParentAssistant.xcdatamodeld/.xccurrentversion b/ParentAssistant/ParentAssistant/ParentAssistant.xcdatamodeld/.xccurrentversion index 587f828..4575e1d 100644 --- a/ParentAssistant/ParentAssistant/ParentAssistant.xcdatamodeld/.xccurrentversion +++ b/ParentAssistant/ParentAssistant/ParentAssistant.xcdatamodeld/.xccurrentversion @@ -3,6 +3,6 @@ _XCCurrentVersionName - ParentAssistant.xcdatamodel + ParentAssistant 2.xcdatamodel diff --git a/ParentAssistant/ParentAssistant/ParentAssistant.xcdatamodeld/ParentAssistant 2.xcdatamodel/contents b/ParentAssistant/ParentAssistant/ParentAssistant.xcdatamodeld/ParentAssistant 2.xcdatamodel/contents new file mode 100644 index 0000000..c5d9e2b --- /dev/null +++ b/ParentAssistant/ParentAssistant/ParentAssistant.xcdatamodeld/ParentAssistant 2.xcdatamodel/contents @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file -- libgit2 0.21.0