Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001

XFFruit/Controllers/HTTPController/ICRHTTPController.m

@@ -513,6 +513,8 @@ acceptTypeJson:(BOOL)bAcceptJson
             userUtil.orgId = dictResult[ @"enterprise_uuid" ];
             userUtil.authenticode = dictResult[@"authenticode"];
             userUtil.permissions = dictResult[@"permissions"];
+            userUtil.password = nsPassword;
+            userUtil.isLogout = NO;
             [userUtil saveArchive];
             if (succ) {
                 succ( dictResult );
@@ -531,9 +533,9 @@ acceptTypeJson:(BOOL)bAcceptJson
             fail( error );
         }
     };
-    
+     // NSString *nsPassword = [self.m_containerView.m_passwordTextF.text uppercaseMD5String];
     NSDictionary *dictParametes =
-    @{ @"password" : nsPassword,
+    @{ @"password" : [nsPassword uppercaseMD5String],
        @"authenticode" : nsRegisterCode,
       };
     

XFFruit/Utilities/UserUtil/ICRUserUtil.h

@@ -36,6 +36,9 @@
 @property (copy, nonatomic) NSString *currentStoreID;  //
 @property (copy, nonatomic) NSString *uniqueID;  //
 
+//avatar add
+@property (assign, nonatomic) BOOL isLogout;
+
 + (instancetype)sharedInstance;
 
 - (BOOL)saveArchive;

XFFruit/ViewControllers/Login/ICRLoginViewController.m

@@ -121,7 +121,12 @@
     
     self.m_containerView.m_cCodeTextF.text = userU.registerCode; //*registerCode;  //企业认证码
     self.m_containerView.m_userNameTextF.text =userU.userName;
-    self.m_containerView.m_passwordTextF.text = userU.password;
+    if (userU.isLogout) {
+        //self.m_containerView.m_passwordTextF.text = userU.password;
+    } else {
+       self.m_containerView.m_passwordTextF.text = userU.password;
+    }
+
     [self.m_containerView checkLoginEnable];
 //#else
 //    
@@ -141,7 +146,8 @@
     [appDelegate comperVersion];
     NSString *nsRegisterCode = self.m_containerView.m_cCodeTextF.text;
     NSString *nsUserName = self.m_containerView.m_userNameTextF.text;
-    NSString *nsPassword = [self.m_containerView.m_passwordTextF.text uppercaseMD5String];
+    //NSString *nsPassword = [self.m_containerView.m_passwordTextF.text uppercaseMD5String];
+    NSString *nsPassword = self.m_containerView.m_passwordTextF.text;
 //        NSString *nsRegisterCode = @"211534962";
 //        NSString *nsUserName = @"admin";
 //        NSString *nsPassword = @"thoradmin";
@@ -150,7 +156,7 @@
     void(^succ)(id) = ^(id data) {
         ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
         userUtil.bAutoLogin = @( [_m_containerView isAutoLogin] );
-      
+
         [userUtil saveArchive];
         
         ICRAppViewControllerManager *mgr =

XFFruit/ViewControllers/System/ICRSystemViewController.m

@@ -139,6 +139,10 @@
     ICRAppViewControllerManager *mgr =
     [ICRAppViewControllerManager getAppViewControllerManager];
     [mgr doLogout];
+    
+    ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
+    userUtil.isLogout = YES;
+    [userUtil saveArchive];
 }
 
 - (void)onChangePassword:(__unused id)sender {