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/检测/View/DetailItemCell.m | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git "a/screendisplay/screendisplay/Classes/\346\243\200\346\265\213/View/DetailItemCell.m" "b/screendisplay/screendisplay/Classes/\346\243\200\346\265\213/View/DetailItemCell.m"
index 82961ea..b130042 100644
--- "a/screendisplay/screendisplay/Classes/\346\243\200\346\265\213/View/DetailItemCell.m"
+++ "b/screendisplay/screendisplay/Classes/\346\243\200\346\265\213/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;
}
--
Gitblit v1.8.0