From 25f409185a53e5e7beb17518a684298d92d31b3f Mon Sep 17 00:00:00 2001
From: 单军华 <WindShan@danjunhuas-MacBook-Pro.local>
Date: Fri, 04 May 2018 13:34:53 +0800
Subject: [PATCH] iPhone x 屏幕适配修改

---
 pregnancy_guard/BaseProject/Model/UploadModel.h |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/pregnancy_guard/BaseProject/Model/UploadModel.h b/pregnancy_guard/BaseProject/Model/UploadModel.h
index 117056f..240bf30 100644
--- a/pregnancy_guard/BaseProject/Model/UploadModel.h
+++ b/pregnancy_guard/BaseProject/Model/UploadModel.h
@@ -8,14 +8,32 @@
 
 #import <Foundation/Foundation.h>
 #import "BaseReqModel.h"
+#import "UploadData.h"
 
 @interface UploadModel : BaseReqModel
-
-@property(nonatomic, strong) NSMutableArray * modelArray; // DataModel
-@property(nonatomic, strong) NSString * address;
-@property(nonatomic, strong) NSString * lat;//"lat": 31.430284,
-@property(nonatomic, strong) NSString * lon;//"lon": 120.988931,
-@property(nonatomic, strong) NSString * userid;//"userid": "597bf6a1a0e6d23f5c3c9869"
+//{
+//    "address": "���������������������������������������������413���",
+//    "data": [{
+//        "is_warn": 0,
+//        "time": "2018-04-18 11:17:54",
+//        "type": 0,
+//        "value": 0.09
+//    }, {
+//        "is_warn": 0,
+//        "time": "2018-04-18 11:17:58",
+//        "type": 0,
+//        "value": 0.09
+//    }, {
+//        "is_warn": 0,
+//        "time": "2018-04-18 11:18:01",
+//        "type": 0,
+//        "value": 0.09
+//    }],
+//    "lat": 31.42807,
+//    "lon": 120.984392,
+//    "userid": "597bf6a1a0e6d23f5c3c9869"
+//}
+@property(nonatomic, strong) UploadData * data; // DataModel
 
 
 @end

--
Gitblit v1.8.0