Commit c73915c769c59dee2342087579732539430ab983

Authored by 葛建军
1 parent b640da72
Exists in parentassistant

no message

ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
... ... @@ -268,6 +268,7 @@
268 268 BF7A4C82204E338400460463 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
269 269 BF7A4C83204E338400460463 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
270 270 BFA74439207DB6EE00845D30 /* ActivationSchoolCardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivationSchoolCardViewController.swift; sourceTree = "<group>"; };
  271 + BFA7443B2080869D00845D30 /* ParentAssistant 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "ParentAssistant 2.xcdatamodel"; sourceTree = "<group>"; };
271 272 BFBC06BB2063AE8800CCFAFF /* ZLaunchAd.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZLaunchAd.swift; sourceTree = "<group>"; };
272 273 BFBC06BC2063AE8800CCFAFF /* ZLaunchAdAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZLaunchAdAnimation.swift; sourceTree = "<group>"; };
273 274 BFBC06BD2063AE8800CCFAFF /* ZLaunchAdButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZLaunchAdButton.swift; sourceTree = "<group>"; };
... ... @@ -1355,9 +1356,10 @@
1355 1356 BF7A4C3A204CD55300460463 /* ParentAssistant.xcdatamodeld */ = {
1356 1357 isa = XCVersionGroup;
1357 1358 children = (
  1359 + BFA7443B2080869D00845D30 /* ParentAssistant 2.xcdatamodel */,
1358 1360 BF7A4C3B204CD55300460463 /* ParentAssistant.xcdatamodel */,
1359 1361 );
1360   - currentVersion = BF7A4C3B204CD55300460463 /* ParentAssistant.xcdatamodel */;
  1362 + currentVersion = BFA7443B2080869D00845D30 /* ParentAssistant 2.xcdatamodel */;
1361 1363 path = ParentAssistant.xcdatamodeld;
1362 1364 sourceTree = "<group>";
1363 1365 versionGroupType = wrapper.xcdatamodel;
... ...
ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift
... ... @@ -113,6 +113,7 @@ class YXMessageManager: NSObject,NIMLoginManagerDelegate,NIMSystemNotificationMa
113 113 }else if info["type"].stringValue=="ordermess"{//订购通知
114 114 let attachItem = NSManagedObject.creatWith(identifier: "Message") as! Message
115 115 attachItem.date=Date(timeIntervalSince1970: notification.timestamp)
  116 + attachItem.type = "ordermess"
116 117 attachItem.content = info["content"].stringValue
117 118 attachItem.ownId = AccountManager.shared.userid
118 119 attachItem.save()
... ...
ParentAssistant/ParentAssistant/ParentAssistant.xcdatamodeld/.xccurrentversion
... ... @@ -3,6 +3,6 @@
3 3 <plist version="1.0">
4 4 <dict>
5 5 <key>_XCCurrentVersionName</key>
6   - <string>ParentAssistant.xcdatamodel</string>
  6 + <string>ParentAssistant 2.xcdatamodel</string>
7 7 </dict>
8 8 </plist>
... ...
ParentAssistant/ParentAssistant/ParentAssistant.xcdatamodeld/ParentAssistant 2.xcdatamodel/contents 0 → 100644
... ... @@ -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 14 \ No newline at end of file
... ...