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

Conflicts:
	XFFruit.xcodeproj/project.pbxproj

Podfile.lock

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

XFFruit.xcodeproj/project.pbxproj

@@ -2568,6 +2568,7 @@
 				C1F696001AB870B400F9F5DD /* Frameworks */,
 				C1F696011AB870B400F9F5DD /* Resources */,
 				1454647E6246AB3D8AAE6FF2 /* Copy Pods Resources */,
+				C30B9D53F34B4631A53EB1DA /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -2707,6 +2708,21 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
+		C30B9D53F34B4631A53EB1DA /* 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;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -3264,8 +3280,8 @@
 			baseConfigurationReference = 1B0B22845F5CD40B5CF655F2 /* Pods.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
+				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
 				INFOPLIST_FILE = XFFruit/Info.plist;
@@ -3277,7 +3293,8 @@
 					"$(PROJECT_DIR)/XFFruit/Vendors/JiGuang/lib",
 				);
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+
+				PROVISIONING_PROFILE = "5747a061-d994-4f1f-8eac-4b028fb34d89";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Debug;
@@ -3287,8 +3304,8 @@
 			baseConfigurationReference = 7DDFB1D460448C3B45118195 /* Pods.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
+				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
 				INFOPLIST_FILE = XFFruit/Info.plist;
@@ -3300,7 +3317,8 @@
 					"$(PROJECT_DIR)/XFFruit/Vendors/JiGuang/lib",
 				);
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+
+				PROVISIONING_PROFILE = "5747a061-d994-4f1f-8eac-4b028fb34d89";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Release;

XFFruit/Controllers/HTTPController/ICRHTTPController.m

@@ -520,7 +520,7 @@ acceptTypeJson:(BOOL)bAcceptJson
         }
         else {
             if (fail) {
-                fail( nil );
+                fail( responseObject[@"message"] );
             }
         }
     };

XFFruit/General/Views/ICRLoginContentView.m

@@ -77,6 +77,7 @@
 }
 
 + (UIView *)p_textFWithLeftImgView:(NSString *)nsLeftImgName
+                       palceHodler: (NSString *)placeHodler
                              textF:(UITextField * __autoreleasing *)textFPointer
 {
     UIView *v = [[UIView alloc] init];
@@ -112,6 +113,7 @@
     UITextField *txtF = [[UITextField alloc] initWithFrame:txtFBG.bounds];
     txtF.leftViewMode = UITextFieldViewModeAlways;
     txtF.leftView = labelContainer;
+    txtF.placeholder = placeHodler;
     [txtF autoresizingWithStrechFullSize];
     [v addSubview:txtF];
     
@@ -233,7 +235,7 @@
     //    [[self class] TextFWithLeftLabel:[[IBTCommon localizableString:@"CompanyCode"] stringByAppendingString:@":"]
     //                               textF:&txtF];
     self.m_cCodeView =
-    [[self class] p_textFWithLeftImgView:@"公司识别码" textF:&txtF];
+    [[self class] p_textFWithLeftImgView:@"公司识别码"  palceHodler:@"请输入公司认证码" textF:&txtF];
     self.m_cCodeTextF = txtF;
     [self addSubview:_m_cCodeView];
     
@@ -241,7 +243,7 @@
     //    [[self class] TextFWithLeftLabel:[[IBTCommon localizableString:@"User"] stringByAppendingString:@":"]
     //                               textF:&txtF];
     self.m_userNameView =
-    [[self class] p_textFWithLeftImgView:@"profile" textF:&txtF];
+    [[self class] p_textFWithLeftImgView:@"profile" palceHodler:@"请输入用户名"textF:&txtF];
     
     self.m_userNameTextF = txtF;
     [self addSubview:_m_userNameView];
@@ -250,7 +252,7 @@
     //    [[self class] TextFWithLeftLabel:[[IBTCommon localizableString:@"Password"] stringByAppendingString:@":"]
     //                               textF:&txtF];
     self.m_passwordView =
-    [[self class] p_textFWithLeftImgView:@"password" textF:&txtF];
+    [[self class] p_textFWithLeftImgView:@"password" palceHodler:@"请输入密码"textF:&txtF];
     
     self.m_passwordTextF = txtF;
     _m_passwordTextF.secureTextEntry = YES;

XFFruit/Images.xcassets/Survey/Contents.json

+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

XFFruit/Images.xcassets/Survey/add.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "add.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "add@2x.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file

XFFruit/ViewControllers/Login/ICRLoginViewController.m

@@ -186,7 +186,9 @@
     };
     
     void(^fail)(id) = ^(id data) {
-        [IBTLoadingView showTips:data];
+        CLog(@"error =%@",data);
+       // [IBTLoadingView showTips:data];//@"输入的信息不正确，请重新输入"
+        [IBTLoadingView showTextOnly: data inView:self.view];
     };
     ICRHTTPController *httpCtrl = [ICRHTTPController sharedController];
     [httpCtrl doLoginWithUserName:nsUserName