Skip to content

万
万科
Commit ab253a85 authored by AvatarC's avatar AvatarC
Browse files
Options

Merge branch 'master' of http://121.42.32.57/root/vanke

parents 9b9b6e6b be242afd
master HEAD dev
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 24 deletions
vanke.xcodeproj/project.pbxproj 100755 → 100644
View file @ ab253a85
......@@ -4193,6 +4193,7 @@
C1D58B131BB1BC9200D297FE /* Frameworks */,
C1D58B141BB1BC9200D297FE /* Resources */,
5CBECAF0D12B43E974C62C13 /* Copy Pods Resources */,
C10990C61C62665B005B4319 /* Run Script */,
);
buildRules = (
);
......@@ -4478,6 +4479,20 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
showEnvVarsInLog = 0;
};
C10990C61C62665B005B4319 /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Run Script";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "xcrun agvtool next-version -all";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
......@@ -5017,6 +5032,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 23;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
......@@ -5034,6 +5050,7 @@
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
};
......@@ -5056,6 +5073,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 23;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
......@@ -5078,6 +5096,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
};
......
vanke/Base.lproj/LaunchScreen.xib
View file @ ab253a85
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
<objects>
......@@ -14,11 +14,9 @@
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="login_bg.png" translatesAutoresizingMaskIntoConstraints="NO" id="T3n-rV-MUb">
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
<animations/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Copyright (c) 2015年 万科. " textAlignment="center" lineBreakMode="tailTruncation" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D9f-bJ-RUy">
<rect key="frame" x="36" y="438" width="389" height="28"/>
<animations/>
<constraints>
<constraint firstAttribute="width" constant="500" id="5gY-rb-pwj" userLabel="width = 450"/>
</constraints>
......@@ -26,7 +24,6 @@
<nil key="highlightedColor"/>
</label>
</subviews>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="D9f-bJ-RUy" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leadingMargin" constant="30" id="Tfn-9w-HrA"/>
......
vanke/Info.plist
View file @ ab253a85
......@@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.9</string>
<string>1.0.10</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0.8</string>
<string>23</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
......
vanke/model/VankeProjectSummaryModel.m
View file @ ab253a85
......@@ -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];
......
vanke/util/VankeUtil.h
View file @ ab253a85
......@@ -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;
......
vanke/util/VankeUtil.m
View file @ ab253a85
......@@ -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];
}
......
vanke/view_iPhone/templates/floor-list/VankeFloorListBoardCell_iPhone.xml
View file @ ab253a85
......@@ -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>
......
vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m
View file @ ab253a85
......@@ -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
......
vanke/view_iPhone/templates/main/VankeServiceDashBoard_iPhone.m
View file @ ab253a85
......@@ -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]];
......
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