From 44ccd0568caf903d0832090af92751ce9081d7ce Mon Sep 17 00:00:00 2001
From: Achilles <wlz.debenson@gmail.com>
Date: Fri, 5 Feb 2016 20:36:34 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=AE=A2=E6=B5=81=E6=94=B9=E4=B8=BA?=
=?UTF-8?q?=E6=9F=A5=E6=98=A8=E5=A4=A9=E7=9A=84=202.=E6=A0=87=E9=A2=98?=
=?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=98=A8=E6=97=A5=E5=AE=A2=E6=B5=81=20=203.?=
=?UTF-8?q?=E4=BB=A5=E5=89=8D=E5=8F=96=E5=BD=93=E5=89=8D=E7=89=88=E6=9C=AC?=
=?UTF-8?q?=E5=8F=B7=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=88=E5=8F=96=E6=88=90?=
=?UTF-8?q?build=20version=E4=BA=86=EF=BC=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
vanke.xcodeproj/project.pbxproj | 4 ++--
vanke/Info.plist | 2 +-
vanke/model/VankeProjectSummaryModel.m | 2 +-
vanke/util/VankeUtil.h | 4 ++--
vanke/util/VankeUtil.m | 12 ++++++------
.../floor-list/VankeFloorListBoardCell_iPhone.xml | 2 +-
.../templates/main/VankeMainBoard_iPhone.m | 12 ++++++------
.../templates/main/VankeServiceDashBoard_iPhone.m | 2 +-
8 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/vanke.xcodeproj/project.pbxproj b/vanke.xcodeproj/project.pbxproj
index e4a2342..a118dae 100644
--- a/vanke.xcodeproj/project.pbxproj
+++ b/vanke.xcodeproj/project.pbxproj
@@ -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;
diff --git a/vanke/Info.plist b/vanke/Info.plist
index f813405..0c66d4b 100755
--- a/vanke/Info.plist
+++ b/vanke/Info.plist
@@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>5</string>
+ <string>22</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
diff --git a/vanke/model/VankeProjectSummaryModel.m b/vanke/model/VankeProjectSummaryModel.m
index a3e904e..8d2b26a 100755
--- a/vanke/model/VankeProjectSummaryModel.m
+++ b/vanke/model/VankeProjectSummaryModel.m
@@ -37,7 +37,7 @@
_salesDate = [self yesterday:df];
}
if ([VankeUtil isBlankString:self.passengerDate]) {
- _passengerDate = [self today:df];
+ _passengerDate = [self yesterday:df];
}
if ([VankeUtil isBlankString:self.trafficDate]) {
_trafficDate = [self today:df];
diff --git a/vanke/util/VankeUtil.h b/vanke/util/VankeUtil.h
index 107e715..6beac9a 100755
--- a/vanke/util/VankeUtil.h
+++ b/vanke/util/VankeUtil.h
@@ -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;
diff --git a/vanke/util/VankeUtil.m b/vanke/util/VankeUtil.m
index e7ccf60..9325ef5 100755
--- a/vanke/util/VankeUtil.m
+++ b/vanke/util/VankeUtil.m
@@ -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:@"CFBundleVersion"];
+ NSString *version = [content valueForKey:@"CFBundleShortVersionString"];
return [VersionNumber initWithVersion:version];
}
diff --git a/vanke/view_iPhone/templates/floor-list/VankeFloorListBoardCell_iPhone.xml b/vanke/view_iPhone/templates/floor-list/VankeFloorListBoardCell_iPhone.xml
index a8d7edf..a9e2b87 100755
--- a/vanke/view_iPhone/templates/floor-list/VankeFloorListBoardCell_iPhone.xml
+++ b/vanke/view_iPhone/templates/floor-list/VankeFloorListBoardCell_iPhone.xml
@@ -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>
diff --git a/vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m b/vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m
index 2ad103f..15a3a48 100755
--- a/vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m
+++ b/vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m
@@ -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
diff --git a/vanke/view_iPhone/templates/main/VankeServiceDashBoard_iPhone.m b/vanke/view_iPhone/templates/main/VankeServiceDashBoard_iPhone.m
index d40447b..530dba9 100644
--- a/vanke/view_iPhone/templates/main/VankeServiceDashBoard_iPhone.m
+++ b/vanke/view_iPhone/templates/main/VankeServiceDashBoard_iPhone.m
@@ -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]];
--
2.18.1