Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
万
万科
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
张杰
万科
Commits
44ccd056
Commit
44ccd056
authored
9 years ago
by
Achilles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 客流改为查昨天的 2.标题改为昨日客流 3.以前取当前版本号有问题(取成build version了)。
parent
412c64a9
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
20 additions
and
20 deletions
+20
-20
project.pbxproj
vanke.xcodeproj/project.pbxproj
+2
-2
Info.plist
vanke/Info.plist
+1
-1
VankeProjectSummaryModel.m
vanke/model/VankeProjectSummaryModel.m
+1
-1
VankeUtil.h
vanke/util/VankeUtil.h
+2
-2
VankeUtil.m
vanke/util/VankeUtil.m
+6
-6
VankeFloorListBoardCell_iPhone.xml
...e/templates/floor-list/VankeFloorListBoardCell_iPhone.xml
+1
-1
VankeMainBoard_iPhone.m
vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m
+6
-6
VankeServiceDashBoard_iPhone.m
...view_iPhone/templates/main/VankeServiceDashBoard_iPhone.m
+1
-1
No files found.
vanke.xcodeproj/project.pbxproj
View file @
44ccd056
...
...
@@ -5032,7 +5032,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
COPY_PHASE_STRIP
=
NO
;
CURRENT_PROJECT_VERSION
=
5
;
CURRENT_PROJECT_VERSION
=
22
;
DEBUG_INFORMATION_FORMAT
=
"dwarf-with-dsym"
;
ENABLE_NS_ASSERTIONS
=
NO
;
ENABLE_STRICT_OBJC_MSGSEND
=
YES
;
...
...
@@ -5073,7 +5073,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
COPY_PHASE_STRIP
=
NO
;
CURRENT_PROJECT_VERSION
=
5
;
CURRENT_PROJECT_VERSION
=
22
;
DEBUG_INFORMATION_FORMAT
=
dwarf
;
ENABLE_STRICT_OBJC_MSGSEND
=
YES
;
ENABLE_TESTABILITY
=
YES
;
...
...
This diff is collapsed.
Click to expand it.
vanke/Info.plist
View file @
44ccd056
...
...
@@ -21,7 +21,7 @@
<
k
e
y
>
CFBundleSignature
<
/k
e
y
>
<
string
>
????
<
/string
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
<
string
>
5
<
/string
>
<
string
>
22
<
/string
>
<
k
e
y
>
LSRequiresIPhoneOS
<
/k
e
y
>
<
tru
e
/
>
<
k
e
y
>
NSAppTransportSecurity
<
/k
e
y
>
...
...
This diff is collapsed.
Click to expand it.
vanke/model/VankeProjectSummaryModel.m
View file @
44ccd056
...
...
@@ -37,7 +37,7 @@
_salesDate
=
[
self
yesterday
:
df
];
}
if
([
VankeUtil
isBlankString
:
self
.
passengerDate
])
{
_passengerDate
=
[
self
to
day
:
df
];
_passengerDate
=
[
self
yester
day
:
df
];
}
if
([
VankeUtil
isBlankString
:
self
.
trafficDate
])
{
_trafficDate
=
[
self
today
:
df
];
...
...
This diff is collapsed.
Click to expand it.
vanke/util/VankeUtil.h
View file @
44ccd056
...
...
@@ -58,12 +58,12 @@ AS_SINGLETON( VankeUtil )
@property
(
nonatomic
,
assign
)
NSInteger
major
;
// 主版本
@property
(
nonatomic
,
assign
)
NSInteger
minor
;
// 小版本
@property
(
nonatomic
,
assign
)
NSInteger
build
;
// 编译
版本号
@property
(
nonatomic
,
assign
)
NSInteger
revision
;
// 修正
版本号
/**
* 构造函数
*
* @param version 版本号字符串,格式:major.minor.
build
,如: 1.0.1
* @param version 版本号字符串,格式:major.minor.
revision
,如: 1.0.1
*/
+
(
instancetype
)
initWithVersion
:
(
NSString
*
)
version
;
...
...
This diff is collapsed.
Click to expand it.
vanke/util/VankeUtil.m
View file @
44ccd056
...
...
@@ -16,13 +16,13 @@
@synthesize
major
=
_major
;
@synthesize
minor
=
_minor
;
@synthesize
build
=
_build
;
@synthesize
revision
=
_revision
;
+
(
instancetype
)
initWithVersion
:
(
NSString
*
)
version
{
VersionNumber
*
instance
=
[
VersionNumber
alloc
];
instance
.
major
=
0
;
instance
.
minor
=
0
;
instance
.
build
=
0
;
instance
.
revision
=
0
;
NSArray
*
ary
=
[
version
componentsSeparatedByString
:
@"."
];
if
(
nil
!=
ary
)
{
...
...
@@ -36,7 +36,7 @@
}
if
(
len
>
2
)
{
instance
.
build
=
[[
ary
objectAtIndex
:
2
]
intValue
];
instance
.
revision
=
[[
ary
objectAtIndex
:
2
]
intValue
];
}
}
return
instance
;
...
...
@@ -57,11 +57,11 @@
return
diff
;
}
return
_
build
-
version
.
build
;
return
_
revision
-
version
.
revision
;
}
-
(
NSString
*
)
toString
{
return
[
NSString
stringWithFormat
:
@"%ld.%ld.%ld"
,
_major
,
_minor
,
_
build
];
return
[
NSString
stringWithFormat
:
@"%ld.%ld.%ld"
,
_major
,
_minor
,
_
revision
];
}
@end
...
...
@@ -234,7 +234,7 @@ DEF_SINGLETON(VankeUtil)
+
(
VersionNumber
*
)
getCurrentVersion
{
NSString
*
path
=
[[
NSBundle
mainBundle
]
pathForResource
:
@"Info"
ofType
:
@"plist"
];
NSDictionary
*
content
=
[
NSDictionary
dictionaryWithContentsOfFile
:
path
];
NSString
*
version
=
[
content
valueForKey
:
@"CFBundle
Version
"
];
NSString
*
version
=
[
content
valueForKey
:
@"CFBundle
ShortVersionString
"
];
return
[
VersionNumber
initWithVersion
:
version
];
}
...
...
This diff is collapsed.
Click to expand it.
vanke/view_iPhone/templates/floor-list/VankeFloorListBoardCell_iPhone.xml
View file @
44ccd056
...
...
@@ -30,7 +30,7 @@
</linear>
<linear
orientation=
"h"
class=
"row flow-wrapper"
>
<label
class=
"lbl"
>
客流:
</label>
<label
class=
"lbl"
>
昨日
客流:
</label>
<label
id=
"lblPassengerFlow"
class=
"value"
></label>
<label
class=
"unit"
>
人
</label>
</linear>
...
...
This diff is collapsed.
Click to expand it.
vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m
View file @
44ccd056
...
...
@@ -146,7 +146,7 @@ ON_SIGNAL3( VankeServiceSaleCell_iPhone, mask, signal ) {
ON_SIGNAL3
(
VankeServiceBoardCell_iPhone
,
mask
,
signal
)
{
VankeServiceBoardCell_iPhone
*
cell
=
(
VankeServiceBoardCell_iPhone
*
)
signal
.
sourceCell
;
if
([
@"
当前
客流"
eq
:[
cell
name
]])
{
if
([
@"
昨日
客流"
eq
:[
cell
name
]])
{
[[
VankeAppBoard_iPhone
sharedInstance
]
hideMenu
];
[
self
showListView
:
CELL_TYPE_PASSENGER
];
}
else
{
...
...
@@ -256,11 +256,11 @@ ON_SIGNAL3(VankeProjectSummaryModel, RELOADED, signal) {
[
self
.
stack
pushBoard
:
board
animated
:
YES
];
}
-
(
NSString
*
)
today
{
NSDateFormatter
*
df
=
[[
NSDateFormatter
alloc
]
init
];
[
df
setDateFormat
:
@"yyyy-MM-dd"
];
return
[
df
stringFromDate
:[
NSDate
date
]];
}
//
-(NSString*) today {
//
NSDateFormatter *df = [[NSDateFormatter alloc] init];
//
[df setDateFormat:@"yyyy-MM-dd"];
//
return [df stringFromDate:[NSDate date]];
//
}
#pragma VankeMainBoard_iPhone
...
...
This diff is collapsed.
Click to expand it.
vanke/view_iPhone/templates/main/VankeServiceDashBoard_iPhone.m
View file @
44ccd056
...
...
@@ -59,7 +59,7 @@ DEF_OUTLET( VankeServiceBoardCell_iPhone, complaint );
-
(
void
)
load
{
self
.
salesInfo
.
imgRightBg
.
backgroundColor
=
[
UIColor
colorWithRed
:
237
/
255
.
0
green
:
27
/
255
.
0
blue
:
35
/
255
.
0
alpha
:
1
];
[
self
.
passenger
loadDefaults
:
@"people.png"
title
:
@"
当前
客流"
bgColor
:
[
UIColor
colorWithRed
:
0
green
:
195
/
255
.
0
blue
:
230
/
255
.
0
alpha
:
1
]
unit
:
@"人"
defValue
:
[
NSNumber
numberWithInt
:
0
]];
[
self
.
passenger
loadDefaults
:
@"people.png"
title
:
@"
昨日
客流"
bgColor
:
[
UIColor
colorWithRed
:
0
green
:
195
/
255
.
0
blue
:
230
/
255
.
0
alpha
:
1
]
unit
:
@"人"
defValue
:
[
NSNumber
numberWithInt
:
0
]];
[
self
.
traffic
loadDefaults
:
@"car.png"
title
:
@"车流"
bgColor
:
[
UIColor
colorWithRed
:
79
/
255
.
0
green
:
143
/
255
.
0
blue
:
248
/
255
.
0
alpha
:
1
]
unit
:
@"次"
defValue
:
[
NSNumber
numberWithInt
:
0
]];
[
self
.
energy
loadDefaults
:
@"energy.png"
title
:
@"坪效"
bgColor
:
[
UIColor
colorWithRed
:
149
/
255
.
0
green
:
200
/
255
.
0
blue
:
8
/
255
.
0
alpha
:
1
]
unit
:
@"元"
defValue
:
[
NSNumber
numberWithInt
:
0
]];
[
self
.
complaint
loadDefaults
:
@"complaint.png"
title
:
@"WIFI登录数"
bgColor
:
[
UIColor
colorWithRed
:
252
/
255
.
0
green
:
67
/
255
.
0
blue
:
62
/
255
.
0
alpha
:
1
]
unit
:
@"次"
defValue
:
[
NSNumber
numberWithInt
:
0
]];
...
...
This diff is collapsed.
Click to expand it.
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