登录成功后， 隐藏键盘。 登录界面响应长按事件，取消请求。 主界面响应左swipe事件。 右swipe事件还有问题。 去掉自动增加build版本号。

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;
@@ -5109,6 +5094,7 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COMPRESS_PNG_FILES = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
 				GCC_PREFIX_HEADER = vanke/vanke.pch;
 				HEADER_SEARCH_PATHS = (
@@ -5122,6 +5108,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				TARGETED_DEVICE_FAMILY = 1;
+				VERSIONING_SYSTEM = "";
 			};
 			name = Release;
 		};
@@ -5132,8 +5119,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 +5135,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				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/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];
     }
 }