From 1d39caf7235522ae121db7a188ba41a706217407 Mon Sep 17 00:00:00 2001
From: 单军华 <WindShan@danjunhuas-MacBook-Pro.local>
Date: Sat, 28 Apr 2018 09:39:49 +0800
Subject: [PATCH] 清理多余代码，优化
---
pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m | 78 ++++++++++++++++++++++++++------------
1 files changed, 53 insertions(+), 25 deletions(-)
diff --git a/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m b/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m
index ae9e6ba..6f3aebc 100644
--- a/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m
+++ b/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m
@@ -28,6 +28,8 @@
#import<BaiduMapAPI_Search/BMKPoiSearchType.h>
#import "DataModel.h"
#import "UIImage+animatedGIF.h"
+#import "UploadData.h"
+
@interface RadiaDetectionPage ()<ASValueTrackingSliderDelegate,ASValueTrackingSliderDataSource,cbCharacteristicManagerDelegate,BMKMapViewDelegate,BMKLocationServiceDelegate>
{
ZZCircleProgress *circle3;
@@ -273,15 +275,15 @@
//dataModelArr
DataModel * model = [[DataModel alloc]init];
- model.value = [_BiaozhunJiliangNumLabel.text floatValue];
+ model.value = _BiaozhunJiliangNumLabel.text;
model.time = [DateUtil stringFromDateYMDHMS:[NSDate date]];
- model.type = 0;
- model.is_warn = 0;
+ model.type = @"0";
+ model.is_warn = @"0";
- if(model.value < 0.16)
+ if([model.value floatValue] < 0.16)
{
// 100
- circle3.progress = model.value*100;
+ circle3.progress = [model.value floatValue]*100;
_currentShuziTipsLabel.text = @"������������������";
_currentTipsLabel.textColor = RgbColor(64, 159, 252);
_currentTipsLabel.text = @"������������������������������\n ������������������������������������������������";
@@ -295,10 +297,10 @@
// _currentTipsLabel.textColor = kUIColorFromRGB(0x848787);
}
- else if(model.value >= 0.16 && model.value < 0.8)
+ else if([model.value floatValue] >= 0.16 && [model.value floatValue] < 0.8)
{
// 100
- float tempValue = model.value;
+ float tempValue = [model.value floatValue];
if(tempValue > 0.50)
tempValue = 0.50;
@@ -306,7 +308,7 @@
_currentShuziTipsLabel.text = @"���������������������������";
_currentTipsLabel.textColor = RgbColor(64, 159, 252);
_currentTipsLabel.text = @"������������������������������\n ���������������������������������������������������";
- model.is_warn = 1;
+ model.is_warn = @"1";
_AnquanStatustLabel.text = @"������";
_AnquanStatustLabel.textColor = kUIColorFromRGB(0x0d95fe);
@@ -316,10 +318,10 @@
ic_zhishu_bk.image = [UIImage imageNamed:@"ic_zhishu_bk"];
_currentTipsLabel.textColor = kUIColorFromRGB(0x848787);
}
- else if(model.value >= 0.8 && model.value < 2)
+ else if([model.value floatValue] >= 0.8 && [model.value floatValue] < 2)
{
// 264
- float tempValue = (model.value*100)/266;
+ float tempValue = ([model.value floatValue]*100)/266;
if(tempValue <= 0.50)
tempValue = 0.51;
@@ -327,7 +329,7 @@
_currentShuziTipsLabel.text = @"���������������������������";
_currentTipsLabel.textColor = RgbColor(252, 80, 84);
_currentTipsLabel.text = @"������������������������������\n ���������������������������������������������������";
- model.is_warn = 1;
+ model.is_warn = @"1";
_AnquanStatustLabel.text = @"������";
_AnquanStatustLabel.textColor = kUIColorFromRGB(0xc240ff);
@@ -337,11 +339,11 @@
ic_zhishu_bk.image = [UIImage imageNamed:@"bt_zise"];
_currentTipsLabel.textColor = kUIColorFromRGB(0x848787);
}
- else if(model.value >2)
+ else if([model.value floatValue] >2)
{
// 400
- float tempValue = (model.value*100)/400;
+ float tempValue = ([model.value floatValue]*100)/400;
if(tempValue <= 0.75)
tempValue = 0.76;
@@ -350,7 +352,7 @@
_currentShuziTipsLabel.text = @"������������������������������";
_currentTipsLabel.textColor = RgbColor(252, 80, 84);
_currentTipsLabel.text = @"������������������������������\n ���������������������������������������������������";
- model.is_warn = 1;
+ model.is_warn = @"1";
_AnquanStatustLabel.text = @"������";
_AnquanStatustLabel.textColor = kUIColorFromRGB(0xff4e63);
@@ -376,10 +378,10 @@
NSString * timeValueStr = [receiveHexValue substringWithRange:NSMakeRange(2,8)];
//dataModelArr
DataModel * model = [[DataModel alloc]init];
- model.value = [timeValueStr floatValue];
- model.time = [DateUtil stringFromDateYMD:[NSDate date]];
- model.type = 1;
- model.is_warn = 0;
+ model.value = timeValueStr;
+ model.time = [DateUtil stringFromDateYMDHMS:[NSDate date]];
+ model.type = @"1";
+ model.is_warn = @"0";
[dataModelArr addObject:model];
}
@@ -569,6 +571,12 @@
{
deviceStstaus = 1;
deviceStatusLabel.text = @"���������";
+
+ //��������������� ������������
+ if(myScanTimer)
+ [myScanTimer setFireDate:[NSDate distantFuture]];
+
+ [self onLineSet];
// ������������������������
NSArray *allService = [self UUIDArray:[[[CBMoralManager sharedManager] serviceUUIDDict] allKeys]];
@@ -1014,6 +1022,19 @@
dataModelArr = [[NSMutableArray alloc] init];
+// for (int i = 0; i < 10; i++) {
+// DataModel * model = [[DataModel alloc] init];
+// model.time = [DateUtil stringFromDateYMDHMS:[NSDate date]];
+// model.type = @"1";
+// model.is_warn = @"0";
+// model.value = @"0.012";
+// [dataModelArr addObject:[model mj_JSONString]];
+// }
+//
+//
+// NSDictionary * tempDic = [dataModelArr mj_keyValues];
+//
+// NSString * tempStr = [Global convertToJsonData:tempDic];
myTimeInterval = [UserDefault stringForKey:@"refresh_frequency"];
is_open_upload = [UserDefault stringForKey:@"is_open_upload"];
@@ -1154,24 +1175,31 @@
-(void)data_upload
{
+ // ������������������������������
+ if ([dataModelArr count] == 0 )
+ return;
+
//[UserDefault stringForKey:@"user_id"]
NSString *path = [[NSString alloc] initWithFormat:DATA_UPLOAD];
UploadModel *model = [[UploadModel alloc] init];
+ model.data = [[UploadData alloc] init];
//['refresh_frequency', 'video', 'is_open_upload']
//[param setValue:[UserDefault stringForKey:@"user_id"] forKey:@"user_id"];
address = @"������������";
- model.lat = [NSString stringWithFormat:@"%lf",latitude];
- model.lon = [NSString stringWithFormat:@"%lf",longitude];
- model.userid = [UserDefault stringForKey:@"user_id"];
- model.address = address;
- model.data = [[NSMutableArray alloc] init];
- [model.data addObjectsFromArray:dataModelArr];
+ model.data.lat = [NSString stringWithFormat:@"%lf",latitude];
+ model.data.lon = [NSString stringWithFormat:@"%lf",longitude];
+ model.data.userid = [UserDefault stringForKey:@"user_id"];
+ model.data.address = address;
+ model.data.data = [[NSMutableArray alloc] init];
+ [model.data.data addObjectsFromArray:dataModelArr];
+
+ //NSString * tempString = [Global convertToJsonData:model.toDic];
MPWeakSelf(self);
- [NetworkSingleton networkingGetMethod:model.toDic urlName:path success:^(id responseBody)
+ [NetworkSingleton networkingPostMethod:model.toDic urlName:path success:^(id responseBody)
{
MPStrongSelf(self);
BaseResModel * resModel = [Global toBaseModel:responseBody];
--
Gitblit v1.8.0