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

Conflicts:
	vanke.xcodeproj/project.pbxproj

vanke.xcodeproj/project.pbxproj

@@ -4193,7 +4193,6 @@
 				C1D58B131BB1BC9200D297FE /* Frameworks */,
 				C1D58B141BB1BC9200D297FE /* Resources */,
 				5CBECAF0D12B43E974C62C13 /* Copy Pods Resources */,
-				C10990C61C62665B005B4319 /* Run Script */,
 			);
 			buildRules = (
 			);
@@ -4215,7 +4214,7 @@
 				TargetAttributes = {
 					C1D58B151BB1BC9200D297FE = {
 						CreatedOnToolsVersion = 7.0;
-						DevelopmentTeam = 2G3393EZPN;
+						DevelopmentTeam = W54V2VB863;
 					};
 				};
 			};
@@ -4479,20 +4478,6 @@
 			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 */
@@ -5032,7 +5017,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 23;
+				CURRENT_PROJECT_VERSION = 105;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -5073,7 +5058,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 23;
+				CURRENT_PROJECT_VERSION = 105;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -5107,8 +5092,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = NO;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = NO;
+<<<<<<< HEAD
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
+=======
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COMPRESS_PNG_FILES = NO;
+>>>>>>> 6993c6f471881a8dd9a4e875913b5122d815d98f
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
 				GCC_PREFIX_HEADER = vanke/vanke.pch;
 				HEADER_SEARCH_PATHS = (
@@ -5122,6 +5113,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "da8de50e-62c2-4312-8dda-7c81fb04858d";
 				TARGETED_DEVICE_FAMILY = 1;
+				VERSIONING_SYSTEM = "";
 			};
 			name = Release;
 		};
@@ -5132,8 +5124,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = NO;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = NO;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
+				COMPRESS_PNG_FILES = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
 				GCC_PREFIX_HEADER = vanke/vanke.pch;
 				HEADER_SEARCH_PATHS = (
@@ -5147,6 +5140,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "da8de50e-62c2-4312-8dda-7c81fb04858d";
 				TARGETED_DEVICE_FAMILY = 1;
+				VERSIONING_SYSTEM = "";
 			};
 			name = Debug;
 		};

vanke/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>23</string>
+	<string>104</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

vanke/model/VankeUserModel.h

@@ -27,4 +27,7 @@
 // 自动登录
 -(void) autoLogin;
 
+// 取消登录请求
+-(void) cancel;
+
 @end

vanke/model/VankeUserModel.m

@@ -64,9 +64,19 @@
         @normalize(api);
         @normalize(self);
         
+        [[VankeCommonModel sharedInstance] removeLoginInfo];
         self.serverResp = [LoginResponse initWith:NO message:nil == api.errorDesc? @"网络异常": api.errorDesc];
         [self sendUISignal:self.RELOADED];
     };
+    api.whenCancelled = ^{
+        @normalize(api);
+        @normalize(self);
+        
+        [[VankeCommonModel sharedInstance] removeLoginInfo];
+        self.serverResp = [LoginResponse initWith:NO message:nil == api.errorDesc? @"用户取消": api.errorDesc];
+        [self sendUISignal:self.RELOADED];
+    };
+
     [api send];
 }
 
@@ -90,4 +100,8 @@
     }
 }
 
+-(void) cancel {
+    [VankeUserLoginAPI cancel];
+}
+
 @end

vanke/view_iPhone/templates/floor-detail/VankeBusinessChartCell_iPhone.m

@@ -5,25 +5,25 @@
 #import "VankeBusinessChartCell_iPhone.h"
 
 #define CHART_DIAMETER 200
+#define COLOR_R 90
+#define COLOR_G 60
+#define COLOR_B 30
 
 #pragma mark -
 
 @implementation VankeBusinessChartCell_iPhone
 
 PNPieChart *chartPieChart;
-NSArray *chartColors;
 
 SUPPORT_AUTOMATIC_LAYOUT( YES )
 SUPPORT_RESOURCE_LOADING( YES )
 
 - (void)load
 {
-    [self initChartColors];
 }
 
 - (void)unload
 {
-    chartColors = nil;
     chartPieChart = nil;
 }
 
@@ -46,14 +46,13 @@ SUPPORT_RESOURCE_LOADING( YES )
     }
 }
 
-
 - (void)layoutDidFinish
 {
     [self drawPieChart];
 }
 
 - (void) drawPieChart {
-    chartPieChart = [[PNPieChart alloc] initWithFrame:CGRectMake((self.width - CHART_DIAMETER)/2.0, 0, CHART_DIAMETER, CHART_DIAMETER) items:[self getChartItems]];
+    chartPieChart = [[PNPieChart alloc] initWithFrame:CGRectMake((self.width - CHART_DIAMETER)/2.0 + 20, 0, CHART_DIAMETER, CHART_DIAMETER) items:[self getChartItems]];
     chartPieChart.descriptionTextColor = [UIColor blackColor];
     chartPieChart.descriptionTextFont  = [UIFont fontWithName:@"微软雅黑" size:12.0];
     chartPieChart.descriptionTextShadowColor = [UIColor clearColor];
@@ -74,22 +73,18 @@ SUPPORT_RESOURCE_LOADING( YES )
 
 -(NSArray*) getChartItems {
     ChartValue *data = self.data;
-    NSInteger colorLen = [chartColors count];
     for (NSInteger i = 0; i < [data.values count]; ++i) {
         PNPieChartDataItem *item = [data.values objectAtIndex:i];
-        item.color = [chartColors objectAtIndex:i % colorLen];
+        item.color = [self randomColor:i];
     }
-    //    [data.values enumerateObjectsUsingBlock:^(ProjectSaleVolume *obj, NSUInteger idx, BOOL * _Nonnull stop) {
-    //        UIColor *color = [chartColors objectAtIndex:idx % colorLen];
-    //        float itemValue = [obj.amount floatValue];
-    //        NSString *itemDesc = obj.dimensionValue;
-    //        [items addObject:[PNPieChartDataItem dataItemWithValue:itemValue color:color description:itemDesc]];
-    //    }];
     return data.values;
 }
 
--(void) initChartColors {
-    chartColors = @[PNYellow, PNBlue, PNTwitterColor, PNPinkDark, PNGreen, PNTitleColor,PNLightGreen, PNFreshGreen, PNDeepGreen, PNRed, PNMauve, PNBrown,  PNStarYellow, PNDarkBlue,  PNDeepGrey, PNPinkGrey, PNLightGrey, PNCleanGrey, PNDarkYellow, PNCloudWhite, PNLightBlue, PNBlack, PNiOSGreenColor];
+-(UIColor*) randomColor: (NSInteger) i {
+    CGFloat r = ((COLOR_R * i + 20) % 255)  / 255.0;
+    CGFloat g = ((COLOR_G * i + 180) % 255)  / 255.0;
+    CGFloat b = ((COLOR_B * i + 35) % 255)  / 255.0;
+    return [UIColor colorWithRed: r green:g blue:b alpha:1.0f];
 }
 
 @end

vanke/view_iPhone/templates/floor-detail/VankePassengerDetailBoard_iPhone.m

@@ -66,10 +66,10 @@ ON_CREATE_VIEWS( signal )
     
     self.list.whenReloading = ^
     {
-        NSInteger chartTotal = 0;
         PassengerFlowResponse *resp = [_passengerFlowModel getServerResp];
-        if (nil != resp) {
-            chartTotal = [resp dataCount];
+        NSInteger chartTotal = 0;
+        if (nil != resp && [resp dataCount] > 0) {
+            chartTotal = 1;
         }
         self.list.total = 1 + chartTotal;
         
@@ -80,8 +80,8 @@ ON_CREATE_VIEWS( signal )
         photo.order = 0;
         photo.size = CGSizeMake(0, 230);
         
-        for (int i = 0; i < chartTotal; ++i) {
-            BeeUIScrollItem *bizChart = self.list.items[i + 1];
+        if (chartTotal > 0) {
+            BeeUIScrollItem *bizChart = self.list.items[1];
             bizChart.clazz = [VankeBusinessChartCell_iPhone class];
             
             // 取值

vanke/view_iPhone/templates/login/VankeLoginBoard_iPhone.m

@@ -50,6 +50,7 @@ ON_CREATE_VIEWS( signal )
     self.navigationBarShown = NO;
     [self addLeftIconToTextField:_txtUserName icon: @"user_icon"];
     [self addLeftIconToTextField:_txtPwd icon:@"pwd_icon"];
+    self.view.holdable = YES;
 }
 
 -(void) addLeftIconToTextField: (BeeUITextField*) textField icon: (NSString*) icon {
@@ -114,6 +115,7 @@ ON_SIGNAL3( VankeLoginBoard_iPhone, btnLogin, signal )
     [GEToast showProgress:self.view];
     [_btnLogin setTitle:@"登录中..." forState:UIControlStateSelected];
     [_model login:[self getUserName] password:[self getPassword]];
+    [[[UIApplication sharedApplication] keyWindow] endEditing:YES]; // 隐藏键盘
 }
 
 ON_SIGNAL3( VankeLoginBoard_iPhone, txtUserName, signal )
@@ -134,17 +136,11 @@ ON_SIGNAL3( VankeLoginBoard_iPhone, txtPwd, signal )
     }
 }
 
-ON_SIGNAL3( VankeLoginBoard_iPhone, HOLD_START, signal ) {
+ON_SIGNAL3( UIView, HOLD_START, signal ) {
     NSLog(@"long press start");
+    [_model cancel];
 }
 
-ON_SIGNAL3( VankeLoginBoard_iPhone, HOLD_CANCEL, signal ) {
-    NSLog(@"long press cancel");
-}
-
-ON_SIGNAL3( VankeLoginBoard_iPhone, HOLD_STOP, signal ) {
-    NSLog(@"long press stop");
-}
 
 -(void) refreshLoginButtonStyle {
     BOOL disabled = [VankeUtil isBlankString:_txtPwd.text] || [VankeUtil isBlankString:_txtUserName.text];

vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m

@@ -53,8 +53,8 @@ ON_CREATE_VIEWS( signal )
     self.view.backgroundColor = [UIColor whiteColor];
 //    [self addLeftIconToTextField:_txtQuery icon:@"search"];
     [_weatherBoard reloadLocationAndWeather];
-    self.view.swipeDirection = UISwipeGestureRecognizerDirectionLeft | UISwipeGestureRecognizerDirectionRight;
     self.view.swipeble = YES;
+    self.view.swipeDirection = UISwipeGestureRecognizerDirectionLeft;
     
     //去掉搜索框背景
     float version = [[[ UIDevice currentDevice ] systemVersion ] floatValue ];
@@ -256,25 +256,14 @@ 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]];
-//}
-
 #pragma VankeMainBoard_iPhone
 
-ON_SIGNAL3( VankeMainBoard_iPhone, SWIPE_LEFT, signal )
-{
-    if (_curTopMenuIndex > 0) {
-        [self showTab:_curTopMenuIndex - 1];
-    }
-}
-
-ON_SIGNAL3( VankeMainBoard_iPhone, SWIPE_RIGHT, signal )
-{
+ON_SWIPE_LEFT( signal ) {
     if (_curTopMenuIndex < 2) {
         [self showTab:_curTopMenuIndex + 1];
+    } else {
+        _curTopMenuIndex = -1;
+        [self showTab:_curTopMenuIndex + 1];
     }
 }