diff --git a/QuickLocation.xcodeproj/project.pbxproj b/QuickLocation.xcodeproj/project.pbxproj index 885e10f0..0b31e9aa 100644 --- a/QuickLocation.xcodeproj/project.pbxproj +++ b/QuickLocation.xcodeproj/project.pbxproj @@ -152,9 +152,6 @@ 305A771D2FCA8C7000227D26 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305A76862FCA8C7000227D26 /* ViewController.swift */; }; 305A771E2FCA8C7000227D26 /* adhoc.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 305A74D12FCA8C7000227D26 /* adhoc.xcconfig */; }; 305A771F2FCA8C7000227D26 /* D-DIN-PRO-500-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 305A75342FCA8C7000227D26 /* D-DIN-PRO-500-Medium.otf */; }; - 305A77202FCA8C7000227D26 /* douyu.otf in Resources */ = {isa = PBXBuildFile; fileRef = 305A75352FCA8C7000227D26 /* douyu.otf */; }; - 305A77212FCA8C7000227D26 /* pmzd.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 305A75362FCA8C7000227D26 /* pmzd.ttf */; }; - 305A77222FCA8C7000227D26 /* YouSheBiaoTiHei.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 305A75372FCA8C7000227D26 /* YouSheBiaoTiHei.ttf */; }; 305A77232FCA8C7000227D26 /* zihunbiantaoti-r.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 305A75382FCA8C7000227D26 /* zihunbiantaoti-r.ttf */; }; 305A77F92FCA8C7000227D26 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 305A767F2FCA8C7000227D26 /* Assets.xcassets */; }; 305A77FB2FCA8C7000227D26 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 305A76822FCA8C7000227D26 /* LaunchScreen.storyboard */; }; @@ -296,6 +293,7 @@ 30EFF3E52FDAA93400EB35D4 /* PrivacyPolicyVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30EFF3E42FDAA93300EB35D4 /* PrivacyPolicyVC.swift */; }; 30EFF3E72FDAA93D00EB35D4 /* PrivacyPolicyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30EFF3E62FDAA93D00EB35D4 /* PrivacyPolicyView.swift */; }; 30EFF3E82FCA8C7000227D26 /* AuthenticationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 30EFF3E92FCA8C7000227D26 /* AuthenticationServices.framework */; }; + 557E8D5330187A5C0032AB51 /* BaseNavigationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 557E8D5230187A5C0032AB51 /* BaseNavigationView.swift */; }; 55BF752D2FFE53F70055DA57 /* LocationPermissionPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55BF752C2FFE53F70055DA57 /* LocationPermissionPopView.swift */; }; 55BF75352FFF91690055DA57 /* InteractionEmojiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55BF75342FFF91690055DA57 /* InteractionEmojiCell.swift */; }; A1B2C3D42FDABC8C009215C1 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = A1B2C3D52FDABC8C009215C1 /* PrivacyInfo.xcprivacy */; }; @@ -387,9 +385,6 @@ 305A75312FCA8C7000227D26 /* ImagePlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePlugin.swift; sourceTree = ""; }; 305A75322FCA8C7000227D26 /* NotEmpty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotEmpty.swift; sourceTree = ""; }; 305A75342FCA8C7000227D26 /* D-DIN-PRO-500-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "D-DIN-PRO-500-Medium.otf"; sourceTree = ""; }; - 305A75352FCA8C7000227D26 /* douyu.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = douyu.otf; sourceTree = ""; }; - 305A75362FCA8C7000227D26 /* pmzd.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = pmzd.ttf; sourceTree = ""; }; - 305A75372FCA8C7000227D26 /* YouSheBiaoTiHei.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = YouSheBiaoTiHei.ttf; sourceTree = ""; }; 305A75382FCA8C7000227D26 /* zihunbiantaoti-r.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "zihunbiantaoti-r.ttf"; sourceTree = ""; }; 305A761A2FCA8C7000227D26 /* Action.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Action.swift; sourceTree = ""; }; 305A761B2FCA8C7000227D26 /* Action+Internal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Action+Internal.swift"; sourceTree = ""; }; @@ -605,6 +600,7 @@ 30EFF3E92FCA8C7000227D26 /* AuthenticationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AuthenticationServices.framework; path = System/Library/Frameworks/AuthenticationServices.framework; sourceTree = SDKROOT; }; 3E4359082FC48D26003470A5 /* QuickLocation.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = QuickLocation.app; sourceTree = BUILT_PRODUCTS_DIR; }; 475D33CAFA1E1911EB1F8D9F /* Pods_QuickLocation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_QuickLocation.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 557E8D5230187A5C0032AB51 /* BaseNavigationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseNavigationView.swift; sourceTree = ""; }; 55BF752C2FFE53F70055DA57 /* LocationPermissionPopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationPermissionPopView.swift; sourceTree = ""; }; 55BF75342FFF91690055DA57 /* InteractionEmojiCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InteractionEmojiCell.swift; sourceTree = ""; }; A1B2C3D52FDABC8C009215C1 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; @@ -615,29 +611,21 @@ /* Begin PBXFileSystemSynchronizedRootGroup section */ 30CCDF8E2FE3E63B00F5214A /* sound */ = { isa = PBXFileSystemSynchronizedRootGroup; - exceptions = ( - ); path = sound; sourceTree = ""; }; 30CCDF902FE3E63B00F5214A /* video */ = { isa = PBXFileSystemSynchronizedRootGroup; - exceptions = ( - ); path = video; sourceTree = ""; }; 30CCE01E2FE3E64700F5214A /* lotties */ = { isa = PBXFileSystemSynchronizedRootGroup; - exceptions = ( - ); path = lotties; sourceTree = ""; }; 30D87CEF2FDFF52100E958FD /* TTGTagCollectionView */ = { isa = PBXFileSystemSynchronizedRootGroup; - exceptions = ( - ); path = TTGTagCollectionView; sourceTree = ""; }; @@ -959,9 +947,6 @@ isa = PBXGroup; children = ( 305A75342FCA8C7000227D26 /* D-DIN-PRO-500-Medium.otf */, - 305A75352FCA8C7000227D26 /* douyu.otf */, - 305A75362FCA8C7000227D26 /* pmzd.ttf */, - 305A75372FCA8C7000227D26 /* YouSheBiaoTiHei.ttf */, 305A75382FCA8C7000227D26 /* zihunbiantaoti-r.ttf */, ); path = Font; @@ -1220,6 +1205,7 @@ 305A767D2FCA8C7000227D26 /* UIKit */ = { isa = PBXGroup; children = ( + 557E8D5230187A5C0032AB51 /* BaseNavigationView.swift */, 30D87CEF2FDFF52100E958FD /* TTGTagCollectionView */, 305A76482FCA8C7000227D26 /* Alert */, 305A76502FCA8C7000227D26 /* EmptyDataSet */, @@ -1753,9 +1739,6 @@ files = ( 305A771E2FCA8C7000227D26 /* adhoc.xcconfig in Resources */, 305A771F2FCA8C7000227D26 /* D-DIN-PRO-500-Medium.otf in Resources */, - 305A77202FCA8C7000227D26 /* douyu.otf in Resources */, - 305A77212FCA8C7000227D26 /* pmzd.ttf in Resources */, - 305A77222FCA8C7000227D26 /* YouSheBiaoTiHei.ttf in Resources */, 305A77232FCA8C7000227D26 /* zihunbiantaoti-r.ttf in Resources */, 305A77F92FCA8C7000227D26 /* Assets.xcassets in Resources */, A1B2C3D42FDABC8C009215C1 /* PrivacyInfo.xcprivacy in Resources */, @@ -1797,10 +1780,14 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-QuickLocation/Pods-QuickLocation-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); + inputPaths = ( + ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-QuickLocation/Pods-QuickLocation-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); + outputPaths = ( + ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QuickLocation/Pods-QuickLocation-frameworks.sh\"\n"; @@ -1814,10 +1801,14 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-QuickLocation/Pods-QuickLocation-resources-${CONFIGURATION}-input-files.xcfilelist", ); + inputPaths = ( + ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-QuickLocation/Pods-QuickLocation-resources-${CONFIGURATION}-output-files.xcfilelist", ); + outputPaths = ( + ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QuickLocation/Pods-QuickLocation-resources.sh\"\n"; @@ -1988,6 +1979,7 @@ 30EBF7202FEFD6F2009A8A87 /* GroupChooseView.swift in Sources */, 305A76DA2FCA8C7000227D26 /* Button+Action.swift in Sources */, 305A76DB2FCA8C7000227D26 /* Control+Action.swift in Sources */, + 557E8D5330187A5C0032AB51 /* BaseNavigationView.swift in Sources */, 305A76DC2FCA8C7000227D26 /* InputSubject.swift in Sources */, 30B74B4D2FF391FF00F6744D /* DrivingService.swift in Sources */, 305A76DD2FCA8C7000227D26 /* NSObject+Rx.swift in Sources */, @@ -2156,8 +2148,8 @@ INFOPLIST_FILE = QuickLocation/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "极速定位"; INFOPLIST_KEY_NSCameraUsageDescription = "您的相机将被用于扫描二维码、拍摄照片和视频。"; - INFOPLIST_KEY_NSContactsUsageDescription = "需要访问您的通讯录以导入联系人号码"; - INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "需要获取您的位置信息以在地图上显示您的位置"; + INFOPLIST_KEY_NSContactsUsageDescription = "需要访问通讯录以快速查找和邀请好友加入您的圈子"; + INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "极速定位需要在后台持续获取您的位置，以便在您锁屏或使用其他App时，家人仍可看到您的实时位置以保障安全"; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "需要获取您的位置信息以在地图上显示您的位置"; INFOPLIST_KEY_NSMicrophoneUsageDescription = "我们需要使用您的麦克风，以便您使用麦克风发送语音消息。"; INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "为了保存图片到您的相册，请允许添加照片，谢谢。"; @@ -2209,8 +2201,8 @@ INFOPLIST_FILE = QuickLocation/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "极速定位"; INFOPLIST_KEY_NSCameraUsageDescription = "您的相机将被用于扫描二维码、拍摄照片和视频。"; - INFOPLIST_KEY_NSContactsUsageDescription = "需要访问您的通讯录以导入联系人号码"; - INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "需要获取您的位置信息以在地图上显示您的位置"; + INFOPLIST_KEY_NSContactsUsageDescription = "需要访问通讯录以快速查找和邀请好友加入您的圈子"; + INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "极速定位需要在后台持续获取您的位置，以便在您锁屏或使用其他App时，家人仍可看到您的实时位置以保障安全"; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "需要获取您的位置信息以在地图上显示您的位置"; INFOPLIST_KEY_NSMicrophoneUsageDescription = "我们需要使用您的麦克风，以便您使用麦克风发送语音消息。"; INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "为了保存图片到您的相册，请允许添加照片，谢谢。"; diff --git a/QuickLocation/AppDelegate.swift b/QuickLocation/AppDelegate.swift index 8c269ca1..ff9870e8 100644 --- a/QuickLocation/AppDelegate.swift +++ b/QuickLocation/AppDelegate.swift @@ -12,6 +12,7 @@ import GeYanSdk import AMapFoundationKit #endif import UMCommon +import SwiftDate @main class AppDelegate: UIResponder, UIApplicationDelegate { @@ -30,7 +31,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate { } func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - // Override point for customization after application launch. + + SwiftDate.defaultRegion = Region(zone: TimeZone.current, locale: Locale.current) IAPManager.shared.startObserving() diff --git a/QuickLocation/Assets.xcassets/AppIcon.appiconset/app_icon.png b/QuickLocation/Assets.xcassets/AppIcon.appiconset/app_icon.png index 2fa8bbe5..b7e830af 100644 Binary files a/QuickLocation/Assets.xcassets/AppIcon.appiconset/app_icon.png and b/QuickLocation/Assets.xcassets/AppIcon.appiconset/app_icon.png differ diff --git a/QuickLocation/Assets.xcassets/Bubble/text.imageset/text@2x.png b/QuickLocation/Assets.xcassets/Bubble/text.imageset/text@2x.png index d8163c6b..4ad95d55 100644 Binary files a/QuickLocation/Assets.xcassets/Bubble/text.imageset/text@2x.png and b/QuickLocation/Assets.xcassets/Bubble/text.imageset/text@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Bubble/text.imageset/text@3x.png b/QuickLocation/Assets.xcassets/Bubble/text.imageset/text@3x.png index c186a82e..fc38d8e2 100644 Binary files a/QuickLocation/Assets.xcassets/Bubble/text.imageset/text@3x.png and b/QuickLocation/Assets.xcassets/Bubble/text.imageset/text@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Bubble/time.imageset/Vector@2x.png b/QuickLocation/Assets.xcassets/Bubble/time.imageset/Vector@2x.png index 6a63773d..e7e8552f 100644 Binary files a/QuickLocation/Assets.xcassets/Bubble/time.imageset/Vector@2x.png and b/QuickLocation/Assets.xcassets/Bubble/time.imageset/Vector@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Bubble/time.imageset/Vector@3x.png b/QuickLocation/Assets.xcassets/Bubble/time.imageset/Vector@3x.png index 97697e03..9df68660 100644 Binary files a/QuickLocation/Assets.xcassets/Bubble/time.imageset/Vector@3x.png and b/QuickLocation/Assets.xcassets/Bubble/time.imageset/Vector@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Bubble/upgrade_bg.imageset/upgrade_bg@2x.png b/QuickLocation/Assets.xcassets/Bubble/upgrade_bg.imageset/upgrade_bg@2x.png index 61b952d7..1bde3afd 100644 Binary files a/QuickLocation/Assets.xcassets/Bubble/upgrade_bg.imageset/upgrade_bg@2x.png and b/QuickLocation/Assets.xcassets/Bubble/upgrade_bg.imageset/upgrade_bg@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Bubble/upgrade_bg.imageset/upgrade_bg@3x.png b/QuickLocation/Assets.xcassets/Bubble/upgrade_bg.imageset/upgrade_bg@3x.png index 0ca460a5..a2b788df 100644 Binary files a/QuickLocation/Assets.xcassets/Bubble/upgrade_bg.imageset/upgrade_bg@3x.png and b/QuickLocation/Assets.xcassets/Bubble/upgrade_bg.imageset/upgrade_bg@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Bubble/vip_pop.imageset/vip_pop@2x.png b/QuickLocation/Assets.xcassets/Bubble/vip_pop.imageset/vip_pop@2x.png index 470a49b5..608a3025 100644 Binary files a/QuickLocation/Assets.xcassets/Bubble/vip_pop.imageset/vip_pop@2x.png and b/QuickLocation/Assets.xcassets/Bubble/vip_pop.imageset/vip_pop@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Bubble/vip_pop.imageset/vip_pop@3x.png b/QuickLocation/Assets.xcassets/Bubble/vip_pop.imageset/vip_pop@3x.png index 99af46ad..d107c60d 100644 Binary files a/QuickLocation/Assets.xcassets/Bubble/vip_pop.imageset/vip_pop@3x.png and b/QuickLocation/Assets.xcassets/Bubble/vip_pop.imageset/vip_pop@3x.png differ diff --git a/QuickLocation/Assets.xcassets/CheckPermission/permission.imageset/permission@2x.png b/QuickLocation/Assets.xcassets/CheckPermission/permission.imageset/permission@2x.png index da063ffd..1679f74f 100644 Binary files a/QuickLocation/Assets.xcassets/CheckPermission/permission.imageset/permission@2x.png and b/QuickLocation/Assets.xcassets/CheckPermission/permission.imageset/permission@2x.png differ diff --git a/QuickLocation/Assets.xcassets/CheckPermission/permission.imageset/permission@3x.png b/QuickLocation/Assets.xcassets/CheckPermission/permission.imageset/permission@3x.png index ea8fffd8..7b16c9c8 100644 Binary files a/QuickLocation/Assets.xcassets/CheckPermission/permission.imageset/permission@3x.png and b/QuickLocation/Assets.xcassets/CheckPermission/permission.imageset/permission@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/back.imageset/back@2x.png b/QuickLocation/Assets.xcassets/Common/back.imageset/back@2x.png index ce73b942..2e36c2ca 100644 Binary files a/QuickLocation/Assets.xcassets/Common/back.imageset/back@2x.png and b/QuickLocation/Assets.xcassets/Common/back.imageset/back@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/back.imageset/back@3x.png b/QuickLocation/Assets.xcassets/Common/back.imageset/back@3x.png index f938c49c..854c1646 100644 Binary files a/QuickLocation/Assets.xcassets/Common/back.imageset/back@3x.png and b/QuickLocation/Assets.xcassets/Common/back.imageset/back@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/button_bg_2.imageset/Rectangle 168@2x.png b/QuickLocation/Assets.xcassets/Common/button_bg_2.imageset/Rectangle 168@2x.png index d1fdbd63..4def13bf 100644 Binary files a/QuickLocation/Assets.xcassets/Common/button_bg_2.imageset/Rectangle 168@2x.png and b/QuickLocation/Assets.xcassets/Common/button_bg_2.imageset/Rectangle 168@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/button_bg_2.imageset/Rectangle 168@3x.png b/QuickLocation/Assets.xcassets/Common/button_bg_2.imageset/Rectangle 168@3x.png index c1011e35..6e7072cd 100644 Binary files a/QuickLocation/Assets.xcassets/Common/button_bg_2.imageset/Rectangle 168@3x.png and b/QuickLocation/Assets.xcassets/Common/button_bg_2.imageset/Rectangle 168@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/checkbox.imageset/Rectangle 209@2x.png b/QuickLocation/Assets.xcassets/Common/checkbox.imageset/Rectangle 209@2x.png index b20e4ca1..cefbedf5 100644 Binary files a/QuickLocation/Assets.xcassets/Common/checkbox.imageset/Rectangle 209@2x.png and b/QuickLocation/Assets.xcassets/Common/checkbox.imageset/Rectangle 209@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/checkbox.imageset/Rectangle 209@3x.png b/QuickLocation/Assets.xcassets/Common/checkbox.imageset/Rectangle 209@3x.png index f985f187..67e373dd 100644 Binary files a/QuickLocation/Assets.xcassets/Common/checkbox.imageset/Rectangle 209@3x.png and b/QuickLocation/Assets.xcassets/Common/checkbox.imageset/Rectangle 209@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/checkbox_20x20.imageset/Rectangle_281@2x.png b/QuickLocation/Assets.xcassets/Common/checkbox_20x20.imageset/Rectangle_281@2x.png index 697af778..8b26a61c 100644 Binary files a/QuickLocation/Assets.xcassets/Common/checkbox_20x20.imageset/Rectangle_281@2x.png and b/QuickLocation/Assets.xcassets/Common/checkbox_20x20.imageset/Rectangle_281@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/checkbox_20x20.imageset/Rectangle_281@3x.png b/QuickLocation/Assets.xcassets/Common/checkbox_20x20.imageset/Rectangle_281@3x.png index 1899b819..b832f0e0 100644 Binary files a/QuickLocation/Assets.xcassets/Common/checkbox_20x20.imageset/Rectangle_281@3x.png and b/QuickLocation/Assets.xcassets/Common/checkbox_20x20.imageset/Rectangle_281@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/checkbox_on.imageset/Group_1476@2x.png b/QuickLocation/Assets.xcassets/Common/checkbox_on.imageset/Group_1476@2x.png index 193115cc..5ca4bbb7 100644 Binary files a/QuickLocation/Assets.xcassets/Common/checkbox_on.imageset/Group_1476@2x.png and b/QuickLocation/Assets.xcassets/Common/checkbox_on.imageset/Group_1476@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/checkbox_on.imageset/Group_1476@3x.png b/QuickLocation/Assets.xcassets/Common/checkbox_on.imageset/Group_1476@3x.png index dcb90405..4bbf2f64 100644 Binary files a/QuickLocation/Assets.xcassets/Common/checkbox_on.imageset/Group_1476@3x.png and b/QuickLocation/Assets.xcassets/Common/checkbox_on.imageset/Group_1476@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/delete.imageset/Group_2302@2x.png b/QuickLocation/Assets.xcassets/Common/delete.imageset/Group_2302@2x.png index 9f60c3b1..992852f5 100644 Binary files a/QuickLocation/Assets.xcassets/Common/delete.imageset/Group_2302@2x.png and b/QuickLocation/Assets.xcassets/Common/delete.imageset/Group_2302@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/delete.imageset/Group_2302@3x.png b/QuickLocation/Assets.xcassets/Common/delete.imageset/Group_2302@3x.png index 4effca66..8ecb63d7 100644 Binary files a/QuickLocation/Assets.xcassets/Common/delete.imageset/Group_2302@3x.png and b/QuickLocation/Assets.xcassets/Common/delete.imageset/Group_2302@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/delete_check.imageset/Vector@2x.png b/QuickLocation/Assets.xcassets/Common/delete_check.imageset/Vector@2x.png index 27dc5633..007e8493 100644 Binary files a/QuickLocation/Assets.xcassets/Common/delete_check.imageset/Vector@2x.png and b/QuickLocation/Assets.xcassets/Common/delete_check.imageset/Vector@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/delete_check.imageset/Vector@3x.png b/QuickLocation/Assets.xcassets/Common/delete_check.imageset/Vector@3x.png index 184ebdee..5852635b 100644 Binary files a/QuickLocation/Assets.xcassets/Common/delete_check.imageset/Vector@3x.png and b/QuickLocation/Assets.xcassets/Common/delete_check.imageset/Vector@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/gradient_bg.imageset/Rectangle 320.png b/QuickLocation/Assets.xcassets/Common/gradient_bg.imageset/Rectangle 320.png index 5bc66e4b..a378e529 100644 Binary files a/QuickLocation/Assets.xcassets/Common/gradient_bg.imageset/Rectangle 320.png and b/QuickLocation/Assets.xcassets/Common/gradient_bg.imageset/Rectangle 320.png differ diff --git a/QuickLocation/Assets.xcassets/Common/gradient_bg.imageset/Rectangle 320@2x.png b/QuickLocation/Assets.xcassets/Common/gradient_bg.imageset/Rectangle 320@2x.png index 1c487315..e13c0609 100644 Binary files a/QuickLocation/Assets.xcassets/Common/gradient_bg.imageset/Rectangle 320@2x.png and b/QuickLocation/Assets.xcassets/Common/gradient_bg.imageset/Rectangle 320@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/lock_white.imageset/Group_2309@2x.png b/QuickLocation/Assets.xcassets/Common/lock_white.imageset/Group_2309@2x.png index 4a60aa86..f5d6d0b4 100644 Binary files a/QuickLocation/Assets.xcassets/Common/lock_white.imageset/Group_2309@2x.png and b/QuickLocation/Assets.xcassets/Common/lock_white.imageset/Group_2309@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/lock_white.imageset/Group_2309@3x.png b/QuickLocation/Assets.xcassets/Common/lock_white.imageset/Group_2309@3x.png index 44e692f0..c6ca3cdb 100644 Binary files a/QuickLocation/Assets.xcassets/Common/lock_white.imageset/Group_2309@3x.png and b/QuickLocation/Assets.xcassets/Common/lock_white.imageset/Group_2309@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/logo108.imageset/logo108@2x.png b/QuickLocation/Assets.xcassets/Common/logo108.imageset/logo108@2x.png index 2422b180..16f0a5e1 100644 Binary files a/QuickLocation/Assets.xcassets/Common/logo108.imageset/logo108@2x.png and b/QuickLocation/Assets.xcassets/Common/logo108.imageset/logo108@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/navBar_bg_1.imageset/navBar_bg_1@2x.png b/QuickLocation/Assets.xcassets/Common/navBar_bg_1.imageset/navBar_bg_1@2x.png index 5b8659af..b4f3febe 100644 Binary files a/QuickLocation/Assets.xcassets/Common/navBar_bg_1.imageset/navBar_bg_1@2x.png and b/QuickLocation/Assets.xcassets/Common/navBar_bg_1.imageset/navBar_bg_1@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/navBar_bg_1.imageset/navBar_bg_1@3x.png b/QuickLocation/Assets.xcassets/Common/navBar_bg_1.imageset/navBar_bg_1@3x.png index 84a66f62..2c37e666 100644 Binary files a/QuickLocation/Assets.xcassets/Common/navBar_bg_1.imageset/navBar_bg_1@3x.png and b/QuickLocation/Assets.xcassets/Common/navBar_bg_1.imageset/navBar_bg_1@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/navBar_bg_2.imageset/navBar_bg_2@2x.png b/QuickLocation/Assets.xcassets/Common/navBar_bg_2.imageset/navBar_bg_2@2x.png index 2a5d2717..de9cc1b7 100644 Binary files a/QuickLocation/Assets.xcassets/Common/navBar_bg_2.imageset/navBar_bg_2@2x.png and b/QuickLocation/Assets.xcassets/Common/navBar_bg_2.imageset/navBar_bg_2@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/navBar_bg_2.imageset/navBar_bg_2@3x.png b/QuickLocation/Assets.xcassets/Common/navBar_bg_2.imageset/navBar_bg_2@3x.png index 0be4d09c..606804e7 100644 Binary files a/QuickLocation/Assets.xcassets/Common/navBar_bg_2.imageset/navBar_bg_2@3x.png and b/QuickLocation/Assets.xcassets/Common/navBar_bg_2.imageset/navBar_bg_2@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/owner.imageset/Group_614@2x.png b/QuickLocation/Assets.xcassets/Common/owner.imageset/Group_614@2x.png index dd5838c5..90184d15 100644 Binary files a/QuickLocation/Assets.xcassets/Common/owner.imageset/Group_614@2x.png and b/QuickLocation/Assets.xcassets/Common/owner.imageset/Group_614@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/owner.imageset/Group_614@3x.png b/QuickLocation/Assets.xcassets/Common/owner.imageset/Group_614@3x.png index 80e48831..fc2a38ee 100644 Binary files a/QuickLocation/Assets.xcassets/Common/owner.imageset/Group_614@3x.png and b/QuickLocation/Assets.xcassets/Common/owner.imageset/Group_614@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/x.imageset/Group_1572@2x.png b/QuickLocation/Assets.xcassets/Common/x.imageset/Group_1572@2x.png index 2dcbd588..61735200 100644 Binary files a/QuickLocation/Assets.xcassets/Common/x.imageset/Group_1572@2x.png and b/QuickLocation/Assets.xcassets/Common/x.imageset/Group_1572@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/x.imageset/Group_1572@3x.png b/QuickLocation/Assets.xcassets/Common/x.imageset/Group_1572@3x.png index ede26f8c..e50fff6c 100644 Binary files a/QuickLocation/Assets.xcassets/Common/x.imageset/Group_1572@3x.png and b/QuickLocation/Assets.xcassets/Common/x.imageset/Group_1572@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/x_black.imageset/x@2x.png b/QuickLocation/Assets.xcassets/Common/x_black.imageset/x@2x.png index bd330bc9..23259e7b 100644 Binary files a/QuickLocation/Assets.xcassets/Common/x_black.imageset/x@2x.png and b/QuickLocation/Assets.xcassets/Common/x_black.imageset/x@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Common/x_black.imageset/x@3x.png b/QuickLocation/Assets.xcassets/Common/x_black.imageset/x@3x.png index 9555b693..bb5fa5c1 100644 Binary files a/QuickLocation/Assets.xcassets/Common/x_black.imageset/x@3x.png and b/QuickLocation/Assets.xcassets/Common/x_black.imageset/x@3x.png differ diff --git a/QuickLocation/Assets.xcassets/EmergencyContact/add.imageset/Group_1532@2x.png b/QuickLocation/Assets.xcassets/EmergencyContact/add.imageset/Group_1532@2x.png index 4bc2fecb..15b96e48 100644 Binary files a/QuickLocation/Assets.xcassets/EmergencyContact/add.imageset/Group_1532@2x.png and b/QuickLocation/Assets.xcassets/EmergencyContact/add.imageset/Group_1532@2x.png differ diff --git a/QuickLocation/Assets.xcassets/EmergencyContact/add.imageset/Group_1532@3x.png b/QuickLocation/Assets.xcassets/EmergencyContact/add.imageset/Group_1532@3x.png index 19c692d5..0d6f321a 100644 Binary files a/QuickLocation/Assets.xcassets/EmergencyContact/add.imageset/Group_1532@3x.png and b/QuickLocation/Assets.xcassets/EmergencyContact/add.imageset/Group_1532@3x.png differ diff --git a/QuickLocation/Assets.xcassets/EmergencyContact/arrow.imageset/Union@2x.png b/QuickLocation/Assets.xcassets/EmergencyContact/arrow.imageset/Union@2x.png index cb159145..a224c7ea 100644 Binary files a/QuickLocation/Assets.xcassets/EmergencyContact/arrow.imageset/Union@2x.png and b/QuickLocation/Assets.xcassets/EmergencyContact/arrow.imageset/Union@2x.png differ diff --git a/QuickLocation/Assets.xcassets/EmergencyContact/arrow.imageset/Union@3x.png b/QuickLocation/Assets.xcassets/EmergencyContact/arrow.imageset/Union@3x.png index 8a4e4684..586dde74 100644 Binary files a/QuickLocation/Assets.xcassets/EmergencyContact/arrow.imageset/Union@3x.png and b/QuickLocation/Assets.xcassets/EmergencyContact/arrow.imageset/Union@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Group/arrow.imageset/Group_272@2x.png b/QuickLocation/Assets.xcassets/Group/arrow.imageset/Group_272@2x.png index cc7bc9fb..a084e5a8 100644 Binary files a/QuickLocation/Assets.xcassets/Group/arrow.imageset/Group_272@2x.png and b/QuickLocation/Assets.xcassets/Group/arrow.imageset/Group_272@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Group/arrow.imageset/Group_272@3x.png b/QuickLocation/Assets.xcassets/Group/arrow.imageset/Group_272@3x.png index 54803a6d..5cb25b82 100644 Binary files a/QuickLocation/Assets.xcassets/Group/arrow.imageset/Group_272@3x.png and b/QuickLocation/Assets.xcassets/Group/arrow.imageset/Group_272@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Group/close.imageset/Group_1545@2x.png b/QuickLocation/Assets.xcassets/Group/close.imageset/Group_1545@2x.png index 6fd01b6f..88dc0106 100644 Binary files a/QuickLocation/Assets.xcassets/Group/close.imageset/Group_1545@2x.png and b/QuickLocation/Assets.xcassets/Group/close.imageset/Group_1545@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Group/close.imageset/Group_1545@3x.png b/QuickLocation/Assets.xcassets/Group/close.imageset/Group_1545@3x.png index 2d74d4b1..bea0a424 100644 Binary files a/QuickLocation/Assets.xcassets/Group/close.imageset/Group_1545@3x.png and b/QuickLocation/Assets.xcassets/Group/close.imageset/Group_1545@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Group/edit.imageset/Group_297@2x.png b/QuickLocation/Assets.xcassets/Group/edit.imageset/Group_297@2x.png index d7eb30c7..8c6963d2 100644 Binary files a/QuickLocation/Assets.xcassets/Group/edit.imageset/Group_297@2x.png and b/QuickLocation/Assets.xcassets/Group/edit.imageset/Group_297@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Group/edit.imageset/Group_297@3x.png b/QuickLocation/Assets.xcassets/Group/edit.imageset/Group_297@3x.png index a11dbcbb..f679b23c 100644 Binary files a/QuickLocation/Assets.xcassets/Group/edit.imageset/Group_297@3x.png and b/QuickLocation/Assets.xcassets/Group/edit.imageset/Group_297@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Group/scan.imageset/Group_238@2x.png b/QuickLocation/Assets.xcassets/Group/scan.imageset/Group_238@2x.png index e82f1679..1b6a5e1b 100644 Binary files a/QuickLocation/Assets.xcassets/Group/scan.imageset/Group_238@2x.png and b/QuickLocation/Assets.xcassets/Group/scan.imageset/Group_238@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Group/scan.imageset/Group_238@3x.png b/QuickLocation/Assets.xcassets/Group/scan.imageset/Group_238@3x.png index c34c0bab..9c8b2e57 100644 Binary files a/QuickLocation/Assets.xcassets/Group/scan.imageset/Group_238@3x.png and b/QuickLocation/Assets.xcassets/Group/scan.imageset/Group_238@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Group/scan_bg.imageset/Group_1725@2x.png b/QuickLocation/Assets.xcassets/Group/scan_bg.imageset/Group_1725@2x.png index 13ac449a..25d09629 100644 Binary files a/QuickLocation/Assets.xcassets/Group/scan_bg.imageset/Group_1725@2x.png and b/QuickLocation/Assets.xcassets/Group/scan_bg.imageset/Group_1725@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Group/scan_bg.imageset/Group_1725@3x.png b/QuickLocation/Assets.xcassets/Group/scan_bg.imageset/Group_1725@3x.png index b86a6522..e907a948 100644 Binary files a/QuickLocation/Assets.xcassets/Group/scan_bg.imageset/Group_1725@3x.png and b/QuickLocation/Assets.xcassets/Group/scan_bg.imageset/Group_1725@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Group/selected.imageset/Group_240@2x.png b/QuickLocation/Assets.xcassets/Group/selected.imageset/Group_240@2x.png index c498aab0..e5648074 100644 Binary files a/QuickLocation/Assets.xcassets/Group/selected.imageset/Group_240@2x.png and b/QuickLocation/Assets.xcassets/Group/selected.imageset/Group_240@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Group/selected.imageset/Group_240@3x.png b/QuickLocation/Assets.xcassets/Group/selected.imageset/Group_240@3x.png index 87a425eb..bc994f3a 100644 Binary files a/QuickLocation/Assets.xcassets/Group/selected.imageset/Group_240@3x.png and b/QuickLocation/Assets.xcassets/Group/selected.imageset/Group_240@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Group/upgrade_bg.imageset/upgrade_bg@2x.png b/QuickLocation/Assets.xcassets/Group/upgrade_bg.imageset/upgrade_bg@2x.png index a7351ff8..468c64e3 100644 Binary files a/QuickLocation/Assets.xcassets/Group/upgrade_bg.imageset/upgrade_bg@2x.png and b/QuickLocation/Assets.xcassets/Group/upgrade_bg.imageset/upgrade_bg@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Group/upgrade_bg.imageset/upgrade_bg@3x.png b/QuickLocation/Assets.xcassets/Group/upgrade_bg.imageset/upgrade_bg@3x.png index 66799b06..6b63c78d 100644 Binary files a/QuickLocation/Assets.xcassets/Group/upgrade_bg.imageset/upgrade_bg@3x.png and b/QuickLocation/Assets.xcassets/Group/upgrade_bg.imageset/upgrade_bg@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Group/vip_pop.imageset/Group_2396@2x.png b/QuickLocation/Assets.xcassets/Group/vip_pop.imageset/Group_2396@2x.png index 5cde4ed5..02e3feee 100644 Binary files a/QuickLocation/Assets.xcassets/Group/vip_pop.imageset/Group_2396@2x.png and b/QuickLocation/Assets.xcassets/Group/vip_pop.imageset/Group_2396@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Group/vip_pop.imageset/Group_2396@3x.png b/QuickLocation/Assets.xcassets/Group/vip_pop.imageset/Group_2396@3x.png index 07479688..dc42599b 100644 Binary files a/QuickLocation/Assets.xcassets/Group/vip_pop.imageset/Group_2396@3x.png and b/QuickLocation/Assets.xcassets/Group/vip_pop.imageset/Group_2396@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/1.imageset/Frame_29@2x.png b/QuickLocation/Assets.xcassets/GroupIcon/1.imageset/Frame_29@2x.png index 304a0e80..fc59607a 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/1.imageset/Frame_29@2x.png and b/QuickLocation/Assets.xcassets/GroupIcon/1.imageset/Frame_29@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/1.imageset/Frame_29@3x.png b/QuickLocation/Assets.xcassets/GroupIcon/1.imageset/Frame_29@3x.png index 8b18b022..9bbaec4c 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/1.imageset/Frame_29@3x.png and b/QuickLocation/Assets.xcassets/GroupIcon/1.imageset/Frame_29@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/10.imageset/Frame_35@2x.png b/QuickLocation/Assets.xcassets/GroupIcon/10.imageset/Frame_35@2x.png index 15c654c8..44c54f39 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/10.imageset/Frame_35@2x.png and b/QuickLocation/Assets.xcassets/GroupIcon/10.imageset/Frame_35@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/10.imageset/Frame_35@3x.png b/QuickLocation/Assets.xcassets/GroupIcon/10.imageset/Frame_35@3x.png index 6efb9c15..ff84fc7e 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/10.imageset/Frame_35@3x.png and b/QuickLocation/Assets.xcassets/GroupIcon/10.imageset/Frame_35@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/11.imageset/Frame_36@2x.png b/QuickLocation/Assets.xcassets/GroupIcon/11.imageset/Frame_36@2x.png index affa49e7..19fe1ddc 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/11.imageset/Frame_36@2x.png and b/QuickLocation/Assets.xcassets/GroupIcon/11.imageset/Frame_36@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/11.imageset/Frame_36@3x.png b/QuickLocation/Assets.xcassets/GroupIcon/11.imageset/Frame_36@3x.png index cc089248..b246f061 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/11.imageset/Frame_36@3x.png and b/QuickLocation/Assets.xcassets/GroupIcon/11.imageset/Frame_36@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/2.imageset/Frame_30@2x.png b/QuickLocation/Assets.xcassets/GroupIcon/2.imageset/Frame_30@2x.png index 21804006..7376eb32 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/2.imageset/Frame_30@2x.png and b/QuickLocation/Assets.xcassets/GroupIcon/2.imageset/Frame_30@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/2.imageset/Frame_30@3x.png b/QuickLocation/Assets.xcassets/GroupIcon/2.imageset/Frame_30@3x.png index e2327713..29eba5c4 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/2.imageset/Frame_30@3x.png and b/QuickLocation/Assets.xcassets/GroupIcon/2.imageset/Frame_30@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/3.imageset/Frame_26@2x.png b/QuickLocation/Assets.xcassets/GroupIcon/3.imageset/Frame_26@2x.png index 298be08a..39f5cf06 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/3.imageset/Frame_26@2x.png and b/QuickLocation/Assets.xcassets/GroupIcon/3.imageset/Frame_26@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/3.imageset/Frame_26@3x.png b/QuickLocation/Assets.xcassets/GroupIcon/3.imageset/Frame_26@3x.png index 4c8e3469..8f35453b 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/3.imageset/Frame_26@3x.png and b/QuickLocation/Assets.xcassets/GroupIcon/3.imageset/Frame_26@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/4.imageset/Frame_28@2x.png b/QuickLocation/Assets.xcassets/GroupIcon/4.imageset/Frame_28@2x.png index 08a6c644..df9edcf0 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/4.imageset/Frame_28@2x.png and b/QuickLocation/Assets.xcassets/GroupIcon/4.imageset/Frame_28@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/4.imageset/Frame_28@3x.png b/QuickLocation/Assets.xcassets/GroupIcon/4.imageset/Frame_28@3x.png index 4b5de0ea..0a929902 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/4.imageset/Frame_28@3x.png and b/QuickLocation/Assets.xcassets/GroupIcon/4.imageset/Frame_28@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/5.imageset/Frame_27@2x.png b/QuickLocation/Assets.xcassets/GroupIcon/5.imageset/Frame_27@2x.png index c8a0485e..054cd8c2 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/5.imageset/Frame_27@2x.png and b/QuickLocation/Assets.xcassets/GroupIcon/5.imageset/Frame_27@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/5.imageset/Frame_27@3x.png b/QuickLocation/Assets.xcassets/GroupIcon/5.imageset/Frame_27@3x.png index 38c8a5d7..b857fd4e 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/5.imageset/Frame_27@3x.png and b/QuickLocation/Assets.xcassets/GroupIcon/5.imageset/Frame_27@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/6.imageset/Frame_31@2x.png b/QuickLocation/Assets.xcassets/GroupIcon/6.imageset/Frame_31@2x.png index dabe1c53..0ae62beb 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/6.imageset/Frame_31@2x.png and b/QuickLocation/Assets.xcassets/GroupIcon/6.imageset/Frame_31@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/6.imageset/Frame_31@3x.png b/QuickLocation/Assets.xcassets/GroupIcon/6.imageset/Frame_31@3x.png index 7800ba81..a4205411 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/6.imageset/Frame_31@3x.png and b/QuickLocation/Assets.xcassets/GroupIcon/6.imageset/Frame_31@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/7.imageset/Frame_32@2x.png b/QuickLocation/Assets.xcassets/GroupIcon/7.imageset/Frame_32@2x.png index c2c7490a..ac1f9bd9 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/7.imageset/Frame_32@2x.png and b/QuickLocation/Assets.xcassets/GroupIcon/7.imageset/Frame_32@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/7.imageset/Frame_32@3x.png b/QuickLocation/Assets.xcassets/GroupIcon/7.imageset/Frame_32@3x.png index dc535256..7f274a4e 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/7.imageset/Frame_32@3x.png and b/QuickLocation/Assets.xcassets/GroupIcon/7.imageset/Frame_32@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/8.imageset/Frame_33@2x.png b/QuickLocation/Assets.xcassets/GroupIcon/8.imageset/Frame_33@2x.png index 98202d47..e63da3a8 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/8.imageset/Frame_33@2x.png and b/QuickLocation/Assets.xcassets/GroupIcon/8.imageset/Frame_33@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/8.imageset/Frame_33@3x.png b/QuickLocation/Assets.xcassets/GroupIcon/8.imageset/Frame_33@3x.png index 4b92a3fa..cffc8274 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/8.imageset/Frame_33@3x.png and b/QuickLocation/Assets.xcassets/GroupIcon/8.imageset/Frame_33@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/9.imageset/Frame_34@2x.png b/QuickLocation/Assets.xcassets/GroupIcon/9.imageset/Frame_34@2x.png index 25ed0f93..c6a2b5de 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/9.imageset/Frame_34@2x.png and b/QuickLocation/Assets.xcassets/GroupIcon/9.imageset/Frame_34@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/9.imageset/Frame_34@3x.png b/QuickLocation/Assets.xcassets/GroupIcon/9.imageset/Frame_34@3x.png index 0c85b584..37214856 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/9.imageset/Frame_34@3x.png and b/QuickLocation/Assets.xcassets/GroupIcon/9.imageset/Frame_34@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/selected.imageset/Vector@2x.png b/QuickLocation/Assets.xcassets/GroupIcon/selected.imageset/Vector@2x.png index 773261ab..9952d25b 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/selected.imageset/Vector@2x.png and b/QuickLocation/Assets.xcassets/GroupIcon/selected.imageset/Vector@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupIcon/selected.imageset/Vector@3x.png b/QuickLocation/Assets.xcassets/GroupIcon/selected.imageset/Vector@3x.png index 33f91cf5..72b8e6ba 100644 Binary files a/QuickLocation/Assets.xcassets/GroupIcon/selected.imageset/Vector@3x.png and b/QuickLocation/Assets.xcassets/GroupIcon/selected.imageset/Vector@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/1.imageset/Group_408@2x.png b/QuickLocation/Assets.xcassets/GroupMemberList/1.imageset/Group_408@2x.png index 09b60557..306aecdc 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/1.imageset/Group_408@2x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/1.imageset/Group_408@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/1.imageset/Group_408@3x.png b/QuickLocation/Assets.xcassets/GroupMemberList/1.imageset/Group_408@3x.png index 4af9b9cf..1fade49b 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/1.imageset/Group_408@3x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/1.imageset/Group_408@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/2.imageset/Group_1914@2x.png b/QuickLocation/Assets.xcassets/GroupMemberList/2.imageset/Group_1914@2x.png index 3f7040a4..1329c316 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/2.imageset/Group_1914@2x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/2.imageset/Group_1914@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/2.imageset/Group_1914@3x.png b/QuickLocation/Assets.xcassets/GroupMemberList/2.imageset/Group_1914@3x.png index 22ca8798..33049995 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/2.imageset/Group_1914@3x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/2.imageset/Group_1914@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/3.imageset/Group_1987@2x.png b/QuickLocation/Assets.xcassets/GroupMemberList/3.imageset/Group_1987@2x.png index 39f561ab..82c26b47 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/3.imageset/Group_1987@2x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/3.imageset/Group_1987@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/3.imageset/Group_1987@3x.png b/QuickLocation/Assets.xcassets/GroupMemberList/3.imageset/Group_1987@3x.png index 3a7df522..d03a06f8 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/3.imageset/Group_1987@3x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/3.imageset/Group_1987@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/4.imageset/Group_1914@2x(1).png b/QuickLocation/Assets.xcassets/GroupMemberList/4.imageset/Group_1914@2x(1).png index b6f03ddd..32719a5d 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/4.imageset/Group_1914@2x(1).png and b/QuickLocation/Assets.xcassets/GroupMemberList/4.imageset/Group_1914@2x(1).png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/4.imageset/Group_1914@3x(1).png b/QuickLocation/Assets.xcassets/GroupMemberList/4.imageset/Group_1914@3x(1).png index 536a0e76..0109e8d8 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/4.imageset/Group_1914@3x(1).png and b/QuickLocation/Assets.xcassets/GroupMemberList/4.imageset/Group_1914@3x(1).png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/5.imageset/Group_1986@2x.png b/QuickLocation/Assets.xcassets/GroupMemberList/5.imageset/Group_1986@2x.png index f079adb8..11113c37 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/5.imageset/Group_1986@2x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/5.imageset/Group_1986@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/5.imageset/Group_1986@3x.png b/QuickLocation/Assets.xcassets/GroupMemberList/5.imageset/Group_1986@3x.png index 061c2db6..0d0bb86f 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/5.imageset/Group_1986@3x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/5.imageset/Group_1986@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/6.imageset/Group_408@2x(1).png b/QuickLocation/Assets.xcassets/GroupMemberList/6.imageset/Group_408@2x(1).png index 5542400e..54904c29 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/6.imageset/Group_408@2x(1).png and b/QuickLocation/Assets.xcassets/GroupMemberList/6.imageset/Group_408@2x(1).png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/6.imageset/Group_408@3x(1).png b/QuickLocation/Assets.xcassets/GroupMemberList/6.imageset/Group_408@3x(1).png index aefd900b..56919a01 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/6.imageset/Group_408@3x(1).png and b/QuickLocation/Assets.xcassets/GroupMemberList/6.imageset/Group_408@3x(1).png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/7.imageset/Group_1985@2x.png b/QuickLocation/Assets.xcassets/GroupMemberList/7.imageset/Group_1985@2x.png index 9cd8a0fe..0b6af008 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/7.imageset/Group_1985@2x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/7.imageset/Group_1985@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/7.imageset/Group_1985@3x.png b/QuickLocation/Assets.xcassets/GroupMemberList/7.imageset/Group_1985@3x.png index 538005c2..bc9f3801 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/7.imageset/Group_1985@3x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/7.imageset/Group_1985@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/8.imageset/Group_1988@2x.png b/QuickLocation/Assets.xcassets/GroupMemberList/8.imageset/Group_1988@2x.png index 05613634..29ec9e20 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/8.imageset/Group_1988@2x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/8.imageset/Group_1988@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/8.imageset/Group_1988@3x.png b/QuickLocation/Assets.xcassets/GroupMemberList/8.imageset/Group_1988@3x.png index cf2706a3..de605be6 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/8.imageset/Group_1988@3x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/8.imageset/Group_1988@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/date_left.imageset/Group_1900@2x.png b/QuickLocation/Assets.xcassets/GroupMemberList/date_left.imageset/Group_1900@2x.png index c3d95499..0738f2f9 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/date_left.imageset/Group_1900@2x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/date_left.imageset/Group_1900@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/date_left.imageset/Group_1900@3x.png b/QuickLocation/Assets.xcassets/GroupMemberList/date_left.imageset/Group_1900@3x.png index 1918c9fe..615cd9b6 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/date_left.imageset/Group_1900@3x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/date_left.imageset/Group_1900@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/date_right.imageset/Group_1900@2x(1).png b/QuickLocation/Assets.xcassets/GroupMemberList/date_right.imageset/Group_1900@2x(1).png index 816aef7e..00728bf8 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/date_right.imageset/Group_1900@2x(1).png and b/QuickLocation/Assets.xcassets/GroupMemberList/date_right.imageset/Group_1900@2x(1).png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/date_right.imageset/Group_1900@3x(1).png b/QuickLocation/Assets.xcassets/GroupMemberList/date_right.imageset/Group_1900@3x(1).png index 4c4300e3..2bfa6739 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/date_right.imageset/Group_1900@3x(1).png and b/QuickLocation/Assets.xcassets/GroupMemberList/date_right.imageset/Group_1900@3x(1).png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/mask_bg.imageset/Group_2170@2x.png b/QuickLocation/Assets.xcassets/GroupMemberList/mask_bg.imageset/Group_2170@2x.png index 9504b5c4..f9db8a61 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/mask_bg.imageset/Group_2170@2x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/mask_bg.imageset/Group_2170@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/mask_bg.imageset/Group_2170@3x.png b/QuickLocation/Assets.xcassets/GroupMemberList/mask_bg.imageset/Group_2170@3x.png index 9da84bba..a3a986b5 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/mask_bg.imageset/Group_2170@3x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/mask_bg.imageset/Group_2170@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/mask_member_tips.imageset/Group_2206@2x.png b/QuickLocation/Assets.xcassets/GroupMemberList/mask_member_tips.imageset/Group_2206@2x.png index 89ad04e2..de10187e 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/mask_member_tips.imageset/Group_2206@2x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/mask_member_tips.imageset/Group_2206@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/mask_member_tips.imageset/Group_2206@3x.png b/QuickLocation/Assets.xcassets/GroupMemberList/mask_member_tips.imageset/Group_2206@3x.png index eb61aab5..b41273c3 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/mask_member_tips.imageset/Group_2206@3x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/mask_member_tips.imageset/Group_2206@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/mask_self_tips.imageset/Group_2207@2x.png b/QuickLocation/Assets.xcassets/GroupMemberList/mask_self_tips.imageset/Group_2207@2x.png index 452f2410..2e0367d2 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/mask_self_tips.imageset/Group_2207@2x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/mask_self_tips.imageset/Group_2207@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/mask_self_tips.imageset/Group_2207@3x.png b/QuickLocation/Assets.xcassets/GroupMemberList/mask_self_tips.imageset/Group_2207@3x.png index ef765db3..554c6858 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/mask_self_tips.imageset/Group_2207@3x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/mask_self_tips.imageset/Group_2207@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/mask_tips.imageset/Group_2205@2x.png b/QuickLocation/Assets.xcassets/GroupMemberList/mask_tips.imageset/Group_2205@2x.png index f78834c1..98878d13 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/mask_tips.imageset/Group_2205@2x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/mask_tips.imageset/Group_2205@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/mask_tips.imageset/Group_2205@3x.png b/QuickLocation/Assets.xcassets/GroupMemberList/mask_tips.imageset/Group_2205@3x.png index 50e12e27..6746e6f9 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/mask_tips.imageset/Group_2205@3x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/mask_tips.imageset/Group_2205@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/member_left.imageset/Vector@2x.png b/QuickLocation/Assets.xcassets/GroupMemberList/member_left.imageset/Vector@2x.png index 82f21b12..a1998cdf 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/member_left.imageset/Vector@2x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/member_left.imageset/Vector@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/member_left.imageset/Vector@3x.png b/QuickLocation/Assets.xcassets/GroupMemberList/member_left.imageset/Vector@3x.png index 62b59442..7ee56816 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/member_left.imageset/Vector@3x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/member_left.imageset/Vector@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/member_right.imageset/Vector@2x(1).png b/QuickLocation/Assets.xcassets/GroupMemberList/member_right.imageset/Vector@2x(1).png index 6a601e78..725badeb 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/member_right.imageset/Vector@2x(1).png and b/QuickLocation/Assets.xcassets/GroupMemberList/member_right.imageset/Vector@2x(1).png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/member_right.imageset/Vector@3x(1).png b/QuickLocation/Assets.xcassets/GroupMemberList/member_right.imageset/Vector@3x(1).png index 602c9018..e61baef8 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/member_right.imageset/Vector@3x(1).png and b/QuickLocation/Assets.xcassets/GroupMemberList/member_right.imageset/Vector@3x(1).png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/selected_bg.imageset/Union@2x.png b/QuickLocation/Assets.xcassets/GroupMemberList/selected_bg.imageset/Union@2x.png index ac0d5b72..6d2b07e1 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/selected_bg.imageset/Union@2x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/selected_bg.imageset/Union@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/selected_bg.imageset/Union@3x.png b/QuickLocation/Assets.xcassets/GroupMemberList/selected_bg.imageset/Union@3x.png index e5ea904c..5a14cdc9 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/selected_bg.imageset/Union@3x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/selected_bg.imageset/Union@3x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/title_bg.imageset/Group_1989@2x.png b/QuickLocation/Assets.xcassets/GroupMemberList/title_bg.imageset/Group_1989@2x.png index 0cb1c490..11fa2938 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/title_bg.imageset/Group_1989@2x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/title_bg.imageset/Group_1989@2x.png differ diff --git a/QuickLocation/Assets.xcassets/GroupMemberList/title_bg.imageset/Group_1989@3x.png b/QuickLocation/Assets.xcassets/GroupMemberList/title_bg.imageset/Group_1989@3x.png index 7f6e50eb..3e381cde 100644 Binary files a/QuickLocation/Assets.xcassets/GroupMemberList/title_bg.imageset/Group_1989@3x.png and b/QuickLocation/Assets.xcassets/GroupMemberList/title_bg.imageset/Group_1989@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Guide/experience.imageset/Rectangle 71@2x.png b/QuickLocation/Assets.xcassets/Guide/experience.imageset/Rectangle 71@2x.png index 2e8a769f..fda1d900 100644 Binary files a/QuickLocation/Assets.xcassets/Guide/experience.imageset/Rectangle 71@2x.png and b/QuickLocation/Assets.xcassets/Guide/experience.imageset/Rectangle 71@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Guide/experience.imageset/Rectangle 71@3x.png b/QuickLocation/Assets.xcassets/Guide/experience.imageset/Rectangle 71@3x.png index 449dac18..7764e2f7 100644 Binary files a/QuickLocation/Assets.xcassets/Guide/experience.imageset/Rectangle 71@3x.png and b/QuickLocation/Assets.xcassets/Guide/experience.imageset/Rectangle 71@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Guide/guide_1.imageset/Group_2040@2x.png b/QuickLocation/Assets.xcassets/Guide/guide_1.imageset/Group_2040@2x.png index c527ecb0..b116cde7 100644 Binary files a/QuickLocation/Assets.xcassets/Guide/guide_1.imageset/Group_2040@2x.png and b/QuickLocation/Assets.xcassets/Guide/guide_1.imageset/Group_2040@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Guide/guide_1.imageset/Group_2040@3x.png b/QuickLocation/Assets.xcassets/Guide/guide_1.imageset/Group_2040@3x.png index 997a55cf..e06a9805 100644 Binary files a/QuickLocation/Assets.xcassets/Guide/guide_1.imageset/Group_2040@3x.png and b/QuickLocation/Assets.xcassets/Guide/guide_1.imageset/Group_2040@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Guide/guide_2.imageset/Group_2041@2x.png b/QuickLocation/Assets.xcassets/Guide/guide_2.imageset/Group_2041@2x.png index 04512c44..db95f004 100644 Binary files a/QuickLocation/Assets.xcassets/Guide/guide_2.imageset/Group_2041@2x.png and b/QuickLocation/Assets.xcassets/Guide/guide_2.imageset/Group_2041@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Guide/guide_2.imageset/Group_2041@3x.png b/QuickLocation/Assets.xcassets/Guide/guide_2.imageset/Group_2041@3x.png index 3cc133e0..02941808 100644 Binary files a/QuickLocation/Assets.xcassets/Guide/guide_2.imageset/Group_2041@3x.png and b/QuickLocation/Assets.xcassets/Guide/guide_2.imageset/Group_2041@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Guide/guide_3.imageset/Group_2042@2x.png b/QuickLocation/Assets.xcassets/Guide/guide_3.imageset/Group_2042@2x.png index f32a0c46..d7928c53 100644 Binary files a/QuickLocation/Assets.xcassets/Guide/guide_3.imageset/Group_2042@2x.png and b/QuickLocation/Assets.xcassets/Guide/guide_3.imageset/Group_2042@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Guide/guide_3.imageset/Group_2042@3x.png b/QuickLocation/Assets.xcassets/Guide/guide_3.imageset/Group_2042@3x.png index ba3f91cd..6ab19382 100644 Binary files a/QuickLocation/Assets.xcassets/Guide/guide_3.imageset/Group_2042@3x.png and b/QuickLocation/Assets.xcassets/Guide/guide_3.imageset/Group_2042@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Guide/guide_4.imageset/Group_2043@2x.png b/QuickLocation/Assets.xcassets/Guide/guide_4.imageset/Group_2043@2x.png index a34e12ec..75f0b8b5 100644 Binary files a/QuickLocation/Assets.xcassets/Guide/guide_4.imageset/Group_2043@2x.png and b/QuickLocation/Assets.xcassets/Guide/guide_4.imageset/Group_2043@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Guide/guide_4.imageset/Group_2043@3x.png b/QuickLocation/Assets.xcassets/Guide/guide_4.imageset/Group_2043@3x.png index 497d5f67..d4b8f7d5 100644 Binary files a/QuickLocation/Assets.xcassets/Guide/guide_4.imageset/Group_2043@3x.png and b/QuickLocation/Assets.xcassets/Guide/guide_4.imageset/Group_2043@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Guide/guide_5.imageset/Group_2044@2x.png b/QuickLocation/Assets.xcassets/Guide/guide_5.imageset/Group_2044@2x.png index 8d2f2faa..194ff1d4 100644 Binary files a/QuickLocation/Assets.xcassets/Guide/guide_5.imageset/Group_2044@2x.png and b/QuickLocation/Assets.xcassets/Guide/guide_5.imageset/Group_2044@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Guide/guide_5.imageset/Group_2044@3x.png b/QuickLocation/Assets.xcassets/Guide/guide_5.imageset/Group_2044@3x.png index 5a3b6da8..77536622 100644 Binary files a/QuickLocation/Assets.xcassets/Guide/guide_5.imageset/Group_2044@3x.png and b/QuickLocation/Assets.xcassets/Guide/guide_5.imageset/Group_2044@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/arrow_down.imageset/􀆉_Parent View@2x.png b/QuickLocation/Assets.xcassets/Home/arrow_down.imageset/􀆉_Parent View@2x.png index 3e4c1e37..c774c33a 100644 Binary files a/QuickLocation/Assets.xcassets/Home/arrow_down.imageset/􀆉_Parent View@2x.png and b/QuickLocation/Assets.xcassets/Home/arrow_down.imageset/􀆉_Parent View@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/arrow_down.imageset/􀆉_Parent View@3x.png b/QuickLocation/Assets.xcassets/Home/arrow_down.imageset/􀆉_Parent View@3x.png index 0e34b3ea..03f30bd0 100644 Binary files a/QuickLocation/Assets.xcassets/Home/arrow_down.imageset/􀆉_Parent View@3x.png and b/QuickLocation/Assets.xcassets/Home/arrow_down.imageset/􀆉_Parent View@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/battery.imageset/battery@2x.png b/QuickLocation/Assets.xcassets/Home/battery.imageset/battery@2x.png index c4b5d159..62b6d3e9 100644 Binary files a/QuickLocation/Assets.xcassets/Home/battery.imageset/battery@2x.png and b/QuickLocation/Assets.xcassets/Home/battery.imageset/battery@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/battery.imageset/battery@3x.png b/QuickLocation/Assets.xcassets/Home/battery.imageset/battery@3x.png index 3328c4cb..cac7878a 100644 Binary files a/QuickLocation/Assets.xcassets/Home/battery.imageset/battery@3x.png and b/QuickLocation/Assets.xcassets/Home/battery.imageset/battery@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/bubble.imageset/Group 1917@2x.png b/QuickLocation/Assets.xcassets/Home/bubble.imageset/Group 1917@2x.png index 6e0a0cc2..be73960a 100644 Binary files a/QuickLocation/Assets.xcassets/Home/bubble.imageset/Group 1917@2x.png and b/QuickLocation/Assets.xcassets/Home/bubble.imageset/Group 1917@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/bubble.imageset/Group 1917@3x.png b/QuickLocation/Assets.xcassets/Home/bubble.imageset/Group 1917@3x.png index 2e0e579e..b74c8dca 100644 Binary files a/QuickLocation/Assets.xcassets/Home/bubble.imageset/Group 1917@3x.png and b/QuickLocation/Assets.xcassets/Home/bubble.imageset/Group 1917@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/direction.imageset/direction@2x.png b/QuickLocation/Assets.xcassets/Home/direction.imageset/direction@2x.png index 2dbd53b0..48fe66ba 100644 Binary files a/QuickLocation/Assets.xcassets/Home/direction.imageset/direction@2x.png and b/QuickLocation/Assets.xcassets/Home/direction.imageset/direction@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/direction.imageset/direction@3x.png b/QuickLocation/Assets.xcassets/Home/direction.imageset/direction@3x.png index 8fdf5f5c..d088ec5d 100644 Binary files a/QuickLocation/Assets.xcassets/Home/direction.imageset/direction@3x.png and b/QuickLocation/Assets.xcassets/Home/direction.imageset/direction@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/emoji_bg.imageset/Rectangle 932@2x.png b/QuickLocation/Assets.xcassets/Home/emoji_bg.imageset/Rectangle 932@2x.png index fd9c4762..a2906955 100644 Binary files a/QuickLocation/Assets.xcassets/Home/emoji_bg.imageset/Rectangle 932@2x.png and b/QuickLocation/Assets.xcassets/Home/emoji_bg.imageset/Rectangle 932@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/emoji_bg.imageset/Rectangle 932@3x.png b/QuickLocation/Assets.xcassets/Home/emoji_bg.imageset/Rectangle 932@3x.png index 9fce4462..9c8fce20 100644 Binary files a/QuickLocation/Assets.xcassets/Home/emoji_bg.imageset/Rectangle 932@3x.png and b/QuickLocation/Assets.xcassets/Home/emoji_bg.imageset/Rectangle 932@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/emoji_interest.imageset/Group_1515@2x.png b/QuickLocation/Assets.xcassets/Home/emoji_interest.imageset/Group_1515@2x.png index d187eff9..26d441ad 100644 Binary files a/QuickLocation/Assets.xcassets/Home/emoji_interest.imageset/Group_1515@2x.png and b/QuickLocation/Assets.xcassets/Home/emoji_interest.imageset/Group_1515@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/emoji_interest.imageset/Group_1515@3x.png b/QuickLocation/Assets.xcassets/Home/emoji_interest.imageset/Group_1515@3x.png index bd40b7f8..4c595ee5 100644 Binary files a/QuickLocation/Assets.xcassets/Home/emoji_interest.imageset/Group_1515@3x.png and b/QuickLocation/Assets.xcassets/Home/emoji_interest.imageset/Group_1515@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/emoji_lock.imageset/Group 1679@2x.png b/QuickLocation/Assets.xcassets/Home/emoji_lock.imageset/Group 1679@2x.png index 7f0e2763..87868504 100644 Binary files a/QuickLocation/Assets.xcassets/Home/emoji_lock.imageset/Group 1679@2x.png and b/QuickLocation/Assets.xcassets/Home/emoji_lock.imageset/Group 1679@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/emoji_lock.imageset/Group 1679@3x.png b/QuickLocation/Assets.xcassets/Home/emoji_lock.imageset/Group 1679@3x.png index e6be29be..8d4a8ad7 100644 Binary files a/QuickLocation/Assets.xcassets/Home/emoji_lock.imageset/Group 1679@3x.png and b/QuickLocation/Assets.xcassets/Home/emoji_lock.imageset/Group 1679@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/emoji_normal.imageset/Group_1516@2x.png b/QuickLocation/Assets.xcassets/Home/emoji_normal.imageset/Group_1516@2x.png index 07e63059..9d55c697 100644 Binary files a/QuickLocation/Assets.xcassets/Home/emoji_normal.imageset/Group_1516@2x.png and b/QuickLocation/Assets.xcassets/Home/emoji_normal.imageset/Group_1516@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/emoji_normal.imageset/Group_1516@3x.png b/QuickLocation/Assets.xcassets/Home/emoji_normal.imageset/Group_1516@3x.png index 3ded2c96..3f0da1b8 100644 Binary files a/QuickLocation/Assets.xcassets/Home/emoji_normal.imageset/Group_1516@3x.png and b/QuickLocation/Assets.xcassets/Home/emoji_normal.imageset/Group_1516@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/group.imageset/group@2x.png b/QuickLocation/Assets.xcassets/Home/group.imageset/group@2x.png index 3eb5e6f4..56d67d2c 100644 Binary files a/QuickLocation/Assets.xcassets/Home/group.imageset/group@2x.png and b/QuickLocation/Assets.xcassets/Home/group.imageset/group@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/group.imageset/group@3x.png b/QuickLocation/Assets.xcassets/Home/group.imageset/group@3x.png index af783296..bc2619db 100644 Binary files a/QuickLocation/Assets.xcassets/Home/group.imageset/group@3x.png and b/QuickLocation/Assets.xcassets/Home/group.imageset/group@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/group_icon.imageset/Group_1458@2x.png b/QuickLocation/Assets.xcassets/Home/group_icon.imageset/Group_1458@2x.png index 776e3133..0d1baf92 100644 Binary files a/QuickLocation/Assets.xcassets/Home/group_icon.imageset/Group_1458@2x.png and b/QuickLocation/Assets.xcassets/Home/group_icon.imageset/Group_1458@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/group_icon.imageset/Group_1458@3x.png b/QuickLocation/Assets.xcassets/Home/group_icon.imageset/Group_1458@3x.png index d64cca35..e49a5339 100644 Binary files a/QuickLocation/Assets.xcassets/Home/group_icon.imageset/Group_1458@3x.png and b/QuickLocation/Assets.xcassets/Home/group_icon.imageset/Group_1458@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/group_member_bg.imageset/Group 1459@2x.png b/QuickLocation/Assets.xcassets/Home/group_member_bg.imageset/Group 1459@2x.png index b4f02413..9ce4ee74 100644 Binary files a/QuickLocation/Assets.xcassets/Home/group_member_bg.imageset/Group 1459@2x.png and b/QuickLocation/Assets.xcassets/Home/group_member_bg.imageset/Group 1459@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/group_member_bg.imageset/Group 1459@3x.png b/QuickLocation/Assets.xcassets/Home/group_member_bg.imageset/Group 1459@3x.png index 5373ffac..4d07366c 100644 Binary files a/QuickLocation/Assets.xcassets/Home/group_member_bg.imageset/Group 1459@3x.png and b/QuickLocation/Assets.xcassets/Home/group_member_bg.imageset/Group 1459@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/interaction_header.imageset/interaction_header@2x.png b/QuickLocation/Assets.xcassets/Home/interaction_header.imageset/interaction_header@2x.png index 5abb51b5..60a34067 100644 Binary files a/QuickLocation/Assets.xcassets/Home/interaction_header.imageset/interaction_header@2x.png and b/QuickLocation/Assets.xcassets/Home/interaction_header.imageset/interaction_header@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/interaction_header.imageset/interaction_header@3x.png b/QuickLocation/Assets.xcassets/Home/interaction_header.imageset/interaction_header@3x.png index 76304603..ff44a0e9 100644 Binary files a/QuickLocation/Assets.xcassets/Home/interaction_header.imageset/interaction_header@3x.png and b/QuickLocation/Assets.xcassets/Home/interaction_header.imageset/interaction_header@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/location.imageset/Group_50@2x.png b/QuickLocation/Assets.xcassets/Home/location.imageset/Group_50@2x.png index 771286b5..215c4e05 100644 Binary files a/QuickLocation/Assets.xcassets/Home/location.imageset/Group_50@2x.png and b/QuickLocation/Assets.xcassets/Home/location.imageset/Group_50@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/location.imageset/Group_50@3x.png b/QuickLocation/Assets.xcassets/Home/location.imageset/Group_50@3x.png index ab523a8e..7eedf54c 100644 Binary files a/QuickLocation/Assets.xcassets/Home/location.imageset/Group_50@3x.png and b/QuickLocation/Assets.xcassets/Home/location.imageset/Group_50@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/lock.imageset/Vector@2x.png b/QuickLocation/Assets.xcassets/Home/lock.imageset/Vector@2x.png index 3614b420..323398c9 100644 Binary files a/QuickLocation/Assets.xcassets/Home/lock.imageset/Vector@2x.png and b/QuickLocation/Assets.xcassets/Home/lock.imageset/Vector@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/lock.imageset/Vector@3x.png b/QuickLocation/Assets.xcassets/Home/lock.imageset/Vector@3x.png index df672e6c..40fc404f 100644 Binary files a/QuickLocation/Assets.xcassets/Home/lock.imageset/Vector@3x.png and b/QuickLocation/Assets.xcassets/Home/lock.imageset/Vector@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/member.imageset/Group_1457@2x.png b/QuickLocation/Assets.xcassets/Home/member.imageset/Group_1457@2x.png index 4a63a503..20651da1 100644 Binary files a/QuickLocation/Assets.xcassets/Home/member.imageset/Group_1457@2x.png and b/QuickLocation/Assets.xcassets/Home/member.imageset/Group_1457@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/member.imageset/Group_1457@3x.png b/QuickLocation/Assets.xcassets/Home/member.imageset/Group_1457@3x.png index 01b09a84..88a3ff52 100644 Binary files a/QuickLocation/Assets.xcassets/Home/member.imageset/Group_1457@3x.png and b/QuickLocation/Assets.xcassets/Home/member.imageset/Group_1457@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/member_location.imageset/Group_1565@2x.png b/QuickLocation/Assets.xcassets/Home/member_location.imageset/Group_1565@2x.png index e8b0dbed..b9913f37 100644 Binary files a/QuickLocation/Assets.xcassets/Home/member_location.imageset/Group_1565@2x.png and b/QuickLocation/Assets.xcassets/Home/member_location.imageset/Group_1565@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/member_location.imageset/Group_1565@3x.png b/QuickLocation/Assets.xcassets/Home/member_location.imageset/Group_1565@3x.png index 788864c8..bd7c8ad8 100644 Binary files a/QuickLocation/Assets.xcassets/Home/member_location.imageset/Group_1565@3x.png and b/QuickLocation/Assets.xcassets/Home/member_location.imageset/Group_1565@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/message.imageset/Group@2x.png b/QuickLocation/Assets.xcassets/Home/message.imageset/Group@2x.png index e15f128d..9b718838 100644 Binary files a/QuickLocation/Assets.xcassets/Home/message.imageset/Group@2x.png and b/QuickLocation/Assets.xcassets/Home/message.imageset/Group@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/message.imageset/Group@3x.png b/QuickLocation/Assets.xcassets/Home/message.imageset/Group@3x.png index 0df93d0b..0a2d092b 100644 Binary files a/QuickLocation/Assets.xcassets/Home/message.imageset/Group@3x.png and b/QuickLocation/Assets.xcassets/Home/message.imageset/Group@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/navBar_bg.imageset/navBar_bg@2x.png b/QuickLocation/Assets.xcassets/Home/navBar_bg.imageset/navBar_bg@2x.png index b62fe0df..0c1223c1 100644 Binary files a/QuickLocation/Assets.xcassets/Home/navBar_bg.imageset/navBar_bg@2x.png and b/QuickLocation/Assets.xcassets/Home/navBar_bg.imageset/navBar_bg@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/navBar_bg.imageset/navBar_bg@3x.png b/QuickLocation/Assets.xcassets/Home/navBar_bg.imageset/navBar_bg@3x.png index 26d77b50..a2f0a05e 100644 Binary files a/QuickLocation/Assets.xcassets/Home/navBar_bg.imageset/navBar_bg@3x.png and b/QuickLocation/Assets.xcassets/Home/navBar_bg.imageset/navBar_bg@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/navigate.imageset/Group_1951@2x.png b/QuickLocation/Assets.xcassets/Home/navigate.imageset/Group_1951@2x.png index 82b74e1a..b5a4a96a 100644 Binary files a/QuickLocation/Assets.xcassets/Home/navigate.imageset/Group_1951@2x.png and b/QuickLocation/Assets.xcassets/Home/navigate.imageset/Group_1951@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/navigate.imageset/Group_1951@3x.png b/QuickLocation/Assets.xcassets/Home/navigate.imageset/Group_1951@3x.png index 8d489480..782c68e8 100644 Binary files a/QuickLocation/Assets.xcassets/Home/navigate.imageset/Group_1951@3x.png and b/QuickLocation/Assets.xcassets/Home/navigate.imageset/Group_1951@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/permission_text.imageset/permission_text@2x.png b/QuickLocation/Assets.xcassets/Home/permission_text.imageset/permission_text@2x.png index 4b690b07..7a36dc20 100644 Binary files a/QuickLocation/Assets.xcassets/Home/permission_text.imageset/permission_text@2x.png and b/QuickLocation/Assets.xcassets/Home/permission_text.imageset/permission_text@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/permission_text.imageset/permission_text@3x.png b/QuickLocation/Assets.xcassets/Home/permission_text.imageset/permission_text@3x.png index ed99a48e..ade80036 100644 Binary files a/QuickLocation/Assets.xcassets/Home/permission_text.imageset/permission_text@3x.png and b/QuickLocation/Assets.xcassets/Home/permission_text.imageset/permission_text@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/refresh.imageset/Group 1456@2x.png b/QuickLocation/Assets.xcassets/Home/refresh.imageset/Group 1456@2x.png index 1f557176..eeb0d05d 100644 Binary files a/QuickLocation/Assets.xcassets/Home/refresh.imageset/Group 1456@2x.png and b/QuickLocation/Assets.xcassets/Home/refresh.imageset/Group 1456@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/refresh.imageset/Group 1456@3x.png b/QuickLocation/Assets.xcassets/Home/refresh.imageset/Group 1456@3x.png index 2de4a39e..1d78d187 100644 Binary files a/QuickLocation/Assets.xcassets/Home/refresh.imageset/Group 1456@3x.png and b/QuickLocation/Assets.xcassets/Home/refresh.imageset/Group 1456@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/schedule.imageset/schedule@2x.png b/QuickLocation/Assets.xcassets/Home/schedule.imageset/schedule@2x.png index baa3f306..314e9a13 100644 Binary files a/QuickLocation/Assets.xcassets/Home/schedule.imageset/schedule@2x.png and b/QuickLocation/Assets.xcassets/Home/schedule.imageset/schedule@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/schedule.imageset/schedule@3x.png b/QuickLocation/Assets.xcassets/Home/schedule.imageset/schedule@3x.png index cbd4365e..95d9ac0d 100644 Binary files a/QuickLocation/Assets.xcassets/Home/schedule.imageset/schedule@3x.png and b/QuickLocation/Assets.xcassets/Home/schedule.imageset/schedule@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/search.imageset/Group_1512@2x.png b/QuickLocation/Assets.xcassets/Home/search.imageset/Group_1512@2x.png index 918b8651..3b3e683f 100644 Binary files a/QuickLocation/Assets.xcassets/Home/search.imageset/Group_1512@2x.png and b/QuickLocation/Assets.xcassets/Home/search.imageset/Group_1512@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/search.imageset/Group_1512@3x.png b/QuickLocation/Assets.xcassets/Home/search.imageset/Group_1512@3x.png index 0857bd7f..82df156e 100644 Binary files a/QuickLocation/Assets.xcassets/Home/search.imageset/Group_1512@3x.png and b/QuickLocation/Assets.xcassets/Home/search.imageset/Group_1512@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/share.imageset/Group_1947@2x.png b/QuickLocation/Assets.xcassets/Home/share.imageset/Group_1947@2x.png index c5b276a4..d464ee5f 100644 Binary files a/QuickLocation/Assets.xcassets/Home/share.imageset/Group_1947@2x.png and b/QuickLocation/Assets.xcassets/Home/share.imageset/Group_1947@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/share.imageset/Group_1947@3x.png b/QuickLocation/Assets.xcassets/Home/share.imageset/Group_1947@3x.png index 3b159a42..1319e658 100644 Binary files a/QuickLocation/Assets.xcassets/Home/share.imageset/Group_1947@3x.png and b/QuickLocation/Assets.xcassets/Home/share.imageset/Group_1947@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/shield.imageset/Group 1919@2x.png b/QuickLocation/Assets.xcassets/Home/shield.imageset/Group 1919@2x.png index 1df1b1b7..171a262f 100644 Binary files a/QuickLocation/Assets.xcassets/Home/shield.imageset/Group 1919@2x.png and b/QuickLocation/Assets.xcassets/Home/shield.imageset/Group 1919@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/shield.imageset/Group 1919@3x.png b/QuickLocation/Assets.xcassets/Home/shield.imageset/Group 1919@3x.png index 49590e76..3cf6c090 100644 Binary files a/QuickLocation/Assets.xcassets/Home/shield.imageset/Group 1919@3x.png and b/QuickLocation/Assets.xcassets/Home/shield.imageset/Group 1919@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/signIn.imageset/Group_1450@2x.png b/QuickLocation/Assets.xcassets/Home/signIn.imageset/Group_1450@2x.png index 9c15a7a9..32cd1242 100644 Binary files a/QuickLocation/Assets.xcassets/Home/signIn.imageset/Group_1450@2x.png and b/QuickLocation/Assets.xcassets/Home/signIn.imageset/Group_1450@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/signIn.imageset/Group_1450@3x.png b/QuickLocation/Assets.xcassets/Home/signIn.imageset/Group_1450@3x.png index c7c7c469..e1c899b1 100644 Binary files a/QuickLocation/Assets.xcassets/Home/signIn.imageset/Group_1450@3x.png and b/QuickLocation/Assets.xcassets/Home/signIn.imageset/Group_1450@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/sos.imageset/Group_1449@2x.png b/QuickLocation/Assets.xcassets/Home/sos.imageset/Group_1449@2x.png index ebdc1ab5..357ace70 100644 Binary files a/QuickLocation/Assets.xcassets/Home/sos.imageset/Group_1449@2x.png and b/QuickLocation/Assets.xcassets/Home/sos.imageset/Group_1449@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/sos.imageset/Group_1449@3x.png b/QuickLocation/Assets.xcassets/Home/sos.imageset/Group_1449@3x.png index a0de5b43..062143a3 100644 Binary files a/QuickLocation/Assets.xcassets/Home/sos.imageset/Group_1449@3x.png and b/QuickLocation/Assets.xcassets/Home/sos.imageset/Group_1449@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/title_icon.imageset/title_icon@2x.png b/QuickLocation/Assets.xcassets/Home/title_icon.imageset/title_icon@2x.png index 546eb43d..2800db0d 100644 Binary files a/QuickLocation/Assets.xcassets/Home/title_icon.imageset/title_icon@2x.png and b/QuickLocation/Assets.xcassets/Home/title_icon.imageset/title_icon@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/title_icon.imageset/title_icon@3x.png b/QuickLocation/Assets.xcassets/Home/title_icon.imageset/title_icon@3x.png index 55767dc1..706edd5f 100644 Binary files a/QuickLocation/Assets.xcassets/Home/title_icon.imageset/title_icon@3x.png and b/QuickLocation/Assets.xcassets/Home/title_icon.imageset/title_icon@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/warning.imageset/Group_2220@2x.png b/QuickLocation/Assets.xcassets/Home/warning.imageset/Group_2220@2x.png index ad4d6809..0e1988fb 100644 Binary files a/QuickLocation/Assets.xcassets/Home/warning.imageset/Group_2220@2x.png and b/QuickLocation/Assets.xcassets/Home/warning.imageset/Group_2220@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Home/warning.imageset/Group_2220@3x.png b/QuickLocation/Assets.xcassets/Home/warning.imageset/Group_2220@3x.png index cec4ccd2..dabfdc12 100644 Binary files a/QuickLocation/Assets.xcassets/Home/warning.imageset/Group_2220@3x.png and b/QuickLocation/Assets.xcassets/Home/warning.imageset/Group_2220@3x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/add.imageset/Plus@2x.png b/QuickLocation/Assets.xcassets/IM/add.imageset/Plus@2x.png index 9ff58700..e23b1209 100644 Binary files a/QuickLocation/Assets.xcassets/IM/add.imageset/Plus@2x.png and b/QuickLocation/Assets.xcassets/IM/add.imageset/Plus@2x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/add.imageset/Plus@3x.png b/QuickLocation/Assets.xcassets/IM/add.imageset/Plus@3x.png index 46f5e626..928f8366 100644 Binary files a/QuickLocation/Assets.xcassets/IM/add.imageset/Plus@3x.png and b/QuickLocation/Assets.xcassets/IM/add.imageset/Plus@3x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/add_off.imageset/Plus@2x.png b/QuickLocation/Assets.xcassets/IM/add_off.imageset/Plus@2x.png index dcdbe53e..2a192bfe 100644 Binary files a/QuickLocation/Assets.xcassets/IM/add_off.imageset/Plus@2x.png and b/QuickLocation/Assets.xcassets/IM/add_off.imageset/Plus@2x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/add_off.imageset/Plus@3x.png b/QuickLocation/Assets.xcassets/IM/add_off.imageset/Plus@3x.png index 8ff0a9c6..180770c2 100644 Binary files a/QuickLocation/Assets.xcassets/IM/add_off.imageset/Plus@3x.png and b/QuickLocation/Assets.xcassets/IM/add_off.imageset/Plus@3x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/cancel.imageset/Group_2164@2x.png b/QuickLocation/Assets.xcassets/IM/cancel.imageset/Group_2164@2x.png index 135ce39b..1b1ec3cf 100644 Binary files a/QuickLocation/Assets.xcassets/IM/cancel.imageset/Group_2164@2x.png and b/QuickLocation/Assets.xcassets/IM/cancel.imageset/Group_2164@2x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/cancel.imageset/Group_2164@3x.png b/QuickLocation/Assets.xcassets/IM/cancel.imageset/Group_2164@3x.png index 588c63c1..41d4d640 100644 Binary files a/QuickLocation/Assets.xcassets/IM/cancel.imageset/Group_2164@3x.png and b/QuickLocation/Assets.xcassets/IM/cancel.imageset/Group_2164@3x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/cancel_off.imageset/Group_2168@2x.png b/QuickLocation/Assets.xcassets/IM/cancel_off.imageset/Group_2168@2x.png index c824fd1b..d93fa6fe 100644 Binary files a/QuickLocation/Assets.xcassets/IM/cancel_off.imageset/Group_2168@2x.png and b/QuickLocation/Assets.xcassets/IM/cancel_off.imageset/Group_2168@2x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/cancel_off.imageset/Group_2168@3x.png b/QuickLocation/Assets.xcassets/IM/cancel_off.imageset/Group_2168@3x.png index 08168b3b..58d7ef56 100644 Binary files a/QuickLocation/Assets.xcassets/IM/cancel_off.imageset/Group_2168@3x.png and b/QuickLocation/Assets.xcassets/IM/cancel_off.imageset/Group_2168@3x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/emoji.imageset/Group@2x.png b/QuickLocation/Assets.xcassets/IM/emoji.imageset/Group@2x.png index 87f81fb9..59a0adfd 100644 Binary files a/QuickLocation/Assets.xcassets/IM/emoji.imageset/Group@2x.png and b/QuickLocation/Assets.xcassets/IM/emoji.imageset/Group@2x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/emoji.imageset/Group@3x.png b/QuickLocation/Assets.xcassets/IM/emoji.imageset/Group@3x.png index 5433e516..7a0abf13 100644 Binary files a/QuickLocation/Assets.xcassets/IM/emoji.imageset/Group@3x.png and b/QuickLocation/Assets.xcassets/IM/emoji.imageset/Group@3x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/emoji_off.imageset/Group@2x.png b/QuickLocation/Assets.xcassets/IM/emoji_off.imageset/Group@2x.png index 07cc01da..911d0608 100644 Binary files a/QuickLocation/Assets.xcassets/IM/emoji_off.imageset/Group@2x.png and b/QuickLocation/Assets.xcassets/IM/emoji_off.imageset/Group@2x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/emoji_off.imageset/Group@3x.png b/QuickLocation/Assets.xcassets/IM/emoji_off.imageset/Group@3x.png index e3bb4f9c..9587a7df 100644 Binary files a/QuickLocation/Assets.xcassets/IM/emoji_off.imageset/Group@3x.png and b/QuickLocation/Assets.xcassets/IM/emoji_off.imageset/Group@3x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/keyboard.imageset/Icons_Photo@2x.png b/QuickLocation/Assets.xcassets/IM/keyboard.imageset/Icons_Photo@2x.png index fdbd5850..ab78db90 100644 Binary files a/QuickLocation/Assets.xcassets/IM/keyboard.imageset/Icons_Photo@2x.png and b/QuickLocation/Assets.xcassets/IM/keyboard.imageset/Icons_Photo@2x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/keyboard.imageset/Icons_Photo@3x.png b/QuickLocation/Assets.xcassets/IM/keyboard.imageset/Icons_Photo@3x.png index dc1aa57b..1e87dcd1 100644 Binary files a/QuickLocation/Assets.xcassets/IM/keyboard.imageset/Icons_Photo@3x.png and b/QuickLocation/Assets.xcassets/IM/keyboard.imageset/Icons_Photo@3x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/member.imageset/Group_1613@2x.png b/QuickLocation/Assets.xcassets/IM/member.imageset/Group_1613@2x.png index c866fc67..6396614f 100644 Binary files a/QuickLocation/Assets.xcassets/IM/member.imageset/Group_1613@2x.png and b/QuickLocation/Assets.xcassets/IM/member.imageset/Group_1613@2x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/member.imageset/Group_1613@3x.png b/QuickLocation/Assets.xcassets/IM/member.imageset/Group_1613@3x.png index 2a966138..7cbba75d 100644 Binary files a/QuickLocation/Assets.xcassets/IM/member.imageset/Group_1613@3x.png and b/QuickLocation/Assets.xcassets/IM/member.imageset/Group_1613@3x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/review.imageset/Group_1898@2x.png b/QuickLocation/Assets.xcassets/IM/review.imageset/Group_1898@2x.png index f4cb6258..c77d20f3 100644 Binary files a/QuickLocation/Assets.xcassets/IM/review.imageset/Group_1898@2x.png and b/QuickLocation/Assets.xcassets/IM/review.imageset/Group_1898@2x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/review.imageset/Group_1898@3x.png b/QuickLocation/Assets.xcassets/IM/review.imageset/Group_1898@3x.png index c6d4d5bc..2b89ad88 100644 Binary files a/QuickLocation/Assets.xcassets/IM/review.imageset/Group_1898@3x.png and b/QuickLocation/Assets.xcassets/IM/review.imageset/Group_1898@3x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/setting.imageset/Group_1614@2x.png b/QuickLocation/Assets.xcassets/IM/setting.imageset/Group_1614@2x.png index eee4d91b..30e5d7ca 100644 Binary files a/QuickLocation/Assets.xcassets/IM/setting.imageset/Group_1614@2x.png and b/QuickLocation/Assets.xcassets/IM/setting.imageset/Group_1614@2x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/setting.imageset/Group_1614@3x.png b/QuickLocation/Assets.xcassets/IM/setting.imageset/Group_1614@3x.png index 17370fe5..de9dc0e4 100644 Binary files a/QuickLocation/Assets.xcassets/IM/setting.imageset/Group_1614@3x.png and b/QuickLocation/Assets.xcassets/IM/setting.imageset/Group_1614@3x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/speak.imageset/Group_2166@2x.png b/QuickLocation/Assets.xcassets/IM/speak.imageset/Group_2166@2x.png index 37982eb5..63479dd7 100644 Binary files a/QuickLocation/Assets.xcassets/IM/speak.imageset/Group_2166@2x.png and b/QuickLocation/Assets.xcassets/IM/speak.imageset/Group_2166@2x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/speak.imageset/Group_2166@3x.png b/QuickLocation/Assets.xcassets/IM/speak.imageset/Group_2166@3x.png index 11452b7f..89ada5f6 100644 Binary files a/QuickLocation/Assets.xcassets/IM/speak.imageset/Group_2166@3x.png and b/QuickLocation/Assets.xcassets/IM/speak.imageset/Group_2166@3x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/speaking.imageset/Mask_group@2x.png b/QuickLocation/Assets.xcassets/IM/speaking.imageset/Mask_group@2x.png index 0155a05e..cdb2e530 100644 Binary files a/QuickLocation/Assets.xcassets/IM/speaking.imageset/Mask_group@2x.png and b/QuickLocation/Assets.xcassets/IM/speaking.imageset/Mask_group@2x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/speaking.imageset/Mask_group@3x.png b/QuickLocation/Assets.xcassets/IM/speaking.imageset/Mask_group@3x.png index 6c49630a..8771626b 100644 Binary files a/QuickLocation/Assets.xcassets/IM/speaking.imageset/Mask_group@3x.png and b/QuickLocation/Assets.xcassets/IM/speaking.imageset/Mask_group@3x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/video_received.imageset/Group_2190@2x.png b/QuickLocation/Assets.xcassets/IM/video_received.imageset/Group_2190@2x.png index 38173266..97693c46 100644 Binary files a/QuickLocation/Assets.xcassets/IM/video_received.imageset/Group_2190@2x.png and b/QuickLocation/Assets.xcassets/IM/video_received.imageset/Group_2190@2x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/video_received.imageset/Group_2190@3x.png b/QuickLocation/Assets.xcassets/IM/video_received.imageset/Group_2190@3x.png index df645739..23ba090f 100644 Binary files a/QuickLocation/Assets.xcassets/IM/video_received.imageset/Group_2190@3x.png and b/QuickLocation/Assets.xcassets/IM/video_received.imageset/Group_2190@3x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/video_send.imageset/video_send@2x.png b/QuickLocation/Assets.xcassets/IM/video_send.imageset/video_send@2x.png index 96dd4c30..7ac461ef 100644 Binary files a/QuickLocation/Assets.xcassets/IM/video_send.imageset/video_send@2x.png and b/QuickLocation/Assets.xcassets/IM/video_send.imageset/video_send@2x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/video_send.imageset/video_send@3x.png b/QuickLocation/Assets.xcassets/IM/video_send.imageset/video_send@3x.png index 234723df..d3a2b0f8 100644 Binary files a/QuickLocation/Assets.xcassets/IM/video_send.imageset/video_send@3x.png and b/QuickLocation/Assets.xcassets/IM/video_send.imageset/video_send@3x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/voice.imageset/Icons_Photo@2x.png b/QuickLocation/Assets.xcassets/IM/voice.imageset/Icons_Photo@2x.png index ee19e21b..1f19395b 100644 Binary files a/QuickLocation/Assets.xcassets/IM/voice.imageset/Icons_Photo@2x.png and b/QuickLocation/Assets.xcassets/IM/voice.imageset/Icons_Photo@2x.png differ diff --git a/QuickLocation/Assets.xcassets/IM/voice.imageset/Icons_Photo@3x.png b/QuickLocation/Assets.xcassets/IM/voice.imageset/Icons_Photo@3x.png index bce94197..16b0a64a 100644 Binary files a/QuickLocation/Assets.xcassets/IM/voice.imageset/Icons_Photo@3x.png and b/QuickLocation/Assets.xcassets/IM/voice.imageset/Icons_Photo@3x.png differ diff --git a/QuickLocation/Assets.xcassets/ItineraryTrace/dashed.imageset/Slice 3@2x.png b/QuickLocation/Assets.xcassets/ItineraryTrace/dashed.imageset/Slice 3@2x.png index 4438da0a..4900513d 100644 Binary files a/QuickLocation/Assets.xcassets/ItineraryTrace/dashed.imageset/Slice 3@2x.png and b/QuickLocation/Assets.xcassets/ItineraryTrace/dashed.imageset/Slice 3@2x.png differ diff --git a/QuickLocation/Assets.xcassets/ItineraryTrace/dashed.imageset/Slice 3@3x.png b/QuickLocation/Assets.xcassets/ItineraryTrace/dashed.imageset/Slice 3@3x.png index 08495b01..f3304848 100644 Binary files a/QuickLocation/Assets.xcassets/ItineraryTrace/dashed.imageset/Slice 3@3x.png and b/QuickLocation/Assets.xcassets/ItineraryTrace/dashed.imageset/Slice 3@3x.png differ diff --git a/QuickLocation/Assets.xcassets/ItineraryTrace/end.imageset/Group_327@2x.png b/QuickLocation/Assets.xcassets/ItineraryTrace/end.imageset/Group_327@2x.png index 4487190d..34312003 100644 Binary files a/QuickLocation/Assets.xcassets/ItineraryTrace/end.imageset/Group_327@2x.png and b/QuickLocation/Assets.xcassets/ItineraryTrace/end.imageset/Group_327@2x.png differ diff --git a/QuickLocation/Assets.xcassets/ItineraryTrace/end.imageset/Group_327@3x.png b/QuickLocation/Assets.xcassets/ItineraryTrace/end.imageset/Group_327@3x.png index 38e7f960..9138b791 100644 Binary files a/QuickLocation/Assets.xcassets/ItineraryTrace/end.imageset/Group_327@3x.png and b/QuickLocation/Assets.xcassets/ItineraryTrace/end.imageset/Group_327@3x.png differ diff --git a/QuickLocation/Assets.xcassets/ItineraryTrace/end_small.imageset/Group_2159@2x.png b/QuickLocation/Assets.xcassets/ItineraryTrace/end_small.imageset/Group_2159@2x.png index 5fc4253e..53cedeb4 100644 Binary files a/QuickLocation/Assets.xcassets/ItineraryTrace/end_small.imageset/Group_2159@2x.png and b/QuickLocation/Assets.xcassets/ItineraryTrace/end_small.imageset/Group_2159@2x.png differ diff --git a/QuickLocation/Assets.xcassets/ItineraryTrace/end_small.imageset/Group_2159@3x.png b/QuickLocation/Assets.xcassets/ItineraryTrace/end_small.imageset/Group_2159@3x.png index 7e6ef2c1..f62a0546 100644 Binary files a/QuickLocation/Assets.xcassets/ItineraryTrace/end_small.imageset/Group_2159@3x.png and b/QuickLocation/Assets.xcassets/ItineraryTrace/end_small.imageset/Group_2159@3x.png differ diff --git a/QuickLocation/Assets.xcassets/ItineraryTrace/event.imageset/Group_326@2x.png b/QuickLocation/Assets.xcassets/ItineraryTrace/event.imageset/Group_326@2x.png index 9e9521b7..473a1f92 100644 Binary files a/QuickLocation/Assets.xcassets/ItineraryTrace/event.imageset/Group_326@2x.png and b/QuickLocation/Assets.xcassets/ItineraryTrace/event.imageset/Group_326@2x.png differ diff --git a/QuickLocation/Assets.xcassets/ItineraryTrace/event.imageset/Group_326@3x.png b/QuickLocation/Assets.xcassets/ItineraryTrace/event.imageset/Group_326@3x.png index f4958c87..105d084c 100644 Binary files a/QuickLocation/Assets.xcassets/ItineraryTrace/event.imageset/Group_326@3x.png and b/QuickLocation/Assets.xcassets/ItineraryTrace/event.imageset/Group_326@3x.png differ diff --git a/QuickLocation/Assets.xcassets/ItineraryTrace/pause.imageset/pause@2x.png b/QuickLocation/Assets.xcassets/ItineraryTrace/pause.imageset/pause@2x.png index 750ec8c8..1878cc5b 100644 Binary files a/QuickLocation/Assets.xcassets/ItineraryTrace/pause.imageset/pause@2x.png and b/QuickLocation/Assets.xcassets/ItineraryTrace/pause.imageset/pause@2x.png differ diff --git a/QuickLocation/Assets.xcassets/ItineraryTrace/pause.imageset/pause@3x.png b/QuickLocation/Assets.xcassets/ItineraryTrace/pause.imageset/pause@3x.png index f7510077..6d5d7ced 100644 Binary files a/QuickLocation/Assets.xcassets/ItineraryTrace/pause.imageset/pause@3x.png and b/QuickLocation/Assets.xcassets/ItineraryTrace/pause.imageset/pause@3x.png differ diff --git a/QuickLocation/Assets.xcassets/ItineraryTrace/play.imageset/Group_2174@2x.png b/QuickLocation/Assets.xcassets/ItineraryTrace/play.imageset/Group_2174@2x.png index 099fc422..adf81615 100644 Binary files a/QuickLocation/Assets.xcassets/ItineraryTrace/play.imageset/Group_2174@2x.png and b/QuickLocation/Assets.xcassets/ItineraryTrace/play.imageset/Group_2174@2x.png differ diff --git a/QuickLocation/Assets.xcassets/ItineraryTrace/play.imageset/Group_2174@3x.png b/QuickLocation/Assets.xcassets/ItineraryTrace/play.imageset/Group_2174@3x.png index 338ef38a..bcb9f047 100644 Binary files a/QuickLocation/Assets.xcassets/ItineraryTrace/play.imageset/Group_2174@3x.png and b/QuickLocation/Assets.xcassets/ItineraryTrace/play.imageset/Group_2174@3x.png differ diff --git a/QuickLocation/Assets.xcassets/ItineraryTrace/slider.imageset/slide@2x.png b/QuickLocation/Assets.xcassets/ItineraryTrace/slider.imageset/slide@2x.png index 4de389df..58d93b7f 100644 Binary files a/QuickLocation/Assets.xcassets/ItineraryTrace/slider.imageset/slide@2x.png and b/QuickLocation/Assets.xcassets/ItineraryTrace/slider.imageset/slide@2x.png differ diff --git a/QuickLocation/Assets.xcassets/ItineraryTrace/slider.imageset/slide@3x.png b/QuickLocation/Assets.xcassets/ItineraryTrace/slider.imageset/slide@3x.png index d31315e6..afbaf6f4 100644 Binary files a/QuickLocation/Assets.xcassets/ItineraryTrace/slider.imageset/slide@3x.png and b/QuickLocation/Assets.xcassets/ItineraryTrace/slider.imageset/slide@3x.png differ diff --git a/QuickLocation/Assets.xcassets/ItineraryTrace/start.imageset/start@2x.png b/QuickLocation/Assets.xcassets/ItineraryTrace/start.imageset/start@2x.png index 9b3225d1..1252206b 100644 Binary files a/QuickLocation/Assets.xcassets/ItineraryTrace/start.imageset/start@2x.png and b/QuickLocation/Assets.xcassets/ItineraryTrace/start.imageset/start@2x.png differ diff --git a/QuickLocation/Assets.xcassets/ItineraryTrace/start.imageset/start@3x.png b/QuickLocation/Assets.xcassets/ItineraryTrace/start.imageset/start@3x.png index a7e9ead7..08a63f42 100644 Binary files a/QuickLocation/Assets.xcassets/ItineraryTrace/start.imageset/start@3x.png and b/QuickLocation/Assets.xcassets/ItineraryTrace/start.imageset/start@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Launch/logo.imageset/Group_1483@2x.png b/QuickLocation/Assets.xcassets/Launch/logo.imageset/Group_1483@2x.png index 68951d42..e925b681 100644 Binary files a/QuickLocation/Assets.xcassets/Launch/logo.imageset/Group_1483@2x.png and b/QuickLocation/Assets.xcassets/Launch/logo.imageset/Group_1483@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Launch/logo.imageset/Group_1483@3x.png b/QuickLocation/Assets.xcassets/Launch/logo.imageset/Group_1483@3x.png index eace6f07..14d4e588 100644 Binary files a/QuickLocation/Assets.xcassets/Launch/logo.imageset/Group_1483@3x.png and b/QuickLocation/Assets.xcassets/Launch/logo.imageset/Group_1483@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Launch/slogan.imageset/Group_1482@2x.png b/QuickLocation/Assets.xcassets/Launch/slogan.imageset/Group_1482@2x.png index a87bed02..ef2884bb 100644 Binary files a/QuickLocation/Assets.xcassets/Launch/slogan.imageset/Group_1482@2x.png and b/QuickLocation/Assets.xcassets/Launch/slogan.imageset/Group_1482@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Launch/slogan.imageset/Group_1482@3x.png b/QuickLocation/Assets.xcassets/Launch/slogan.imageset/Group_1482@3x.png index 6b4900a5..2074d10d 100644 Binary files a/QuickLocation/Assets.xcassets/Launch/slogan.imageset/Group_1482@3x.png and b/QuickLocation/Assets.xcassets/Launch/slogan.imageset/Group_1482@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Login/apple.imageset/Group 1444@2x.png b/QuickLocation/Assets.xcassets/Login/apple.imageset/Group 1444@2x.png index cfb55532..a40c785a 100644 Binary files a/QuickLocation/Assets.xcassets/Login/apple.imageset/Group 1444@2x.png and b/QuickLocation/Assets.xcassets/Login/apple.imageset/Group 1444@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Login/apple.imageset/Group 1444@3x.png b/QuickLocation/Assets.xcassets/Login/apple.imageset/Group 1444@3x.png index 58006457..397fde7b 100644 Binary files a/QuickLocation/Assets.xcassets/Login/apple.imageset/Group 1444@3x.png and b/QuickLocation/Assets.xcassets/Login/apple.imageset/Group 1444@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Login/bg.imageset/Mask_group@2x.png b/QuickLocation/Assets.xcassets/Login/bg.imageset/Mask_group@2x.png index dc4fdf0e..a3edcee0 100644 Binary files a/QuickLocation/Assets.xcassets/Login/bg.imageset/Mask_group@2x.png and b/QuickLocation/Assets.xcassets/Login/bg.imageset/Mask_group@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Login/bg.imageset/Mask_group@3x.png b/QuickLocation/Assets.xcassets/Login/bg.imageset/Mask_group@3x.png index ba975482..e7773ec1 100644 Binary files a/QuickLocation/Assets.xcassets/Login/bg.imageset/Mask_group@3x.png and b/QuickLocation/Assets.xcassets/Login/bg.imageset/Mask_group@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Login/checkbox.imageset/Rectangle 209@2x.png b/QuickLocation/Assets.xcassets/Login/checkbox.imageset/Rectangle 209@2x.png index b20e4ca1..cefbedf5 100644 Binary files a/QuickLocation/Assets.xcassets/Login/checkbox.imageset/Rectangle 209@2x.png and b/QuickLocation/Assets.xcassets/Login/checkbox.imageset/Rectangle 209@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Login/checkbox.imageset/Rectangle 209@3x.png b/QuickLocation/Assets.xcassets/Login/checkbox.imageset/Rectangle 209@3x.png index f985f187..67e373dd 100644 Binary files a/QuickLocation/Assets.xcassets/Login/checkbox.imageset/Rectangle 209@3x.png and b/QuickLocation/Assets.xcassets/Login/checkbox.imageset/Rectangle 209@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Login/login_bg.imageset/Rectangle 72@2x.png b/QuickLocation/Assets.xcassets/Login/login_bg.imageset/Rectangle 72@2x.png index b1c863f1..b037c744 100644 Binary files a/QuickLocation/Assets.xcassets/Login/login_bg.imageset/Rectangle 72@2x.png and b/QuickLocation/Assets.xcassets/Login/login_bg.imageset/Rectangle 72@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Login/login_bg.imageset/Rectangle 72@3x.png b/QuickLocation/Assets.xcassets/Login/login_bg.imageset/Rectangle 72@3x.png index 5c331849..a48ce909 100644 Binary files a/QuickLocation/Assets.xcassets/Login/login_bg.imageset/Rectangle 72@3x.png and b/QuickLocation/Assets.xcassets/Login/login_bg.imageset/Rectangle 72@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Login/phone.imageset/Group 1445@2x.png b/QuickLocation/Assets.xcassets/Login/phone.imageset/Group 1445@2x.png index 019b259b..11f5fafd 100644 Binary files a/QuickLocation/Assets.xcassets/Login/phone.imageset/Group 1445@2x.png and b/QuickLocation/Assets.xcassets/Login/phone.imageset/Group 1445@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Login/phone.imageset/Group 1445@3x.png b/QuickLocation/Assets.xcassets/Login/phone.imageset/Group 1445@3x.png index 737f8f84..1bd3aee7 100644 Binary files a/QuickLocation/Assets.xcassets/Login/phone.imageset/Group 1445@3x.png and b/QuickLocation/Assets.xcassets/Login/phone.imageset/Group 1445@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Login/selected.imageset/Group_1476@2x.png b/QuickLocation/Assets.xcassets/Login/selected.imageset/Group_1476@2x.png index 193115cc..5ca4bbb7 100644 Binary files a/QuickLocation/Assets.xcassets/Login/selected.imageset/Group_1476@2x.png and b/QuickLocation/Assets.xcassets/Login/selected.imageset/Group_1476@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Login/selected.imageset/Group_1476@3x.png b/QuickLocation/Assets.xcassets/Login/selected.imageset/Group_1476@3x.png index dcb90405..4bbf2f64 100644 Binary files a/QuickLocation/Assets.xcassets/Login/selected.imageset/Group_1476@3x.png and b/QuickLocation/Assets.xcassets/Login/selected.imageset/Group_1476@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Login/visitor_bg.imageset/Rectangle 71@2x 1.png b/QuickLocation/Assets.xcassets/Login/visitor_bg.imageset/Rectangle 71@2x 1.png index 02f2656c..d685ce4f 100644 Binary files a/QuickLocation/Assets.xcassets/Login/visitor_bg.imageset/Rectangle 71@2x 1.png and b/QuickLocation/Assets.xcassets/Login/visitor_bg.imageset/Rectangle 71@2x 1.png differ diff --git a/QuickLocation/Assets.xcassets/Login/visitor_bg.imageset/Rectangle 71@3x 1.png b/QuickLocation/Assets.xcassets/Login/visitor_bg.imageset/Rectangle 71@3x 1.png index c0897e93..a9686e3f 100644 Binary files a/QuickLocation/Assets.xcassets/Login/visitor_bg.imageset/Rectangle 71@3x 1.png and b/QuickLocation/Assets.xcassets/Login/visitor_bg.imageset/Rectangle 71@3x 1.png differ diff --git a/QuickLocation/Assets.xcassets/Login/wechat.imageset/Group 1446@2x.png b/QuickLocation/Assets.xcassets/Login/wechat.imageset/Group 1446@2x.png index aa5db5c8..4ab6bb91 100644 Binary files a/QuickLocation/Assets.xcassets/Login/wechat.imageset/Group 1446@2x.png and b/QuickLocation/Assets.xcassets/Login/wechat.imageset/Group 1446@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Login/wechat.imageset/Group 1446@3x.png b/QuickLocation/Assets.xcassets/Login/wechat.imageset/Group 1446@3x.png index ead57b57..3e05cc1a 100644 Binary files a/QuickLocation/Assets.xcassets/Login/wechat.imageset/Group 1446@3x.png and b/QuickLocation/Assets.xcassets/Login/wechat.imageset/Group 1446@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Map/current.imageset/Group 1545@2x.png b/QuickLocation/Assets.xcassets/Map/current.imageset/Group 1545@2x.png index e261059f..bfc214d9 100644 Binary files a/QuickLocation/Assets.xcassets/Map/current.imageset/Group 1545@2x.png and b/QuickLocation/Assets.xcassets/Map/current.imageset/Group 1545@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Map/current.imageset/Group 1545@3x.png b/QuickLocation/Assets.xcassets/Map/current.imageset/Group 1545@3x.png index 6c85cd3b..e6986518 100644 Binary files a/QuickLocation/Assets.xcassets/Map/current.imageset/Group 1545@3x.png and b/QuickLocation/Assets.xcassets/Map/current.imageset/Group 1545@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Map/end.imageset/Group_2075@2x.png b/QuickLocation/Assets.xcassets/Map/end.imageset/Group_2075@2x.png index c3d09ac0..4e82bfa3 100644 Binary files a/QuickLocation/Assets.xcassets/Map/end.imageset/Group_2075@2x.png and b/QuickLocation/Assets.xcassets/Map/end.imageset/Group_2075@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Map/end.imageset/Group_2075@3x.png b/QuickLocation/Assets.xcassets/Map/end.imageset/Group_2075@3x.png index dc650bca..fbb9a078 100644 Binary files a/QuickLocation/Assets.xcassets/Map/end.imageset/Group_2075@3x.png and b/QuickLocation/Assets.xcassets/Map/end.imageset/Group_2075@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/account_security.imageset/account_security@2x.png b/QuickLocation/Assets.xcassets/Mine/account_security.imageset/account_security@2x.png index 1882b7d1..e7212516 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/account_security.imageset/account_security@2x.png and b/QuickLocation/Assets.xcassets/Mine/account_security.imageset/account_security@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/account_security.imageset/account_security@3x.png b/QuickLocation/Assets.xcassets/Mine/account_security.imageset/account_security@3x.png index 1882b7d1..e7212516 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/account_security.imageset/account_security@3x.png and b/QuickLocation/Assets.xcassets/Mine/account_security.imageset/account_security@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/arrow_right.imageset/arrow_right@2x.png b/QuickLocation/Assets.xcassets/Mine/arrow_right.imageset/arrow_right@2x.png index 53cabedb..dc2c628d 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/arrow_right.imageset/arrow_right@2x.png and b/QuickLocation/Assets.xcassets/Mine/arrow_right.imageset/arrow_right@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/arrow_right.imageset/arrow_right@3x.png b/QuickLocation/Assets.xcassets/Mine/arrow_right.imageset/arrow_right@3x.png index 53cabedb..dc2c628d 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/arrow_right.imageset/arrow_right@3x.png and b/QuickLocation/Assets.xcassets/Mine/arrow_right.imageset/arrow_right@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/copy.imageset/copy@2x.png b/QuickLocation/Assets.xcassets/Mine/copy.imageset/copy@2x.png index 5874e1d1..3837fdbe 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/copy.imageset/copy@2x.png and b/QuickLocation/Assets.xcassets/Mine/copy.imageset/copy@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/copy.imageset/copy@3x.png b/QuickLocation/Assets.xcassets/Mine/copy.imageset/copy@3x.png index 5874e1d1..3837fdbe 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/copy.imageset/copy@3x.png and b/QuickLocation/Assets.xcassets/Mine/copy.imageset/copy@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/customer_service.imageset/customer_service@2x.png b/QuickLocation/Assets.xcassets/Mine/customer_service.imageset/customer_service@2x.png index 27e045de..c2a55286 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/customer_service.imageset/customer_service@2x.png and b/QuickLocation/Assets.xcassets/Mine/customer_service.imageset/customer_service@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/customer_service.imageset/customer_service@3x.png b/QuickLocation/Assets.xcassets/Mine/customer_service.imageset/customer_service@3x.png index 27e045de..c2a55286 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/customer_service.imageset/customer_service@3x.png and b/QuickLocation/Assets.xcassets/Mine/customer_service.imageset/customer_service@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/emergency_contact.imageset/emergency_contact@2x.png b/QuickLocation/Assets.xcassets/Mine/emergency_contact.imageset/emergency_contact@2x.png index d9b3bb04..224ef80c 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/emergency_contact.imageset/emergency_contact@2x.png and b/QuickLocation/Assets.xcassets/Mine/emergency_contact.imageset/emergency_contact@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/emergency_contact.imageset/emergency_contact@3x.png b/QuickLocation/Assets.xcassets/Mine/emergency_contact.imageset/emergency_contact@3x.png index d9b3bb04..224ef80c 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/emergency_contact.imageset/emergency_contact@3x.png and b/QuickLocation/Assets.xcassets/Mine/emergency_contact.imageset/emergency_contact@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/header_bg.imageset/header_bg@2x.png b/QuickLocation/Assets.xcassets/Mine/header_bg.imageset/header_bg@2x.png index d6a55d94..bddcc63a 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/header_bg.imageset/header_bg@2x.png and b/QuickLocation/Assets.xcassets/Mine/header_bg.imageset/header_bg@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/header_bg.imageset/header_bg@3x.png b/QuickLocation/Assets.xcassets/Mine/header_bg.imageset/header_bg@3x.png index d6a55d94..bddcc63a 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/header_bg.imageset/header_bg@3x.png and b/QuickLocation/Assets.xcassets/Mine/header_bg.imageset/header_bg@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/mask_bg.imageset/mask_bg@2x.png b/QuickLocation/Assets.xcassets/Mine/mask_bg.imageset/mask_bg@2x.png index 471c2b81..c3dede70 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/mask_bg.imageset/mask_bg@2x.png and b/QuickLocation/Assets.xcassets/Mine/mask_bg.imageset/mask_bg@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/mask_bg.imageset/mask_bg@3x.png b/QuickLocation/Assets.xcassets/Mine/mask_bg.imageset/mask_bg@3x.png index ecae6513..6bd05006 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/mask_bg.imageset/mask_bg@3x.png and b/QuickLocation/Assets.xcassets/Mine/mask_bg.imageset/mask_bg@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/permission_check.imageset/permission_check@2x.png b/QuickLocation/Assets.xcassets/Mine/permission_check.imageset/permission_check@2x.png index cee8825d..a2e7864b 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/permission_check.imageset/permission_check@2x.png and b/QuickLocation/Assets.xcassets/Mine/permission_check.imageset/permission_check@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/permission_check.imageset/permission_check@3x.png b/QuickLocation/Assets.xcassets/Mine/permission_check.imageset/permission_check@3x.png index cee8825d..a2e7864b 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/permission_check.imageset/permission_check@3x.png and b/QuickLocation/Assets.xcassets/Mine/permission_check.imageset/permission_check@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/privacy_agreement.imageset/privacy_agreement@2x.png b/QuickLocation/Assets.xcassets/Mine/privacy_agreement.imageset/privacy_agreement@2x.png index f59d85db..8bf18433 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/privacy_agreement.imageset/privacy_agreement@2x.png and b/QuickLocation/Assets.xcassets/Mine/privacy_agreement.imageset/privacy_agreement@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/privacy_agreement.imageset/privacy_agreement@3x.png b/QuickLocation/Assets.xcassets/Mine/privacy_agreement.imageset/privacy_agreement@3x.png index f59d85db..8bf18433 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/privacy_agreement.imageset/privacy_agreement@3x.png and b/QuickLocation/Assets.xcassets/Mine/privacy_agreement.imageset/privacy_agreement@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/profile_bg.imageset/profile_bg@2x.png b/QuickLocation/Assets.xcassets/Mine/profile_bg.imageset/profile_bg@2x.png index 6bfa5c77..04506385 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/profile_bg.imageset/profile_bg@2x.png and b/QuickLocation/Assets.xcassets/Mine/profile_bg.imageset/profile_bg@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/profile_bg.imageset/profile_bg@3x.png b/QuickLocation/Assets.xcassets/Mine/profile_bg.imageset/profile_bg@3x.png index 6bfa5c77..04506385 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/profile_bg.imageset/profile_bg@3x.png and b/QuickLocation/Assets.xcassets/Mine/profile_bg.imageset/profile_bg@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/status_setting.imageset/status_setting@2x.png b/QuickLocation/Assets.xcassets/Mine/status_setting.imageset/status_setting@2x.png index 70ac0770..6e121d68 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/status_setting.imageset/status_setting@2x.png and b/QuickLocation/Assets.xcassets/Mine/status_setting.imageset/status_setting@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/status_setting.imageset/status_setting@3x.png b/QuickLocation/Assets.xcassets/Mine/status_setting.imageset/status_setting@3x.png index 70ac0770..6e121d68 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/status_setting.imageset/status_setting@3x.png and b/QuickLocation/Assets.xcassets/Mine/status_setting.imageset/status_setting@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/vip_card.imageset/vip_card@2x.png b/QuickLocation/Assets.xcassets/Mine/vip_card.imageset/vip_card@2x.png index d0977228..2b4b4b03 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/vip_card.imageset/vip_card@2x.png and b/QuickLocation/Assets.xcassets/Mine/vip_card.imageset/vip_card@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Mine/vip_card.imageset/vip_card@3x.png b/QuickLocation/Assets.xcassets/Mine/vip_card.imageset/vip_card@3x.png index d0977228..2b4b4b03 100644 Binary files a/QuickLocation/Assets.xcassets/Mine/vip_card.imageset/vip_card@3x.png and b/QuickLocation/Assets.xcassets/Mine/vip_card.imageset/vip_card@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Popup/bell.imageset/Group_1672@2x.png b/QuickLocation/Assets.xcassets/Popup/bell.imageset/Group_1672@2x.png index b6cfb406..92e0e3ca 100644 Binary files a/QuickLocation/Assets.xcassets/Popup/bell.imageset/Group_1672@2x.png and b/QuickLocation/Assets.xcassets/Popup/bell.imageset/Group_1672@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Popup/bell.imageset/Group_1672@3x.png b/QuickLocation/Assets.xcassets/Popup/bell.imageset/Group_1672@3x.png index cd6e6364..f20916e1 100644 Binary files a/QuickLocation/Assets.xcassets/Popup/bell.imageset/Group_1672@3x.png and b/QuickLocation/Assets.xcassets/Popup/bell.imageset/Group_1672@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Popup/correct.imageset/correct@2x.png b/QuickLocation/Assets.xcassets/Popup/correct.imageset/correct@2x.png index df907ed0..5e9c4cf9 100644 Binary files a/QuickLocation/Assets.xcassets/Popup/correct.imageset/correct@2x.png and b/QuickLocation/Assets.xcassets/Popup/correct.imageset/correct@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Popup/correct.imageset/correct@3x.png b/QuickLocation/Assets.xcassets/Popup/correct.imageset/correct@3x.png index 7465974e..c1203fe8 100644 Binary files a/QuickLocation/Assets.xcassets/Popup/correct.imageset/correct@3x.png and b/QuickLocation/Assets.xcassets/Popup/correct.imageset/correct@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Popup/error.imageset/error@2x.png b/QuickLocation/Assets.xcassets/Popup/error.imageset/error@2x.png index f67061d5..f2c02440 100644 Binary files a/QuickLocation/Assets.xcassets/Popup/error.imageset/error@2x.png and b/QuickLocation/Assets.xcassets/Popup/error.imageset/error@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Popup/error.imageset/error@3x.png b/QuickLocation/Assets.xcassets/Popup/error.imageset/error@3x.png index 29762f8d..49cbf79b 100644 Binary files a/QuickLocation/Assets.xcassets/Popup/error.imageset/error@3x.png and b/QuickLocation/Assets.xcassets/Popup/error.imageset/error@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Popup/failure.imageset/failure@2x.png b/QuickLocation/Assets.xcassets/Popup/failure.imageset/failure@2x.png index 6a6695df..50672af6 100644 Binary files a/QuickLocation/Assets.xcassets/Popup/failure.imageset/failure@2x.png and b/QuickLocation/Assets.xcassets/Popup/failure.imageset/failure@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Popup/failure.imageset/failure@3x.png b/QuickLocation/Assets.xcassets/Popup/failure.imageset/failure@3x.png index a7f94ebe..140ad4ee 100644 Binary files a/QuickLocation/Assets.xcassets/Popup/failure.imageset/failure@3x.png and b/QuickLocation/Assets.xcassets/Popup/failure.imageset/failure@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Popup/header_bg.imageset/header_bg@2x.png b/QuickLocation/Assets.xcassets/Popup/header_bg.imageset/header_bg@2x.png index 2a5d2717..de9cc1b7 100644 Binary files a/QuickLocation/Assets.xcassets/Popup/header_bg.imageset/header_bg@2x.png and b/QuickLocation/Assets.xcassets/Popup/header_bg.imageset/header_bg@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Popup/header_bg.imageset/header_bg@3x.png b/QuickLocation/Assets.xcassets/Popup/header_bg.imageset/header_bg@3x.png index 0be4d09c..606804e7 100644 Binary files a/QuickLocation/Assets.xcassets/Popup/header_bg.imageset/header_bg@3x.png and b/QuickLocation/Assets.xcassets/Popup/header_bg.imageset/header_bg@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Popup/success.imageset/success@2x.png b/QuickLocation/Assets.xcassets/Popup/success.imageset/success@2x.png index c6e375f9..5b6e6976 100644 Binary files a/QuickLocation/Assets.xcassets/Popup/success.imageset/success@2x.png and b/QuickLocation/Assets.xcassets/Popup/success.imageset/success@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Popup/success.imageset/success@3x.png b/QuickLocation/Assets.xcassets/Popup/success.imageset/success@3x.png index 8b93d784..925bbf76 100644 Binary files a/QuickLocation/Assets.xcassets/Popup/success.imageset/success@3x.png and b/QuickLocation/Assets.xcassets/Popup/success.imageset/success@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/close.imageset/Group_1545@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/close.imageset/Group_1545@2x.png index b3f4381c..f9f28892 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/close.imageset/Group_1545@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/close.imageset/Group_1545@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/close.imageset/Group_1545@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/close.imageset/Group_1545@3x.png index eabe01e5..4b39cc70 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/close.imageset/Group_1545@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/close.imageset/Group_1545@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/register2_logo.imageset/Group 2127@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/register2_logo.imageset/Group 2127@2x.png index af637793..a65f4fb5 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/register2_logo.imageset/Group 2127@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/register2_logo.imageset/Group 2127@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/register2_logo.imageset/Group 2127@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/register2_logo.imageset/Group 2127@3x.png index cb7b048e..3773d96f 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/register2_logo.imageset/Group 2127@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/register2_logo.imageset/Group 2127@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/register_bg.imageset/Group 2188@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/register_bg.imageset/Group 2188@2x.png index e897cf83..89a20de5 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/register_bg.imageset/Group 2188@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/register_bg.imageset/Group 2188@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/register_bg.imageset/Group 2188@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/register_bg.imageset/Group 2188@3x.png index efd7d78f..92dfbc67 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/register_bg.imageset/Group 2188@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/register_bg.imageset/Group 2188@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/register_heart.imageset/Group_2323@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/register_heart.imageset/Group_2323@2x.png index f282fd48..dc95158c 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/register_heart.imageset/Group_2323@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/register_heart.imageset/Group_2323@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/register_heart.imageset/Group_2323@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/register_heart.imageset/Group_2323@3x.png index 946b1443..38a10f8e 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/register_heart.imageset/Group_2323@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/register_heart.imageset/Group_2323@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/register_logo.imageset/Group_2331@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/register_logo.imageset/Group_2331@2x.png index ab191506..31e5a6c0 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/register_logo.imageset/Group_2331@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/register_logo.imageset/Group_2331@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/register_logo.imageset/Group_2331@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/register_logo.imageset/Group_2331@3x.png index 32f2b539..f57e08f4 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/register_logo.imageset/Group_2331@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/register_logo.imageset/Group_2331@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/register_text.imageset/register_text@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/register_text.imageset/register_text@2x.png index 9f2a6a27..91265480 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/register_text.imageset/register_text@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/register_text.imageset/register_text@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/register_text.imageset/register_text@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/register_text.imageset/register_text@3x.png index 67b967de..9595d879 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/register_text.imageset/register_text@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/register_text.imageset/register_text@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/search_bg.imageset/search_bg@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/search_bg.imageset/search_bg@2x.png index bce9db0c..51f68d82 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/search_bg.imageset/search_bg@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/search_bg.imageset/search_bg@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/search_bg.imageset/search_bg@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/search_bg.imageset/search_bg@3x.png index d3adbfd9..8cd1ff4d 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/search_bg.imageset/search_bg@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/search_bg.imageset/search_bg@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/search_earth.imageset/组 3 2@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/search_earth.imageset/组 3 2@2x.png index a2aa9600..ba0d7354 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/search_earth.imageset/组 3 2@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/search_earth.imageset/组 3 2@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/search_earth.imageset/组 3 2@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/search_earth.imageset/组 3 2@3x.png index be279c78..5f6b1088 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/search_earth.imageset/组 3 2@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/search_earth.imageset/组 3 2@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/search_people.imageset/image 111@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/search_people.imageset/image 111@2x.png index 2aa52d6a..b2f280f5 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/search_people.imageset/image 111@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/search_people.imageset/image 111@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/search_people.imageset/image 111@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/search_people.imageset/image 111@3x.png index c8cf8320..e3e76c6a 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/search_people.imageset/image 111@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/search_people.imageset/image 111@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/star_1.imageset/Group_2322@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/star_1.imageset/Group_2322@2x.png index de94af5c..8101d281 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/star_1.imageset/Group_2322@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/star_1.imageset/Group_2322@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/star_1.imageset/Group_2322@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/star_1.imageset/Group_2322@3x.png index 557752e7..2ce46a82 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/star_1.imageset/Group_2322@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/star_1.imageset/Group_2322@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/star_2.imageset/image 107@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/star_2.imageset/image 107@2x.png index 14c740d9..e8a4cbb0 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/star_2.imageset/image 107@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/star_2.imageset/image 107@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/star_2.imageset/image 107@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/star_2.imageset/image 107@3x.png index 6f22792c..4d36d569 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/star_2.imageset/image 107@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/star_2.imageset/image 107@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/star_3.imageset/image 108@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/star_3.imageset/image 108@2x.png index b6f6e5ab..146db998 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/star_3.imageset/image 108@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/star_3.imageset/image 108@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/star_3.imageset/image 108@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/star_3.imageset/image 108@3x.png index 5e9adc02..3e24fab2 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/star_3.imageset/image 108@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/star_3.imageset/image 108@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip1_heart.imageset/vip1_unlock@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip1_heart.imageset/vip1_unlock@2x.png index e2afa04e..03622d9f 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip1_heart.imageset/vip1_unlock@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip1_heart.imageset/vip1_unlock@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip1_heart.imageset/vip1_unlock@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip1_heart.imageset/vip1_unlock@3x.png index 94cf3e72..2c2cf5cf 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip1_heart.imageset/vip1_unlock@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip1_heart.imageset/vip1_unlock@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip1_logo.imageset/vip1_logo@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip1_logo.imageset/vip1_logo@2x.png index dd8d26a4..ce3e285a 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip1_logo.imageset/vip1_logo@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip1_logo.imageset/vip1_logo@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip1_logo.imageset/vip1_logo@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip1_logo.imageset/vip1_logo@3x.png index cd901322..5556a9ce 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip1_logo.imageset/vip1_logo@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip1_logo.imageset/vip1_logo@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_1.imageset/Group 2086@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_1.imageset/Group 2086@2x.png index 7b55fc11..2fe50bcc 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_1.imageset/Group 2086@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_1.imageset/Group 2086@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_1.imageset/Group 2086@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_1.imageset/Group 2086@3x.png index 4c1a7fe8..98227452 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_1.imageset/Group 2086@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_1.imageset/Group 2086@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_2.imageset/Group 2087@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_2.imageset/Group 2087@2x.png index aa2a6ddf..4a804d09 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_2.imageset/Group 2087@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_2.imageset/Group 2087@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_2.imageset/Group 2087@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_2.imageset/Group 2087@3x.png index 6cdc00c7..fd0bc1ce 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_2.imageset/Group 2087@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_2.imageset/Group 2087@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_3.imageset/Group 2088@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_3.imageset/Group 2088@2x.png index 33b22ff1..75ed2034 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_3.imageset/Group 2088@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_3.imageset/Group 2088@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_3.imageset/Group 2088@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_3.imageset/Group 2088@3x.png index d156f14a..34be5789 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_3.imageset/Group 2088@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip1_tips_3.imageset/Group 2088@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip2_bg.imageset/Group_2092@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip2_bg.imageset/Group_2092@2x.png index 3bea3535..edabdf2c 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip2_bg.imageset/Group_2092@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip2_bg.imageset/Group_2092@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip2_bg.imageset/Group_2092@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip2_bg.imageset/Group_2092@3x.png index 9ef4a480..643f3055 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip2_bg.imageset/Group_2092@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip2_bg.imageset/Group_2092@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip2_icon.imageset/Mask_group@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip2_icon.imageset/Mask_group@2x.png index cd07c112..8542aefa 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip2_icon.imageset/Mask_group@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip2_icon.imageset/Mask_group@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip2_icon.imageset/Mask_group@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip2_icon.imageset/Mask_group@3x.png index c3ef1170..5c028415 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip2_icon.imageset/Mask_group@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip2_icon.imageset/Mask_group@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip2_logo.imageset/Group 2091@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip2_logo.imageset/Group 2091@2x.png index ebcbd0d0..6fceae51 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip2_logo.imageset/Group 2091@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip2_logo.imageset/Group 2091@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip2_logo.imageset/Group 2091@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip2_logo.imageset/Group 2091@3x.png index 4555e78d..ed16ef1c 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip2_logo.imageset/Group 2091@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip2_logo.imageset/Group 2091@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip2_text.imageset/vip2_text@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip2_text.imageset/vip2_text@2x.png index 3a0f0e17..622ac2a8 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip2_text.imageset/vip2_text@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip2_text.imageset/vip2_text@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip2_text.imageset/vip2_text@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip2_text.imageset/vip2_text@3x.png index eb5c3816..87363387 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip2_text.imageset/vip2_text@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip2_text.imageset/vip2_text@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip2_text_bg.imageset/Group_2084@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip2_text_bg.imageset/Group_2084@2x.png index e001b1c1..0273c388 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip2_text_bg.imageset/Group_2084@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip2_text_bg.imageset/Group_2084@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip2_text_bg.imageset/Group_2084@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip2_text_bg.imageset/Group_2084@3x.png index 686b795b..92149c8e 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip2_text_bg.imageset/Group_2084@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip2_text_bg.imageset/Group_2084@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip3_bg.imageset/Group_2094@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip3_bg.imageset/Group_2094@2x.png index d4d8cf37..c916901a 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip3_bg.imageset/Group_2094@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip3_bg.imageset/Group_2094@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip3_bg.imageset/Group_2094@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip3_bg.imageset/Group_2094@3x.png index b8333b86..69fa36e5 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip3_bg.imageset/Group_2094@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip3_bg.imageset/Group_2094@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip4_animate.imageset/Group 2109@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip4_animate.imageset/Group 2109@2x.png index 4afa71bb..34364ef5 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip4_animate.imageset/Group 2109@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip4_animate.imageset/Group 2109@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip4_animate.imageset/Group 2109@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip4_animate.imageset/Group 2109@3x.png index 67a8bda7..03b51243 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip4_animate.imageset/Group 2109@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip4_animate.imageset/Group 2109@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip4_bg.imageset/vip4_bg@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip4_bg.imageset/vip4_bg@2x.png index 5f955b8a..d7647477 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip4_bg.imageset/vip4_bg@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip4_bg.imageset/vip4_bg@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip4_bg.imageset/vip4_bg@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip4_bg.imageset/vip4_bg@3x.png index fee9a28c..e9a576f5 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip4_bg.imageset/vip4_bg@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip4_bg.imageset/vip4_bg@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip_bg.imageset/Group 2209@2x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip_bg.imageset/Group 2209@2x.png index 05d62252..68365f9b 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip_bg.imageset/Group 2209@2x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip_bg.imageset/Group 2209@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PopupWindow/vip_bg.imageset/Group 2209@3x.png b/QuickLocation/Assets.xcassets/PopupWindow/vip_bg.imageset/Group 2209@3x.png index c75acc91..5564803b 100644 Binary files a/QuickLocation/Assets.xcassets/PopupWindow/vip_bg.imageset/Group 2209@3x.png and b/QuickLocation/Assets.xcassets/PopupWindow/vip_bg.imageset/Group 2209@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/benefits.imageset/benefits@2x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/benefits.imageset/benefits@2x.png index 9069f955..35eed081 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/benefits.imageset/benefits@2x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/benefits.imageset/benefits@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/benefits.imageset/benefits@3x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/benefits.imageset/benefits@3x.png index 9e5932ae..7b7127e7 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/benefits.imageset/benefits@3x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/benefits.imageset/benefits@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/header_bg.imageset/banner@2x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/header_bg.imageset/banner@2x.png index 6de14910..50dee158 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/header_bg.imageset/banner@2x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/header_bg.imageset/banner@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/header_bg.imageset/banner@3x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/header_bg.imageset/banner@3x.png index bdc56e8a..55532af2 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/header_bg.imageset/banner@3x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/header_bg.imageset/banner@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/normal_bg.imageset/Group_2432@2x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/normal_bg.imageset/Group_2432@2x.png index b10806d1..b8e4e6bd 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/normal_bg.imageset/Group_2432@2x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/normal_bg.imageset/Group_2432@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/normal_bg.imageset/Group_2432@3x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/normal_bg.imageset/Group_2432@3x.png index 4321c1c5..85195a56 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/normal_bg.imageset/Group_2432@3x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/normal_bg.imageset/Group_2432@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/normal_on_bg.imageset/normal_on_bg@2x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/normal_on_bg.imageset/normal_on_bg@2x.png index e889cdad..30199923 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/normal_on_bg.imageset/normal_on_bg@2x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/normal_on_bg.imageset/normal_on_bg@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/normal_on_bg.imageset/normal_on_bg@3x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/normal_on_bg.imageset/normal_on_bg@3x.png index edfc917f..69131f4e 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/normal_on_bg.imageset/normal_on_bg@3x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/normal_on_bg.imageset/normal_on_bg@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_bg.imageset/recommend_bg@2x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_bg.imageset/recommend_bg@2x.png index bb35f175..90cf61d1 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_bg.imageset/recommend_bg@2x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_bg.imageset/recommend_bg@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_bg.imageset/recommend_bg@3x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_bg.imageset/recommend_bg@3x.png index c42b15c9..a469b2e0 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_bg.imageset/recommend_bg@3x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_bg.imageset/recommend_bg@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_icon.imageset/Group_2429@2x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_icon.imageset/Group_2429@2x.png index 1956b02a..3b1cc3ed 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_icon.imageset/Group_2429@2x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_icon.imageset/Group_2429@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_icon.imageset/Group_2429@3x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_icon.imageset/Group_2429@3x.png index 261e6149..cbfd6a19 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_icon.imageset/Group_2429@3x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_icon.imageset/Group_2429@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_on_bg.imageset/recommend_on_bg@2x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_on_bg.imageset/recommend_on_bg@2x.png index cad28e90..35baad67 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_on_bg.imageset/recommend_on_bg@2x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_on_bg.imageset/recommend_on_bg@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_on_bg.imageset/recommend_on_bg@3x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_on_bg.imageset/recommend_on_bg@3x.png index 15a60a39..afa4f47e 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_on_bg.imageset/recommend_on_bg@3x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/recommend_on_bg.imageset/recommend_on_bg@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/tips_bg.imageset/Group_2428@2x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/tips_bg.imageset/Group_2428@2x.png index 41bf837e..85ec64a0 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/tips_bg.imageset/Group_2428@2x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/tips_bg.imageset/Group_2428@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/tips_bg.imageset/Group_2428@3x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/tips_bg.imageset/Group_2428@3x.png index 23863f8e..8eeaedfe 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/tips_bg.imageset/Group_2428@3x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/tips_bg.imageset/Group_2428@3x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/vip_icon.imageset/Group_2426@2x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/vip_icon.imageset/Group_2426@2x.png index 0664df30..60de6ed5 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/vip_icon.imageset/Group_2426@2x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/vip_icon.imageset/Group_2426@2x.png differ diff --git a/QuickLocation/Assets.xcassets/PromotionalActivities/vip_icon.imageset/Group_2426@3x.png b/QuickLocation/Assets.xcassets/PromotionalActivities/vip_icon.imageset/Group_2426@3x.png index e7f6d630..8d0b8f3c 100644 Binary files a/QuickLocation/Assets.xcassets/PromotionalActivities/vip_icon.imageset/Group_2426@3x.png and b/QuickLocation/Assets.xcassets/PromotionalActivities/vip_icon.imageset/Group_2426@3x.png differ diff --git a/QuickLocation/Assets.xcassets/SOS/1.imageset/SOS-1@2x.png b/QuickLocation/Assets.xcassets/SOS/1.imageset/SOS-1@2x.png index 73a67d3f..f9dca11f 100644 Binary files a/QuickLocation/Assets.xcassets/SOS/1.imageset/SOS-1@2x.png and b/QuickLocation/Assets.xcassets/SOS/1.imageset/SOS-1@2x.png differ diff --git a/QuickLocation/Assets.xcassets/SOS/1.imageset/SOS-1@3x.png b/QuickLocation/Assets.xcassets/SOS/1.imageset/SOS-1@3x.png index 4ed20494..66cae043 100644 Binary files a/QuickLocation/Assets.xcassets/SOS/1.imageset/SOS-1@3x.png and b/QuickLocation/Assets.xcassets/SOS/1.imageset/SOS-1@3x.png differ diff --git a/QuickLocation/Assets.xcassets/SOS/2.imageset/SOS-2@2x.png b/QuickLocation/Assets.xcassets/SOS/2.imageset/SOS-2@2x.png index 576bf9c4..23e9b872 100644 Binary files a/QuickLocation/Assets.xcassets/SOS/2.imageset/SOS-2@2x.png and b/QuickLocation/Assets.xcassets/SOS/2.imageset/SOS-2@2x.png differ diff --git a/QuickLocation/Assets.xcassets/SOS/2.imageset/SOS-2@3x.png b/QuickLocation/Assets.xcassets/SOS/2.imageset/SOS-2@3x.png index bb26dc68..24d3ce10 100644 Binary files a/QuickLocation/Assets.xcassets/SOS/2.imageset/SOS-2@3x.png and b/QuickLocation/Assets.xcassets/SOS/2.imageset/SOS-2@3x.png differ diff --git a/QuickLocation/Assets.xcassets/SOS/3.imageset/SOS-3@2x.png b/QuickLocation/Assets.xcassets/SOS/3.imageset/SOS-3@2x.png index 284b1644..c7e309ce 100644 Binary files a/QuickLocation/Assets.xcassets/SOS/3.imageset/SOS-3@2x.png and b/QuickLocation/Assets.xcassets/SOS/3.imageset/SOS-3@2x.png differ diff --git a/QuickLocation/Assets.xcassets/SOS/3.imageset/SOS-3@3x.png b/QuickLocation/Assets.xcassets/SOS/3.imageset/SOS-3@3x.png index aa63c0a3..0dc95687 100644 Binary files a/QuickLocation/Assets.xcassets/SOS/3.imageset/SOS-3@3x.png and b/QuickLocation/Assets.xcassets/SOS/3.imageset/SOS-3@3x.png differ diff --git a/QuickLocation/Assets.xcassets/SOS/add.imageset/add@2x.png b/QuickLocation/Assets.xcassets/SOS/add.imageset/add@2x.png index 02d59d17..e6b10ed6 100644 Binary files a/QuickLocation/Assets.xcassets/SOS/add.imageset/add@2x.png and b/QuickLocation/Assets.xcassets/SOS/add.imageset/add@2x.png differ diff --git a/QuickLocation/Assets.xcassets/SOS/add.imageset/add@3x.png b/QuickLocation/Assets.xcassets/SOS/add.imageset/add@3x.png index 17000f0c..24858ac5 100644 Binary files a/QuickLocation/Assets.xcassets/SOS/add.imageset/add@3x.png and b/QuickLocation/Assets.xcassets/SOS/add.imageset/add@3x.png differ diff --git a/QuickLocation/Assets.xcassets/SOS/finish.imageset/sos@2x.png b/QuickLocation/Assets.xcassets/SOS/finish.imageset/sos@2x.png index f3697093..2be86999 100644 Binary files a/QuickLocation/Assets.xcassets/SOS/finish.imageset/sos@2x.png and b/QuickLocation/Assets.xcassets/SOS/finish.imageset/sos@2x.png differ diff --git a/QuickLocation/Assets.xcassets/SOS/finish.imageset/sos@3x.png b/QuickLocation/Assets.xcassets/SOS/finish.imageset/sos@3x.png index 13a81b6c..7694fdb8 100644 Binary files a/QuickLocation/Assets.xcassets/SOS/finish.imageset/sos@3x.png and b/QuickLocation/Assets.xcassets/SOS/finish.imageset/sos@3x.png differ diff --git a/QuickLocation/Assets.xcassets/SOS/slider.imageset/Group_1524@2x.png b/QuickLocation/Assets.xcassets/SOS/slider.imageset/Group_1524@2x.png index 650b57d5..a5bc7019 100644 Binary files a/QuickLocation/Assets.xcassets/SOS/slider.imageset/Group_1524@2x.png and b/QuickLocation/Assets.xcassets/SOS/slider.imageset/Group_1524@2x.png differ diff --git a/QuickLocation/Assets.xcassets/SOS/slider.imageset/Group_1524@3x.png b/QuickLocation/Assets.xcassets/SOS/slider.imageset/Group_1524@3x.png index a5a0c5c9..7776eb80 100644 Binary files a/QuickLocation/Assets.xcassets/SOS/slider.imageset/Group_1524@3x.png and b/QuickLocation/Assets.xcassets/SOS/slider.imageset/Group_1524@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Scan/bg.imageset/Group_1102@2x.png b/QuickLocation/Assets.xcassets/Scan/bg.imageset/Group_1102@2x.png index eeb3071c..1fb5b329 100644 Binary files a/QuickLocation/Assets.xcassets/Scan/bg.imageset/Group_1102@2x.png and b/QuickLocation/Assets.xcassets/Scan/bg.imageset/Group_1102@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Scan/bg.imageset/Group_1102@3x.png b/QuickLocation/Assets.xcassets/Scan/bg.imageset/Group_1102@3x.png index 851aa27b..ed66d2e4 100644 Binary files a/QuickLocation/Assets.xcassets/Scan/bg.imageset/Group_1102@3x.png and b/QuickLocation/Assets.xcassets/Scan/bg.imageset/Group_1102@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Scan/scan.imageset/Group 1055@2x.png b/QuickLocation/Assets.xcassets/Scan/scan.imageset/Group 1055@2x.png index 41e6c3c5..2e935f24 100644 Binary files a/QuickLocation/Assets.xcassets/Scan/scan.imageset/Group 1055@2x.png and b/QuickLocation/Assets.xcassets/Scan/scan.imageset/Group 1055@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Scan/scan.imageset/Group 1055@3x.png b/QuickLocation/Assets.xcassets/Scan/scan.imageset/Group 1055@3x.png index 1f97810e..da4418b6 100644 Binary files a/QuickLocation/Assets.xcassets/Scan/scan.imageset/Group 1055@3x.png and b/QuickLocation/Assets.xcassets/Scan/scan.imageset/Group 1055@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/add.imageset/Group_2267@2x.png b/QuickLocation/Assets.xcassets/Schedule/add.imageset/Group_2267@2x.png index d962cc70..29956fed 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/add.imageset/Group_2267@2x.png and b/QuickLocation/Assets.xcassets/Schedule/add.imageset/Group_2267@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/add.imageset/Group_2267@3x.png b/QuickLocation/Assets.xcassets/Schedule/add.imageset/Group_2267@3x.png index 744f5a20..9e338006 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/add.imageset/Group_2267@3x.png and b/QuickLocation/Assets.xcassets/Schedule/add.imageset/Group_2267@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/arrow.imageset/Group_2289@2x.png b/QuickLocation/Assets.xcassets/Schedule/arrow.imageset/Group_2289@2x.png index 2b832ddb..1f12da9d 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/arrow.imageset/Group_2289@2x.png and b/QuickLocation/Assets.xcassets/Schedule/arrow.imageset/Group_2289@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/arrow.imageset/Group_2289@3x.png b/QuickLocation/Assets.xcassets/Schedule/arrow.imageset/Group_2289@3x.png index 900cfdc6..9d10b0ac 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/arrow.imageset/Group_2289@3x.png and b/QuickLocation/Assets.xcassets/Schedule/arrow.imageset/Group_2289@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/checkbox.imageset/Rectangle_42232@2x.png b/QuickLocation/Assets.xcassets/Schedule/checkbox.imageset/Rectangle_42232@2x.png index 024a79b7..f911b546 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/checkbox.imageset/Rectangle_42232@2x.png and b/QuickLocation/Assets.xcassets/Schedule/checkbox.imageset/Rectangle_42232@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/checkbox.imageset/Rectangle_42232@3x.png b/QuickLocation/Assets.xcassets/Schedule/checkbox.imageset/Rectangle_42232@3x.png index 927704df..ab400bb6 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/checkbox.imageset/Rectangle_42232@3x.png and b/QuickLocation/Assets.xcassets/Schedule/checkbox.imageset/Rectangle_42232@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/checkbox_selected.imageset/Group_2303@2x.png b/QuickLocation/Assets.xcassets/Schedule/checkbox_selected.imageset/Group_2303@2x.png index df448af2..4b0fcf1a 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/checkbox_selected.imageset/Group_2303@2x.png and b/QuickLocation/Assets.xcassets/Schedule/checkbox_selected.imageset/Group_2303@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/checkbox_selected.imageset/Group_2303@3x.png b/QuickLocation/Assets.xcassets/Schedule/checkbox_selected.imageset/Group_2303@3x.png index 1582a23d..813824eb 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/checkbox_selected.imageset/Group_2303@3x.png and b/QuickLocation/Assets.xcassets/Schedule/checkbox_selected.imageset/Group_2303@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/create.imageset/Group_2250@2x.png b/QuickLocation/Assets.xcassets/Schedule/create.imageset/Group_2250@2x.png index 0c00e050..7d95d3fe 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/create.imageset/Group_2250@2x.png and b/QuickLocation/Assets.xcassets/Schedule/create.imageset/Group_2250@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/create.imageset/Group_2250@3x.png b/QuickLocation/Assets.xcassets/Schedule/create.imageset/Group_2250@3x.png index cbab6274..f2510bfb 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/create.imageset/Group_2250@3x.png and b/QuickLocation/Assets.xcassets/Schedule/create.imageset/Group_2250@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/delete.imageset/Group_2308@2x.png b/QuickLocation/Assets.xcassets/Schedule/delete.imageset/Group_2308@2x.png index 1de40dc4..bb75dbcf 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/delete.imageset/Group_2308@2x.png and b/QuickLocation/Assets.xcassets/Schedule/delete.imageset/Group_2308@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/delete.imageset/Group_2308@3x.png b/QuickLocation/Assets.xcassets/Schedule/delete.imageset/Group_2308@3x.png index e84710f4..465766d4 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/delete.imageset/Group_2308@3x.png and b/QuickLocation/Assets.xcassets/Schedule/delete.imageset/Group_2308@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/forward.imageset/Group_2381@2x.png b/QuickLocation/Assets.xcassets/Schedule/forward.imageset/Group_2381@2x.png index 1d5502c2..fdf14d28 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/forward.imageset/Group_2381@2x.png and b/QuickLocation/Assets.xcassets/Schedule/forward.imageset/Group_2381@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/forward.imageset/Group_2381@3x.png b/QuickLocation/Assets.xcassets/Schedule/forward.imageset/Group_2381@3x.png index fbc407de..7104d8e2 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/forward.imageset/Group_2381@3x.png and b/QuickLocation/Assets.xcassets/Schedule/forward.imageset/Group_2381@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/location.imageset/Group_1584@2x.png b/QuickLocation/Assets.xcassets/Schedule/location.imageset/Group_1584@2x.png index c6216c72..3ee231fa 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/location.imageset/Group_1584@2x.png and b/QuickLocation/Assets.xcassets/Schedule/location.imageset/Group_1584@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/location.imageset/Group_1584@3x.png b/QuickLocation/Assets.xcassets/Schedule/location.imageset/Group_1584@3x.png index 997b7fb1..2e502110 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/location.imageset/Group_1584@3x.png and b/QuickLocation/Assets.xcassets/Schedule/location.imageset/Group_1584@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/point.imageset/Group_2264@2x.png b/QuickLocation/Assets.xcassets/Schedule/point.imageset/Group_2264@2x.png index 9c5104fa..ec39315e 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/point.imageset/Group_2264@2x.png and b/QuickLocation/Assets.xcassets/Schedule/point.imageset/Group_2264@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/point.imageset/Group_2264@3x.png b/QuickLocation/Assets.xcassets/Schedule/point.imageset/Group_2264@3x.png index 96f0e539..ab18513c 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/point.imageset/Group_2264@3x.png and b/QuickLocation/Assets.xcassets/Schedule/point.imageset/Group_2264@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/route.imageset/Group_2385@2x.png b/QuickLocation/Assets.xcassets/Schedule/route.imageset/Group_2385@2x.png index be408341..4aad96be 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/route.imageset/Group_2385@2x.png and b/QuickLocation/Assets.xcassets/Schedule/route.imageset/Group_2385@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/route.imageset/Group_2385@3x.png b/QuickLocation/Assets.xcassets/Schedule/route.imageset/Group_2385@3x.png index f9428d9c..abc685c0 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/route.imageset/Group_2385@3x.png and b/QuickLocation/Assets.xcassets/Schedule/route.imageset/Group_2385@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/upgrade_bg.imageset/按钮@2x.png b/QuickLocation/Assets.xcassets/Schedule/upgrade_bg.imageset/按钮@2x.png index 4a45e76f..03245e7f 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/upgrade_bg.imageset/按钮@2x.png and b/QuickLocation/Assets.xcassets/Schedule/upgrade_bg.imageset/按钮@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/upgrade_bg.imageset/按钮@3x.png b/QuickLocation/Assets.xcassets/Schedule/upgrade_bg.imageset/按钮@3x.png index aeb690e1..0017676d 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/upgrade_bg.imageset/按钮@3x.png and b/QuickLocation/Assets.xcassets/Schedule/upgrade_bg.imageset/按钮@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/vip_pop.imageset/Group_2396@2x.png b/QuickLocation/Assets.xcassets/Schedule/vip_pop.imageset/Group_2396@2x.png index 8dbea1c0..d812a418 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/vip_pop.imageset/Group_2396@2x.png and b/QuickLocation/Assets.xcassets/Schedule/vip_pop.imageset/Group_2396@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Schedule/vip_pop.imageset/Group_2396@3x.png b/QuickLocation/Assets.xcassets/Schedule/vip_pop.imageset/Group_2396@3x.png index 4586031f..32b7d4af 100644 Binary files a/QuickLocation/Assets.xcassets/Schedule/vip_pop.imageset/Group_2396@3x.png and b/QuickLocation/Assets.xcassets/Schedule/vip_pop.imageset/Group_2396@3x.png differ diff --git a/QuickLocation/Assets.xcassets/SearchLocation/bg_1.imageset/Group_1554@2x.png b/QuickLocation/Assets.xcassets/SearchLocation/bg_1.imageset/Group_1554@2x.png index 3eb6078b..bd645843 100644 Binary files a/QuickLocation/Assets.xcassets/SearchLocation/bg_1.imageset/Group_1554@2x.png and b/QuickLocation/Assets.xcassets/SearchLocation/bg_1.imageset/Group_1554@2x.png differ diff --git a/QuickLocation/Assets.xcassets/SearchLocation/bg_1.imageset/Group_1554@3x.png b/QuickLocation/Assets.xcassets/SearchLocation/bg_1.imageset/Group_1554@3x.png index e7b19fe1..98e842e4 100644 Binary files a/QuickLocation/Assets.xcassets/SearchLocation/bg_1.imageset/Group_1554@3x.png and b/QuickLocation/Assets.xcassets/SearchLocation/bg_1.imageset/Group_1554@3x.png differ diff --git a/QuickLocation/Assets.xcassets/SearchLocation/contacts.imageset/Group_1677@2x.png b/QuickLocation/Assets.xcassets/SearchLocation/contacts.imageset/Group_1677@2x.png index 576f8e32..96aab60c 100644 Binary files a/QuickLocation/Assets.xcassets/SearchLocation/contacts.imageset/Group_1677@2x.png and b/QuickLocation/Assets.xcassets/SearchLocation/contacts.imageset/Group_1677@2x.png differ diff --git a/QuickLocation/Assets.xcassets/SearchLocation/contacts.imageset/Group_1677@3x.png b/QuickLocation/Assets.xcassets/SearchLocation/contacts.imageset/Group_1677@3x.png index 5e39ba23..b3a736aa 100644 Binary files a/QuickLocation/Assets.xcassets/SearchLocation/contacts.imageset/Group_1677@3x.png and b/QuickLocation/Assets.xcassets/SearchLocation/contacts.imageset/Group_1677@3x.png differ diff --git a/QuickLocation/Assets.xcassets/SearchLocation/done.imageset/Group_686@2x.png b/QuickLocation/Assets.xcassets/SearchLocation/done.imageset/Group_686@2x.png index d7befaf3..b0bb3e56 100644 Binary files a/QuickLocation/Assets.xcassets/SearchLocation/done.imageset/Group_686@2x.png and b/QuickLocation/Assets.xcassets/SearchLocation/done.imageset/Group_686@2x.png differ diff --git a/QuickLocation/Assets.xcassets/SearchLocation/done.imageset/Group_686@3x.png b/QuickLocation/Assets.xcassets/SearchLocation/done.imageset/Group_686@3x.png index d5402609..ae120cda 100644 Binary files a/QuickLocation/Assets.xcassets/SearchLocation/done.imageset/Group_686@3x.png and b/QuickLocation/Assets.xcassets/SearchLocation/done.imageset/Group_686@3x.png differ diff --git a/QuickLocation/Assets.xcassets/SearchLocation/done_off.imageset/Group_687@2x.png b/QuickLocation/Assets.xcassets/SearchLocation/done_off.imageset/Group_687@2x.png index fa8d49b0..85a44032 100644 Binary files a/QuickLocation/Assets.xcassets/SearchLocation/done_off.imageset/Group_687@2x.png and b/QuickLocation/Assets.xcassets/SearchLocation/done_off.imageset/Group_687@2x.png differ diff --git a/QuickLocation/Assets.xcassets/SearchLocation/done_off.imageset/Group_687@3x.png b/QuickLocation/Assets.xcassets/SearchLocation/done_off.imageset/Group_687@3x.png index 3a25937e..aab4ae68 100644 Binary files a/QuickLocation/Assets.xcassets/SearchLocation/done_off.imageset/Group_687@3x.png and b/QuickLocation/Assets.xcassets/SearchLocation/done_off.imageset/Group_687@3x.png differ diff --git a/QuickLocation/Assets.xcassets/SearchLocation/mask.imageset/mask@2x.png b/QuickLocation/Assets.xcassets/SearchLocation/mask.imageset/mask@2x.png index 112c593f..c0d25cc5 100644 Binary files a/QuickLocation/Assets.xcassets/SearchLocation/mask.imageset/mask@2x.png and b/QuickLocation/Assets.xcassets/SearchLocation/mask.imageset/mask@2x.png differ diff --git a/QuickLocation/Assets.xcassets/SearchLocation/mask.imageset/mask@3x.png b/QuickLocation/Assets.xcassets/SearchLocation/mask.imageset/mask@3x.png index 8440c205..d18628d1 100644 Binary files a/QuickLocation/Assets.xcassets/SearchLocation/mask.imageset/mask@3x.png and b/QuickLocation/Assets.xcassets/SearchLocation/mask.imageset/mask@3x.png differ diff --git a/QuickLocation/Assets.xcassets/SearchLocation/result_bg.imageset/result_bg@2x.png b/QuickLocation/Assets.xcassets/SearchLocation/result_bg.imageset/result_bg@2x.png index f41215ac..ffc594a8 100644 Binary files a/QuickLocation/Assets.xcassets/SearchLocation/result_bg.imageset/result_bg@2x.png and b/QuickLocation/Assets.xcassets/SearchLocation/result_bg.imageset/result_bg@2x.png differ diff --git a/QuickLocation/Assets.xcassets/SearchLocation/result_bg.imageset/result_bg@3x.png b/QuickLocation/Assets.xcassets/SearchLocation/result_bg.imageset/result_bg@3x.png index 75c4fa70..12b96f88 100644 Binary files a/QuickLocation/Assets.xcassets/SearchLocation/result_bg.imageset/result_bg@3x.png and b/QuickLocation/Assets.xcassets/SearchLocation/result_bg.imageset/result_bg@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Share/friend.imageset/friend@2x.png b/QuickLocation/Assets.xcassets/Share/friend.imageset/friend@2x.png index a53cd38f..29442cc2 100644 Binary files a/QuickLocation/Assets.xcassets/Share/friend.imageset/friend@2x.png and b/QuickLocation/Assets.xcassets/Share/friend.imageset/friend@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Share/friend.imageset/friend@3x.png b/QuickLocation/Assets.xcassets/Share/friend.imageset/friend@3x.png index 3ffa3ca8..da9e73d8 100644 Binary files a/QuickLocation/Assets.xcassets/Share/friend.imageset/friend@3x.png and b/QuickLocation/Assets.xcassets/Share/friend.imageset/friend@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Share/moments.imageset/moments@2x.png b/QuickLocation/Assets.xcassets/Share/moments.imageset/moments@2x.png index ed7bc019..4a3a5cc4 100644 Binary files a/QuickLocation/Assets.xcassets/Share/moments.imageset/moments@2x.png and b/QuickLocation/Assets.xcassets/Share/moments.imageset/moments@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Share/moments.imageset/moments@3x.png b/QuickLocation/Assets.xcassets/Share/moments.imageset/moments@3x.png index f69d0cbd..f5af1369 100644 Binary files a/QuickLocation/Assets.xcassets/Share/moments.imageset/moments@3x.png and b/QuickLocation/Assets.xcassets/Share/moments.imageset/moments@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Share/url.imageset/url@2x.png b/QuickLocation/Assets.xcassets/Share/url.imageset/url@2x.png index 0c2dae37..3ab71b9b 100644 Binary files a/QuickLocation/Assets.xcassets/Share/url.imageset/url@2x.png and b/QuickLocation/Assets.xcassets/Share/url.imageset/url@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Share/url.imageset/url@3x.png b/QuickLocation/Assets.xcassets/Share/url.imageset/url@3x.png index 7a61b293..71ce2479 100644 Binary files a/QuickLocation/Assets.xcassets/Share/url.imageset/url@3x.png and b/QuickLocation/Assets.xcassets/Share/url.imageset/url@3x.png differ diff --git a/QuickLocation/Assets.xcassets/SignIn/signIn_text.imageset/Group 2404@2x.png b/QuickLocation/Assets.xcassets/SignIn/signIn_text.imageset/Group 2404@2x.png index 77c262b7..d3214f94 100644 Binary files a/QuickLocation/Assets.xcassets/SignIn/signIn_text.imageset/Group 2404@2x.png and b/QuickLocation/Assets.xcassets/SignIn/signIn_text.imageset/Group 2404@2x.png differ diff --git a/QuickLocation/Assets.xcassets/SignIn/signIn_text.imageset/Group 2404@3x.png b/QuickLocation/Assets.xcassets/SignIn/signIn_text.imageset/Group 2404@3x.png index 36f14dfb..51fcada9 100644 Binary files a/QuickLocation/Assets.xcassets/SignIn/signIn_text.imageset/Group 2404@3x.png and b/QuickLocation/Assets.xcassets/SignIn/signIn_text.imageset/Group 2404@3x.png differ diff --git a/QuickLocation/Assets.xcassets/SignIn/tips.imageset/Group_2400@2x.png b/QuickLocation/Assets.xcassets/SignIn/tips.imageset/Group_2400@2x.png index 0eba319e..372ec615 100644 Binary files a/QuickLocation/Assets.xcassets/SignIn/tips.imageset/Group_2400@2x.png and b/QuickLocation/Assets.xcassets/SignIn/tips.imageset/Group_2400@2x.png differ diff --git a/QuickLocation/Assets.xcassets/SignIn/tips.imageset/Group_2400@3x.png b/QuickLocation/Assets.xcassets/SignIn/tips.imageset/Group_2400@3x.png index 88f131b2..111e6460 100644 Binary files a/QuickLocation/Assets.xcassets/SignIn/tips.imageset/Group_2400@3x.png and b/QuickLocation/Assets.xcassets/SignIn/tips.imageset/Group_2400@3x.png differ diff --git a/QuickLocation/Assets.xcassets/SignIn/today_text.imageset/today_signin@2x.png b/QuickLocation/Assets.xcassets/SignIn/today_text.imageset/today_signin@2x.png index 9d2ec906..e9355436 100644 Binary files a/QuickLocation/Assets.xcassets/SignIn/today_text.imageset/today_signin@2x.png and b/QuickLocation/Assets.xcassets/SignIn/today_text.imageset/today_signin@2x.png differ diff --git a/QuickLocation/Assets.xcassets/SignIn/today_text.imageset/today_signin@3x.png b/QuickLocation/Assets.xcassets/SignIn/today_text.imageset/today_signin@3x.png index 9816c66a..5016284d 100644 Binary files a/QuickLocation/Assets.xcassets/SignIn/today_text.imageset/today_signin@3x.png and b/QuickLocation/Assets.xcassets/SignIn/today_text.imageset/today_signin@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Tabbar/explore.imageset/explore@2x.png b/QuickLocation/Assets.xcassets/Tabbar/explore.imageset/explore@2x.png index 0e30df29..984fd2bd 100644 Binary files a/QuickLocation/Assets.xcassets/Tabbar/explore.imageset/explore@2x.png and b/QuickLocation/Assets.xcassets/Tabbar/explore.imageset/explore@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Tabbar/explore.imageset/explore@3x.png b/QuickLocation/Assets.xcassets/Tabbar/explore.imageset/explore@3x.png index fe9eac12..f56305e5 100644 Binary files a/QuickLocation/Assets.xcassets/Tabbar/explore.imageset/explore@3x.png and b/QuickLocation/Assets.xcassets/Tabbar/explore.imageset/explore@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Tabbar/explore_selected.imageset/explore_selected@2x.png b/QuickLocation/Assets.xcassets/Tabbar/explore_selected.imageset/explore_selected@2x.png index c64d7465..562024e4 100644 Binary files a/QuickLocation/Assets.xcassets/Tabbar/explore_selected.imageset/explore_selected@2x.png and b/QuickLocation/Assets.xcassets/Tabbar/explore_selected.imageset/explore_selected@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Tabbar/explore_selected.imageset/explore_selected@3x.png b/QuickLocation/Assets.xcassets/Tabbar/explore_selected.imageset/explore_selected@3x.png index cbf3018a..45a8f3d9 100644 Binary files a/QuickLocation/Assets.xcassets/Tabbar/explore_selected.imageset/explore_selected@3x.png and b/QuickLocation/Assets.xcassets/Tabbar/explore_selected.imageset/explore_selected@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Tabbar/group.imageset/group@2x.png b/QuickLocation/Assets.xcassets/Tabbar/group.imageset/group@2x.png index e94beffe..817fbd51 100644 Binary files a/QuickLocation/Assets.xcassets/Tabbar/group.imageset/group@2x.png and b/QuickLocation/Assets.xcassets/Tabbar/group.imageset/group@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Tabbar/group.imageset/group@3x.png b/QuickLocation/Assets.xcassets/Tabbar/group.imageset/group@3x.png index 7c476805..87c6681a 100644 Binary files a/QuickLocation/Assets.xcassets/Tabbar/group.imageset/group@3x.png and b/QuickLocation/Assets.xcassets/Tabbar/group.imageset/group@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Tabbar/group_selected.imageset/group_selected@2x.png b/QuickLocation/Assets.xcassets/Tabbar/group_selected.imageset/group_selected@2x.png index c3f33a31..2ed20ea6 100644 Binary files a/QuickLocation/Assets.xcassets/Tabbar/group_selected.imageset/group_selected@2x.png and b/QuickLocation/Assets.xcassets/Tabbar/group_selected.imageset/group_selected@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Tabbar/group_selected.imageset/group_selected@3x.png b/QuickLocation/Assets.xcassets/Tabbar/group_selected.imageset/group_selected@3x.png index 1d15a292..77ae664d 100644 Binary files a/QuickLocation/Assets.xcassets/Tabbar/group_selected.imageset/group_selected@3x.png and b/QuickLocation/Assets.xcassets/Tabbar/group_selected.imageset/group_selected@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Tabbar/location.imageset/location@2x.png b/QuickLocation/Assets.xcassets/Tabbar/location.imageset/location@2x.png index e92c42a7..03f5b417 100644 Binary files a/QuickLocation/Assets.xcassets/Tabbar/location.imageset/location@2x.png and b/QuickLocation/Assets.xcassets/Tabbar/location.imageset/location@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Tabbar/location.imageset/location@3x.png b/QuickLocation/Assets.xcassets/Tabbar/location.imageset/location@3x.png index 6ccdc54a..ef69c50a 100644 Binary files a/QuickLocation/Assets.xcassets/Tabbar/location.imageset/location@3x.png and b/QuickLocation/Assets.xcassets/Tabbar/location.imageset/location@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Tabbar/location_selected.imageset/location_selected@2x.png b/QuickLocation/Assets.xcassets/Tabbar/location_selected.imageset/location_selected@2x.png index a295eacc..4775609f 100644 Binary files a/QuickLocation/Assets.xcassets/Tabbar/location_selected.imageset/location_selected@2x.png and b/QuickLocation/Assets.xcassets/Tabbar/location_selected.imageset/location_selected@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Tabbar/location_selected.imageset/location_selected@3x.png b/QuickLocation/Assets.xcassets/Tabbar/location_selected.imageset/location_selected@3x.png index 3e238e6b..94ac075a 100644 Binary files a/QuickLocation/Assets.xcassets/Tabbar/location_selected.imageset/location_selected@3x.png and b/QuickLocation/Assets.xcassets/Tabbar/location_selected.imageset/location_selected@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Tabbar/mine.imageset/mine@2x.png b/QuickLocation/Assets.xcassets/Tabbar/mine.imageset/mine@2x.png index 23e1733d..d5aae932 100644 Binary files a/QuickLocation/Assets.xcassets/Tabbar/mine.imageset/mine@2x.png and b/QuickLocation/Assets.xcassets/Tabbar/mine.imageset/mine@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Tabbar/mine.imageset/mine@3x.png b/QuickLocation/Assets.xcassets/Tabbar/mine.imageset/mine@3x.png index 79249247..50f6ebbd 100644 Binary files a/QuickLocation/Assets.xcassets/Tabbar/mine.imageset/mine@3x.png and b/QuickLocation/Assets.xcassets/Tabbar/mine.imageset/mine@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Tabbar/mine_selected.imageset/mine_selected@2x.png b/QuickLocation/Assets.xcassets/Tabbar/mine_selected.imageset/mine_selected@2x.png index f99ab079..171ab35e 100644 Binary files a/QuickLocation/Assets.xcassets/Tabbar/mine_selected.imageset/mine_selected@2x.png and b/QuickLocation/Assets.xcassets/Tabbar/mine_selected.imageset/mine_selected@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Tabbar/mine_selected.imageset/mine_selected@3x.png b/QuickLocation/Assets.xcassets/Tabbar/mine_selected.imageset/mine_selected@3x.png index 141f2c90..bc0dd76c 100644 Binary files a/QuickLocation/Assets.xcassets/Tabbar/mine_selected.imageset/mine_selected@3x.png and b/QuickLocation/Assets.xcassets/Tabbar/mine_selected.imageset/mine_selected@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Toast/fail.imageset/fail.png b/QuickLocation/Assets.xcassets/Toast/fail.imageset/fail.png index ef086671..03bdc91d 100644 Binary files a/QuickLocation/Assets.xcassets/Toast/fail.imageset/fail.png and b/QuickLocation/Assets.xcassets/Toast/fail.imageset/fail.png differ diff --git a/QuickLocation/Assets.xcassets/Toast/fail.imageset/fail@2x.png b/QuickLocation/Assets.xcassets/Toast/fail.imageset/fail@2x.png index 6998ac6f..5e09f504 100644 Binary files a/QuickLocation/Assets.xcassets/Toast/fail.imageset/fail@2x.png and b/QuickLocation/Assets.xcassets/Toast/fail.imageset/fail@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Toast/fail.imageset/fail@3x.png b/QuickLocation/Assets.xcassets/Toast/fail.imageset/fail@3x.png index bda72da2..76eb8822 100644 Binary files a/QuickLocation/Assets.xcassets/Toast/fail.imageset/fail@3x.png and b/QuickLocation/Assets.xcassets/Toast/fail.imageset/fail@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Toast/loading.imageset/loading.png b/QuickLocation/Assets.xcassets/Toast/loading.imageset/loading.png index a784e5e4..5be3bfec 100644 Binary files a/QuickLocation/Assets.xcassets/Toast/loading.imageset/loading.png and b/QuickLocation/Assets.xcassets/Toast/loading.imageset/loading.png differ diff --git a/QuickLocation/Assets.xcassets/Toast/loading.imageset/loading@2x.png b/QuickLocation/Assets.xcassets/Toast/loading.imageset/loading@2x.png index d9c6bbef..776f6fce 100644 Binary files a/QuickLocation/Assets.xcassets/Toast/loading.imageset/loading@2x.png and b/QuickLocation/Assets.xcassets/Toast/loading.imageset/loading@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Toast/loading.imageset/loading@3x.png b/QuickLocation/Assets.xcassets/Toast/loading.imageset/loading@3x.png index 50d0b42c..25fb2d6c 100644 Binary files a/QuickLocation/Assets.xcassets/Toast/loading.imageset/loading@3x.png and b/QuickLocation/Assets.xcassets/Toast/loading.imageset/loading@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Toast/success.imageset/success.png b/QuickLocation/Assets.xcassets/Toast/success.imageset/success.png index d3752713..aaf40402 100644 Binary files a/QuickLocation/Assets.xcassets/Toast/success.imageset/success.png and b/QuickLocation/Assets.xcassets/Toast/success.imageset/success.png differ diff --git a/QuickLocation/Assets.xcassets/Toast/success.imageset/success@2x.png b/QuickLocation/Assets.xcassets/Toast/success.imageset/success@2x.png index 578d7525..13380116 100644 Binary files a/QuickLocation/Assets.xcassets/Toast/success.imageset/success@2x.png and b/QuickLocation/Assets.xcassets/Toast/success.imageset/success@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Toast/success.imageset/success@3x.png b/QuickLocation/Assets.xcassets/Toast/success.imageset/success@3x.png index 1ca13f7f..42b40ed4 100644 Binary files a/QuickLocation/Assets.xcassets/Toast/success.imageset/success@3x.png and b/QuickLocation/Assets.xcassets/Toast/success.imageset/success@3x.png differ diff --git a/QuickLocation/Assets.xcassets/Toast/warning.imageset/warning.png b/QuickLocation/Assets.xcassets/Toast/warning.imageset/warning.png index 86297a6f..b1c778d1 100644 Binary files a/QuickLocation/Assets.xcassets/Toast/warning.imageset/warning.png and b/QuickLocation/Assets.xcassets/Toast/warning.imageset/warning.png differ diff --git a/QuickLocation/Assets.xcassets/Toast/warning.imageset/warning@2x.png b/QuickLocation/Assets.xcassets/Toast/warning.imageset/warning@2x.png index ccea4a13..3aff768c 100644 Binary files a/QuickLocation/Assets.xcassets/Toast/warning.imageset/warning@2x.png and b/QuickLocation/Assets.xcassets/Toast/warning.imageset/warning@2x.png differ diff --git a/QuickLocation/Assets.xcassets/Toast/warning.imageset/warning@3x.png b/QuickLocation/Assets.xcassets/Toast/warning.imageset/warning@3x.png index ed8a4b51..55056a5f 100644 Binary files a/QuickLocation/Assets.xcassets/Toast/warning.imageset/warning@3x.png and b/QuickLocation/Assets.xcassets/Toast/warning.imageset/warning@3x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/1.imageset/Frame_16@2x.png b/QuickLocation/Assets.xcassets/UserIcon/1.imageset/Frame_16@2x.png index 7e09f427..9d6894d8 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/1.imageset/Frame_16@2x.png and b/QuickLocation/Assets.xcassets/UserIcon/1.imageset/Frame_16@2x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/1.imageset/Frame_16@3x.png b/QuickLocation/Assets.xcassets/UserIcon/1.imageset/Frame_16@3x.png index 5a46395a..1afbfbd8 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/1.imageset/Frame_16@3x.png and b/QuickLocation/Assets.xcassets/UserIcon/1.imageset/Frame_16@3x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/10.imageset/Frame_20@2x.png b/QuickLocation/Assets.xcassets/UserIcon/10.imageset/Frame_20@2x.png index 8250cf86..e69d1d8a 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/10.imageset/Frame_20@2x.png and b/QuickLocation/Assets.xcassets/UserIcon/10.imageset/Frame_20@2x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/10.imageset/Frame_20@3x.png b/QuickLocation/Assets.xcassets/UserIcon/10.imageset/Frame_20@3x.png index ada57236..b4a38491 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/10.imageset/Frame_20@3x.png and b/QuickLocation/Assets.xcassets/UserIcon/10.imageset/Frame_20@3x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/11.imageset/Frame_21@2x.png b/QuickLocation/Assets.xcassets/UserIcon/11.imageset/Frame_21@2x.png index b82dc6b7..b1306e64 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/11.imageset/Frame_21@2x.png and b/QuickLocation/Assets.xcassets/UserIcon/11.imageset/Frame_21@2x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/11.imageset/Frame_21@3x.png b/QuickLocation/Assets.xcassets/UserIcon/11.imageset/Frame_21@3x.png index 87bba097..e96601c4 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/11.imageset/Frame_21@3x.png and b/QuickLocation/Assets.xcassets/UserIcon/11.imageset/Frame_21@3x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/12.imageset/Frame_22@2x.png b/QuickLocation/Assets.xcassets/UserIcon/12.imageset/Frame_22@2x.png index 06edbb5c..7bb8d531 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/12.imageset/Frame_22@2x.png and b/QuickLocation/Assets.xcassets/UserIcon/12.imageset/Frame_22@2x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/12.imageset/Frame_22@3x.png b/QuickLocation/Assets.xcassets/UserIcon/12.imageset/Frame_22@3x.png index f8ee8f37..a4b00bc1 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/12.imageset/Frame_22@3x.png and b/QuickLocation/Assets.xcassets/UserIcon/12.imageset/Frame_22@3x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/13.imageset/Frame_23@2x.png b/QuickLocation/Assets.xcassets/UserIcon/13.imageset/Frame_23@2x.png index 702300b7..c9ee4173 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/13.imageset/Frame_23@2x.png and b/QuickLocation/Assets.xcassets/UserIcon/13.imageset/Frame_23@2x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/13.imageset/Frame_23@3x.png b/QuickLocation/Assets.xcassets/UserIcon/13.imageset/Frame_23@3x.png index bc3a1850..26ee22fd 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/13.imageset/Frame_23@3x.png and b/QuickLocation/Assets.xcassets/UserIcon/13.imageset/Frame_23@3x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/14.imageset/Frame_24@2x.png b/QuickLocation/Assets.xcassets/UserIcon/14.imageset/Frame_24@2x.png index a4a20fc2..3077a6a2 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/14.imageset/Frame_24@2x.png and b/QuickLocation/Assets.xcassets/UserIcon/14.imageset/Frame_24@2x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/14.imageset/Frame_24@3x.png b/QuickLocation/Assets.xcassets/UserIcon/14.imageset/Frame_24@3x.png index 5adc830b..ba9e058b 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/14.imageset/Frame_24@3x.png and b/QuickLocation/Assets.xcassets/UserIcon/14.imageset/Frame_24@3x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/15.imageset/Frame_25@2x.png b/QuickLocation/Assets.xcassets/UserIcon/15.imageset/Frame_25@2x.png index d4a37e44..efbde5a7 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/15.imageset/Frame_25@2x.png and b/QuickLocation/Assets.xcassets/UserIcon/15.imageset/Frame_25@2x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/15.imageset/Frame_25@3x.png b/QuickLocation/Assets.xcassets/UserIcon/15.imageset/Frame_25@3x.png index 6d76ecb9..7a8359c8 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/15.imageset/Frame_25@3x.png and b/QuickLocation/Assets.xcassets/UserIcon/15.imageset/Frame_25@3x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/2.imageset/Frame_15@2x.png b/QuickLocation/Assets.xcassets/UserIcon/2.imageset/Frame_15@2x.png index 8b53d325..fc9e8114 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/2.imageset/Frame_15@2x.png and b/QuickLocation/Assets.xcassets/UserIcon/2.imageset/Frame_15@2x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/2.imageset/Frame_15@3x.png b/QuickLocation/Assets.xcassets/UserIcon/2.imageset/Frame_15@3x.png index 078fe7ce..e61e34a2 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/2.imageset/Frame_15@3x.png and b/QuickLocation/Assets.xcassets/UserIcon/2.imageset/Frame_15@3x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/3.imageset/Frame_17@2x.png b/QuickLocation/Assets.xcassets/UserIcon/3.imageset/Frame_17@2x.png index c72abf6b..e6591678 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/3.imageset/Frame_17@2x.png and b/QuickLocation/Assets.xcassets/UserIcon/3.imageset/Frame_17@2x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/3.imageset/Frame_17@3x.png b/QuickLocation/Assets.xcassets/UserIcon/3.imageset/Frame_17@3x.png index 02d27b63..2a66416d 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/3.imageset/Frame_17@3x.png and b/QuickLocation/Assets.xcassets/UserIcon/3.imageset/Frame_17@3x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/4.imageset/Group 2371@2x.png b/QuickLocation/Assets.xcassets/UserIcon/4.imageset/Group 2371@2x.png index 06a145c1..c9e61d47 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/4.imageset/Group 2371@2x.png and b/QuickLocation/Assets.xcassets/UserIcon/4.imageset/Group 2371@2x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/4.imageset/Group 2371@3x.png b/QuickLocation/Assets.xcassets/UserIcon/4.imageset/Group 2371@3x.png index c4f690c8..d0784ef9 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/4.imageset/Group 2371@3x.png and b/QuickLocation/Assets.xcassets/UserIcon/4.imageset/Group 2371@3x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/5.imageset/Frame_14@2x.png b/QuickLocation/Assets.xcassets/UserIcon/5.imageset/Frame_14@2x.png index fca171e8..13999312 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/5.imageset/Frame_14@2x.png and b/QuickLocation/Assets.xcassets/UserIcon/5.imageset/Frame_14@2x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/5.imageset/Frame_14@3x.png b/QuickLocation/Assets.xcassets/UserIcon/5.imageset/Frame_14@3x.png index a1a7c7ec..8b21c84c 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/5.imageset/Frame_14@3x.png and b/QuickLocation/Assets.xcassets/UserIcon/5.imageset/Frame_14@3x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/6.imageset/Frame_12@2x.png b/QuickLocation/Assets.xcassets/UserIcon/6.imageset/Frame_12@2x.png index 0ccc4d75..729de242 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/6.imageset/Frame_12@2x.png and b/QuickLocation/Assets.xcassets/UserIcon/6.imageset/Frame_12@2x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/6.imageset/Frame_12@3x.png b/QuickLocation/Assets.xcassets/UserIcon/6.imageset/Frame_12@3x.png index d8f77c5d..d263933d 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/6.imageset/Frame_12@3x.png and b/QuickLocation/Assets.xcassets/UserIcon/6.imageset/Frame_12@3x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/7.imageset/Frame_13@2x.png b/QuickLocation/Assets.xcassets/UserIcon/7.imageset/Frame_13@2x.png index 30225c8b..43a07985 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/7.imageset/Frame_13@2x.png and b/QuickLocation/Assets.xcassets/UserIcon/7.imageset/Frame_13@2x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/7.imageset/Frame_13@3x.png b/QuickLocation/Assets.xcassets/UserIcon/7.imageset/Frame_13@3x.png index 578b7f5b..b3adcdf6 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/7.imageset/Frame_13@3x.png and b/QuickLocation/Assets.xcassets/UserIcon/7.imageset/Frame_13@3x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/8.imageset/Frame_18@2x.png b/QuickLocation/Assets.xcassets/UserIcon/8.imageset/Frame_18@2x.png index f3260564..8e8b0d45 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/8.imageset/Frame_18@2x.png and b/QuickLocation/Assets.xcassets/UserIcon/8.imageset/Frame_18@2x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/8.imageset/Frame_18@3x.png b/QuickLocation/Assets.xcassets/UserIcon/8.imageset/Frame_18@3x.png index 6cbf54b1..1786da32 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/8.imageset/Frame_18@3x.png and b/QuickLocation/Assets.xcassets/UserIcon/8.imageset/Frame_18@3x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/9.imageset/Frame_19@2x.png b/QuickLocation/Assets.xcassets/UserIcon/9.imageset/Frame_19@2x.png index c7e24a67..497168f2 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/9.imageset/Frame_19@2x.png and b/QuickLocation/Assets.xcassets/UserIcon/9.imageset/Frame_19@2x.png differ diff --git a/QuickLocation/Assets.xcassets/UserIcon/9.imageset/Frame_19@3x.png b/QuickLocation/Assets.xcassets/UserIcon/9.imageset/Frame_19@3x.png index 1b3aaee8..322419fd 100644 Binary files a/QuickLocation/Assets.xcassets/UserIcon/9.imageset/Frame_19@3x.png and b/QuickLocation/Assets.xcassets/UserIcon/9.imageset/Frame_19@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipIcon/1.imageset/Group_2335@2x.png b/QuickLocation/Assets.xcassets/VipIcon/1.imageset/Group_2335@2x.png index b6788966..35400549 100644 Binary files a/QuickLocation/Assets.xcassets/VipIcon/1.imageset/Group_2335@2x.png and b/QuickLocation/Assets.xcassets/VipIcon/1.imageset/Group_2335@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipIcon/1.imageset/Group_2335@3x.png b/QuickLocation/Assets.xcassets/VipIcon/1.imageset/Group_2335@3x.png index 68af387b..f4ee609a 100644 Binary files a/QuickLocation/Assets.xcassets/VipIcon/1.imageset/Group_2335@3x.png and b/QuickLocation/Assets.xcassets/VipIcon/1.imageset/Group_2335@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipIcon/2.imageset/Group_2334@2x.png b/QuickLocation/Assets.xcassets/VipIcon/2.imageset/Group_2334@2x.png index c19d13e0..2201a33e 100644 Binary files a/QuickLocation/Assets.xcassets/VipIcon/2.imageset/Group_2334@2x.png and b/QuickLocation/Assets.xcassets/VipIcon/2.imageset/Group_2334@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipIcon/2.imageset/Group_2334@3x.png b/QuickLocation/Assets.xcassets/VipIcon/2.imageset/Group_2334@3x.png index 2fa20def..e6e61fef 100644 Binary files a/QuickLocation/Assets.xcassets/VipIcon/2.imageset/Group_2334@3x.png and b/QuickLocation/Assets.xcassets/VipIcon/2.imageset/Group_2334@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipIcon/4.imageset/Group_2333@2x.png b/QuickLocation/Assets.xcassets/VipIcon/4.imageset/Group_2333@2x.png index 6840d95e..90634a76 100644 Binary files a/QuickLocation/Assets.xcassets/VipIcon/4.imageset/Group_2333@2x.png and b/QuickLocation/Assets.xcassets/VipIcon/4.imageset/Group_2333@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipIcon/4.imageset/Group_2333@3x.png b/QuickLocation/Assets.xcassets/VipIcon/4.imageset/Group_2333@3x.png index 64ca74de..cd3d823d 100644 Binary files a/QuickLocation/Assets.xcassets/VipIcon/4.imageset/Group_2333@3x.png and b/QuickLocation/Assets.xcassets/VipIcon/4.imageset/Group_2333@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/ad.imageset/Group 1862@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/ad.imageset/Group 1862@2x.png index ccce85c5..50ca6e7b 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/ad.imageset/Group 1862@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/ad.imageset/Group 1862@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/ad.imageset/Group 1862@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/ad.imageset/Group 1862@3x.png index d2eccb0b..fe541570 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/ad.imageset/Group 1862@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/ad.imageset/Group 1862@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/alipay.imageset/alipay@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/alipay.imageset/alipay@2x.png index 5a74935b..0486e2ed 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/alipay.imageset/alipay@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/alipay.imageset/alipay@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/alipay.imageset/alipay@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/alipay.imageset/alipay@3x.png index 9545c41d..0aa9201c 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/alipay.imageset/alipay@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/alipay.imageset/alipay@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/apple.imageset/apple@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/apple.imageset/apple@2x.png index 40f97b09..63d4e759 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/apple.imageset/apple@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/apple.imageset/apple@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/apple.imageset/apple@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/apple.imageset/apple@3x.png index 51042060..c26a6eaf 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/apple.imageset/apple@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/apple.imageset/apple@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/battery.imageset/Group 1863@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/battery.imageset/Group 1863@2x.png index 119ef7f7..a380fc95 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/battery.imageset/Group 1863@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/battery.imageset/Group 1863@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/battery.imageset/Group 1863@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/battery.imageset/Group 1863@3x.png index 637667c5..b8d6462c 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/battery.imageset/Group 1863@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/battery.imageset/Group 1863@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/bubble.imageset/Group 1861@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/bubble.imageset/Group 1861@2x.png index 378e6d72..60468f40 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/bubble.imageset/Group 1861@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/bubble.imageset/Group 1861@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/bubble.imageset/Group 1861@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/bubble.imageset/Group 1861@3x.png index 69826695..1fa637f0 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/bubble.imageset/Group 1861@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/bubble.imageset/Group 1861@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/checkbox.imageset/tick-circle@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/checkbox.imageset/tick-circle@2x.png index bbcc2969..1aea72ee 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/checkbox.imageset/tick-circle@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/checkbox.imageset/tick-circle@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/checkbox.imageset/tick-circle@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/checkbox.imageset/tick-circle@3x.png index 7eb154eb..d2736729 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/checkbox.imageset/tick-circle@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/checkbox.imageset/tick-circle@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/checkbox_on.imageset/icon_yindao_change@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/checkbox_on.imageset/icon_yindao_change@2x.png index 3c4f691b..d9495776 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/checkbox_on.imageset/icon_yindao_change@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/checkbox_on.imageset/icon_yindao_change@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/checkbox_on.imageset/icon_yindao_change@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/checkbox_on.imageset/icon_yindao_change@3x.png index 3bb2699e..537ce9f2 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/checkbox_on.imageset/icon_yindao_change@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/checkbox_on.imageset/icon_yindao_change@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/count_bg.imageset/Rectangle 42116@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/count_bg.imageset/Rectangle 42116@2x.png index 1cf7693c..954a2f5f 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/count_bg.imageset/Rectangle 42116@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/count_bg.imageset/Rectangle 42116@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/count_bg.imageset/Rectangle 42116@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/count_bg.imageset/Rectangle 42116@3x.png index 61b5a72b..157e5c5a 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/count_bg.imageset/Rectangle 42116@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/count_bg.imageset/Rectangle 42116@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/create_count.imageset/create_count@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/create_count.imageset/create_count@2x.png index 59e41629..9bfc2e7e 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/create_count.imageset/create_count@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/create_count.imageset/create_count@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/create_count.imageset/create_count@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/create_count.imageset/create_count@3x.png index a83d6bc4..46efb629 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/create_count.imageset/create_count@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/create_count.imageset/create_count@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/emoji.imageset/Group 1864@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/emoji.imageset/Group 1864@2x.png index 70406ac8..1bed3b0f 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/emoji.imageset/Group 1864@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/emoji.imageset/Group 1864@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/emoji.imageset/Group 1864@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/emoji.imageset/Group 1864@3x.png index 7a79661f..99d51550 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/emoji.imageset/Group 1864@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/emoji.imageset/Group 1864@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/expense.imageset/expense@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/expense.imageset/expense@2x.png index 9f848672..68f0a7e9 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/expense.imageset/expense@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/expense.imageset/expense@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/expense.imageset/expense@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/expense.imageset/expense@3x.png index 535ead7d..ccb118dc 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/expense.imageset/expense@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/expense.imageset/expense@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/expense_on.imageset/expense_on@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/expense_on.imageset/expense_on@2x.png index 185829d0..34286891 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/expense_on.imageset/expense_on@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/expense_on.imageset/expense_on@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/expense_on.imageset/expense_on@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/expense_on.imageset/expense_on@3x.png index f533f1fa..42402490 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/expense_on.imageset/expense_on@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/expense_on.imageset/expense_on@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/expense_tips.imageset/Rectangle 868@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/expense_tips.imageset/Rectangle 868@2x.png index b9b07207..3e297a8f 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/expense_tips.imageset/Rectangle 868@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/expense_tips.imageset/Rectangle 868@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/expense_tips.imageset/Rectangle 868@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/expense_tips.imageset/Rectangle 868@3x.png index 5460b4bc..e3f37b98 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/expense_tips.imageset/Rectangle 868@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/expense_tips.imageset/Rectangle 868@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/header_bg.imageset/header_bg@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/header_bg.imageset/header_bg@2x.png index 9523a4a3..e0ce026b 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/header_bg.imageset/header_bg@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/header_bg.imageset/header_bg@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/header_bg.imageset/header_bg@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/header_bg.imageset/header_bg@3x.png index 5f585f5e..178f1bd6 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/header_bg.imageset/header_bg@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/header_bg.imageset/header_bg@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/join_count.imageset/join_count@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/join_count.imageset/join_count@2x.png index c9578dd8..0945ec4d 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/join_count.imageset/join_count@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/join_count.imageset/join_count@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/join_count.imageset/join_count@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/join_count.imageset/join_count@3x.png index 53fcfea2..40050c60 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/join_count.imageset/join_count@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/join_count.imageset/join_count@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/location.imageset/Group 1858@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/location.imageset/Group 1858@2x.png index a6b299a0..2b40d9d2 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/location.imageset/Group 1858@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/location.imageset/Group 1858@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/location.imageset/Group 1858@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/location.imageset/Group 1858@3x.png index 5622f7e5..5dc3b222 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/location.imageset/Group 1858@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/location.imageset/Group 1858@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/map.imageset/Group 1859@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/map.imageset/Group 1859@2x.png index 9097bc22..bb12eed7 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/map.imageset/Group 1859@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/map.imageset/Group 1859@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/map.imageset/Group 1859@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/map.imageset/Group 1859@3x.png index 71cde26f..34129e61 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/map.imageset/Group 1859@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/map.imageset/Group 1859@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/member_count.imageset/member_count@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/member_count.imageset/member_count@2x.png index ae8d18b6..d6305b85 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/member_count.imageset/member_count@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/member_count.imageset/member_count@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/member_count.imageset/member_count@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/member_count.imageset/member_count@3x.png index 45c07a3b..a202edd1 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/member_count.imageset/member_count@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/member_count.imageset/member_count@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/pay_bg.imageset/组 47671@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/pay_bg.imageset/组 47671@2x.png index 014c3732..36bb627b 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/pay_bg.imageset/组 47671@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/pay_bg.imageset/组 47671@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/pay_bg.imageset/组 47671@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/pay_bg.imageset/组 47671@3x.png index 2ad4bdd4..cd2a6ffb 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/pay_bg.imageset/组 47671@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/pay_bg.imageset/组 47671@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/separator.imageset/Rectangle 42118@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/separator.imageset/Rectangle 42118@2x.png index 0f4b30f2..55080d42 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/separator.imageset/Rectangle 42118@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/separator.imageset/Rectangle 42118@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/separator.imageset/Rectangle 42118@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/separator.imageset/Rectangle 42118@3x.png index 4e93411f..567a3bb6 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/separator.imageset/Rectangle 42118@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/separator.imageset/Rectangle 42118@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/service.imageset/Group 1865@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/service.imageset/Group 1865@2x.png index acbbb63e..66efe732 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/service.imageset/Group 1865@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/service.imageset/Group 1865@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/service.imageset/Group 1865@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/service.imageset/Group 1865@3x.png index 8d8c7751..97646094 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/service.imageset/Group 1865@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/service.imageset/Group 1865@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/sos.imageset/Group 1860@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/sos.imageset/Group 1860@2x.png index 47131e2e..ac2a024e 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/sos.imageset/Group 1860@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/sos.imageset/Group 1860@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/sos.imageset/Group 1860@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/sos.imageset/Group 1860@3x.png index 2d8e8e81..e7d450d1 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/sos.imageset/Group 1860@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/sos.imageset/Group 1860@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/waive_bg.imageset/waive_bg@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/waive_bg.imageset/waive_bg@2x.png index 6bcc1601..16d72ff8 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/waive_bg.imageset/waive_bg@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/waive_bg.imageset/waive_bg@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/waive_bg.imageset/waive_bg@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/waive_bg.imageset/waive_bg@3x.png index eec32227..6a33d0b7 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/waive_bg.imageset/waive_bg@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/waive_bg.imageset/waive_bg@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/wechat.imageset/wechat@2x.png b/QuickLocation/Assets.xcassets/VipRecharge/wechat.imageset/wechat@2x.png index 1717ccb9..c67ab4d6 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/wechat.imageset/wechat@2x.png and b/QuickLocation/Assets.xcassets/VipRecharge/wechat.imageset/wechat@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRecharge/wechat.imageset/wechat@3x.png b/QuickLocation/Assets.xcassets/VipRecharge/wechat.imageset/wechat@3x.png index 965b5dba..d7d90524 100644 Binary files a/QuickLocation/Assets.xcassets/VipRecharge/wechat.imageset/wechat@3x.png and b/QuickLocation/Assets.xcassets/VipRecharge/wechat.imageset/wechat@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRights/bg.imageset/bg@2x.png b/QuickLocation/Assets.xcassets/VipRights/bg.imageset/bg@2x.png index 185f6bf1..9fb0eefe 100644 Binary files a/QuickLocation/Assets.xcassets/VipRights/bg.imageset/bg@2x.png and b/QuickLocation/Assets.xcassets/VipRights/bg.imageset/bg@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRights/bg.imageset/bg@3x.png b/QuickLocation/Assets.xcassets/VipRights/bg.imageset/bg@3x.png index 38339999..5111c2c9 100644 Binary files a/QuickLocation/Assets.xcassets/VipRights/bg.imageset/bg@3x.png and b/QuickLocation/Assets.xcassets/VipRights/bg.imageset/bg@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRights/detail.imageset/desc@2x.png b/QuickLocation/Assets.xcassets/VipRights/detail.imageset/desc@2x.png index b4528054..24afb0ef 100644 Binary files a/QuickLocation/Assets.xcassets/VipRights/detail.imageset/desc@2x.png and b/QuickLocation/Assets.xcassets/VipRights/detail.imageset/desc@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRights/detail.imageset/desc@3x.png b/QuickLocation/Assets.xcassets/VipRights/detail.imageset/desc@3x.png index 46094bc8..ae1d85a3 100644 Binary files a/QuickLocation/Assets.xcassets/VipRights/detail.imageset/desc@3x.png and b/QuickLocation/Assets.xcassets/VipRights/detail.imageset/desc@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRights/header_bg.imageset/header_bg@2x.png b/QuickLocation/Assets.xcassets/VipRights/header_bg.imageset/header_bg@2x.png index 0f61bb00..cf370e89 100644 Binary files a/QuickLocation/Assets.xcassets/VipRights/header_bg.imageset/header_bg@2x.png and b/QuickLocation/Assets.xcassets/VipRights/header_bg.imageset/header_bg@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRights/header_bg.imageset/header_bg@3x.png b/QuickLocation/Assets.xcassets/VipRights/header_bg.imageset/header_bg@3x.png index 94bf7e6f..bb3fa4a0 100644 Binary files a/QuickLocation/Assets.xcassets/VipRights/header_bg.imageset/header_bg@3x.png and b/QuickLocation/Assets.xcassets/VipRights/header_bg.imageset/header_bg@3x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRights/logo.imageset/logo@2x.png b/QuickLocation/Assets.xcassets/VipRights/logo.imageset/logo@2x.png index 390453bc..06d8ca23 100644 Binary files a/QuickLocation/Assets.xcassets/VipRights/logo.imageset/logo@2x.png and b/QuickLocation/Assets.xcassets/VipRights/logo.imageset/logo@2x.png differ diff --git a/QuickLocation/Assets.xcassets/VipRights/logo.imageset/logo@3x.png b/QuickLocation/Assets.xcassets/VipRights/logo.imageset/logo@3x.png index e22ccea1..3c56b5be 100644 Binary files a/QuickLocation/Assets.xcassets/VipRights/logo.imageset/logo@3x.png and b/QuickLocation/Assets.xcassets/VipRights/logo.imageset/logo@3x.png differ diff --git a/QuickLocation/Core/Extension/Date+Extension.swift b/QuickLocation/Core/Extension/Date+Extension.swift index 94a97317..5c975edf 100644 --- a/QuickLocation/Core/Extension/Date+Extension.swift +++ b/QuickLocation/Core/Extension/Date+Extension.swift @@ -6,11 +6,10 @@ // import Foundation +import SwiftDate extension Date { func formatterStyle(_ style: String) -> String { - let dateFormatter = DateFormatter() - dateFormatter.dateFormat = style - return dateFormatter.string(from: self) + toFormat(style) } } diff --git a/QuickLocation/Core/Extension/String+Extension.swift b/QuickLocation/Core/Extension/String+Extension.swift index 6d1cec64..48628ac3 100644 --- a/QuickLocation/Core/Extension/String+Extension.swift +++ b/QuickLocation/Core/Extension/String+Extension.swift @@ -10,6 +10,7 @@ import Foundation import SwiftyJSON import CommonCrypto import URLNavigator +import SwiftDate public extension String { @@ -535,11 +536,8 @@ extension String { /// - format: 格式模板 如 yyyy-MM-dd HH:mm:ss /// - Returns: 格式化后的日期字符串 func formatDate(_ date: Date, format: String) -> String { - let formatter = DateFormatter() - formatter.locale = Locale(identifier: "zh_CN") - formatter.timeZone = TimeZone(identifier: "Asia/Shanghai") - formatter.dateFormat = format - return formatter.string(from: date) + let region = Region(zone: TimeZone(identifier: "Asia/Shanghai")!, locale: Locale(identifier: "zh_CN")) + return date.in(region: region).toFormat(format) } // MARK: - ISO字符串 直接转自定义格式 diff --git a/QuickLocation/Info.plist b/QuickLocation/Info.plist index 9c3f7054..48ac7de6 100644 --- a/QuickLocation/Info.plist +++ b/QuickLocation/Info.plist @@ -48,6 +48,13 @@ NSIncludesSubdomains + imapi.zuom8.cn + + NSExceptionAllowsInsecureHTTPLoads + + NSIncludesSubdomains + + imws.zuom8.cn NSExceptionAllowsInsecureHTTPLoads diff --git a/QuickLocation/Model/GroupModel.swift b/QuickLocation/Model/GroupModel.swift index 37925881..f8a78899 100644 --- a/QuickLocation/Model/GroupModel.swift +++ b/QuickLocation/Model/GroupModel.swift @@ -178,10 +178,14 @@ struct GroupMemberModel: Mappable, Equatable { /// 会员等级 1普通 2白银 3永久 4钻石 var level: Int = 1 var vipIcon: UIImage { - if level != 2 || level != 4 { + switch level { + case 2: // 白银 + return UIImage(named: "VipIcon/2") ?? UIImage() + case 3: // 永久 return UIImage(named: "VipIcon/1") ?? UIImage() + default: + return UIImage() } - return UIImage(named: "VipIcon/\(level)") ?? UIImage() } /// 状态：0、无状态 1、SOS 2、气泡等 var status: Int = 0 diff --git a/QuickLocation/Resource/Font/YouSheBiaoTiHei.ttf b/QuickLocation/Resource/Font/YouSheBiaoTiHei.ttf deleted file mode 100644 index 3729151a..00000000 Binary files a/QuickLocation/Resource/Font/YouSheBiaoTiHei.ttf and /dev/null differ diff --git a/QuickLocation/Resource/Font/douyu.otf b/QuickLocation/Resource/Font/douyu.otf deleted file mode 100644 index 3d9732ce..00000000 Binary files a/QuickLocation/Resource/Font/douyu.otf and /dev/null differ diff --git a/QuickLocation/Resource/Font/pmzd.ttf b/QuickLocation/Resource/Font/pmzd.ttf deleted file mode 100644 index 0118a4bd..00000000 Binary files a/QuickLocation/Resource/Font/pmzd.ttf and /dev/null differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/1-001.png b/QuickLocation/Resource/lotties/emoji/fun/png/1-001.png index 43cedf11..6b337a4f 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/1-001.png and b/QuickLocation/Resource/lotties/emoji/fun/png/1-001.png differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/10-020.png b/QuickLocation/Resource/lotties/emoji/fun/png/10-020.png index 9f41456b..b1987016 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/10-020.png and b/QuickLocation/Resource/lotties/emoji/fun/png/10-020.png differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/11-043.png b/QuickLocation/Resource/lotties/emoji/fun/png/11-043.png index 45832f31..a9455a6d 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/11-043.png and b/QuickLocation/Resource/lotties/emoji/fun/png/11-043.png differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/13-005.png b/QuickLocation/Resource/lotties/emoji/fun/png/13-005.png index 6330bbd9..b50aab58 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/13-005.png and b/QuickLocation/Resource/lotties/emoji/fun/png/13-005.png differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/14-145.png b/QuickLocation/Resource/lotties/emoji/fun/png/14-145.png index 9a5ea165..31eec5d0 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/14-145.png and b/QuickLocation/Resource/lotties/emoji/fun/png/14-145.png differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/15-073.png b/QuickLocation/Resource/lotties/emoji/fun/png/15-073.png index 239e8801..1df06903 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/15-073.png and b/QuickLocation/Resource/lotties/emoji/fun/png/15-073.png differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/16-031.png b/QuickLocation/Resource/lotties/emoji/fun/png/16-031.png index 30e7cb75..3a607eb8 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/16-031.png and b/QuickLocation/Resource/lotties/emoji/fun/png/16-031.png differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/17-034.png b/QuickLocation/Resource/lotties/emoji/fun/png/17-034.png index dcc1cebc..28b650e6 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/17-034.png and b/QuickLocation/Resource/lotties/emoji/fun/png/17-034.png differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/18-092.png b/QuickLocation/Resource/lotties/emoji/fun/png/18-092.png index 910372f2..0e52927c 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/18-092.png and b/QuickLocation/Resource/lotties/emoji/fun/png/18-092.png differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/19-124.png b/QuickLocation/Resource/lotties/emoji/fun/png/19-124.png index e50cbeb8..6b121cb4 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/19-124.png and b/QuickLocation/Resource/lotties/emoji/fun/png/19-124.png differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/2-002.png b/QuickLocation/Resource/lotties/emoji/fun/png/2-002.png index f94aa228..df406932 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/2-002.png and b/QuickLocation/Resource/lotties/emoji/fun/png/2-002.png differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/3-029.png b/QuickLocation/Resource/lotties/emoji/fun/png/3-029.png index 96c00671..5710f6ec 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/3-029.png and b/QuickLocation/Resource/lotties/emoji/fun/png/3-029.png differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/4-005.png b/QuickLocation/Resource/lotties/emoji/fun/png/4-005.png index 9ebb5dc7..2db51975 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/4-005.png and b/QuickLocation/Resource/lotties/emoji/fun/png/4-005.png differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/5-046.png b/QuickLocation/Resource/lotties/emoji/fun/png/5-046.png index da4a5dce..2f314657 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/5-046.png and b/QuickLocation/Resource/lotties/emoji/fun/png/5-046.png differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/6-021.png b/QuickLocation/Resource/lotties/emoji/fun/png/6-021.png index 513fb700..abe94bd0 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/6-021.png and b/QuickLocation/Resource/lotties/emoji/fun/png/6-021.png differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/7-030.png b/QuickLocation/Resource/lotties/emoji/fun/png/7-030.png index 03ce1c20..c80fdb66 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/7-030.png and b/QuickLocation/Resource/lotties/emoji/fun/png/7-030.png differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/8-033.png b/QuickLocation/Resource/lotties/emoji/fun/png/8-033.png index 8e71d68a..36d838bb 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/8-033.png and b/QuickLocation/Resource/lotties/emoji/fun/png/8-033.png differ diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/9-166.png b/QuickLocation/Resource/lotties/emoji/fun/png/9-166.png index fa4d340d..8143a9a3 100644 Binary files a/QuickLocation/Resource/lotties/emoji/fun/png/9-166.png and b/QuickLocation/Resource/lotties/emoji/fun/png/9-166.png differ diff --git a/QuickLocation/Resource/lotties/emoji/images/register_tip2_img_0.png b/QuickLocation/Resource/lotties/emoji/images/register_tip2_img_0.png index 5c4970ce..1afd59e6 100644 Binary files a/QuickLocation/Resource/lotties/emoji/images/register_tip2_img_0.png and b/QuickLocation/Resource/lotties/emoji/images/register_tip2_img_0.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/angry-face-emoji-027.png b/QuickLocation/Resource/lotties/emoji/normal/png/angry-face-emoji-027.png index cb1eec94..e8d8bba7 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/angry-face-emoji-027.png and b/QuickLocation/Resource/lotties/emoji/normal/png/angry-face-emoji-027.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/broken-face-emoji-142.png b/QuickLocation/Resource/lotties/emoji/normal/png/broken-face-emoji-142.png index 50aef8f6..009a1d50 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/broken-face-emoji-142.png and b/QuickLocation/Resource/lotties/emoji/normal/png/broken-face-emoji-142.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/chill-face-emoji-073.png b/QuickLocation/Resource/lotties/emoji/normal/png/chill-face-emoji-073.png index a4864aac..0149cb54 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/chill-face-emoji-073.png and b/QuickLocation/Resource/lotties/emoji/normal/png/chill-face-emoji-073.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/cold-face-emoji-103.png b/QuickLocation/Resource/lotties/emoji/normal/png/cold-face-emoji-103.png index ef9b0840..38346bfb 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/cold-face-emoji-103.png and b/QuickLocation/Resource/lotties/emoji/normal/png/cold-face-emoji-103.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/crying-face-emoji-121.png b/QuickLocation/Resource/lotties/emoji/normal/png/crying-face-emoji-121.png index 270ea28d..2ec16738 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/crying-face-emoji-121.png and b/QuickLocation/Resource/lotties/emoji/normal/png/crying-face-emoji-121.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/devil-face-emoji-125.png b/QuickLocation/Resource/lotties/emoji/normal/png/devil-face-emoji-125.png index 6dfe80ec..32c26ca5 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/devil-face-emoji-125.png and b/QuickLocation/Resource/lotties/emoji/normal/png/devil-face-emoji-125.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/dizzy-face-emoji-118.png b/QuickLocation/Resource/lotties/emoji/normal/png/dizzy-face-emoji-118.png index 4f78c8d9..f93df7fa 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/dizzy-face-emoji-118.png and b/QuickLocation/Resource/lotties/emoji/normal/png/dizzy-face-emoji-118.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/driving-face-emoji-085.png b/QuickLocation/Resource/lotties/emoji/normal/png/driving-face-emoji-085.png index 0eced827..3765781d 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/driving-face-emoji-085.png and b/QuickLocation/Resource/lotties/emoji/normal/png/driving-face-emoji-085.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/eating-popcorn-073.png b/QuickLocation/Resource/lotties/emoji/normal/png/eating-popcorn-073.png index 05a2e91c..51cb2c50 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/eating-popcorn-073.png and b/QuickLocation/Resource/lotties/emoji/normal/png/eating-popcorn-073.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/face-holding-tears-100.png b/QuickLocation/Resource/lotties/emoji/normal/png/face-holding-tears-100.png index f0617445..4f1d6535 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/face-holding-tears-100.png and b/QuickLocation/Resource/lotties/emoji/normal/png/face-holding-tears-100.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/face-using-laptop-009.png b/QuickLocation/Resource/lotties/emoji/normal/png/face-using-laptop-009.png index 0fb8c3b7..20cf836d 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/face-using-laptop-009.png and b/QuickLocation/Resource/lotties/emoji/normal/png/face-using-laptop-009.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/face-with-hearts-162.png b/QuickLocation/Resource/lotties/emoji/normal/png/face-with-hearts-162.png index fb1b9407..3b45c32d 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/face-with-hearts-162.png and b/QuickLocation/Resource/lotties/emoji/normal/png/face-with-hearts-162.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/fearful-face-emoji-108.png b/QuickLocation/Resource/lotties/emoji/normal/png/fearful-face-emoji-108.png index 11da70ff..8be590fd 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/fearful-face-emoji-108.png and b/QuickLocation/Resource/lotties/emoji/normal/png/fearful-face-emoji-108.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/heart-eyes-107.png b/QuickLocation/Resource/lotties/emoji/normal/png/heart-eyes-107.png index aaf51bdc..9dbcfbe3 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/heart-eyes-107.png and b/QuickLocation/Resource/lotties/emoji/normal/png/heart-eyes-107.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/heart-hand-075.png b/QuickLocation/Resource/lotties/emoji/normal/png/heart-hand-075.png index fecbb734..74f69afd 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/heart-hand-075.png and b/QuickLocation/Resource/lotties/emoji/normal/png/heart-hand-075.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/hi-face-emoji-129.png b/QuickLocation/Resource/lotties/emoji/normal/png/hi-face-emoji-129.png index d438d773..c5f2daef 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/hi-face-emoji-129.png and b/QuickLocation/Resource/lotties/emoji/normal/png/hi-face-emoji-129.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/hot-face-emoji-112.png b/QuickLocation/Resource/lotties/emoji/normal/png/hot-face-emoji-112.png index 40648532..280262c6 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/hot-face-emoji-112.png and b/QuickLocation/Resource/lotties/emoji/normal/png/hot-face-emoji-112.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/house-face-emoji-169.png b/QuickLocation/Resource/lotties/emoji/normal/png/house-face-emoji-169.png index 4c8a11ca..c0041a20 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/house-face-emoji-169.png and b/QuickLocation/Resource/lotties/emoji/normal/png/house-face-emoji-169.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/kiss-face-emoji-178.png b/QuickLocation/Resource/lotties/emoji/normal/png/kiss-face-emoji-178.png index c32b9988..f25165b6 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/kiss-face-emoji-178.png and b/QuickLocation/Resource/lotties/emoji/normal/png/kiss-face-emoji-178.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/laughing-face-emoji-136.png b/QuickLocation/Resource/lotties/emoji/normal/png/laughing-face-emoji-136.png index ab9c84ae..93695884 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/laughing-face-emoji-136.png and b/QuickLocation/Resource/lotties/emoji/normal/png/laughing-face-emoji-136.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/liar-face-emoji-128.png b/QuickLocation/Resource/lotties/emoji/normal/png/liar-face-emoji-128.png index 1abda677..a8fe47fe 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/liar-face-emoji-128.png and b/QuickLocation/Resource/lotties/emoji/normal/png/liar-face-emoji-128.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/lifiting-face-emoji-111.png b/QuickLocation/Resource/lotties/emoji/normal/png/lifiting-face-emoji-111.png index 9ecdc3f0..fb72e449 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/lifiting-face-emoji-111.png and b/QuickLocation/Resource/lotties/emoji/normal/png/lifiting-face-emoji-111.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/like-face-emoji-077.png b/QuickLocation/Resource/lotties/emoji/normal/png/like-face-emoji-077.png index 45ffeeef..60ad66a2 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/like-face-emoji-077.png and b/QuickLocation/Resource/lotties/emoji/normal/png/like-face-emoji-077.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/looking-face-emoji-137.png b/QuickLocation/Resource/lotties/emoji/normal/png/looking-face-emoji-137.png index 95547ace..527b2494 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/looking-face-emoji-137.png and b/QuickLocation/Resource/lotties/emoji/normal/png/looking-face-emoji-137.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/nervous-face-emoji-121.png b/QuickLocation/Resource/lotties/emoji/normal/png/nervous-face-emoji-121.png index 3e2c5988..6c5604e1 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/nervous-face-emoji-121.png and b/QuickLocation/Resource/lotties/emoji/normal/png/nervous-face-emoji-121.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/no-face-emoji-133.png b/QuickLocation/Resource/lotties/emoji/normal/png/no-face-emoji-133.png index 4800be4c..d3bf2d4c 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/no-face-emoji-133.png and b/QuickLocation/Resource/lotties/emoji/normal/png/no-face-emoji-133.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/ok-emoji-081.png b/QuickLocation/Resource/lotties/emoji/normal/png/ok-emoji-081.png index 58c09612..4adf4bc4 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/ok-emoji-081.png and b/QuickLocation/Resource/lotties/emoji/normal/png/ok-emoji-081.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/party-face-emoji-078.png b/QuickLocation/Resource/lotties/emoji/normal/png/party-face-emoji-078.png index 56632811..4d08027f 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/party-face-emoji-078.png and b/QuickLocation/Resource/lotties/emoji/normal/png/party-face-emoji-078.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/peace-emoji-090.png b/QuickLocation/Resource/lotties/emoji/normal/png/peace-emoji-090.png index 33bd15d2..0ecfd5c3 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/peace-emoji-090.png and b/QuickLocation/Resource/lotties/emoji/normal/png/peace-emoji-090.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/phone-call-141.png b/QuickLocation/Resource/lotties/emoji/normal/png/phone-call-141.png index 910c7842..78bb0774 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/phone-call-141.png and b/QuickLocation/Resource/lotties/emoji/normal/png/phone-call-141.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/plane-face-emoji-124.png b/QuickLocation/Resource/lotties/emoji/normal/png/plane-face-emoji-124.png index e84b2deb..1a521613 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/plane-face-emoji-124.png and b/QuickLocation/Resource/lotties/emoji/normal/png/plane-face-emoji-124.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/question-face-emoji-167.png b/QuickLocation/Resource/lotties/emoji/normal/png/question-face-emoji-167.png index 11185188..516fb9aa 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/question-face-emoji-167.png and b/QuickLocation/Resource/lotties/emoji/normal/png/question-face-emoji-167.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/read-book-092.png b/QuickLocation/Resource/lotties/emoji/normal/png/read-book-092.png index c47586ed..fc9423ec 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/read-book-092.png and b/QuickLocation/Resource/lotties/emoji/normal/png/read-book-092.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/rose-face-emoji-114.png b/QuickLocation/Resource/lotties/emoji/normal/png/rose-face-emoji-114.png index a2307e8f..45266be2 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/rose-face-emoji-114.png and b/QuickLocation/Resource/lotties/emoji/normal/png/rose-face-emoji-114.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/sleep-face-emoji-091.png b/QuickLocation/Resource/lotties/emoji/normal/png/sleep-face-emoji-091.png index 95082bb8..a2cb3086 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/sleep-face-emoji-091.png and b/QuickLocation/Resource/lotties/emoji/normal/png/sleep-face-emoji-091.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/thumb-down-091.png b/QuickLocation/Resource/lotties/emoji/normal/png/thumb-down-091.png index 07a2b6e4..cf84893b 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/thumb-down-091.png and b/QuickLocation/Resource/lotties/emoji/normal/png/thumb-down-091.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/tongue-face-emoji-044.png b/QuickLocation/Resource/lotties/emoji/normal/png/tongue-face-emoji-044.png index 4afe0aea..57e995d1 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/tongue-face-emoji-044.png and b/QuickLocation/Resource/lotties/emoji/normal/png/tongue-face-emoji-044.png differ diff --git a/QuickLocation/Resource/lotties/emoji/normal/png/yoga-face-emoji-156.png b/QuickLocation/Resource/lotties/emoji/normal/png/yoga-face-emoji-156.png index 9da544f7..2eab999d 100644 Binary files a/QuickLocation/Resource/lotties/emoji/normal/png/yoga-face-emoji-156.png and b/QuickLocation/Resource/lotties/emoji/normal/png/yoga-face-emoji-156.png differ diff --git a/QuickLocation/Resource/video/search_interlude.mp4 b/QuickLocation/Resource/video/search_interlude.mp4 index e5e58ce4..d7eaa242 100644 Binary files a/QuickLocation/Resource/video/search_interlude.mp4 and b/QuickLocation/Resource/video/search_interlude.mp4 differ diff --git a/QuickLocation/Section/Group/CreateGroup/CreateGroupView.swift b/QuickLocation/Section/Group/CreateGroup/CreateGroupView.swift index 23e4e440..23134e87 100644 --- a/QuickLocation/Section/Group/CreateGroup/CreateGroupView.swift +++ b/QuickLocation/Section/Group/CreateGroup/CreateGroupView.swift @@ -43,17 +43,11 @@ class CreateGroupView: UIView { } }) .disposed(by: disposeBag) - - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) } private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(submitBtn) addSubview(titleLab) @@ -80,23 +74,12 @@ class CreateGroupView: UIView { .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - titleLab.layoutChain - .topToBottomOfView(navBarView, offset: 20) + .topToBottomOfView(navView, offset: 20) .left(15) submitBtn.layoutChain @@ -187,26 +170,9 @@ class CreateGroupView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "创建圈子" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "创建圈子") + return nav }() lazy var titleLab: UILabel = { diff --git a/QuickLocation/Section/Group/CreateGroup/GroupIconListView.swift b/QuickLocation/Section/Group/CreateGroup/GroupIconListView.swift index 760c5fd9..4b99eb14 100644 --- a/QuickLocation/Section/Group/CreateGroup/GroupIconListView.swift +++ b/QuickLocation/Section/Group/CreateGroup/GroupIconListView.swift @@ -23,18 +23,11 @@ class GroupIconListView: UIView { private var iconImgList: [UIImage] = [] private func setupRx() { - - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) } private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) - navBarView.addSubview(doneBtn) + addSubview(navView) addSubview(selectedIconView) addSubview(titleLab) addSubview(iconCollectionView) @@ -43,27 +36,12 @@ class GroupIconListView: UIView { .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - - doneBtn.layoutChain - .centerY(navTitleLabel) - .right(15) - selectedIconView.layoutChain - .topToBottomOfView(navBarView, offset: 30) + .topToBottomOfView(navView, offset: 30) .centerX() .width(80) .height(80) @@ -76,8 +54,6 @@ class GroupIconListView: UIView { .topToBottomOfView(titleLab, offset: 13) .edgesHorzontal(40) .bottom(kSafeBottomMargin + 10) - - doneBtn.sizeToFit() } lazy var navBgView: UIImageView = { @@ -87,26 +63,10 @@ class GroupIconListView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "更换图标" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "更换图标") + nav.addRightButton(doneBtn) + return nav }() lazy var doneBtn: UIButton = { diff --git a/QuickLocation/Section/Group/GroupChat/GroupChatView.swift b/QuickLocation/Section/Group/GroupChat/GroupChatView.swift index 3d8b36ce..cc231cc4 100644 --- a/QuickLocation/Section/Group/GroupChat/GroupChatView.swift +++ b/QuickLocation/Section/Group/GroupChat/GroupChatView.swift @@ -10,6 +10,7 @@ import RxSwift import RxCocoa import Lottie import AVFoundation +import SwiftDate enum VoiceRecordState { case began @@ -883,14 +884,10 @@ final class ChatBubbleActionMenu: UIView { private func chatFormatTime(_ t: TimeInterval) -> String { let date = Date(timeIntervalSince1970: t) - let now = Date() - let calendar = Calendar.current - let f = DateFormatter() - if calendar.isDateInToday(date) { f.dateFormat = "HH:mm" } - else if calendar.isDateInYesterday(date) { f.dateFormat = "'昨天' HH:mm" } - else if calendar.isDate(date, equalTo: now, toGranularity: .year) { f.dateFormat = "M-d HH:mm" } - else { f.dateFormat = "yyyy-M-d HH:mm" } - return f.string(from: date) + if date.isToday { return date.toFormat("HH:mm") } + if date.isYesterday { return date.toFormat("'昨天' HH:mm") } + if Calendar.current.isDate(date, equalTo: Date(), toGranularity: .year) { return date.toFormat("M-d HH:mm") } + return date.toFormat("yyyy-M-d HH:mm") } // MARK: - 发送的消息cell @@ -1163,22 +1160,10 @@ final class NotificationMsgCell: UITableViewCell { func configure(_ text: NSAttributedString, showTime: Bool, timestamp: TimeInterval) { timeLabel.isHidden = !showTime - timeLabel.text = showTime ? formatTime(timestamp) : nil + timeLabel.text = showTime ? chatFormatTime(timestamp) : nil contentLabel.attributedText = text } - private func formatTime(_ t: TimeInterval) -> String { - let date = Date(timeIntervalSince1970: t) - let now = Date() - let calendar = Calendar.current - let f = DateFormatter() - if calendar.isDateInToday(date) { f.dateFormat = "HH:mm" } - else if calendar.isDateInYesterday(date) { f.dateFormat = "'昨天' HH:mm" } - else if calendar.isDate(date, equalTo: now, toGranularity: .year) { f.dateFormat = "M-d HH:mm" } - else { f.dateFormat = "yyyy-M-d HH:mm" } - return f.string(from: date) - } - private let timeLabel: UILabel = { let label = UILabel() label.font = .systemFont(ofSize: 12) @@ -1280,7 +1265,7 @@ final class EmojiSendMsgCell: UITableViewCell { func configure(_ msg: ChatMessage) { timeLabel.isHidden = !msg.showTime - timeLabel.text = msg.showTime ? formatTime(msg.timestamp) : nil + timeLabel.text = msg.showTime ? chatFormatTime(msg.timestamp) : nil avatarView.image = msg.avatar let index = Int(msg.content.replacingOccurrences(of: "js_emoji:", with: "")) ?? 0 guard Self.emojiFileNames.indices.contains(index) else { @@ -1321,18 +1306,6 @@ final class EmojiSendMsgCell: UITableViewCell { lottieView.stop() lottieView.animation = nil } - - private func formatTime(_ t: TimeInterval) -> String { - let date = Date(timeIntervalSince1970: t) - let now = Date() - let calendar = Calendar.current - let f = DateFormatter() - if calendar.isDateInToday(date) { f.dateFormat = "HH:mm" } - else if calendar.isDateInYesterday(date) { f.dateFormat = "'昨天' HH:mm" } - else if calendar.isDate(date, equalTo: now, toGranularity: .year) { f.dateFormat = "M-d HH:mm" } - else { f.dateFormat = "yyyy-M-d HH:mm" } - return f.string(from: date) - } } // MARK: - 收到的表情消息 @@ -1409,7 +1382,7 @@ final class EmojiReceivedMsgCell: UITableViewCell { func configure(_ msg: ChatMessage) { timeLabel.isHidden = !msg.showTime - timeLabel.text = msg.showTime ? formatTime(msg.timestamp) : nil + timeLabel.text = msg.showTime ? chatFormatTime(msg.timestamp) : nil avatarView.image = msg.avatar nameLabel.text = msg.senderName let index = Int(msg.content.replacingOccurrences(of: "js_emoji:", with: "")) ?? 0 @@ -1451,18 +1424,6 @@ final class EmojiReceivedMsgCell: UITableViewCell { lottieView.stop() lottieView.animation = nil } - - private func formatTime(_ t: TimeInterval) -> String { - let date = Date(timeIntervalSince1970: t) - let now = Date() - let calendar = Calendar.current - let f = DateFormatter() - if calendar.isDateInToday(date) { f.dateFormat = "HH:mm" } - else if calendar.isDateInYesterday(date) { f.dateFormat = "'昨天' HH:mm" } - else if calendar.isDate(date, equalTo: now, toGranularity: .year) { f.dateFormat = "M-d HH:mm" } - else { f.dateFormat = "yyyy-M-d HH:mm" } - return f.string(from: date) - } } // MARK: - UICollectionViewDelegate (page control) extension GroupChatView: UICollectionViewDelegate { @@ -1585,7 +1546,7 @@ final class VoiceSendMsgCell: UITableViewCell, VoicePlaybackView { func configure(_ msg: ChatMessage) { timeLabel.isHidden = !msg.showTime - timeLabel.text = msg.showTime ? formatTime(msg.timestamp) : nil + timeLabel.text = msg.showTime ? chatFormatTime(msg.timestamp) : nil avatarView.image = msg.avatar let dur = msg.content.int / 1000 durationLabel.text = dur > 0 ? "\(dur)''" : "" @@ -1617,18 +1578,6 @@ final class VoiceSendMsgCell: UITableViewCell, VoicePlaybackView { playAnimation.stop() } - private func formatTime(_ t: TimeInterval) -> String { - let date = Date(timeIntervalSince1970: t) - let now = Date() - let calendar = Calendar.current - let f = DateFormatter() - if calendar.isDateInToday(date) { f.dateFormat = "HH:mm" } - else if calendar.isDateInYesterday(date) { f.dateFormat = "'昨天' HH:mm" } - else if calendar.isDate(date, equalTo: now, toGranularity: .year) { f.dateFormat = "M-d HH:mm" } - else { f.dateFormat = "yyyy-M-d HH:mm" } - return f.string(from: date) - } - override func layoutSubviews() { super.layoutSubviews() bubbleView.setNeedsLayout() @@ -1644,7 +1593,7 @@ final class VoiceReceivedMsgCell: UITableViewCell, VoicePlaybackView { func configure(_ msg: ChatMessage) { timeLabel.isHidden = !msg.showTime - timeLabel.text = msg.showTime ? formatTime(msg.timestamp) : nil + timeLabel.text = msg.showTime ? chatFormatTime(msg.timestamp) : nil avatarView.image = msg.avatar nameLabel.text = msg.senderName let dur = msg.content.int / 1000 @@ -1672,18 +1621,6 @@ final class VoiceReceivedMsgCell: UITableViewCell, VoicePlaybackView { func play() { playAnimation.play() } func stop() { playAnimation.stop() } - private func formatTime(_ t: TimeInterval) -> String { - let date = Date(timeIntervalSince1970: t) - let now = Date() - let calendar = Calendar.current - let f = DateFormatter() - if calendar.isDateInToday(date) { f.dateFormat = "HH:mm" } - else if calendar.isDateInYesterday(date) { f.dateFormat = "'昨天' HH:mm" } - else if calendar.isDate(date, equalTo: now, toGranularity: .year) { f.dateFormat = "M-d HH:mm" } - else { f.dateFormat = "yyyy-M-d HH:mm" } - return f.string(from: date) - } - private let timeLabel: UILabel = { let label = UILabel() label.font = .systemFont(ofSize: 12) @@ -1803,10 +1740,9 @@ final class ImageSendMsgCell: UITableViewCell { func configure(_ msg: ChatMessage) { timeLabel.isHidden = !msg.showTime - timeLabel.text = msg.showTime ? formatTime(msg.timestamp) : nil + timeLabel.text = msg.showTime ? chatFormatTime(msg.timestamp) : nil avatarView.image = msg.avatar if !msg.imageUrl.isEmpty { - // 优先加载本地文件路径，否则走网络加载 if let localImage = UIImage(contentsOfFile: msg.imageUrl) { photoView.image = localImage } else { @@ -1827,27 +1763,6 @@ final class ImageSendMsgCell: UITableViewCell { return v }() - private static func displaySize(w: CGFloat, h: CGFloat) -> CGSize { - guard w > 0, h > 0 else { return CGSize(width: 160, height: 160) } - let maxW: CGFloat = 200, maxH: CGFloat = 250, minW: CGFloat = 80 - var dw = maxW, dh = dw * (h / w) - if dh > maxH { dh = maxH; dw = dh * (w / h) } - if dw < minW { dw = minW; dh = dw * (h / w) } - return CGSize(width: dw, height: dh) - } - - private func formatTime(_ t: TimeInterval) -> String { - let date = Date(timeIntervalSince1970: t) - let now = Date() - let calendar = Calendar.current - let f = DateFormatter() - if calendar.isDateInToday(date) { f.dateFormat = "HH:mm" } - else if calendar.isDateInYesterday(date) { f.dateFormat = "'昨天' HH:mm" } - else if calendar.isDate(date, equalTo: now, toGranularity: .year) { f.dateFormat = "M-d HH:mm" } - else { f.dateFormat = "yyyy-M-d HH:mm" } - return f.string(from: date) - } - private let timeLabel: UILabel = { let label = UILabel() label.font = .systemFont(ofSize: 12) @@ -1913,7 +1828,7 @@ final class ImageReceivedMsgCell: UITableViewCell { func configure(_ msg: ChatMessage) { timeLabel.isHidden = !msg.showTime - timeLabel.text = msg.showTime ? formatTime(msg.timestamp) : nil + timeLabel.text = msg.showTime ? chatFormatTime(msg.timestamp) : nil avatarView.image = msg.avatar nameLabel.text = msg.senderName if !msg.imageUrl.isEmpty { @@ -1924,27 +1839,6 @@ final class ImageReceivedMsgCell: UITableViewCell { @objc private func onTap() { onImageTap?() } - private static func displaySize(w: CGFloat, h: CGFloat) -> CGSize { - guard w > 0, h > 0 else { return CGSize(width: 160, height: 160) } - let maxW: CGFloat = 200, maxH: CGFloat = 250, minW: CGFloat = 80 - var dw = maxW, dh = dw * (h / w) - if dh > maxH { dh = maxH; dw = dh * (w / h) } - if dw < minW { dw = minW; dh = dw * (h / w) } - return CGSize(width: dw, height: dh) - } - - private func formatTime(_ t: TimeInterval) -> String { - let date = Date(timeIntervalSince1970: t) - let now = Date() - let calendar = Calendar.current - let f = DateFormatter() - if calendar.isDateInToday(date) { f.dateFormat = "HH:mm" } - else if calendar.isDateInYesterday(date) { f.dateFormat = "'昨天' HH:mm" } - else if calendar.isDate(date, equalTo: now, toGranularity: .year) { f.dateFormat = "M-d HH:mm" } - else { f.dateFormat = "yyyy-M-d HH:mm" } - return f.string(from: date) - } - private let timeLabel: UILabel = { let label = UILabel() label.font = .systemFont(ofSize: 12) diff --git a/QuickLocation/Section/Group/GroupInfo/GroupInfoView.swift b/QuickLocation/Section/Group/GroupInfo/GroupInfoView.swift index aa908ed5..2f3f602f 100644 --- a/QuickLocation/Section/Group/GroupInfo/GroupInfoView.swift +++ b/QuickLocation/Section/Group/GroupInfo/GroupInfoView.swift @@ -24,17 +24,11 @@ class GroupInfoView: UIView { } private func setupRx() { - - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) } private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(groupIcon) addSubview(groupNameLab) @@ -46,23 +40,12 @@ class GroupInfoView: UIView { .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - groupIcon.layoutChain - .topToBottomOfView(navBarView, offset: 24) + .topToBottomOfView(navView, offset: 24) .width(80) .height(80) .centerX() @@ -92,26 +75,9 @@ class GroupInfoView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "圈子资料" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "圈子资料") + return nav }() lazy var groupIcon: UIImageView = { diff --git a/QuickLocation/Section/Group/GroupMemberList/GroupMemberListView.swift b/QuickLocation/Section/Group/GroupMemberList/GroupMemberListView.swift index af649990..74f0db87 100644 --- a/QuickLocation/Section/Group/GroupMemberList/GroupMemberListView.swift +++ b/QuickLocation/Section/Group/GroupMemberList/GroupMemberListView.swift @@ -8,6 +8,7 @@ import UIKit import RxSwift import RxCocoa +import SwiftDate class GroupMemberListView: UIView { @@ -22,10 +23,6 @@ class GroupMemberListView: UIView { } private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) - collectionView.rx.contentOffset .subscribe(onNext: { [weak self] _ in self?.updateArrowVisibility() @@ -35,9 +32,7 @@ class GroupMemberListView: UIView { // 选中日期变化时更新月份 selectedDate.subscribe(onNext: { [weak self] date in guard let self = self else { return } - let fmt = DateFormatter() - fmt.dateFormat = "MM月" - self.monthLab.text = fmt.string(from: date) + self.monthLab.text = date.toFormat("MM月") }).disposed(by: disposeBag) // 往前/往后翻 7 天 @@ -58,9 +53,7 @@ class GroupMemberListView: UIView { private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(memberArrowLeft) addSubview(collectionView) @@ -71,23 +64,12 @@ class GroupMemberListView: UIView { .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - collectionView.layoutChain - .topToBottomOfView(navBarView, offset: 0) + .topToBottomOfView(navView, offset: 0) .height(90) .edgesHorzontal(28) @@ -115,26 +97,9 @@ class GroupMemberListView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "圈子成员" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "圈子成员") + return nav }() // MARK: - 成员列表 diff --git a/QuickLocation/Section/Group/GroupMemberList/ItineraryTraceVC.swift b/QuickLocation/Section/Group/GroupMemberList/ItineraryTraceVC.swift index a8ae0c46..cee7cece 100644 --- a/QuickLocation/Section/Group/GroupMemberList/ItineraryTraceVC.swift +++ b/QuickLocation/Section/Group/GroupMemberList/ItineraryTraceVC.swift @@ -12,6 +12,7 @@ import ObjectMapper import SwiftyUserDefaults import AMapNaviKit import AMapSearchKit +import SwiftDate class ItineraryTraceVC: BaseViewController { @@ -425,9 +426,7 @@ class ItineraryTraceVC: BaseViewController { private func eventTimeText(_ timestamp: Int64) -> String { let seconds = timestamp > 10_000_000_000 ? Double(timestamp) / 1000.0 : Double(timestamp) - let formatter = DateFormatter() - formatter.dateFormat = "HH:mm" - return formatter.string(from: Date(timeIntervalSince1970: seconds)) + return Date(timeIntervalSince1970: seconds).toFormat("HH:mm") } private static func playbackAvatarImage(_ image: UIImage) -> UIImage? { diff --git a/QuickLocation/Section/Group/GroupSetting/GroupSettingView.swift b/QuickLocation/Section/Group/GroupSetting/GroupSettingView.swift index eaefd82c..662dbd08 100644 --- a/QuickLocation/Section/Group/GroupSetting/GroupSettingView.swift +++ b/QuickLocation/Section/Group/GroupSetting/GroupSettingView.swift @@ -15,7 +15,7 @@ class GroupSettingView: UIView { var disposeBag = DisposeBag() func setupData(_ model: GroupInfoModel) { - navTitleLabel.text = model.name + navView.titleLabel.text = model.name groupNameLab.text = model.name groupIcon.image = model.groupIcon groupDescLab.text = model.description.isEmpty ? "暂无描述" : model.description @@ -40,16 +40,11 @@ class GroupSettingView: UIView { } private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) } private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(scrollView) scrollView.addSubview(scrollContentView) @@ -64,23 +59,12 @@ class GroupSettingView: UIView { .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - scrollView.layoutChain - .topToBottomOfView(navBarView) + .topToBottomOfView(navView) .edges(excludingEdge: .top) scrollContentView.layoutChain @@ -129,25 +113,9 @@ class GroupSettingView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "") + return nav }() lazy var scrollView: UIScrollView = { diff --git a/QuickLocation/Section/Group/GroupView.swift b/QuickLocation/Section/Group/GroupView.swift index 4ae08331..932313e5 100644 --- a/QuickLocation/Section/Group/GroupView.swift +++ b/QuickLocation/Section/Group/GroupView.swift @@ -10,6 +10,7 @@ import RxSwift import RxCocoa import SDCycleScrollView import OpenIMSDK +import SwiftDate // MARK: - PanScrollView（参考 PanScrollView，允许嵌套手势同时识别） class PanScrollView: UIScrollView { @@ -35,9 +36,8 @@ class GroupView: UIView { // MARK: - Setup private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(scanBtn) + addSubview(navView) + navView.addRightButton(scanBtn) addSubview(mainScrollView) mainScrollView.addSubview(contentView) @@ -60,18 +60,9 @@ class GroupView: UIView { .edges(excludingEdge: .bottom) .height(kNaviHeight) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerX() - - scanBtn.layoutChain - .right(15) - .centerY(navTitleLabel) - .width(24).height(24) mainScrollView.layoutChain .topToBottomOfView(navBgView) @@ -169,21 +160,8 @@ class GroupView: UIView { iv.contentMode = .scaleAspectFill return iv }() - - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "圈子" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() + lazy var navView = BaseNavigationView(title: "圈子") lazy var scanBtn: UIButton = { let btn = UIButton(type: .custom) @@ -634,22 +612,9 @@ final class CircleGroupCell: UITableViewCell { // MARK: - Date IM format private extension Date { func formatForIM() -> String { - let now = Date() - let calendar = Calendar.current - if calendar.isDateInToday(self) { - let f = DateFormatter() - f.dateFormat = "HH:mm" - return f.string(from: self) - } else if calendar.isDateInYesterday(self) { - return "昨天" - } else if calendar.isDate(self, equalTo: now, toGranularity: .year) { - let f = DateFormatter() - f.dateFormat = "MM/dd" - return f.string(from: self) - } else { - let f = DateFormatter() - f.dateFormat = "yyyy/MM/dd" - return f.string(from: self) - } + if isToday { return toFormat("HH:mm") } + if isYesterday { return "昨天" } + if Calendar.current.isDate(self, equalTo: Date(), toGranularity: .year) { return toFormat("MM/dd") } + return toFormat("yyyy/MM/dd") } } diff --git a/QuickLocation/Section/Group/InviteJoin/InviteJoinView.swift b/QuickLocation/Section/Group/InviteJoin/InviteJoinView.swift index 98c3c5d8..8b67a964 100644 --- a/QuickLocation/Section/Group/InviteJoin/InviteJoinView.swift +++ b/QuickLocation/Section/Group/InviteJoin/InviteJoinView.swift @@ -20,17 +20,11 @@ class InviteJoinView: UIView { UIPasteboard.general.string = code DLToast.showSuccess(text: "已复制") }.disposed(by: disposeBag) - - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) } private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(groupIcon) addSubview(groupNameLab) addSubview(inviteInfoView) @@ -50,23 +44,12 @@ class InviteJoinView: UIView { .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - groupIcon.layoutChain - .topToBottomOfView(navBarView, offset: 24) + .topToBottomOfView(navView, offset: 24) .width(80) .height(80) .centerX() @@ -139,26 +122,9 @@ class InviteJoinView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "邀请成员" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "邀请成员") + return nav }() lazy var groupIcon: UIImageView = { diff --git a/QuickLocation/Section/Group/Join/JoinGroupView.swift b/QuickLocation/Section/Group/Join/JoinGroupView.swift index a9388fba..d2be5760 100644 --- a/QuickLocation/Section/Group/Join/JoinGroupView.swift +++ b/QuickLocation/Section/Group/Join/JoinGroupView.swift @@ -51,19 +51,12 @@ class JoinGroupView: UIView { }) .disposed(by: disposeBag) - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) - } private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) - navBarView.addSubview(scanBtn) + addSubview(navView) addSubview(titleLab) addSubview(number1) addSubview(number2) @@ -80,28 +73,12 @@ class JoinGroupView: UIView { .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - scanBtn.layoutChain - .right(15) - .centerY(navTitleLabel) - .width(24).height(24) - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - titleLab.layoutChain - .topToBottomOfView(navBarView, offset: 21) + .topToBottomOfView(navView, offset: 21) .centerX() lineView.layoutChain @@ -164,26 +141,10 @@ class JoinGroupView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "加入圈子" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "加入圈子") + nav.addRightButton(scanBtn) + return nav }() lazy var scanBtn: UIButton = { diff --git a/QuickLocation/Section/Group/RemoveMember/RemoveMemberView.swift b/QuickLocation/Section/Group/RemoveMember/RemoveMemberView.swift index 1e21a8ae..b1fc9339 100644 --- a/QuickLocation/Section/Group/RemoveMember/RemoveMemberView.swift +++ b/QuickLocation/Section/Group/RemoveMember/RemoveMemberView.swift @@ -16,17 +16,11 @@ class RemoveMemberView: UIView { static let rowHeight: CGFloat = 85 private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) } private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) - navBarView.addSubview(deleteBtn) + addSubview(navView) addSubview(titleLab) addSubview(cornerBgView) @@ -36,28 +30,12 @@ class RemoveMemberView: UIView { .edges(excludingEdge: .bottom) .height(kNaviHeight) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - - deleteBtn.layoutChain - .right(15) - .width(100) - .height(44) - .centerY(navTitleLabel) - titleLab.layoutChain - .topToBottomOfView(navBarView, offset: 8) + .topToBottomOfView(navView, offset: 8) .left(15) cornerBgView.layoutChain @@ -89,26 +67,10 @@ class RemoveMemberView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "移除圈子成员" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "移除圈子成员") + nav.addRightButton(deleteBtn) + return nav }() lazy var deleteBtn: UIButton = { diff --git a/QuickLocation/Section/Group/ReviewMemberList/ReviewMemberListView.swift b/QuickLocation/Section/Group/ReviewMemberList/ReviewMemberListView.swift index 426b5769..c02589e9 100644 --- a/QuickLocation/Section/Group/ReviewMemberList/ReviewMemberListView.swift +++ b/QuickLocation/Section/Group/ReviewMemberList/ReviewMemberListView.swift @@ -16,16 +16,11 @@ class ReviewMemberListView: UIView { static let rowHeight: CGFloat = 85 private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) } private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(cornerBgView) addSubview(tableView) @@ -34,26 +29,16 @@ class ReviewMemberListView: UIView { .edges(excludingEdge: .bottom) .height(kNaviHeight) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - cornerBgView.layoutChain - .topToBottomOfView(navBarView, offset: 16) + .topToBottomOfView(navView, offset: 16) .edgesHorzontal(15) tableView.layoutChain - .topToBottomOfView(navBarView, offset: 16) + .topToBottomOfView(navView, offset: 16) .edgesHorzontal(15) } @@ -77,26 +62,9 @@ class ReviewMemberListView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "待审核成员" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "待审核成员") + return nav }() lazy var cornerBgView: UIView = { diff --git a/QuickLocation/Section/Home/Bubble/CreateBubbleVC.swift b/QuickLocation/Section/Home/Bubble/CreateBubbleVC.swift index cdf20491..9be9aee6 100644 --- a/QuickLocation/Section/Home/Bubble/CreateBubbleVC.swift +++ b/QuickLocation/Section/Home/Bubble/CreateBubbleVC.swift @@ -59,7 +59,7 @@ class CreateBubbleVC: BaseViewController { }).disposed(by: disposeBag) guard AppContextManager.shared.status == 2, let endDate = Defaults[\.bubbleKeepTimes] else { return } - self.rootView.navTitleLabel.text = "活动气泡" + self.rootView.navView.titleLabel.text = "活动气泡" self.rootView.createBubbleDoneView.messageLab.text = self.rootView.createBubbleTipsView.messageText self.rootView.createBubbleTipsView.isHidden = true self.rootView.createBubbleDoneView.isHidden = false @@ -79,7 +79,7 @@ class CreateBubbleVC: BaseViewController { return } AppContextManager.shared.updateAccountStatus(2) - self.rootView.navTitleLabel.text = "活动气泡" + self.rootView.navView.titleLabel.text = "活动气泡" self.rootView.createBubbleDoneView.messageLab.text = self.rootView.createBubbleTipsView.messageText let endDate = Calendar.current.date(byAdding: .hour, value: keep_time, to: Date()) ?? Date() Defaults[\.bubbleKeepTimes] = endDate diff --git a/QuickLocation/Section/Home/Bubble/CreateBubbleView.swift b/QuickLocation/Section/Home/Bubble/CreateBubbleView.swift index f5c9e6c4..0ce0921a 100644 --- a/QuickLocation/Section/Home/Bubble/CreateBubbleView.swift +++ b/QuickLocation/Section/Home/Bubble/CreateBubbleView.swift @@ -8,6 +8,7 @@ import UIKit import RxSwift import RxCocoa +import SwiftDate class CreateBubbleView: UIView { @@ -18,18 +19,12 @@ class CreateBubbleView: UIView { var createBubbleDoneView: CreateBubbleDoneView = CreateBubbleDoneView() private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) - createBubbleTiemView.onNextTap = { [weak self] in guard let self = self else { return } - self.navTitleLabel.text = "通知您的圈子" + self.navView.titleLabel.text = "通知您的圈子" let hours = self.createBubbleTiemView.selectedHour.value let endDate = Calendar.current.date(byAdding: .hour, value: hours, to: Date()) ?? Date() - let fmt = DateFormatter() - fmt.dateFormat = "HH:mm" - let timeStr = fmt.string(from: endDate) + let timeStr = endDate.toFormat("HH:mm") let message = "\(timeStr)之前，我会一直在这个区域。如果需要我帮忙，请给我发消息。" self.createBubbleTipsView.messageLab.text = message self.createBubbleTipsView.messageText = message @@ -44,39 +39,26 @@ class CreateBubbleView: UIView { addSubview(createBubbleDoneView) addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) navBgView.layoutChain .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - + createBubbleTiemView.layoutChain - .topToBottomOfView(navBarView) + .topToBottomOfView(navView) .edges(excludingEdge: .top) createBubbleTipsView.layoutChain - .topToBottomOfView(navBarView) + .topToBottomOfView(navView) .edges(excludingEdge: .top) createBubbleDoneView.layoutChain - .topToBottomOfView(navBarView) + .topToBottomOfView(navView) .edges(excludingEdge: .top) } @@ -87,26 +69,9 @@ class CreateBubbleView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "设置气泡时间" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "设置气泡时间") + return nav }() diff --git a/QuickLocation/Section/Home/GroupSchedule/GroupScheduleView.swift b/QuickLocation/Section/Home/GroupSchedule/GroupScheduleView.swift index 97addb19..0ca88c1a 100644 --- a/QuickLocation/Section/Home/GroupSchedule/GroupScheduleView.swift +++ b/QuickLocation/Section/Home/GroupSchedule/GroupScheduleView.swift @@ -24,17 +24,12 @@ class GroupScheduleView: UIView { private var isSubCanScroll = false private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) } private func setupUI() { addSubview(mapView) addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(bottomView) bottomView.addSubview(lineView) bottomView.addSubview(tableView) @@ -43,21 +38,10 @@ class GroupScheduleView: UIView { .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - mapView.layoutChain .top() .edgesHorzontal() @@ -151,7 +135,7 @@ class GroupScheduleView: UIView { super.layoutSubviews() if !isLimitsSet { isLimitsSet = true - popUpLimit = navBarView.frame.maxY + popUpLimit = navView.frame.maxY } } @@ -164,26 +148,9 @@ class GroupScheduleView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "行程路线" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "行程路线") + return nav }() lazy var mapView: MAMapView! = { diff --git a/QuickLocation/Section/Home/SOS/SOSView.swift b/QuickLocation/Section/Home/SOS/SOSView.swift index c655326d..73b1c99d 100644 --- a/QuickLocation/Section/Home/SOS/SOSView.swift +++ b/QuickLocation/Section/Home/SOS/SOSView.swift @@ -23,10 +23,6 @@ class SOSView: UIView { var countDownFinish: Bool = false private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) - exclamationLottieView.rx.tapGesture.subscribe(onNext: { _ in UIView.animate(withDuration: 0.3, delay: 0, options: [.curveEaseInOut], animations: { self.countDownView.alpha = 1 @@ -96,35 +92,22 @@ class SOSView: UIView { addSubview(sosPracticeView) addSubview(countDownView) addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) navBgView.layoutChain .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - sosPracticeView.layoutChain - .topToBottomOfView(navBarView) + .topToBottomOfView(navView) .edges(excludingEdge: .top) exclamationLottieView.layoutChain - .topToBottomOfView(navBarView, offset: 40) + .topToBottomOfView(navView, offset: 40) .edgesHorzontal(28) .heightToWidth(1) @@ -141,7 +124,7 @@ class SOSView: UIView { .centerX() countDownView.layoutChain - .topToBottomOfView(navBarView) + .topToBottomOfView(navView) .edges(excludingEdge: .top) bottomTipsLab.layoutChain @@ -156,26 +139,9 @@ class SOSView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "SOS" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "SOS") + return nav }() lazy var exclamationLottieView: LottieAnimationView = { diff --git a/QuickLocation/Section/Home/SearchLocation/SearchLocationResultView.swift b/QuickLocation/Section/Home/SearchLocation/SearchLocationResultView.swift index 138a291f..cf0c2494 100644 --- a/QuickLocation/Section/Home/SearchLocation/SearchLocationResultView.swift +++ b/QuickLocation/Section/Home/SearchLocation/SearchLocationResultView.swift @@ -15,17 +15,12 @@ class SearchLocationResultView: UIView { var disposeBag = DisposeBag() private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) } private func setupUI() { addSubview(unlockVipView) addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(normalView) addSubview(successLottieView) @@ -34,27 +29,16 @@ class SearchLocationResultView: UIView { .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - unlockVipView.layoutChain.edges() successLottieView.layoutChain.edges() normalView.layoutChain - .topToBottomOfView(navBarView) + .topToBottomOfView(navView) .edges(excludingEdge: .top) } @@ -67,26 +51,9 @@ class SearchLocationResultView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = " " - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: " ") + return nav }() // MARK: - 成功烟花Lottie diff --git a/QuickLocation/Section/Home/SearchLocation/SearchLocationView.swift b/QuickLocation/Section/Home/SearchLocation/SearchLocationView.swift index 15c0aa63..9a2a8c37 100644 --- a/QuickLocation/Section/Home/SearchLocation/SearchLocationView.swift +++ b/QuickLocation/Section/Home/SearchLocation/SearchLocationView.swift @@ -22,10 +22,6 @@ class SearchLocationView: UIView { private var timeObserver: Any? private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) - phoneInputTF.rx.text .map { text -> String? in guard let text = text else { return nil } @@ -53,9 +49,7 @@ class SearchLocationView: UIView { private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(scrollView) addSubview(videoView) addSubview(searchProgressView) @@ -71,23 +65,12 @@ class SearchLocationView: UIView { .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) scrollView.layoutChain - .topToBottomOfView(navBarView) + .topToBottomOfView(navView) .edges(excludingEdge: .top) } @@ -209,26 +192,9 @@ class SearchLocationView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "找人助手" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "找人助手") + return nav }() lazy var scrollView: UIScrollView = { diff --git a/QuickLocation/Section/Home/SignIn/SignInView.swift b/QuickLocation/Section/Home/SignIn/SignInView.swift index 72a2f6e7..e1d92d46 100644 --- a/QuickLocation/Section/Home/SignIn/SignInView.swift +++ b/QuickLocation/Section/Home/SignIn/SignInView.swift @@ -39,18 +39,11 @@ class SignInView: UIView { var currentCoordinate: CLLocationCoordinate2D? private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) - - } private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(emailView) addSubview(signInLottieView) @@ -63,23 +56,12 @@ class SignInView: UIView { .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - emailView.layoutChain - .topToBottomOfView(navBarView, offset: 20) + .topToBottomOfView(navView, offset: 20) .centerX() signInLottieView.layoutChain @@ -112,26 +94,9 @@ class SignInView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "还在吗？" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "还在吗？") + return nav }() lazy var emailView: UIView = { diff --git a/QuickLocation/Section/Map/Navigation/NavigationView.swift b/QuickLocation/Section/Map/Navigation/NavigationView.swift index 7683e6f0..32c50f17 100644 --- a/QuickLocation/Section/Map/Navigation/NavigationView.swift +++ b/QuickLocation/Section/Map/Navigation/NavigationView.swift @@ -17,9 +17,6 @@ class NavigationView: UIView { var disposeBag = DisposeBag() private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) } private func setupUI() { @@ -29,10 +26,8 @@ class NavigationView: UIView { addSubview(mapView) #endif - addSubview(navBarView) - navBarView.addSubview(backBtn) - navBarView.addSubview(navTitleLabel) - + addSubview(navView) + addSubview(bottomView) bottomView.addSubview(avatarImgView) bottomView.addSubview(nameLab) @@ -48,18 +43,10 @@ class NavigationView: UIView { // .edges(excludingEdge: .bottom) // .height(kNaviHeight) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24).height(24) - - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerX() + navView.backBtn.extendEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 30) #if !targetEnvironment(simulator) mapView.layoutChain @@ -134,26 +121,7 @@ class NavigationView: UIView { return iv }() - lazy var navBarView: UIView = { - let v = UIView() - v.backgroundColor = .clear - return v - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 30) - return btn - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.text = "查看位置" - return label - }() + lazy var navView = BaseNavigationView(title: "查看位置") #if !targetEnvironment(simulator) lazy var mapView: MAMapView! = { diff --git a/QuickLocation/Section/Mine/Account/AccountView.swift b/QuickLocation/Section/Mine/Account/AccountView.swift index f7cb4439..f87a487a 100644 --- a/QuickLocation/Section/Mine/Account/AccountView.swift +++ b/QuickLocation/Section/Mine/Account/AccountView.swift @@ -17,18 +17,12 @@ class AccountView: UIView { phoneView.rx.tapGesture.subscribe(onNext: { _ in AppRouter.push(Route.changePhone) }).disposed(by: disposeBag) - - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) - } + private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(infoView) infoView.addSubview(infoStackView) @@ -42,23 +36,12 @@ class AccountView: UIView { .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - infoView.layoutChain - .topToBottomOfView(navBarView, offset: 18) + .topToBottomOfView(navView, offset: 18) .edgesHorzontal(16) infoStackView.layoutChain.edges() @@ -93,26 +76,9 @@ class AccountView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "账号与安全" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "账号与安全") + return nav }() lazy var infoView: UIView = { diff --git a/QuickLocation/Section/Mine/Account/ChangePhoneView.swift b/QuickLocation/Section/Mine/Account/ChangePhoneView.swift index 01930644..02ed2133 100644 --- a/QuickLocation/Section/Mine/Account/ChangePhoneView.swift +++ b/QuickLocation/Section/Mine/Account/ChangePhoneView.swift @@ -50,16 +50,12 @@ class ChangePhoneView: UIView { .bind(to: confirmBtn.rx.isEnabled) .disposed(by: disposeBag) - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) + } private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(confirmBtn) addSubview(infoShadowView) @@ -71,23 +67,12 @@ class ChangePhoneView: UIView { .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - infoShadowView.layoutChain - .topToBottomOfView(navBarView, offset: 18) + .topToBottomOfView(navView, offset: 18) .edgesHorzontal(16) infoView.layoutChain.edges() @@ -115,26 +100,9 @@ class ChangePhoneView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "更换手机号" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "更换手机号") + return nav }() lazy var infoShadowView: UIView = { diff --git a/QuickLocation/Section/Mine/CheckPermission/CheckPermissionVC.swift b/QuickLocation/Section/Mine/CheckPermission/CheckPermissionVC.swift index b85bdcda..7e790515 100644 --- a/QuickLocation/Section/Mine/CheckPermission/CheckPermissionVC.swift +++ b/QuickLocation/Section/Mine/CheckPermission/CheckPermissionVC.swift @@ -18,10 +18,6 @@ class CheckPermissionVC: BaseViewController { setupUI() - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) - tipsLab.rx.tapGesture.subscribe { _ in AppRouter.push(Route.web, userInfo: ["url": URLManager.shared.privacyPolicyUrl]) }.disposed(by: disposeBag) @@ -42,9 +38,7 @@ class CheckPermissionVC: BaseViewController { private func setupUI() { view.addSubview(navBgView) - view.addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + view.addSubview(navView) view.addSubview(scrollView) scrollView.addSubview(scrollContentView) @@ -56,20 +50,10 @@ class CheckPermissionVC: BaseViewController { .edges(excludingEdge: .bottom) .height(kNaviHeight) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - settingBtn.layoutChain .edgesHorzontal(30) .bottom(kSafeBottomMargin + 30) @@ -80,7 +64,7 @@ class CheckPermissionVC: BaseViewController { .bottomToTopOfView(settingBtn, offset: -20) scrollView.layoutChain - .topToBottomOfView(navBarView, offset: 15) + .topToBottomOfView(navView, offset: 15) .edgesHorzontal() .bottomToTopOfView(tipsLab, offset: -10) @@ -101,29 +85,9 @@ class CheckPermissionVC: BaseViewController { iv.contentMode = .scaleAspectFill return iv }() - - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "权限检测" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn - }() - + + lazy var navView = BaseNavigationView(title: "权限检测") + lazy var scrollView: UIScrollView = { let view = UIScrollView() view.backgroundColor = .clear diff --git a/QuickLocation/Section/Mine/EmergencyContact/EmergencyContactAddView.swift b/QuickLocation/Section/Mine/EmergencyContact/EmergencyContactAddView.swift index f0c49199..57d59942 100644 --- a/QuickLocation/Section/Mine/EmergencyContact/EmergencyContactAddView.swift +++ b/QuickLocation/Section/Mine/EmergencyContact/EmergencyContactAddView.swift @@ -40,16 +40,12 @@ class EmergencyContactAddView: UIView { .bind(to: saveBtn.rx.isEnabled) .disposed(by: disposeBag) - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) + } private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(titleLab) addSubview(infoShadowView) @@ -61,23 +57,12 @@ class EmergencyContactAddView: UIView { .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - titleLab.layoutChain - .topToBottomOfView(navBarView, offset: 20) + .topToBottomOfView(navView, offset: 20) .left(15) infoShadowView.layoutChain @@ -99,26 +84,9 @@ class EmergencyContactAddView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "添加紧急联系人" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "添加紧急联系人") + return nav }() lazy var titleLab: UILabel = { diff --git a/QuickLocation/Section/Mine/EmergencyContact/EmergencyContactView.swift b/QuickLocation/Section/Mine/EmergencyContact/EmergencyContactView.swift index f1696b68..3ad6fe44 100644 --- a/QuickLocation/Section/Mine/EmergencyContact/EmergencyContactView.swift +++ b/QuickLocation/Section/Mine/EmergencyContact/EmergencyContactView.swift @@ -17,16 +17,12 @@ class EmergencyContactView: UIView { private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) + } private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(titleLab) addSubview(tableView) @@ -35,23 +31,12 @@ class EmergencyContactView: UIView { .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - titleLab.layoutChain - .topToBottomOfView(navBarView, offset: 20) + .topToBottomOfView(navView, offset: 20) .left(15) tableView.layoutChain @@ -67,26 +52,9 @@ class EmergencyContactView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "紧急联系人" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "紧急联系人") + return nav }() lazy var titleLab: UILabel = { diff --git a/QuickLocation/Section/Mine/MyProfile/AvatarIconListView.swift b/QuickLocation/Section/Mine/MyProfile/AvatarIconListView.swift index fe77a666..08527ec6 100644 --- a/QuickLocation/Section/Mine/MyProfile/AvatarIconListView.swift +++ b/QuickLocation/Section/Mine/MyProfile/AvatarIconListView.swift @@ -24,17 +24,13 @@ class AvatarIconListView: UIView { private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) + } private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) - navBarView.addSubview(doneBtn) + addSubview(navView) + navView.addRightButton(doneBtn) addSubview(selectedIconView) addSubview(titleLab) addSubview(iconCollectionView) @@ -43,27 +39,12 @@ class AvatarIconListView: UIView { .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - - doneBtn.layoutChain - .centerY(navTitleLabel) - .right(15) - selectedIconView.layoutChain - .topToBottomOfView(navBarView, offset: 30) + .topToBottomOfView(navView, offset: 30) .centerX() .width(80) .height(80) @@ -76,8 +57,6 @@ class AvatarIconListView: UIView { .topToBottomOfView(titleLab, offset: 13) .edgesHorzontal(40) .bottom(kSafeBottomMargin + 10) - - doneBtn.sizeToFit() } lazy var navBgView: UIImageView = { @@ -87,26 +66,9 @@ class AvatarIconListView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "更换图标" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "更换图标") + return nav }() lazy var doneBtn: UIButton = { diff --git a/QuickLocation/Section/Mine/MyProfile/MyProfileView.swift b/QuickLocation/Section/Mine/MyProfile/MyProfileView.swift index 4eb9f8f8..06130e18 100644 --- a/QuickLocation/Section/Mine/MyProfile/MyProfileView.swift +++ b/QuickLocation/Section/Mine/MyProfile/MyProfileView.swift @@ -15,16 +15,12 @@ class MyProfileView: UIView { private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) + } private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(avatarView) addSubview(nickNameView) @@ -34,23 +30,12 @@ class MyProfileView: UIView { .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - avatarView.layoutChain - .topToBottomOfView(navBarView, offset: 30) + .topToBottomOfView(navView, offset: 30) .centerX() nickNameView.layoutChain @@ -71,26 +56,9 @@ class MyProfileView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "编辑资料" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "编辑资料") + return nav }() lazy var avatarView: UIView = { diff --git a/QuickLocation/Section/Mine/PrivacyPolicy/PrivacyPolicyView.swift b/QuickLocation/Section/Mine/PrivacyPolicy/PrivacyPolicyView.swift index b1c5049b..12d613a7 100644 --- a/QuickLocation/Section/Mine/PrivacyPolicy/PrivacyPolicyView.swift +++ b/QuickLocation/Section/Mine/PrivacyPolicy/PrivacyPolicyView.swift @@ -14,16 +14,11 @@ class PrivacyPolicyView: UIView { var disposeBag = DisposeBag() private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) } private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(infoView) infoView.addSubview(tableView) @@ -33,22 +28,12 @@ class PrivacyPolicyView: UIView { .edges(excludingEdge: .bottom) .height(kNaviHeight) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - infoView.layoutChain - .topToBottomOfView(navBarView, offset: 15) + .topToBottomOfView(navView, offset: 15) .edgesHorzontal(15) // 列表 @@ -63,26 +48,9 @@ class PrivacyPolicyView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "隐私与协议" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "隐私与协议") + return nav }() lazy var infoView: UIView = { diff --git a/QuickLocation/Section/PopupWindow/PromotionalActivitiesView.swift b/QuickLocation/Section/PopupWindow/PromotionalActivitiesView.swift index aef7aa70..5927b982 100644 --- a/QuickLocation/Section/PopupWindow/PromotionalActivitiesView.swift +++ b/QuickLocation/Section/PopupWindow/PromotionalActivitiesView.swift @@ -19,32 +19,18 @@ class PromotionalActivitiesView: UIView { var disposeBag = DisposeBag() private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - VipWaivePopView.show() - }).disposed(by: disposeBag) + navView.onBackTapped = { VipWaivePopView.show() } } private func setupUI() { addSubview(scrollView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - addSubview(backBtn) + addSubview(navView) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .top(kStatusBarHeight + 12) - .left(15) - .width(24) - .height(24) + navView.alpha = 0 addSubview(bottomView) bottomView.layoutChain @@ -56,28 +42,7 @@ class PromotionalActivitiesView: UIView { .bottomToTopOfView(bottomView) } - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .white - view.alpha = 0 - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "超值优惠" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 15, right: 100) - return btn - }() + lazy var navView = BaseNavigationView(title: "超值优惠") lazy var scrollView: UIScrollView = { let view = UIScrollView() @@ -359,7 +324,7 @@ extension PromotionalActivitiesView: UIScrollViewDelegate { func scrollViewDidScroll(_ scrollView: UIScrollView) { let maxY = scrollView.contentOffset.y let alpha = maxY / kNaviHeight - navBarView.alpha = alpha < 0.0 ? 0.0 : alpha + navView.alpha = alpha < 0.0 ? 0.0 : alpha } } diff --git a/QuickLocation/Section/Scan/ScanView.swift b/QuickLocation/Section/Scan/ScanView.swift index 2755e45f..6b45c146 100644 --- a/QuickLocation/Section/Scan/ScanView.swift +++ b/QuickLocation/Section/Scan/ScanView.swift @@ -15,10 +15,6 @@ class ScanView: UIView { var disposeBag = DisposeBag() private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) - torchBtn.rx.tap.subscribe(onNext: { _ in guard let device = AVCaptureDevice.default(.builtInWideAngleCamera, for: .video, position: .back) else { return } do { @@ -32,30 +28,16 @@ class ScanView: UIView { } private func setupUI() { - addSubview(navBarView) - navBarView.addSubview(backBtn) - navBarView.addSubview(torchBtn) + addSubview(navView) addSubview(scanBoxView) scanBoxView.addSubview(scanImgView) scanBoxView.addSubview(scanLineView) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - backBtn.layoutChain - .top(kStatusBarHeight + 12) - .left(15) - .width(35) - .height(24) - - torchBtn.layoutChain - .centerY(backBtn) - .right(15) - .width(100) - .height(24) - scanBoxView.layoutChain .centerY() .edgesHorzontal(35) @@ -71,21 +53,17 @@ class ScanView: UIView { scanLineView.frame = CGRect(x: 5, y: 0, width: scanBoxView.bounds.width - 10, height: 2) } - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear + lazy var navView: BaseNavigationView = { + let view = BaseNavigationView(title: "") + view.titleLabel.isHidden = true + view.backBtn.setImage(nil, for: .normal) + view.backBtn.setTitle("取消", for: .normal) + view.backBtn.setTitleColor(.white, for: .normal) + view.backBtn.titleLabel?.font = .systemFont(ofSize: 16, weight: .medium) + view.addRightButton(torchBtn) return view }() - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setTitle("取消", for: .normal) - btn.setTitleColor(.white, for: .normal) - btn.titleLabel?.font = .systemFont(ofSize: 16, weight: .medium) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn - }() - lazy var torchBtn: UIButton = { let btn = UIButton(type: .custom) btn.setTitle("打开手电筒", for: .normal) diff --git a/QuickLocation/Section/Schedule/CreateSchedule/CreateSchedulePopView.swift b/QuickLocation/Section/Schedule/CreateSchedule/CreateSchedulePopView.swift index a68ec01b..7007b424 100644 --- a/QuickLocation/Section/Schedule/CreateSchedule/CreateSchedulePopView.swift +++ b/QuickLocation/Section/Schedule/CreateSchedule/CreateSchedulePopView.swift @@ -13,6 +13,7 @@ import BRPickerView import RxGesture import CoreLocation import TagListView +import SwiftDate // MARK: - CreateSchedulePopView class CreateSchedulePopView: UIView { @@ -87,9 +88,7 @@ class CreateSchedulePopView: UIView { label.font = .systemFont(ofSize: 14, weight: .medium) label.textColor = UIColor(hexStr: "#16B3FF") label.isUserInteractionEnabled = true - let fmt = DateFormatter() - fmt.dateFormat = "yyyy年MM月dd日" - label.text = fmt.string(from: Date()) + label.text = Date().toFormat("yyyy年MM月dd日") return label }() @@ -267,9 +266,7 @@ class SchedulePointCell: UITableViewCell { } private func formatTime(_ date: Date) -> String { - let fmt = DateFormatter() - fmt.dateFormat = "HH:mm" - return fmt.string(from: date) + date.toFormat("HH:mm") } // MARK: - Init diff --git a/QuickLocation/Section/Schedule/CreateSchedule/CreateScheduleVC.swift b/QuickLocation/Section/Schedule/CreateSchedule/CreateScheduleVC.swift index 5b3adeae..be65dac0 100644 --- a/QuickLocation/Section/Schedule/CreateSchedule/CreateScheduleVC.swift +++ b/QuickLocation/Section/Schedule/CreateSchedule/CreateScheduleVC.swift @@ -44,7 +44,7 @@ class CreateScheduleVC: BaseViewController, MAMapViewDelegate { requestGroupInfo() guard let _ = viewModel.scheduModel else { return } - rootView.navTitleLabel.text = "编辑行程" + rootView.navView.titleLabel.text = "编辑行程" rootView.deleteBtn.isHidden = false // requestFollowList(id: model.id) } diff --git a/QuickLocation/Section/Schedule/CreateSchedule/CreateScheduleVM.swift b/QuickLocation/Section/Schedule/CreateSchedule/CreateScheduleVM.swift index bf55108a..52416615 100644 --- a/QuickLocation/Section/Schedule/CreateSchedule/CreateScheduleVM.swift +++ b/QuickLocation/Section/Schedule/CreateSchedule/CreateScheduleVM.swift @@ -8,6 +8,7 @@ import RxSwift import RxCocoa import RxDataSources +import SwiftDate // MARK: - 行程点编辑模型 struct SchedulePointItem: IdentifiableType, Equatable { @@ -72,11 +73,7 @@ class CreateScheduleVM { } dateString = selectedDate - .map { - let fmt = DateFormatter() - fmt.dateFormat = "yyyy年MM月dd日" - return fmt.string(from: $0) - } + .map { $0.toFormat("yyyy年MM月dd日") } // 添加行程点 addPointTapped diff --git a/QuickLocation/Section/Schedule/CreateSchedule/CreateScheduleView.swift b/QuickLocation/Section/Schedule/CreateSchedule/CreateScheduleView.swift index 08b20096..086818a2 100644 --- a/QuickLocation/Section/Schedule/CreateSchedule/CreateScheduleView.swift +++ b/QuickLocation/Section/Schedule/CreateSchedule/CreateScheduleView.swift @@ -14,8 +14,6 @@ import AMapNaviKit class CreateScheduleView: UIView { - var disposeBag = DisposeBag() - let createSchedulePopView = CreateSchedulePopView() // MARK: - PopView 拖拽 @@ -27,10 +25,6 @@ class CreateScheduleView: UIView { private var isSubCanScroll = false private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) - // 嵌套滑动协调（参考 GroupView 的 PanScrollView 模式） createSchedulePopView.scrollView.delegate = self } @@ -40,34 +34,17 @@ class CreateScheduleView: UIView { addSubview(mapView) #endif addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(backBtn) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(deleteBtn) + addSubview(navView) + navView.addRightButton(deleteBtn) addSubview(createSchedulePopView) navBgView.layoutChain .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24).height(24) - - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerX() - - deleteBtn.layoutChain - .centerY(navTitleLabel) - .right(15) - .width(16) - .height(16) #if !targetEnvironment(simulator) mapView.layoutChain @@ -168,7 +145,7 @@ class CreateScheduleView: UIView { if !isLimitsSet { isLimitsSet = true popDownLimit = kScreenHeight / 3 * 2 - popUpLimit = navBarView.frame.maxY + popUpLimit = navView.frame.maxY createSchedulePopView.scrollView.isScrollEnabled = false } } @@ -181,25 +158,9 @@ class CreateScheduleView: UIView { return iv }() - lazy var navBarView: UIView = { - let v = UIView() - v.backgroundColor = .clear - return v - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 30) - return btn - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.text = "创建行程" - return label + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "创建行程") + return nav }() lazy var deleteBtn: UIButton = { diff --git a/QuickLocation/Section/Schedule/ItineraryDetail/ItineraryDetailView.swift b/QuickLocation/Section/Schedule/ItineraryDetail/ItineraryDetailView.swift index 30da56e8..a584a526 100644 --- a/QuickLocation/Section/Schedule/ItineraryDetail/ItineraryDetailView.swift +++ b/QuickLocation/Section/Schedule/ItineraryDetail/ItineraryDetailView.swift @@ -12,40 +12,19 @@ import AMapNaviKit class ItineraryDetailView: UIView { - var disposeBag = DisposeBag() - - private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) - } - private func setupUI() { addSubview(mapView) addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) navBgView.layoutChain .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - mapView.layoutChain .edges() } @@ -57,26 +36,9 @@ class ItineraryDetailView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "行程路线" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "行程路线") + return nav }() lazy var mapView: MAMapView! = { @@ -99,7 +61,6 @@ class ItineraryDetailView: UIView { super.init(frame: .zero) backgroundColor = .white setupUI() - setupRx() } required init?(coder aDecoder: NSCoder) { diff --git a/QuickLocation/Section/Schedule/ScheduleHistory/ScheduleHistoryView.swift b/QuickLocation/Section/Schedule/ScheduleHistory/ScheduleHistoryView.swift index 46b90fb6..b962ca90 100644 --- a/QuickLocation/Section/Schedule/ScheduleHistory/ScheduleHistoryView.swift +++ b/QuickLocation/Section/Schedule/ScheduleHistory/ScheduleHistoryView.swift @@ -12,42 +12,21 @@ import TagListView class ScheduleHistoryView: UIView { - var disposeBag = DisposeBag() - - private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) - } - private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(tableView) navBgView.layoutChain .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - tableView.layoutChain - .topToBottomOfView(navBarView, offset: 15) + .topToBottomOfView(navView, offset: 15) .edges(excludingEdge: .top) } @@ -59,33 +38,15 @@ class ScheduleHistoryView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "历史行程" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "历史行程") + return nav }() override init(frame: CGRect) { super.init(frame: .zero) backgroundColor = .white setupUI() - setupRx() } lazy var tableView: UITableView = { diff --git a/QuickLocation/Section/Schedule/ScheduleView.swift b/QuickLocation/Section/Schedule/ScheduleView.swift index 4134c20f..a889e7d4 100644 --- a/QuickLocation/Section/Schedule/ScheduleView.swift +++ b/QuickLocation/Section/Schedule/ScheduleView.swift @@ -22,8 +22,7 @@ class ScheduleView: UIView { private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) + addSubview(navView) addSubview(headerView) addSubview(travelRouteView) addSubview(tableView) @@ -34,16 +33,12 @@ class ScheduleView: UIView { .edges(excludingEdge: .bottom) .height(kNaviHeight) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerX() - headerView.layoutChain - .topToBottomOfView(navBarView) + .topToBottomOfView(navView) .edgesHorzontal() // .height(147) @@ -69,19 +64,10 @@ class ScheduleView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "行程" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "行程") + nav.backBtn.isHidden = true + return nav }() /// 谁看过我 diff --git a/QuickLocation/Section/Schedule/ScheduleViewed/ScheduleViewedView.swift b/QuickLocation/Section/Schedule/ScheduleViewed/ScheduleViewedView.swift index fcad42eb..e764b796 100644 --- a/QuickLocation/Section/Schedule/ScheduleViewed/ScheduleViewedView.swift +++ b/QuickLocation/Section/Schedule/ScheduleViewed/ScheduleViewedView.swift @@ -12,42 +12,21 @@ import TagListView class ScheduleViewedView: UIView { - var disposeBag = DisposeBag() - - private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) - } - private func setupUI() { addSubview(navBgView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) + addSubview(navView) addSubview(tableView) navBgView.layoutChain .edges(excludingEdge: .bottom) .heightToWidth(160/375) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - tableView.layoutChain - .topToBottomOfView(navBarView, offset: 15) + .topToBottomOfView(navView, offset: 15) .edges(excludingEdge: .top) } @@ -59,33 +38,15 @@ class ScheduleViewedView: UIView { return iv }() - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "看过我的" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: "看过我的") + return nav }() override init(frame: CGRect) { super.init(frame: .zero) backgroundColor = .white setupUI() - setupRx() } lazy var tableView: UITableView = { diff --git a/QuickLocation/Section/TextInput/TextInputViewController.swift b/QuickLocation/Section/TextInput/TextInputViewController.swift index bcc1f40a..081e11aa 100644 --- a/QuickLocation/Section/TextInput/TextInputViewController.swift +++ b/QuickLocation/Section/TextInput/TextInputViewController.swift @@ -56,7 +56,6 @@ final class TextInputViewController: UIViewController { setupUI() setupBinding() - navTitleLabel.text = titleText textView.becomeFirstResponder() } @@ -68,10 +67,8 @@ final class TextInputViewController: UIViewController { private func setupUI() { view.addSubview(navBgView) - view.addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) - + view.addSubview(navView) + view.addSubview(inputTextView) inputTextView.addSubview(textView) view.addSubview(countLabel) @@ -80,24 +77,13 @@ final class TextInputViewController: UIViewController { navBgView.layoutChain .edges(excludingEdge: .bottom) .heightToWidth(160/375) - - navBarView.layoutChain + + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) inputTextView.layoutChain - .topToBottomOfView(navBarView, offset: 15) + .topToBottomOfView(navView, offset: 15) .edgesHorzontal(15) // 输入框 @@ -116,7 +102,6 @@ final class TextInputViewController: UIViewController { // MARK: - Binding private func setupBinding() { - // 输入流 Observable.merge( textView.rx.didChange.asObservable(), textView.rx.text.map { _ in () }, @@ -161,13 +146,6 @@ final class TextInputViewController: UIViewController { self.dismiss(animated: true) }) .disposed(by: disposeBag) - - // 关闭 - backBtn.rx.tap - .subscribe(onNext: { [weak self] _ in - self?.dismiss(animated: true) - }) - .disposed(by: disposeBag) } // MARK: - Views @@ -177,28 +155,15 @@ final class TextInputViewController: UIViewController { iv.contentMode = .scaleAspectFill return iv }() - - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view + + lazy var navView: BaseNavigationView = { + let nav = BaseNavigationView(title: titleText) + nav.onBackTapped = { [weak self] in + self?.dismiss(animated: true) + } + return nav }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) - return btn - }() - + lazy var inputTextView: UIView = { let view = UIView() view.backgroundColor = .white diff --git a/QuickLocation/Section/VipRecharge/VipRechargeView.swift b/QuickLocation/Section/VipRecharge/VipRechargeView.swift index e2209a3e..c88f2b78 100644 --- a/QuickLocation/Section/VipRecharge/VipRechargeView.swift +++ b/QuickLocation/Section/VipRecharge/VipRechargeView.swift @@ -14,9 +14,7 @@ class VipRechargeView: UIView { var disposeBag = DisposeBag() private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - VipWaivePopView.show() - }).disposed(by: disposeBag) + navView.onBackTapped = { VipWaivePopView.show() } agreementLab.rx.tapGesture.subscribe { _ in AppRouter.push(Route.web, userInfo: ["url": URLManager.shared.userAgreementUrl]) @@ -47,24 +45,12 @@ class VipRechargeView: UIView { bottomView.addSubview(payBtnView) bottomView.addSubview(payPriceView) - addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - addSubview(backBtn) + addSubview(navView) - navBarView.layoutChain + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .top(kStatusBarHeight + 12) - .left(15) - .width(24) - .height(24) + navView.alpha = 0 bottomView.layoutChain .edgesHorzontal() @@ -143,28 +129,7 @@ class VipRechargeView: UIView { .bottom(10) } - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .white - view.alpha = 0 - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "升级会员" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 15, right: 100) - return btn - }() + lazy var navView = BaseNavigationView(title: "升级会员") lazy var scrollView: UIScrollView = { let view = UIScrollView() @@ -752,7 +717,7 @@ extension VipRechargeView: UIScrollViewDelegate { func scrollViewDidScroll(_ scrollView: UIScrollView) { let maxY = scrollView.contentOffset.y let alpha = maxY / kNaviHeight - navBarView.alpha = alpha < 0.0 ? 0.0 : alpha + navView.alpha = alpha < 0.0 ? 0.0 : alpha } } diff --git a/QuickLocation/Section/VipRecharge/VipRightsVC.swift b/QuickLocation/Section/VipRecharge/VipRightsVC.swift index e659cb37..e83b8695 100644 --- a/QuickLocation/Section/VipRecharge/VipRightsVC.swift +++ b/QuickLocation/Section/VipRecharge/VipRightsVC.swift @@ -20,9 +20,6 @@ class VipRightsVC: BaseViewController { } private func setupRx() { - backBtn.rx.tap.subscribe(onNext: { _ in - AppRouter.shared.popOrDismiss() - }).disposed(by: disposeBag) } private func setupUI() { @@ -34,25 +31,12 @@ class VipRightsVC: BaseViewController { scrollContentView.addSubview(logoImg) scrollContentView.addSubview(detailImg) - view.addSubview(navBarView) - navBarView.addSubview(navTitleLabel) - navBarView.addSubview(backBtn) - - navBarView.layoutChain + view.addSubview(navView) + + navView.layoutChain .edges(excludingEdge: .bottom) .height(kNaviHeight) - navTitleLabel.layoutChain - .top(kStatusBarHeight + 12) - .centerY(backBtn) - .centerX() - - backBtn.layoutChain - .centerY(navTitleLabel) - .left(15) - .width(24) - .height(24) - bgImgView.layoutChain.edges() headerBgImg.layoutChain @@ -60,7 +44,7 @@ class VipRightsVC: BaseViewController { .heightToWidth(233/375) scrollView.layoutChain - .topToBottomOfView(navBarView) + .topToBottomOfView(navView) .edges(excludingEdge: .top) scrollContentView.layoutChain @@ -79,27 +63,7 @@ class VipRightsVC: BaseViewController { .heightToWidth(1081/345) } - lazy var navBarView: UIView = { - let view = UIView() - view.backgroundColor = .clear - return view - }() - - lazy var navTitleLabel: UILabel = { - let label = UILabel() - label.text = "会员权益" - label.font = .systemFont(ofSize: 18, weight: .medium) - label.textColor = ThemeManager.shared.color.titleAuxColor - label.textAlignment = .center - return label - }() - - lazy var backBtn: UIButton = { - let btn = UIButton(type: .custom) - btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 15, right: 100) - return btn - }() + lazy var navView = BaseNavigationView(title: "会员权益") lazy var bgImgView: UIImageView = { let view = UIImageView(image: UIImage(named: "VipRights/bg")) diff --git a/QuickLocation/UIKit/BaseNavigationView.swift b/QuickLocation/UIKit/BaseNavigationView.swift new file mode 100644 index 00000000..a404c18c --- /dev/null +++ b/QuickLocation/UIKit/BaseNavigationView.swift @@ -0,0 +1,74 @@ +import UIKit + +class BaseNavigationView: UIView { + + let titleLabel: UILabel + let backBtn: UIButton + var onBackTapped: (() -> Void)? + + private let rightStack: UIStackView = { + let stack = UIStackView() + stack.axis = .horizontal + stack.alignment = .fill + stack.distribution = .fill + stack.spacing = 12 + return stack + }() + + init(title: String) { + backBtn = UIButton(type: .custom) + backBtn.setImage(UIImage(named: "Common/back"), for: .normal) + backBtn.extendEdgeInsets = UIEdgeInsets(top: 54, left: 15, bottom: 100, right: 100) + + titleLabel = UILabel() + titleLabel.font = .systemFont(ofSize: 18, weight: .medium) + titleLabel.textColor = ThemeManager.shared.color.titleAuxColor + titleLabel.textAlignment = .center + titleLabel.text = title + + super.init(frame: .zero) + + backgroundColor = .clear + addSubview(backBtn) + addSubview(titleLabel) + addSubview(rightStack) + + backBtn.layoutChain + .centerY(titleLabel) + .left(15) + .width(24) + .height(24) + + titleLabel.layoutChain + .top(kStatusBarHeight + 12) + .centerY(backBtn) + .centerX() + + rightStack.layoutChain + .centerY(titleLabel) + .right(15) + .height(24) + + backBtn.addTarget(self, action: #selector(handleBackTap), for: .touchUpInside) + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + @objc private func handleBackTap() { + if let onBackTapped = onBackTapped { + onBackTapped() + } else { + AppRouter.shared.popOrDismiss() + } + } + + func addRightButton(_ button: UIButton) { + rightStack.addArrangedSubview(button) + } + + func addRightView(_ view: UIView) { + rightStack.addArrangedSubview(view) + } +}