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

Conflicts:
	XFFruit/Info.plist

Podfile.lock

@@ -64,4 +64,4 @@ SPEC CHECKSUMS:
   SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84
   SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
 
-COCOAPODS: 0.38.2
+COCOAPODS: 0.39.0

XFFruit.xcodeproj/project.pbxproj

@@ -2665,6 +2665,7 @@
 				C1F696001AB870B400F9F5DD /* Frameworks */,
 				C1F696011AB870B400F9F5DD /* Resources */,
 				1454647E6246AB3D8AAE6FF2 /* Copy Pods Resources */,
+				257FA5FADFB85E73662B5F98 /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -2789,6 +2790,21 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		257FA5FADFB85E73662B5F98 /* Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		2F15FB75DA97749DAA8CA872 /* Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -3389,7 +3405,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Debug;
@@ -3414,7 +3430,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Release;

XFFruit/ViewControllers/Login/ICRLoginViewController.m

@@ -95,15 +95,15 @@
     
     [self.view addSubview:_m_containerView];
     
-#if DEBUG
+//#if DEBUG
 //    self.m_containerView.m_cCodeTextF.text = @"A93jie957lK";
 //    self.m_containerView.m_userNameTextF.text = @"kevin";
 //    self.m_containerView.m_passwordTextF.text = @"aaa";
 
     //@"http://218.244.151.129:7580/cruiser-server/rest"
-    self.m_containerView.m_cCodeTextF.text = @"211534962";
-    self.m_containerView.m_userNameTextF.text = @"admin";
-    self.m_containerView.m_passwordTextF.text = @"thoradmin";
+//    self.m_containerView.m_cCodeTextF.text = @"211534962";
+//    self.m_containerView.m_userNameTextF.text = @"admin";
+//    self.m_containerView.m_passwordTextF.text = @"thoradmin";
     
     
 //@"http://122.224.171.126:7280/cruiser-server/rest"
@@ -117,10 +117,15 @@
 //    self.m_containerView.m_userNameTextF.text = @"admin";
 //    self.m_containerView.m_passwordTextF.text = @"thoradmin";
     
-    [self.m_containerView checkLoginEnable];
-#else
+    ICRUserUtil *userU = [ICRUserUtil sharedInstance];
     
-#endif
+    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;
+    [self.m_containerView checkLoginEnable];
+//#else
+//    
+//#endif
 }
 
 #pragma mark - Logic
@@ -145,6 +150,7 @@
     void(^succ)(id) = ^(id data) {
         ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
         userUtil.bAutoLogin = @( [_m_containerView isAutoLogin] );
+      
         [userUtil saveArchive];
         
         ICRAppViewControllerManager *mgr =