增加飞行模式弹框，题目增加序号

total.xcodeproj/project.pbxproj

@@ -131,6 +131,9 @@
 		2998EC691FCC0BCE007082B9 /* UIScrollView+MJExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 2998EC531FCC0BCD007082B9 /* UIScrollView+MJExtension.m */; };
 		2998EC6A1FCC0BCE007082B9 /* UIScrollView+MJRefresh.m in Sources */ = {isa = PBXBuildFile; fileRef = 2998EC551FCC0BCD007082B9 /* UIScrollView+MJRefresh.m */; };
 		2998EC6B1FCC0BCE007082B9 /* UIView+MJExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 2998EC571FCC0BCD007082B9 /* UIView+MJExtension.m */; };
+		29A8D99C200F5ABA001E865C /* AirplaneModeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A8D99A200F5AB9001E865C /* AirplaneModeViewController.m */; };
+		29A8D99F200F5AD2001E865C /* AirplaneModeTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A8D99E200F5AD2001E865C /* AirplaneModeTableViewCell.m */; };
+		29A8D9A3200F5C1B001E865C /* PatrolExamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A8D9A2200F5C1B001E865C /* PatrolExamViewController.m */; };
 		29AC60641D2A6ACE003B9675 /* ReceivedOilModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29AC60631D2A6ACE003B9675 /* ReceivedOilModel.m */; };
 		29B1C6DC1FCD315100EFC812 /* Patrol_PatrolInspectResult.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29B1C6DB1FCD315000EFC812 /* Patrol_PatrolInspectResult.storyboard */; };
 		29B1C6DE1FCD353A00EFC812 /* Patrol_Filter.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29B1C6DD1FCD353A00EFC812 /* Patrol_Filter.storyboard */; };
@@ -184,7 +187,6 @@
 		29F5C3DE1FCBAA4F0052CBF1 /* ZJPatrolDetail.m in Sources */ = {isa = PBXBuildFile; fileRef = 29F5C3B81FCBAA4F0052CBF1 /* ZJPatrolDetail.m */; };
 		29F5C3DF1FCBAA4F0052CBF1 /* ZJPatrolStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 29F5C3BA1FCBAA4F0052CBF1 /* ZJPatrolStore.m */; };
 		29F5C3E01FCBAA4F0052CBF1 /* PatrolAttachmentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29F5C3BD1FCBAA4F0052CBF1 /* PatrolAttachmentViewController.m */; };
-		29F5C3E11FCBAA4F0052CBF1 /* PatrolExamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29F5C3BF1FCBAA4F0052CBF1 /* PatrolExamViewController.m */; };
 		29F5C3E21FCBAA4F0052CBF1 /* PatrolStandardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29F5C3C11FCBAA4F0052CBF1 /* PatrolStandardViewController.m */; };
 		29F5C3E31FCBAA4F0052CBF1 /* PatrolStartAnswerConfirmVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 29F5C3C31FCBAA4F0052CBF1 /* PatrolStartAnswerConfirmVC.m */; };
 		29F5C3E41FCBAA4F0052CBF1 /* PatrolTaskViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29F5C3C51FCBAA4F0052CBF1 /* PatrolTaskViewController.m */; };
@@ -707,6 +709,11 @@
 		2998EC561FCC0BCD007082B9 /* UIView+MJExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+MJExtension.h"; sourceTree = "<group>"; };
 		2998EC571FCC0BCD007082B9 /* UIView+MJExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+MJExtension.m"; sourceTree = "<group>"; };
 		2998EC6C1FCCFE87007082B9 /* total.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = total.entitlements; path = total/total.entitlements; sourceTree = "<group>"; };
+		29A8D99A200F5AB9001E865C /* AirplaneModeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AirplaneModeViewController.m; sourceTree = "<group>"; };
+		29A8D99B200F5ABA001E865C /* AirplaneModeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AirplaneModeViewController.h; sourceTree = "<group>"; };
+		29A8D99D200F5AD2001E865C /* AirplaneModeTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AirplaneModeTableViewCell.h; sourceTree = "<group>"; };
+		29A8D99E200F5AD2001E865C /* AirplaneModeTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AirplaneModeTableViewCell.m; sourceTree = "<group>"; };
+		29A8D9A2200F5C1B001E865C /* PatrolExamViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PatrolExamViewController.m; sourceTree = "<group>"; };
 		29AC60621D2A6ACE003B9675 /* ReceivedOilModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReceivedOilModel.h; sourceTree = "<group>"; };
 		29AC60631D2A6ACE003B9675 /* ReceivedOilModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReceivedOilModel.m; sourceTree = "<group>"; };
 		29B1C6DB1FCD315000EFC812 /* Patrol_PatrolInspectResult.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Patrol_PatrolInspectResult.storyboard; sourceTree = "<group>"; };
@@ -806,7 +813,6 @@
 		29F5C3BC1FCBAA4F0052CBF1 /* PatrolAttachmentViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PatrolAttachmentViewController.h; sourceTree = "<group>"; };
 		29F5C3BD1FCBAA4F0052CBF1 /* PatrolAttachmentViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PatrolAttachmentViewController.m; sourceTree = "<group>"; };
 		29F5C3BE1FCBAA4F0052CBF1 /* PatrolExamViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PatrolExamViewController.h; sourceTree = "<group>"; };
-		29F5C3BF1FCBAA4F0052CBF1 /* PatrolExamViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PatrolExamViewController.m; sourceTree = "<group>"; };
 		29F5C3C01FCBAA4F0052CBF1 /* PatrolStandardViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PatrolStandardViewController.h; sourceTree = "<group>"; };
 		29F5C3C11FCBAA4F0052CBF1 /* PatrolStandardViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PatrolStandardViewController.m; sourceTree = "<group>"; };
 		29F5C3C21FCBAA4F0052CBF1 /* PatrolStartAnswerConfirmVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PatrolStartAnswerConfirmVC.h; sourceTree = "<group>"; };
@@ -2133,7 +2139,7 @@
 				29F5C3BC1FCBAA4F0052CBF1 /* PatrolAttachmentViewController.h */,
 				29F5C3BD1FCBAA4F0052CBF1 /* PatrolAttachmentViewController.m */,
 				29F5C3BE1FCBAA4F0052CBF1 /* PatrolExamViewController.h */,
-				29F5C3BF1FCBAA4F0052CBF1 /* PatrolExamViewController.m */,
+				29A8D9A2200F5C1B001E865C /* PatrolExamViewController.m */,
 				29F5C3C01FCBAA4F0052CBF1 /* PatrolStandardViewController.h */,
 				29F5C3C11FCBAA4F0052CBF1 /* PatrolStandardViewController.m */,
 				29F5C3C21FCBAA4F0052CBF1 /* PatrolStartAnswerConfirmVC.h */,
@@ -2142,6 +2148,8 @@
 				29F5C3C51FCBAA4F0052CBF1 /* PatrolTaskViewController.m */,
 				296D5E581FD4DDD200A397D5 /* PatrolTempCheckViewController.h */,
 				296D5E591FD4DDD200A397D5 /* PatrolTempCheckViewController.m */,
+				29A8D99B200F5ABA001E865C /* AirplaneModeViewController.h */,
+				29A8D99A200F5AB9001E865C /* AirplaneModeViewController.m */,
 			);
 			path = ViewConstrollers;
 			sourceTree = "<group>";
@@ -2164,6 +2172,8 @@
 			children = (
 				29F5C3CE1FCBAA4F0052CBF1 /* PatrolExamTopView.h */,
 				29F5C3CF1FCBAA4F0052CBF1 /* PatrolExamTopView.m */,
+				29A8D99D200F5AD2001E865C /* AirplaneModeTableViewCell.h */,
+				29A8D99E200F5AD2001E865C /* AirplaneModeTableViewCell.m */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -3713,6 +3723,7 @@
 				3506EDD31BA0194300897EBE /* NSDate+FormatterAdditions.m in Sources */,
 				29F5C44D1FCBAB410052CBF1 /* InspectionHeaderTableViewCell.m in Sources */,
 				292D0C1C1FCBD79900B48C13 /* ToolsManager.m in Sources */,
+				29A8D99C200F5ABA001E865C /* AirplaneModeViewController.m in Sources */,
 				29F5C40F1FCBAACB0052CBF1 /* DateTextField.m in Sources */,
 				29F5C3E21FCBAA4F0052CBF1 /* PatrolStandardViewController.m in Sources */,
 				3506ED471BA0164E00897EBE /* IBTScrollLoadMoreView.m in Sources */,
@@ -3807,6 +3818,7 @@
 				3506ED551BA0164E00897EBE /* IBTTableViewCell.m in Sources */,
 				292D0BED1FCBBCDB00B48C13 /* FilterAreaModel.m in Sources */,
 				29F5C3D31FCBAA4F0052CBF1 /* PatrolExamAttachmentCell.m in Sources */,
+				29A8D9A3200F5C1B001E865C /* PatrolExamViewController.m in Sources */,
 				29F5C49E1FCBB1220052CBF1 /* PYPhotosView.m in Sources */,
 				292D0BEA1FCBBCDB00B48C13 /* FilterInputTableViewController.m in Sources */,
 				297BFE8A1D221BAD000F41D1 /* NSDictionary+ZXPUnicode.m in Sources */,
@@ -3862,6 +3874,7 @@
 				29F5C3D01FCBAA4F0052CBF1 /* PatrolTaskCollectionFooterView.m in Sources */,
 				29F5C3E71FCBAA500052CBF1 /* PatrolExamViewModel.m in Sources */,
 				3506EDDD1BA0194300897EBE /* UIScrollView+Content.m in Sources */,
+				29A8D99F200F5AD2001E865C /* AirplaneModeTableViewCell.m in Sources */,
 				29B501D41D1A7747003D4E74 /* OilOrderTableViewCell.m in Sources */,
 				29F5C3E31FCBAA4F0052CBF1 /* PatrolStartAnswerConfirmVC.m in Sources */,
 				3506ED571BA0164E00897EBE /* IBTUIControl.m in Sources */,
@@ -3933,7 +3946,6 @@
 				29B501E91D1A986B003D4E74 /* OilHeaderView.m in Sources */,
 				29F5C4661FCBAD6C0052CBF1 /* NetWorkRequestManager.m in Sources */,
 				29F143C21D18E2E600083975 /* SeeRequestViewController.m in Sources */,
-				29F5C3E11FCBAA4F0052CBF1 /* PatrolExamViewController.m in Sources */,
 				35422FCD1BD6312300455F7A /* GTOPioneeringSurveyItem.m in Sources */,
 				29603D931D1CDFE500951670 /* DetailTimeViewController.m in Sources */,
 				35C287C81BFAC40900A1B89D /* ICRAnnocementContentView.m in Sources */,

total/GTOApp/Business/BusinessViewController.m

@@ -293,7 +293,7 @@
 - (void)getStoreArray
 {
     [IBTLoadingView showProgressLabel:@"获取门店中"];
-    [HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/mdata/store/getsByUser/%@",HTTP_REST_API_BASE_URL,[ICRUserUtil sharedInstance].f_user_uuid] withRequestType:ONE withParameter:nil withSuccess:^(id returnValue) {
+    [HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/mdata/store/getsByUser2/%@",HTTP_REST_API_BASE_URL,[ICRUserUtil sharedInstance].f_user_uuid] withRequestType:ONE withParameter:nil withSuccess:^(id returnValue) {
         [IBTLoadingView hideHUDWithText:nil];
         if ([returnValue[@"success"] isEqualToNumber:@1]) {
             [ICRUserUtil sharedInstance].storeArray = returnValue[@"data"];

total/GTOApp/Business/NewObtainViewController.m

@@ -234,7 +234,7 @@
     __weak typeof(self) weakSelf = self;
     //获取油站列表
     [IBTLoadingView showProgressLabel:@"加载中..."];
-    [HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/mdata/store/getsByUser/%@",HTTP_REST_API_BASE_URL,[ICRUserUtil sharedInstance].f_user_uuid] withRequestType:ONE withParameter:nil withSuccess:^(id returnValue) {
+    [HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/mdata/store/getsByUser2/%@",HTTP_REST_API_BASE_URL,[ICRUserUtil sharedInstance].f_user_uuid] withRequestType:ONE withParameter:nil withSuccess:^(id returnValue) {
         
         [IBTLoadingView hideHUDWithText:nil];
         if ([returnValue[@"success"] isEqualToNumber:@1]) {

total/GTOApp/Business/PatrolOnline(VI巡检)/Cells/QuestionCells/PatrolExamQuestionTableViewCell.m

@@ -43,7 +43,13 @@
 
 - (void)setCellModel:(PatrolExamCellViewModel *)cellModel {
     [super setCellModel:cellModel];
-    self.labelTitle.text = cellModel.question.title;
+    NSString *title = nil;
+    if (cellModel.question.titleNumber) {
+        title = [NSString stringWithFormat:@"%@ %@",cellModel.question.titleNumber,cellModel.question.title];
+    }else {
+        title = cellModel.question.title;
+    }
+    self.labelTitle.text = title;
     self.labelStandScore.text = [NSString stringWithFormat:@"%@%@", cellModel.question.standScore,@"分"];
         self.labelStandScore.hidden = cellModel.question.standScore == nil;
     ZJPatrolDetail_results_answers *answer = self.cellModel.answer;

total/GTOApp/Business/PatrolOnline(VI巡检)/Models/ZJPatrolDetail.h

@@ -179,12 +179,16 @@
  */
 @property (nonatomic, copy) NSString *photoType;
 
+@property (nonatomic, copy) NSString *titleNumber;
+
 @property (nonatomic, strong)  NSNumber <Optional>  * scoreFrom;
 
 @property (nonatomic, strong)  NSString <Optional>  * reference;
 
 @property (nonatomic, strong)  NSNumber <Optional>  * star;
 
+
+
 @end 
 
 

total/GTOApp/Business/PatrolOnline(VI巡检)/ViewConstrollers/AirplaneModeViewController.h

+//
+//  AirplaneModeViewController.h
+//  total
+//
+//  Created by 曹云霄 on 2018/1/17.
+//  Copyright © 2018年 Delevin. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface AirplaneModeViewController : BaseViewController
+
+/**
+ 飞行模式
+ */
+@property (weak, nonatomic) IBOutlet UITableView *airplanModeTableView;
+
+/**
+ 数据源
+ */
+@property (nonatomic,strong) NSArray<NSString *> *datasArray;
+@end

total/GTOApp/Business/PatrolOnline(VI巡检)/ViewConstrollers/AirplaneModeViewController.m

+//
+//  AirplaneModeViewController.m
+//  total
+//
+//  Created by 曹云霄 on 2018/1/17.
+//  Copyright © 2018年 Delevin. All rights reserved.
+//
+
+#import "AirplaneModeViewController.h"
+#import "AirplaneModeTableViewCell.h"
+@interface AirplaneModeViewController ()<UITableViewDelegate,UITableViewDataSource>
+
+@end
+
+@implementation AirplaneModeViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    [self uiConfigAction];
+}
+
+#pragma mark -UI
+- (void)uiConfigAction {
+    self.view.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5];
+}
+
+#pragma mark -数据源
+- (void)setDatasArray:(NSArray<NSString *> *)datasArray
+{
+    _datasArray = datasArray;
+    [self.airplanModeTableView reloadData];
+}
+
+#pragma mark -确认
+- (IBAction)sureButtonClickAction:(UIButton *)sender {
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+#pragma mark -<UITableViewDelegate,UITableViewDataSource>
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    AirplaneModeTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"AirplaneModeTableViewCell" forIndexPath:indexPath];
+    cell.airplanModeTitleLabel.text = self.datasArray[indexPath.row];
+    return cell;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return self.datasArray.count;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return 40;
+}
+
+
+
+
+
+
+
+
+
+@end

total/GTOApp/Business/PatrolOnline(VI巡检)/ViewConstrollers/PatrolExamViewController.h

@@ -11,12 +11,17 @@
 #import "InspectionResultModel.h"
 #import "PatrolExamViewModel.h"
 
+
 @interface PatrolExamViewController : BaseViewController
+
 //@property (strong, nonatomic) Results *result;
 @property (strong, nonatomic) PatrolExamViewModel *viewModel;
 
+
 /**
  是否返回到根视图
  */
 @property (nonatomic, assign) BOOL isBackRootVc;
+
+
 @end

total/GTOApp/Business/PatrolOnline(VI巡检)/ViewConstrollers/PatrolExamViewController.m

@@ -21,6 +21,7 @@
 #import "ZJPatrolDetail.h"
 #import "BaseNavigationViewController.h"
 #import "InspectionTableViewController.h"
+#import "AirplaneModeViewController.h"
 
 @interface PatrolExamViewController () <UITableViewDelegate, UITableViewDataSource>
 @property (weak, nonatomic) IBOutlet PatrolExamTopView *topView;
@@ -70,7 +71,6 @@
     [super viewDidLoad];
     self.timer = [NSTimer timerWithTimeInterval:30 target:self selector:@selector(actionSave) userInfo:nil repeats:YES];
     [[NSRunLoop mainRunLoop] addTimer:_timer forMode:NSRunLoopCommonModes];
-    
     [self.tableView registerClass:[PatrolExamStarCell class] forCellReuseIdentifier:@"PatrolExamStarCell"];
     [self.btnSubmit setTitle:@"确认提交" forState:UIControlStateNormal];
     @weakify(self);
@@ -109,14 +109,13 @@
             self.topView.viewModel = self.viewModel;
             //根据当前单据状态显示底部按钮
             [self.tableView reloadData];
-            
+            [self showAirPlanModeVc];
             if (self.viewModel.state.type != PatrolExamStateUnStart) {
                 dispatch_async(dispatch_get_main_queue(), ^{
                     NSMutableArray *arrIndexs = [self.viewModel closeAll];
                     [self.tableView deleteRowsAtIndexPaths:arrIndexs withRowAnimation:UITableViewRowAnimationFade];
                 });
             }
-            
             //进行中的单据才显示保存按钮
             if (self.viewModel.state.type == PatrolExamStateProcessing) {
                 UIBarButtonItem *save = [[UIBarButtonItem alloc] initWithTitle:@"保存" style:UIBarButtonItemStyleDone target:self action:@selector(actionSave)];
@@ -151,6 +150,7 @@
             self.topView.viewModel = self.viewModel;
             self.btnSubmit.hidden = self.viewModel.state.type != PatrolExamStateProcessing;
             [self.tableView reloadData];
+            [self showAirPlanModeVc];
             dispatch_async(dispatch_get_main_queue(), ^{
                 NSMutableArray *arrIndexs = [self.viewModel closeAll];
                 [self.tableView deleteRowsAtIndexPaths:arrIndexs withRowAnimation:UITableViewRowAnimationFade];
@@ -160,7 +160,6 @@
             }
         }];
     };
-    
     //手动监听返回方法，返回时是否定时器
     BaseNavigationViewController *nav = (BaseNavigationViewController *)self.navigationController;
     [nav setBackClickAction:^{
@@ -173,6 +172,18 @@
     [self createBackBtn];
 }
 
+#pragma mark -显示飞行模式弹出框
+- (void)showAirPlanModeVc {
+    if (self.viewModel.airplanModeArray.count && (self.viewModel.state.type == PatrolExamStateProcessing)) {
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            AirplaneModeViewController *airplanModeVc = [AirplaneModeViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_PATROLINSPECT];
+            airplanModeVc.modalPresentationStyle = UIModalPresentationOverCurrentContext;
+            airplanModeVc.datasArray = self.viewModel.airplanModeArray;
+            [self presentViewController:airplanModeVc animated:YES completion:nil];
+        });
+    }
+}
+
 #pragma mark -自定义返回视图
 - (void)createBackBtn{
     UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -196,6 +207,7 @@
 #pragma mark -通知刷新回调
 - (void)actionNotiAnswerChanged:(NSNotification *)noti {
     [self.tableView reloadData];
+    [self showAirPlanModeVc];
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {

total/GTOApp/Business/PatrolOnline(VI巡检)/ViewConstrollers/PatrolStandardViewController.m

@@ -83,10 +83,10 @@
     }else{
         PostAttachmentModel *model = self.arrPictures[indexPath.row - 1];
         ZJStandardPictureTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ZJStandardPictureTableViewCell" forIndexPath:indexPath];
-        [cell.img sd_setImageWithURL:[NSURL URLWithString:[ToolsManager jointUrl:model.fileUrl]] placeholderImage:KNODATAIMAGE];
+        NSString *extractedExpr = [ToolsManager viJointUrl:model.fileUrl];
+        [cell.img sd_setImageWithURL:[NSURL URLWithString:extractedExpr] placeholderImage:KNODATAIMAGE];
         return  cell;
          }
-    
     return nil;
 }
 
@@ -94,13 +94,10 @@
     if (indexPath.row > 0) {
         NSMutableArray *imageArray = [NSMutableArray array];
         PYPhotoBrowseView *photoBroseView = [[PYPhotoBrowseView alloc] init];
-        for (UITableViewCell *cell in tableView.visibleCells) {
-            if ([cell isKindOfClass:[ZJStandardPictureTableViewCell class]]) {
-                ZJStandardPictureTableViewCell *pictureCell = (ZJStandardPictureTableViewCell *)cell;
-                [imageArray addObject:pictureCell.img];
-            }
+        for (PostAttachmentModel *model in self.arrPictures) {
+            [imageArray addObject:[ToolsManager viJointUrl:model.fileUrl]];
         }
-        photoBroseView.sourceImgageViews = imageArray;
+        photoBroseView.imagesURL = imageArray;
         photoBroseView.currentIndex = indexPath.row - 1;
         [photoBroseView show];
     }

total/GTOApp/Business/PatrolOnline(VI巡检)/ViewConstrollers/PatrolTempCheckViewController.m

@@ -69,19 +69,29 @@
 - (void)addStoreChildVc
 {
     [self.contentBgView addSubview:self.storeDetailVc.view];
-    NSMutableArray *storyArray = [NSMutableArray array];
-    for (NSDictionary *dict in [ICRUserUtil sharedInstance].storeArray) {
-        FilterSearchModel *searchModel = [[FilterSearchModel alloc] init];
-        searchModel.name = [NSString stringWithFormat:@"[%@]%@",dict[@"code"],dict[@"name"]];
-        searchModel.uuid = dict[@"uuid"];
-        [storyArray addObject:searchModel];
-    }
-    WS(weakSelf);
-    [self.storeDetailVc setSelectedItemBlock:^(NSIndexPath *indexPath, FilterSearchModel *model) {
-        weakSelf.selectedStoreLabel.text = model.isSelected ? model.name : @"---";
-        weakSelf.selectedStoreModel = model.isSelected ? model : nil; 
+    [IBTLoadingView showProgressLabel:@"获取门店中"];
+    [HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/mdata/store/getsByUser2/%@",VIHTTP_REST_API_BASE_URL,[ICRUserUtil sharedInstance].f_user_uuid] withRequestType:ONE withParameter:nil withSuccess:^(id returnValue) {
+        [IBTLoadingView hideHUDWithText:nil];
+        if ([returnValue[@"success"] isEqualToNumber:@1]) {
+            NSArray *stores = returnValue[@"data"];
+            NSMutableArray *storyArray = [NSMutableArray array];
+            for (NSDictionary *dict in stores) {
+                FilterSearchModel *searchModel = [[FilterSearchModel alloc] init];
+                searchModel.name = [NSString stringWithFormat:@"[%@]%@",dict[@"code"],dict[@"name"]];
+                searchModel.uuid = dict[@"uuid"];
+                [storyArray addObject:searchModel];
+            }
+            WS(weakSelf);
+            [weakSelf.storeDetailVc setSelectedItemBlock:^(NSIndexPath *indexPath, FilterSearchModel *model) {
+                weakSelf.selectedStoreLabel.text = model.isSelected ? model.name : @"---";
+                weakSelf.selectedStoreModel = model.isSelected ? model : nil;
+            }];
+            weakSelf.storeDetailVc.filterArray = storyArray;
+        }
+    } withFailed:^(NSError *failed) {
+        [IBTLoadingView hideHUDWithText:nil];
+        [IBTLoadingView showTextOnly:failed.localizedDescription];
     }];
-    self.storeDetailVc.filterArray = storyArray;
 }
 
 #pragma mark -下一步(生成VI检查任务)
@@ -97,7 +107,7 @@
             [RequestManager request_CreatePatrolTempCheck:weakSelf.selectedStoreModel.uuid success:^(id returnValue) {
                 [IBTLoadingView hideHUDWithText:nil];
                 if ([ BaseViewModel verifyData:returnValue]) {
-                    [IBTLoadingView showTextOnly:@"生成VIVI抽查任务成功"];
+                    [IBTLoadingView showTextOnly:@"生成VI抽查任务成功"];
                     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                         ZJPatrolDetail *detail = [ZJPatrolDetail modelWithDic:[BaseViewModel formatData:returnValue]];
                         PatrolTaskCustomModel *customModel = [PatrolTaskCustomModel new];

total/GTOApp/Business/PatrolOnline(VI巡检)/ViewModels/PatrolExamViewModel.h

@@ -23,6 +23,11 @@ typedef NS_ENUM(NSInteger, AnswerSubmitAction) {
 @property (nonatomic, copy) void (^blockReloadData)(void);
 @property (nonatomic, copy) void (^blockAnswerAction)(void);
 @property (nonatomic, copy) void (^blockReHttp)(void);
+/**
+ 飞行模式
+ */
+@property (nonatomic,strong) NSArray *airplanModes;
+@property (nonatomic,strong) NSMutableArray *airplanModeArray;
 
 /**
  门店VI检查的结果

total/GTOApp/Business/PatrolOnline(VI巡检)/ViewModels/PatrolExamViewModel.m

@@ -12,6 +12,9 @@ static UILabel *stringLabel = nil;
 @interface PatrolExamViewModel ()
 @property (strong, nonatomic) NSCache *cellCache;
 @property (strong, nonatomic) NSMutableArray *arrDefautCellModel;
+
+
+
 @end
 @implementation PatrolExamViewModel
 
@@ -48,6 +51,11 @@ static UILabel *stringLabel = nil;
         stringLabel.numberOfLines = 0;
     });
     for (NSString *category in sortSetArray) {
+        for (NSString *string in self.airplanModes) {
+            if ([category rangeOfString:string].location != NSNotFound) {
+                [self.airplanModeArray addObject:category];
+            }
+        }
         PatrolExamCellViewModel *cateModel = [PatrolExamCellViewModel modelWithType:ExamCellTypeCatogory viewModel:self];
         cateModel.category = category;
         stringLabel.text = category;
@@ -66,7 +74,6 @@ static UILabel *stringLabel = nil;
                 }
             }else if (kUser.configModel.automaticAnswer) {
                 //判断是否有自动答题权限
-                
                 //  - ExamCellTypeSingle: 单选题
                 //  - ExamCellTypeMultiple: 多选题
                 //  - ExamCellTypeYesNO: 是非题
@@ -86,7 +93,6 @@ static UILabel *stringLabel = nil;
                 }
             }
         }
-
         //获取问题题目
         for (ZJPatrolDetail_questions *questions in detail.questions) {
             //如果等于临时
@@ -100,7 +106,13 @@ static UILabel *stringLabel = nil;
                 //问题题目
                 PatrolExamCellViewModel *titleModel = [PatrolExamCellViewModel modelWithType:ExamCellTypeQuestion viewModel:self];
                 titleModel.question = questions;
-                stringLabel.text = questions.title;
+                NSString *title = nil;
+                if (questions.titleNumber) {
+                    title = [NSString stringWithFormat:@"%@ %@",questions.titleNumber,questions.title];
+                }else {
+                    title = questions.title;
+                }
+                stringLabel.text = title;
                 titleModel.height = [stringLabel sizeThatFits:CGSizeMake(ScreenSize.width - 110, MAXFLOAT)].height + 28;
                 titleModel.level = 1;
                 [self.arrCellData addObject:titleModel];
@@ -370,14 +382,11 @@ static UILabel *stringLabel = nil;
         newAnswer.details = (NSMutableArray<ZJPatrolDetail_results_answers_details> *) [NSMutableArray array];
         [self.dicAnswers setObject:newAnswer forKey:cellModel.question.uuid];
     }
-
     cellModel.answer = cellModel.answer;
-
     return cellModel.answer;
 }
 
 #pragma mark - http
-
 - (void)httpDetailComplete:(void (^)(void))complete {
     [RequestManager request_PatrolPlanDetail:self.plan.uuid storeUuid:self.storeResult.store_uuid success:^(id returnValue) {
         if ([BaseViewModel verifyData:returnValue]) {
@@ -448,7 +457,6 @@ static UILabel *stringLabel = nil;
     }
 }
 
-
 /**
  比较时间字符串大小
  
@@ -480,6 +488,18 @@ static UILabel *stringLabel = nil;
     return _dicAnswers;
 }
 
+- (NSArray *)airplanModes {
+    if (!_airplanModes) {
+        _airplanModes = @[@"油罐区",@"加油区",@"卸油区"];
+    }
+    return _airplanModes;
+}
 
+- (NSMutableArray *)airplanModeArray {
+    if (!_airplanModeArray) {
+        _airplanModeArray = [NSMutableArray array];
+    }
+    return _airplanModeArray;
+}
 
 @end

total/GTOApp/Business/PatrolOnline(VI巡检)/Views/AirplaneModeTableViewCell.h

+//
+//  AirplaneModeTableViewCell.h
+//  total
+//
+//  Created by 曹云霄 on 2018/1/17.
+//  Copyright © 2018年 Delevin. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface AirplaneModeTableViewCell : UITableViewCell
+
+
+/**
+ 需要支持飞行模式的分类
+ */
+@property (weak, nonatomic) IBOutlet UILabel *airplanModeTitleLabel;
+
+
+@end

total/GTOApp/Business/PatrolOnline(VI巡检)/Views/AirplaneModeTableViewCell.m

+//
+//  AirplaneModeTableViewCell.m
+//  total
+//
+//  Created by 曹云霄 on 2018/1/17.
+//  Copyright © 2018年 Delevin. All rights reserved.
+//
+
+#import "AirplaneModeTableViewCell.h"
+
+@implementation AirplaneModeTableViewCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+    // Configure the view for the selected state
+}
+
+@end

total/GTOApp/Login/ICRLoginViewController.m

@@ -141,8 +141,8 @@
     NSString *nsRegisterCode = self.m_containerView.m_cCodeTextF.text;
     NSString *nsUserName = self.m_containerView.m_userNameTextF.text;
     NSString *nsPassword = self.m_containerView.m_passwordTextF.text;
-    WS(weakSelf);
     void (^succ)(id) = ^(id data) {
+        NSLog(@"%@",data);
         [IBTLoadingView hideHUDWithText:nil];
         ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
         userUtil.bAutoLogin = @([_m_containerView isAutoLogin]);

total/GTOApp/UserUtil/FilterManager/ViewModels/FilterViewModel.m

@@ -74,24 +74,24 @@
 #pragma mark - 获取门店信息
 - (void)queryStore:(SuccessBlock)successBlock {
     [IBTLoadingView showProgressLabel:@"加载中..."];;
-    [RequestManager request_Store_Success:^(id returnValue) {
+    [HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/mdata/store/getsByUser2/%@",VIHTTP_REST_API_BASE_URL,[ICRUserUtil sharedInstance].f_user_uuid] withRequestType:ONE withParameter:nil withSuccess:^(id returnValue) {
         [IBTLoadingView hideHUDWithText:nil];
         if ([[self class] verifyData:returnValue]) {
-            NSMutableArray *searchArray = [NSMutableArray array];
-            FilterAreaModel *model = [[FilterAreaModel alloc] initWithDictionary:returnValue error:nil];
-            for (FilterAreaModel_data_records *record in model.data.records) {
-                FilterSearchModel *searchModel = [[FilterSearchModel alloc] initWithDictionary:[record toDictionary] error:nil];
-                searchModel.name = [NSString stringWithFormat:@"[%@]%@",searchModel.code,searchModel.name];
-                [searchArray addObject:searchModel];
+            NSArray *stores = returnValue[@"data"];
+            NSMutableArray *storyArray = [NSMutableArray array];
+            for (NSDictionary *dict in stores) {
+                FilterSearchModel *searchModel = [[FilterSearchModel alloc] init];
+                searchModel.name = [NSString stringWithFormat:@"[%@]%@",dict[@"code"],dict[@"name"]];
+                searchModel.uuid = dict[@"uuid"];
+                [storyArray addObject:searchModel];
             }
-            [self conditionIsSelected:searchArray];
-            successBlock(searchArray);
+            [self conditionIsSelected:storyArray];
+            successBlock(storyArray);
             return;
         }
-        [IBTLoadingView showTextOnly:[[self class] messageData:returnValue]];
-    } failure:^(id errorValue) {
+    } withFailed:^(NSError *failed) {
         [IBTLoadingView hideHUDWithText:nil];
-        [IBTLoadingView showTextOnly:errorValue];
+        [IBTLoadingView showTextOnly:failed.localizedDescription];
     }];
 }
 

total/GTOApp/UserUtil/Helper/ToolsManager.h

@@ -112,6 +112,11 @@
  */
 + (NSString *)jointUrl:(NSString *)string;
 
+/**
+ VI检查拼接附件地址（如果没有HTTP前缀）
+ */
++ (NSString *)viJointUrl:(NSString *)string;
+
 /**
  计算数组中最长的最长的字符串长度
  */

total/GTOApp/UserUtil/Helper/ToolsManager.m

@@ -32,6 +32,19 @@
     return urlString;
 }
 
+/**
+ VI检查拼接附件地址（如果没有HTTP前缀）
+ */
++ (NSString *)viJointUrl:(NSString *)string
+{
+    BOOL boolValue = [string rangeOfString:@"http"].location != NSNotFound;
+    if (boolValue) {
+        return string;
+    }
+    NSString *urlString = [NSString stringWithFormat:@"%@%@",VIHTTP_LOCAL_BASE_URL,string];
+    return urlString;
+}
+
 /**
  比较时间字符串大小
  

total/GTOApp/UserUtil/Network/RequestManager.m

@@ -326,7 +326,7 @@
  */
 + (void)request_Store_Success:(SuccessBlock)success failure:(ErrorBlock)failure
 {
-    NSString *urlString = [ToolsManager completeUrl:QUERYSTORE];
+    NSString *urlString = [NSString stringWithFormat:@"%@/%@",VIHTTP_REST_API_BASE_URL,QUERYSTORE];
     NSDictionary *parameters = @{
                                  @"userUuid":kUser.f_user_uuid,
                                  @"pageNumber":@(0),
@@ -385,7 +385,7 @@
  */
 + (void)request_Supervisor_Success:(SuccessBlock)success failure:(ErrorBlock)failure
 {
-    NSString *urlString = [ToolsManager completeUrl:QUERYSUPERVISOR];
+    NSString *urlString = [NSString stringWithFormat:@"%@/%@",VIHTTP_REST_API_BASE_URL,QUERYSUPERVISOR];
     NSDictionary *parameters = @{
                                  @"pageNumber":@(0),
                                  @"pageSize":@(0),
@@ -457,7 +457,7 @@
  */
 + (void)request_PatrolPlan:(ParametersModel *)queryModel success:(SuccessBlock)success failure:(ErrorBlock)failure
 {
-    NSString *urlString = [ToolsManager completeUrl:QUERYPATROLPLAN];
+    NSString *urlString = [NSString stringWithFormat:@"%@/%@",VIHTTP_REST_API_BASE_URL,QUERYPATROLPLAN];
     [[NetWorkRequestManager shareManager] POST:urlString withParmeter:[queryModel toDictionary] success:^(id returnValue) {
         success(returnValue);
     } failure:^(id errorValue) {
@@ -474,7 +474,7 @@
  */
 + (void)request_PatrolPlanDetail:(NSString *)planUuid storeUuid:(NSString *)storeUuid success:(SuccessBlock)success failure:(ErrorBlock)failure
 {
-    NSString *urlString = [NSString stringWithFormat:[ToolsManager completeUrl:QUERYPATROLPLANDETAIL],planUuid,storeUuid,kUser.f_user_uuid];
+     NSString *urlString = [NSString stringWithFormat:[NSString stringWithFormat:@"%@/%@",VIHTTP_REST_API_BASE_URL,QUERYPATROLPLANDETAIL],planUuid,storeUuid,kUser.f_user_uuid];
     [[NetWorkRequestManager shareManager] POST:urlString withParmeter:nil success:^(id returnValue) {
         success(returnValue);
     } failure:^(id errorValue) {
@@ -491,7 +491,7 @@
  */
 + (void)request_PatrolPlanResult:(NSString *)planUuid storeUuid:(NSString *)storeUuid success:(SuccessBlock)success failure:(ErrorBlock)failure
 {
-    NSString *urlString = [NSString stringWithFormat:[ToolsManager completeUrl:QUERYPATROLINSPECTDETAIL],planUuid,storeUuid,kUser.f_user_uuid];
+    NSString *urlString = [NSString stringWithFormat:[NSString stringWithFormat:@"%@/%@",VIHTTP_REST_API_BASE_URL,QUERYPATROLINSPECTDETAIL],planUuid,storeUuid,kUser.f_user_uuid];
     [[NetWorkRequestManager shareManager] GET:urlString withParmeter:nil success:^(id returnValue) {
         success(returnValue);
     } failure:^(id errorValue) {
@@ -509,7 +509,7 @@
  */
 + (void)request_SubmitPatrolPlan:(NSString *)planUuid type:(NSString *)type parameter:(NSDictionary *)parameter success:(SuccessBlock)success failure:(ErrorBlock)failure
 {
-    NSString *urlString = [NSString stringWithFormat:[ToolsManager completeUrl:SUBMITPATROLPLAN],type,planUuid];
+    NSString *urlString = [NSString stringWithFormat:[NSString stringWithFormat:@"%@/%@",VIHTTP_REST_API_BASE_URL,SUBMITPATROLPLAN],type,planUuid];
     [[NetWorkRequestManager shareManager] POST:urlString withParmeter:parameter success:^(id returnValue) {
         success(returnValue);
     } failure:^(id errorValue) {
@@ -531,7 +531,7 @@
  */
 + (void)request_BeginPatrolPlanAnswer:(NSString *)planUuid storeUuid:(NSString *)storeUuid selectedStoreUuid:(NSString *)selectedStoreUuid longtitude:(NSString *)longtitude latitute:(NSString *)latitute success:(SuccessBlock)success failure:(ErrorBlock)failure
 {
-    NSString *urlString = [NSString stringWithFormat:[ToolsManager completeUrl:BEGINPATROLPLANANSWER],planUuid,storeUuid,kUser.f_user_uuid,selectedStoreUuid,longtitude,latitute];
+    NSString *urlString = [NSString stringWithFormat:[NSString stringWithFormat:@"%@/%@",VIHTTP_REST_API_BASE_URL,BEGINPATROLPLANANSWER],planUuid,storeUuid,kUser.f_user_uuid,selectedStoreUuid,longtitude,latitute];
     [[NetWorkRequestManager shareManager] POST:urlString withParmeter:nil success:^(id returnValue) {
         success(returnValue);
     } failure:^(id errorValue) {
@@ -566,7 +566,7 @@
  */
 + (void)request_QueryPatrolInspectResult:(ParametersModel *)model success:(SuccessBlock)success failure:(ErrorBlock)failure
 {
-    NSString *urlString = [ToolsManager completeUrl:QUERYPATROLINSPECTRESULT];
+    NSString *urlString = [NSString stringWithFormat:@"%@/%@",VIHTTP_REST_API_BASE_URL,QUERYPATROLINSPECTRESULT];
     [[NetWorkRequestManager shareManager] POST:urlString withParmeter:[model toDictionary] success:^(id returnValue) {
         success(returnValue);
     } failure:^(id errorValue) {
@@ -582,7 +582,7 @@
  */
 + (void)request_QueryPatrolInspectResultSuccess:(SuccessBlock)success failure:(ErrorBlock)failure
 {
-    NSString *urlString = [NSString stringWithFormat:[ToolsManager completeUrl:QUERYPATROLINSPECTPLAN],kUser.f_user_uuid,[[NSDate date] httpParameterString],@"0",@"0"];
+    NSString *urlString = [NSString stringWithFormat:[NSString stringWithFormat:@"%@/%@",VIHTTP_REST_API_BASE_URL,QUERYPATROLINSPECTPLAN],kUser.f_user_uuid,[[NSDate date] httpParameterString],@"0",@"0"];
     urlString = [ToolsManager returnUrlString:urlString];
     [[NetWorkRequestManager shareManager] POST:urlString withParmeter:nil success:^(id returnValue) {
         success(returnValue);
@@ -600,7 +600,7 @@
  */
 + (void)request_QueryPatrolPlanAttachments:(NSString *)entityUuid success:(SuccessBlock)success failure:(ErrorBlock)failure
 {
-    NSString *urlString = [NSString stringWithFormat:[ToolsManager completeUrl:QUERYPATROLATTACHMENT],entityUuid];
+    NSString *urlString = [NSString stringWithFormat:[NSString stringWithFormat:@"%@/%@",VIHTTP_REST_API_BASE_URL,QUERYPATROLATTACHMENT],entityUuid];
     urlString = [ToolsManager returnUrlString:urlString];
     [[NetWorkRequestManager shareManager] GET:urlString withParmeter:nil success:^(id returnValue) {
         success(returnValue);
@@ -611,14 +611,14 @@
 
 
 /**
- 生成VIVI抽查
+ 生成VI抽查
 
  @param store_Uuid 油站ID
  @param success    成功回调
  @param failure    失败回调
  */
 + (void)request_CreatePatrolTempCheck:(NSString *)store_Uuid success:(SuccessBlock)success failure:(ErrorBlock)failure {
-    NSString *urlString = [NSString stringWithFormat:[ToolsManager completeUrl:CREATEVITEMPCHECK],kUser.f_user_uuid,store_Uuid];
+    NSString *urlString = [NSString stringWithFormat:[NSString stringWithFormat:@"%@/%@",VIHTTP_REST_API_BASE_URL,CREATEVITEMPCHECK],kUser.f_user_uuid,store_Uuid];
     urlString = [ToolsManager returnUrlString:urlString];
     [[NetWorkRequestManager shareManager] GET:urlString withParmeter:nil success:^(id returnValue) {
         success(returnValue);

total/GTOApp/UserUtil/PictureCell/ZJPictureTableViewCell.m

@@ -115,12 +115,17 @@
             break;
         case PHOTO_TYPE_ONLYLBUM:
         {
-            DBCameraLibraryViewController *vc = [[DBCameraLibraryViewController alloc] init];
-            [vc setDelegate:self];
-            [IBTLoadingView showProgressLabel:@"加载中"];
-            [self.vc presentViewController:vc animated:YES completion:^{
-                [IBTLoadingView hideHUDWithText:nil];
-            }];
+            ShowAlertView(@"提示", @"此分类需要您提前拍摄好照片,拍摄之前请确保手机处于飞行模式下。您拍摄好了吗？", @[@"没有",@"拍照完成"], UIAlertControllerStyleAlert, ^(NSInteger index) {
+                if (index == ZERO) {
+                    return;
+                }
+                DBCameraLibraryViewController *vc = [[DBCameraLibraryViewController alloc] init];
+                [vc setDelegate:self];
+                [IBTLoadingView showProgressLabel:@"加载中"];
+                [self.vc presentViewController:vc animated:YES completion:^{
+                    [IBTLoadingView hideHUDWithText:nil];
+                }];
+            });
         }
             break;
         case PHOTO_TYPE_ALL:

total/Images.xcassets/fly_top.imageset/Contents.json

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

total/Info.plist

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

total/Macro/GTOAppMacro.h

@@ -211,9 +211,21 @@ typedef NS_ENUM(NSInteger,ATTACHMENT_LOCATION){
 //#define HTTP_REST_API_BASE_URL        @"http://139.196.39.77:8180/total-server/rest"
 //#define HTTP_LOCAL_BASE_URL    @"http://139.196.39.77:8180"
 
+//测试VI检查、VI抽查、VI检查结果模块使用
+//#define VIHTTP_REST_API_BASE_URL        @"http://139.196.39.77:8280/total-server/rest"
+//#define VIHTTP_LOCAL_BASE_URL    @"http://139.196.39.77:8280"
+
+//正式VI检查、VI抽查、VI检查结果模块使用
+//#define VIHTTP_REST_API_BASE_URL        @"http://139.196.39.77:7280/total-server/rest"
+//#define VIHTTP_LOCAL_BASE_URL    @"http://139.196.39.77:7280"
+
+
 //开发环境
-#define HTTP_LOCAL_BASE_URL    @"http://192.168.1.176:8083"
-#define HTTP_REST_API_BASE_URL        @"http://192.168.1.176:8083/total-server/rest"
+#define HTTP_LOCAL_BASE_URL      @"http://192.168.1.176:8083"
+#define HTTP_REST_API_BASE_URL   @"http://192.168.1.176:8083/total-server/rest"
+#define VIHTTP_REST_API_BASE_URL @"http://192.168.1.176:8083/total-server/rest"
+#define VIHTTP_LOCAL_BASE_URL    @"http://192.168.1.176:8083"
+
 
 //外网映射开发环境
 //#define HTTP_LOCAL_BASE_URL    @"http://dev.gomoretech.com"