Commit dfe8fd7b authored by Sandy's avatar Sandy

工程巡检闪退

parent f93cb58c
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
} }
- (UIColor *)stateColor { - (UIColor *)stateColor {
if (!_stateColor) {
switch (self.state) { switch (self.state) {
case kPatrolPlanStatusCreated: { case kPatrolPlanStatusCreated: {
_stateColor = GTO_RED_COLOR; _stateColor = GTO_RED_COLOR;
...@@ -42,7 +41,6 @@ ...@@ -42,7 +41,6 @@
_stateColor = GTO_GRAY_TINT_COLOR; _stateColor = GTO_GRAY_TINT_COLOR;
break; break;
} }
}
} }
return _stateColor; return _stateColor;
} }
......
...@@ -93,13 +93,15 @@ ...@@ -93,13 +93,15 @@
.origin.y = _m_processLabel.y, .origin.y = _m_processLabel.y,
.size.width = 120, .size.width = 120,
.size.height = lblH, .size.height = lblH,
}; [_m_processValueLabel sizeToFit]; };
[_m_processValueLabel sizeToFit];
_m_processFractionLabel.frame = (CGRect){ _m_processFractionLabel.frame = (CGRect){
.origin.x = SCREEN_SIZE.width - 100 - GTO_LEFT_PADDING, .origin.x = SCREEN_SIZE.width - 100 - GTO_LEFT_PADDING,
.origin.y = _m_processLabel.y, .origin.y = _m_processLabel.y,
.size.width = 100, .size.width = 100,
.size.height = lblH, .size.height = lblH,
}; [_m_processFractionLabel sizeToFit]; };
[_m_processFractionLabel sizeToFit];
CGRect rect = (CGRect){ CGRect rect = (CGRect){
.origin.x = _m_processLabel.x, .origin.x = _m_processLabel.x,
...@@ -122,7 +124,7 @@ ...@@ -122,7 +124,7 @@
self.m_planNameLabel.text = [NSString stringWithFormat:@"%@",patrolPlan.name]; self.m_planNameLabel.text = [NSString stringWithFormat:@"%@",patrolPlan.name];
NSString *begin = [patrolPlan.beginDate substringToIndex:11]; NSString *begin = [patrolPlan.beginDate substringToIndex:11];
NSString *end = [patrolPlan.endDate substringToIndex:11]; NSString *end = [patrolPlan.endDate substringToIndex:11];
self.m_planTimeLabel.text = [NSString stringWithFormat:@"计划时间: %@ ~ %@",begin ,end];//[NSString stringWithFormat:@"最后修改时间:%@ ",patrolPlan.lastModify_time];// self.m_planTimeLabel.text = [NSString stringWithFormat:@"计划时间: %@ ~ %@",begin ,end];//
self.m_processLabel.text = [NSString stringWithFormat:@"巡检总进度: "]; self.m_processLabel.text = [NSString stringWithFormat:@"巡检总进度: "];
self.m_planStateLabel.text = @"状态: "; self.m_planStateLabel.text = @"状态: ";
NSString *stateStr = [NSString stringWithFormat:@"%ld",patrolPlan.state]; NSString *stateStr = [NSString stringWithFormat:@"%ld",patrolPlan.state];
...@@ -141,11 +143,7 @@ ...@@ -141,11 +143,7 @@
} }
self.m_processFractionLabel.text = [NSString stringWithFormat:@"%ld/%ld(油站)",patrolPlan.finishedStoreNumber,patrolPlan.totalStoreNumber]; self.m_processFractionLabel.text = [NSString stringWithFormat:@"%ld/%ld(油站)",patrolPlan.finishedStoreNumber,patrolPlan.totalStoreNumber];
// self.m_processBarView = [[IBTUIView alloc]initWithFrame:self.m_processBarView.frame processBarFloat:_d_processLength processBarColor:GTO_BLUE_SHALLOW_TINT_COLOR viewBorderBarColor:GTO_GRAY_SHALLOW_TINT_COLOR];
// [self addSubview:_m_processBarView];
[self layoutSubviews]; [self layoutSubviews];
} }
@end @end
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
#define GTO_BLUE_TINT_COLOR HexColor(@"#226AAD") //17 topView #define GTO_BLUE_TINT_COLOR HexColor(@"#226AAD") //17 topView
#define GTO_BLUE_SHALLOW_TINT_COLOR HexColor(@"#71D2F4") // category 较浅的蓝色 #define GTO_BLUE_SHALLOW_TINT_COLOR HexColor(@"#71D2F4") // category 较浅的蓝色
#define GTO_BLUE_DEEP_COLOR HexColor(@"#005CA5") // 深蓝 #define GTO_BLUE_DEEP_COLOR HexColor(@"#005CA5") // 深蓝
#define GTO_RED_COLOR HexColor(@" #E6002E") //红色 #define GTO_RED_COLOR HexColor(@"#E6002E") //红色
#define GTO_GREEN_COLOR HexColor(@"#7FD18D") //红色 #define GTO_GREEN_COLOR HexColor(@"#7FD18D") //红色
#define GXF_ORIGIN_COLOR HexColor(@"f69100") //橙色 #define GXF_ORIGIN_COLOR HexColor(@"f69100") //橙色
#define GTO_BACKGROUND_GRAY_SHALLOW_COLOR RGBA(246,246,246,1) #define GTO_BACKGROUND_GRAY_SHALLOW_COLOR RGBA(246,246,246,1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment