From 21d3023a9b7b6aff68c1170e345951396b1c6cfd Mon Sep 17 00:00:00 2001
From: 单军华
Date: Tue, 31 Jul 2018 13:35:21 +0800
Subject: [PATCH] no message
---
screendisplay/screendisplay/Classes/检测/Service/DynamicService.m | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git "a/screendisplay/screendisplay/Classes/\346\243\200\346\265\213/Service/DynamicService.m" "b/screendisplay/screendisplay/Classes/\346\243\200\346\265\213/Service/DynamicService.m"
index 16f85b2..def4b6e 100644
--- "a/screendisplay/screendisplay/Classes/\346\243\200\346\265\213/Service/DynamicService.m"
+++ "b/screendisplay/screendisplay/Classes/\346\243\200\346\265\213/Service/DynamicService.m"
@@ -27,12 +27,41 @@
if (getCount > 1)
{
self.dynamicViewModels = [DynamicModel mj_objectArrayWithKeyValuesArray:resModel.content];
+ for (int i = 0; i < self.dynamicViewModels.count; i++) {
+ DynamicModel * dynamicViewModel = [self.dynamicViewModels objectAtIndex:i];
+ if([StringUtil isPureFloat:dynamicViewModel.value] && ![StringUtil isPureInt:dynamicViewModel.value])
+ {
+ dynamicViewModel.value = [NSString stringWithFormat:@"%.2f",[dynamicViewModel.value floatValue]];
+ }
+ }
}
else if(getCount == 1)
{
- self.dynamicViewModel = [DynamicModel mj_objectWithKeyValues:resModel.content];
-
- //[self.dynamicViewModels replaceObjectAtIndex:self.dynamicViewModels.count-1 withObject:model];
+ NSMutableArray<DynamicModel *> *dynamicTempViewModels = [DynamicModel mj_objectArrayWithKeyValuesArray:resModel.content];
+ if(self.dynamicViewModels.count > 0)
+ {
+// for (int i = 0; i < self.dynamicViewModels.count-1; i++)
+// {
+// if(self.dynamicViewModels.count-1 < i + 1) continue;
+// [self.dynamicViewModels exchangeObjectAtIndex:i withObjectAtIndex:i+1];
+// }
+ [self.dynamicViewModels removeObjectAtIndex:0];
+ if(dynamicTempViewModels.count==1)
+ {
+ DynamicModel * dynamicViewModel = [dynamicTempViewModels objectAtIndex:0];
+ if(!TWIsEmpty(dynamicViewModel))
+ {
+ if([StringUtil isPureFloat:dynamicViewModel.value]&& ![StringUtil isPureInt:dynamicViewModel.value])
+ {
+ dynamicViewModel.value = [NSString stringWithFormat:@"%.2f",[dynamicViewModel.value floatValue]];
+ }
+
+ [self.dynamicViewModels addObject:dynamicViewModel];
+ }
+ //[self.dynamicViewModels replaceObjectAtIndex:(self.dynamicViewModels.count-1) withObject:dynamicViewModel];
+ }
+
+ }
}
}
else
@@ -59,15 +88,6 @@
_dynamicViewModels = [NSMutableArray array];
}
return _dynamicViewModels;
-}
-
-- (DynamicModel *)dynamicViewModel
-{
- if(_dynamicViewModel == nil)
- {
- _dynamicViewModel = [DynamicModel new];
- }
- return _dynamicViewModel;
}
@end
--
Gitblit v1.8.0