diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 9178562..5530d95 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -16,6 +16,14 @@ 656EEBC826C4C7C20054E00E /* ImageCollectionViewDelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */; }; 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */; }; 656EEBCF26C529130054E00E /* Int.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBCE26C529130054E00E /* Int.swift */; }; + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */; }; + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */; }; + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */; }; + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */; }; + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */; }; + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */; }; + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */; }; + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */; }; 65BF7A2A26B937410097B132 /* InspectMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7A2826B937410097B132 /* InspectMapViewController.swift */; }; 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF7A2926B937410097B132 /* InspectMapViewController.xib */; }; 65BF7C1C26AFDDCD000FEC82 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */; }; @@ -82,6 +90,14 @@ 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCollectionViewDelCell.swift; sourceTree = ""; }; 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ImageCollectionViewDelCell.xib; sourceTree = ""; }; 656EEBCE26C529130054E00E /* Int.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Int.swift; sourceTree = ""; }; + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeInspectViewController.swift; sourceTree = ""; }; + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeInspectViewController.xib; sourceTree = ""; }; + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeEventViewController.swift; sourceTree = ""; }; + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeEventViewController.xib; sourceTree = ""; }; + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeSettingViewController.swift; sourceTree = ""; }; + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeSettingViewController.xib; sourceTree = ""; }; + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeMapViewController.swift; sourceTree = ""; }; + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeMapViewController.xib; sourceTree = ""; }; 65BF7A2826B937410097B132 /* InspectMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectMapViewController.swift; sourceTree = ""; }; 65BF7A2926B937410097B132 /* InspectMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectMapViewController.xib; sourceTree = ""; }; 65BF7A3426B9413F0097B132 /* LaserMethane-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "LaserMethane-Bridging-Header.h"; sourceTree = ""; }; @@ -598,13 +614,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 6518222226AFE95F00FCC275 /* Base */ = { - isa = PBXGroup; - children = ( - ); - path = Base; - sourceTree = ""; - }; 6518222326AFE97100FCC275 /* Extension */ = { isa = PBXGroup; children = ( @@ -658,7 +667,6 @@ 65F2DFC326AFF19900179EBD /* Coordinator */, 6518222826AFEAE500FCC275 /* ViewController */, 6518222326AFE97100FCC275 /* Extension */, - 6518222226AFE95F00FCC275 /* Base */, 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */, 65BF7C2426AFDDCD000FEC82 /* Assets.xcassets */, 65BF7C2626AFDDCD000FEC82 /* LaunchScreen.storyboard */, @@ -675,6 +683,8 @@ 65EB077326BCDF6600F9C0EC /* MapViewController.xib */, 65221CD026C0CCE40070D21C /* NewEventViewController.swift */, 65221CD126C0CCE40070D21C /* NewEventViewController.xib */, + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */, + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */, ); path = Map; sourceTree = ""; @@ -748,6 +758,8 @@ children = ( 65F2E01A26B1019200179EBD /* SettingViewController.swift */, 65F2E01B26B1019200179EBD /* SettingViewController.xib */, + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */, + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */, ); path = Settings; sourceTree = ""; @@ -789,6 +801,8 @@ 65BF7A2926B937410097B132 /* InspectMapViewController.xib */, 65EB076B26BCD76F00F9C0EC /* EventTaskViewController.swift */, 65EB076C26BCD76F00F9C0EC /* EventTaskViewController.xib */, + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */, + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */, ); path = Inspect; sourceTree = ""; @@ -800,6 +814,8 @@ 65F2E03F26B1724900179EBD /* EventViewController.xib */, 65F2E04826B25E8200179EBD /* EventDetailViewController.swift */, 65F2E04926B25E8200179EBD /* EventDetailViewController.xib */, + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */, + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */, ); path = Event; sourceTree = ""; @@ -1343,10 +1359,13 @@ 65F2E01D26B1019200179EBD /* SettingViewController.xib in Resources */, 65F2E05426B2812700179EBD /* ImageCollectionViewCell.xib in Resources */, 65BF7C2826AFDDCD000FEC82 /* LaunchScreen.storyboard in Resources */, + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */, + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */, 65221CD326C0CCE40070D21C /* NewEventViewController.xib in Resources */, 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */, 65EB077526BCDF6600F9C0EC /* MapViewController.xib in Resources */, 65F2E03D26B1723700179EBD /* InspectViewController.xib in Resources */, + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */, 65F2E04B26B25E8200179EBD /* EventDetailViewController.xib in Resources */, 65F2DFFB26B0099800179EBD /* GuideViewController.xib in Resources */, 65F2E02626B1326D00179EBD /* CommonTableViewCell.xib in Resources */, @@ -1354,6 +1373,7 @@ 65EB076E26BCD76F00F9C0EC /* EventTaskViewController.xib in Resources */, 65F2E02E26B1341300179EBD /* SwitchTableViewCell.xib in Resources */, 65F2E03326B164CC00179EBD /* LogViewController.xib in Resources */, + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */, 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */, 65F2E02226B1242200179EBD /* DefaultTableViewCell.xib in Resources */, 65BF7C2526AFDDCD000FEC82 /* Assets.xcassets in Resources */, @@ -1443,6 +1463,7 @@ 65F2E05326B2812700179EBD /* ImageCollectionViewCell.swift in Sources */, 65F2E02526B1326D00179EBD /* CommonTableViewCell.swift in Sources */, 65EB077026BCD7C300F9C0EC /* EventTaskModel.swift in Sources */, + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */, 65F2E01426B0E8CA00179EBD /* AlertHub.swift in Sources */, 65BF7DD526BB8F880097B132 /* InspectDetailModel.swift in Sources */, 65221CDF26C11D320070D21C /* LoadingHub.swift in Sources */, @@ -1457,14 +1478,17 @@ 65F2DFC526AFF1A300179EBD /* AppCoordinator.swift in Sources */, 65F2E00326B0129100179EBD /* LoginResultModel.swift in Sources */, 65F2E04E26B260BC00179EBD /* TransferValueDelegate.swift in Sources */, + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */, 656EEBCF26C529130054E00E /* Int.swift in Sources */, 65F2E05026B27B2C00179EBD /* LayerShadowHub.swift in Sources */, 65F2E00526B0129100179EBD /* InspectListModel.swift in Sources */, 65F2E00626B0129100179EBD /* BaseConfigModel.swift in Sources */, 65F2E00A26B012D700179EBD /* LoginViewController.swift in Sources */, + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */, 65EB077426BCDF6600F9C0EC /* MapViewController.swift in Sources */, 65F2E04426B2392600179EBD /* ListCustomCell.swift in Sources */, 65EB076626BCCA6E00F9C0EC /* TransferIdDelegate.swift in Sources */, + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */, 65F2DFCC26AFF2A900179EBD /* KeychainManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 9178562..5530d95 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -16,6 +16,14 @@ 656EEBC826C4C7C20054E00E /* ImageCollectionViewDelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */; }; 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */; }; 656EEBCF26C529130054E00E /* Int.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBCE26C529130054E00E /* Int.swift */; }; + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */; }; + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */; }; + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */; }; + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */; }; + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */; }; + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */; }; + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */; }; + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */; }; 65BF7A2A26B937410097B132 /* InspectMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7A2826B937410097B132 /* InspectMapViewController.swift */; }; 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF7A2926B937410097B132 /* InspectMapViewController.xib */; }; 65BF7C1C26AFDDCD000FEC82 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */; }; @@ -82,6 +90,14 @@ 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCollectionViewDelCell.swift; sourceTree = ""; }; 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ImageCollectionViewDelCell.xib; sourceTree = ""; }; 656EEBCE26C529130054E00E /* Int.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Int.swift; sourceTree = ""; }; + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeInspectViewController.swift; sourceTree = ""; }; + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeInspectViewController.xib; sourceTree = ""; }; + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeEventViewController.swift; sourceTree = ""; }; + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeEventViewController.xib; sourceTree = ""; }; + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeSettingViewController.swift; sourceTree = ""; }; + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeSettingViewController.xib; sourceTree = ""; }; + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeMapViewController.swift; sourceTree = ""; }; + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeMapViewController.xib; sourceTree = ""; }; 65BF7A2826B937410097B132 /* InspectMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectMapViewController.swift; sourceTree = ""; }; 65BF7A2926B937410097B132 /* InspectMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectMapViewController.xib; sourceTree = ""; }; 65BF7A3426B9413F0097B132 /* LaserMethane-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "LaserMethane-Bridging-Header.h"; sourceTree = ""; }; @@ -598,13 +614,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 6518222226AFE95F00FCC275 /* Base */ = { - isa = PBXGroup; - children = ( - ); - path = Base; - sourceTree = ""; - }; 6518222326AFE97100FCC275 /* Extension */ = { isa = PBXGroup; children = ( @@ -658,7 +667,6 @@ 65F2DFC326AFF19900179EBD /* Coordinator */, 6518222826AFEAE500FCC275 /* ViewController */, 6518222326AFE97100FCC275 /* Extension */, - 6518222226AFE95F00FCC275 /* Base */, 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */, 65BF7C2426AFDDCD000FEC82 /* Assets.xcassets */, 65BF7C2626AFDDCD000FEC82 /* LaunchScreen.storyboard */, @@ -675,6 +683,8 @@ 65EB077326BCDF6600F9C0EC /* MapViewController.xib */, 65221CD026C0CCE40070D21C /* NewEventViewController.swift */, 65221CD126C0CCE40070D21C /* NewEventViewController.xib */, + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */, + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */, ); path = Map; sourceTree = ""; @@ -748,6 +758,8 @@ children = ( 65F2E01A26B1019200179EBD /* SettingViewController.swift */, 65F2E01B26B1019200179EBD /* SettingViewController.xib */, + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */, + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */, ); path = Settings; sourceTree = ""; @@ -789,6 +801,8 @@ 65BF7A2926B937410097B132 /* InspectMapViewController.xib */, 65EB076B26BCD76F00F9C0EC /* EventTaskViewController.swift */, 65EB076C26BCD76F00F9C0EC /* EventTaskViewController.xib */, + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */, + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */, ); path = Inspect; sourceTree = ""; @@ -800,6 +814,8 @@ 65F2E03F26B1724900179EBD /* EventViewController.xib */, 65F2E04826B25E8200179EBD /* EventDetailViewController.swift */, 65F2E04926B25E8200179EBD /* EventDetailViewController.xib */, + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */, + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */, ); path = Event; sourceTree = ""; @@ -1343,10 +1359,13 @@ 65F2E01D26B1019200179EBD /* SettingViewController.xib in Resources */, 65F2E05426B2812700179EBD /* ImageCollectionViewCell.xib in Resources */, 65BF7C2826AFDDCD000FEC82 /* LaunchScreen.storyboard in Resources */, + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */, + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */, 65221CD326C0CCE40070D21C /* NewEventViewController.xib in Resources */, 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */, 65EB077526BCDF6600F9C0EC /* MapViewController.xib in Resources */, 65F2E03D26B1723700179EBD /* InspectViewController.xib in Resources */, + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */, 65F2E04B26B25E8200179EBD /* EventDetailViewController.xib in Resources */, 65F2DFFB26B0099800179EBD /* GuideViewController.xib in Resources */, 65F2E02626B1326D00179EBD /* CommonTableViewCell.xib in Resources */, @@ -1354,6 +1373,7 @@ 65EB076E26BCD76F00F9C0EC /* EventTaskViewController.xib in Resources */, 65F2E02E26B1341300179EBD /* SwitchTableViewCell.xib in Resources */, 65F2E03326B164CC00179EBD /* LogViewController.xib in Resources */, + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */, 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */, 65F2E02226B1242200179EBD /* DefaultTableViewCell.xib in Resources */, 65BF7C2526AFDDCD000FEC82 /* Assets.xcassets in Resources */, @@ -1443,6 +1463,7 @@ 65F2E05326B2812700179EBD /* ImageCollectionViewCell.swift in Sources */, 65F2E02526B1326D00179EBD /* CommonTableViewCell.swift in Sources */, 65EB077026BCD7C300F9C0EC /* EventTaskModel.swift in Sources */, + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */, 65F2E01426B0E8CA00179EBD /* AlertHub.swift in Sources */, 65BF7DD526BB8F880097B132 /* InspectDetailModel.swift in Sources */, 65221CDF26C11D320070D21C /* LoadingHub.swift in Sources */, @@ -1457,14 +1478,17 @@ 65F2DFC526AFF1A300179EBD /* AppCoordinator.swift in Sources */, 65F2E00326B0129100179EBD /* LoginResultModel.swift in Sources */, 65F2E04E26B260BC00179EBD /* TransferValueDelegate.swift in Sources */, + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */, 656EEBCF26C529130054E00E /* Int.swift in Sources */, 65F2E05026B27B2C00179EBD /* LayerShadowHub.swift in Sources */, 65F2E00526B0129100179EBD /* InspectListModel.swift in Sources */, 65F2E00626B0129100179EBD /* BaseConfigModel.swift in Sources */, 65F2E00A26B012D700179EBD /* LoginViewController.swift in Sources */, + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */, 65EB077426BCDF6600F9C0EC /* MapViewController.swift in Sources */, 65F2E04426B2392600179EBD /* ListCustomCell.swift in Sources */, 65EB076626BCCA6E00F9C0EC /* TransferIdDelegate.swift in Sources */, + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */, 65F2DFCC26AFF2A900179EBD /* KeychainManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 502e862..b6d908d 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 9178562..5530d95 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -16,6 +16,14 @@ 656EEBC826C4C7C20054E00E /* ImageCollectionViewDelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */; }; 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */; }; 656EEBCF26C529130054E00E /* Int.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBCE26C529130054E00E /* Int.swift */; }; + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */; }; + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */; }; + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */; }; + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */; }; + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */; }; + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */; }; + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */; }; + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */; }; 65BF7A2A26B937410097B132 /* InspectMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7A2826B937410097B132 /* InspectMapViewController.swift */; }; 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF7A2926B937410097B132 /* InspectMapViewController.xib */; }; 65BF7C1C26AFDDCD000FEC82 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */; }; @@ -82,6 +90,14 @@ 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCollectionViewDelCell.swift; sourceTree = ""; }; 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ImageCollectionViewDelCell.xib; sourceTree = ""; }; 656EEBCE26C529130054E00E /* Int.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Int.swift; sourceTree = ""; }; + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeInspectViewController.swift; sourceTree = ""; }; + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeInspectViewController.xib; sourceTree = ""; }; + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeEventViewController.swift; sourceTree = ""; }; + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeEventViewController.xib; sourceTree = ""; }; + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeSettingViewController.swift; sourceTree = ""; }; + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeSettingViewController.xib; sourceTree = ""; }; + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeMapViewController.swift; sourceTree = ""; }; + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeMapViewController.xib; sourceTree = ""; }; 65BF7A2826B937410097B132 /* InspectMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectMapViewController.swift; sourceTree = ""; }; 65BF7A2926B937410097B132 /* InspectMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectMapViewController.xib; sourceTree = ""; }; 65BF7A3426B9413F0097B132 /* LaserMethane-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "LaserMethane-Bridging-Header.h"; sourceTree = ""; }; @@ -598,13 +614,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 6518222226AFE95F00FCC275 /* Base */ = { - isa = PBXGroup; - children = ( - ); - path = Base; - sourceTree = ""; - }; 6518222326AFE97100FCC275 /* Extension */ = { isa = PBXGroup; children = ( @@ -658,7 +667,6 @@ 65F2DFC326AFF19900179EBD /* Coordinator */, 6518222826AFEAE500FCC275 /* ViewController */, 6518222326AFE97100FCC275 /* Extension */, - 6518222226AFE95F00FCC275 /* Base */, 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */, 65BF7C2426AFDDCD000FEC82 /* Assets.xcassets */, 65BF7C2626AFDDCD000FEC82 /* LaunchScreen.storyboard */, @@ -675,6 +683,8 @@ 65EB077326BCDF6600F9C0EC /* MapViewController.xib */, 65221CD026C0CCE40070D21C /* NewEventViewController.swift */, 65221CD126C0CCE40070D21C /* NewEventViewController.xib */, + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */, + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */, ); path = Map; sourceTree = ""; @@ -748,6 +758,8 @@ children = ( 65F2E01A26B1019200179EBD /* SettingViewController.swift */, 65F2E01B26B1019200179EBD /* SettingViewController.xib */, + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */, + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */, ); path = Settings; sourceTree = ""; @@ -789,6 +801,8 @@ 65BF7A2926B937410097B132 /* InspectMapViewController.xib */, 65EB076B26BCD76F00F9C0EC /* EventTaskViewController.swift */, 65EB076C26BCD76F00F9C0EC /* EventTaskViewController.xib */, + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */, + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */, ); path = Inspect; sourceTree = ""; @@ -800,6 +814,8 @@ 65F2E03F26B1724900179EBD /* EventViewController.xib */, 65F2E04826B25E8200179EBD /* EventDetailViewController.swift */, 65F2E04926B25E8200179EBD /* EventDetailViewController.xib */, + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */, + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */, ); path = Event; sourceTree = ""; @@ -1343,10 +1359,13 @@ 65F2E01D26B1019200179EBD /* SettingViewController.xib in Resources */, 65F2E05426B2812700179EBD /* ImageCollectionViewCell.xib in Resources */, 65BF7C2826AFDDCD000FEC82 /* LaunchScreen.storyboard in Resources */, + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */, + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */, 65221CD326C0CCE40070D21C /* NewEventViewController.xib in Resources */, 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */, 65EB077526BCDF6600F9C0EC /* MapViewController.xib in Resources */, 65F2E03D26B1723700179EBD /* InspectViewController.xib in Resources */, + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */, 65F2E04B26B25E8200179EBD /* EventDetailViewController.xib in Resources */, 65F2DFFB26B0099800179EBD /* GuideViewController.xib in Resources */, 65F2E02626B1326D00179EBD /* CommonTableViewCell.xib in Resources */, @@ -1354,6 +1373,7 @@ 65EB076E26BCD76F00F9C0EC /* EventTaskViewController.xib in Resources */, 65F2E02E26B1341300179EBD /* SwitchTableViewCell.xib in Resources */, 65F2E03326B164CC00179EBD /* LogViewController.xib in Resources */, + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */, 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */, 65F2E02226B1242200179EBD /* DefaultTableViewCell.xib in Resources */, 65BF7C2526AFDDCD000FEC82 /* Assets.xcassets in Resources */, @@ -1443,6 +1463,7 @@ 65F2E05326B2812700179EBD /* ImageCollectionViewCell.swift in Sources */, 65F2E02526B1326D00179EBD /* CommonTableViewCell.swift in Sources */, 65EB077026BCD7C300F9C0EC /* EventTaskModel.swift in Sources */, + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */, 65F2E01426B0E8CA00179EBD /* AlertHub.swift in Sources */, 65BF7DD526BB8F880097B132 /* InspectDetailModel.swift in Sources */, 65221CDF26C11D320070D21C /* LoadingHub.swift in Sources */, @@ -1457,14 +1478,17 @@ 65F2DFC526AFF1A300179EBD /* AppCoordinator.swift in Sources */, 65F2E00326B0129100179EBD /* LoginResultModel.swift in Sources */, 65F2E04E26B260BC00179EBD /* TransferValueDelegate.swift in Sources */, + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */, 656EEBCF26C529130054E00E /* Int.swift in Sources */, 65F2E05026B27B2C00179EBD /* LayerShadowHub.swift in Sources */, 65F2E00526B0129100179EBD /* InspectListModel.swift in Sources */, 65F2E00626B0129100179EBD /* BaseConfigModel.swift in Sources */, 65F2E00A26B012D700179EBD /* LoginViewController.swift in Sources */, + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */, 65EB077426BCDF6600F9C0EC /* MapViewController.swift in Sources */, 65F2E04426B2392600179EBD /* ListCustomCell.swift in Sources */, 65EB076626BCCA6E00F9C0EC /* TransferIdDelegate.swift in Sources */, + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */, 65F2DFCC26AFF2A900179EBD /* KeychainManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 502e862..b6d908d 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 26e799b..7dafef3 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -9,6 +9,8 @@ public enum Constant: String { // 用户相关的key值 + case UserName = "userName" + case Password = "password" case ServerConfig = "defaultServerConfig" case Token = "token" case UserJson = "userInfoJson" @@ -16,6 +18,7 @@ case OpenWarning = "openWarning" case CurrentLongitude = "currentLongitude" case CurrentLatitude = "currentLatitude" + case isSingleMode = "singleMode" // 网络请求相关的地址 case baseConfig = "/config/baseConfig" diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 9178562..5530d95 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -16,6 +16,14 @@ 656EEBC826C4C7C20054E00E /* ImageCollectionViewDelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */; }; 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */; }; 656EEBCF26C529130054E00E /* Int.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBCE26C529130054E00E /* Int.swift */; }; + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */; }; + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */; }; + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */; }; + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */; }; + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */; }; + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */; }; + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */; }; + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */; }; 65BF7A2A26B937410097B132 /* InspectMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7A2826B937410097B132 /* InspectMapViewController.swift */; }; 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF7A2926B937410097B132 /* InspectMapViewController.xib */; }; 65BF7C1C26AFDDCD000FEC82 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */; }; @@ -82,6 +90,14 @@ 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCollectionViewDelCell.swift; sourceTree = ""; }; 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ImageCollectionViewDelCell.xib; sourceTree = ""; }; 656EEBCE26C529130054E00E /* Int.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Int.swift; sourceTree = ""; }; + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeInspectViewController.swift; sourceTree = ""; }; + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeInspectViewController.xib; sourceTree = ""; }; + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeEventViewController.swift; sourceTree = ""; }; + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeEventViewController.xib; sourceTree = ""; }; + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeSettingViewController.swift; sourceTree = ""; }; + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeSettingViewController.xib; sourceTree = ""; }; + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeMapViewController.swift; sourceTree = ""; }; + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeMapViewController.xib; sourceTree = ""; }; 65BF7A2826B937410097B132 /* InspectMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectMapViewController.swift; sourceTree = ""; }; 65BF7A2926B937410097B132 /* InspectMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectMapViewController.xib; sourceTree = ""; }; 65BF7A3426B9413F0097B132 /* LaserMethane-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "LaserMethane-Bridging-Header.h"; sourceTree = ""; }; @@ -598,13 +614,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 6518222226AFE95F00FCC275 /* Base */ = { - isa = PBXGroup; - children = ( - ); - path = Base; - sourceTree = ""; - }; 6518222326AFE97100FCC275 /* Extension */ = { isa = PBXGroup; children = ( @@ -658,7 +667,6 @@ 65F2DFC326AFF19900179EBD /* Coordinator */, 6518222826AFEAE500FCC275 /* ViewController */, 6518222326AFE97100FCC275 /* Extension */, - 6518222226AFE95F00FCC275 /* Base */, 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */, 65BF7C2426AFDDCD000FEC82 /* Assets.xcassets */, 65BF7C2626AFDDCD000FEC82 /* LaunchScreen.storyboard */, @@ -675,6 +683,8 @@ 65EB077326BCDF6600F9C0EC /* MapViewController.xib */, 65221CD026C0CCE40070D21C /* NewEventViewController.swift */, 65221CD126C0CCE40070D21C /* NewEventViewController.xib */, + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */, + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */, ); path = Map; sourceTree = ""; @@ -748,6 +758,8 @@ children = ( 65F2E01A26B1019200179EBD /* SettingViewController.swift */, 65F2E01B26B1019200179EBD /* SettingViewController.xib */, + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */, + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */, ); path = Settings; sourceTree = ""; @@ -789,6 +801,8 @@ 65BF7A2926B937410097B132 /* InspectMapViewController.xib */, 65EB076B26BCD76F00F9C0EC /* EventTaskViewController.swift */, 65EB076C26BCD76F00F9C0EC /* EventTaskViewController.xib */, + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */, + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */, ); path = Inspect; sourceTree = ""; @@ -800,6 +814,8 @@ 65F2E03F26B1724900179EBD /* EventViewController.xib */, 65F2E04826B25E8200179EBD /* EventDetailViewController.swift */, 65F2E04926B25E8200179EBD /* EventDetailViewController.xib */, + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */, + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */, ); path = Event; sourceTree = ""; @@ -1343,10 +1359,13 @@ 65F2E01D26B1019200179EBD /* SettingViewController.xib in Resources */, 65F2E05426B2812700179EBD /* ImageCollectionViewCell.xib in Resources */, 65BF7C2826AFDDCD000FEC82 /* LaunchScreen.storyboard in Resources */, + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */, + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */, 65221CD326C0CCE40070D21C /* NewEventViewController.xib in Resources */, 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */, 65EB077526BCDF6600F9C0EC /* MapViewController.xib in Resources */, 65F2E03D26B1723700179EBD /* InspectViewController.xib in Resources */, + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */, 65F2E04B26B25E8200179EBD /* EventDetailViewController.xib in Resources */, 65F2DFFB26B0099800179EBD /* GuideViewController.xib in Resources */, 65F2E02626B1326D00179EBD /* CommonTableViewCell.xib in Resources */, @@ -1354,6 +1373,7 @@ 65EB076E26BCD76F00F9C0EC /* EventTaskViewController.xib in Resources */, 65F2E02E26B1341300179EBD /* SwitchTableViewCell.xib in Resources */, 65F2E03326B164CC00179EBD /* LogViewController.xib in Resources */, + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */, 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */, 65F2E02226B1242200179EBD /* DefaultTableViewCell.xib in Resources */, 65BF7C2526AFDDCD000FEC82 /* Assets.xcassets in Resources */, @@ -1443,6 +1463,7 @@ 65F2E05326B2812700179EBD /* ImageCollectionViewCell.swift in Sources */, 65F2E02526B1326D00179EBD /* CommonTableViewCell.swift in Sources */, 65EB077026BCD7C300F9C0EC /* EventTaskModel.swift in Sources */, + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */, 65F2E01426B0E8CA00179EBD /* AlertHub.swift in Sources */, 65BF7DD526BB8F880097B132 /* InspectDetailModel.swift in Sources */, 65221CDF26C11D320070D21C /* LoadingHub.swift in Sources */, @@ -1457,14 +1478,17 @@ 65F2DFC526AFF1A300179EBD /* AppCoordinator.swift in Sources */, 65F2E00326B0129100179EBD /* LoginResultModel.swift in Sources */, 65F2E04E26B260BC00179EBD /* TransferValueDelegate.swift in Sources */, + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */, 656EEBCF26C529130054E00E /* Int.swift in Sources */, 65F2E05026B27B2C00179EBD /* LayerShadowHub.swift in Sources */, 65F2E00526B0129100179EBD /* InspectListModel.swift in Sources */, 65F2E00626B0129100179EBD /* BaseConfigModel.swift in Sources */, 65F2E00A26B012D700179EBD /* LoginViewController.swift in Sources */, + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */, 65EB077426BCDF6600F9C0EC /* MapViewController.swift in Sources */, 65F2E04426B2392600179EBD /* ListCustomCell.swift in Sources */, 65EB076626BCCA6E00F9C0EC /* TransferIdDelegate.swift in Sources */, + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */, 65F2DFCC26AFF2A900179EBD /* KeychainManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 502e862..b6d908d 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 26e799b..7dafef3 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -9,6 +9,8 @@ public enum Constant: String { // 用户相关的key值 + case UserName = "userName" + case Password = "password" case ServerConfig = "defaultServerConfig" case Token = "token" case UserJson = "userInfoJson" @@ -16,6 +18,7 @@ case OpenWarning = "openWarning" case CurrentLongitude = "currentLongitude" case CurrentLatitude = "currentLatitude" + case isSingleMode = "singleMode" // 网络请求相关的地址 case baseConfig = "/config/baseConfig" diff --git a/LaserMethane/ViewController/Event/SingModeEventViewController.swift b/LaserMethane/ViewController/Event/SingModeEventViewController.swift new file mode 100644 index 0000000..76f1f98 --- /dev/null +++ b/LaserMethane/ViewController/Event/SingModeEventViewController.swift @@ -0,0 +1,29 @@ +// +// SingModeEventViewController.swift +// LaserMethane +// +// Created by 203 on 2021/8/19. +// + +import UIKit + +class SingModeEventViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 9178562..5530d95 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -16,6 +16,14 @@ 656EEBC826C4C7C20054E00E /* ImageCollectionViewDelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */; }; 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */; }; 656EEBCF26C529130054E00E /* Int.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBCE26C529130054E00E /* Int.swift */; }; + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */; }; + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */; }; + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */; }; + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */; }; + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */; }; + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */; }; + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */; }; + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */; }; 65BF7A2A26B937410097B132 /* InspectMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7A2826B937410097B132 /* InspectMapViewController.swift */; }; 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF7A2926B937410097B132 /* InspectMapViewController.xib */; }; 65BF7C1C26AFDDCD000FEC82 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */; }; @@ -82,6 +90,14 @@ 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCollectionViewDelCell.swift; sourceTree = ""; }; 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ImageCollectionViewDelCell.xib; sourceTree = ""; }; 656EEBCE26C529130054E00E /* Int.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Int.swift; sourceTree = ""; }; + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeInspectViewController.swift; sourceTree = ""; }; + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeInspectViewController.xib; sourceTree = ""; }; + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeEventViewController.swift; sourceTree = ""; }; + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeEventViewController.xib; sourceTree = ""; }; + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeSettingViewController.swift; sourceTree = ""; }; + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeSettingViewController.xib; sourceTree = ""; }; + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeMapViewController.swift; sourceTree = ""; }; + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeMapViewController.xib; sourceTree = ""; }; 65BF7A2826B937410097B132 /* InspectMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectMapViewController.swift; sourceTree = ""; }; 65BF7A2926B937410097B132 /* InspectMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectMapViewController.xib; sourceTree = ""; }; 65BF7A3426B9413F0097B132 /* LaserMethane-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "LaserMethane-Bridging-Header.h"; sourceTree = ""; }; @@ -598,13 +614,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 6518222226AFE95F00FCC275 /* Base */ = { - isa = PBXGroup; - children = ( - ); - path = Base; - sourceTree = ""; - }; 6518222326AFE97100FCC275 /* Extension */ = { isa = PBXGroup; children = ( @@ -658,7 +667,6 @@ 65F2DFC326AFF19900179EBD /* Coordinator */, 6518222826AFEAE500FCC275 /* ViewController */, 6518222326AFE97100FCC275 /* Extension */, - 6518222226AFE95F00FCC275 /* Base */, 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */, 65BF7C2426AFDDCD000FEC82 /* Assets.xcassets */, 65BF7C2626AFDDCD000FEC82 /* LaunchScreen.storyboard */, @@ -675,6 +683,8 @@ 65EB077326BCDF6600F9C0EC /* MapViewController.xib */, 65221CD026C0CCE40070D21C /* NewEventViewController.swift */, 65221CD126C0CCE40070D21C /* NewEventViewController.xib */, + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */, + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */, ); path = Map; sourceTree = ""; @@ -748,6 +758,8 @@ children = ( 65F2E01A26B1019200179EBD /* SettingViewController.swift */, 65F2E01B26B1019200179EBD /* SettingViewController.xib */, + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */, + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */, ); path = Settings; sourceTree = ""; @@ -789,6 +801,8 @@ 65BF7A2926B937410097B132 /* InspectMapViewController.xib */, 65EB076B26BCD76F00F9C0EC /* EventTaskViewController.swift */, 65EB076C26BCD76F00F9C0EC /* EventTaskViewController.xib */, + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */, + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */, ); path = Inspect; sourceTree = ""; @@ -800,6 +814,8 @@ 65F2E03F26B1724900179EBD /* EventViewController.xib */, 65F2E04826B25E8200179EBD /* EventDetailViewController.swift */, 65F2E04926B25E8200179EBD /* EventDetailViewController.xib */, + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */, + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */, ); path = Event; sourceTree = ""; @@ -1343,10 +1359,13 @@ 65F2E01D26B1019200179EBD /* SettingViewController.xib in Resources */, 65F2E05426B2812700179EBD /* ImageCollectionViewCell.xib in Resources */, 65BF7C2826AFDDCD000FEC82 /* LaunchScreen.storyboard in Resources */, + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */, + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */, 65221CD326C0CCE40070D21C /* NewEventViewController.xib in Resources */, 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */, 65EB077526BCDF6600F9C0EC /* MapViewController.xib in Resources */, 65F2E03D26B1723700179EBD /* InspectViewController.xib in Resources */, + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */, 65F2E04B26B25E8200179EBD /* EventDetailViewController.xib in Resources */, 65F2DFFB26B0099800179EBD /* GuideViewController.xib in Resources */, 65F2E02626B1326D00179EBD /* CommonTableViewCell.xib in Resources */, @@ -1354,6 +1373,7 @@ 65EB076E26BCD76F00F9C0EC /* EventTaskViewController.xib in Resources */, 65F2E02E26B1341300179EBD /* SwitchTableViewCell.xib in Resources */, 65F2E03326B164CC00179EBD /* LogViewController.xib in Resources */, + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */, 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */, 65F2E02226B1242200179EBD /* DefaultTableViewCell.xib in Resources */, 65BF7C2526AFDDCD000FEC82 /* Assets.xcassets in Resources */, @@ -1443,6 +1463,7 @@ 65F2E05326B2812700179EBD /* ImageCollectionViewCell.swift in Sources */, 65F2E02526B1326D00179EBD /* CommonTableViewCell.swift in Sources */, 65EB077026BCD7C300F9C0EC /* EventTaskModel.swift in Sources */, + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */, 65F2E01426B0E8CA00179EBD /* AlertHub.swift in Sources */, 65BF7DD526BB8F880097B132 /* InspectDetailModel.swift in Sources */, 65221CDF26C11D320070D21C /* LoadingHub.swift in Sources */, @@ -1457,14 +1478,17 @@ 65F2DFC526AFF1A300179EBD /* AppCoordinator.swift in Sources */, 65F2E00326B0129100179EBD /* LoginResultModel.swift in Sources */, 65F2E04E26B260BC00179EBD /* TransferValueDelegate.swift in Sources */, + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */, 656EEBCF26C529130054E00E /* Int.swift in Sources */, 65F2E05026B27B2C00179EBD /* LayerShadowHub.swift in Sources */, 65F2E00526B0129100179EBD /* InspectListModel.swift in Sources */, 65F2E00626B0129100179EBD /* BaseConfigModel.swift in Sources */, 65F2E00A26B012D700179EBD /* LoginViewController.swift in Sources */, + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */, 65EB077426BCDF6600F9C0EC /* MapViewController.swift in Sources */, 65F2E04426B2392600179EBD /* ListCustomCell.swift in Sources */, 65EB076626BCCA6E00F9C0EC /* TransferIdDelegate.swift in Sources */, + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */, 65F2DFCC26AFF2A900179EBD /* KeychainManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 502e862..b6d908d 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 26e799b..7dafef3 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -9,6 +9,8 @@ public enum Constant: String { // 用户相关的key值 + case UserName = "userName" + case Password = "password" case ServerConfig = "defaultServerConfig" case Token = "token" case UserJson = "userInfoJson" @@ -16,6 +18,7 @@ case OpenWarning = "openWarning" case CurrentLongitude = "currentLongitude" case CurrentLatitude = "currentLatitude" + case isSingleMode = "singleMode" // 网络请求相关的地址 case baseConfig = "/config/baseConfig" diff --git a/LaserMethane/ViewController/Event/SingModeEventViewController.swift b/LaserMethane/ViewController/Event/SingModeEventViewController.swift new file mode 100644 index 0000000..76f1f98 --- /dev/null +++ b/LaserMethane/ViewController/Event/SingModeEventViewController.swift @@ -0,0 +1,29 @@ +// +// SingModeEventViewController.swift +// LaserMethane +// +// Created by 203 on 2021/8/19. +// + +import UIKit + +class SingModeEventViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/LaserMethane/ViewController/Event/SingModeEventViewController.xib b/LaserMethane/ViewController/Event/SingModeEventViewController.xib new file mode 100644 index 0000000..059e884 --- /dev/null +++ b/LaserMethane/ViewController/Event/SingModeEventViewController.xib @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 9178562..5530d95 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -16,6 +16,14 @@ 656EEBC826C4C7C20054E00E /* ImageCollectionViewDelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */; }; 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */; }; 656EEBCF26C529130054E00E /* Int.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBCE26C529130054E00E /* Int.swift */; }; + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */; }; + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */; }; + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */; }; + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */; }; + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */; }; + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */; }; + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */; }; + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */; }; 65BF7A2A26B937410097B132 /* InspectMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7A2826B937410097B132 /* InspectMapViewController.swift */; }; 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF7A2926B937410097B132 /* InspectMapViewController.xib */; }; 65BF7C1C26AFDDCD000FEC82 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */; }; @@ -82,6 +90,14 @@ 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCollectionViewDelCell.swift; sourceTree = ""; }; 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ImageCollectionViewDelCell.xib; sourceTree = ""; }; 656EEBCE26C529130054E00E /* Int.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Int.swift; sourceTree = ""; }; + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeInspectViewController.swift; sourceTree = ""; }; + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeInspectViewController.xib; sourceTree = ""; }; + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeEventViewController.swift; sourceTree = ""; }; + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeEventViewController.xib; sourceTree = ""; }; + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeSettingViewController.swift; sourceTree = ""; }; + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeSettingViewController.xib; sourceTree = ""; }; + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeMapViewController.swift; sourceTree = ""; }; + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeMapViewController.xib; sourceTree = ""; }; 65BF7A2826B937410097B132 /* InspectMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectMapViewController.swift; sourceTree = ""; }; 65BF7A2926B937410097B132 /* InspectMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectMapViewController.xib; sourceTree = ""; }; 65BF7A3426B9413F0097B132 /* LaserMethane-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "LaserMethane-Bridging-Header.h"; sourceTree = ""; }; @@ -598,13 +614,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 6518222226AFE95F00FCC275 /* Base */ = { - isa = PBXGroup; - children = ( - ); - path = Base; - sourceTree = ""; - }; 6518222326AFE97100FCC275 /* Extension */ = { isa = PBXGroup; children = ( @@ -658,7 +667,6 @@ 65F2DFC326AFF19900179EBD /* Coordinator */, 6518222826AFEAE500FCC275 /* ViewController */, 6518222326AFE97100FCC275 /* Extension */, - 6518222226AFE95F00FCC275 /* Base */, 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */, 65BF7C2426AFDDCD000FEC82 /* Assets.xcassets */, 65BF7C2626AFDDCD000FEC82 /* LaunchScreen.storyboard */, @@ -675,6 +683,8 @@ 65EB077326BCDF6600F9C0EC /* MapViewController.xib */, 65221CD026C0CCE40070D21C /* NewEventViewController.swift */, 65221CD126C0CCE40070D21C /* NewEventViewController.xib */, + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */, + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */, ); path = Map; sourceTree = ""; @@ -748,6 +758,8 @@ children = ( 65F2E01A26B1019200179EBD /* SettingViewController.swift */, 65F2E01B26B1019200179EBD /* SettingViewController.xib */, + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */, + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */, ); path = Settings; sourceTree = ""; @@ -789,6 +801,8 @@ 65BF7A2926B937410097B132 /* InspectMapViewController.xib */, 65EB076B26BCD76F00F9C0EC /* EventTaskViewController.swift */, 65EB076C26BCD76F00F9C0EC /* EventTaskViewController.xib */, + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */, + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */, ); path = Inspect; sourceTree = ""; @@ -800,6 +814,8 @@ 65F2E03F26B1724900179EBD /* EventViewController.xib */, 65F2E04826B25E8200179EBD /* EventDetailViewController.swift */, 65F2E04926B25E8200179EBD /* EventDetailViewController.xib */, + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */, + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */, ); path = Event; sourceTree = ""; @@ -1343,10 +1359,13 @@ 65F2E01D26B1019200179EBD /* SettingViewController.xib in Resources */, 65F2E05426B2812700179EBD /* ImageCollectionViewCell.xib in Resources */, 65BF7C2826AFDDCD000FEC82 /* LaunchScreen.storyboard in Resources */, + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */, + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */, 65221CD326C0CCE40070D21C /* NewEventViewController.xib in Resources */, 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */, 65EB077526BCDF6600F9C0EC /* MapViewController.xib in Resources */, 65F2E03D26B1723700179EBD /* InspectViewController.xib in Resources */, + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */, 65F2E04B26B25E8200179EBD /* EventDetailViewController.xib in Resources */, 65F2DFFB26B0099800179EBD /* GuideViewController.xib in Resources */, 65F2E02626B1326D00179EBD /* CommonTableViewCell.xib in Resources */, @@ -1354,6 +1373,7 @@ 65EB076E26BCD76F00F9C0EC /* EventTaskViewController.xib in Resources */, 65F2E02E26B1341300179EBD /* SwitchTableViewCell.xib in Resources */, 65F2E03326B164CC00179EBD /* LogViewController.xib in Resources */, + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */, 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */, 65F2E02226B1242200179EBD /* DefaultTableViewCell.xib in Resources */, 65BF7C2526AFDDCD000FEC82 /* Assets.xcassets in Resources */, @@ -1443,6 +1463,7 @@ 65F2E05326B2812700179EBD /* ImageCollectionViewCell.swift in Sources */, 65F2E02526B1326D00179EBD /* CommonTableViewCell.swift in Sources */, 65EB077026BCD7C300F9C0EC /* EventTaskModel.swift in Sources */, + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */, 65F2E01426B0E8CA00179EBD /* AlertHub.swift in Sources */, 65BF7DD526BB8F880097B132 /* InspectDetailModel.swift in Sources */, 65221CDF26C11D320070D21C /* LoadingHub.swift in Sources */, @@ -1457,14 +1478,17 @@ 65F2DFC526AFF1A300179EBD /* AppCoordinator.swift in Sources */, 65F2E00326B0129100179EBD /* LoginResultModel.swift in Sources */, 65F2E04E26B260BC00179EBD /* TransferValueDelegate.swift in Sources */, + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */, 656EEBCF26C529130054E00E /* Int.swift in Sources */, 65F2E05026B27B2C00179EBD /* LayerShadowHub.swift in Sources */, 65F2E00526B0129100179EBD /* InspectListModel.swift in Sources */, 65F2E00626B0129100179EBD /* BaseConfigModel.swift in Sources */, 65F2E00A26B012D700179EBD /* LoginViewController.swift in Sources */, + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */, 65EB077426BCDF6600F9C0EC /* MapViewController.swift in Sources */, 65F2E04426B2392600179EBD /* ListCustomCell.swift in Sources */, 65EB076626BCCA6E00F9C0EC /* TransferIdDelegate.swift in Sources */, + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */, 65F2DFCC26AFF2A900179EBD /* KeychainManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 502e862..b6d908d 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 26e799b..7dafef3 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -9,6 +9,8 @@ public enum Constant: String { // 用户相关的key值 + case UserName = "userName" + case Password = "password" case ServerConfig = "defaultServerConfig" case Token = "token" case UserJson = "userInfoJson" @@ -16,6 +18,7 @@ case OpenWarning = "openWarning" case CurrentLongitude = "currentLongitude" case CurrentLatitude = "currentLatitude" + case isSingleMode = "singleMode" // 网络请求相关的地址 case baseConfig = "/config/baseConfig" diff --git a/LaserMethane/ViewController/Event/SingModeEventViewController.swift b/LaserMethane/ViewController/Event/SingModeEventViewController.swift new file mode 100644 index 0000000..76f1f98 --- /dev/null +++ b/LaserMethane/ViewController/Event/SingModeEventViewController.swift @@ -0,0 +1,29 @@ +// +// SingModeEventViewController.swift +// LaserMethane +// +// Created by 203 on 2021/8/19. +// + +import UIKit + +class SingModeEventViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/LaserMethane/ViewController/Event/SingModeEventViewController.xib b/LaserMethane/ViewController/Event/SingModeEventViewController.xib new file mode 100644 index 0000000..059e884 --- /dev/null +++ b/LaserMethane/ViewController/Event/SingModeEventViewController.xib @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/LaserMethane/ViewController/Guide/GuideViewController.swift b/LaserMethane/ViewController/Guide/GuideViewController.swift index 2321c3f..4ae017f 100644 --- a/LaserMethane/ViewController/Guide/GuideViewController.swift +++ b/LaserMethane/ViewController/Guide/GuideViewController.swift @@ -5,9 +5,7 @@ // Created by 203 on 2021/7/27. // -import Alamofire import KeychainAccess -import SwiftyJSON import UIKit class GuideViewController: UIViewController { @@ -29,8 +27,7 @@ if countSeconds < 1 { timer?.invalidate() timer = nil - // 跳转页面 - startLoginViewController() + toLogin() return } countSeconds -= 1 @@ -42,37 +39,7 @@ @IBAction func skipCountDown(_ sender: UIButton) { timer?.invalidate() timer = nil - startLoginViewController() - } - - @objc func startLoginViewController() { - let token = keychain[Constant.Token.rawValue] - if token == nil { - toLogin() - } else { - if token!.isEmpty { - toLogin() - } else { - // 验证token有效性 - let obtainUserInfoURL = keychain[Constant.ServerConfig.rawValue]! + Constant.userInfo.rawValue - Alamofire.request(obtainUserInfoURL, method: .get, headers: ["token": token!]).responseJSON { [self] response in - switch response.result { - case let .success(value): - let userModel = UserInfoModel(respJson: JSON(value)) - if userModel.code == 200 { - // 将用户信息存起来 - keychain[Constant.UserJson.rawValue] = JSON(value).description - // 无需账号密码，直接到主界面 - toMainMenu() - } else { - toLogin() - } - case .failure: - toLogin() - } - } - } - } + toLogin() } @objc func toLogin() { @@ -81,12 +48,4 @@ destinationController.modalTransitionStyle = UIModalTransitionStyle.crossDissolve present(destinationController, animated: true, completion: nil) } - - @objc func toMainMenu() { - let homePage = MainMenuViewController(nibName: "MainMenuViewController", bundle: nil) - let destinationController = UINavigationController(rootViewController: homePage) - destinationController.modalPresentationStyle = UIModalPresentationStyle.fullScreen - destinationController.modalTransitionStyle = UIModalTransitionStyle.crossDissolve - present(destinationController, animated: true, completion: nil) - } } diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 9178562..5530d95 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -16,6 +16,14 @@ 656EEBC826C4C7C20054E00E /* ImageCollectionViewDelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */; }; 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */; }; 656EEBCF26C529130054E00E /* Int.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBCE26C529130054E00E /* Int.swift */; }; + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */; }; + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */; }; + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */; }; + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */; }; + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */; }; + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */; }; + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */; }; + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */; }; 65BF7A2A26B937410097B132 /* InspectMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7A2826B937410097B132 /* InspectMapViewController.swift */; }; 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF7A2926B937410097B132 /* InspectMapViewController.xib */; }; 65BF7C1C26AFDDCD000FEC82 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */; }; @@ -82,6 +90,14 @@ 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCollectionViewDelCell.swift; sourceTree = ""; }; 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ImageCollectionViewDelCell.xib; sourceTree = ""; }; 656EEBCE26C529130054E00E /* Int.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Int.swift; sourceTree = ""; }; + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeInspectViewController.swift; sourceTree = ""; }; + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeInspectViewController.xib; sourceTree = ""; }; + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeEventViewController.swift; sourceTree = ""; }; + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeEventViewController.xib; sourceTree = ""; }; + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeSettingViewController.swift; sourceTree = ""; }; + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeSettingViewController.xib; sourceTree = ""; }; + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeMapViewController.swift; sourceTree = ""; }; + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeMapViewController.xib; sourceTree = ""; }; 65BF7A2826B937410097B132 /* InspectMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectMapViewController.swift; sourceTree = ""; }; 65BF7A2926B937410097B132 /* InspectMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectMapViewController.xib; sourceTree = ""; }; 65BF7A3426B9413F0097B132 /* LaserMethane-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "LaserMethane-Bridging-Header.h"; sourceTree = ""; }; @@ -598,13 +614,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 6518222226AFE95F00FCC275 /* Base */ = { - isa = PBXGroup; - children = ( - ); - path = Base; - sourceTree = ""; - }; 6518222326AFE97100FCC275 /* Extension */ = { isa = PBXGroup; children = ( @@ -658,7 +667,6 @@ 65F2DFC326AFF19900179EBD /* Coordinator */, 6518222826AFEAE500FCC275 /* ViewController */, 6518222326AFE97100FCC275 /* Extension */, - 6518222226AFE95F00FCC275 /* Base */, 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */, 65BF7C2426AFDDCD000FEC82 /* Assets.xcassets */, 65BF7C2626AFDDCD000FEC82 /* LaunchScreen.storyboard */, @@ -675,6 +683,8 @@ 65EB077326BCDF6600F9C0EC /* MapViewController.xib */, 65221CD026C0CCE40070D21C /* NewEventViewController.swift */, 65221CD126C0CCE40070D21C /* NewEventViewController.xib */, + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */, + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */, ); path = Map; sourceTree = ""; @@ -748,6 +758,8 @@ children = ( 65F2E01A26B1019200179EBD /* SettingViewController.swift */, 65F2E01B26B1019200179EBD /* SettingViewController.xib */, + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */, + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */, ); path = Settings; sourceTree = ""; @@ -789,6 +801,8 @@ 65BF7A2926B937410097B132 /* InspectMapViewController.xib */, 65EB076B26BCD76F00F9C0EC /* EventTaskViewController.swift */, 65EB076C26BCD76F00F9C0EC /* EventTaskViewController.xib */, + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */, + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */, ); path = Inspect; sourceTree = ""; @@ -800,6 +814,8 @@ 65F2E03F26B1724900179EBD /* EventViewController.xib */, 65F2E04826B25E8200179EBD /* EventDetailViewController.swift */, 65F2E04926B25E8200179EBD /* EventDetailViewController.xib */, + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */, + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */, ); path = Event; sourceTree = ""; @@ -1343,10 +1359,13 @@ 65F2E01D26B1019200179EBD /* SettingViewController.xib in Resources */, 65F2E05426B2812700179EBD /* ImageCollectionViewCell.xib in Resources */, 65BF7C2826AFDDCD000FEC82 /* LaunchScreen.storyboard in Resources */, + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */, + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */, 65221CD326C0CCE40070D21C /* NewEventViewController.xib in Resources */, 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */, 65EB077526BCDF6600F9C0EC /* MapViewController.xib in Resources */, 65F2E03D26B1723700179EBD /* InspectViewController.xib in Resources */, + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */, 65F2E04B26B25E8200179EBD /* EventDetailViewController.xib in Resources */, 65F2DFFB26B0099800179EBD /* GuideViewController.xib in Resources */, 65F2E02626B1326D00179EBD /* CommonTableViewCell.xib in Resources */, @@ -1354,6 +1373,7 @@ 65EB076E26BCD76F00F9C0EC /* EventTaskViewController.xib in Resources */, 65F2E02E26B1341300179EBD /* SwitchTableViewCell.xib in Resources */, 65F2E03326B164CC00179EBD /* LogViewController.xib in Resources */, + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */, 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */, 65F2E02226B1242200179EBD /* DefaultTableViewCell.xib in Resources */, 65BF7C2526AFDDCD000FEC82 /* Assets.xcassets in Resources */, @@ -1443,6 +1463,7 @@ 65F2E05326B2812700179EBD /* ImageCollectionViewCell.swift in Sources */, 65F2E02526B1326D00179EBD /* CommonTableViewCell.swift in Sources */, 65EB077026BCD7C300F9C0EC /* EventTaskModel.swift in Sources */, + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */, 65F2E01426B0E8CA00179EBD /* AlertHub.swift in Sources */, 65BF7DD526BB8F880097B132 /* InspectDetailModel.swift in Sources */, 65221CDF26C11D320070D21C /* LoadingHub.swift in Sources */, @@ -1457,14 +1478,17 @@ 65F2DFC526AFF1A300179EBD /* AppCoordinator.swift in Sources */, 65F2E00326B0129100179EBD /* LoginResultModel.swift in Sources */, 65F2E04E26B260BC00179EBD /* TransferValueDelegate.swift in Sources */, + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */, 656EEBCF26C529130054E00E /* Int.swift in Sources */, 65F2E05026B27B2C00179EBD /* LayerShadowHub.swift in Sources */, 65F2E00526B0129100179EBD /* InspectListModel.swift in Sources */, 65F2E00626B0129100179EBD /* BaseConfigModel.swift in Sources */, 65F2E00A26B012D700179EBD /* LoginViewController.swift in Sources */, + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */, 65EB077426BCDF6600F9C0EC /* MapViewController.swift in Sources */, 65F2E04426B2392600179EBD /* ListCustomCell.swift in Sources */, 65EB076626BCCA6E00F9C0EC /* TransferIdDelegate.swift in Sources */, + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */, 65F2DFCC26AFF2A900179EBD /* KeychainManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 502e862..b6d908d 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 26e799b..7dafef3 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -9,6 +9,8 @@ public enum Constant: String { // 用户相关的key值 + case UserName = "userName" + case Password = "password" case ServerConfig = "defaultServerConfig" case Token = "token" case UserJson = "userInfoJson" @@ -16,6 +18,7 @@ case OpenWarning = "openWarning" case CurrentLongitude = "currentLongitude" case CurrentLatitude = "currentLatitude" + case isSingleMode = "singleMode" // 网络请求相关的地址 case baseConfig = "/config/baseConfig" diff --git a/LaserMethane/ViewController/Event/SingModeEventViewController.swift b/LaserMethane/ViewController/Event/SingModeEventViewController.swift new file mode 100644 index 0000000..76f1f98 --- /dev/null +++ b/LaserMethane/ViewController/Event/SingModeEventViewController.swift @@ -0,0 +1,29 @@ +// +// SingModeEventViewController.swift +// LaserMethane +// +// Created by 203 on 2021/8/19. +// + +import UIKit + +class SingModeEventViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/LaserMethane/ViewController/Event/SingModeEventViewController.xib b/LaserMethane/ViewController/Event/SingModeEventViewController.xib new file mode 100644 index 0000000..059e884 --- /dev/null +++ b/LaserMethane/ViewController/Event/SingModeEventViewController.xib @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/LaserMethane/ViewController/Guide/GuideViewController.swift b/LaserMethane/ViewController/Guide/GuideViewController.swift index 2321c3f..4ae017f 100644 --- a/LaserMethane/ViewController/Guide/GuideViewController.swift +++ b/LaserMethane/ViewController/Guide/GuideViewController.swift @@ -5,9 +5,7 @@ // Created by 203 on 2021/7/27. // -import Alamofire import KeychainAccess -import SwiftyJSON import UIKit class GuideViewController: UIViewController { @@ -29,8 +27,7 @@ if countSeconds < 1 { timer?.invalidate() timer = nil - // 跳转页面 - startLoginViewController() + toLogin() return } countSeconds -= 1 @@ -42,37 +39,7 @@ @IBAction func skipCountDown(_ sender: UIButton) { timer?.invalidate() timer = nil - startLoginViewController() - } - - @objc func startLoginViewController() { - let token = keychain[Constant.Token.rawValue] - if token == nil { - toLogin() - } else { - if token!.isEmpty { - toLogin() - } else { - // 验证token有效性 - let obtainUserInfoURL = keychain[Constant.ServerConfig.rawValue]! + Constant.userInfo.rawValue - Alamofire.request(obtainUserInfoURL, method: .get, headers: ["token": token!]).responseJSON { [self] response in - switch response.result { - case let .success(value): - let userModel = UserInfoModel(respJson: JSON(value)) - if userModel.code == 200 { - // 将用户信息存起来 - keychain[Constant.UserJson.rawValue] = JSON(value).description - // 无需账号密码，直接到主界面 - toMainMenu() - } else { - toLogin() - } - case .failure: - toLogin() - } - } - } - } + toLogin() } @objc func toLogin() { @@ -81,12 +48,4 @@ destinationController.modalTransitionStyle = UIModalTransitionStyle.crossDissolve present(destinationController, animated: true, completion: nil) } - - @objc func toMainMenu() { - let homePage = MainMenuViewController(nibName: "MainMenuViewController", bundle: nil) - let destinationController = UINavigationController(rootViewController: homePage) - destinationController.modalPresentationStyle = UIModalPresentationStyle.fullScreen - destinationController.modalTransitionStyle = UIModalTransitionStyle.crossDissolve - present(destinationController, animated: true, completion: nil) - } } diff --git a/LaserMethane/ViewController/Inspect/SingModeInspectViewController.swift b/LaserMethane/ViewController/Inspect/SingModeInspectViewController.swift new file mode 100644 index 0000000..d7ad2a9 --- /dev/null +++ b/LaserMethane/ViewController/Inspect/SingModeInspectViewController.swift @@ -0,0 +1,29 @@ +// +// SingModeInspectViewController.swift +// LaserMethane +// +// Created by 203 on 2021/8/19. +// + +import UIKit + +class SingModeInspectViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 9178562..5530d95 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -16,6 +16,14 @@ 656EEBC826C4C7C20054E00E /* ImageCollectionViewDelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */; }; 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */; }; 656EEBCF26C529130054E00E /* Int.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBCE26C529130054E00E /* Int.swift */; }; + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */; }; + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */; }; + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */; }; + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */; }; + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */; }; + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */; }; + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */; }; + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */; }; 65BF7A2A26B937410097B132 /* InspectMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7A2826B937410097B132 /* InspectMapViewController.swift */; }; 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF7A2926B937410097B132 /* InspectMapViewController.xib */; }; 65BF7C1C26AFDDCD000FEC82 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */; }; @@ -82,6 +90,14 @@ 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCollectionViewDelCell.swift; sourceTree = ""; }; 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ImageCollectionViewDelCell.xib; sourceTree = ""; }; 656EEBCE26C529130054E00E /* Int.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Int.swift; sourceTree = ""; }; + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeInspectViewController.swift; sourceTree = ""; }; + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeInspectViewController.xib; sourceTree = ""; }; + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeEventViewController.swift; sourceTree = ""; }; + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeEventViewController.xib; sourceTree = ""; }; + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeSettingViewController.swift; sourceTree = ""; }; + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeSettingViewController.xib; sourceTree = ""; }; + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeMapViewController.swift; sourceTree = ""; }; + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeMapViewController.xib; sourceTree = ""; }; 65BF7A2826B937410097B132 /* InspectMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectMapViewController.swift; sourceTree = ""; }; 65BF7A2926B937410097B132 /* InspectMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectMapViewController.xib; sourceTree = ""; }; 65BF7A3426B9413F0097B132 /* LaserMethane-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "LaserMethane-Bridging-Header.h"; sourceTree = ""; }; @@ -598,13 +614,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 6518222226AFE95F00FCC275 /* Base */ = { - isa = PBXGroup; - children = ( - ); - path = Base; - sourceTree = ""; - }; 6518222326AFE97100FCC275 /* Extension */ = { isa = PBXGroup; children = ( @@ -658,7 +667,6 @@ 65F2DFC326AFF19900179EBD /* Coordinator */, 6518222826AFEAE500FCC275 /* ViewController */, 6518222326AFE97100FCC275 /* Extension */, - 6518222226AFE95F00FCC275 /* Base */, 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */, 65BF7C2426AFDDCD000FEC82 /* Assets.xcassets */, 65BF7C2626AFDDCD000FEC82 /* LaunchScreen.storyboard */, @@ -675,6 +683,8 @@ 65EB077326BCDF6600F9C0EC /* MapViewController.xib */, 65221CD026C0CCE40070D21C /* NewEventViewController.swift */, 65221CD126C0CCE40070D21C /* NewEventViewController.xib */, + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */, + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */, ); path = Map; sourceTree = ""; @@ -748,6 +758,8 @@ children = ( 65F2E01A26B1019200179EBD /* SettingViewController.swift */, 65F2E01B26B1019200179EBD /* SettingViewController.xib */, + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */, + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */, ); path = Settings; sourceTree = ""; @@ -789,6 +801,8 @@ 65BF7A2926B937410097B132 /* InspectMapViewController.xib */, 65EB076B26BCD76F00F9C0EC /* EventTaskViewController.swift */, 65EB076C26BCD76F00F9C0EC /* EventTaskViewController.xib */, + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */, + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */, ); path = Inspect; sourceTree = ""; @@ -800,6 +814,8 @@ 65F2E03F26B1724900179EBD /* EventViewController.xib */, 65F2E04826B25E8200179EBD /* EventDetailViewController.swift */, 65F2E04926B25E8200179EBD /* EventDetailViewController.xib */, + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */, + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */, ); path = Event; sourceTree = ""; @@ -1343,10 +1359,13 @@ 65F2E01D26B1019200179EBD /* SettingViewController.xib in Resources */, 65F2E05426B2812700179EBD /* ImageCollectionViewCell.xib in Resources */, 65BF7C2826AFDDCD000FEC82 /* LaunchScreen.storyboard in Resources */, + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */, + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */, 65221CD326C0CCE40070D21C /* NewEventViewController.xib in Resources */, 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */, 65EB077526BCDF6600F9C0EC /* MapViewController.xib in Resources */, 65F2E03D26B1723700179EBD /* InspectViewController.xib in Resources */, + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */, 65F2E04B26B25E8200179EBD /* EventDetailViewController.xib in Resources */, 65F2DFFB26B0099800179EBD /* GuideViewController.xib in Resources */, 65F2E02626B1326D00179EBD /* CommonTableViewCell.xib in Resources */, @@ -1354,6 +1373,7 @@ 65EB076E26BCD76F00F9C0EC /* EventTaskViewController.xib in Resources */, 65F2E02E26B1341300179EBD /* SwitchTableViewCell.xib in Resources */, 65F2E03326B164CC00179EBD /* LogViewController.xib in Resources */, + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */, 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */, 65F2E02226B1242200179EBD /* DefaultTableViewCell.xib in Resources */, 65BF7C2526AFDDCD000FEC82 /* Assets.xcassets in Resources */, @@ -1443,6 +1463,7 @@ 65F2E05326B2812700179EBD /* ImageCollectionViewCell.swift in Sources */, 65F2E02526B1326D00179EBD /* CommonTableViewCell.swift in Sources */, 65EB077026BCD7C300F9C0EC /* EventTaskModel.swift in Sources */, + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */, 65F2E01426B0E8CA00179EBD /* AlertHub.swift in Sources */, 65BF7DD526BB8F880097B132 /* InspectDetailModel.swift in Sources */, 65221CDF26C11D320070D21C /* LoadingHub.swift in Sources */, @@ -1457,14 +1478,17 @@ 65F2DFC526AFF1A300179EBD /* AppCoordinator.swift in Sources */, 65F2E00326B0129100179EBD /* LoginResultModel.swift in Sources */, 65F2E04E26B260BC00179EBD /* TransferValueDelegate.swift in Sources */, + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */, 656EEBCF26C529130054E00E /* Int.swift in Sources */, 65F2E05026B27B2C00179EBD /* LayerShadowHub.swift in Sources */, 65F2E00526B0129100179EBD /* InspectListModel.swift in Sources */, 65F2E00626B0129100179EBD /* BaseConfigModel.swift in Sources */, 65F2E00A26B012D700179EBD /* LoginViewController.swift in Sources */, + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */, 65EB077426BCDF6600F9C0EC /* MapViewController.swift in Sources */, 65F2E04426B2392600179EBD /* ListCustomCell.swift in Sources */, 65EB076626BCCA6E00F9C0EC /* TransferIdDelegate.swift in Sources */, + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */, 65F2DFCC26AFF2A900179EBD /* KeychainManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 502e862..b6d908d 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 26e799b..7dafef3 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -9,6 +9,8 @@ public enum Constant: String { // 用户相关的key值 + case UserName = "userName" + case Password = "password" case ServerConfig = "defaultServerConfig" case Token = "token" case UserJson = "userInfoJson" @@ -16,6 +18,7 @@ case OpenWarning = "openWarning" case CurrentLongitude = "currentLongitude" case CurrentLatitude = "currentLatitude" + case isSingleMode = "singleMode" // 网络请求相关的地址 case baseConfig = "/config/baseConfig" diff --git a/LaserMethane/ViewController/Event/SingModeEventViewController.swift b/LaserMethane/ViewController/Event/SingModeEventViewController.swift new file mode 100644 index 0000000..76f1f98 --- /dev/null +++ b/LaserMethane/ViewController/Event/SingModeEventViewController.swift @@ -0,0 +1,29 @@ +// +// SingModeEventViewController.swift +// LaserMethane +// +// Created by 203 on 2021/8/19. +// + +import UIKit + +class SingModeEventViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/LaserMethane/ViewController/Event/SingModeEventViewController.xib b/LaserMethane/ViewController/Event/SingModeEventViewController.xib new file mode 100644 index 0000000..059e884 --- /dev/null +++ b/LaserMethane/ViewController/Event/SingModeEventViewController.xib @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/LaserMethane/ViewController/Guide/GuideViewController.swift b/LaserMethane/ViewController/Guide/GuideViewController.swift index 2321c3f..4ae017f 100644 --- a/LaserMethane/ViewController/Guide/GuideViewController.swift +++ b/LaserMethane/ViewController/Guide/GuideViewController.swift @@ -5,9 +5,7 @@ // Created by 203 on 2021/7/27. // -import Alamofire import KeychainAccess -import SwiftyJSON import UIKit class GuideViewController: UIViewController { @@ -29,8 +27,7 @@ if countSeconds < 1 { timer?.invalidate() timer = nil - // 跳转页面 - startLoginViewController() + toLogin() return } countSeconds -= 1 @@ -42,37 +39,7 @@ @IBAction func skipCountDown(_ sender: UIButton) { timer?.invalidate() timer = nil - startLoginViewController() - } - - @objc func startLoginViewController() { - let token = keychain[Constant.Token.rawValue] - if token == nil { - toLogin() - } else { - if token!.isEmpty { - toLogin() - } else { - // 验证token有效性 - let obtainUserInfoURL = keychain[Constant.ServerConfig.rawValue]! + Constant.userInfo.rawValue - Alamofire.request(obtainUserInfoURL, method: .get, headers: ["token": token!]).responseJSON { [self] response in - switch response.result { - case let .success(value): - let userModel = UserInfoModel(respJson: JSON(value)) - if userModel.code == 200 { - // 将用户信息存起来 - keychain[Constant.UserJson.rawValue] = JSON(value).description - // 无需账号密码，直接到主界面 - toMainMenu() - } else { - toLogin() - } - case .failure: - toLogin() - } - } - } - } + toLogin() } @objc func toLogin() { @@ -81,12 +48,4 @@ destinationController.modalTransitionStyle = UIModalTransitionStyle.crossDissolve present(destinationController, animated: true, completion: nil) } - - @objc func toMainMenu() { - let homePage = MainMenuViewController(nibName: "MainMenuViewController", bundle: nil) - let destinationController = UINavigationController(rootViewController: homePage) - destinationController.modalPresentationStyle = UIModalPresentationStyle.fullScreen - destinationController.modalTransitionStyle = UIModalTransitionStyle.crossDissolve - present(destinationController, animated: true, completion: nil) - } } diff --git a/LaserMethane/ViewController/Inspect/SingModeInspectViewController.swift b/LaserMethane/ViewController/Inspect/SingModeInspectViewController.swift new file mode 100644 index 0000000..d7ad2a9 --- /dev/null +++ b/LaserMethane/ViewController/Inspect/SingModeInspectViewController.swift @@ -0,0 +1,29 @@ +// +// SingModeInspectViewController.swift +// LaserMethane +// +// Created by 203 on 2021/8/19. +// + +import UIKit + +class SingModeInspectViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/LaserMethane/ViewController/Inspect/SingModeInspectViewController.xib b/LaserMethane/ViewController/Inspect/SingModeInspectViewController.xib new file mode 100644 index 0000000..1f96f02 --- /dev/null +++ b/LaserMethane/ViewController/Inspect/SingModeInspectViewController.xib @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 9178562..5530d95 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -16,6 +16,14 @@ 656EEBC826C4C7C20054E00E /* ImageCollectionViewDelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */; }; 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */; }; 656EEBCF26C529130054E00E /* Int.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBCE26C529130054E00E /* Int.swift */; }; + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */; }; + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */; }; + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */; }; + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */; }; + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */; }; + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */; }; + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */; }; + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */; }; 65BF7A2A26B937410097B132 /* InspectMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7A2826B937410097B132 /* InspectMapViewController.swift */; }; 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF7A2926B937410097B132 /* InspectMapViewController.xib */; }; 65BF7C1C26AFDDCD000FEC82 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */; }; @@ -82,6 +90,14 @@ 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCollectionViewDelCell.swift; sourceTree = ""; }; 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ImageCollectionViewDelCell.xib; sourceTree = ""; }; 656EEBCE26C529130054E00E /* Int.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Int.swift; sourceTree = ""; }; + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeInspectViewController.swift; sourceTree = ""; }; + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeInspectViewController.xib; sourceTree = ""; }; + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeEventViewController.swift; sourceTree = ""; }; + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeEventViewController.xib; sourceTree = ""; }; + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeSettingViewController.swift; sourceTree = ""; }; + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeSettingViewController.xib; sourceTree = ""; }; + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeMapViewController.swift; sourceTree = ""; }; + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeMapViewController.xib; sourceTree = ""; }; 65BF7A2826B937410097B132 /* InspectMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectMapViewController.swift; sourceTree = ""; }; 65BF7A2926B937410097B132 /* InspectMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectMapViewController.xib; sourceTree = ""; }; 65BF7A3426B9413F0097B132 /* LaserMethane-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "LaserMethane-Bridging-Header.h"; sourceTree = ""; }; @@ -598,13 +614,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 6518222226AFE95F00FCC275 /* Base */ = { - isa = PBXGroup; - children = ( - ); - path = Base; - sourceTree = ""; - }; 6518222326AFE97100FCC275 /* Extension */ = { isa = PBXGroup; children = ( @@ -658,7 +667,6 @@ 65F2DFC326AFF19900179EBD /* Coordinator */, 6518222826AFEAE500FCC275 /* ViewController */, 6518222326AFE97100FCC275 /* Extension */, - 6518222226AFE95F00FCC275 /* Base */, 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */, 65BF7C2426AFDDCD000FEC82 /* Assets.xcassets */, 65BF7C2626AFDDCD000FEC82 /* LaunchScreen.storyboard */, @@ -675,6 +683,8 @@ 65EB077326BCDF6600F9C0EC /* MapViewController.xib */, 65221CD026C0CCE40070D21C /* NewEventViewController.swift */, 65221CD126C0CCE40070D21C /* NewEventViewController.xib */, + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */, + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */, ); path = Map; sourceTree = ""; @@ -748,6 +758,8 @@ children = ( 65F2E01A26B1019200179EBD /* SettingViewController.swift */, 65F2E01B26B1019200179EBD /* SettingViewController.xib */, + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */, + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */, ); path = Settings; sourceTree = ""; @@ -789,6 +801,8 @@ 65BF7A2926B937410097B132 /* InspectMapViewController.xib */, 65EB076B26BCD76F00F9C0EC /* EventTaskViewController.swift */, 65EB076C26BCD76F00F9C0EC /* EventTaskViewController.xib */, + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */, + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */, ); path = Inspect; sourceTree = ""; @@ -800,6 +814,8 @@ 65F2E03F26B1724900179EBD /* EventViewController.xib */, 65F2E04826B25E8200179EBD /* EventDetailViewController.swift */, 65F2E04926B25E8200179EBD /* EventDetailViewController.xib */, + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */, + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */, ); path = Event; sourceTree = ""; @@ -1343,10 +1359,13 @@ 65F2E01D26B1019200179EBD /* SettingViewController.xib in Resources */, 65F2E05426B2812700179EBD /* ImageCollectionViewCell.xib in Resources */, 65BF7C2826AFDDCD000FEC82 /* LaunchScreen.storyboard in Resources */, + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */, + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */, 65221CD326C0CCE40070D21C /* NewEventViewController.xib in Resources */, 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */, 65EB077526BCDF6600F9C0EC /* MapViewController.xib in Resources */, 65F2E03D26B1723700179EBD /* InspectViewController.xib in Resources */, + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */, 65F2E04B26B25E8200179EBD /* EventDetailViewController.xib in Resources */, 65F2DFFB26B0099800179EBD /* GuideViewController.xib in Resources */, 65F2E02626B1326D00179EBD /* CommonTableViewCell.xib in Resources */, @@ -1354,6 +1373,7 @@ 65EB076E26BCD76F00F9C0EC /* EventTaskViewController.xib in Resources */, 65F2E02E26B1341300179EBD /* SwitchTableViewCell.xib in Resources */, 65F2E03326B164CC00179EBD /* LogViewController.xib in Resources */, + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */, 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */, 65F2E02226B1242200179EBD /* DefaultTableViewCell.xib in Resources */, 65BF7C2526AFDDCD000FEC82 /* Assets.xcassets in Resources */, @@ -1443,6 +1463,7 @@ 65F2E05326B2812700179EBD /* ImageCollectionViewCell.swift in Sources */, 65F2E02526B1326D00179EBD /* CommonTableViewCell.swift in Sources */, 65EB077026BCD7C300F9C0EC /* EventTaskModel.swift in Sources */, + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */, 65F2E01426B0E8CA00179EBD /* AlertHub.swift in Sources */, 65BF7DD526BB8F880097B132 /* InspectDetailModel.swift in Sources */, 65221CDF26C11D320070D21C /* LoadingHub.swift in Sources */, @@ -1457,14 +1478,17 @@ 65F2DFC526AFF1A300179EBD /* AppCoordinator.swift in Sources */, 65F2E00326B0129100179EBD /* LoginResultModel.swift in Sources */, 65F2E04E26B260BC00179EBD /* TransferValueDelegate.swift in Sources */, + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */, 656EEBCF26C529130054E00E /* Int.swift in Sources */, 65F2E05026B27B2C00179EBD /* LayerShadowHub.swift in Sources */, 65F2E00526B0129100179EBD /* InspectListModel.swift in Sources */, 65F2E00626B0129100179EBD /* BaseConfigModel.swift in Sources */, 65F2E00A26B012D700179EBD /* LoginViewController.swift in Sources */, + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */, 65EB077426BCDF6600F9C0EC /* MapViewController.swift in Sources */, 65F2E04426B2392600179EBD /* ListCustomCell.swift in Sources */, 65EB076626BCCA6E00F9C0EC /* TransferIdDelegate.swift in Sources */, + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */, 65F2DFCC26AFF2A900179EBD /* KeychainManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 502e862..b6d908d 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 26e799b..7dafef3 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -9,6 +9,8 @@ public enum Constant: String { // 用户相关的key值 + case UserName = "userName" + case Password = "password" case ServerConfig = "defaultServerConfig" case Token = "token" case UserJson = "userInfoJson" @@ -16,6 +18,7 @@ case OpenWarning = "openWarning" case CurrentLongitude = "currentLongitude" case CurrentLatitude = "currentLatitude" + case isSingleMode = "singleMode" // 网络请求相关的地址 case baseConfig = "/config/baseConfig" diff --git a/LaserMethane/ViewController/Event/SingModeEventViewController.swift b/LaserMethane/ViewController/Event/SingModeEventViewController.swift new file mode 100644 index 0000000..76f1f98 --- /dev/null +++ b/LaserMethane/ViewController/Event/SingModeEventViewController.swift @@ -0,0 +1,29 @@ +// +// SingModeEventViewController.swift +// LaserMethane +// +// Created by 203 on 2021/8/19. +// + +import UIKit + +class SingModeEventViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/LaserMethane/ViewController/Event/SingModeEventViewController.xib b/LaserMethane/ViewController/Event/SingModeEventViewController.xib new file mode 100644 index 0000000..059e884 --- /dev/null +++ b/LaserMethane/ViewController/Event/SingModeEventViewController.xib @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/LaserMethane/ViewController/Guide/GuideViewController.swift b/LaserMethane/ViewController/Guide/GuideViewController.swift index 2321c3f..4ae017f 100644 --- a/LaserMethane/ViewController/Guide/GuideViewController.swift +++ b/LaserMethane/ViewController/Guide/GuideViewController.swift @@ -5,9 +5,7 @@ // Created by 203 on 2021/7/27. // -import Alamofire import KeychainAccess -import SwiftyJSON import UIKit class GuideViewController: UIViewController { @@ -29,8 +27,7 @@ if countSeconds < 1 { timer?.invalidate() timer = nil - // 跳转页面 - startLoginViewController() + toLogin() return } countSeconds -= 1 @@ -42,37 +39,7 @@ @IBAction func skipCountDown(_ sender: UIButton) { timer?.invalidate() timer = nil - startLoginViewController() - } - - @objc func startLoginViewController() { - let token = keychain[Constant.Token.rawValue] - if token == nil { - toLogin() - } else { - if token!.isEmpty { - toLogin() - } else { - // 验证token有效性 - let obtainUserInfoURL = keychain[Constant.ServerConfig.rawValue]! + Constant.userInfo.rawValue - Alamofire.request(obtainUserInfoURL, method: .get, headers: ["token": token!]).responseJSON { [self] response in - switch response.result { - case let .success(value): - let userModel = UserInfoModel(respJson: JSON(value)) - if userModel.code == 200 { - // 将用户信息存起来 - keychain[Constant.UserJson.rawValue] = JSON(value).description - // 无需账号密码，直接到主界面 - toMainMenu() - } else { - toLogin() - } - case .failure: - toLogin() - } - } - } - } + toLogin() } @objc func toLogin() { @@ -81,12 +48,4 @@ destinationController.modalTransitionStyle = UIModalTransitionStyle.crossDissolve present(destinationController, animated: true, completion: nil) } - - @objc func toMainMenu() { - let homePage = MainMenuViewController(nibName: "MainMenuViewController", bundle: nil) - let destinationController = UINavigationController(rootViewController: homePage) - destinationController.modalPresentationStyle = UIModalPresentationStyle.fullScreen - destinationController.modalTransitionStyle = UIModalTransitionStyle.crossDissolve - present(destinationController, animated: true, completion: nil) - } } diff --git a/LaserMethane/ViewController/Inspect/SingModeInspectViewController.swift b/LaserMethane/ViewController/Inspect/SingModeInspectViewController.swift new file mode 100644 index 0000000..d7ad2a9 --- /dev/null +++ b/LaserMethane/ViewController/Inspect/SingModeInspectViewController.swift @@ -0,0 +1,29 @@ +// +// SingModeInspectViewController.swift +// LaserMethane +// +// Created by 203 on 2021/8/19. +// + +import UIKit + +class SingModeInspectViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/LaserMethane/ViewController/Inspect/SingModeInspectViewController.xib b/LaserMethane/ViewController/Inspect/SingModeInspectViewController.xib new file mode 100644 index 0000000..1f96f02 --- /dev/null +++ b/LaserMethane/ViewController/Inspect/SingModeInspectViewController.xib @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/LaserMethane/ViewController/Login/LoginViewController.swift b/LaserMethane/ViewController/Login/LoginViewController.swift index a033844..a91d110 100644 --- a/LaserMethane/ViewController/Login/LoginViewController.swift +++ b/LaserMethane/ViewController/Login/LoginViewController.swift @@ -14,17 +14,19 @@ @IBOutlet var userNameView: UITextField! @IBOutlet var passwordView: UITextField! @IBOutlet var loginButton: UIButton! - var keychain: Keychain! + private var keychain = Keychain() override func viewDidLoad() { super.viewDidLoad() - keychain = Keychain() // 实现UITextField代理 passwordView.delegate = self // rgb 色值为（21，101，227）那么给UIColor设置里面要除以255，设置16进制颜色也同理 loginButton.backgroundColor = UIColor(red: 21 / 255, green: 101 / 255, blue: 227 / 255, alpha: 1.0) loginButton.layer.cornerRadius = 18 // 设置圆角 + // 设置默认账号密码 + userNameView.text = keychain[Constant.UserName.rawValue] ?? "" + passwordView.text = keychain[Constant.Password.rawValue] ?? "" } @IBAction func loginAction(_ sender: UIButton) { @@ -38,6 +40,10 @@ AlertHub.shared.showWaringAlert(controller: self, message: "密码不能为空") return } + // 记录账号密码 + keychain[Constant.UserName.rawValue] = userName + keychain[Constant.Password.rawValue] = password + // 访问后台，开始登录 let baseURL = keychain[Constant.ServerConfig.rawValue] let configURL = baseURL! + Constant.baseConfig.rawValue @@ -78,6 +84,7 @@ // 跳转到主页 @objc func startMainMenuView() { + keychain[Constant.isSingleMode.rawValue] = "OFF" let homePage = MainMenuViewController(nibName: "MainMenuViewController", bundle: nil) let destinationController = UINavigationController(rootViewController: homePage) destinationController.modalPresentationStyle = UIModalPresentationStyle.fullScreen @@ -95,9 +102,14 @@ return true } - //单机模式 + // 单机模式 @IBAction func toSingleModeAction(_ sender: UIButton) { - + keychain[Constant.isSingleMode.rawValue] = "ON" + let homePage = MainMenuViewController(nibName: "MainMenuViewController", bundle: nil) + let destinationController = UINavigationController(rootViewController: homePage) + destinationController.modalPresentationStyle = UIModalPresentationStyle.fullScreen + destinationController.modalTransitionStyle = UIModalTransitionStyle.crossDissolve + present(destinationController, animated: true, completion: nil) } // 修改服务器IP diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 9178562..5530d95 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -16,6 +16,14 @@ 656EEBC826C4C7C20054E00E /* ImageCollectionViewDelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */; }; 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */; }; 656EEBCF26C529130054E00E /* Int.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656EEBCE26C529130054E00E /* Int.swift */; }; + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */; }; + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */; }; + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */; }; + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */; }; + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */; }; + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */; }; + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */; }; + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */; }; 65BF7A2A26B937410097B132 /* InspectMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7A2826B937410097B132 /* InspectMapViewController.swift */; }; 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65BF7A2926B937410097B132 /* InspectMapViewController.xib */; }; 65BF7C1C26AFDDCD000FEC82 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */; }; @@ -82,6 +90,14 @@ 656EEBC626C4C7C20054E00E /* ImageCollectionViewDelCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCollectionViewDelCell.swift; sourceTree = ""; }; 656EEBC726C4C7C20054E00E /* ImageCollectionViewDelCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ImageCollectionViewDelCell.xib; sourceTree = ""; }; 656EEBCE26C529130054E00E /* Int.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Int.swift; sourceTree = ""; }; + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeInspectViewController.swift; sourceTree = ""; }; + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeInspectViewController.xib; sourceTree = ""; }; + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeEventViewController.swift; sourceTree = ""; }; + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeEventViewController.xib; sourceTree = ""; }; + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeSettingViewController.swift; sourceTree = ""; }; + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeSettingViewController.xib; sourceTree = ""; }; + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingModeMapViewController.swift; sourceTree = ""; }; + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingModeMapViewController.xib; sourceTree = ""; }; 65BF7A2826B937410097B132 /* InspectMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectMapViewController.swift; sourceTree = ""; }; 65BF7A2926B937410097B132 /* InspectMapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectMapViewController.xib; sourceTree = ""; }; 65BF7A3426B9413F0097B132 /* LaserMethane-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "LaserMethane-Bridging-Header.h"; sourceTree = ""; }; @@ -598,13 +614,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 6518222226AFE95F00FCC275 /* Base */ = { - isa = PBXGroup; - children = ( - ); - path = Base; - sourceTree = ""; - }; 6518222326AFE97100FCC275 /* Extension */ = { isa = PBXGroup; children = ( @@ -658,7 +667,6 @@ 65F2DFC326AFF19900179EBD /* Coordinator */, 6518222826AFEAE500FCC275 /* ViewController */, 6518222326AFE97100FCC275 /* Extension */, - 6518222226AFE95F00FCC275 /* Base */, 65BF7C1B26AFDDCD000FEC82 /* AppDelegate.swift */, 65BF7C2426AFDDCD000FEC82 /* Assets.xcassets */, 65BF7C2626AFDDCD000FEC82 /* LaunchScreen.storyboard */, @@ -675,6 +683,8 @@ 65EB077326BCDF6600F9C0EC /* MapViewController.xib */, 65221CD026C0CCE40070D21C /* NewEventViewController.swift */, 65221CD126C0CCE40070D21C /* NewEventViewController.xib */, + 65BDB88826CD12D400A627D7 /* SingModeMapViewController.swift */, + 65BDB88926CD12D400A627D7 /* SingModeMapViewController.xib */, ); path = Map; sourceTree = ""; @@ -748,6 +758,8 @@ children = ( 65F2E01A26B1019200179EBD /* SettingViewController.swift */, 65F2E01B26B1019200179EBD /* SettingViewController.xib */, + 65A10D7226CDEC8600F2D76E /* SingModeSettingViewController.swift */, + 65A10D7326CDEC8600F2D76E /* SingModeSettingViewController.xib */, ); path = Settings; sourceTree = ""; @@ -789,6 +801,8 @@ 65BF7A2926B937410097B132 /* InspectMapViewController.xib */, 65EB076B26BCD76F00F9C0EC /* EventTaskViewController.swift */, 65EB076C26BCD76F00F9C0EC /* EventTaskViewController.xib */, + 65A10D6A26CDEC5300F2D76E /* SingModeInspectViewController.swift */, + 65A10D6B26CDEC5300F2D76E /* SingModeInspectViewController.xib */, ); path = Inspect; sourceTree = ""; @@ -800,6 +814,8 @@ 65F2E03F26B1724900179EBD /* EventViewController.xib */, 65F2E04826B25E8200179EBD /* EventDetailViewController.swift */, 65F2E04926B25E8200179EBD /* EventDetailViewController.xib */, + 65A10D6E26CDEC7100F2D76E /* SingModeEventViewController.swift */, + 65A10D6F26CDEC7100F2D76E /* SingModeEventViewController.xib */, ); path = Event; sourceTree = ""; @@ -1343,10 +1359,13 @@ 65F2E01D26B1019200179EBD /* SettingViewController.xib in Resources */, 65F2E05426B2812700179EBD /* ImageCollectionViewCell.xib in Resources */, 65BF7C2826AFDDCD000FEC82 /* LaunchScreen.storyboard in Resources */, + 65BDB88B26CD12D400A627D7 /* SingModeMapViewController.xib in Resources */, + 65A10D7526CDEC8600F2D76E /* SingModeSettingViewController.xib in Resources */, 65221CD326C0CCE40070D21C /* NewEventViewController.xib in Resources */, 656EEBC926C4C7C20054E00E /* ImageCollectionViewDelCell.xib in Resources */, 65EB077526BCDF6600F9C0EC /* MapViewController.xib in Resources */, 65F2E03D26B1723700179EBD /* InspectViewController.xib in Resources */, + 65A10D6D26CDEC5300F2D76E /* SingModeInspectViewController.xib in Resources */, 65F2E04B26B25E8200179EBD /* EventDetailViewController.xib in Resources */, 65F2DFFB26B0099800179EBD /* GuideViewController.xib in Resources */, 65F2E02626B1326D00179EBD /* CommonTableViewCell.xib in Resources */, @@ -1354,6 +1373,7 @@ 65EB076E26BCD76F00F9C0EC /* EventTaskViewController.xib in Resources */, 65F2E02E26B1341300179EBD /* SwitchTableViewCell.xib in Resources */, 65F2E03326B164CC00179EBD /* LogViewController.xib in Resources */, + 65A10D7126CDEC7100F2D76E /* SingModeEventViewController.xib in Resources */, 65BF7A2B26B937410097B132 /* InspectMapViewController.xib in Resources */, 65F2E02226B1242200179EBD /* DefaultTableViewCell.xib in Resources */, 65BF7C2526AFDDCD000FEC82 /* Assets.xcassets in Resources */, @@ -1443,6 +1463,7 @@ 65F2E05326B2812700179EBD /* ImageCollectionViewCell.swift in Sources */, 65F2E02526B1326D00179EBD /* CommonTableViewCell.swift in Sources */, 65EB077026BCD7C300F9C0EC /* EventTaskModel.swift in Sources */, + 65A10D7426CDEC8600F2D76E /* SingModeSettingViewController.swift in Sources */, 65F2E01426B0E8CA00179EBD /* AlertHub.swift in Sources */, 65BF7DD526BB8F880097B132 /* InspectDetailModel.swift in Sources */, 65221CDF26C11D320070D21C /* LoadingHub.swift in Sources */, @@ -1457,14 +1478,17 @@ 65F2DFC526AFF1A300179EBD /* AppCoordinator.swift in Sources */, 65F2E00326B0129100179EBD /* LoginResultModel.swift in Sources */, 65F2E04E26B260BC00179EBD /* TransferValueDelegate.swift in Sources */, + 65A10D6C26CDEC5300F2D76E /* SingModeInspectViewController.swift in Sources */, 656EEBCF26C529130054E00E /* Int.swift in Sources */, 65F2E05026B27B2C00179EBD /* LayerShadowHub.swift in Sources */, 65F2E00526B0129100179EBD /* InspectListModel.swift in Sources */, 65F2E00626B0129100179EBD /* BaseConfigModel.swift in Sources */, 65F2E00A26B012D700179EBD /* LoginViewController.swift in Sources */, + 65A10D7026CDEC7100F2D76E /* SingModeEventViewController.swift in Sources */, 65EB077426BCDF6600F9C0EC /* MapViewController.swift in Sources */, 65F2E04426B2392600179EBD /* ListCustomCell.swift in Sources */, 65EB076626BCCA6E00F9C0EC /* TransferIdDelegate.swift in Sources */, + 65BDB88A26CD12D400A627D7 /* SingModeMapViewController.swift in Sources */, 65F2DFCC26AFF2A900179EBD /* KeychainManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 502e862..b6d908d 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 26e799b..7dafef3 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -9,6 +9,8 @@ public enum Constant: String { // 用户相关的key值 + case UserName = "userName" + case Password = "password" case ServerConfig = "defaultServerConfig" case Token = "token" case UserJson = "userInfoJson" @@ -16,6 +18,7 @@ case OpenWarning = "openWarning" case CurrentLongitude = "currentLongitude" case CurrentLatitude = "currentLatitude" + case isSingleMode = "singleMode" // 网络请求相关的地址 case baseConfig = "/config/baseConfig" diff --git a/LaserMethane/ViewController/Event/SingModeEventViewController.swift b/LaserMethane/ViewController/Event/SingModeEventViewController.swift new file mode 100644 index 0000000..76f1f98 --- /dev/null +++ b/LaserMethane/ViewController/Event/SingModeEventViewController.swift @@ -0,0 +1,29 @@ +// +// SingModeEventViewController.swift +// LaserMethane +// +// Created by 203 on 2021/8/19. +// + +import UIKit + +class SingModeEventViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/LaserMethane/ViewController/Event/SingModeEventViewController.xib b/LaserMethane/ViewController/Event/SingModeEventViewController.xib new file mode 100644 index 0000000..059e884 --- /dev/null +++ b/LaserMethane/ViewController/Event/SingModeEventViewController.xib @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/LaserMethane/ViewController/Guide/GuideViewController.swift b/LaserMethane/ViewController/Guide/GuideViewController.swift index 2321c3f..4ae017f 100644 --- a/LaserMethane/ViewController/Guide/GuideViewController.swift +++ b/LaserMethane/ViewController/Guide/GuideViewController.swift @@ -5,9 +5,7 @@ // Created by 203 on 2021/7/27. // -import Alamofire import KeychainAccess -import SwiftyJSON import UIKit class GuideViewController: UIViewController { @@ -29,8 +27,7 @@ if countSeconds < 1 { timer?.invalidate() timer = nil - // 跳转页面 - startLoginViewController() + toLogin() return } countSeconds -= 1 @@ -42,37 +39,7 @@ @IBAction func skipCountDown(_ sender: UIButton) { timer?.invalidate() timer = nil - startLoginViewController() - } - - @objc func startLoginViewController() { - let token = keychain[Constant.Token.rawValue] - if token == nil { - toLogin() - } else { - if token!.isEmpty { - toLogin() - } else { - // 验证token有效性 - let obtainUserInfoURL = keychain[Constant.ServerConfig.rawValue]! + Constant.userInfo.rawValue - Alamofire.request(obtainUserInfoURL, method: .get, headers: ["token": token!]).responseJSON { [self] response in - switch response.result { - case let .success(value): - let userModel = UserInfoModel(respJson: JSON(value)) - if userModel.code == 200 { - // 将用户信息存起来 - keychain[Constant.UserJson.rawValue] = JSON(value).description - // 无需账号密码，直接到主界面 - toMainMenu() - } else { - toLogin() - } - case .failure: - toLogin() - } - } - } - } + toLogin() } @objc func toLogin() { @@ -81,12 +48,4 @@ destinationController.modalTransitionStyle = UIModalTransitionStyle.crossDissolve present(destinationController, animated: true, completion: nil) } - - @objc func toMainMenu() { - let homePage = MainMenuViewController(nibName: "MainMenuViewController", bundle: nil) - let destinationController = UINavigationController(rootViewController: homePage) - destinationController.modalPresentationStyle = UIModalPresentationStyle.fullScreen - destinationController.modalTransitionStyle = UIModalTransitionStyle.crossDissolve - present(destinationController, animated: true, completion: nil) - } } diff --git a/LaserMethane/ViewController/Inspect/SingModeInspectViewController.swift b/LaserMethane/ViewController/Inspect/SingModeInspectViewController.swift new file mode 100644 index 0000000..d7ad2a9 --- /dev/null +++ b/LaserMethane/ViewController/Inspect/SingModeInspectViewController.swift @@ -0,0 +1,29 @@ +// +// SingModeInspectViewController.swift +// LaserMethane +// +// Created by 203 on 2021/8/19. +// + +import UIKit + +class SingModeInspectViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/LaserMethane/ViewController/Inspect/SingModeInspectViewController.xib b/LaserMethane/ViewController/Inspect/SingModeInspectViewController.xib new file mode 100644 index 0000000..1f96f02 --- /dev/null +++ b/LaserMethane/ViewController/Inspect/SingModeInspectViewController.xib @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/LaserMethane/ViewController/Login/LoginViewController.swift b/LaserMethane/ViewController/Login/LoginViewController.swift index a033844..a91d110 100644 --- a/LaserMethane/ViewController/Login/LoginViewController.swift +++ b/LaserMethane/ViewController/Login/LoginViewController.swift @@ -14,17 +14,19 @@ @IBOutlet var userNameView: UITextField! @IBOutlet var passwordView: UITextField! @IBOutlet var loginButton: UIButton! - var keychain: Keychain! + private var keychain = Keychain() override func viewDidLoad() { super.viewDidLoad() - keychain = Keychain() // 实现UITextField代理 passwordView.delegate = self // rgb 色值为（21，101，227）那么给UIColor设置里面要除以255，设置16进制颜色也同理 loginButton.backgroundColor = UIColor(red: 21 / 255, green: 101 / 255, blue: 227 / 255, alpha: 1.0) loginButton.layer.cornerRadius = 18 // 设置圆角 + // 设置默认账号密码 + userNameView.text = keychain[Constant.UserName.rawValue] ?? "" + passwordView.text = keychain[Constant.Password.rawValue] ?? "" } @IBAction func loginAction(_ sender: UIButton) { @@ -38,6 +40,10 @@ AlertHub.shared.showWaringAlert(controller: self, message: "密码不能为空") return } + // 记录账号密码 + keychain[Constant.UserName.rawValue] = userName + keychain[Constant.Password.rawValue] = password + // 访问后台，开始登录 let baseURL = keychain[Constant.ServerConfig.rawValue] let configURL = baseURL! + Constant.baseConfig.rawValue @@ -78,6 +84,7 @@ // 跳转到主页 @objc func startMainMenuView() { + keychain[Constant.isSingleMode.rawValue] = "OFF" let homePage = MainMenuViewController(nibName: "MainMenuViewController", bundle: nil) let destinationController = UINavigationController(rootViewController: homePage) destinationController.modalPresentationStyle = UIModalPresentationStyle.fullScreen @@ -95,9 +102,14 @@ return true } - //单机模式 + // 单机模式 @IBAction func toSingleModeAction(_ sender: UIButton) { - + keychain[Constant.isSingleMode.rawValue] = "ON" + let homePage = MainMenuViewController(nibName: "MainMenuViewController", bundle: nil) + let destinationController = UINavigationController(rootViewController: homePage) + destinationController.modalPresentationStyle = UIModalPresentationStyle.fullScreen + destinationController.modalTransitionStyle = UIModalTransitionStyle.crossDissolve + present(destinationController, animated: true, completion: nil) } // 修改服务器IP diff --git a/LaserMethane/ViewController/Login/LoginViewController.xib b/LaserMethane/ViewController/Login/LoginViewController.xib index ae329b3..9ae01ee 100644 --- a/LaserMethane/ViewController/Login/LoginViewController.xib +++ b/LaserMethane/ViewController/Login/LoginViewController.xib @@ -28,37 +28,34 @@ - + - + - + - +