diff --git a/OrderScheduling.xcodeproj/project.pbxproj b/OrderScheduling.xcodeproj/project.pbxproj index caf2857..3f9af75 100644 --- a/OrderScheduling.xcodeproj/project.pbxproj +++ b/OrderScheduling.xcodeproj/project.pbxproj @@ -39,9 +39,9 @@ 7940277C2B3E9ECB00EC52D4 /* ConditionalSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7940277B2B3E9ECB00EC52D4 /* ConditionalSearchView.swift */; }; 7940277E2B43B9B600EC52D4 /* ConditionalSearchTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7940277D2B43B9B600EC52D4 /* ConditionalSearchTool.swift */; }; 794027842B4E330900EC52D4 /* MapPointAnnotationExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794027832B4E330900EC52D4 /* MapPointAnnotationExtension.swift */; }; - 7949FF102B51087900B75A21 /* style_extra.data in Resources */ = {isa = PBXBuildFile; fileRef = 7949FF0E2B51087900B75A21 /* style_extra.data */; }; - 7949FF112B51087900B75A21 /* style.data in Resources */ = {isa = PBXBuildFile; fileRef = 7949FF0F2B51087900B75A21 /* style.data */; }; 7949FF142B51096A00B75A21 /* CustomMapStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7949FF132B51096A00B75A21 /* CustomMapStyle.swift */; }; + 7949FF172B5144B300B75A21 /* style.data in Resources */ = {isa = PBXBuildFile; fileRef = 7949FF152B5144B200B75A21 /* style.data */; }; + 7949FF182B5144B300B75A21 /* style_extra.data in Resources */ = {isa = PBXBuildFile; fileRef = 7949FF162B5144B300B75A21 /* style_extra.data */; }; 794FBB0D2A8F040D00D57BB8 /* HistoryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794FBB0C2A8F040D00D57BB8 /* HistoryController.swift */; }; 794FBB142A8F045F00D57BB8 /* MineController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794FBB132A8F045F00D57BB8 /* MineController.swift */; }; 794FBB162A8F1A3300D57BB8 /* RescuePhotoController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794FBB152A8F1A3300D57BB8 /* RescuePhotoController.swift */; }; @@ -148,9 +148,9 @@ 7940277B2B3E9ECB00EC52D4 /* ConditionalSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConditionalSearchView.swift; sourceTree = ""; }; 7940277D2B43B9B600EC52D4 /* ConditionalSearchTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConditionalSearchTool.swift; sourceTree = ""; }; 794027832B4E330900EC52D4 /* MapPointAnnotationExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapPointAnnotationExtension.swift; sourceTree = ""; }; - 7949FF0E2B51087900B75A21 /* style_extra.data */ = {isa = PBXFileReference; lastKnownFileType = file; path = style_extra.data; sourceTree = ""; }; - 7949FF0F2B51087900B75A21 /* style.data */ = {isa = PBXFileReference; lastKnownFileType = file; path = style.data; sourceTree = ""; }; 7949FF132B51096A00B75A21 /* CustomMapStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomMapStyle.swift; sourceTree = ""; }; + 7949FF152B5144B200B75A21 /* style.data */ = {isa = PBXFileReference; lastKnownFileType = file; path = style.data; sourceTree = ""; }; + 7949FF162B5144B300B75A21 /* style_extra.data */ = {isa = PBXFileReference; lastKnownFileType = file; path = style_extra.data; sourceTree = ""; }; 794FBB0C2A8F040D00D57BB8 /* HistoryController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryController.swift; sourceTree = ""; }; 794FBB132A8F045F00D57BB8 /* MineController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineController.swift; sourceTree = ""; }; 794FBB152A8F1A3300D57BB8 /* RescuePhotoController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RescuePhotoController.swift; sourceTree = ""; }; @@ -437,8 +437,8 @@ 7949FF122B51093F00B75A21 /* CustomMap */ = { isa = PBXGroup; children = ( - 7949FF0E2B51087900B75A21 /* style_extra.data */, - 7949FF0F2B51087900B75A21 /* style.data */, + 7949FF162B5144B300B75A21 /* style_extra.data */, + 7949FF152B5144B200B75A21 /* style.data */, 7949FF132B51096A00B75A21 /* CustomMapStyle.swift */, ); path = CustomMap; @@ -900,13 +900,13 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 7949FF102B51087900B75A21 /* style_extra.data in Resources */, 79FB76102A9C6CAF00DB00A4 /* newJuheOrderAudio.wav in Resources */, 79EAD8172A7B86610036E093 /* LaunchScreen.storyboard in Resources */, 795FF3E02AA991E70058454C /* appointmentOrder.wav in Resources */, - 7949FF112B51087900B75A21 /* style.data in Resources */, + 7949FF172B5144B300B75A21 /* style.data in Resources */, 79EAD8142A7B86610036E093 /* Assets.xcassets in Resources */, 79FB76132A9C6CC100DB00A4 /* newOrderAudio.wav in Resources */, + 7949FF182B5144B300B75A21 /* style_extra.data in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 0f05422..d311cef 100644 Binary files a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate and b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/OrderScheduling/Common/Model/CustomMap/style.data b/OrderScheduling/Common/Model/CustomMap/style.data index 521f11b..3b8f823 100644 Binary files a/OrderScheduling/Common/Model/CustomMap/style.data and b/OrderScheduling/Common/Model/CustomMap/style.data differ diff --git a/OrderScheduling/Common/Model/CustomMap/style_extra.data b/OrderScheduling/Common/Model/CustomMap/style_extra.data index be00015..b44ab9e 100644 Binary files a/OrderScheduling/Common/Model/CustomMap/style_extra.data and b/OrderScheduling/Common/Model/CustomMap/style_extra.data differ diff --git a/fastlane/report.xml b/fastlane/report.xml index 8b6039e..d16c64e 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,17 @@ - + - + - +