获取上传附件配置项提前到app启动时

total/AppDelegate/AppDelegate.m

@@ -10,6 +10,8 @@
 //#import "BMKMapManager.h"
 #import "IQKeyboardManager.h"
  #import "APService.h"
+#import "UploadManager.h"
+
 @interface AppDelegate ()
 {
     BMKMapManager* _mapManager;
@@ -33,6 +35,7 @@
     self.window = [[UIWindow alloc]initWithFrame:[[UIScreen mainScreen]bounds]];
     self.window.backgroundColor = [UIColor whiteColor];
     
+    [UploadManager getAppOption];
     //版本更新
     [self enterpriseUpdate];
     [self SetIQKeyboardManager];

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

@@ -113,19 +113,15 @@
     }else{
         picVM.type = kPicCellTypeAdd;
     }
-    
     //根据单据状态判断是添加还是查看
-    
     attVC.viewModel = picVM;
     [self.viewController pushViewController:attVC animated:YES];
 }
 
 - (PatrolStandardViewController *)standardVC {
-    if (!_standardVC) {
-        _standardVC = [PatrolStandardViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_PATROLINSPECT];
-        _standardVC.question = self.cellModel.question;
-        _standardVC.superVC = self.viewController;
-    }
+    _standardVC = [PatrolStandardViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_PATROLINSPECT];
+    _standardVC.question = self.cellModel.question;
+    _standardVC.superVC = self.viewController;
     return _standardVC;
 }
 

total/GTOApp/Business/PatrolOnline(VI巡检)/Patrol_PatrolInspect.storyboard

@@ -1097,13 +1097,13 @@
                                                 <userDefinedRuntimeAttribute type="string" keyPath="text" value="图片附件"/>
                                             </userDefinedRuntimeAttributes>
                                         </label>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="注：图片最多不能超过4张" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XHL-mA-tKw">
-                                            <rect key="frame" x="97.5" y="46.5" width="178" height="18"/>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="注：图片最多不能超过10张" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XHL-mA-tKw">
+                                            <rect key="frame" x="97.5" y="46.5" width="184.5" height="18"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                             <color key="textColor" red="0.63179747500000005" green="0.63179747500000005" blue="0.63179747500000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                             <userDefinedRuntimeAttributes>
-                                                <userDefinedRuntimeAttribute type="string" keyPath="text" value="注：图片最多不超过4张"/>
+                                                <userDefinedRuntimeAttribute type="string" keyPath="text" value="注：图片最多不超过10张"/>
                                             </userDefinedRuntimeAttributes>
                                         </label>
                                     </subviews>

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

@@ -207,7 +207,7 @@
 #pragma mark -通知刷新回调
 - (void)actionNotiAnswerChanged:(NSNotification *)noti {
     [self.tableView reloadData];
-    [self showAirPlanModeVc];
+//    [self showAirPlanModeVc];
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {

total/GTOApp/UserUtil/PictureCell/PicViewModel.m

@@ -13,7 +13,7 @@
 - (instancetype)init {
     self = [super init];
     if (self) {
-        self.maxPictureNumber = 4;
+        self.maxPictureNumber = 10;
         self.columns = 2;
     }
     return self;

total/GTOApp/UserUtil/UploadManager/UploadManager.h

@@ -22,6 +22,7 @@ typedef NS_ENUM(NSInteger,UPLOAD_TYPE){
 
 @interface UploadResponse : NSObject
 
+
 /**
  上传类型
  */
@@ -40,6 +41,7 @@ typedef NS_ENUM(NSInteger,UPLOAD_TYPE){
 
 + (UPLOAD_TYPE)getUploadType;
 
++ (void)getAppOption;
 /**
  上传文件
 

total/GTOApp/UserUtil/UploadManager/UploadManager.m

@@ -19,7 +19,6 @@
 @implementation UploadManager
 
 
-
 /**
  获取App配置项
  */

total/Info.plist

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

total/Macro/GTOAppMacro.h

@@ -204,8 +204,8 @@ typedef NS_ENUM(NSInteger,ATTACHMENT_LOCATION){
 //#define HTTP_LOCAL_BASE_URL    @"http://218.244.151.129:7580"
 
 //正式环境
-//#define HTTP_REST_API_BASE_URL        @"http://139.196.39.77:7080/total-server/rest"
-//#define HTTP_LOCAL_BASE_URL    @"http://139.196.39.77:7080"
+#define HTTP_REST_API_BASE_URL        @"http://139.196.39.77:7080/total-server/rest"
+#define HTTP_LOCAL_BASE_URL    @"http://139.196.39.77:7080"
 
 //测试环境
 //#define HTTP_REST_API_BASE_URL        @"http://139.196.39.77:8180/total-server/rest"
@@ -216,16 +216,14 @@ typedef NS_ENUM(NSInteger,ATTACHMENT_LOCATION){
 //#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 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 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 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"