Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
T
total
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张杰
total
Commits
dfe8fd7b
Commit
dfe8fd7b
authored
Jan 06, 2017
by
Sandy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工程巡检闪退
parent
f93cb58c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
10 deletions
+6
-10
GTOPatrolPlan.m
total/GTOApp/Business/Patrol/Models/GTOPatrolPlan.m
+0
-2
GTOPatrolPlanCellContentView.m
...OApp/Business/Patrol/Views/GTOPatrolPlanCellContentView.m
+5
-7
GTOAppMacro.h
total/Macro/GTOAppMacro.h
+1
-1
No files found.
total/GTOApp/Business/Patrol/Models/GTOPatrolPlan.m
View file @
dfe8fd7b
...
...
@@ -20,7 +20,6 @@
}
-
(
UIColor
*
)
stateColor
{
if
(
!
_stateColor
)
{
switch
(
self
.
state
)
{
case
kPatrolPlanStatusCreated
:
{
_stateColor
=
GTO_RED_COLOR
;
...
...
@@ -43,7 +42,6 @@
break
;
}
}
}
return
_stateColor
;
}
#pragma mark - setter
...
...
total/GTOApp/Business/Patrol/Views/GTOPatrolPlanCellContentView.m
View file @
dfe8fd7b
...
...
@@ -93,13 +93,15 @@
.
origin
.
y
=
_m_processLabel
.
y
,
.
size
.
width
=
120
,
.
size
.
height
=
lblH
,
};
[
_m_processValueLabel
sizeToFit
];
};
[
_m_processValueLabel
sizeToFit
];
_m_processFractionLabel
.
frame
=
(
CGRect
){
.
origin
.
x
=
SCREEN_SIZE
.
width
-
100
-
GTO_LEFT_PADDING
,
.
origin
.
y
=
_m_processLabel
.
y
,
.
size
.
width
=
100
,
.
size
.
height
=
lblH
,
};
[
_m_processFractionLabel
sizeToFit
];
};
[
_m_processFractionLabel
sizeToFit
];
CGRect
rect
=
(
CGRect
){
.
origin
.
x
=
_m_processLabel
.
x
,
...
...
@@ -122,7 +124,7 @@
self
.
m_planNameLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@"
,
patrolPlan
.
name
];
NSString
*
begin
=
[
patrolPlan
.
beginDate
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_planStateLabel
.
text
=
@"状态: "
;
NSString
*
stateStr
=
[
NSString
stringWithFormat
:
@"%ld"
,
patrolPlan
.
state
];
...
...
@@ -141,10 +143,6 @@
}
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
];
}
...
...
total/Macro/GTOAppMacro.h
View file @
dfe8fd7b
...
...
@@ -106,7 +106,7 @@
#define GTO_BLUE_TINT_COLOR HexColor(@"#226AAD") //17 topView
#define GTO_BLUE_SHALLOW_TINT_COLOR HexColor(@"#71D2F4") // category 较浅的蓝色
#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 GXF_ORIGIN_COLOR HexColor(@"f69100") //橙色
#define GTO_BACKGROUND_GRAY_SHALLOW_COLOR RGBA(246,246,246,1)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment