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

Conflicts:
	XFFruit.xcodeproj/project.pbxproj

Podfile

@@ -8,6 +8,6 @@ pod 'SSKeychain', '~> 1.2.3'
 pod 'FMDB', '~> 2.5'
 pod 'Base64nl', '~> 1.2'
 pod 'Reveal-iOS-SDK', '~> 1.5.1'
-pod 'BaiduMapAPI', '~> 2.8.1’
+pod 'BaiduMapAPI', '~> 2.8.0’
 pod 'MJRefresh', '~> 2.2.0'
 pod 'IQKeyboardManager', '~> 3.2.3'

Podfile.lock

@@ -20,11 +20,14 @@ PODS:
   - AFNetworking/UIKit (2.5.4):
     - AFNetworking/NSURLConnection
     - AFNetworking/NSURLSession
-  - BaiduMapAPI (2.8.1):
-    - BaiduMapAPI/Default (= 2.8.1)
-  - BaiduMapAPI/Default (2.8.1):
-    - BaiduMapAPI/Universal
-  - BaiduMapAPI/Universal (2.8.1)
+  - BaiduMapAPI (2.8.0):
+    - BaiduMapAPI/All (= 2.8.0)
+  - BaiduMapAPI/All (2.8.0):
+    - BaiduMapAPI/Core
+    - BaiduMapAPI/Extend
+  - BaiduMapAPI/Core (2.8.0)
+  - BaiduMapAPI/Extend (2.8.0):
+    - BaiduMapAPI/Core
   - Base64nl (1.2)
   - FMDB (2.5):
     - FMDB/standard (= 2.5)
@@ -42,7 +45,7 @@ PODS:
 
 DEPENDENCIES:
   - AFNetworking (~> 2.5.4)
-  - BaiduMapAPI (~> 2.8.1)
+  - BaiduMapAPI (~> 2.8.0)
   - Base64nl (~> 1.2)
   - FMDB (~> 2.5)
   - IQKeyboardManager (~> 3.2.3)
@@ -54,7 +57,7 @@ DEPENDENCIES:
 
 SPEC CHECKSUMS:
   AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
-  BaiduMapAPI: 2d03e12a51d5c6c49ece555c6bdda8562635cc02
+  BaiduMapAPI: e066aa1e85f9fee77a1bc071afb67552852bb0fb
   Base64nl: a497bdcd1c01ea793d36b399016195a8713c0e95
   FMDB: 96e8f1bcc1329e269330f99770ad4285d9003e52
   IQKeyboardManager: 555b1231fefafb21b19278d7cca72986a27b748b
@@ -64,4 +67,4 @@ SPEC CHECKSUMS:
   SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84
   SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
 
-COCOAPODS: 0.39.0
+COCOAPODS: 0.38.2

XFFruit.xcodeproj/project.pbxproj

@@ -2568,7 +2568,6 @@
 				C1F696001AB870B400F9F5DD /* Frameworks */,
 				C1F696011AB870B400F9F5DD /* Resources */,
 				1454647E6246AB3D8AAE6FF2 /* Copy Pods Resources */,
-				DD0C5CA575D0001C5572EB89 /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -2708,21 +2707,6 @@
 			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;
 		};
-		DD0C5CA575D0001C5572EB89 /* 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 */
@@ -3229,7 +3213,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
@@ -3267,7 +3251,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
@@ -3339,7 +3323,7 @@
 				INFOPLIST_FILE = XFFruitTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = XFFruitTests;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
@@ -3359,7 +3343,7 @@
 				INFOPLIST_FILE = XFFruitTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = XFFruitTests;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};

XFFruit/AppDelegate/ICRAppDelegate.m

@@ -135,13 +135,20 @@
             }
 
             
+            
         }else{
             [IBTLoadingView showProgressLabel:@"暂无新版本"];
+            [self performSelector:@selector(scale_2) withObject:nil afterDelay:1.5f];
             
-        }
            
+
+        }
     }
 }
+-(void)scale_2
+{
+  [IBTLoadingView hideHUDWithText:nil];
+}
 - (void) alertView:(UIAlertView *)alertView
 clickedButtonAtIndex:(NSInteger)buttonIndex {
     if (alertView.tag==1001) {

XFFruit/ViewControllers/Survey/controllers/SurveyDetailViewController.m

@@ -87,7 +87,9 @@ typedef enum : NSUInteger {
             NSString *message  = data[@"message"] ;
             if (success == 1) {
                 NSString *dataStr = data[@"data"];
-               NSString *urlStr = [NSString stringWithFormat:@"%@/DisplayChart?filename=%@",@"http://122.224.171.126:7280/cruiser-server",dataStr];
+                NSRange range = [HTTP_REST_API_BASE_URL rangeOfString:@"rest"];
+                NSString *serverURl = [HTTP_REST_API_BASE_URL substringToIndex:range.location];
+               NSString *urlStr = [NSString stringWithFormat:@"%@DisplayChart?filename=%@",serverURl,dataStr];
                 [_chartImageView sd_setImageWithURL:[NSURL URLWithString:urlStr]];
             }else{
                 [IBTLoadingView showTips:message];