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 | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 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" new file mode 100644 index 0000000..acb2502 --- /dev/null +++ "b/screendisplay/screendisplay/Classes/\346\243\200\346\265\213/Service/DetailService.m" @@ -0,0 +1,101 @@ +// +// DetailService.m +// screendisplay +// +// Created by ��������� on 2018/7/9. +// Copyright �� 2018��� ���������. All rights reserved. +// + +#import "DetailService.h" +#import "PPInterfacedConst.h" + +@implementation DetailService + +/** ������������������*/ +- (NSURLSessionTask *)getDetailListWithParameters:(id)parameters completion:(void(^)(NSString *desc,int code))completion{ + // ������������������������������������������������������URL + NSString *url = [NSString stringWithFormat:@"%@%@",kApiPrefix,kDetail]; + + return [self requestGETWithURL:url parameters:parameters success:^(id responseObject) + { + BaseResModel * resModel = [Global toBaseModel:responseObject]; + if(resModel.code == 1) + { + 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 + { + // ������������ + resModel.code = -5; + completion(@"���������������������������������!",resModel.code); + } + } + + // ���������������������������������������������������������������,���������������������������������������, ������������.... + completion(resModel.desc,resModel.code); + + } failure:^(NSError *error) { + // ������ + completion(error.localizedDescription,-1); + }]; +} + +- (NSMutableArray<DetailModel *> *)detailViewModels +{ + if(_detailViewModels == nil) + { + _detailViewModels = [NSMutableArray array]; + } + return _detailViewModels; +} + + +@end -- Gitblit v1.8.0