change

单军华

2018-07-19 83b9d5c682b21d88133f24da0f94dd56bd79e687

 screendisplay/screendisplay/Classes/??/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