修改密码bug

vanke/controller/VankeResponse.h

@@ -22,4 +22,6 @@
 
 -(BOOL) isOk;
 
+-(BOOL) isNotOk;
+
 @end

vanke/controller/VankeResponse.m

@@ -27,4 +27,8 @@
     return [@"1" eq: self.success];
 }
 
+-(BOOL) isNotOk {
+    return ![self isOk];
+}
+
 @end

vanke/framework/system/network/http/client/Bee_HTTPRequest.m

@@ -653,8 +653,8 @@ DEF_INT( STATE_REDIRECTED,	6 );
 			va_end( args );
 		}
 			
-		if ( [self.requestMethod is:@"GET"] )
-		{
+//		if ( [self.requestMethod is:@"GET"] )
+//		{
 			for ( NSString * key in inputParams.allKeys )
 			{
 				NSObject * value = [inputParams objectForKey:key];
@@ -679,16 +679,16 @@ DEF_INT( STATE_REDIRECTED,	6 );
 					[self setURL:newURL];	
 				}
 			}
-		}
-		else
-		{
-			for ( NSString * key in inputParams.allKeys )
-			{
-				NSObject * value = [inputParams objectForKey:key];
-				
-				[self setPostValue:[value asNSString] forKey:key];
-			}
-		}
+//		}
+//		else
+//		{
+//			for ( NSString * key in inputParams.allKeys )
+//			{
+//				NSObject * value = [inputParams objectForKey:key];
+//				
+//				[self setPostValue:[value asNSString] forKey:key];
+//			}
+//		}
 
 		return self;
 	};
@@ -726,8 +726,8 @@ DEF_INT( STATE_REDIRECTED,	6 );
             if ( nil == value )
                 break;
             
-            if ( [self.requestMethod is:@"GET"] )
-            {
+//            if ( [self.requestMethod is:@"GET"] )
+//            {
                 NSString * base = [self.url absoluteString];
                 NSString * params = [NSString queryStringFromKeyValues:key, value, nil];
                 NSString * query = self.url.query;
@@ -747,12 +747,12 @@ DEF_INT( STATE_REDIRECTED,	6 );
                 {
                     [self setURL:newURL];
                 }
-            }
-            
-            else
-            {
-                [self setPostValue:value forKey:key];
-            }
+//            }
+//            
+//            else
+//            {
+//                [self setPostValue:value forKey:key];
+//            }
             
         }
         

vanke/view_iPhone/templates/login/VankeLoginBoard_iPhone.m

@@ -14,8 +14,6 @@
 #import "VankeUtil.h"
 #import "VankeCommonModel.h"
 
-#define PWD_MASK @"                  "
-
 #pragma mark -
 
 @interface VankeLoginBoard_iPhone()
@@ -136,6 +134,18 @@ ON_SIGNAL3( VankeLoginBoard_iPhone, txtPwd, signal )
     }
 }
 
+ON_SIGNAL3( VankeLoginBoard_iPhone, HOLD_START, signal ) {
+    NSLog(@"long press start");
+}
+
+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];
     [self setLoginButtonEnabled: !disabled];

vanke/view_iPhone/templates/settings/ICRModifyPwdViewController.m

@@ -158,21 +158,23 @@ ON_LAYOUT_VIEWS( signal )
     @weakify(self);
     
     User *curUser = [[VankeCommonModel sharedInstance] currentUser];
-    Enterpirse *curEnt = [[VankeCommonModel sharedInstance] currentEnt];
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
     [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
     NSString *curTime = [dateFormatter stringFromDate:[NSDate date]];
     
     NSString *url = [NSString stringWithFormat:@"/user/change_password/%@", curUser.uuid];
-    NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
+    
+    NSDictionary *queryParam = [NSDictionary dictionaryWithObjectsAndKeys:
                           curTime, @"time",
-                          curUser.code, @"operatorId",
-                          curUser.name, @"operatorName",
-                          curEnt.uuid, @"enterprise",
-                          _m_oldPwdTextF.text, @"oldPassword",
-                          _m_newPwdTextF.text, @"newPassword",
+                          curUser.code, @"operId",
+                          curUser.name, @"operName",
+                          nil];
+    NSDictionary *postDict = [NSDictionary dictionaryWithObjectsAndKeys:
+                        [VankeUtil md5:_m_oldPwdTextF.text], @"oldPassword",
+                         [VankeUtil md5:_m_newPwdTextF.text], @"newPassword",
                           nil];
-    [api http_post:url].BODY(dict).TIMEOUT(10);
+    NSString *postData = [VankeUtil dictToJsonString: postDict];
+    [api http_post:url].PARAM(queryParam).BODY(postData).TIMEOUT(10);
     
     api.whenSucceed = ^{
         @normalize(api);
@@ -180,13 +182,19 @@ ON_LAYOUT_VIEWS( signal )
         [GEToast hideProgress];
         NSLog(@"response: %@", api.responseString);
         
-        UIAlertView *alert = [[UIAlertView alloc]initWithTitle:@""
-                                                      message:@"操作成功，请重新登录！"
-                                                     delegate:self
-                                            cancelButtonTitle:@"确定"
-                                            otherButtonTitles:nil];
-        alert.tag = ALERT_TAG;
-        [alert show];
+        VankeResponse *resp = [VankeResponse objectFromDictionary: api.responseJSONDictionary];
+        if (![resp isOk]) {
+            [self updateSubmitButtonForSending:NO];
+            [GEToast showWithText:nil == resp.message ? @"网络异常" : resp.message bottomOffset:60.0f duration:2.0f];
+        } else {
+            UIAlertView *alert = [[UIAlertView alloc]initWithTitle:@""
+                                                           message:@"操作成功，请重新登录！"
+                                                          delegate:self
+                                                 cancelButtonTitle:@"确定"
+                                                 otherButtonTitles:nil];
+            alert.tag = ALERT_TAG;
+            [alert show];
+        }
     };
     api.whenFailed = ^{
         @normalize(api);