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

Conflicts:
	XFFruit.xcodeproj/project.pbxproj

XFFruit.xcodeproj/project.pbxproj

@@ -3229,7 +3229,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
+				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
@@ -3267,7 +3267,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
+				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
@@ -3292,6 +3292,7 @@
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/XFFruit/Vendors/JiGuang/lib",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.cntaiping.life.xffruit;
 				PRODUCT_NAME = XFFruit;
 				PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
@@ -3315,6 +3316,7 @@
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/XFFruit/Vendors/JiGuang/lib",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.cntaiping.life.xffruit;
 				PRODUCT_NAME = XFFruit;
 				PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
@@ -3339,7 +3341,7 @@
 				INFOPLIST_FILE = XFFruitTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = XFFruitTests;
-				PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
+				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
@@ -3359,7 +3361,7 @@
 				INFOPLIST_FILE = XFFruitTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = XFFruitTests;
-				PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
+				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};

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

@@ -2,13 +2,13 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "add.png"
+      "filename" : "add.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "add@2x.png"
+      "filename" : "add@2x.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",

XFFruit/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.gomore.xffruit</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

XFFruit/ViewControllers/ChooseViewController/ChooseCostViewController.m

@@ -34,7 +34,7 @@
         [IBTLoadingView showTips:data];
     };
     [IBTLoadingView showProgressLabel:@"正在加载..."];
-    [[ICRHTTPController sharedController] getAccounttitleWithPage_number:0 page_size:100 success:succ failure:fail];
+    [[ICRHTTPController sharedController] getAccounttitleWithPage_number:0 page_size:1000 success:succ failure:fail];
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     static NSString *cellID = @"MaskCell";

XFFruit/ViewControllers/ChooseViewController/ChooseProductUnitViewController.m

@@ -34,7 +34,7 @@
         [IBTLoadingView showTips:data];
     };
     [IBTLoadingView showProgressLabel:@"正在加载..."];
-    [[ICRHTTPController sharedController] getProductUnitWithPage_number:0 page_size:100 success:succ failure:fail];
+    [[ICRHTTPController sharedController] getProductUnitWithPage_number:0 page_size:1000 success:succ failure:fail];
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     static NSString *cellID = @"MaskCell";

XFFruit/ViewControllers/ChooseViewController/ChooseProductViewController.m

@@ -35,7 +35,7 @@
         [IBTLoadingView showTips:data];
     };
     [IBTLoadingView showProgressLabel:@"正在加载..."];
-    [[ICRHTTPController sharedController] getProductWithPage_number:0 page_size:100 success:succ failure:fail];
+    [[ICRHTTPController sharedController] getProductWithPage_number:0 page_size:1000 success:succ failure:fail];
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     static NSString *cellID = @"MaskCell";

XFFruit/ViewControllers/ChooseViewController/ChooseVendorViewController.m

@@ -43,7 +43,7 @@
         [IBTLoadingView showTips:data];
     };
     [IBTLoadingView showProgressLabel:@"正在加载..."];
-    [[ICRHTTPController sharedController] getVendorWithPage_number:0 page_size:100 success:succ failure:fail];
+    [[ICRHTTPController sharedController] getVendorWithPage_number:0 page_size:1000 success:succ failure:fail];
 }
 #pragma mark - 协议方法
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {

XFFruit/ViewControllers/ChooseViewController/ChooseWarehouseViewController.m

@@ -41,7 +41,7 @@
         
     };
     [IBTLoadingView showProgressLabel:@"正在加载..."];
-    [[ICRHTTPController sharedController] getWarehouseWithPage_number:0 page_size:100 success:succ failure:fail];
+    [[ICRHTTPController sharedController] getWarehouseWithPage_number:0 page_size:1000 success:succ failure:fail];
 }
 
 #pragma mark - 协议方法

XFFruit/ViewControllers/ChooseViewController/ChosePersonViewController.m

@@ -39,7 +39,7 @@
         [IBTLoadingView showTips:data];
     };
     [IBTLoadingView showProgressLabel:@"正在加载..."];
-    [[ICRHTTPController sharedController] getUserWithPage_number:0 page_size:100 success:succ failure:fail];
+    [[ICRHTTPController sharedController] getUserWithPage_number:0 page_size:1000 success:succ failure:fail];
 }
 #pragma mark -成功
 - (void)sureClick{

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

XFFruit/ViewControllers/Transfer/Controllers/ChooseTransportViewController.m

@@ -83,7 +83,7 @@
     }
     NSDictionary *dict = @{
                            @"state":TRANSPORT_STATE_RECEIVED,
-                           @"userCode":userUtil.userCode,
+                           @"userUuid":userUtil.userId,
                            @"billNumberLike":billNumberObject,
                            @"fetchParts":@"pdtDetails",
                            @"pageNumber":@(_currentPage),