From 3e8437ae559487362fae3525beb79c534c213a51 Mon Sep 17 00:00:00 2001
From: 单军华
Date: Thu, 12 Jul 2018 13:44:34 +0800
Subject: [PATCH] bug修复和功能优化
---
screendisplay/screendisplay/Classes/检测/Service/DetailService.m | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git "a/screendisplay/screendisplay/Classes/\346\243\200\346\265\213/Service/DetailService.m" "b/screendisplay/screendisplay/Classes/\346\243\200\346\265\213/Service/DetailService.m"
index 8beeaa1..acb2502 100644
--- "a/screendisplay/screendisplay/Classes/\346\243\200\346\265\213/Service/DetailService.m"
+++ "b/screendisplay/screendisplay/Classes/\346\243\200\346\265\213/Service/DetailService.m"
@@ -24,7 +24,52 @@
if(!TWIsEmpty(resModel.content))
{
// ������������
+ [self.detailViewModels removeAllObjects];
self.detailViewModels = [DetailModel mj_objectArrayWithKeyValuesArray:resModel.content];
+ int hWarnIndex = -1;
+ int hE24Index = -1;
+ int hE23Index = -1;
+ for (int i = 0; i < self.detailViewModels.count; i++)
+ {
+ DetailModel * model = [self.detailViewModels objectAtIndex:i];
+ if([model.sensor_key isEqualToString:@"warn"])
+ {
+ hWarnIndex = i;
+ continue;
+ }
+ }
+
+ if(hWarnIndex>=0)
+ [self.detailViewModels removeObjectAtIndex:hWarnIndex];
+
+ for (int i = 0; i < self.detailViewModels.count; i++)
+ {
+ DetailModel * model = [self.detailViewModels objectAtIndex:i];
+
+ if([model.sensor_key isEqualToString:@"e23"])
+ {
+ hE23Index = i;
+ continue;
+ }
+ }
+
+ if(hE23Index>=0)
+ [self.detailViewModels removeObjectAtIndex:hE23Index];
+
+ for (int i = 0; i < self.detailViewModels.count; i++)
+ {
+ DetailModel * model = [self.detailViewModels objectAtIndex:i];
+
+ if([model.sensor_key isEqualToString:@"e24"])
+ {
+ hE24Index = i;
+ continue;
+ }
+ }
+
+ if(hE24Index>=0)
+ [self.detailViewModels removeObjectAtIndex:hE24Index];
+
}
else
{
--
Gitblit v1.8.0