Commit 44ccd056 authored by Achilles's avatar Achilles

1. 客流改为查昨天的 2.标题改为昨日客流 3.以前取当前版本号有问题(取成build version了)。

parent 412c64a9
...@@ -5032,7 +5032,7 @@ ...@@ -5032,7 +5032,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 5; CURRENT_PROJECT_VERSION = 22;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO; ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
...@@ -5073,7 +5073,7 @@ ...@@ -5073,7 +5073,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 5; CURRENT_PROJECT_VERSION = 22;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>5</string> <string>22</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
<true/> <true/>
<key>NSAppTransportSecurity</key> <key>NSAppTransportSecurity</key>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
_salesDate = [self yesterday:df]; _salesDate = [self yesterday:df];
} }
if ([VankeUtil isBlankString:self.passengerDate]) { if ([VankeUtil isBlankString:self.passengerDate]) {
_passengerDate = [self today:df]; _passengerDate = [self yesterday:df];
} }
if ([VankeUtil isBlankString:self.trafficDate]) { if ([VankeUtil isBlankString:self.trafficDate]) {
_trafficDate = [self today:df]; _trafficDate = [self today:df];
......
...@@ -58,12 +58,12 @@ AS_SINGLETON( VankeUtil ) ...@@ -58,12 +58,12 @@ AS_SINGLETON( VankeUtil )
@property (nonatomic, assign) NSInteger major; // 主版本 @property (nonatomic, assign) NSInteger major; // 主版本
@property (nonatomic, assign) NSInteger minor; // 小版本 @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; +(instancetype) initWithVersion: (NSString*) version;
......
...@@ -16,13 +16,13 @@ ...@@ -16,13 +16,13 @@
@synthesize major = _major; @synthesize major = _major;
@synthesize minor = _minor; @synthesize minor = _minor;
@synthesize build = _build; @synthesize revision = _revision;
+(instancetype) initWithVersion: (NSString*) version { +(instancetype) initWithVersion: (NSString*) version {
VersionNumber *instance = [VersionNumber alloc]; VersionNumber *instance = [VersionNumber alloc];
instance.major = 0; instance.major = 0;
instance.minor = 0; instance.minor = 0;
instance.build = 0; instance.revision = 0;
NSArray *ary = [version componentsSeparatedByString:@"."]; NSArray *ary = [version componentsSeparatedByString:@"."];
if (nil != ary) { if (nil != ary) {
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
} }
if (len > 2) { if (len > 2) {
instance.build = [[ary objectAtIndex:2] intValue]; instance.revision = [[ary objectAtIndex:2] intValue];
} }
} }
return instance; return instance;
...@@ -57,11 +57,11 @@ ...@@ -57,11 +57,11 @@
return diff; return diff;
} }
return _build - version.build; return _revision - version.revision;
} }
-(NSString*) toString { -(NSString*) toString {
return [NSString stringWithFormat:@"%ld.%ld.%ld", _major, _minor, _build]; return [NSString stringWithFormat:@"%ld.%ld.%ld", _major, _minor, _revision];
} }
@end @end
...@@ -234,7 +234,7 @@ DEF_SINGLETON(VankeUtil) ...@@ -234,7 +234,7 @@ DEF_SINGLETON(VankeUtil)
+ (VersionNumber*) getCurrentVersion { + (VersionNumber*) getCurrentVersion {
NSString *path = [[NSBundle mainBundle]pathForResource:@"Info" ofType:@"plist"]; NSString *path = [[NSBundle mainBundle]pathForResource:@"Info" ofType:@"plist"];
NSDictionary* content =[NSDictionary dictionaryWithContentsOfFile:path]; NSDictionary* content =[NSDictionary dictionaryWithContentsOfFile:path];
NSString *version = [content valueForKey:@"CFBundleVersion"]; NSString *version = [content valueForKey:@"CFBundleShortVersionString"];
return [VersionNumber initWithVersion:version]; return [VersionNumber initWithVersion:version];
} }
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</linear> </linear>
<linear orientation="h" class="row flow-wrapper"> <linear orientation="h" class="row flow-wrapper">
<label class="lbl">客流:</label> <label class="lbl">昨日客流:</label>
<label id="lblPassengerFlow" class="value"></label> <label id="lblPassengerFlow" class="value"></label>
<label class="unit"></label> <label class="unit"></label>
</linear> </linear>
......
...@@ -146,7 +146,7 @@ ON_SIGNAL3( VankeServiceSaleCell_iPhone, mask, signal ) { ...@@ -146,7 +146,7 @@ ON_SIGNAL3( VankeServiceSaleCell_iPhone, mask, signal ) {
ON_SIGNAL3(VankeServiceBoardCell_iPhone, mask, signal) { ON_SIGNAL3(VankeServiceBoardCell_iPhone, mask, signal) {
VankeServiceBoardCell_iPhone *cell = (VankeServiceBoardCell_iPhone *)signal.sourceCell; VankeServiceBoardCell_iPhone *cell = (VankeServiceBoardCell_iPhone *)signal.sourceCell;
if ([@"当前客流" eq:[cell name]]) { if ([@"昨日客流" eq:[cell name]]) {
[[VankeAppBoard_iPhone sharedInstance] hideMenu]; [[VankeAppBoard_iPhone sharedInstance] hideMenu];
[self showListView: CELL_TYPE_PASSENGER]; [self showListView: CELL_TYPE_PASSENGER];
} else { } else {
...@@ -256,11 +256,11 @@ ON_SIGNAL3(VankeProjectSummaryModel, RELOADED, signal) { ...@@ -256,11 +256,11 @@ ON_SIGNAL3(VankeProjectSummaryModel, RELOADED, signal) {
[self.stack pushBoard:board animated:YES]; [self.stack pushBoard:board animated:YES];
} }
-(NSString*) today { //-(NSString*) today {
NSDateFormatter *df = [[NSDateFormatter alloc] init]; // NSDateFormatter *df = [[NSDateFormatter alloc] init];
[df setDateFormat:@"yyyy-MM-dd"]; // [df setDateFormat:@"yyyy-MM-dd"];
return [df stringFromDate:[NSDate date]]; // return [df stringFromDate:[NSDate date]];
} //}
#pragma VankeMainBoard_iPhone #pragma VankeMainBoard_iPhone
......
...@@ -59,7 +59,7 @@ DEF_OUTLET( VankeServiceBoardCell_iPhone, complaint ); ...@@ -59,7 +59,7 @@ DEF_OUTLET( VankeServiceBoardCell_iPhone, complaint );
- (void)load - (void)load
{ {
self.salesInfo.imgRightBg.backgroundColor = [UIColor colorWithRed:237/255.0 green:27/255.0 blue:35/255.0 alpha:1]; 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.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.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]]; [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]];
......
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