单军华
2018-07-31 21d3023a9b7b6aff68c1170e345951396b1c6cfd
screendisplay/screendisplay/Classes/??/View/DetailItemCell.m
@@ -126,9 +126,28 @@
    self.UnitLabel.text = [NSString stringWithFormat:@"(%@)",detailViewModel.unit];
    if([StringUtil isPureFloat:detailViewModel.value] && ![StringUtil isPureInt:detailViewModel.value])
    {
        detailViewModel.value = [NSString stringWithFormat:@"%.2f",[detailViewModel.value floatValue]];
    }
    self.currentValueLabel.text = detailViewModel.value;
    CGFloat progress = (([detailViewModel.value floatValue]-[detailViewModel.lower floatValue])/([detailViewModel.upper floatValue] -[detailViewModel.lower floatValue]));
    //e17
    if([_detailViewModel.sensor_key isEqualToString:@"e17"])
    {
        _NameLabel.font = AdaptedFontSize(9);
    }
    else
    {
        _NameLabel.font = AdaptedFontSize(10);
    }
    CGFloat progress = 0.0;
    if([detailViewModel.upper floatValue] != 0)
    {
        progress = ([detailViewModel.value floatValue]/[detailViewModel.upper floatValue]);
    }
    
    self.pPregressView.progress = progress;
}