diff --git a/total/AppDelegate/AppDelegate.m b/total/AppDelegate/AppDelegate.m index 4051f274448106e3f24269407dcd1e7b4c252e63..5a07dbfe6b15a4ebfafe6aeffd09d2a55e07e4fa 100644 --- a/total/AppDelegate/AppDelegate.m +++ b/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]; diff --git "a/total/GTOApp/Business/PatrolOnline(VI\345\267\241\346\243\200)/Cells/QuestionCells/PatrolExamAttachmentCell.m" "b/total/GTOApp/Business/PatrolOnline(VI\345\267\241\346\243\200)/Cells/QuestionCells/PatrolExamAttachmentCell.m" index bdfd75d6987ec6420d7c805a28969b350e6342b5..0163d349f5105c514b1389e597ce97a72686f700 100755 --- "a/total/GTOApp/Business/PatrolOnline(VI\345\267\241\346\243\200)/Cells/QuestionCells/PatrolExamAttachmentCell.m" +++ "b/total/GTOApp/Business/PatrolOnline(VI\345\267\241\346\243\200)/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; } diff --git "a/total/GTOApp/Business/PatrolOnline(VI\345\267\241\346\243\200)/Patrol_PatrolInspect.storyboard" "b/total/GTOApp/Business/PatrolOnline(VI\345\267\241\346\243\200)/Patrol_PatrolInspect.storyboard" index fb7dffe7539ccc1d72abb127023a69130d0b928a..945da0c412d829fd33aa29ea41dc48b3efbd4cf6 100755 --- "a/total/GTOApp/Business/PatrolOnline(VI\345\267\241\346\243\200)/Patrol_PatrolInspect.storyboard" +++ "b/total/GTOApp/Business/PatrolOnline(VI\345\267\241\346\243\200)/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> diff --git "a/total/GTOApp/Business/PatrolOnline(VI\345\267\241\346\243\200)/ViewConstrollers/PatrolExamViewController.m" "b/total/GTOApp/Business/PatrolOnline(VI\345\267\241\346\243\200)/ViewConstrollers/PatrolExamViewController.m" index 40c6a276568b834147a9eee22dea2f3a87702ba7..43b098b2cf0192a22a5b366a04845a9d2977e54f 100755 --- "a/total/GTOApp/Business/PatrolOnline(VI\345\267\241\346\243\200)/ViewConstrollers/PatrolExamViewController.m" +++ "b/total/GTOApp/Business/PatrolOnline(VI\345\267\241\346\243\200)/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 { diff --git a/total/GTOApp/UserUtil/PictureCell/PicViewModel.m b/total/GTOApp/UserUtil/PictureCell/PicViewModel.m index 4dfa4c0e606cfad24f27faa77671c0d748465aa3..1e28bdb50778edd6b2f0ba7adc6e63b9f64cd4b6 100755 --- a/total/GTOApp/UserUtil/PictureCell/PicViewModel.m +++ b/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; diff --git a/total/GTOApp/UserUtil/UploadManager/UploadManager.h b/total/GTOApp/UserUtil/UploadManager/UploadManager.h index 2ad9507625dbf82181d6dd4a55f3677534ee9af5..92eefc0c34873087b69cd105527014f4566d5227 100755 --- a/total/GTOApp/UserUtil/UploadManager/UploadManager.h +++ b/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; /** ä¸Šä¼ æ–‡ä»¶ diff --git a/total/GTOApp/UserUtil/UploadManager/UploadManager.m b/total/GTOApp/UserUtil/UploadManager/UploadManager.m index f44743d9b6be1a93b3a1ebfbd2dc6f802f7d9a0a..f78f7cbf5180558a8c920a3ef372179a10c17171 100755 --- a/total/GTOApp/UserUtil/UploadManager/UploadManager.m +++ b/total/GTOApp/UserUtil/UploadManager/UploadManager.m @@ -19,7 +19,6 @@ @implementation UploadManager - /** 获å–Appé…置项 */ diff --git a/total/Info.plist b/total/Info.plist index eedd79d963ad9df2846f6e37919de355322f2074..eb5fea1bcf4edd7445e5231fe2973f1c460fa8b5 100644 --- a/total/Info.plist +++ b/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> diff --git a/total/Macro/GTOAppMacro.h b/total/Macro/GTOAppMacro.h index 195b5d176a1fbb519fa0f025a604243b7cecb851..198793caeb0853f0458764dbeff7b069ce8f72fe 100644 --- a/total/Macro/GTOAppMacro.h +++ b/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"