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

Conflicts:
	XFFruit/AppDelegate/ICRAppDelegate.m

XFFruit/AppDelegate/ICRAppDelegate.m

@@ -133,6 +133,7 @@
                 alertV.tag = 1002;
                 [alertV show];
             }
+
             
             
         }else{
@@ -140,8 +141,8 @@
             [self performSelector:@selector(scale_2) withObject:nil afterDelay:1.5f];
             
            
+
         }
- 
     }
 }
 -(void)scale_2

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];