推送消息

artimenring-iOS/Artimenring/Classes/Model/EModel.h

@@ -230,7 +230,7 @@
 @interface PushMessageModel : BaseModel
 @property(nonatomic, copy) NSString* cid;
 @property(nonatomic, copy) NSString* childName;
-@property(nonatomic, assign) NSInteger type;
+@property(nonatomic, assign) NSInteger type; //10:低电 20:电子围栏 30:通讯录 40:开关机 50:系统升级 60:手表高温 70:天气预警
 @property(nonatomic, assign) NSInteger create_time;
 @property(nonatomic, strong) PushMessageParamsModel* params;
 - (NSString*)getMessage;

artimenring-iOS/Artimenring/Classes/ViewController/Record/PushAllMessageViewController.m

@@ -48,7 +48,7 @@
     PushMessageModel* model = self.mDataArray[indexPath.row];
     NSString* key = [NSString stringWithFormat:@"%@%ld", @"PAM.Type.", model.type];
     cell.mTypeNameLabel.text = NSLocalizedString(key, nil);
-    [cell.mTypeImage setImage:[UIImage imageNamed:[NSString stringWithFormat:@"%@%ld", @"push_message_", (long)model.type]]];
+    [cell.mTypeImage setImage:[UIImage imageNamed:[NSString stringWithFormat:@"%@%ld", @"push_", (long)model.type]]];
     cell.mContentLabel.text = [model getMessage];
     
     NSDate *date = [NSDate dateWithTimeIntervalSince1970:model.create_time];

artimenring-iOS/Artimenring/Images.xcassets/Record/pm_10.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "pm_10@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "pm_10@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

artimenring-iOS/Artimenring/Images.xcassets/Record/pm_20.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "pm_20@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "pm_20@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

artimenring-iOS/Artimenring/Images.xcassets/Record/pm_30.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "pm_30@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "pm_30@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

artimenring-iOS/Artimenring/Images.xcassets/Record/pm_40.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "pm_40@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "pm_40@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

artimenring-iOS/Artimenring/Images.xcassets/Record/pm_50.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "pm_50@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "pm_50@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

artimenring-iOS/Artimenring/Images.xcassets/Record/pm_60.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "pm_60@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "pm_60@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

artimenring-iOS/Artimenring/Images.xcassets/Record/pm_70.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "pm_70@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "pm_70@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}