Skip to content

T
total
Commit abf8a10d authored by 曹云霄's avatar 曹云霄
Browse files
Options

VI检查添加字段控制是否拍照和是否从相册选取

parent 4ba86e22
Show whitespace changes
Inline Side-by-side
Showing with 218 additions and 736 deletions
total.xcodeproj/project.pbxproj
View file @ abf8a10d
......@@ -63,8 +63,22 @@
294154531D1D312200B3B761 /* QueryOrderNew.m in Sources */ = {isa = PBXBuildFile; fileRef = 294154521D1D312200B3B761 /* QueryOrderNew.m */; };
29436A101D23979000587601 /* RecordOrderModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29436A0F1D23979000587601 /* RecordOrderModel.m */; };
2944FC231D2F48040093628B /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2944FC221D2F48040093628B /* BaseViewController.m */; };
29460DF21D1A22C8001FCD34 /* GTOLicenceNewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29460DF11D1A22C8001FCD34 /* GTOLicenceNewViewController.m */; };
29460DF51D1A27B7001FCD34 /* screeningButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 29460DF41D1A27B7001FCD34 /* screeningButton.m */; };
295AA5CA1FF36C9D00469D3C /* GTOLicenceResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 295AA5B81FF36C9900469D3C /* GTOLicenceResult.m */; };
295AA5CB1FF36C9D00469D3C /* GTOLiceneResultViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 295AA5B91FF36C9A00469D3C /* GTOLiceneResultViewController.m */; };
295AA5CC1FF36C9D00469D3C /* GTOLicenceResultTopCellContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 295AA5BF1FF36C9B00469D3C /* GTOLicenceResultTopCellContentView.m */; };
295AA5CD1FF36C9D00469D3C /* GTOLicenceCheckItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 295AA5C01FF36C9B00469D3C /* GTOLicenceCheckItem.m */; };
295AA5CF1FF36C9D00469D3C /* GTOLicenceResultHeaderContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 295AA5C41FF36C9C00469D3C /* GTOLicenceResultHeaderContentView.m */; };
295AA5D01FF36C9D00469D3C /* GTOLicenceEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 295AA5C51FF36C9C00469D3C /* GTOLicenceEditViewController.m */; };
295AA5D11FF36C9D00469D3C /* GTOLicenceListSimpleCellContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 295AA5C61FF36C9C00469D3C /* GTOLicenceListSimpleCellContentView.m */; };
295AA5D21FF36C9D00469D3C /* GTOAlertInfoLicenceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 295AA5C81FF36C9C00469D3C /* GTOAlertInfoLicenceViewController.m */; };
295AA5D71FF36CB100469D3C /* GTOLicenceNewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 295AA5D41FF36CB100469D3C /* GTOLicenceNewViewController.m */; };
295AA5D81FF36CB100469D3C /* GTOButtonHeaderContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 295AA5D61FF36CB100469D3C /* GTOButtonHeaderContentView.m */; };
295AA5E11FF36CC600469D3C /* GTOLicenceListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 295AA5D91FF36CC400469D3C /* GTOLicenceListViewController.m */; };
295AA5E21FF36CC600469D3C /* GTOLicenceBoltView.m in Sources */ = {isa = PBXBuildFile; fileRef = 295AA5DD1FF36CC500469D3C /* GTOLicenceBoltView.m */; };
295AA5E31FF36CC600469D3C /* GTOLicenceListCellContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 295AA5DE1FF36CC500469D3C /* GTOLicenceListCellContentView.m */; };
295AA5E41FF36CC600469D3C /* GTOLicence.m in Sources */ = {isa = PBXBuildFile; fileRef = 295AA5E01FF36CC600469D3C /* GTOLicence.m */; };
295AA5E71FF36D0E00469D3C /* GTOCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 295AA5E61FF36D0E00469D3C /* GTOCollectionViewController.m */; };
295FE1E01D17E9B600DF5B77 /* BusinessStoryBoard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 295FE1DF1D17E9B600DF5B77 /* BusinessStoryBoard.storyboard */; };
295FE1EB1D17EE3200DF5B77 /* BusinessViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 295FE1EA1D17EE3200DF5B77 /* BusinessViewController.m */; };
295FE1EE1D17F60E00DF5B77 /* BusinessCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 295FE1ED1D17F60E00DF5B77 /* BusinessCollectionViewCell.m */; };
......@@ -349,15 +363,11 @@
35550C391BA13007003D6199 /* ICRLoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35550C351BA13007003D6199 /* ICRLoginViewController.m */; };
35550C401BA13074003D6199 /* GTOMeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35550C3F1BA13074003D6199 /* GTOMeViewController.m */; };
356587341C226A0E0077FCE9 /* GTOBusinessSignInViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 356587331C226A0E0077FCE9 /* GTOBusinessSignInViewController.m */; };
357FC28D1BFD62A100D93FFE /* GTOCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 357FC28C1BFD62A100D93FFE /* GTOCollectionViewController.m */; };
357FC28F1BFDBA3300D93FFE /* Actions.json in Resources */ = {isa = PBXBuildFile; fileRef = 357FC28E1BFDBA3300D93FFE /* Actions.json */; };
35814B9B1BF5E8CB00DE352C /* GTOPioneeringBoltView.m in Sources */ = {isa = PBXBuildFile; fileRef = 35814B9A1BF5E8CB00DE352C /* GTOPioneeringBoltView.m */; };
35936C0A1BC8CD9A00BDE751 /* GTOPatrolPlanAllTopItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 35936C091BC8CD9A00BDE751 /* GTOPatrolPlanAllTopItem.m */; };
359AF76B1BB3BB250072CEB1 /* ICRSingleScoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 359AF76A1BB3BB250072CEB1 /* ICRSingleScoreViewController.m */; };
359B82EC1BA7EC42002B1F00 /* GXFBottomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 359B82EB1BA7EC42002B1F00 /* GXFBottomView.m */; };
35A4788E1BE8556700158246 /* GTOLicenceEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35A4788D1BE8556700158246 /* GTOLicenceEditViewController.m */; };
35A478911BE8A97900158246 /* GTOLicenceListSimpleCellContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 35A478901BE8A97900158246 /* GTOLicenceListSimpleCellContentView.m */; };
35A478941BE8BD6500158246 /* GTOLicenceResultHeaderContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 35A478931BE8BD6500158246 /* GTOLicenceResultHeaderContentView.m */; };
35A53D151BF88069007184C4 /* GTOPioneeringAddressInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35A53D141BF88069007184C4 /* GTOPioneeringAddressInfoViewController.m */; };
35A53D181BF88155007184C4 /* GTOPioneeringAddressInfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 35A53D171BF88155007184C4 /* GTOPioneeringAddressInfoView.m */; };
35A57A0D1BE093A5008F3818 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35A57A0C1BE093A5008F3818 /* CoreGraphics.framework */; };
......@@ -421,7 +431,6 @@
35B2E5B31BAC180700AB8582 /* JTOptionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 35B2E5AE1BAC180700AB8582 /* JTOptionCell.m */; };
35B2E5B41BAC180700AB8582 /* JTOptionsEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 35B2E5B01BAC180700AB8582 /* JTOptionsEntity.m */; };
35B2E5B51BAC180700AB8582 /* JTOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35B2E5B21BAC180700AB8582 /* JTOptionsViewController.m */; };
35BB5A2C1C23B04F00B9F452 /* GTOButtonHeaderContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 35BB5A2B1C23B04F00B9F452 /* GTOButtonHeaderContentView.m */; };
35BC8C731BFC106300D0E694 /* city.txt in Resources */ = {isa = PBXBuildFile; fileRef = 35BC8C721BFC106300D0E694 /* city.txt */; };
35BC8C771BFC643E00D0E694 /* GTOLicenceCheckBoltView.m in Sources */ = {isa = PBXBuildFile; fileRef = 35BC8C761BFC643E00D0E694 /* GTOLicenceCheckBoltView.m */; };
35C287C51BFAC40900A1B89D /* ICRAnnouncementDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35C287B81BFAC40900A1B89D /* ICRAnnouncementDetailViewController.m */; };
......@@ -442,21 +451,12 @@
35CCE19F1BD0D0AD00DACB0F /* GTOAnswerDetail.m in Sources */ = {isa = PBXBuildFile; fileRef = 35CCE19E1BD0D0AD00DACB0F /* GTOAnswerDetail.m */; };
35CD5EFF1BE09984008A2B8D /* PushConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = 35CD5EFE1BE09984008A2B8D /* PushConfig.plist */; };
35CD5F011BE0A148008A2B8D /* libPushSDK-1.8.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 35CD5F001BE0A148008A2B8D /* libPushSDK-1.8.7.a */; };
35D66A3A1BE709E5004476F0 /* GTOAlertInfoLicenceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35D66A391BE709E5004476F0 /* GTOAlertInfoLicenceViewController.m */; };
35D66A3D1BE75239004476F0 /* GTOLiceneResultViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35D66A3C1BE75239004476F0 /* GTOLiceneResultViewController.m */; };
35D66A401BE75670004476F0 /* GTOLicenceResultTopCellContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 35D66A3F1BE75670004476F0 /* GTOLicenceResultTopCellContentView.m */; };
35D66A431BE76B18004476F0 /* GTOLicenceResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 35D66A421BE76B18004476F0 /* GTOLicenceResult.m */; };
35D66A461BE76B7B004476F0 /* GTOLicenceCheckItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 35D66A451BE76B7B004476F0 /* GTOLicenceCheckItem.m */; };
35D922CD1BAF9A6900D02338 /* ICRPostAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = 35D922CC1BAF9A6900D02338 /* ICRPostAttachment.m */; };
35D922D01BAF9AC700D02338 /* ICRPatrolResultViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35D922CF1BAF9AC700D02338 /* ICRPatrolResultViewController.m */; };
35E3BB191BF087AE0081232D /* GTOAlertInfoPatrolPlanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35E3BB181BF087AE0081232D /* GTOAlertInfoPatrolPlanViewController.m */; };
35E4EC3B1BE9C479001AF192 /* GTORepairAddPhotoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 35E4EC3A1BE9C479001AF192 /* GTORepairAddPhotoView.m */; };
35E6BB251BD1B59500227D53 /* GTOQSingleScoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35E6BB241BD1B59500227D53 /* GTOQSingleScoreViewController.m */; };
35E6C12D1BD0F3EB00E738F7 /* GTOQuestionBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35E6C12C1BD0F3EB00E738F7 /* GTOQuestionBaseViewController.m */; };
35EB8E5F1BE3201C00411E45 /* GTOLicenceListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35EB8E5E1BE3201C00411E45 /* GTOLicenceListViewController.m */; };
35EB8E621BE3208500411E45 /* GTOLicence.m in Sources */ = {isa = PBXBuildFile; fileRef = 35EB8E611BE3208500411E45 /* GTOLicence.m */; };
35EB8E651BE32C1600411E45 /* GTOLicenceListCellContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 35EB8E641BE32C1600411E45 /* GTOLicenceListCellContentView.m */; };
35EB8E681BE32C2800411E45 /* GTOLicenceBoltView.m in Sources */ = {isa = PBXBuildFile; fileRef = 35EB8E671BE32C2800411E45 /* GTOLicenceBoltView.m */; };
35EB8E6B1BE33F6200411E45 /* GTORepairDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35EB8E6A1BE33F6200411E45 /* GTORepairDetailViewController.m */; };
35EB8E711BE340B700411E45 /* GTORepairDetailTopCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 35EB8E701BE340B700411E45 /* GTORepairDetailTopCellView.m */; };
35EB8E741BE34E2900411E45 /* GXFButtonAndLineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 35EB8E731BE34E2900411E45 /* GXFButtonAndLineView.m */; };
......@@ -575,10 +575,38 @@
29436A0F1D23979000587601 /* RecordOrderModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RecordOrderModel.m; sourceTree = "<group>"; };
2944FC211D2F48040093628B /* BaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseViewController.h; sourceTree = "<group>"; };
2944FC221D2F48040093628B /* BaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseViewController.m; sourceTree = "<group>"; };
29460DF01D1A22C8001FCD34 /* GTOLicenceNewViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceNewViewController.h; path = total/GTOApp/Business/Repair/GTOLicenceNewViewController.h; sourceTree = SOURCE_ROOT; };
29460DF11D1A22C8001FCD34 /* GTOLicenceNewViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceNewViewController.m; path = total/GTOApp/Business/Repair/GTOLicenceNewViewController.m; sourceTree = SOURCE_ROOT; };
29460DF31D1A27B7001FCD34 /* screeningButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screeningButton.h; sourceTree = "<group>"; };
29460DF41D1A27B7001FCD34 /* screeningButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = screeningButton.m; sourceTree = "<group>"; };
295AA5B81FF36C9900469D3C /* GTOLicenceResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceResult.m; path = Repair/GTOLicenceResult.m; sourceTree = "<group>"; };
295AA5B91FF36C9A00469D3C /* GTOLiceneResultViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLiceneResultViewController.m; path = Repair/GTOLiceneResultViewController.m; sourceTree = "<group>"; };
295AA5BA1FF36C9A00469D3C /* GTOLicenceCheckItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceCheckItem.h; path = Repair/GTOLicenceCheckItem.h; sourceTree = "<group>"; };
295AA5BB1FF36C9A00469D3C /* GTOLicenceResultHeaderContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceResultHeaderContentView.h; path = Repair/GTOLicenceResultHeaderContentView.h; sourceTree = "<group>"; };
295AA5BC1FF36C9A00469D3C /* GTOLicenceEditViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceEditViewController.h; path = Repair/GTOLicenceEditViewController.h; sourceTree = "<group>"; };
295AA5BD1FF36C9B00469D3C /* GTOAlertInfoLicenceViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOAlertInfoLicenceViewController.h; path = Repair/GTOAlertInfoLicenceViewController.h; sourceTree = "<group>"; };
295AA5BE1FF36C9B00469D3C /* GTOLicenceResultTopCellContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceResultTopCellContentView.h; path = Repair/GTOLicenceResultTopCellContentView.h; sourceTree = "<group>"; };
295AA5BF1FF36C9B00469D3C /* GTOLicenceResultTopCellContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceResultTopCellContentView.m; path = Repair/GTOLicenceResultTopCellContentView.m; sourceTree = "<group>"; };
295AA5C01FF36C9B00469D3C /* GTOLicenceCheckItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceCheckItem.m; path = Repair/GTOLicenceCheckItem.m; sourceTree = "<group>"; };
295AA5C21FF36C9B00469D3C /* GTOLiceneResultViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLiceneResultViewController.h; path = Repair/GTOLiceneResultViewController.h; sourceTree = "<group>"; };
295AA5C31FF36C9C00469D3C /* GTOLicenceResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceResult.h; path = Repair/GTOLicenceResult.h; sourceTree = "<group>"; };
295AA5C41FF36C9C00469D3C /* GTOLicenceResultHeaderContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceResultHeaderContentView.m; path = Repair/GTOLicenceResultHeaderContentView.m; sourceTree = "<group>"; };
295AA5C51FF36C9C00469D3C /* GTOLicenceEditViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceEditViewController.m; path = Repair/GTOLicenceEditViewController.m; sourceTree = "<group>"; };
295AA5C61FF36C9C00469D3C /* GTOLicenceListSimpleCellContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceListSimpleCellContentView.m; path = Repair/GTOLicenceListSimpleCellContentView.m; sourceTree = "<group>"; };
295AA5C81FF36C9C00469D3C /* GTOAlertInfoLicenceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOAlertInfoLicenceViewController.m; path = Repair/GTOAlertInfoLicenceViewController.m; sourceTree = "<group>"; };
295AA5C91FF36C9D00469D3C /* GTOLicenceListSimpleCellContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceListSimpleCellContentView.h; path = Repair/GTOLicenceListSimpleCellContentView.h; sourceTree = "<group>"; };
295AA5D31FF36CB100469D3C /* GTOButtonHeaderContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTOButtonHeaderContentView.h; sourceTree = "<group>"; };
295AA5D41FF36CB100469D3C /* GTOLicenceNewViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTOLicenceNewViewController.m; sourceTree = "<group>"; };
295AA5D51FF36CB100469D3C /* GTOLicenceNewViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTOLicenceNewViewController.h; sourceTree = "<group>"; };
295AA5D61FF36CB100469D3C /* GTOButtonHeaderContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTOButtonHeaderContentView.m; sourceTree = "<group>"; };
295AA5D91FF36CC400469D3C /* GTOLicenceListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceListViewController.m; path = Repair/Views/GTOLicenceListViewController.m; sourceTree = "<group>"; };
295AA5DA1FF36CC500469D3C /* GTOLicenceListCellContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceListCellContentView.h; path = Repair/Views/GTOLicenceListCellContentView.h; sourceTree = "<group>"; };
295AA5DB1FF36CC500469D3C /* GTOLicence.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicence.h; path = Repair/Views/GTOLicence.h; sourceTree = "<group>"; };
295AA5DC1FF36CC500469D3C /* GTOLicenceBoltView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceBoltView.h; path = Repair/Views/GTOLicenceBoltView.h; sourceTree = "<group>"; };
295AA5DD1FF36CC500469D3C /* GTOLicenceBoltView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceBoltView.m; path = Repair/Views/GTOLicenceBoltView.m; sourceTree = "<group>"; };
295AA5DE1FF36CC500469D3C /* GTOLicenceListCellContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceListCellContentView.m; path = Repair/Views/GTOLicenceListCellContentView.m; sourceTree = "<group>"; };
295AA5DF1FF36CC500469D3C /* GTOLicenceListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceListViewController.h; path = Repair/Views/GTOLicenceListViewController.h; sourceTree = "<group>"; };
295AA5E01FF36CC600469D3C /* GTOLicence.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicence.m; path = Repair/Views/GTOLicence.m; sourceTree = "<group>"; };
295AA5E51FF36D0D00469D3C /* GTOCollectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOCollectionViewController.h; path = LicenceCheck/GTOCollectionViewController.h; sourceTree = "<group>"; };
295AA5E61FF36D0E00469D3C /* GTOCollectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOCollectionViewController.m; path = LicenceCheck/GTOCollectionViewController.m; sourceTree = "<group>"; };
295FE1DF1D17E9B600DF5B77 /* BusinessStoryBoard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = BusinessStoryBoard.storyboard; sourceTree = "<group>"; };
295FE1E91D17EE3200DF5B77 /* BusinessViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BusinessViewController.h; sourceTree = "<group>"; };
295FE1EA1D17EE3200DF5B77 /* BusinessViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BusinessViewController.m; sourceTree = "<group>"; };
......@@ -1137,8 +1165,6 @@
35550C3F1BA13074003D6199 /* GTOMeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTOMeViewController.m; sourceTree = "<group>"; };
356587321C226A0E0077FCE9 /* GTOBusinessSignInViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTOBusinessSignInViewController.h; sourceTree = "<group>"; };
356587331C226A0E0077FCE9 /* GTOBusinessSignInViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTOBusinessSignInViewController.m; sourceTree = "<group>"; };
357FC28B1BFD62A100D93FFE /* GTOCollectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOCollectionViewController.h; path = total/GTOApp/Business/LicenceCheck/GTOCollectionViewController.h; sourceTree = SOURCE_ROOT; };
357FC28C1BFD62A100D93FFE /* GTOCollectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOCollectionViewController.m; path = total/GTOApp/Business/LicenceCheck/GTOCollectionViewController.m; sourceTree = SOURCE_ROOT; };
357FC28E1BFDBA3300D93FFE /* Actions.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = Actions.json; sourceTree = "<group>"; };
35814B991BF5E8CB00DE352C /* GTOPioneeringBoltView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTOPioneeringBoltView.h; sourceTree = "<group>"; };
35814B9A1BF5E8CB00DE352C /* GTOPioneeringBoltView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTOPioneeringBoltView.m; sourceTree = "<group>"; };
......@@ -1148,12 +1174,6 @@
359AF76A1BB3BB250072CEB1 /* ICRSingleScoreViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ICRSingleScoreViewController.m; path = QuestionManager/ICRSingleScoreViewController.m; sourceTree = "<group>"; };
359B82EA1BA7EC42002B1F00 /* GXFBottomView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GXFBottomView.h; sourceTree = "<group>"; };
359B82EB1BA7EC42002B1F00 /* GXFBottomView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GXFBottomView.m; sourceTree = "<group>"; };
35A4788C1BE8556700158246 /* GTOLicenceEditViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceEditViewController.h; path = total/GTOApp/Business/Repair/GTOLicenceEditViewController.h; sourceTree = SOURCE_ROOT; };
35A4788D1BE8556700158246 /* GTOLicenceEditViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceEditViewController.m; path = total/GTOApp/Business/Repair/GTOLicenceEditViewController.m; sourceTree = SOURCE_ROOT; };
35A4788F1BE8A97900158246 /* GTOLicenceListSimpleCellContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceListSimpleCellContentView.h; path = total/GTOApp/Business/Repair/GTOLicenceListSimpleCellContentView.h; sourceTree = SOURCE_ROOT; };
35A478901BE8A97900158246 /* GTOLicenceListSimpleCellContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceListSimpleCellContentView.m; path = total/GTOApp/Business/Repair/GTOLicenceListSimpleCellContentView.m; sourceTree = SOURCE_ROOT; };
35A478921BE8BD6500158246 /* GTOLicenceResultHeaderContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceResultHeaderContentView.h; path = total/GTOApp/Business/Repair/GTOLicenceResultHeaderContentView.h; sourceTree = SOURCE_ROOT; };
35A478931BE8BD6500158246 /* GTOLicenceResultHeaderContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceResultHeaderContentView.m; path = total/GTOApp/Business/Repair/GTOLicenceResultHeaderContentView.m; sourceTree = SOURCE_ROOT; };
35A53D131BF88069007184C4 /* GTOPioneeringAddressInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTOPioneeringAddressInfoViewController.h; sourceTree = "<group>"; };
35A53D141BF88069007184C4 /* GTOPioneeringAddressInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTOPioneeringAddressInfoViewController.m; sourceTree = "<group>"; };
35A53D161BF88155007184C4 /* GTOPioneeringAddressInfoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTOPioneeringAddressInfoView.h; sourceTree = "<group>"; };
......@@ -1271,8 +1291,6 @@
35B2E5B01BAC180700AB8582 /* JTOptionsEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JTOptionsEntity.m; sourceTree = "<group>"; };
35B2E5B11BAC180700AB8582 /* JTOptionsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JTOptionsViewController.h; sourceTree = "<group>"; };
35B2E5B21BAC180700AB8582 /* JTOptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JTOptionsViewController.m; sourceTree = "<group>"; };
35BB5A2A1C23B04F00B9F452 /* GTOButtonHeaderContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOButtonHeaderContentView.h; path = total/GTOApp/Business/GTOButtonHeaderContentView.h; sourceTree = SOURCE_ROOT; };
35BB5A2B1C23B04F00B9F452 /* GTOButtonHeaderContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOButtonHeaderContentView.m; path = total/GTOApp/Business/GTOButtonHeaderContentView.m; sourceTree = SOURCE_ROOT; };
35BC8C721BFC106300D0E694 /* city.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = city.txt; sourceTree = "<group>"; };
35BC8C751BFC643E00D0E694 /* GTOLicenceCheckBoltView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTOLicenceCheckBoltView.h; sourceTree = "<group>"; };
35BC8C761BFC643E00D0E694 /* GTOLicenceCheckBoltView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTOLicenceCheckBoltView.m; sourceTree = "<group>"; };
......@@ -1315,16 +1333,6 @@
35CD5EFC1BE098B8008A2B8D /* BaiduMapAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BaiduMapAPI.framework; path = "Pods/BaiduMapAPI/Release-universal/BaiduMapAPI.framework"; sourceTree = "<group>"; };
35CD5EFE1BE09984008A2B8D /* PushConfig.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = PushConfig.plist; sourceTree = "<group>"; };
35CD5F001BE0A148008A2B8D /* libPushSDK-1.8.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libPushSDK-1.8.7.a"; sourceTree = "<group>"; };
35D66A381BE709E5004476F0 /* GTOAlertInfoLicenceViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOAlertInfoLicenceViewController.h; path = total/GTOApp/Business/Repair/GTOAlertInfoLicenceViewController.h; sourceTree = SOURCE_ROOT; };
35D66A391BE709E5004476F0 /* GTOAlertInfoLicenceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOAlertInfoLicenceViewController.m; path = total/GTOApp/Business/Repair/GTOAlertInfoLicenceViewController.m; sourceTree = SOURCE_ROOT; };
35D66A3B1BE75239004476F0 /* GTOLiceneResultViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLiceneResultViewController.h; path = total/GTOApp/Business/Repair/GTOLiceneResultViewController.h; sourceTree = SOURCE_ROOT; };
35D66A3C1BE75239004476F0 /* GTOLiceneResultViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLiceneResultViewController.m; path = total/GTOApp/Business/Repair/GTOLiceneResultViewController.m; sourceTree = SOURCE_ROOT; };
35D66A3E1BE75670004476F0 /* GTOLicenceResultTopCellContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceResultTopCellContentView.h; path = total/GTOApp/Business/Repair/GTOLicenceResultTopCellContentView.h; sourceTree = SOURCE_ROOT; };
35D66A3F1BE75670004476F0 /* GTOLicenceResultTopCellContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceResultTopCellContentView.m; path = total/GTOApp/Business/Repair/GTOLicenceResultTopCellContentView.m; sourceTree = SOURCE_ROOT; };
35D66A411BE76B18004476F0 /* GTOLicenceResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceResult.h; path = total/GTOApp/Business/Repair/GTOLicenceResult.h; sourceTree = SOURCE_ROOT; };
35D66A421BE76B18004476F0 /* GTOLicenceResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceResult.m; path = total/GTOApp/Business/Repair/GTOLicenceResult.m; sourceTree = SOURCE_ROOT; };
35D66A441BE76B7B004476F0 /* GTOLicenceCheckItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceCheckItem.h; path = total/GTOApp/Business/Repair/GTOLicenceCheckItem.h; sourceTree = SOURCE_ROOT; };
35D66A451BE76B7B004476F0 /* GTOLicenceCheckItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceCheckItem.m; path = total/GTOApp/Business/Repair/GTOLicenceCheckItem.m; sourceTree = SOURCE_ROOT; };
35D922CA1BAF987200D02338 /* ICRLocalDataCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICRLocalDataCommon.h; sourceTree = "<group>"; };
35D922CB1BAF9A6900D02338 /* ICRPostAttachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICRPostAttachment.h; sourceTree = "<group>"; };
35D922CC1BAF9A6900D02338 /* ICRPostAttachment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICRPostAttachment.m; sourceTree = "<group>"; };
......@@ -1338,14 +1346,6 @@
35E6BB241BD1B59500227D53 /* GTOQSingleScoreViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTOQSingleScoreViewController.m; sourceTree = "<group>"; };
35E6C12B1BD0F3EB00E738F7 /* GTOQuestionBaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTOQuestionBaseViewController.h; sourceTree = "<group>"; };
35E6C12C1BD0F3EB00E738F7 /* GTOQuestionBaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTOQuestionBaseViewController.m; sourceTree = "<group>"; };
35EB8E5D1BE3201C00411E45 /* GTOLicenceListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceListViewController.h; path = total/GTOApp/Business/Repair/Views/GTOLicenceListViewController.h; sourceTree = SOURCE_ROOT; };
35EB8E5E1BE3201C00411E45 /* GTOLicenceListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceListViewController.m; path = total/GTOApp/Business/Repair/Views/GTOLicenceListViewController.m; sourceTree = SOURCE_ROOT; };
35EB8E601BE3208500411E45 /* GTOLicence.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicence.h; path = total/GTOApp/Business/Repair/Views/GTOLicence.h; sourceTree = SOURCE_ROOT; };
35EB8E611BE3208500411E45 /* GTOLicence.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicence.m; path = total/GTOApp/Business/Repair/Views/GTOLicence.m; sourceTree = SOURCE_ROOT; };
35EB8E631BE32C1600411E45 /* GTOLicenceListCellContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceListCellContentView.h; path = total/GTOApp/Business/Repair/Views/GTOLicenceListCellContentView.h; sourceTree = SOURCE_ROOT; };
35EB8E641BE32C1600411E45 /* GTOLicenceListCellContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceListCellContentView.m; path = total/GTOApp/Business/Repair/Views/GTOLicenceListCellContentView.m; sourceTree = SOURCE_ROOT; };
35EB8E661BE32C2800411E45 /* GTOLicenceBoltView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTOLicenceBoltView.h; path = total/GTOApp/Business/Repair/Views/GTOLicenceBoltView.h; sourceTree = SOURCE_ROOT; };
35EB8E671BE32C2800411E45 /* GTOLicenceBoltView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTOLicenceBoltView.m; path = total/GTOApp/Business/Repair/Views/GTOLicenceBoltView.m; sourceTree = SOURCE_ROOT; };
35EB8E691BE33F6200411E45 /* GTORepairDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTORepairDetailViewController.h; path = total/GTOApp/Business/Repair/Views/GTORepairDetailViewController.h; sourceTree = SOURCE_ROOT; };
35EB8E6A1BE33F6200411E45 /* GTORepairDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTORepairDetailViewController.m; path = total/GTOApp/Business/Repair/Views/GTORepairDetailViewController.m; sourceTree = SOURCE_ROOT; };
35EB8E6F1BE340B700411E45 /* GTORepairDetailTopCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTORepairDetailTopCellView.h; sourceTree = "<group>"; };
......@@ -3023,60 +3023,6 @@
path = Views;
sourceTree = "<group>";
};
352652DC1BCD053E001CB9C3 /* Licence（许可证） */ = {
isa = PBXGroup;
children = (
35D66A381BE709E5004476F0 /* GTOAlertInfoLicenceViewController.h */,
35D66A391BE709E5004476F0 /* GTOAlertInfoLicenceViewController.m */,
357FC28B1BFD62A100D93FFE /* GTOCollectionViewController.h */,
357FC28C1BFD62A100D93FFE /* GTOCollectionViewController.m */,
35A4788C1BE8556700158246 /* GTOLicenceEditViewController.h */,
35A4788D1BE8556700158246 /* GTOLicenceEditViewController.m */,
35EB8E5D1BE3201C00411E45 /* GTOLicenceListViewController.h */,
35EB8E5E1BE3201C00411E45 /* GTOLicenceListViewController.m */,
35D66A3B1BE75239004476F0 /* GTOLiceneResultViewController.h */,
35D66A3C1BE75239004476F0 /* GTOLiceneResultViewController.m */,
29460DF01D1A22C8001FCD34 /* GTOLicenceNewViewController.h */,
29460DF11D1A22C8001FCD34 /* GTOLicenceNewViewController.m */,
352652DD1BCD053E001CB9C3 /* Models */,
352652DE1BCD053E001CB9C3 /* Views */,
);
name = "Licence（许可证）";
path = Licence;
sourceTree = "<group>";
};
352652DD1BCD053E001CB9C3 /* Models */ = {
isa = PBXGroup;
children = (
35EB8E601BE3208500411E45 /* GTOLicence.h */,
35EB8E611BE3208500411E45 /* GTOLicence.m */,
35D66A411BE76B18004476F0 /* GTOLicenceResult.h */,
35D66A421BE76B18004476F0 /* GTOLicenceResult.m */,
35D66A441BE76B7B004476F0 /* GTOLicenceCheckItem.h */,
35D66A451BE76B7B004476F0 /* GTOLicenceCheckItem.m */,
);
path = Models;
sourceTree = "<group>";
};
352652DE1BCD053E001CB9C3 /* Views */ = {
isa = PBXGroup;
children = (
35EB8E631BE32C1600411E45 /* GTOLicenceListCellContentView.h */,
35EB8E641BE32C1600411E45 /* GTOLicenceListCellContentView.m */,
35EB8E661BE32C2800411E45 /* GTOLicenceBoltView.h */,
35EB8E671BE32C2800411E45 /* GTOLicenceBoltView.m */,
35D66A3E1BE75670004476F0 /* GTOLicenceResultTopCellContentView.h */,
35D66A3F1BE75670004476F0 /* GTOLicenceResultTopCellContentView.m */,
35A4788F1BE8A97900158246 /* GTOLicenceListSimpleCellContentView.h */,
35A478901BE8A97900158246 /* GTOLicenceListSimpleCellContentView.m */,
35A478921BE8BD6500158246 /* GTOLicenceResultHeaderContentView.h */,
35A478931BE8BD6500158246 /* GTOLicenceResultHeaderContentView.m */,
35BB5A2A1C23B04F00B9F452 /* GTOButtonHeaderContentView.h */,
35BB5A2B1C23B04F00B9F452 /* GTOButtonHeaderContentView.m */,
);
path = Views;
sourceTree = "<group>";
};
352652DF1BCD055F001CB9C3 /* Models */ = {
isa = PBXGroup;
children = (
......@@ -3238,6 +3184,36 @@
35550C3A1BA13022003D6199 /* Business */ = {
isa = PBXGroup;
children = (
295AA5E51FF36D0D00469D3C /* GTOCollectionViewController.h */,
295AA5E61FF36D0E00469D3C /* GTOCollectionViewController.m */,
295AA5DB1FF36CC500469D3C /* GTOLicence.h */,
295AA5E01FF36CC600469D3C /* GTOLicence.m */,
295AA5DC1FF36CC500469D3C /* GTOLicenceBoltView.h */,
295AA5DD1FF36CC500469D3C /* GTOLicenceBoltView.m */,
295AA5DA1FF36CC500469D3C /* GTOLicenceListCellContentView.h */,
295AA5DE1FF36CC500469D3C /* GTOLicenceListCellContentView.m */,
295AA5DF1FF36CC500469D3C /* GTOLicenceListViewController.h */,
295AA5D91FF36CC400469D3C /* GTOLicenceListViewController.m */,
295AA5D31FF36CB100469D3C /* GTOButtonHeaderContentView.h */,
295AA5D61FF36CB100469D3C /* GTOButtonHeaderContentView.m */,
295AA5D51FF36CB100469D3C /* GTOLicenceNewViewController.h */,
295AA5D41FF36CB100469D3C /* GTOLicenceNewViewController.m */,
295AA5BD1FF36C9B00469D3C /* GTOAlertInfoLicenceViewController.h */,
295AA5C81FF36C9C00469D3C /* GTOAlertInfoLicenceViewController.m */,
295AA5BA1FF36C9A00469D3C /* GTOLicenceCheckItem.h */,
295AA5C01FF36C9B00469D3C /* GTOLicenceCheckItem.m */,
295AA5BC1FF36C9A00469D3C /* GTOLicenceEditViewController.h */,
295AA5C51FF36C9C00469D3C /* GTOLicenceEditViewController.m */,
295AA5C91FF36C9D00469D3C /* GTOLicenceListSimpleCellContentView.h */,
295AA5C61FF36C9C00469D3C /* GTOLicenceListSimpleCellContentView.m */,
295AA5C31FF36C9C00469D3C /* GTOLicenceResult.h */,
295AA5B81FF36C9900469D3C /* GTOLicenceResult.m */,
295AA5BB1FF36C9A00469D3C /* GTOLicenceResultHeaderContentView.h */,
295AA5C41FF36C9C00469D3C /* GTOLicenceResultHeaderContentView.m */,
295AA5BE1FF36C9B00469D3C /* GTOLicenceResultTopCellContentView.h */,
295AA5BF1FF36C9B00469D3C /* GTOLicenceResultTopCellContentView.m */,
295AA5C21FF36C9B00469D3C /* GTOLiceneResultViewController.h */,
295AA5B91FF36C9A00469D3C /* GTOLiceneResultViewController.m */,
29F5C4131FCBAB400052CBF1 /* PatroIInspectionResults(VI巡检结果) */,
29F5C3971FCBAA4F0052CBF1 /* PatrolOnline(VI巡检) */,
2933CC581D213A8B000F8EE6 /* SelectOrder(选择配油单) */,
......@@ -3255,7 +3231,6 @@
295FE1E11D17EC8500DF5B77 /* view */,
35C287B61BFAC40900A1B89D /* Announcement */,
354B054D1BEB438900805F54 /* LicenceCheck（许可证审批） */,
352652DC1BCD053E001CB9C3 /* Licence（许可证） */,
352652D21BCCFD5C001CB9C3 /* Repair（报修） */,
352652D11BCCFD5C001CB9C3 /* Pioneering(拓店) */,
35B2E51D1BAC064600AB8582 /* Patrol（巡检） */,
......@@ -3738,7 +3713,6 @@
3506EDD31BA0194300897EBE /* NSDate+FormatterAdditions.m in Sources */,
29F5C44D1FCBAB410052CBF1 /* InspectionHeaderTableViewCell.m in Sources */,
292D0C1C1FCBD79900B48C13 /* ToolsManager.m in Sources */,
357FC28D1BFD62A100D93FFE /* GTOCollectionViewController.m in Sources */,
29F5C40F1FCBAACB0052CBF1 /* DateTextField.m in Sources */,
29F5C3E21FCBAA4F0052CBF1 /* PatrolStandardViewController.m in Sources */,
3506ED471BA0164E00897EBE /* IBTScrollLoadMoreView.m in Sources */,
......@@ -3798,13 +3772,16 @@
2978ED601D1BF3B700159B4A /* TypeTableViewCell.m in Sources */,
3506ED581BA0164E00897EBE /* IBTUILabel.m in Sources */,
2998EC641FCC0BCE007082B9 /* MJRefreshNormalHeader.m in Sources */,
295AA5CC1FF36C9D00469D3C /* GTOLicenceResultTopCellContentView.m in Sources */,
35B2E5741BAC064600AB8582 /* GTOCategoryItemView.m in Sources */,
292D0BE91FCBBCDB00B48C13 /* FilterDetailViewController.m in Sources */,
29F5C3D91FCBAA4F0052CBF1 /* PatrolExamStarCell.m in Sources */,
3506EDD21BA0194300897EBE /* NSData+EncodeAdditions.m in Sources */,
29F5C4411FCBAB410052CBF1 /* InspectionAnswerViewController.m in Sources */,
35F113B51BC918FB00432C41 /* ICRFunctionEntity.m in Sources */,
295AA5E71FF36D0E00469D3C /* GTOCollectionViewController.m in Sources */,
3506EDA41BA0166700897EBE /* LBorderView.m in Sources */,
295AA5CA1FF36C9D00469D3C /* GTOLicenceResult.m in Sources */,
29F5C3DC1FCBAA4F0052CBF1 /* ZJStandardTitleTableViewCell.m in Sources */,
29F143ED1D19569500083975 /* HeaderView.m in Sources */,
29F5C3DE1FCBAA4F0052CBF1 /* ZJPatrolDetail.m in Sources */,
......@@ -3845,13 +3822,11 @@
2978ED691D1BF40200159B4A /* NumberTableViewCell.m in Sources */,
35B2E5AB1BAC176500AB8582 /* IBTFileManager.m in Sources */,
3506EDD71BA0194300897EBE /* UIApplication+CheckFirstRun.m in Sources */,
35EB8E681BE32C2800411E45 /* GTOLicenceBoltView.m in Sources */,
35E3BB191BF087AE0081232D /* GTOAlertInfoPatrolPlanViewController.m in Sources */,
293ADF491E23726D005C1AEB /* NSDictionary+Category.m in Sources */,
29BE72341D4077BE001D60EE /* NoteTableViewCell.m in Sources */,
3506ED5C1BA0164E00897EBE /* IBTUITextField.m in Sources */,
29F5C3E81FCBAA500052CBF1 /* PatrolExamTopView.m in Sources */,
35EB8E621BE3208500411E45 /* GTOLicence.m in Sources */,
35C287C91BFAC40900A1B89D /* ICRAnnouncementDetailContentView.m in Sources */,
295FE1F11D17FAA200DF5B77 /* BusinessCollectionReusableView.m in Sources */,
29F5C4981FCBB1220052CBF1 /* PYPhoto.m in Sources */,
......@@ -3864,7 +3839,6 @@
35550C371BA13007003D6199 /* GTOHomeViewController.m in Sources */,
35B2E59F1BAC171F00AB8582 /* ICRPlaceholderTextView.m in Sources */,
35B2E58F1BAC140500AB8582 /* ICRAttachmentUnit.m in Sources */,
35D66A401BE75670004476F0 /* GTOLicenceResultTopCellContentView.m in Sources */,
293ADF4D1E2372E8005C1AEB /* QueryModel.m in Sources */,
3506ED4B1BA0164E00897EBE /* IBTTableViewUserInfo.m in Sources */,
35B2E5761BAC064600AB8582 /* GTOPatrolPlanInfoItemView.m in Sources */,
......@@ -3895,6 +3869,7 @@
29F5C49D1FCBB1220052CBF1 /* PYPhotoCell.m in Sources */,
3506EDDC1BA0194300897EBE /* UIResponder+FirstResponder.m in Sources */,
354165E01BF718E60014FD4E /* IBTTextFieldCell.m in Sources */,
295AA5CD1FF36C9D00469D3C /* GTOLicenceCheckItem.m in Sources */,
2978ED631D1BF3D300159B4A /* OilTableViewCell.m in Sources */,
292D0C0D1FCBCFE700B48C13 /* KWFormView.m in Sources */,
29B501DE1D1A898B003D4E74 /* ThirdTableViewCell.m in Sources */,
......@@ -3941,6 +3916,7 @@
3523ADC11BE24B85006D821C /* GTOPaging.m in Sources */,
29F5C4451FCBAB410052CBF1 /* InspectionPlanViewController.m in Sources */,
29603D8D1D1CDEA000951670 /* DateHelper.m in Sources */,
295AA5E21FF36CC600469D3C /* GTOLicenceBoltView.m in Sources */,
29EB166C1E8B9688004B4D0D /* SerialNumberTableViewCell.m in Sources */,
29F5C3D81FCBAA4F0052CBF1 /* PatrolExamSelectTableViewCell.m in Sources */,
35A53D181BF88155007184C4 /* GTOPioneeringAddressInfoView.m in Sources */,
......@@ -3954,7 +3930,6 @@
2998EC621FCC0BCE007082B9 /* MJRefreshBackStateFooter.m in Sources */,
3523ADC41BE25159006D821C /* GTORepairBoltView.m in Sources */,
29F5C4671FCBAD6C0052CBF1 /* RequestManager.m in Sources */,
35EB8E5F1BE3201C00411E45 /* GTOLicenceListViewController.m in Sources */,
29B501E91D1A986B003D4E74 /* OilHeaderView.m in Sources */,
29F5C4661FCBAD6C0052CBF1 /* NetWorkRequestManager.m in Sources */,
29F143C21D18E2E600083975 /* SeeRequestViewController.m in Sources */,
......@@ -3962,9 +3937,7 @@
35422FCD1BD6312300455F7A /* GTOPioneeringSurveyItem.m in Sources */,
29603D931D1CDFE500951670 /* DetailTimeViewController.m in Sources */,
35C287C81BFAC40900A1B89D /* ICRAnnocementContentView.m in Sources */,
35A4788E1BE8556700158246 /* GTOLicenceEditViewController.m in Sources */,
352652E31BCD05AA001CB9C3 /* GTOPatrolTemplate.m in Sources */,
35D66A431BE76B18004476F0 /* GTOLicenceResult.m in Sources */,
29F5C4911FCBB1220052CBF1 /* OSSHelper.m in Sources */,
3506ED521BA0164E00897EBE /* IBTSegmentedControl.m in Sources */,
3506ED491BA0164E00897EBE /* IBTTableViewInfo.m in Sources */,
......@@ -4000,7 +3973,6 @@
2978ED481D1BB0BA00159B4A /* PromptTableViewController.m in Sources */,
3506ED971BA0166700897EBE /* ASStarRatingView.m in Sources */,
2998EC5B1FCC0BCE007082B9 /* MJRefreshFooter.m in Sources */,
35D66A3D1BE75239004476F0 /* GTOLiceneResultViewController.m in Sources */,
35FC36441BCE554A00C62137 /* GTOPioneeringTemplateViewController.m in Sources */,
35AD140C1BD158F500B2D91B /* GTOQMutiSelectViewController.m in Sources */,
2978ED6C1D1BF44500159B4A /* TimeSelectTableViewCell.m in Sources */,
......@@ -4008,7 +3980,6 @@
292D0BE81FCBBCDB00B48C13 /* FilterConfig.m in Sources */,
294154451D1D190800B3B761 /* TotalPriceTableViewCell.m in Sources */,
29F5C3E61FCBAA4F0052CBF1 /* PatrolExamState.m in Sources */,
35D66A3A1BE709E5004476F0 /* GTOAlertInfoLicenceViewController.m in Sources */,
35B2E5711BAC064600AB8582 /* ICRQuestionManager.m in Sources */,
292D0BEB1FCBBCDB00B48C13 /* FilterListViewController.m in Sources */,
3522CC451C17D24A00C9FCB5 /* GTOPositionMapViewController.m in Sources */,
......@@ -4019,7 +3990,6 @@
292D0BF01FCBBCDB00B48C13 /* FilterSearchModel.m in Sources */,
292D0BF31FCBBCDB00B48C13 /* FilterViewModel.m in Sources */,
3506ED461BA0164E00897EBE /* IBTRefreshTableView.m in Sources */,
35D66A461BE76B7B004476F0 /* GTOLicenceCheckItem.m in Sources */,
35B2E56C1BAC064600AB8582 /* ICRQStarViewController.m in Sources */,
3506ECEA1BA012BB00897EBE /* AppDelegate.m in Sources */,
35B2E56A1BAC064600AB8582 /* ICRQScoreViewController.m in Sources */,
......@@ -4036,7 +4006,6 @@
354165D61BF717670014FD4E /* ICRConfigurationViewController.m in Sources */,
292D0C2A1FCBE70A00B48C13 /* AccountConfigModel.m in Sources */,
35550C391BA13007003D6199 /* ICRLoginViewController.m in Sources */,
35BB5A2C1C23B04F00B9F452 /* GTOButtonHeaderContentView.m in Sources */,
29F5C3D11FCBAA4F0052CBF1 /* PatrolTaskCollectionReusableView.m in Sources */,
29F143D11D18E32400083975 /* SeeObtainViewController.m in Sources */,
292D0BE71FCBBCDB00B48C13 /* FilterTimeChooseTableViewCell.m in Sources */,
......@@ -4044,13 +4013,14 @@
29F5C3DD1FCBAA4F0052CBF1 /* PatrolTaskCustomModel.m in Sources */,
29F5C45C1FCBAC920052CBF1 /* PostAttachmentModel.m in Sources */,
292D0BF11FCBBCDB00B48C13 /* FilterStoreTypeModel.m in Sources */,
35A478941BE8BD6500158246 /* GTOLicenceResultHeaderContentView.m in Sources */,
29F5C40A1FCBAACB0052CBF1 /* BasePatrolExamTableViewCell.m in Sources */,
35B2E5791BAC064600AB8582 /* SortMaskView.m in Sources */,
2978ED521D1BC74D00159B4A /* TimeSelectViewController.m in Sources */,
35AD14111BD158F500B2D91B /* GTOQStarViewController.m in Sources */,
29F5C3DB1FCBAA4F0052CBF1 /* ZJStandardPictureTableViewCell.m in Sources */,
35B2E5821BAC110000AB8582 /* ICRBaseViewController.m in Sources */,
295AA5E31FF36CC600469D3C /* GTOLicenceListCellContentView.m in Sources */,
295AA5D21FF36C9D00469D3C /* GTOAlertInfoLicenceViewController.m in Sources */,
35E6BB251BD1B59500227D53 /* GTOQSingleScoreViewController.m in Sources */,
2998EC6A1FCC0BCE007082B9 /* UIScrollView+MJRefresh.m in Sources */,
35B2E5671BAC064600AB8582 /* ICRQMutiSelectViewController.m in Sources */,
......@@ -4060,19 +4030,20 @@
29F5C4681FCBAD6C0052CBF1 /* UrlConst.m in Sources */,
294154481D1D192400B3B761 /* BeginEndDateTableViewCell.m in Sources */,
295FE1EE1D17F60E00DF5B77 /* BusinessCollectionViewCell.m in Sources */,
295AA5D11FF36C9D00469D3C /* GTOLicenceListSimpleCellContentView.m in Sources */,
29BE722E1D40773F001D60EE /* OilNumberTableViewCell.m in Sources */,
35C287C71BFAC40900A1B89D /* ICRAnnouncement.m in Sources */,
3506EDA51BA0166700897EBE /* NALLabelsMatrix.m in Sources */,
2941544E1D1D1ECA00B3B761 /* wareHouseView.m in Sources */,
35936C0A1BC8CD9A00BDE751 /* GTOPatrolPlanAllTopItem.m in Sources */,
35FC36411BCE52FB00C62137 /* ChooseParentViewController.m in Sources */,
295AA5E11FF36CC600469D3C /* GTOLicenceListViewController.m in Sources */,
29F5C40E1FCBAACB0052CBF1 /* BaseViewModel.m in Sources */,
294154361D1CFD3000B3B761 /* HttpRequestManager.m in Sources */,
2998EC5F1FCC0BCE007082B9 /* MJRefreshAutoStateFooter.m in Sources */,
29F5C44C1FCBAB410052CBF1 /* InspectionDetailsSectionTableViewCell.m in Sources */,
2933CC4D1D20FF80000F8EE6 /* SeeObtainHeaderView.m in Sources */,
291ED6291D1AA1FF0021E632 /* SourceOrderSectionView.m in Sources */,
35EB8E651BE32C1600411E45 /* GTOLicenceListCellContentView.m in Sources */,
35422FBD1BD54B8700455F7A /* GTOAlertInfoPioneeringViewController.m in Sources */,
35B2E5981BAC14ED00AB8582 /* ICRPostTask.m in Sources */,
29F143E91D19522C00083975 /* NewOrderTableViewCell.m in Sources */,
......@@ -4089,6 +4060,7 @@
294154421D1D18E600B3B761 /* PriceNumberTypeTableViewCell.m in Sources */,
29F5C4531FCBAB410052CBF1 /* SuspensionView.m in Sources */,
356587341C226A0E0077FCE9 /* GTOBusinessSignInViewController.m in Sources */,
295AA5CF1FF36C9D00469D3C /* GTOLicenceResultHeaderContentView.m in Sources */,
29F5C4941FCBB1220052CBF1 /* PYPhotosNavigationController.m in Sources */,
29F5C44A1FCBAB410052CBF1 /* InspectionAnswerSectionView.m in Sources */,
29F5C44E1FCBAB410052CBF1 /* InspectionPhotoCollectionViewCell.m in Sources */,
......@@ -4111,17 +4083,19 @@
29F5C45D1FCBAC920052CBF1 /* ThirdPartyUploadManager.m in Sources */,
35B2E56D1BAC064600AB8582 /* ICRQStoreStudyViewController.m in Sources */,
35B2E5941BAC14DF00AB8582 /* ICRTask.m in Sources */,
295AA5D01FF36C9D00469D3C /* GTOLicenceEditViewController.m in Sources */,
35CCE19F1BD0D0AD00DACB0F /* GTOAnswerDetail.m in Sources */,
292D0BEE1FCBBCDB00B48C13 /* FilterInspectItemsModel.m in Sources */,
29F143BF1D18E2CF00083975 /* NewRequestViewController.m in Sources */,
29F5C4431FCBAB410052CBF1 /* InspectionPhotoViewController.m in Sources */,
35E4EC3B1BE9C479001AF192 /* GTORepairAddPhotoView.m in Sources */,
2998EC591FCC0BCE007082B9 /* MJRefreshBackFooter.m in Sources */,
29460DF21D1A22C8001FCD34 /* GTOLicenceNewViewController.m in Sources */,
3506ED451BA0164E00897EBE /* IBTModel.m in Sources */,
295AA5D71FF36CB100469D3C /* GTOLicenceNewViewController.m in Sources */,
2998EC281FCC03DC007082B9 /* YXProgressHUDView.m in Sources */,
29F5C4971FCBB1220052CBF1 /* PYPhotosViewController.m in Sources */,
35B2E55F1BAC064600AB8582 /* GTOPatrolPlanListViewController.m in Sources */,
295AA5D81FF36CB100469D3C /* GTOButtonHeaderContentView.m in Sources */,
35AD14121BD158F500B2D91B /* GTOQStoreStudyViewController.m in Sources */,
29F143DB1D1902F400083975 /* SeePriceCollectionReusableView.m in Sources */,
297C52721D260E3D007AB90B /* CommitTableViewCell.m in Sources */,
......@@ -4130,7 +4104,9 @@
297BFE891D221BAD000F41D1 /* NSArray+ ZXPUnicode.m in Sources */,
3506ED4F1BA0164E00897EBE /* IBTLoadingView.m in Sources */,
3513FCB41BF9DDED0079EB81 /* GTOPermission.m in Sources */,
295AA5CB1FF36C9D00469D3C /* GTOLiceneResultViewController.m in Sources */,
3506EDA11BA0166700897EBE /* JTPopOverWindow.m in Sources */,
295AA5E41FF36CC600469D3C /* GTOLicence.m in Sources */,
35B2E5681BAC064600AB8582 /* ICRQReseachViewController.m in Sources */,
29603D901D1CDEA000951670 /* NSDate+CalculateDay.m in Sources */,
35B2E55D1BAC064600AB8582 /* GTOAllPatrolPlanViewController.m in Sources */,
......@@ -4140,7 +4116,6 @@
3506ED481BA0164E00897EBE /* IBTTableViewCellInfo.m in Sources */,
3506EDA01BA0166700897EBE /* JTImagePreviewer.m in Sources */,
354B05501BEB442400805F54 /* GTOLicenceCheckListViewController.m in Sources */,
35A478911BE8A97900158246 /* GTOLicenceListSimpleCellContentView.m in Sources */,
2933CC571D213377000F8EE6 /* OrderDetailsViewController.m in Sources */,
35C72D1F1BB93C1A00D8ACBD /* GTOPatrolPlanResultHeaderItem.m in Sources */,
352652D51BCD006C001CB9C3 /* GTOPioneeringListViewController.m in Sources */,
......
total/GTOApp/Business/BusinessViewController.m
View file @ abf8a10d
......@@ -126,7 +126,7 @@
,@"function_vicheck"
,@"function_vicheckresult",nil];
NSArray *titleArray = [NSArray arrayWithObjects:
@"临时VI检查"
@"VI抽查"
,@"VI检查任务"
,@"VI检查结果",nil];
NSDictionary *dict = @{@"image":[imageArray objectAtIndex:i],@"title":[titleArray objectAtIndex:i]};
......
total/GTOApp/Business/PatroIInspectionResults(VI巡检结果)/View/InspectionAnswerTableViewCell.m
View file @ abf8a10d
......@@ -157,7 +157,22 @@
[self noAnswersCondition];return;
}
NewDetails *detail = [self.answerModel.details firstObject];
self.contentLabel.text = [NSString stringWithFormat:@"%@",(detail.index == ONE)?@"是":@"否"];
NSString *string;
switch (detail.index) {
case 1:
string = @"是";
break;
case 2:
string = @"否";
break;
case 3:
string = @"无此项";
break;
default:
break;
}
self.contentLabel.text = string;
[self addImageAttachment];
}
......
total/GTOApp/Business/PatrolOnline(VI巡检)/Cells/QuestionCells/PatrolExamAttachmentCell.m
View file @ abf8a10d
......@@ -58,7 +58,7 @@
[self.btnAtt setTitleColor:RGBA(227, 12, 53, 1) forState:UIControlStateNormal];
}
}else {
if (cellModel.question.needPhoto) {
if (photoType(cellModel.question.photoType) != PHOTO_TYPE_NO) {
[self.btnAtt setBackgroundImage:TCImage(@"patrol_exam_btn_bg_red") forState:UIControlStateNormal];
[self.btnAtt setImage:TCImage(@"patrol_exam_camera_red") forState:UIControlStateNormal];
if (self.cellModel.answer.resultAttachments.count > 0) {
......
total/GTOApp/Business/PatrolOnline(VI巡检)/Models/ZJPatrolDetail.h
View file @ abf8a10d
......@@ -174,17 +174,17 @@
@property (nonatomic, strong) NSNumber <Optional> * lineNo;
@property (nonatomic, strong) NSNumber <Optional> * scoreTo;
/**
是否必须拍照
拍照类型
*/
@property (nonatomic, assign) BOOL needPhoto;
@property (nonatomic, copy) NSString *photoType;
@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/PatrolAttachmentViewController.m
View file @ abf8a10d
......@@ -92,7 +92,8 @@
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
ZJPictureTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ZJPictureTableViewCell" forIndexPath:indexPath];
NSString *memarkString = [NSString stringWithFormat:@"%@ %@\n%@ %@",kUser.f_user_name,self.cellModel.question.title,[[NSDate date] httpParameterString],self.cellModel.viewModel.inspector.store_name];
[cell configCellWithViewModel:self.viewModel indexPath:indexPath target:self remarkString:memarkString];
PHOTO_TYPE type = photoType(self.cellModel.question.photoType);
[cell configCellWithViewModel:self.viewModel indexPath:indexPath target:self remarkString:memarkString photoType:type];
@weakify(self);
cell.blockReloadData = ^{
@strongify(self);
......
total/GTOApp/Business/PatrolOnline(VI巡检)/ViewConstrollers/PatrolExamViewController.m
View file @ abf8a10d
......@@ -326,7 +326,7 @@
}
for (NSInteger i = 0; i < self.viewModel.arrCellData.count; i++) {
PatrolExamCellViewModel *vm = self.viewModel.arrCellData[i];
if (vm.question.needPhoto) {
if (1) {
if ([questionArray containsObject:vm.question.uuid]) {
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:i inSection:0];
[self.tableView scrollToRowAtIndexPath:indexPath atScrollPosition:(UITableViewScrollPositionMiddle) animated:YES];
......
total/GTOApp/Business/PatrolOnline(VI巡检)/ViewConstrollers/PatrolTempCheckViewController.m
View file @ abf8a10d
......@@ -43,7 +43,7 @@
[self addStoreChildVc];
[self addHistoryButtonItem];
self.title = @"临时VI检查";
self.title = @"VI抽查";
}
#pragma mark -布局完成
......@@ -97,7 +97,7 @@
[RequestManager request_CreatePatrolTempCheck:weakSelf.selectedStoreModel.uuid success:^(id returnValue) {
[IBTLoadingView hideHUDWithText:nil];
if ([ BaseViewModel verifyData:returnValue]) {
[IBTLoadingView showTextOnly:@"生成VI临时VI检查任务成功"];
[IBTLoadingView showTextOnly:@"生成VIVI抽查任务成功"];
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/Repair/GTOLicenceNewViewController.h deleted 100644 → 0
View file @ 4ba86e22
//
// GTORepairNewViewController.h
// total
//
// Created by freecui on 15/10/31.
// Copyright © 2015年 free. All rights reserved.
//
#import <UIKit/UIKit.h>
@class GTORepair;
@interface GTOLicenceNewViewController : UIViewController
@property (nonatomic, strong) GTORepair *d_repair;
//- (instancetype)initWithRepairUuid: (NSString *)repairUuid;
@end
total/GTOApp/Business/Repair/GTOLicenceNewViewController.m deleted 100644 → 0
View file @ 4ba86e22
//
// GTORepairNewViewController.m
// total
//
// Created by freecui on 15/10/31.
// Copyright © 2015年 free. All rights reserved.
//
#import "GTOLicenceNewViewController.h"
#import "RETableViewManager.h"
#import "RETableViewOptionsController.h"
#import "GXFBottomView.h"
#import "GTOPioneeringTemplateViewController.h"
#import "GTOPatrolTemplate.h"
#import "GTOAlertInfoLicenceViewController.h"
#import "GTOLicence.h"
#import "GTORepair.h"
#import "GTOQuestion.h"
#import "GTOAnswer.h"
#import "GTOQuestionManager.h"
#import "GTODisplayResult.h"
#import "GTOLiceneResultViewController.h"
#import "GTOCollectionViewController.h"
#import "ICRPostAttachment.h"
@interface GTOLicenceNewViewController ()
<RETableViewManagerDelegate,GXFBottomViewDelegate,
GTOAlertInfoLicenceViewControllerDelegate>
//IBTDatePickerDelegate>
typedef NS_ENUM(NSUInteger, bottomTag) {
kbottomDelBtnsTag = 0,
kbottomBackBtnsTag
};
#define BOTTOM_TEXT_DELETE @"删除"
#define BOTTOM_TEXT_BACK @"返回"
@property (nonatomic, strong) UITableView *c_tableView;
@property (strong, readwrite, nonatomic) RETableViewManager *manager;
@property (strong, readwrite, nonatomic) RETextItem *repairBillNumberItem;
@property (strong, readwrite, nonatomic) RETextItem *applicantItem;
@property (strong, readwrite, nonatomic) RERadioItem *valideTimeItem;
@property (strong, readwrite, nonatomic) RERadioItem *riskGradeItem;
@property (strong, readwrite, nonatomic) RERadioItem *licenceTypeItem;
@property (nonatomic, strong) GTOPatrolTemplate *d_patrolTemplate;
@property (nonatomic, assign) BOOL isStartlicence;//
@property (nonatomic, assign) BOOL d_isClosed; //点击弹框的“关闭”按钮
@property (nonatomic, assign) BOOL d_isNext;// 非弹框上的“下一步”
@property (nonatomic, strong) GTOLicence *d_licence;
@property (nonatomic, strong) GTOAlertInfoLicenceViewController *alertInfoVC;
@property (nonatomic, strong) NSArray *d_arrCategorys; //问题按区域分
@property (nonatomic, strong) GXFBottomView *bottomV;
@end
@implementation GTOLicenceNewViewController
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
self.title = @"新增许可证";
[self p_initData];
[self p_initWithSubViews];
}
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
[self fetchLocalNoSubmittedLicence];
}
- (void)fetchLocalNoSubmittedLicence {
ICRDatabaseFetchBlock fetchBlk = ^FMResultSet *(FMDatabase *db) {
NSString * sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE %@=? AND %@ = ?", [GTOLicence TableName], @"state",@"repairUuid"];
NSLog(@"%@",sql);
return [db executeQuery:sql,GTO_PIONEERING_STATE_LOCAL,_d_repair.uuid];
};
__weak typeof(self)weakSelf = self;
ICRDatabaseFetchResultsBlock fetchResultsBlk = ^(NSArray *fetchedObjects) {
__strong __typeof(weakSelf)strongSelf = weakSelf;
if (!fetchedObjects) {
return ;
}
if (fetchedObjects) {
[self p_initData];
self.d_licence = fetchedObjects[0];
//tableview
_valideTimeItem.value = [NSString stringWithFormat:@"%ld",_d_licence.validHours];
_riskGradeItem.value = _d_licence.riskGrade;
_licenceTypeItem.value = _d_licence.licenceType;
[_valideTimeItem reloadRowWithAnimation:UITableViewRowAnimationNone];
[_riskGradeItem reloadRowWithAnimation:UITableViewRowAnimationNone];
[_licenceTypeItem reloadRowWithAnimation:UITableViewRowAnimationNone];
_c_tableView.userInteractionEnabled = NO;
if (self.bottomV.tag == kbottomBackBtnsTag) {
self.bottomV.tag = kbottomDelBtnsTag;
[self.bottomV.f_leftBtn setTitle:BOTTOM_TEXT_DELETE forState:UIControlStateNormal];
}
}
[strongSelf p_addAlerInfoLicenceView];
};
ICRDataBaseController *dbCtrl = [ICRDataBaseController sharedController];
[dbCtrl runFetchForClass:[GTOLicence class]
fetchBlock:fetchBlk
fetchResultsBlock:fetchResultsBlk];
}
- (void)p_initData {
if (!_d_licence) {
self.d_licence = [[GTOLicence alloc]init];
}
}
- (void)p_initWithSubViews {
self.c_tableView = [[UITableView alloc]initWithFrame:CGRectMake(0, -44,ScreenSize.width, 44 * 6) style:(UITableViewStylePlain)];
[self.view addSubview:self.c_tableView];
self.manager = [[RETableViewManager alloc] initWithTableView:self.c_tableView delegate:self];
__typeof (&*self) __weak weakSelf = self;
RETableViewSection *section = [RETableViewSection sectionWithHeaderTitle:@"Basic controls"];
[self.manager addSection:section];
self.repairBillNumberItem = [RETextItem itemWithTitle:@"报修单号：" value:_d_repair.billnumber placeholder:@"请输入报修单号"];
self.applicantItem = [RETextItem itemWithTitle:@"申请人：" value:[[ICRUserUtil sharedInstance] f_user_name] placeholder:@"请输入申请人姓名"];
self.licenceTypeItem = [RERadioItem itemWithTitle:@"许可证类型：" value:nil selectionHandler:^(RERadioItem *item) {
GTOPioneeringTemplateViewController *VC = [[GTOPioneeringTemplateViewController alloc]init];
VC.purpose = @"licence";
// if (VC.choseBaseInfo) {
VC.choseBaseInfo = ^(NSArray *templateNames) {
GTOPatrolTemplate *patroTemplate = templateNames[0];
self.licenceTypeItem.value = patroTemplate.name;
self.d_patrolTemplate = patroTemplate;
[item reloadRowWithAnimation:UITableViewRowAnimationNone];
};
[self PushViewController:VC animated:YES];
}];
self.valideTimeItem = [RERadioItem itemWithTitle:@"有效时间(h)：" value:nil selectionHandler:^(RERadioItem *item) {
[item selectRowAnimated:YES];
// NSArray *arrRiskGrades = @[@"8",@"12",@"24",@"48",@"72"];
// RETableViewOptionsController *optionsController = [[RETableViewOptionsController alloc] initWithItem:item options:arrRiskGrades multipleChoice:NO completionHandler:^(RETableViewItem *selectedItem){
// [weakSelf.navigationController popViewControllerAnimated:YES];
//// if (!self.d_licence) {
//// self.d_licence.riskGrade = item.value;
//// }
// [item reloadRowWithAnimation:UITableViewRowAnimationNone];
// }];
// optionsController.delegate = weakSelf;
// optionsController.style = section.style;
// if (weakSelf.c_tableView.backgroundView == nil) {
// optionsController.tableView.backgroundColor = weakSelf.c_tableView.backgroundColor;
// optionsController.tableView.backgroundView = nil;
// }
//
// // Push the options controller
// //
// [weakSelf.navigationController pushViewController:optionsController animated:YES];
// GTOCollectionViewController *dVC = [[GTOCollectionViewController alloc] init];
// dVC.blockValideTime = ^(NSUInteger validTime){
// self.valideTimeItem.value = [NSString stringWithFormat:@"%ld",validTime];
// [item reloadRowWithAnimation:UITableViewRowAnimationNone];
//
// };
// [self PushViewController:dVC animated:YES];
}];
self.riskGradeItem = [RERadioItem itemWithTitle:@"危险等级：" value:nil selectionHandler:^(RERadioItem *item) {
[item deselectRowAnimated:YES];
NSArray *arrRiskGrades = @[@"高",@"中"];
//
RETableViewOptionsController *optionsController = [[RETableViewOptionsController alloc] initWithItem:item options:arrRiskGrades multipleChoice:NO completionHandler:^(RETableViewItem *selectedItem){
[weakSelf.navigationController popViewControllerAnimated:YES];
if (!self.d_licence) {
self.d_licence.riskGrade = item.value;
}
if ([item.value isEqualToString:@"高"]) {
self.valideTimeItem.value = @"8";
}else{
self.valideTimeItem.value = @"72";
}
[self.valideTimeItem reloadRowWithAnimation:UITableViewRowAnimationNone];
[item reloadRowWithAnimation:UITableViewRowAnimationNone]; // same as [weakSelf.tableView reloadRowsAtIndexPaths:@[item.indexPath] withRowAnimation:UITableViewRowAnimationNone];
}];
// Adjust styles
//
optionsController.delegate = weakSelf;
optionsController.style = section.style;
if (weakSelf.c_tableView.backgroundView == nil) {
optionsController.tableView.backgroundColor = weakSelf.c_tableView.backgroundColor;
optionsController.tableView.backgroundView = nil;
}
// Push the options controller
//
[weakSelf.navigationController pushViewController:optionsController animated:YES];
}];
[section addItem:_repairBillNumberItem];
[section addItem:_applicantItem];
[section addItem:_riskGradeItem];
[section addItem:_licenceTypeItem];
[section addItem:_valideTimeItem];
CGRect rect = CGRectMake(0, self.c_tableView.bottom +20, self.view.width, BottomViewHeight);
GXFBottomView *bottomV = [[GXFBottomView alloc]initWithFrame:rect leftButtonColor:GTO_BLUE_DEEP_COLOR rightButtonColor:GTO_RED_COLOR LeftBtnTitle:BOTTOM_TEXT_BACK rightBtnTitle:@"下一步"];
bottomV.delegate = self;
bottomV.tag = kbottomBackBtnsTag;
self.bottomV = bottomV;
[self.view addSubview:_bottomV];
}
- (void)p_addAlerInfoLicenceView {
GTOAlertInfoLicenceViewController *alertInfoVC = [[GTOAlertInfoLicenceViewController alloc]initWithLicence:_d_licence ];
self.alertInfoVC = alertInfoVC;
alertInfoVC.delegate = self;
[[UIApplication sharedApplication].keyWindow addSubview:_alertInfoVC.view];
}
- (void)p_licenceWithatrolTemplate: (GTOPatrolTemplate *)patrolTemple
{
[self p_initData];
ICRUserUtil *userU = [ICRUserUtil sharedInstance];
self.d_licence.uuid = [userU mobileID];
self.d_licence.version = 0;
self.d_licence.requestDate = [[NSDate date] httpParameterString];
self.d_licence.state = GTO_LICENCE_STATE_LOCAL;
self.d_licence.engineer_uuid = userU.f_user_uuid;
self.d_licence.engineer_name = userU.f_user_name;
self.d_licence.engineer_code = userU.f_user_code;
self.d_licence.licenceType = patrolTemple.name;
self.d_licence.repairUuid = _d_repair.uuid;
self.d_licence.repairNumber = _d_repair.billnumber;
self.d_licence.riskGrade = self.riskGradeItem.value;
// self.d_licence.beginDate
// self.d_licence.endDate
self.d_licence.store_uuid = _d_repair.store_uuid;
self.d_licence.store_name = _d_repair.store_name;
self.d_licence.store_code = _d_repair.store_code;
self.d_licence.validHours = [self.valideTimeItem.value integerValue];
// self.d_licence.create_time = patrolTemple.create_time;//
// self.d_licence.create_id = patrolTemple.create_id;
// self.d_licence.create_operName = patrolTemple.create_operName;
// self.d_licence.lastModify_time = patrolTemple.lastModify_time;
// self.d_licence.lastModify_id = patrolTemple.lastModify_id;
//
// self.d_licence.purpose = patrolTemple.purpose;
NSMutableArray *muArrQuestions = [NSMutableArray array];
for(NSDictionary *dictQuestion in patrolTemple.questions) {
GTOQuestion *question = [GTOQuestion DBObject];
[question praseFromJsonDict:dictQuestion];
question.uuid = [[ICRUserUtil sharedInstance] mobileID];
question.licenceUuid = _d_licence.uuid;
[question saveToDBWithHandleData:NULL complete:NULL fail:NULL];
[muArrQuestions addObject:[question dictForCommit]];
}
self.d_licence.questions = muArrQuestions;//patrolTemple.questions;//
[self p_licenceDisplayResults];
}
- (void)p_saveLicence {
__weak typeof(self)weakSelf = self;
[_d_licence saveToDBWithHandleData:NULL
complete:^{
__strong __typeof(weakSelf)strongSelf = weakSelf;
[IBTLoadingView hideHUDWithText:nil];
self.isStartlicence = YES;
GTOAlertInfoLicenceViewController *alertInfoVC = [[GTOAlertInfoLicenceViewController alloc]initWithLicence:_d_licence];
self.alertInfoVC = alertInfoVC;
alertInfoVC.delegate = self;
[[UIApplication sharedApplication].keyWindow addSubview:_alertInfoVC.view];
}
fail:^(NSError *error) {
[IBTLoadingView hideHUDWithText:error.localizedDescription];
}];
}
- (void)p_licenceDisplayResults {
//问题的分类
if (!_d_arrCategorys) {
NSUInteger uiQuestionsCount = [_d_licence.questions count];
NSArray *arrQuestIDs = [_d_licence.questions valueForKeyPath:@"uuid"];
ICRDatabaseFetchBlock fetchBlk = ^FMResultSet *(FMDatabase *db) {
NSString * sql = [NSString stringWithFormat:@"SELECT DISTINCT category FROM %@ WHERE %@ IN %@ ORDER BY %@ ASC", [GTOQuestion TableName], @"uuid", [IBTModel ValuePlaceholdersWithCount:uiQuestionsCount], @"lineNo"];
NSLog(@"%@",sql);//lineno没有，因为现在后台没有给问题排序
return [db executeQuery:sql withArgumentsInArray:arrQuestIDs];
};
__weak typeof(self)weakSelf = self;
ICRDatabaseFetchResultsBlock fetchResultsBlk = ^(NSArray *fetchedObjects) {
__strong __typeof(weakSelf)strongSelf = weakSelf;
NSMutableArray *muArr = [NSMutableArray array];
for(GTOQuestion * question in fetchedObjects){
[muArr addObject:question.category];
}
strongSelf.d_arrCategorys = [NSArray arrayWithArray:muArr];
};
ICRDataBaseController *dbCtrl = [ICRDataBaseController sharedController];
[dbCtrl runFetchForClass:[GTOQuestion class]
fetchBlock:fetchBlk
fetchResultsBlock:fetchResultsBlk];
}
//答案 （新建任务答案肯定是没有的，所以这个可以不写）
ICRDatabaseFetchBlock fetchBlk = ^FMResultSet *(FMDatabase *db) {
NSString * sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE %@ = ?", [GTOAnswer TableName], @"licenceUuid"];
NSLog(@"%@",sql);//lineno没有，因为现在后台没有给问题排序
return [db executeQuery:sql,_d_licence.uuid];
};
__weak typeof(self)weakSelf = self;
ICRDatabaseFetchResultsBlock fetchResultsBlk = ^(NSArray *fetchedObjects) {
__strong __typeof(weakSelf)strongSelf = weakSelf;
NSMutableArray *muArrDisplayRs = [NSMutableArray array];
for( NSString *category in _d_arrCategorys){
//答案
GTODisplayResult *displayR = [[GTODisplayResult alloc]init];
NSMutableArray *muArrAnswers = [NSMutableArray array];
for(GTOAnswer *answer in fetchedObjects){
if ([answer.category isEqualToString:category])
//[muArrAnswers addObject:answer];
[muArrAnswers addObject:[answer dictForCommit]];
}
//问题
NSMutableArray *muArrQuestions = [NSMutableArray array];
for(NSDictionary *dict in _d_licence.questions){
if ([dict[@"category"] isEqualToString:category]) {
GTOQuestion *question = [GTOQuestion DBObject];
[question praseFromJsonDict:dict];
// question.uuid = [[ICRUserUtil sharedInstance] mobileID];//给所有问题分配唯一标识
[muArrQuestions addObject:[question dictForCommit]];
}
}
displayR.arrAnswers = muArrAnswers;
displayR.category = category;
displayR.isDisplay = NO;
displayR.arrQuestions = muArrQuestions;
// displayR.answerNumber = muArrAnswers.count;
// displayR.questionNumber = muArrQuestions.count;
[muArrDisplayRs addObject:[displayR dictForCommit]];
}
// strongSelf.d_arrDisplayResults = muArrDisplayRs;
strongSelf.d_licence.arrCategorys = _d_arrCategorys;
strongSelf.d_licence.arrDisplayResults = muArrDisplayRs;
[strongSelf p_saveLicence];
[_c_tableView reloadData];
};
ICRDataBaseController *dbCtrl = [ICRDataBaseController sharedController];
[dbCtrl runFetchForClass:[GTOAnswer class]
fetchBlock:fetchBlk
fetchResultsBlock:fetchResultsBlk];
}
#pragma GXFBottomViewDelegate
- (void)bottomView:(GXFBottomView *)bottomView leftButtonClicked:(UIButton *)leftBtn {
if(bottomView.tag == kbottomBackBtnsTag){
[self PopViewControllerAnimated:YES];
return;
}
if (bottomView.tag == kbottomDelBtnsTag) {
ICRDataBaseController *dataBaseC = [ICRDataBaseController sharedController];
[dataBaseC.m_dbQueue inDatabase:^(FMDatabase *db) {
NSString *strSql = [NSString stringWithFormat:@"DELETE FROM %@ WHERE %@=?",[GTOLicence TableName],@"uuid" ];
BOOL del = [db executeUpdate:strSql,_d_licence.uuid];
if (!del) {
[IBTLoadingView showTextOnly:@"删除失败"];
return ;
}
//tableview
_valideTimeItem.value = nil;
_riskGradeItem.value = nil;
_licenceTypeItem.value = nil;
_d_arrCategorys = nil;
_d_licence = nil;
[_valideTimeItem reloadRowWithAnimation:UITableViewRowAnimationNone];
[_riskGradeItem reloadRowWithAnimation:UITableViewRowAnimationNone];
[_licenceTypeItem reloadRowWithAnimation:UITableViewRowAnimationNone];
_c_tableView.userInteractionEnabled = YES;
self.bottomV.tag = kbottomBackBtnsTag;
[self.bottomV.f_leftBtn setTitle:BOTTOM_TEXT_BACK forState:UIControlStateNormal];
}];
[self localDelete];
}
}
//本地删除
- (void)localDelete {
ICRDataBaseController *dataBaseC = [ICRDataBaseController sharedController];
//删除本地答案
[dataBaseC.m_dbQueue inDatabase:^(FMDatabase *db) {
NSString *strSql = [NSString stringWithFormat:@"DELETE FROM %@ WHERE %@=?",[GTOAnswer TableName],@"licenceUuid" ];
[db executeUpdate:strSql,_d_licence.uuid];
}];
//删除本地问题
[dataBaseC.m_dbQueue inDatabase:^(FMDatabase *db) {
NSString *strSql = [NSString stringWithFormat:@"DELETE FROM %@ WHERE %@=?",[GTOQuestion TableName],@"licenceUuid" ];
[db executeUpdate:strSql,_d_licence.uuid];
}];
//删除本地图片
[dataBaseC.m_dbQueue inDatabase:^(FMDatabase *db) {
NSString *strSql = [NSString stringWithFormat:@"DELETE FROM %@ WHERE %@=?",[ICRPostAttachment TableName],@"licenceUuid" ];
[db executeUpdate:strSql,_d_licence.uuid];
}];
}
- (void)bottomView:(GXFBottomView *)bottomView RightButtonClicked:(UIButton *)rightBtn {
if (_riskGradeItem.value.length <= 0) {
[IBTLoadingView showTextOnly:@"请选择危险等级"];
return;
}
if (_licenceTypeItem.value.length <= 0) {
[IBTLoadingView showTextOnly:@"请选择许可证类型"];
return;
}
if (_valideTimeItem.value.length <= 0) {
[IBTLoadingView showTextOnly:@"请选择有效时间"];
return;
}
if (!_d_licence.uuid) {
[self p_licenceWithatrolTemplate:_d_patrolTemplate];
} else {
[self p_addAlerInfoLicenceView];
}
_c_tableView.userInteractionEnabled = NO;
if(self.bottomV.tag == kbottomBackBtnsTag) {
self.bottomV.tag = kbottomDelBtnsTag;
[self.bottomV.f_leftBtn setTitle:BOTTOM_TEXT_DELETE forState:UIControlStateNormal];
}
}
#pragma GTOAlertInfoLicenceViewControllerDelegate
- (void)alertInfoLicenceViewController:(GTOAlertInfoLicenceViewController *)alertInfoLicence closeClickedWithBtton:(UIButton *)btn {
self.d_isClosed = YES;
[_alertInfoVC.view removeFromSuperview];
}
- (void)alertInfoLicenceViewController:(GTOAlertInfoLicenceViewController *)alertInfoLicence seeResultClickedWithBtton:(UIButton *)btn {
GTOLiceneResultViewController *resultVC = [[GTOLiceneResultViewController alloc]initWithLicence:_d_licence ];
resultVC.d_isNew = YES;
self.d_isClosed = YES;
[_alertInfoVC.view removeFromSuperview];
[self PushViewController:resultVC animated:YES];
}
- (void)alertInfoLicenceViewController:(GTOAlertInfoLicenceViewController *)alertInfoLicence nextClickedWithBtton:(UIButton *)btn {
BOOL isAllFinished = YES;
for(NSDictionary *dict in _d_licence.arrDisplayResults) {
GTODisplayResult *displayR = [GTODisplayResult DBObject];
[displayR praseFromJsonDict:dict];
if (displayR.arrAnswers.count < displayR.arrQuestions.count) {
GTOQuestionManager *mgr = [GTOQuestionManager sharedManager];
mgr.d_category = displayR.category;
// [mgr openQuestionVCFromViewControler:self Licence:_d_licence Pioneering:nil];
BOOL notEdit = NO;
if ([_d_licence.state isEqualToString:GTO_LICENCE_STATE_LOCAL ]
|| [_d_licence.state isEqualToString:GTO_LICENCE_STATE_INITIAL]) {
notEdit = NO;
} else {
notEdit = YES;
}
[mgr openQuestionVCFromViewControler:self Licence:_d_licence Pioneering:nil IsNotEdit:notEdit ProblemIndex:0];
[self alertInfoLicenceViewController:alertInfoLicence closeClickedWithBtton:nil];
isAllFinished = NO;
break;
}
}
if (isAllFinished) {
NSDictionary *dictR = [_d_licence.arrDisplayResults lastObject];
GTODisplayResult *displayR = [GTODisplayResult DBObject];
[displayR praseFromJsonDict:dictR];
GTOQuestionManager *mgr = [GTOQuestionManager sharedManager];
mgr.d_category = displayR.category;
// [mgr openQuestionVCFromViewControler:self Licence:_d_licence Pioneering:nil];
BOOL notEdit = NO;
if ([_d_licence.state isEqualToString:GTO_LICENCE_STATE_LOCAL ]
|| [_d_licence.state isEqualToString:GTO_LICENCE_STATE_INITIAL]) {
notEdit = NO;
} else {
notEdit = YES;
}
[mgr openQuestionVCFromViewControler:self Licence:_d_licence Pioneering:nil IsNotEdit:notEdit ProblemIndex:0];
[self alertInfoLicenceViewController:alertInfoLicence closeClickedWithBtton:nil];
}
}
- (void)alertInfoLicenceViewController:(GTOAlertInfoLicenceViewController *)alertInfoLicence didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
self.d_licence.isChanged = YES;
[_d_licence saveToDBWithHandleData:NULL complete:NULL fail:NULL];
GTOQuestionManager *mgr = [GTOQuestionManager sharedManager];
GTODisplayResult *displayR = [GTODisplayResult DBObject];
[displayR praseFromJsonDict:_d_licence.arrDisplayResults[indexPath.row]];
mgr.d_category = displayR.category;//alertInfoPioneering.d_arrCategorys[indexPath.row];
BOOL notEdit = NO;
if ([_d_licence.state isEqualToString:GTO_LICENCE_STATE_LOCAL ]
|| [_d_licence.state isEqualToString:GTO_LICENCE_STATE_INITIAL]) {
notEdit = NO;
} else {
notEdit = YES;
}
[mgr openQuestionVCFromViewControler:self Licence:_d_licence Pioneering:nil IsNotEdit:notEdit ProblemIndex:0];
[self alertInfoLicenceViewController:alertInfoLicence closeClickedWithBtton:nil];
}
- (void)viewWillDisappear:(BOOL)animated {
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
total/GTOApp/UserUtil/Network/RequestManager.h
View file @ abf8a10d
......@@ -152,7 +152,7 @@
+ (void)request_UploadInspectResult:(NSString *)taskUuid parmeter:(NSDictionary *)parmeter success:(SuccessBlock)success failure:(ErrorBlock)failure;
/**
生成VI临时VI检查
生成VIVI抽查
@param store_Uuid 油站ID
@param success 成功回调
......
total/GTOApp/UserUtil/Network/RequestManager.m
View file @ abf8a10d
......@@ -611,7 +611,7 @@
/**
生成VI临时VI检查
生成VIVI抽查
@param store_Uuid 油站ID
@param success 成功回调
......
total/GTOApp/UserUtil/Network/UrlConst.h
View file @ abf8a10d
......@@ -28,7 +28,7 @@ UIKIT_EXTERN NSString *const PRAISEANDINSPECTOR_PROGRESS;
UIKIT_EXTERN NSString *const SUPERVISOR_SERVICE;
//当日自检任务进度（首页）
UIKIT_EXTERN NSString *const QUERYPRAISESBYDAY;
//生成VI临时VI检查
//生成VIVI抽查
UIKIT_EXTERN NSString *const CREATEVITEMPCHECK;
//当日自检任务列表、时间轴（首页）
UIKIT_EXTERN NSString *const QUERYPRAISESBYDAY2;
......
total/GTOApp/UserUtil/Network/UrlConst.m
View file @ abf8a10d
......@@ -76,7 +76,7 @@ NSString *const QUERYPATROLINSPECTPLAN = @"vipatrol/plan/query/%@?start_date=%@&
NSString *const QUERYPATROLINSPECTDETAIL = @"vipatrol/plan/get_rstore_result/%@?store_uuid=%@";
//查询VI检查任务附件
NSString *const QUERYPATROLATTACHMENT = @"attachment/get_urls?entity_type=repairingBill&entity_uuid=%@";
//生成VI临时VI检查
//生成VIVI抽查
NSString *const CREATEVITEMPCHECK = @"vipatrol/plan/create_by_temporary/%@?store_uuid=%@";
//修改密码
NSString *const CHANGEPASSWORD = @"user/change_password/%@?time=%@&operId=%@&operName=%@";
......
total/GTOApp/UserUtil/PictureCell/ZJPictureTableViewCell.h
View file @ abf8a10d
......@@ -13,12 +13,17 @@
typedef void (^repairBlock)(void);
@interface ZJPictureTableViewCell : UITableViewCell<UICollectionViewDelegate,
UICollectionViewDataSource,DBCameraViewControllerDelegate>
UICollectionViewDataSource,DBCameraViewControllerDelegate,DBCameraContainerDelegate>
@property (weak, nonatomic) IBOutlet UICollectionView *collectionView;
@property (weak, nonatomic) IBOutlet UICollectionViewFlowLayout *layOut;
@property (weak, nonatomic) UIViewController *vc;
@property (strong, nonatomic) PicViewModel *viewModel;
/**
附件选取类型
*/
@property (nonatomic, assign) PHOTO_TYPE type;
/**
水印文字
*/
......@@ -26,6 +31,8 @@ UICollectionViewDataSource,DBCameraViewControllerDelegate>
/** 是否显示添加按钮 */
@property (nonatomic, copy) repairBlock blockReloadData;
- (void)configCellWithViewModel:(PicViewModel *)viewModel indexPath:(NSIndexPath *)indexPath target:(UIViewController *)target remarkString:(NSString *)remarkString;
- (void)configCellWithViewModel:(PicViewModel *)viewModel indexPath:(NSIndexPath *)indexPath target:(UIViewController *)target remarkString:(NSString *)remarkString photoType:(PHOTO_TYPE)photoType;
- (void)pushImagePickerController;
@end
total/GTOApp/UserUtil/PictureCell/ZJPictureTableViewCell.m
View file @ abf8a10d
......@@ -8,6 +8,9 @@
#import "ZJPictureTableViewCell.h"
#import "ZJAddPictureCollectionCell.h"
#import "DBCameraLibraryViewController.h"
#import "DBCameraContainerViewController.h"
@interface ZJPictureTableViewCell ()
......@@ -22,13 +25,13 @@
self.layOut.minimumInteritemSpacing = 10;
self.layOut.minimumLineSpacing = 10;
self.layOut.sectionInset = UIEdgeInsetsMake(10, 10, 10, 10);
// Initialization code
}
- (void)configCellWithViewModel:(PicViewModel *)viewModel indexPath:(NSIndexPath *)indexPath target:(UIViewController *)target remarkString:(NSString *)remarkString {
- (void)configCellWithViewModel:(PicViewModel *)viewModel indexPath:(NSIndexPath *)indexPath target:(UIViewController *)target remarkString:(NSString *)remarkString photoType:(PHOTO_TYPE)photoType {
self.vc = target;
self.viewModel = viewModel;
self.remarkString = remarkString;
self.type = photoType;
//如果是只读的，则直接刷新。
if (self.viewModel.type == kPicCellTypeRead) {
[self.collectionView reloadData];
......@@ -98,15 +101,44 @@
}
#pragma mark - TZImagePickerController
- (void)pushImagePickerController {
switch (self.type) {
case PHOTO_TYPE_NO:
ShowDefaultErrorView(@"此分类不用拍照", nil);
break;
case PHOTO_TYPE_ONLYPHOTO:
{
DBCameraViewController *cameraVc = [DBCameraViewController initWithDelegate:self];
[cameraVc setUseCameraSegue:NO];
[self.vc presentViewController:cameraVc animated:YES completion:nil];
}
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];
}];
}
break;
case PHOTO_TYPE_ALL:
{
DBCameraViewController *cameraController = [DBCameraViewController initWithDelegate:self];
[cameraController setForceQuadCrop:YES];
DBCameraContainerViewController *container = [[DBCameraContainerViewController alloc] initWithDelegate:self];
[container setCameraViewController:cameraController];
[container setFullScreenMode];
[self.vc presentViewController:container animated:YES completion:nil];
}
break;
default:
break;
}
}
#pragma mark - DBCameraViewControllerDelegate
- (void) dismissCamera:(id)cameraViewController{
[self.vc dismissViewControllerAnimated:YES completion:nil];
[cameraViewController restoreFullScreenMode];
......@@ -121,7 +153,6 @@
return;
}
UIImage *newImage = [image rescaleImageToSize:CGSizeMake(ScreenSize.width, ScreenSize.width * 4 / 3)];
// NSString *string = [NSString stringWithFormat:@"%@ %@",kUser.f_user_name,[[NSDate date] httpParameterString]];
NSDictionary *fontDict = @{NSForegroundColorAttributeName:[UIColor yellowColor],NSFontAttributeName:[UIFont systemFontOfSize:17]};
UIImage *waterImage = [newImage imageWaterMarkWithString:self.remarkString point:CGPointMake(20, newImage.size.height - 20) attribute:fontDict];
NSString *imageName = [self saveImageToLocal:waterImage];
......@@ -129,6 +160,18 @@
self.blockReloadData();
}
#pragma mark - DBCameraContainerDelegate
- (void) backFromController:(id)fromController
{
[self.vc dismissViewControllerAnimated:YES completion:nil];
[fromController restoreFullScreenMode];
}
- (void) switchFromController:(id)fromController toController:(id)controller
{
}
#pragma mark -保存到本地
- (NSString *)saveImageToLocal:(UIImage *)image
{
......
total/GTOApp/UserUtil/YXProgressHUDView/YXProgressHUDView.m
View file @ abf8a10d
......@@ -242,7 +242,6 @@ void PerformCustomHUDMethod(MBProgressHUD *hud,NSString *message,NSString *image
}
}
/**
进度条
默认窗口
......
total/Macro/GTOAppMacro.h
View file @ abf8a10d
......@@ -158,10 +158,39 @@ typedef NS_ENUM(NSInteger,ATTACHMENT_TYPE){
ATTACHMENT_VIDEO
};
/**
VI检查拍照类型
- PHOTO_TYPE_NO: 不允许拍照
- PHOTO_TYPE_ONLYPHOTO: 只允许拍照
- PHOTO_TYPE_ONLYLBUM: 只允许从相册选取
- PHOTO_TYPE_ALL: 可以拍照，可以从相册获取
*/
typedef NS_ENUM(NSInteger,PHOTO_TYPE) {
PHOTO_TYPE_NO = 0,
PHOTO_TYPE_ONLYPHOTO,
PHOTO_TYPE_ONLYLBUM,
PHOTO_TYPE_ALL
};
static PHOTO_TYPE photoType(NSString *type) {
if ([type isEqualToString:@"no"]) {
return PHOTO_TYPE_NO;
}
if ([type isEqualToString:@"onlyphoto"]) {
return PHOTO_TYPE_ONLYPHOTO;
}
if ([type isEqualToString:@"onlyalbum"]) {
return PHOTO_TYPE_ONLYLBUM;
}
if ([type isEqualToString:@"all"]) {
return PHOTO_TYPE_ALL;
}
return PHOTO_TYPE_ONLYPHOTO;
};
/**
附件位置
- ATTACHMENT_HTTP: 网络
- ATTACHMENT_LOCAL: 本地
*/
......@@ -179,12 +208,16 @@ typedef NS_ENUM(NSInteger,ATTACHMENT_LOCATION){
//#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"
#define HTTP_LOCAL_BASE_URL @"http://139.196.39.77:8180"
//#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"
//开发环境
//#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 HTTP_LOCAL_BASE_URL @"http://dev.gomoretech.com"
//#define HTTP_REST_API_BASE_URL @"http://dev.gomoretech.com/total-server/rest/"
#define HTTP_WEATHER_URL @"http://apis.baidu.com/heweather/weather/free"
//refreshUpdateDate
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment