From f1ee066c6603987d58a7939fae1c3b0577dff6ba Mon Sep 17 00:00:00 2001 From: linshujie Date: Tue, 8 Sep 2026 18:34:05 +0800 Subject: [PATCH] =?UTF-8?q?-=20bug=E4=BF=AE=E6=94=B9=20-=20=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Podfile | 13 + Podfile.lock | 2 +- QuickLocation.xcodeproj/project.pbxproj | 225 +++--- .../xcschemes/QuickLocation Release.xcscheme | 79 +++ .../xcschemes/QuickLocation.xcscheme | 2 +- QuickLocation/API/SystemAPI.swift | 9 +- QuickLocation/API/UserAPI.swift | 25 +- .../Assets.xcassets/Mailbox/Contents.json | 9 + .../detail_bird.imageset/Contents.json | 8 + .../detail_bird.imageset/detail_bird@2x.png | Bin 0 -> 13241 bytes .../detail_bird.imageset/detail_bird@3x.png | Bin 0 -> 26836 bytes .../detail_card.imageset/Contents.json | 8 + .../detail_card.imageset/detail_card@2x.png | Bin 0 -> 3759 bytes .../detail_card.imageset/detail_card@3x.png | Bin 0 -> 12312 bytes .../detail_close.imageset/Contents.json | 8 + .../detail_close.imageset/detail_close@2x.png | Bin 0 -> 530 bytes .../detail_close.imageset/detail_close@3x.png | Bin 0 -> 915 bytes .../interaction.imageset/Contents.json | 8 + .../interaction.imageset/interaction@2x.png | Bin 0 -> 2018 bytes .../interaction.imageset/interaction@3x.png | Bin 0 -> 4010 bytes .../Mailbox/notice.imageset/Contents.json | 8 + .../Mailbox/notice.imageset/notice@2x.png | Bin 0 -> 1568 bytes .../Mailbox/notice.imageset/notice@3x.png | Bin 0 -> 3208 bytes .../Mailbox/system.imageset/Contents.json | 8 + .../Mailbox/system.imageset/system@2x.png | Bin 0 -> 1957 bytes .../Mailbox/system.imageset/system@3x.png | Bin 0 -> 4051 bytes .../system_message.imageset/Contents.json | 8 + .../system_message@2x.png | Bin 0 -> 4373 bytes .../system_message@3x.png | Bin 0 -> 8185 bytes .../PrivacySettings/Contents.json | 9 + .../group_lock.imageset/Contents.json | 22 + .../group_lock.imageset/group_lock@2x.png | Bin 0 -> 2466 bytes .../group_lock.imageset/group_lock@3x.png | Bin 0 -> 4323 bytes .../phone_report.imageset/Contents.json | 22 + .../phone_report.imageset/phone_report@2x.png | Bin 0 -> 1893 bytes .../phone_report.imageset/phone_report@3x.png | Bin 0 -> 3393 bytes .../pigeon_message.imageset/Contents.json | 22 + .../pigeon_message@2x.png | Bin 0 -> 1056 bytes .../pigeon_message@3x.png | Bin 0 -> 1787 bytes .../privacy_entry.imageset/Contents.json | 22 + .../privacy_entry@2x.png | Bin 0 -> 1720 bytes .../privacy_entry@3x.png | Bin 0 -> 3631 bytes QuickLocation/Common/Constant.swift | 8 + .../Component/PrivilegeDeniedOverlay.swift | 79 +++ QuickLocation/Info.plist | 7 + .../Manager/Account/UserConfigModel.swift | 19 + QuickLocation/Manager/App/RouterManager.swift | 24 + .../AppRestrict/AppRestrictManager.swift | 29 + QuickLocation/Manager/MQTT/MQTTService.swift | 254 ++++--- .../Manager/MQTT/PhoneStatusCollector.swift | 226 ++++++ QuickLocation/Manager/URL/URLManager.swift | 4 +- QuickLocation/Model/GroupModel.swift | 93 +++ QuickLocation/Model/MailboxModel.swift | 100 +++ .../Section/AppRestrict/AppRestrictCell.swift | 3 +- .../Section/Group/GroupChat/GroupChatVC.swift | 4 + .../Group/GroupChat/GroupChatView.swift | 42 +- .../Group/GroupChat/GroupChatViewModel.swift | 6 +- .../Section/Group/GroupViewController.swift | 6 + .../Mailbox/MailboxDetailViewController.swift | 392 +++++++++++ .../Section/Group/Mailbox/MailboxView.swift | 494 +++++++++++++ .../Group/Mailbox/MailboxViewController.swift | 372 ++++++++++ .../Group/MemberInfo/MemberInfoVC.swift | 68 +- .../Group/MemberInfo/MemberInfoView.swift | 35 +- .../Section/Home/GroupMemberView2.swift | 158 ++++- QuickLocation/Section/Home/HomeView2.swift | 28 + .../Section/Home/HomeViewController.swift | 14 +- .../Section/Home/MemberAppUsageView.swift | 21 + .../Section/Home/MemberPhoneReportView.swift | 21 + .../PhoneReportDetailView.swift | 2 +- .../PhoneReportDetailViewModel.swift | 121 +++- .../Section/Home/SOS/SOSAnimationViews.swift | 31 +- .../Home/SOS/SOSListViewController.swift | 354 ++++++++++ .../Section/Home/SOS/SOSPracticeView.swift | 4 +- QuickLocation/Section/Home/SOS/SOSView.swift | 14 +- .../Section/Home/SOS/SOSViewController.swift | 3 + .../Section/Launch/LaunchViewController.swift | 3 + .../Section/LockDistract/LockDistractVC.swift | 46 +- .../LockDistract/LockDistractView.swift | 26 + .../Section/Login/LoginViewModel.swift | 3 + .../Section/Mine/Account/AccountVC.swift | 97 +++ .../Section/Mine/Account/AccountView.swift | 135 +++- .../Section/Mine/MinePhotoWallView.swift | 8 +- QuickLocation/Section/Mine/MineView.swift | 4 +- .../Section/Mine/MineViewController.swift | 17 +- .../Section/Mine/MineViewModel.swift | 8 +- .../PrivacySettingsViewController.swift | 663 ++++++++++++++++++ .../PigeonMessage/PigeonMessageVC.swift | 44 ++ .../PigeonMessage/PigeonMessageView.swift | 6 +- .../Web/Controller/WebViewController.swift | 13 +- QuickLocation/Service/GroupService.swift | 2 +- QuickLocation/Service/SystemService.swift | 7 + QuickLocation/Service/UserService.swift | 21 + QuickLocation/UIKit/Alert/DLToast.swift | 2 +- 93 files changed, 4359 insertions(+), 299 deletions(-) create mode 100644 QuickLocation.xcodeproj/xcshareddata/xcschemes/QuickLocation Release.xcscheme create mode 100644 QuickLocation/Assets.xcassets/Mailbox/Contents.json create mode 100644 QuickLocation/Assets.xcassets/Mailbox/detail_bird.imageset/Contents.json create mode 100644 QuickLocation/Assets.xcassets/Mailbox/detail_bird.imageset/detail_bird@2x.png create mode 100644 QuickLocation/Assets.xcassets/Mailbox/detail_bird.imageset/detail_bird@3x.png create mode 100644 QuickLocation/Assets.xcassets/Mailbox/detail_card.imageset/Contents.json create mode 100644 QuickLocation/Assets.xcassets/Mailbox/detail_card.imageset/detail_card@2x.png create mode 100644 QuickLocation/Assets.xcassets/Mailbox/detail_card.imageset/detail_card@3x.png create mode 100644 QuickLocation/Assets.xcassets/Mailbox/detail_close.imageset/Contents.json create mode 100644 QuickLocation/Assets.xcassets/Mailbox/detail_close.imageset/detail_close@2x.png create mode 100644 QuickLocation/Assets.xcassets/Mailbox/detail_close.imageset/detail_close@3x.png create mode 100644 QuickLocation/Assets.xcassets/Mailbox/interaction.imageset/Contents.json create mode 100644 QuickLocation/Assets.xcassets/Mailbox/interaction.imageset/interaction@2x.png create mode 100644 QuickLocation/Assets.xcassets/Mailbox/interaction.imageset/interaction@3x.png create mode 100644 QuickLocation/Assets.xcassets/Mailbox/notice.imageset/Contents.json create mode 100644 QuickLocation/Assets.xcassets/Mailbox/notice.imageset/notice@2x.png create mode 100644 QuickLocation/Assets.xcassets/Mailbox/notice.imageset/notice@3x.png create mode 100644 QuickLocation/Assets.xcassets/Mailbox/system.imageset/Contents.json create mode 100644 QuickLocation/Assets.xcassets/Mailbox/system.imageset/system@2x.png create mode 100644 QuickLocation/Assets.xcassets/Mailbox/system.imageset/system@3x.png create mode 100644 QuickLocation/Assets.xcassets/Mailbox/system_message.imageset/Contents.json create mode 100644 QuickLocation/Assets.xcassets/Mailbox/system_message.imageset/system_message@2x.png create mode 100644 QuickLocation/Assets.xcassets/Mailbox/system_message.imageset/system_message@3x.png create mode 100644 QuickLocation/Assets.xcassets/PrivacySettings/Contents.json create mode 100644 QuickLocation/Assets.xcassets/PrivacySettings/group_lock.imageset/Contents.json create mode 100644 QuickLocation/Assets.xcassets/PrivacySettings/group_lock.imageset/group_lock@2x.png create mode 100644 QuickLocation/Assets.xcassets/PrivacySettings/group_lock.imageset/group_lock@3x.png create mode 100644 QuickLocation/Assets.xcassets/PrivacySettings/phone_report.imageset/Contents.json create mode 100644 QuickLocation/Assets.xcassets/PrivacySettings/phone_report.imageset/phone_report@2x.png create mode 100644 QuickLocation/Assets.xcassets/PrivacySettings/phone_report.imageset/phone_report@3x.png create mode 100644 QuickLocation/Assets.xcassets/PrivacySettings/pigeon_message.imageset/Contents.json create mode 100644 QuickLocation/Assets.xcassets/PrivacySettings/pigeon_message.imageset/pigeon_message@2x.png create mode 100644 QuickLocation/Assets.xcassets/PrivacySettings/pigeon_message.imageset/pigeon_message@3x.png create mode 100644 QuickLocation/Assets.xcassets/PrivacySettings/privacy_entry.imageset/Contents.json create mode 100644 QuickLocation/Assets.xcassets/PrivacySettings/privacy_entry.imageset/privacy_entry@2x.png create mode 100644 QuickLocation/Assets.xcassets/PrivacySettings/privacy_entry.imageset/privacy_entry@3x.png create mode 100644 QuickLocation/Component/PrivilegeDeniedOverlay.swift create mode 100644 QuickLocation/Manager/MQTT/PhoneStatusCollector.swift create mode 100644 QuickLocation/Model/MailboxModel.swift create mode 100644 QuickLocation/Section/Group/Mailbox/MailboxDetailViewController.swift create mode 100644 QuickLocation/Section/Group/Mailbox/MailboxView.swift create mode 100644 QuickLocation/Section/Group/Mailbox/MailboxViewController.swift create mode 100644 QuickLocation/Section/Home/SOS/SOSListViewController.swift create mode 100644 QuickLocation/Section/Mine/PrivacySettings/PrivacySettingsViewController.swift diff --git a/Podfile b/Podfile index 84e322ee..f4c8f513 100644 --- a/Podfile +++ b/Podfile @@ -2,6 +2,15 @@ source 'https://gitee.com/mirrors/CocoaPods-Specs.git' platform :ios, '16.0' use_frameworks! + +# AdHoc is a custom configuration. Without this mapping CocoaPods only +# generates Debug/Release xcfilelists, and AdHoc builds fail to embed pods. +project 'QuickLocation.xcodeproj', { + 'Debug' => :debug, + 'Release' => :release, + 'AdHoc' => :release, +} + target 'QuickLocation' do # Comment the next line if you don't want to use dynamic frameworks use_frameworks! @@ -139,6 +148,10 @@ post_install do |installer| end end + if File.basename(path) == 'Pods-QuickLocation.adhoc.xcconfig' && content !~ /SWIFT_ACTIVE_COMPILATION_CONDITIONS/ + content += "\nSWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) AdHoc\n" + end + File.write(path, content) end end diff --git a/Podfile.lock b/Podfile.lock index 94a60268..8d86956f 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -374,6 +374,6 @@ SPEC CHECKSUMS: YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54 ZXSDK: 786338c0a18e98e03eda00699c3bfd2700b97117 -PODFILE CHECKSUM: f676321d820ce55c18e69318732ac59e39a57e43 +PODFILE CHECKSUM: 3272194e421676580050601835b59f7c4d288888 COCOAPODS: 1.16.2 diff --git a/QuickLocation.xcodeproj/project.pbxproj b/QuickLocation.xcodeproj/project.pbxproj index 09aa26fa..a43daad5 100644 --- a/QuickLocation.xcodeproj/project.pbxproj +++ b/QuickLocation.xcodeproj/project.pbxproj @@ -19,9 +19,6 @@ 305A768E2FCA8C7000227D26 /* SignPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305A74CD2FCA8C7000227D26 /* SignPlugin.swift */; }; 305A768F2FCA8C7000227D26 /* SystemAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305A74CE2FCA8C7000227D26 /* SystemAPI.swift */; }; 305A76902FCA8C7000227D26 /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305A74CF2FCA8C7000227D26 /* UserAPI.swift */; }; - 55B230033032000100785004 /* PigeonAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B230023032000100785003 /* PigeonAPI.swift */; }; - 55B230013032000100785002 /* UploadService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B230003032000100785001 /* UploadService.swift */; }; - 55B230053032000100785006 /* PigeonService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B230043032000100785005 /* PigeonService.swift */; }; 305A76912FCA8C7000227D26 /* Constant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305A74D22FCA8C7000227D26 /* Constant.swift */; }; 305A76922FCA8C7000227D26 /* LogUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305A74D32FCA8C7000227D26 /* LogUtils.swift */; }; 305A76932FCA8C7000227D26 /* AddImageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305A74D52FCA8C7000227D26 /* AddImageCell.swift */; }; @@ -90,7 +87,6 @@ 305A76D22FCA8C7000227D26 /* ThemeManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305A75292FCA8C7000227D26 /* ThemeManager.swift */; }; 305A76D32FCA8C7000227D26 /* URLManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305A752B2FCA8C7000227D26 /* URLManager.swift */; }; 305A76D42FCA8C7000227D26 /* GroupModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305A752E2FCA8C7000227D26 /* GroupModel.swift */; }; - 55B230073032000100785008 /* PigeonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B230063032000100785007 /* PigeonModel.swift */; }; 305A76D52FCA8C7000227D26 /* SystemResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305A752F2FCA8C7000227D26 /* SystemResponse.swift */; }; 305A76D62FCA8C7000227D26 /* ImagePlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305A75312FCA8C7000227D26 /* ImagePlugin.swift */; }; 305A76D72FCA8C7000227D26 /* NotEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305A75322FCA8C7000227D26 /* NotEmpty.swift */; }; @@ -166,13 +162,6 @@ 305A79902FCAC61A00227D26 /* InviteMemberVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305A798F2FCAC61A00227D26 /* InviteMemberVC.swift */; }; 3062E8B52FCE6BBA00CEF511 /* ScanVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3062E8B42FCE6BBA00CEF511 /* ScanVC.swift */; }; 3062E8B72FCE6BFE00CEF511 /* ScanView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3062E8B62FCE6BFE00CEF511 /* ScanView.swift */; }; - 30A1C0A12FEB000100CA0001 /* CameraCaptureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30A1C0A02FEB000100CA0001 /* CameraCaptureView.swift */; }; - 30A1C0A32FEB000100CA0001 /* CameraCaptureVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30A1C0A22FEB000100CA0001 /* CameraCaptureVC.swift */; }; - 30B2D0B12FEB111100CA0001 /* PhotoPickerStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D0B02FEB111100CA0001 /* PhotoPickerStore.swift */; }; - 30B2D0B32FEB111100CA0001 /* PhotoPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D0B22FEB111100CA0001 /* PhotoPickerView.swift */; }; - 30B2D0B52FEB111100CA0001 /* PhotoPickerAlbumView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D0B42FEB111100CA0001 /* PhotoPickerAlbumView.swift */; }; - 30B2D0B72FEB111100CA0001 /* PhotoPickerPreviewVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D0B62FEB111100CA0001 /* PhotoPickerPreviewVC.swift */; }; - 30B2D0B92FEB111100CA0001 /* PhotoPickerVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D0B82FEB111100CA0001 /* PhotoPickerVC.swift */; }; 3062E8BA2FCEAC6500CEF511 /* CreateGroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3062E8B92FCEAC6500CEF511 /* CreateGroupView.swift */; }; 3062E8BC2FCEAC7100CEF511 /* CreateGroupVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3062E8BB2FCEAC7100CEF511 /* CreateGroupVC.swift */; }; 3062E8BE2FCEBD0E00CEF511 /* GroupIconListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3062E8BD2FCEBD0E00CEF511 /* GroupIconListVC.swift */; }; @@ -185,6 +174,8 @@ 307073E52FD18A20004C37CC /* GroupChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 307073E32FD18A20004C37CC /* GroupChatView.swift */; }; 307073E62FD18A20004C37CC /* GroupChatVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 307073E22FD18A20004C37CC /* GroupChatVC.swift */; }; 307073EA2FD2715A004C37CC /* GroupChatViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 307073E92FD2715A004C37CC /* GroupChatViewModel.swift */; }; + 30A1C0A12FEB000100CA0001 /* CameraCaptureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30A1C0A02FEB000100CA0001 /* CameraCaptureView.swift */; }; + 30A1C0A32FEB000100CA0001 /* CameraCaptureVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30A1C0A22FEB000100CA0001 /* CameraCaptureVC.swift */; }; 30A7A9112FCAEE3D00105780 /* GroupListPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30A7A9102FCAEE3D00105780 /* GroupListPopView.swift */; }; 30A87A4B2FEE1DAB0095E7C6 /* ItineraryDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30A87A4A2FEE1DAB0095E7C6 /* ItineraryDetailVC.swift */; }; 30A87A4D2FEE1DB40095E7C6 /* ItineraryDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30A87A4C2FEE1DB40095E7C6 /* ItineraryDetailView.swift */; }; @@ -208,6 +199,11 @@ 30ACD54E2FF7942E00174861 /* PromotionalActivitiesVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30ACD54D2FF7942E00174861 /* PromotionalActivitiesVC.swift */; }; 30ACD5502FF7943A00174861 /* PromotionalActivitiesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30ACD54F2FF7943A00174861 /* PromotionalActivitiesView.swift */; }; 30ACD67B2FF7B36A00174861 /* PopupQueueManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30ACD67A2FF7B36A00174861 /* PopupQueueManager.swift */; }; + 30B2D0B12FEB111100CA0001 /* PhotoPickerStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D0B02FEB111100CA0001 /* PhotoPickerStore.swift */; }; + 30B2D0B32FEB111100CA0001 /* PhotoPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D0B22FEB111100CA0001 /* PhotoPickerView.swift */; }; + 30B2D0B52FEB111100CA0001 /* PhotoPickerAlbumView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D0B42FEB111100CA0001 /* PhotoPickerAlbumView.swift */; }; + 30B2D0B72FEB111100CA0001 /* PhotoPickerPreviewVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D0B62FEB111100CA0001 /* PhotoPickerPreviewVC.swift */; }; + 30B2D0B92FEB111100CA0001 /* PhotoPickerVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D0B82FEB111100CA0001 /* PhotoPickerVC.swift */; }; 30B74B3A2FF2115A00F6744D /* GroupScheduleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30B74B392FF2115A00F6744D /* GroupScheduleView.swift */; }; 30B74B3C2FF2117900F6744D /* GroupScheduleVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30B74B3B2FF2117900F6744D /* GroupScheduleVC.swift */; }; 30B74B412FF2437E00F6744D /* GroupMemberListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30B74B402FF2437E00F6744D /* GroupMemberListVC.swift */; }; @@ -259,7 +255,7 @@ 30D74BF42FEB6F5B0050EB2C /* LocationPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30D74BF12FEB6F5B0050EB2C /* LocationPickerView.swift */; }; 30D74D1F2FEBB09B0050EB2C /* CreateScheduleVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30D74D1E2FEBB09B0050EB2C /* CreateScheduleVM.swift */; }; 30D87CDB2FDFA9EE00E958FD /* MQTTService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30D87CDA2FDFA9EE00E958FD /* MQTTService.swift */; }; - 55B240013034000100786001 /* MemberWeatherService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B240023034000100786002 /* MemberWeatherService.swift */; }; + 55C1A0113034101000786011 /* PhoneStatusCollector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55C1A0103034101000786010 /* PhoneStatusCollector.swift */; }; 30D87CDD2FDFF07500E958FD /* InteractionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30D87CDC2FDFF07500E958FD /* InteractionView.swift */; }; 30D87CDF2FDFF1A100E958FD /* QuickMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30D87CDE2FDFF1A100E958FD /* QuickMessageView.swift */; }; 30D87D042FE1336300E958FD /* NavigationVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30D87D012FE1336300E958FD /* NavigationVC.swift */; }; @@ -319,6 +315,7 @@ 55B217B13022F0A000784711 /* GroupItineraryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B217B03022F0A000784710 /* GroupItineraryView.swift */; }; 55B217C13022F0A000784721 /* MinePhotoWallView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B217C03022F0A000784720 /* MinePhotoWallView.swift */; }; 55B217C33022F0A000784723 /* MemberPhoneReportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B217C23022F0A000784722 /* MemberPhoneReportView.swift */; }; + 55C1A0213034102000786021 /* PrivilegeDeniedOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55C1A0203034102000786020 /* PrivilegeDeniedOverlay.swift */; }; 55B217C53022F0A000784725 /* MemberAppUsageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B217C43022F0A000784724 /* MemberAppUsageView.swift */; }; 55B217D13022F0A000784727 /* UnlockCountManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B217D03022F0A000784726 /* UnlockCountManager.swift */; }; 55B217D23023010000784731 /* TodayTrackDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B217D13023010000784730 /* TodayTrackDetailVC.swift */; }; @@ -327,22 +324,15 @@ 55B217D83023010000784737 /* PhoneReportDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B217D73023010000784736 /* PhoneReportDetailVC.swift */; }; 55B217DA3023010000784739 /* PhoneReportDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B217D93023010000784738 /* PhoneReportDetailView.swift */; }; 55B217DC302301000078473B /* PhoneReportDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B217DB302301000078473A /* PhoneReportDetailViewModel.swift */; }; - 55B240013040000100784901 /* AppUsageReportVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B240003040000100784900 /* AppUsageReportVC.swift */; }; - 55B240033040000100784903 /* AppUsageReportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B240023040000100784902 /* AppUsageReportView.swift */; }; - 55B240053040000100784905 /* AppUsageReportViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B240043040000100784904 /* AppUsageReportViewModel.swift */; }; 55B218A13024A00100784702 /* AboutVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B218A13024A00100784701 /* AboutVC.swift */; }; 55B218A13024A00100784704 /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B218A13024A00100784703 /* AboutView.swift */; }; 55B218A13024A00100784706 /* CancelAccountVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B218A13024A00100784705 /* CancelAccountVC.swift */; }; 55B218A13024A00100784708 /* CancelAccountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B218A13024A00100784707 /* CancelAccountView.swift */; }; 55B218A13024A0010078470A /* MemberInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B218A13024A00100784709 /* MemberInfoVC.swift */; }; 55B218A13024A0010078470C /* MemberInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B218A13024A0010078470B /* MemberInfoView.swift */; }; - 55B233013035000100785041 /* GenderSelectPopVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B233003035000100785040 /* GenderSelectPopVC.swift */; }; - 55B234013036000100785051 /* RelationSelectPopVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B234003036000100785050 /* RelationSelectPopVC.swift */; }; - 55B234033036000100785053 /* RelationStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B234023036000100785052 /* RelationStore.swift */; }; 55B218B13024B00100784722 /* FeatureIntroVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B218B13024B00100784721 /* FeatureIntroVC.swift */; }; 55B218B13024B00100784724 /* FeatureIntroView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B218B13024B00100784723 /* FeatureIntroView.swift */; }; 55B219A2302A000100784751 /* UnlockRequestPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B219A1302A000100784750 /* UnlockRequestPopView.swift */; }; - 55B250023050000100784902 /* LockedAppPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B250013050000100784901 /* LockedAppPopView.swift */; }; 55B219B2302A000100784761 /* ReceiveMessagePopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B219B1302A000100784760 /* ReceiveMessagePopView.swift */; }; 55B219B4302A000100784763 /* ReceiveMessageReportPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B219B3302A000100784762 /* ReceiveMessageReportPopView.swift */; }; 55B219C13024C00100784722 /* BubbleHeroView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B219C13024C00100784721 /* BubbleHeroView.swift */; }; @@ -355,6 +345,7 @@ 55B219C8302A000100784778 /* PigeonMessageHistoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B219C7302A000100784777 /* PigeonMessageHistoryView.swift */; }; 55B21A02302B0001007847A2 /* SOSAnimationViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B21A01302B0001007847A1 /* SOSAnimationViews.swift */; }; 55B21A04302B0001007847A4 /* SOSReceiveAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B21A03302B0001007847A3 /* SOSReceiveAlertView.swift */; }; + 55B21A06302B0001007847A6 /* SOSListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B21A05302B0001007847A5 /* SOSListViewController.swift */; }; 55B21D6E3023117900784774 /* 优设标题黑_猫啃网.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 55B21D6D3023117900784774 /* 优设标题黑_猫啃网.ttf */; }; 55B220013031000100784801 /* FeedbackVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B220003031000100784800 /* FeedbackVC.swift */; }; 55B220033031000100784803 /* FeedbackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B220023031000100784802 /* FeedbackView.swift */; }; @@ -365,6 +356,27 @@ 55B221270000000100784827 /* MoodStatusCatalog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B221260000000100784826 /* MoodStatusCatalog.swift */; }; 55B222010000000100784831 /* AddEmojiPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B222000000000100784830 /* AddEmojiPopView.swift */; }; 55B222030000000100784833 /* AddMessagePopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B222020000000100784832 /* AddMessagePopView.swift */; }; + 55B230013032000100785002 /* UploadService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B230003032000100785001 /* UploadService.swift */; }; + 55B230033032000100785004 /* PigeonAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B230023032000100785003 /* PigeonAPI.swift */; }; + 55B230053032000100785006 /* PigeonService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B230043032000100785005 /* PigeonService.swift */; }; + 55B230073032000100785008 /* PigeonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B230063032000100785007 /* PigeonModel.swift */; }; + 55B230093032000100785010 /* LockDistractPermissionPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B230083032000100785009 /* LockDistractPermissionPopView.swift */; }; + 55B232013034000100785031 /* PigeonUploadPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B232003034000100785030 /* PigeonUploadPopView.swift */; }; + 55B232033034000100785033 /* PigeonWatermarkCameraVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B232023034000100785032 /* PigeonWatermarkCameraVC.swift */; }; + 55B232053034000100785035 /* PigeonWatermarkCameraView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B232043034000100785034 /* PigeonWatermarkCameraView.swift */; }; + 55B233013035000100785041 /* GenderSelectPopVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B233003035000100785040 /* GenderSelectPopVC.swift */; }; + 55B234013036000100785051 /* RelationSelectPopVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B234003036000100785050 /* RelationSelectPopVC.swift */; }; + 55B234033036000100785053 /* RelationStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B234023036000100785052 /* RelationStore.swift */; }; + 55B240013034000100786001 /* MemberWeatherService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B240023034000100786002 /* MemberWeatherService.swift */; }; + 55B240013040000100784901 /* AppUsageReportVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B240003040000100784900 /* AppUsageReportVC.swift */; }; + 55B240033040000100784903 /* AppUsageReportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B240023040000100784902 /* AppUsageReportView.swift */; }; + 55B240053040000100784905 /* AppUsageReportViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B240043040000100784904 /* AppUsageReportViewModel.swift */; }; + 55B250023038000100786502 /* MailboxModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B250013038000100786501 /* MailboxModel.swift */; }; + 55B250023050000100784902 /* LockedAppPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B250013050000100784901 /* LockedAppPopView.swift */; }; + 55B250043038000100786504 /* MailboxView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B250033038000100786503 /* MailboxView.swift */; }; + 55B250063038000100786506 /* MailboxViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B250053038000100786505 /* MailboxViewController.swift */; }; + 55B250083038000100786508 /* MailboxDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B250073038000100786507 /* MailboxDetailViewController.swift */; }; + 55B261010000000100786601 /* PrivacySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B261000000000100786600 /* PrivacySettingsViewController.swift */; }; 55BF752D2FFE53F70055DA57 /* LocationPermissionPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55BF752C2FFE53F70055DA57 /* LocationPermissionPopView.swift */; }; 55BF75352FFF91690055DA57 /* InteractionEmojiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55BF75342FFF91690055DA57 /* InteractionEmojiCell.swift */; }; 55C219C13024C00100784731 /* SearchLocationHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55C219C13024C00100784730 /* SearchLocationHeaderView.swift */; }; @@ -386,10 +398,6 @@ C15D41A1770F5B4A02E5FC59 /* AppRestrictShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AB29D0618C4BE76F2CA5261 /* AppRestrictShared.swift */; }; C3C4ACC1AE3CAF5BA21328B7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 226CA98495C2884EBB1D1372 /* Foundation.framework */; }; C6A99DEE361AB31477F88475 /* LockDistractView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC46E80B848E4012D192E4CE /* LockDistractView.swift */; }; - 55B230093032000100785010 /* LockDistractPermissionPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B230083032000100785009 /* LockDistractPermissionPopView.swift */; }; - 55B232013034000100785031 /* PigeonUploadPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B232003034000100785030 /* PigeonUploadPopView.swift */; }; - 55B232033034000100785033 /* PigeonWatermarkCameraVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B232023034000100785032 /* PigeonWatermarkCameraVC.swift */; }; - 55B232053034000100785035 /* PigeonWatermarkCameraView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B232043034000100785034 /* PigeonWatermarkCameraView.swift */; }; CC53DE2CA88E529129547A52 /* ShieldConfigurationExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 0C47E0012491DB1371FD5E53 /* ShieldConfigurationExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; D3C101B198090A9F4D93E44F /* FamilyControls.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CD6B965A124276661A84C4C /* FamilyControls.framework */; }; D60B79067C80CD6AF50D63FE /* FamilyControls.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CD6B965A124276661A84C4C /* FamilyControls.framework */; }; @@ -437,6 +445,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 01BC26D9997CBD9CF070EA6A /* Pods-QuickLocation.adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QuickLocation.adhoc.xcconfig"; path = "Target Support Files/Pods-QuickLocation/Pods-QuickLocation.adhoc.xcconfig"; sourceTree = ""; }; 08002267FC4390B20D3510B3 /* ShieldConfigurationExtension.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ShieldConfigurationExtension.swift; path = ShieldConfigurationExtension/ShieldConfigurationExtension.swift; sourceTree = ""; }; 0C47E0012491DB1371FD5E53 /* ShieldConfigurationExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = ShieldConfigurationExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 1AB29D0618C4BE76F2CA5261 /* AppRestrictShared.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AppRestrictShared.swift; path = AppRestrictShared/AppRestrictShared.swift; sourceTree = ""; }; @@ -452,9 +461,6 @@ 305A74CD2FCA8C7000227D26 /* SignPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignPlugin.swift; sourceTree = ""; }; 305A74CE2FCA8C7000227D26 /* SystemAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemAPI.swift; sourceTree = ""; }; 305A74CF2FCA8C7000227D26 /* UserAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = ""; }; - 55B230023032000100785003 /* PigeonAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PigeonAPI.swift; sourceTree = ""; }; - 55B230003032000100785001 /* UploadService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UploadService.swift; sourceTree = ""; }; - 55B230043032000100785005 /* PigeonService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PigeonService.swift; sourceTree = ""; }; 305A74D12FCA8C7000227D26 /* adhoc.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = adhoc.xcconfig; sourceTree = ""; }; 305A74D22FCA8C7000227D26 /* Constant.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constant.swift; sourceTree = ""; }; 305A74D32FCA8C7000227D26 /* LogUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogUtils.swift; sourceTree = ""; }; @@ -526,7 +532,6 @@ 305A75292FCA8C7000227D26 /* ThemeManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeManager.swift; sourceTree = ""; }; 305A752B2FCA8C7000227D26 /* URLManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLManager.swift; sourceTree = ""; }; 305A752E2FCA8C7000227D26 /* GroupModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupModel.swift; sourceTree = ""; }; - 55B230063032000100785007 /* PigeonModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PigeonModel.swift; sourceTree = ""; }; 305A752F2FCA8C7000227D26 /* SystemResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemResponse.swift; sourceTree = ""; }; 305A75312FCA8C7000227D26 /* ImagePlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePlugin.swift; sourceTree = ""; }; 305A75322FCA8C7000227D26 /* NotEmpty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotEmpty.swift; sourceTree = ""; }; @@ -607,13 +612,6 @@ 305A798F2FCAC61A00227D26 /* InviteMemberVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InviteMemberVC.swift; sourceTree = ""; }; 3062E8B42FCE6BBA00CEF511 /* ScanVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanVC.swift; sourceTree = ""; }; 3062E8B62FCE6BFE00CEF511 /* ScanView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanView.swift; sourceTree = ""; }; - 30A1C0A02FEB000100CA0001 /* CameraCaptureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraCaptureView.swift; sourceTree = ""; }; - 30A1C0A22FEB000100CA0001 /* CameraCaptureVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraCaptureVC.swift; sourceTree = ""; }; - 30B2D0B02FEB111100CA0001 /* PhotoPickerStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoPickerStore.swift; sourceTree = ""; }; - 30B2D0B22FEB111100CA0001 /* PhotoPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoPickerView.swift; sourceTree = ""; }; - 30B2D0B42FEB111100CA0001 /* PhotoPickerAlbumView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoPickerAlbumView.swift; sourceTree = ""; }; - 30B2D0B62FEB111100CA0001 /* PhotoPickerPreviewVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoPickerPreviewVC.swift; sourceTree = ""; }; - 30B2D0B82FEB111100CA0001 /* PhotoPickerVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoPickerVC.swift; sourceTree = ""; }; 3062E8B92FCEAC6500CEF511 /* CreateGroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateGroupView.swift; sourceTree = ""; }; 3062E8BB2FCEAC7100CEF511 /* CreateGroupVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateGroupVC.swift; sourceTree = ""; }; 3062E8BD2FCEBD0E00CEF511 /* GroupIconListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupIconListVC.swift; sourceTree = ""; }; @@ -626,6 +624,8 @@ 307073E22FD18A20004C37CC /* GroupChatVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupChatVC.swift; sourceTree = ""; }; 307073E32FD18A20004C37CC /* GroupChatView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupChatView.swift; sourceTree = ""; }; 307073E92FD2715A004C37CC /* GroupChatViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupChatViewModel.swift; sourceTree = ""; }; + 30A1C0A02FEB000100CA0001 /* CameraCaptureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraCaptureView.swift; sourceTree = ""; }; + 30A1C0A22FEB000100CA0001 /* CameraCaptureVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraCaptureVC.swift; sourceTree = ""; }; 30A7A9102FCAEE3D00105780 /* GroupListPopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupListPopView.swift; sourceTree = ""; }; 30A87A4A2FEE1DAB0095E7C6 /* ItineraryDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItineraryDetailVC.swift; sourceTree = ""; }; 30A87A4C2FEE1DB40095E7C6 /* ItineraryDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItineraryDetailView.swift; sourceTree = ""; }; @@ -649,6 +649,11 @@ 30ACD54D2FF7942E00174861 /* PromotionalActivitiesVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromotionalActivitiesVC.swift; sourceTree = ""; }; 30ACD54F2FF7943A00174861 /* PromotionalActivitiesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromotionalActivitiesView.swift; sourceTree = ""; }; 30ACD67A2FF7B36A00174861 /* PopupQueueManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopupQueueManager.swift; sourceTree = ""; }; + 30B2D0B02FEB111100CA0001 /* PhotoPickerStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoPickerStore.swift; sourceTree = ""; }; + 30B2D0B22FEB111100CA0001 /* PhotoPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoPickerView.swift; sourceTree = ""; }; + 30B2D0B42FEB111100CA0001 /* PhotoPickerAlbumView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoPickerAlbumView.swift; sourceTree = ""; }; + 30B2D0B62FEB111100CA0001 /* PhotoPickerPreviewVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoPickerPreviewVC.swift; sourceTree = ""; }; + 30B2D0B82FEB111100CA0001 /* PhotoPickerVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoPickerVC.swift; sourceTree = ""; }; 30B74B392FF2115A00F6744D /* GroupScheduleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupScheduleView.swift; sourceTree = ""; }; 30B74B3B2FF2117900F6744D /* GroupScheduleVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupScheduleVC.swift; sourceTree = ""; }; 30B74B402FF2437E00F6744D /* GroupMemberListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupMemberListVC.swift; sourceTree = ""; }; @@ -701,7 +706,7 @@ 30D74BF12FEB6F5B0050EB2C /* LocationPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationPickerView.swift; sourceTree = ""; }; 30D74D1E2FEBB09B0050EB2C /* CreateScheduleVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateScheduleVM.swift; sourceTree = ""; }; 30D87CDA2FDFA9EE00E958FD /* MQTTService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MQTTService.swift; sourceTree = ""; }; - 55B240023034000100786002 /* MemberWeatherService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemberWeatherService.swift; sourceTree = ""; }; + 55C1A0103034101000786010 /* PhoneStatusCollector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhoneStatusCollector.swift; sourceTree = ""; }; 30D87CDC2FDFF07500E958FD /* InteractionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InteractionView.swift; sourceTree = ""; }; 30D87CDE2FDFF1A100E958FD /* QuickMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickMessageView.swift; sourceTree = ""; }; 30D87D012FE1336300E958FD /* NavigationVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationVC.swift; sourceTree = ""; }; @@ -765,6 +770,7 @@ 55B217B03022F0A000784710 /* GroupItineraryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupItineraryView.swift; sourceTree = ""; }; 55B217C03022F0A000784720 /* MinePhotoWallView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MinePhotoWallView.swift; sourceTree = ""; }; 55B217C23022F0A000784722 /* MemberPhoneReportView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemberPhoneReportView.swift; sourceTree = ""; }; + 55C1A0203034102000786020 /* PrivilegeDeniedOverlay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivilegeDeniedOverlay.swift; sourceTree = ""; }; 55B217C43022F0A000784724 /* MemberAppUsageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemberAppUsageView.swift; sourceTree = ""; }; 55B217D03022F0A000784726 /* UnlockCountManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnlockCountManager.swift; sourceTree = ""; }; 55B217D13023010000784730 /* TodayTrackDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TodayTrackDetailVC.swift; sourceTree = ""; }; @@ -773,22 +779,15 @@ 55B217D73023010000784736 /* PhoneReportDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhoneReportDetailVC.swift; sourceTree = ""; }; 55B217D93023010000784738 /* PhoneReportDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhoneReportDetailView.swift; sourceTree = ""; }; 55B217DB302301000078473A /* PhoneReportDetailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhoneReportDetailViewModel.swift; sourceTree = ""; }; - 55B240003040000100784900 /* AppUsageReportVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppUsageReportVC.swift; sourceTree = ""; }; - 55B240023040000100784902 /* AppUsageReportView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppUsageReportView.swift; sourceTree = ""; }; - 55B240043040000100784904 /* AppUsageReportViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppUsageReportViewModel.swift; sourceTree = ""; }; 55B218A13024A00100784701 /* AboutVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutVC.swift; sourceTree = ""; }; 55B218A13024A00100784703 /* AboutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutView.swift; sourceTree = ""; }; 55B218A13024A00100784705 /* CancelAccountVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CancelAccountVC.swift; sourceTree = ""; }; 55B218A13024A00100784707 /* CancelAccountView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CancelAccountView.swift; sourceTree = ""; }; 55B218A13024A00100784709 /* MemberInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemberInfoVC.swift; sourceTree = ""; }; 55B218A13024A0010078470B /* MemberInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemberInfoView.swift; sourceTree = ""; }; - 55B233003035000100785040 /* GenderSelectPopVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenderSelectPopVC.swift; sourceTree = ""; }; - 55B234003036000100785050 /* RelationSelectPopVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelationSelectPopVC.swift; sourceTree = ""; }; - 55B234023036000100785052 /* RelationStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelationStore.swift; sourceTree = ""; }; 55B218B13024B00100784721 /* FeatureIntroVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureIntroVC.swift; sourceTree = ""; }; 55B218B13024B00100784723 /* FeatureIntroView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureIntroView.swift; sourceTree = ""; }; 55B219A1302A000100784750 /* UnlockRequestPopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnlockRequestPopView.swift; sourceTree = ""; }; - 55B250013050000100784901 /* LockedAppPopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LockedAppPopView.swift; sourceTree = ""; }; 55B219B1302A000100784760 /* ReceiveMessagePopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReceiveMessagePopView.swift; sourceTree = ""; }; 55B219B3302A000100784762 /* ReceiveMessageReportPopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReceiveMessageReportPopView.swift; sourceTree = ""; }; 55B219C13024C00100784721 /* BubbleHeroView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BubbleHeroView.swift; sourceTree = ""; }; @@ -801,6 +800,7 @@ 55B219C7302A000100784777 /* PigeonMessageHistoryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PigeonMessageHistoryView.swift; sourceTree = ""; }; 55B21A01302B0001007847A1 /* SOSAnimationViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SOSAnimationViews.swift; sourceTree = ""; }; 55B21A03302B0001007847A3 /* SOSReceiveAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SOSReceiveAlertView.swift; sourceTree = ""; }; + 55B21A05302B0001007847A5 /* SOSListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SOSListViewController.swift; sourceTree = ""; }; 55B21D6D3023117900784774 /* 优设标题黑_猫啃网.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "优设标题黑_猫啃网.ttf"; sourceTree = ""; }; 55B220003031000100784800 /* FeedbackVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackVC.swift; sourceTree = ""; }; 55B220023031000100784802 /* FeedbackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackView.swift; sourceTree = ""; }; @@ -811,6 +811,27 @@ 55B221260000000100784826 /* MoodStatusCatalog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoodStatusCatalog.swift; sourceTree = ""; }; 55B222000000000100784830 /* AddEmojiPopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEmojiPopView.swift; sourceTree = ""; }; 55B222020000000100784832 /* AddMessagePopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddMessagePopView.swift; sourceTree = ""; }; + 55B230003032000100785001 /* UploadService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UploadService.swift; sourceTree = ""; }; + 55B230023032000100785003 /* PigeonAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PigeonAPI.swift; sourceTree = ""; }; + 55B230043032000100785005 /* PigeonService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PigeonService.swift; sourceTree = ""; }; + 55B230063032000100785007 /* PigeonModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PigeonModel.swift; sourceTree = ""; }; + 55B230083032000100785009 /* LockDistractPermissionPopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LockDistractPermissionPopView.swift; sourceTree = ""; }; + 55B232003034000100785030 /* PigeonUploadPopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PigeonUploadPopView.swift; sourceTree = ""; }; + 55B232023034000100785032 /* PigeonWatermarkCameraVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PigeonWatermarkCameraVC.swift; sourceTree = ""; }; + 55B232043034000100785034 /* PigeonWatermarkCameraView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PigeonWatermarkCameraView.swift; sourceTree = ""; }; + 55B233003035000100785040 /* GenderSelectPopVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenderSelectPopVC.swift; sourceTree = ""; }; + 55B234003036000100785050 /* RelationSelectPopVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelationSelectPopVC.swift; sourceTree = ""; }; + 55B234023036000100785052 /* RelationStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelationStore.swift; sourceTree = ""; }; + 55B240003040000100784900 /* AppUsageReportVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppUsageReportVC.swift; sourceTree = ""; }; + 55B240023034000100786002 /* MemberWeatherService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemberWeatherService.swift; sourceTree = ""; }; + 55B240023040000100784902 /* AppUsageReportView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppUsageReportView.swift; sourceTree = ""; }; + 55B240043040000100784904 /* AppUsageReportViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppUsageReportViewModel.swift; sourceTree = ""; }; + 55B250013038000100786501 /* MailboxModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MailboxModel.swift; sourceTree = ""; }; + 55B250013050000100784901 /* LockedAppPopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LockedAppPopView.swift; sourceTree = ""; }; + 55B250033038000100786503 /* MailboxView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MailboxView.swift; sourceTree = ""; }; + 55B250053038000100786505 /* MailboxViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MailboxViewController.swift; sourceTree = ""; }; + 55B250073038000100786507 /* MailboxDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MailboxDetailViewController.swift; sourceTree = ""; }; + 55B261000000000100786600 /* PrivacySettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacySettingsViewController.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 = ""; }; 55C219C13024C00100784730 /* SearchLocationHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchLocationHeaderView.swift; sourceTree = ""; }; @@ -825,10 +846,6 @@ 98E91E51811235EAD0985421 /* DeviceActivityMonitorExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = DeviceActivityMonitorExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; A1B2C3D52FDABC8C009215C1 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; AC46E80B848E4012D192E4CE /* LockDistractView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LockDistractView.swift; sourceTree = ""; }; - 55B230083032000100785009 /* LockDistractPermissionPopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LockDistractPermissionPopView.swift; sourceTree = ""; }; - 55B232003034000100785030 /* PigeonUploadPopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PigeonUploadPopView.swift; sourceTree = ""; }; - 55B232023034000100785032 /* PigeonWatermarkCameraVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PigeonWatermarkCameraVC.swift; sourceTree = ""; }; - 55B232043034000100785034 /* PigeonWatermarkCameraView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PigeonWatermarkCameraView.swift; sourceTree = ""; }; BE3D39F325FC7624C1D914D6 /* ITunesSearchService.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ITunesSearchService.swift; path = AppRestrict/ITunesSearchService.swift; sourceTree = ""; }; BFFBDE92B94E7004F6B642AD /* AppRestrictShieldSettingsVC.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AppRestrictShieldSettingsVC.swift; path = AppRestrict/AppRestrictShieldSettingsVC.swift; sourceTree = ""; }; D0112B7865829D5B6A4A0BD0 /* AppRestrictVC.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AppRestrictVC.swift; path = AppRestrict/AppRestrictVC.swift; sourceTree = ""; }; @@ -1010,6 +1027,7 @@ 305A74E72FCA8C7000227D26 /* Component */ = { isa = PBXGroup; children = ( + 55C1A0203034102000786020 /* PrivilegeDeniedOverlay.swift */, 30A1C0A42FEB000100CA0001 /* CameraCapture */, 30B2D0BA2FEB111100CA0001 /* PhotoPicker */, 305A74D72FCA8C7000227D26 /* AddImageCell */, @@ -1020,27 +1038,6 @@ path = Component; sourceTree = ""; }; - 30A1C0A42FEB000100CA0001 /* CameraCapture */ = { - isa = PBXGroup; - children = ( - 30A1C0A02FEB000100CA0001 /* CameraCaptureView.swift */, - 30A1C0A22FEB000100CA0001 /* CameraCaptureVC.swift */, - ); - path = CameraCapture; - sourceTree = ""; - }; - 30B2D0BA2FEB111100CA0001 /* PhotoPicker */ = { - isa = PBXGroup; - children = ( - 30B2D0B02FEB111100CA0001 /* PhotoPickerStore.swift */, - 30B2D0B22FEB111100CA0001 /* PhotoPickerView.swift */, - 30B2D0B42FEB111100CA0001 /* PhotoPickerAlbumView.swift */, - 30B2D0B62FEB111100CA0001 /* PhotoPickerPreviewVC.swift */, - 30B2D0B82FEB111100CA0001 /* PhotoPickerVC.swift */, - ); - path = PhotoPicker; - sourceTree = ""; - }; 305A74EA2FCA8C7000227D26 /* RTL */ = { isa = PBXGroup; children = ( @@ -1238,6 +1235,7 @@ 305A75302FCA8C7000227D26 /* Model */ = { isa = PBXGroup; children = ( + 55B250013038000100786501 /* MailboxModel.swift */, 305A752E2FCA8C7000227D26 /* GroupModel.swift */, 55B230063032000100785007 /* PigeonModel.swift */, 305A752F2FCA8C7000227D26 /* SystemResponse.swift */, @@ -1294,6 +1292,7 @@ 305A76262FCA8C7000227D26 /* Group */ = { isa = PBXGroup; children = ( + 55B250093038000100786509 /* Mailbox */, 307073E02FD15F50004C37CC /* GroupIMService.swift */, 305A76242FCA8C7000227D26 /* GroupViewController.swift */, 305A76252FCA8C7000227D26 /* GroupViewModel.swift */, @@ -1393,6 +1392,7 @@ 55B218A13024A00100784711 /* CancelAccount */, 30EFF3D42FDA8EF200EB35D4 /* EmergencyContact */, 30EFF3E32FDAA92200EB35D4 /* PrivacyPolicy */, + 55B261020000000100786602 /* PrivacySettings */, 30C4C0122FDB9178009215C1 /* CheckPermission */, ); path = Mine; @@ -1644,6 +1644,15 @@ path = GroupChat; sourceTree = ""; }; + 30A1C0A42FEB000100CA0001 /* CameraCapture */ = { + isa = PBXGroup; + children = ( + 30A1C0A02FEB000100CA0001 /* CameraCaptureView.swift */, + 30A1C0A22FEB000100CA0001 /* CameraCaptureVC.swift */, + ); + path = CameraCapture; + sourceTree = ""; + }; 30A87A492FEE1CB20095E7C6 /* ItineraryDetail */ = { isa = PBXGroup; children = ( @@ -1714,6 +1723,18 @@ path = PopupWindow; sourceTree = ""; }; + 30B2D0BA2FEB111100CA0001 /* PhotoPicker */ = { + isa = PBXGroup; + children = ( + 30B2D0B02FEB111100CA0001 /* PhotoPickerStore.swift */, + 30B2D0B22FEB111100CA0001 /* PhotoPickerView.swift */, + 30B2D0B42FEB111100CA0001 /* PhotoPickerAlbumView.swift */, + 30B2D0B62FEB111100CA0001 /* PhotoPickerPreviewVC.swift */, + 30B2D0B82FEB111100CA0001 /* PhotoPickerVC.swift */, + ); + path = PhotoPicker; + sourceTree = ""; + }; 30B74B382FF2105C00F6744D /* GroupSchedule */ = { isa = PBXGroup; children = ( @@ -1828,6 +1849,7 @@ 30CCDE5B2FE3A1A800F5214A /* SOSPracticeView.swift */, 55B21A01302B0001007847A1 /* SOSAnimationViews.swift */, 55B21A03302B0001007847A3 /* SOSReceiveAlertView.swift */, + 55B21A05302B0001007847A5 /* SOSListViewController.swift */, ); path = SOS; sourceTree = ""; @@ -1875,6 +1897,7 @@ isa = PBXGroup; children = ( 30D87CDA2FDFA9EE00E958FD /* MQTTService.swift */, + 55C1A0103034101000786010 /* PhoneStatusCollector.swift */, 55B240023034000100786002 /* MemberWeatherService.swift */, ); path = MQTT; @@ -2055,16 +2078,6 @@ path = PhoneReportDetail; sourceTree = ""; }; - 55B240063040000100784906 /* AppUsageReport */ = { - isa = PBXGroup; - children = ( - 55B240003040000100784900 /* AppUsageReportVC.swift */, - 55B240023040000100784902 /* AppUsageReportView.swift */, - 55B240043040000100784904 /* AppUsageReportViewModel.swift */, - ); - path = AppUsageReport; - sourceTree = ""; - }; 55B218A13024A00100784710 /* About */ = { isa = PBXGroup; children = ( @@ -2138,6 +2151,34 @@ path = MoodStatus; sourceTree = ""; }; + 55B240063040000100784906 /* AppUsageReport */ = { + isa = PBXGroup; + children = ( + 55B240003040000100784900 /* AppUsageReportVC.swift */, + 55B240023040000100784902 /* AppUsageReportView.swift */, + 55B240043040000100784904 /* AppUsageReportViewModel.swift */, + ); + path = AppUsageReport; + sourceTree = ""; + }; + 55B250093038000100786509 /* Mailbox */ = { + isa = PBXGroup; + children = ( + 55B250053038000100786505 /* MailboxViewController.swift */, + 55B250033038000100786503 /* MailboxView.swift */, + 55B250073038000100786507 /* MailboxDetailViewController.swift */, + ); + path = Mailbox; + sourceTree = ""; + }; + 55B261020000000100786602 /* PrivacySettings */ = { + isa = PBXGroup; + children = ( + 55B261000000000100786600 /* PrivacySettingsViewController.swift */, + ); + path = PrivacySettings; + sourceTree = ""; + }; 74B9CD2ABDBC4C8CE3107CDE /* iOS */ = { isa = PBXGroup; children = ( @@ -2151,6 +2192,7 @@ children = ( DA16D49AA46D4F6838340B55 /* Pods-QuickLocation.debug.xcconfig */, E483B9929C03809ADEDE8341 /* Pods-QuickLocation.release.xcconfig */, + 01BC26D9997CBD9CF070EA6A /* Pods-QuickLocation.adhoc.xcconfig */, ); path = Pods; sourceTree = ""; @@ -2397,6 +2439,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 55B261010000000100786601 /* PrivacySettingsViewController.swift in Sources */, 30B74B452FF24D1B00F6744D /* GroupMemberListVM.swift in Sources */, 30A87A712FEF7BED0095E7C6 /* SearchLocationResultView.swift in Sources */, 305A76882FCA8C7000227D26 /* MoyaProvider+Rx.swift in Sources */, @@ -2412,6 +2455,7 @@ 305A768F2FCA8C7000227D26 /* SystemAPI.swift in Sources */, 30C4C0222FDC0ED3009215C1 /* GroupInfoVC.swift in Sources */, 305A76902FCA8C7000227D26 /* UserAPI.swift in Sources */, + 55B250023038000100786502 /* MailboxModel.swift in Sources */, 55B230033032000100785004 /* PigeonAPI.swift in Sources */, 55B230013032000100785002 /* UploadService.swift in Sources */, 55B230053032000100785006 /* PigeonService.swift in Sources */, @@ -2500,6 +2544,7 @@ 30CCDE582FE39F8C00F5214A /* SOSView.swift in Sources */, 55B21A02302B0001007847A2 /* SOSAnimationViews.swift in Sources */, 55B21A04302B0001007847A4 /* SOSReceiveAlertView.swift in Sources */, + 55B21A06302B0001007847A6 /* SOSListViewController.swift in Sources */, 30EFF3E02FDA9CE300EB35D4 /* EmergencyContactModel.swift in Sources */, 305A76B62FCA8C7000227D26 /* UITextField+Extensions.swift in Sources */, 30EFF3A82FD7C6A400EB35D4 /* GroupSettingViewModel.swift in Sources */, @@ -2537,6 +2582,7 @@ 55B2179330218CE100784774 /* GroupMemberView2.swift in Sources */, 55B217C53022F0A000784725 /* MemberAppUsageView.swift in Sources */, 55B217C33022F0A000784723 /* MemberPhoneReportView.swift in Sources */, + 55C1A0213034102000786021 /* PrivilegeDeniedOverlay.swift in Sources */, 55B217D23023010000784731 /* TodayTrackDetailVC.swift in Sources */, 55B217D43023010000784733 /* TodayTrackDetailView.swift in Sources */, 55B217D63023010000784735 /* TodayTrackDetailViewModel.swift in Sources */, @@ -2630,6 +2676,9 @@ 30EFF3BB2FD90D7600EB35D4 /* ConfirmPopVC.swift in Sources */, 30BAB8512FCD331C00C33B5C /* GroupAPI.swift in Sources */, 305A76E12FCA8C7000227D26 /* GroupViewController.swift in Sources */, + 55B250043038000100786504 /* MailboxView.swift in Sources */, + 55B250063038000100786506 /* MailboxViewController.swift in Sources */, + 55B250083038000100786508 /* MailboxDetailViewController.swift in Sources */, 30D74AB22FEA1D5D0050EB2C /* ScheduleViewModel.swift in Sources */, 30EFF3B52FD8F1D000EB35D4 /* ReviewMemberListVC.swift in Sources */, 30BAB84D2FCD2FDE00C33B5C /* InviteJoinView.swift in Sources */, @@ -2700,6 +2749,7 @@ 30B74B412FF2437E00F6744D /* GroupMemberListVC.swift in Sources */, 305A76FD2FCA8C7000227D26 /* EmptyDataSetSource.swift in Sources */, 30D87CDB2FDFA9EE00E958FD /* MQTTService.swift in Sources */, + 55C1A0113034101000786011 /* PhoneStatusCollector.swift in Sources */, 55B240013034000100786001 /* MemberWeatherService.swift in Sources */, 30EFF3CD2FDA668A00EB35D4 /* MyProfileView.swift in Sources */, 305A76FE2FCA8C7000227D26 /* EmptyDataSetView.swift in Sources */, @@ -2922,6 +2972,7 @@ SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "AdHoc $(inherited)"; SWIFT_APPROACHABLE_CONCURRENCY = YES; SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor; SWIFT_EMIT_LOC_STRINGS = YES; @@ -3167,7 +3218,7 @@ }; 559B7BA33037017D0031C511 /* AdHoc */ = { isa = XCBuildConfiguration; - baseConfigurationReference = DA16D49AA46D4F6838340B55 /* Pods-QuickLocation.debug.xcconfig */; + baseConfigurationReference = 01BC26D9997CBD9CF070EA6A /* Pods-QuickLocation.adhoc.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -3225,9 +3276,12 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = NO; CODE_SIGN_ENTITLEMENTS = DeviceActivityMonitorExtension/DeviceActivityMonitorExtension.entitlements; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "iPhone Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = LRDLWZ2Y83; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = LRDLWZ2Y83; GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = DeviceActivityMonitorExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 16.0; @@ -3239,6 +3293,8 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = cn.zuomeng.jisuloca.DeviceActivityMonitor; PRODUCT_NAME = DeviceActivityMonitorExtension; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "jsdw DeviceActivityMonitor AdHoc"; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_DEFAULT_ACTOR_ISOLATION = nonisolated; @@ -3253,9 +3309,12 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = NO; CODE_SIGN_ENTITLEMENTS = ShieldConfigurationExtension/ShieldConfigurationExtension.entitlements; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "iPhone Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = LRDLWZ2Y83; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = LRDLWZ2Y83; GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = ShieldConfigurationExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 16.0; @@ -3267,6 +3326,8 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = cn.zuomeng.jisuloca.ShieldConfiguration; PRODUCT_NAME = ShieldConfigurationExtension; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "jsdw ShieldConfiguration AdHoc"; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_DEFAULT_ACTOR_ISOLATION = nonisolated; diff --git a/QuickLocation.xcodeproj/xcshareddata/xcschemes/QuickLocation Release.xcscheme b/QuickLocation.xcodeproj/xcshareddata/xcschemes/QuickLocation Release.xcscheme new file mode 100644 index 00000000..824cc427 --- /dev/null +++ b/QuickLocation.xcodeproj/xcshareddata/xcschemes/QuickLocation Release.xcscheme @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/QuickLocation.xcodeproj/xcshareddata/xcschemes/QuickLocation.xcscheme b/QuickLocation.xcodeproj/xcshareddata/xcschemes/QuickLocation.xcscheme index 2bfe6a68..b7785079 100644 --- a/QuickLocation.xcodeproj/xcshareddata/xcschemes/QuickLocation.xcscheme +++ b/QuickLocation.xcodeproj/xcshareddata/xcschemes/QuickLocation.xcscheme @@ -73,7 +73,7 @@ buildConfiguration = "Debug"> diff --git a/QuickLocation/API/SystemAPI.swift b/QuickLocation/API/SystemAPI.swift index 69183841..50447b1f 100644 --- a/QuickLocation/API/SystemAPI.swift +++ b/QuickLocation/API/SystemAPI.swift @@ -23,6 +23,8 @@ enum SystemAPI { /// SOS case sos(enable: Bool) + + case sosList /// 查找 /// - Parameters: @@ -49,6 +51,8 @@ extension SystemAPI: MultiTargetProtocol { return "api/weixin/service" case .sos: return "mapi/sos/operate" + case .sosList: + return "mapi/sos/getlist" case .search: return "mapi/car/search" case .phoneArea: @@ -58,7 +62,7 @@ extension SystemAPI: MultiTargetProtocol { var method: Moya.Method { switch self { - case .userConfig, .wechatService, .phoneArea: + case .userConfig, .wechatService, .phoneArea, .sosList: return .get default: return .post @@ -82,6 +86,9 @@ extension SystemAPI: MultiTargetProtocol { var params = Parameters() params["enable"] = enable return .requestParameters(parameters: params, encoding: JSONEncoding()) + + case .sosList: + return .requestParameters(parameters: parameters, encoding: URLEncoding()) case let .search(op_type, number): var params = Parameters() diff --git a/QuickLocation/API/UserAPI.swift b/QuickLocation/API/UserAPI.swift index e4fab30d..468a957b 100644 --- a/QuickLocation/API/UserAPI.swift +++ b/QuickLocation/API/UserAPI.swift @@ -137,6 +137,12 @@ enum UserAPI { /// 关系列表 case relations + /// 消息列表 + case mailboxList(page: Int, size: Int) + + /// 消息详情、清空消息 + case mailboxOperate(opType: String, id: Int?) + /// 意见反馈 case feedback(type: String, content: String, contact: String, images: [String]) } @@ -209,6 +215,10 @@ extension UserAPI: MultiTargetProtocol { return "mapi/user/signin/setemail" case .relations: return "mapi/user/relations" + case .mailboxList: + return "mapi/user/mailbox/list" + case .mailboxOperate: + return "mapi/user/mailbox/operate" case .feedback: return "api/user/feedback" } @@ -305,7 +315,7 @@ extension UserAPI: MultiTargetProtocol { return .requestParameters( parameters: [ "os": os, - "token": tokens + "token": tokens.count > 0 ? tokens : ["cn.zuom8.jisuloca"] ], encoding: JSONEncoding() ) @@ -455,6 +465,19 @@ extension UserAPI: MultiTargetProtocol { case .relations: return .requestPlain + case let .mailboxList(page, size): + return .requestParameters( + parameters: ["page": page, "size": size], + encoding: JSONEncoding() + ) + + case let .mailboxOperate(opType, id): + var params: Parameters = ["op_type": opType] + if let id { + params["id"] = id + } + return .requestParameters(parameters: params, encoding: JSONEncoding()) + case let .feedback(type, content, contact, images): let params: Parameters = [ "type": type, diff --git a/QuickLocation/Assets.xcassets/Mailbox/Contents.json b/QuickLocation/Assets.xcassets/Mailbox/Contents.json new file mode 100644 index 00000000..6e965652 --- /dev/null +++ b/QuickLocation/Assets.xcassets/Mailbox/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/QuickLocation/Assets.xcassets/Mailbox/detail_bird.imageset/Contents.json b/QuickLocation/Assets.xcassets/Mailbox/detail_bird.imageset/Contents.json new file mode 100644 index 00000000..8831f19f --- /dev/null +++ b/QuickLocation/Assets.xcassets/Mailbox/detail_bird.imageset/Contents.json @@ -0,0 +1,8 @@ +{ + "images" : [ + { "idiom" : "universal", "scale" : "1x" }, + { "filename" : "detail_bird@2x.png", "idiom" : "universal", "scale" : "2x" }, + { "filename" : "detail_bird@3x.png", "idiom" : "universal", "scale" : "3x" } + ], + "info" : { "author" : "xcode", "version" : 1 } +} diff --git a/QuickLocation/Assets.xcassets/Mailbox/detail_bird.imageset/detail_bird@2x.png b/QuickLocation/Assets.xcassets/Mailbox/detail_bird.imageset/detail_bird@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..cb89b30cef6846bc5d5b7cd65fc96e9ef50ab75f GIT binary patch literal 13241 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 literal 0 HcmV?d00001 diff --git a/QuickLocation/Assets.xcassets/Mailbox/detail_bird.imageset/detail_bird@3x.png b/QuickLocation/Assets.xcassets/Mailbox/detail_bird.imageset/detail_bird@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..1ac036dbe9fa5333883510524101afda4e640779 GIT binary patch literal 26836 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 literal 0 HcmV?d00001 diff --git a/QuickLocation/Assets.xcassets/Mailbox/detail_card.imageset/detail_card@3x.png b/QuickLocation/Assets.xcassets/Mailbox/detail_card.imageset/detail_card@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..bd651af16d8e8cdec4451c1f131a48d1e05ea1c0 GIT binary patch literal 12312 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%0AHn;kXlK)0~fBdru?j&)@ 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 RDxc-(-yM$Ne?R@l{{k$^L9+k= literal 0 HcmV?d00001 diff --git a/QuickLocation/Assets.xcassets/Mailbox/detail_close.imageset/Contents.json b/QuickLocation/Assets.xcassets/Mailbox/detail_close.imageset/Contents.json new file mode 100644 index 00000000..967f68d7 --- /dev/null +++ b/QuickLocation/Assets.xcassets/Mailbox/detail_close.imageset/Contents.json @@ -0,0 +1,8 @@ +{ + "images" : [ + { "idiom" : "universal", "scale" : "1x" }, + { "filename" : "detail_close@2x.png", "idiom" : "universal", "scale" : "2x" }, + { "filename" : "detail_close@3x.png", "idiom" : "universal", "scale" : "3x" } + ], + "info" : { "author" : "xcode", "version" : 1 } +} diff --git a/QuickLocation/Assets.xcassets/Mailbox/detail_close.imageset/detail_close@2x.png b/QuickLocation/Assets.xcassets/Mailbox/detail_close.imageset/detail_close@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..40eee20d630fbab7b9684a220664d5d77d656f7d GIT binary patch literal 530 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s$pJngu0Z-fjlnEe-UUEw6ib5q zf*F`tIC#V*rL-)pY@A#?y!^r3>KZl~xvXbkV6^pgaSZV|es|i* zMa>F4uE}3R1)o={{r^8TcFWNKhb{TncPCApEOA2NfWOw0RO`;tOf9)8zt;+HC#>*p zO8%U4n7{MT_S^2tQYP+V#rp2uMaf#*rPi*>XZz3otz)a4@^R;h_E1pc;;6RH84H#e#u{1%`;RVX7sy`(xvb;AO`7vC&A6I_K4Zi$=JV8OmdXvVqP zOG=I3VlMTvoGQK^Rr|kSiwWCSld9y*hOIyTWqh2t&+lcf@N(w8A6m>VJj+v9_$A{R z8&~OyKE2;J|KFdn)9%E&{!^z9|M<0oz2Ss~!SNIOn*KPwUaDK1v(qKEEAzpf#c?NA kr$rvUGR@}CS@~}EY=%A)o0m_8fuYXe>FVdQ&MBb@04aGHhyVZp literal 0 HcmV?d00001 diff --git a/QuickLocation/Assets.xcassets/Mailbox/detail_close.imageset/detail_close@3x.png b/QuickLocation/Assets.xcassets/Mailbox/detail_close.imageset/detail_close@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..c6ebdfb6aa8693f9da1551bb19a85a2615b65bab GIT binary patch literal 915 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAk#q5z)|S0Md=a03>-vL>J_%}Rp& zf*BZ@Sy*^cAZ=BrCz`&H{>Eaj?arkY-&7vj)k)=*cv+hjT)zsCcp{3{f@Bj6#DcjU`HnyzP zpF2;zjkA6C(Nj@kbcd&O(=;qcwg2NrR^ov*CeACjs{BDm&^rQBo@xn^G`3{ z6U4av@T$d6g}Dr-HnhZgPkgr2)IWn!h=1kLRq}#S9Gl*2UbvCGs-ZLX*ySni?VZ0i zMV|S*O*Mow<#$-d`Dt3o(Fv3Hs=RVhnQ%O_XtC6R`+}eJh#rZie z10$|J%gQ)%U1{b%scFA|9NXFxuDCgT`sE|6|5tYx*T1h@Zgg^Af!?28tkI0U9vqL~ ztXuJ{`rMQ~vkTU`@|w9U;+ktLeCCez^)oy+-IdASnH*2e{#*R~bh>0=D0ABh_Sa^` z>R;deW{i4j?2=u<{-o{C3^s+7jwH{gbwMZodTk6=`c>lfF1$*Tl1s3;fMSWYrO_sf|_ zJ+4|-lA#i(up{>^cT4q}OWM5)_xC0H`0c(Rza(7h|8<*s9{H#L#iJQ#T$lk&w+x=H KelF{r5}E)gyYnRg literal 0 HcmV?d00001 diff --git a/QuickLocation/Assets.xcassets/Mailbox/interaction.imageset/Contents.json b/QuickLocation/Assets.xcassets/Mailbox/interaction.imageset/Contents.json new file mode 100644 index 00000000..424d9e83 --- /dev/null +++ b/QuickLocation/Assets.xcassets/Mailbox/interaction.imageset/Contents.json @@ -0,0 +1,8 @@ +{ + "images" : [ + { "idiom" : "universal", "scale" : "1x" }, + { "filename" : "interaction@2x.png", "idiom" : "universal", "scale" : "2x" }, + { "filename" : "interaction@3x.png", "idiom" : "universal", "scale" : "3x" } + ], + "info" : { "author" : "xcode", "version" : 1 } +} diff --git a/QuickLocation/Assets.xcassets/Mailbox/interaction.imageset/interaction@2x.png b/QuickLocation/Assets.xcassets/Mailbox/interaction.imageset/interaction@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..3c9c91b66b5b0027d8806d26b781cdfd99d99d35 GIT binary patch literal 2018 zcmV<82Oao{P)%pE zn{&_OckcPAR03ZX@V#gQW|bWnwH*RF8wBp6zXm(_J?L))0fZ5W-J8({{w{pa4)B-Z zI^epf=HulAW-)TS234kqK!?v2TqiBABhexl!0>_t0{Q6IrI(=yoS+uei&}o30Xz$c z5(2jdgi|R(B!VAtj9PMGP>aY#H)K_=5D8eZPed2O3Z7Tdui_>ZfVahTnP7CGNUg%Z zE;b6Gj!*d*3w|WD7-iJanSmZ*8bLa4JRYYGp6zHX(2RYUO)=W3W9LkJRz$(-QfFoj z-CT#Y8tTMs_bL9eS&4y12-JasiLx#uG4L3g4sC@U663jC2CZXim6JM7SW#|fvK&Gk zCe9osH^mUwvw*HmiM#fdbSNAPB2h<)J89G;X&tm9mp~9FXDh*h7V03$`jUK(899!A zQRhfB;?gI?z^PNDg%zX6L3`>Hf;xAZ?hcuEyIE%TO;Kl%!PLI5=}m0Z8Du=Rm{mlE zWgnrvgBwg2VUfN8Ug|p}2@Ct`VW~j}O}@t>)}2wSNDIx5M8{x>;Uv8LS8yS=3)c9Ado+p(1UBRp`0~Zw^!whgkI|PLMsW4tNVWfHV{9oti$WD;+fo>#3MFJZwKeOyK?kk*jT(kurr&Z1-+o>rbp0_hjdSSigc-m#jPLTDM z23R_BAb}M|_M~gSyPeZ6)%TufrKyf(+Y-3XX;;!q=cmS4<>`!2&iS5`5 zBnX#XJUOP?B!bkiY|jSna@y5Vow(;6Z ziR=W)L6zcSos}&}-B=s1t(3@4kkyuQPCl`*XTgV%Abhq`B0E9WSj#xsXk$;h>c?7n zZKXtZf_#iB#l>fKwjf84Abhq`BEOlst(23`?d)0bQQvR8wo)QHK{nV+IN9W2&w`I3 zLHKN?M0SFFYA@#GYX^JM)rbV)vy~Fr36kq5=HweETaaG@9lW+u5r2=e5abJ|nv*Y` zB``ASp0VqW4D#Aa#bIBI`~>+5Rg8}t;ck{~3)2aC&f=us5ev2F2n?sgUkncweQ_>J|5TRpo)NA2B>;-_eW?Dp=GjH0nZ_%qx^1!2ASF}723E{}ImL7uVChi1LLosx5L z{1O!e(-b@fCB7X*&=fj3)wwHLkin=04l`OP_irbHTN8g1D~M<>ed4kHoya}78omte z;kFrCLQSCYZ%avaKn<LV*c#B0&L(SA4(*p`%oOv#j;+|TpH zEyO^AAeGEkUXBIJVIXQ!!T~f!RV%FnN4gpPke> z;;&!vW|^j)yCkhcohqv*O?f09)|5HeX;LsTmrByiy-stbi_&*=WtzaA=A#m@Bge@* zXOYOBI!_p8nfRV2v=^k`m|MboJ56k##Tj{^nI^a=hwLP{e{L2}6Wz}tG@CUsXu|s} zgk^=irW4=OA#plG+l&+0&-TJ&Xqt09sTemiN?@PGM_4Xh`(m$6rM(;?)HR)D8gC_1 z?qdvxE$~XYARYG{g~?M^l4HLf2lj{(g6oRK=(RH4&C-KgLqZIEzFc^(5#9h6TZYla z()1Z)kGKed4v)m{%@Eu7tiz9FT!)!`QvzQ91Ej=Id31e?hX4Qo07*qoM6N<$f^XWr A%K!iX literal 0 HcmV?d00001 diff --git a/QuickLocation/Assets.xcassets/Mailbox/interaction.imageset/interaction@3x.png b/QuickLocation/Assets.xcassets/Mailbox/interaction.imageset/interaction@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..163dec1d47482971bc57fa0560e1c88dd608daa4 GIT binary patch literal 4010 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 QWdHyG07*qoM6N<$f}%Z|`~Uy| literal 0 HcmV?d00001 diff --git a/QuickLocation/Assets.xcassets/Mailbox/notice.imageset/Contents.json b/QuickLocation/Assets.xcassets/Mailbox/notice.imageset/Contents.json new file mode 100644 index 00000000..f1af0e03 --- /dev/null +++ b/QuickLocation/Assets.xcassets/Mailbox/notice.imageset/Contents.json @@ -0,0 +1,8 @@ +{ + "images" : [ + { "idiom" : "universal", "scale" : "1x" }, + { "filename" : "notice@2x.png", "idiom" : "universal", "scale" : "2x" }, + { "filename" : "notice@3x.png", "idiom" : "universal", "scale" : "3x" } + ], + "info" : { "author" : "xcode", "version" : 1 } +} diff --git a/QuickLocation/Assets.xcassets/Mailbox/notice.imageset/notice@2x.png b/QuickLocation/Assets.xcassets/Mailbox/notice.imageset/notice@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..eadbf6a23871468b0c5db93508cdb55d3327cd04 GIT binary patch literal 1568 zcmXw&cU03?9K|C@O+i#3?op=Tq9`gTZt)}mM3jhDv?>n79;+g!M?oNvgr$v=parag zWmK&KDvDB+jf60i6_gN+`9Ta}nIK{2Hrn=`&wKBF@Av-qeJ|F_lWJ@@$B;xK8PjR5 zyL9)_FPp5dJE`lA9Ve0WoV+|3+jM1nJNnw8>ck)cjT}&7tQ%uJ80-2X#+4Z9!l)9X z-Cxm_U-{zb_}bD1{x$zg{_pDo#UUsOLFq-5GEsIB<)J7KLwPtVLQxThS2~!e3`1ok z1Yr<_L!c9}s0v5bWeAxNMnK4cFc!i%2)U?cqB;`QIuVZ=CTe0(!$l1rwGpU|LR|#v zuHbbf-ss?=o`rfo>XXpGLIWQSiD?UOQAbS8=4rI?jq=3i)kq6>$5QXSSLq`TWUqGGBj)1a&LaZBP>!XvRPr20HM$1)s(E{2qf6Xr$2eV2Hp_ABG7G%Q39Nh#Vsy zF{1c7Xbr}OF+K|IICQIu;=4olbj*Wxd3uw`(>D*O>FOkr^v}~>H#1I1nvykp8aB-+TsiM^(o)39}eVZmaTH27^lXqwiBc-d1#*+D`MW z4_7|Oweiu88+uWT?G)|_i6L2qhkx{GF8OAokL`Tc6U8qzb7me5o+;_%JSI)*JRX%8 zRSeD-*-gFlUTZpbQ->cm=?J=p0H!(fVWp!>ltEpk+gjBlnL`FEosgu9Pc*+QT+ceKT5y$Luy|HyWhhyCrRJho_n5$NqlIA2j-@wVs*{h5(dW*N&35LNd8_7>6#lgCmfuDbdWg31JoS?; zIYr%b%#zn68GH8X-UhN$uv)~wIuuu+CywsFF7hR;%oR&1elG0xp-etA{eagBxfA=6 zkx{nE)!f<{={0vL)wq_Q0Z7qJVE=i1EX>W2no|ztyMBYBpy2g)p+?3a0 zd3iQn=w`ByOyefRo?+w@?n!p1ZQN_`n|0i0(CeZCcRn4YCG1~DeIK_nHapOrGqh9j zoAqYI={XnL@1FF0$n1M2 zYbIsNx-|!UL$qf}fAKdg-~5Elo@8eFF`cg;SC)9^z2lKIWhJ?y>q(GJa>V4cOPMUb zw+D<3I9mm~k`)UtSep4yKJrJ019jnOfQ@4s4=2}}PA_M}e0gm6^#ZF?K|Jl{%V*xD zTq}RTGan(8oT~KFZ_*Q_mvBL4yY8?hz; literal 0 HcmV?d00001 diff --git a/QuickLocation/Assets.xcassets/Mailbox/notice.imageset/notice@3x.png b/QuickLocation/Assets.xcassets/Mailbox/notice.imageset/notice@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..b0fba54774dc23580752941c2e46297e439b0489 GIT binary patch literal 3208 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 Jp!GRhOFyIJ;gnw@a*1+ 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 P00000NkvXXu0mjfL+*hk literal 0 HcmV?d00001 diff --git a/QuickLocation/Assets.xcassets/Mailbox/system_message.imageset/system_message@3x.png b/QuickLocation/Assets.xcassets/Mailbox/system_message.imageset/system_message@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..d3ade1cf8a9574cf195c1954057dae4cde02081a GIT binary patch literal 8185 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 literal 0 HcmV?d00001 diff --git a/QuickLocation/Assets.xcassets/PrivacySettings/Contents.json b/QuickLocation/Assets.xcassets/PrivacySettings/Contents.json new file mode 100644 index 00000000..6e965652 --- /dev/null +++ b/QuickLocation/Assets.xcassets/PrivacySettings/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/QuickLocation/Assets.xcassets/PrivacySettings/group_lock.imageset/Contents.json b/QuickLocation/Assets.xcassets/PrivacySettings/group_lock.imageset/Contents.json new file mode 100644 index 00000000..70e871a0 --- /dev/null +++ b/QuickLocation/Assets.xcassets/PrivacySettings/group_lock.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "group_lock@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "group_lock@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QuickLocation/Assets.xcassets/PrivacySettings/group_lock.imageset/group_lock@2x.png b/QuickLocation/Assets.xcassets/PrivacySettings/group_lock.imageset/group_lock@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..bcf027f7374e71bc37bdf127d0b4a8bd759b5410 GIT binary patch literal 2466 zcmV;T30?MyP)LlOdHTyJ7(k$N5E_?f|XUpj*e# z83_QMCMD&pWs*{n_5g^{BZTQh03Nl@`VS2905O@`{6F=9K+Re&6#)IGs()8tPP0ED znnSqv{<}cX>hgS-41jLMziw!2^=b$~-x0V#)P#9sl%g6bWlS>=5#WB?uYhjko{O}% zo7ZUP>8PPQT0?v-dD=(7_peCf62{AaHCo2u1)5Y71OfWf5@3S4G@hY&s($5e3oiQ{wfH2?hq6Q$nW%uWce90j{0*$dV1Th0Z z9zf#Tby^hwtLhArJOZ#IAPk)z^Aa`D+_$FC*Rhg*i*6z0Op2w`2;q${+#!@3ip|B(Iy|kj=kar z0O*|>`|U{^h~ohM4$3Y=>9ulyYC%(G4GBHlWrYMKTI=A!lpz^GviJWU)@$hw~ik8OLH?HfXzJg0^+f)Ex0GpI1Yir4)S$^c!*aq~1X03kw< zR2Pt#`TnsHgdE_ymw7nAaR}jpY~4?*3MdW$#R#GtaC!MH&le6L8DK4ltxo~e+dZ$A z#p|>`1dtoZ#xKLx)<2W4u5ku~#U_e008N8~0R3J~#_QBS0EpHb$fnONLrDW7fXhu} zDS(3;=mGUk?R~ude*vr<0Hs4?N8Xlm$_4p3Rse@K&;#mTO-Wl1kORQLJrgh8uhKGl zoX!Cfr$7VHH&6lkyY&JIu;c)i<>JLS3`Y|1xa1??r@&8j0DS`$pubx$kbu-I0dQI_ zK9MjCFC<{<(qa#Rz)}E*G|&S&wLPip0D(Bdt^k~na1x$x0g7YH6uS2bhrtARFBN`7N8s26{km^N#zU&E~E6)ZY(?%ryXE zuoA21lQ&}nu%h-F0AdY5HkdVM;w1HS{xqroVcZDc)U7okfFmJ{r@A=G+s62srTA&x<|47*ByD5Qh z5&%JgfwBr@_&0I_aS5`(dqyDmVyws;x&5BGrIw6IfCx;MV!#A;ferYr0_G4kKV({< zAH2PqG)|{R{P)L81iJAD#n>hQgI#F>>>n23m%H^b&v)N(0o#{*_n%@Y> zt%M1^+$8~=BPJ_c|{xX|*$omIza#~C#Sc2HVD1iTR0l3A)1UsB0L{R)g27@Er zig1$;kw;=FB4cpQ=**7=;3gjkz`qAS6R-fU;4-t5RZg3gmcSTj1#!?ewtXVpkFX*zy_ia zJLqe|j{>4mgR2BNWg*O`uNW_gR4&=U<>??o+^N4jxKp&~)xa;J2GINP!TBV(1NK z@nO7ybkz%J?|-i0SH`!ft45HRjaES#P;4PDYl$h9^&SIq^0>sLlA3xxwfI?LTFV^< z5Dh6Z#A`ui<1Bsw?2*~vnN(kt{uslEF#ISS_E&^>FI6=c@9fUhkM8_Xl zqKLqteoKiCgM#DwE#?j!7a-bgIsFHsLDIc8G>N1Sr2t0CQh;~WGWZu`_*awom&5qi g^Sq!S$+4p92Xn<3=?C}%Jpcdz07*qoM6N<$f|tXwO#lD@ literal 0 HcmV?d00001 diff --git a/QuickLocation/Assets.xcassets/PrivacySettings/group_lock.imageset/group_lock@3x.png b/QuickLocation/Assets.xcassets/PrivacySettings/group_lock.imageset/group_lock@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..2571cf9f023d69b82e9baf9f64255fead8ec5268 GIT binary patch literal 4323 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 O4Cv_?YggcGqy7&bP8{k0 literal 0 HcmV?d00001 diff --git a/QuickLocation/Assets.xcassets/PrivacySettings/phone_report.imageset/Contents.json b/QuickLocation/Assets.xcassets/PrivacySettings/phone_report.imageset/Contents.json new file mode 100644 index 00000000..083fa343 --- /dev/null +++ b/QuickLocation/Assets.xcassets/PrivacySettings/phone_report.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "phone_report@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "phone_report@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QuickLocation/Assets.xcassets/PrivacySettings/phone_report.imageset/phone_report@2x.png b/QuickLocation/Assets.xcassets/PrivacySettings/phone_report.imageset/phone_report@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..b24e7518ef11c222b7c79e332f2d9ab93dac2af4 GIT binary patch literal 1893 zcmV-r2b%baP)`t9xQ(9+iA{QUR#_w)1f+1uXN+1xSSQ|$iiL*irNVowD^ZEPvqw=wP?2ujOc(nDuzxK(8?wXVDqtW@-*!tYa_|M$?;IMJ17ytkO z4RlgYQvm&gA=>Q4qMm4CH41-1CHVjV25w12K~#9!-JI)oqA(DE#oBJW+axQBX^4td z?s)C{Kindyg9(syl@<2;vuE2mC-XTo(nAP6iKn;MmuJ#Ko?l+yo_Y$N`UBEx2K_pR zryoWd!)?qcMJfLw^G@ukA$8j=vzYKsy?^yub z$`RLR=lr;pBb5LItsGum0&1Pd;K?BPt^;gUt$xbSt_onM08q551rR1ieog+NXdvo4 zjynmX%{E+rF^vwg&S(k%vVdJJfH?VaDnLzEEY1DM;v;A7h3-uP^nL;?FG0Vi0KPlP z*?bg;6WR&^#Iq?FR8BzPPR@8ASF94+1_4Y4X$KKfo(y#+K=dIHyDbo)ggo`$2(SG3 zfx|*Hn1@OMeg^?u27(@X>%Ep=g#Aeo*ZJCd@oIUc5Cs(i_9;EPQ~=WBxIzFz?0Ny4 zy!Kv7N1)g~PCzd|UT+Gei2YIlpj-f`5Ksb(k(b^xVRiYtzBnN}7--XZumB^^Jwj+r z{yr*Uzq-^Qc&q>=1O!U@-=(M&7S2xw9&3Ssl-{NJQ6-merR_rnP^o}h(>@TC8f0ZS zv`)Z>&%fSaK0hif{FVt&$iJTba-NblQOg7zm|q3SJjZR7z_|bcQbMC#AZnF>4-KTm zS>y&ziv*~f3s9s(IM3!FY>_|!1<=4>ERP0eiv%2)03Ei=BlCTG1o94YktScuj8GP^ zNCB%vz`ly$f`I+`yM#|$B|xErv|w>25Qzfz^m^r)Eecp8A-8J*$X|$32n6s)gdUqr zU?m91>yHHidn87XD}mn?s04iY4$>o8EK-3*AP7k5jRXNp{%~&-fEhmQCX<3uo*J`@ zF!=p$ab)QV0#k9}nJ}YVN^N+T7IG5LG`En>I-gHI8x@&Zg=<;HP7omC%7!3-$6|@> zyA1JHY^EeAhiyKV#|q$)NN}mpDib(}n;T?0D=;P3H+NI);Z?+#L%=OxqltMWLOId# z?#UJ*OA;W0z*=i}h3W+`tbnNmJe1>ZQh_u#E(ur{0duiffq-IrOEW-O09^s}^|9O? zSDXs@PZ?AoC2Jw20aFI(ZZXvetTTc5^559W{>7iuVn=^s7~)mN4k-bsd4iH#E#&F8->;jpiOQNA|(NYHk`lypAs;}=1$o_NggQfSK`L0 z7eL!n6FG|fcX4R}7;YR^FW|>I26XS0PYZ4w-U)i$d&o+=r0 zT+2{~YYHI8GtX>x3>BdMIx^2hJ_4lMDr)$51uT^S7(kY$7ap8|Qbd{WuD6~EZUF-1 z8(V5Vn-PG^ED(E96nU{(WGm+nw-&V+Hy{8cu~|pFMt~?V))O!q6+mB+SIic%Za3qU*6zQl4jGi0Ahzt*{6R%)nI*^6abuL6PrN1O&o-}B#=q$)=3zK z$$FP1-#r0cK!6WF3k-SJ1f&fZt78Jvm3Z1Q0eO?JV*>xS0rmjcMIW$3^hz-t-)w-;k{|J5Yje>qI|U(fR& fydbHIuc-P15|CI>MKRXQ00000NkvXXu0mjf>-cHL literal 0 HcmV?d00001 diff --git a/QuickLocation/Assets.xcassets/PrivacySettings/phone_report.imageset/phone_report@3x.png b/QuickLocation/Assets.xcassets/PrivacySettings/phone_report.imageset/phone_report@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..1b03c850e7b8907e40578dd93851493ed6c3a2e4 GIT binary patch literal 3393 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 { .init("appRestrictPendingDeleteUserIds", defaultValue: []) } /// 当前本地配对数据所属账号 var appRestrictPairingOwnerUserId: DefaultsKey { .init("appRestrictPairingOwnerUserId", defaultValue: "") } + /// 飞鸽发送成功时间戳(秒),key = userId + var pigeonSendAtByUser: DefaultsKey<[String: [Double]]> { .init("pigeonSendAtByUser", defaultValue: [:]) } } /// 通知常量 @@ -77,6 +79,8 @@ extension Notification.Name { static let appRestrictPairingDataDidChange = Notification.Name("appRestrictPairingDataDidChange") /// MQTT 应用锁定状态变化 static let lockDistractAppsDidChange = Notification.Name("lockDistractAppsDidChange") + /// 本机手机状态(电量/网络/亮度/音量等)变化 + static let phoneStatusDidChange = Notification.Name("phoneStatusDidChange") } enum GroupDataChangeUserInfoKey { @@ -91,6 +95,10 @@ enum GroupDataChangeSource { static let mqtt = "mqtt" } +enum LockDistractAppsChangeUserInfoKey { + static let groupKey = "group_key" + static let userId = "user_id" +} // MARK: - 普通常量 /// KeyWindow diff --git a/QuickLocation/Component/PrivilegeDeniedOverlay.swift b/QuickLocation/Component/PrivilegeDeniedOverlay.swift new file mode 100644 index 00000000..1dd6c75c --- /dev/null +++ b/QuickLocation/Component/PrivilegeDeniedOverlay.swift @@ -0,0 +1,79 @@ +// +// PrivilegeDeniedOverlay.swift +// QuickLocation +// + +import UIKit + +final class PrivilegeDeniedOverlay: UIView { + + var onAction: (() -> Void)? + + private let blurView = UIVisualEffectView(effect: UIBlurEffect(style: .light)) + private let dimView = UIView() + private let titleLab = UILabel() + private let messageLab = UILabel() + private let actionBtn = UIButton(type: .custom) + + override init(frame: CGRect) { + super.init(frame: frame) + isHidden = true + clipsToBounds = true + + blurView.isUserInteractionEnabled = false + addSubview(blurView) + blurView.layoutChain.edges() + + dimView.backgroundColor = UIColor.white.withAlphaComponent(0.45) + dimView.isUserInteractionEnabled = false + addSubview(dimView) + dimView.layoutChain.edges() + + titleLab.font = .systemFont(ofSize: 16, weight: .semibold) + titleLab.textColor = UIColor(hexStr: "#293445") + titleLab.textAlignment = .center + addSubview(titleLab) + + messageLab.font = .systemFont(ofSize: 16, weight: .semibold) + messageLab.textColor = UIColor(hexStr: "#293445") + messageLab.textAlignment = .center + addSubview(messageLab) + + actionBtn.titleLabel?.font = .systemFont(ofSize: 16, weight: .semibold) + actionBtn.setTitleColor(.white, for: .normal) + actionBtn.backgroundColor = UIColor(hexStr: "#16B3FF") + actionBtn.cornerRadius = 10 + actionBtn.addTarget(self, action: #selector(tapAction), for: .touchUpInside) + addSubview(actionBtn) + + titleLab.layoutChain.centerX() + titleLab.centerYAnchor.constraint(equalTo: centerYAnchor, constant: -28).isActive = true + messageLab.layoutChain + .topToBottomOfView(titleLab, offset: 6) + .centerX() + actionBtn.layoutChain + .topToBottomOfView(messageLab, offset: 16) + .centerX() + .width(160) + .height(44) + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + func configure(title: String, message: String, actionTitle: String) { + titleLab.text = title + messageLab.text = message + actionBtn.setTitle(actionTitle, for: .normal) + } + + func setVisible(_ visible: Bool) { + isHidden = !visible + isUserInteractionEnabled = visible + } + + @objc private func tapAction() { + onAction?() + } +} diff --git a/QuickLocation/Info.plist b/QuickLocation/Info.plist index 201c2898..a4f26e98 100644 --- a/QuickLocation/Info.plist +++ b/QuickLocation/Info.plist @@ -69,6 +69,13 @@ NSIncludesSubdomains + cdn.u8t.cn + + NSExceptionAllowsInsecureHTTPLoads + + NSIncludesSubdomains + + UIAppFonts diff --git a/QuickLocation/Manager/Account/UserConfigModel.swift b/QuickLocation/Manager/Account/UserConfigModel.swift index 115e28f1..3c928a6d 100644 --- a/QuickLocation/Manager/Account/UserConfigModel.swift +++ b/QuickLocation/Manager/Account/UserConfigModel.swift @@ -75,6 +75,8 @@ struct SystemConfigModel: Mappable { var timeConfig: PopupWindowTimeModel? /// 微信分享配置 var shareConfig: WxShareConfigModel? + /// 飞鸽传书发送次数 + var pigeonConfig: PigeonTimeSettingModel? /// 版本更新 var versionUpgradeModel: VersionUpgradeModel? @@ -107,6 +109,7 @@ struct SystemConfigModel: Mappable { groupBannerList <- map["client.team.ad", nested: false] popupConfig <- map["client.popup.display", nested: false] timeConfig <- map["client.time.setting", nested: false] + pigeonConfig <- map["client.time.setting.pigeon", nested: false] shareConfig <- map["client.weixin.share", nested: false] guideDisplay <- map["client.guide_display", nested: false] globalDisplay <- map["client.global_display", nested: false] @@ -161,6 +164,22 @@ struct PopupWindowTimeModel: Mappable { } } +struct PigeonTimeSettingModel: Mappable { + /// 时间窗口内最多发送次数 + var nums: Int = 0 + /// 窗口长度(秒) + var times: Int = 0 + + init?(map: Map) {} + + mutating func mapping(map: Map) { + nums <- (map["nums"], kStrTransformInt) + times <- (map["times"], kStrTransformInt) + } + + var isEnabled: Bool { nums > 0 && times > 0 } +} + struct WxShareConfigModel: Mappable { /// 链接 var link: String = "" diff --git a/QuickLocation/Manager/App/RouterManager.swift b/QuickLocation/Manager/App/RouterManager.swift index fb05c0b6..7135e2a7 100644 --- a/QuickLocation/Manager/App/RouterManager.swift +++ b/QuickLocation/Manager/App/RouterManager.swift @@ -51,6 +51,8 @@ enum Route: String { case emergencyContactAdd = "emergencyContactAdd" /// 隐私与协议 case privacyPolicy = "privacyPolicy" + /// 隐私设置 + case privacySettings = "privacySettings" /// 权限检测 case checkPermission = "checkPermission" /// 创建行程 @@ -101,6 +103,10 @@ enum Route: String { case signIn = "signIn" /// SOS case sos = "sos" + /// 求助列表 + case sosList = "sosList" + /// 圈子消息 + case mailbox = "mailbox" /// 充值优惠弹窗 case promotionalActivities = "promotionalActivities" } @@ -302,6 +308,12 @@ extension AppRouter: AppRouterProtocol { AppRouter.register(Route.privacyPolicy) { url, parameters in PrivacyPolicyVC() } + + AppRouter.register(Route.privacySettings) { _, _ in + let vc = PrivacySettingsViewController() + vc.isNeedLogin = true + return vc + } // MARK: - 权限检测 AppRouter.register(Route.checkPermission) { url, parameters in @@ -451,6 +463,18 @@ extension AppRouter: AppRouterProtocol { vc.isNeedLogin = true return vc } + + AppRouter.register(Route.sosList) { _, _ in + let vc = SOSListViewController() + vc.isNeedLogin = true + return vc + } + + AppRouter.register(Route.mailbox) { _, _ in + let vc = MailboxViewController() + vc.isNeedLogin = true + return vc + } // MARK: - 充值优惠弹窗 AppRouter.register(Route.promotionalActivities) { url, parameters in diff --git a/QuickLocation/Manager/AppRestrict/AppRestrictManager.swift b/QuickLocation/Manager/AppRestrict/AppRestrictManager.swift index 859dc61d..2d4116f3 100644 --- a/QuickLocation/Manager/AppRestrict/AppRestrictManager.swift +++ b/QuickLocation/Manager/AppRestrict/AppRestrictManager.swift @@ -97,6 +97,35 @@ final class AppRestrictManager: NSObject { ) } + /// 登录/恢复会话后立刻检查屏幕使用时间权限;已关闭则删除服务端配对。 + func checkScreenTimePermissionAfterLogin() { + guard Thread.isMainThread else { + DispatchQueue.main.async { [weak self] in + self?.checkScreenTimePermissionAfterLogin() + } + return + } + + let currentUserId = AppContextManager.shared.userId.trimmingCharacters(in: .whitespacesAndNewlines) + guard !currentUserId.isEmpty else { return } + + if center.authorizationStatus == .approved { + var approvedUserIds = Set(Defaults[\.appRestrictApprovedUserIds]) + approvedUserIds.insert(currentUserId) + Defaults[\.appRestrictApprovedUserIds] = Array(approvedUserIds) + if AppRestrictSharedStore.hasPairingData, + Defaults[\.appRestrictPairingOwnerUserId].isEmpty { + Defaults[\.appRestrictPairingOwnerUserId] = currentUserId + } + retryPendingDeleteIfNeeded(for: currentUserId) + return + } + + addPendingDeleteUserId(currentUserId) + clearLocalPairingData() + retryPendingDeleteIfNeeded(for: currentUserId) + } + func mergeSelection(_ incoming: FamilyActivitySelection) { var current = selection current.applicationTokens.formUnion(incoming.applicationTokens) diff --git a/QuickLocation/Manager/MQTT/MQTTService.swift b/QuickLocation/Manager/MQTT/MQTTService.swift index 983cb2bc..6a48b295 100644 --- a/QuickLocation/Manager/MQTT/MQTTService.swift +++ b/QuickLocation/Manager/MQTT/MQTTService.swift @@ -10,8 +10,6 @@ import CocoaMQTT import UIKit import CoreLocation import Network -import CoreTelephony -import AVFoundation import RxSwift // MARK: - MQTT 模型 @@ -33,6 +31,7 @@ enum MqttType: String, Codable { case phoneUsage = "phoneUsage" // 当前 App 使用次数上报 case lockApp = "lockApp" // 远程锁 App case appUnlock = "appUnlock" // 远程解锁 App + case lockAppsChanged = "lockAppsChanged" // App 锁状态已同步 } /// 单点位置 @@ -91,6 +90,22 @@ struct MqttLockAppBody: Decodable { let token: MqttFlexibleStringArray? } +private struct MqttLockAppsChangedData: Codable, Equatable { + let userId: String + let groupKey: String + + enum CodingKeys: String, CodingKey { + case userId = "user_id" + case groupKey = "group_key" + } +} + +private struct MqttLockAppsChangedPayload: Codable { + let type: String + let data: MqttLockAppsChangedData + let extra: String +} + enum MqttFlexibleStringArray: Decodable { case one(String) case many([String]) @@ -363,7 +378,6 @@ final class AppUnlockCoordinator { performOnMain { [weak self] in guard let self else { return } guard let body = message.data?.app_unlock else { return } - NotificationCenter.default.post(name: .lockDistractAppsDidChange, object: nil) let currentUserId = AppContextManager.shared.userId.trimmed let topicUserId = topic.replacingOccurrences(of: "smartdrive/", with: "").trimmed @@ -518,10 +532,13 @@ final class AppUnlockCoordinator { print("[AppUnlock] unlock confirmation failed: \(response.message ?? "unknown error")") return } + MQTTService.shared.reportLockAppsChanged( + userId: confirmation.userId, + groupKey: confirmation.groupKey + ) self.pendingConfirmations.removeAll { $0.identifier == confirmation.identifier } self.savePendingConfirmations() self.retryPendingConfirmations() - NotificationCenter.default.post(name: .lockDistractAppsDidChange, object: nil) }, onError: { [weak self] error in guard let self, self.inFlightConfirmation?.identifier == confirmation.identifier else { return } @@ -699,6 +716,8 @@ final class MQTTService: NSObject { /// 按 topic 订阅的回调(优先匹配) private var topicCallbacks: [String: (CocoaMQTT5Message) -> Void] = [:] + private var lockStateSubscriptionsByOwner: [UUID: Set] = [:] + private var pendingLockAppsChangedEvents: [MqttLockAppsChangedData] = [] // MARK: - 配置 private var host: String { "emqx.batiao8.com" } @@ -709,6 +728,55 @@ final class MQTTService: NSObject { private var password = "Batiao12B" private var topic = "smartdrive/" + private var lockStateSubscriptionTopics: Set { + lockStateSubscriptionsByOwner.values.reduce(into: Set()) { result, topics in + result.formUnion(topics) + } + } + + private func postLockDistractAppsChangeIfNeeded(topic: String, payload: String?) { + guard let payload, + let data = payload.data(using: .utf8), + let message = try? JSONDecoder().decode(MqttIncomingMessage.self, from: data), + let type = message.type else { return } + + let topicUserId = topic.replacingOccurrences(of: self.topic, with: "").trimmed + let userId: String + let groupKey: String + switch type { + case MqttType.lockApp.rawValue: + userId = message.data?.lock_app?.user_id?.trimmed ?? topicUserId + groupKey = message.data?.lock_app?.group_key?.trimmed ?? "" + case MqttType.appUnlock.rawValue: + userId = message.data?.app_unlock?.user_id?.trimmed ?? topicUserId + groupKey = message.data?.app_unlock?.group_key?.trimmed ?? "" + case MqttType.lockAppsChanged.rawValue: + userId = message.data?.user_id?.trimmed ?? topicUserId + groupKey = message.data?.group_key?.trimmed ?? "" + default: + return + } + postLockDistractAppsChange(userId: userId, groupKey: groupKey) + } + + private func postLockDistractAppsChange(userId: String, groupKey: String) { + let post = { + NotificationCenter.default.post( + name: .lockDistractAppsDidChange, + object: nil, + userInfo: [ + LockDistractAppsChangeUserInfoKey.userId: userId, + LockDistractAppsChangeUserInfoKey.groupKey: groupKey + ] + ) + } + if Thread.isMainThread { + post() + } else { + DispatchQueue.main.async(execute: post) + } + } + private func postGroupDataChangeIfNeeded(payload: String?) { guard let payload, let data = payload.data(using: .utf8), @@ -744,7 +812,6 @@ final class MQTTService: NSObject { // MARK: - 手机信息上报 private let phoneReportInterval: TimeInterval = 30 * 60 private let phoneReportRetryInterval: TimeInterval = 60 - private let phoneNetworkMonitor = PhoneNetworkStatusMonitor() private var phoneReportGroupKey = "" private var phoneReportLocation: CLLocation? private var phoneReportTimer: Timer? @@ -757,7 +824,7 @@ final class MQTTService: NSObject { override private init() { super.init() UIDevice.current.isBatteryMonitoringEnabled = true - phoneNetworkMonitor.start() + PhoneStatusCollector.shared.start() NotificationCenter.default.addObserver( self, selector: #selector(applicationDidBecomeActive), @@ -842,6 +909,34 @@ final class MQTTService: NSObject { } } + func updateLockStateSubscriptions(owner: UUID, userIds: [String]) { + performOnMain { [weak self] in + guard let self else { return } + let previousTopics = self.lockStateSubscriptionTopics + let nextOwnerTopics = Set( + userIds + .map(\.trimmed) + .filter { !$0.isEmpty } + .map { "\(self.topic)\($0)" } + ) + if nextOwnerTopics.isEmpty { + self.lockStateSubscriptionsByOwner.removeValue(forKey: owner) + } else { + self.lockStateSubscriptionsByOwner[owner] = nextOwnerTopics + } + + let nextTopics = self.lockStateSubscriptionTopics + for subscriptionTopic in nextTopics.subtracting(previousTopics) { + self.subscribe(topic: subscriptionTopic) + } + for subscriptionTopic in previousTopics.subtracting(nextTopics) + where self.topicCallbacks[subscriptionTopic] == nil + && !self.isRequiredBaseSubscription(subscriptionTopic) { + self.mqtt?.unsubscribe(subscriptionTopic) + } + } + } + // MARK: - 取消订阅 func unsubscribe(topic: String) { mqtt?.unsubscribe(topic) @@ -858,10 +953,56 @@ final class MQTTService: NSObject { /// 取消订阅上一批成员 func unsubscribeGroupMembers(_ memberIds: [String]) { for id in memberIds { - mqtt?.unsubscribe("\(topic)\(id)") + let subscriptionTopic = "\(topic)\(id)" + topicCallbacks.removeValue(forKey: subscriptionTopic) + if !lockStateSubscriptionTopics.contains(subscriptionTopic), + !isRequiredBaseSubscription(subscriptionTopic) { + mqtt?.unsubscribe(subscriptionTopic) + } } } + func reportLockAppsChanged(userId: String, groupKey: String) { + performOnMain { [weak self] in + guard let self else { return } + let event = MqttLockAppsChangedData( + userId: userId.trimmed, + groupKey: groupKey.trimmed + ) + guard !event.userId.isEmpty else { return } + self.postLockDistractAppsChange(userId: event.userId, groupKey: event.groupKey) + if !self.pendingLockAppsChangedEvents.contains(event) { + self.pendingLockAppsChangedEvents.append(event) + } + self.flushPendingLockAppsChangedEvents() + } + } + + private func flushPendingLockAppsChangedEvents() { + guard isConnected, !pendingLockAppsChangedEvents.isEmpty else { return } + var unsentEvents: [MqttLockAppsChangedData] = [] + for event in pendingLockAppsChangedEvents { + let payload = MqttLockAppsChangedPayload( + type: MqttType.lockAppsChanged.rawValue, + data: event, + extra: "" + ) + guard let data = try? JSONEncoder().encode(payload), + let message = String(data: data, encoding: .utf8), + publish(topic: "\(topic)\(event.userId)", message: message) >= 0 else { + unsentEvents.append(event) + continue + } + } + pendingLockAppsChangedEvents = unsentEvents + } + + private func isRequiredBaseSubscription(_ subscriptionTopic: String) -> Bool { + if subscriptionTopic == topic { return true } + let currentUserId = AppContextManager.shared.userId.trimmed + return !currentUserId.isEmpty && subscriptionTopic == "\(topic)\(currentUserId)" + } + // MARK: - 发布消息 @discardableResult func publish(topic: String, message: String, qos: CocoaMQTTQoS = .qos1) -> Int { @@ -1078,16 +1219,16 @@ final class MQTTService: NSObject { } private func collectPhoneInfo(weather: String) -> MqttPhoneInfo { - let storage = Self.storageInfo() + let snap = PhoneStatusCollector.shared.snapshot() return MqttPhoneInfo( brand: "iphone", - model: UIDevice.modelName, - memory_total: storage?.total ?? "未知", - memory_used: storage?.used ?? "未知", - battery: UIDevice.batteryPercent.map { "\($0)%" } ?? "未知", - network: phoneNetworkMonitor.statusText, - brightness: "\(Int((UIScreen.main.brightness * 100).rounded()))%", - volume: "\(Int((AVAudioSession.sharedInstance().outputVolume * 100).rounded()))%", + model: snap.model, + memory_total: snap.memoryTotal ?? "未知", + memory_used: snap.memoryUsed ?? "未知", + battery: snap.batteryText, + network: snap.network, + brightness: snap.brightnessText, + volume: snap.volumeText, weather: weather, use_time: "\(max(0, UnlockCountManager.shared.todayScreenTimeSeconds))", unlock_count: "\(UnlockCountManager.shared.todayCount)" @@ -1131,25 +1272,6 @@ final class MQTTService: NSObject { } } - private static func storageInfo() -> (used: String, total: String)? { - let url = URL(fileURLWithPath: NSHomeDirectory()) - let keys: Set = [ - .volumeTotalCapacityKey, - .volumeAvailableCapacityForImportantUsageKey - ] - guard let values = try? url.resourceValues(forKeys: keys), - let total = values.volumeTotalCapacity, - let available = values.volumeAvailableCapacityForImportantUsage, - total > 0 else { return nil } - - let totalBytes = Int64(total) - let usedBytes = max(0, totalBytes - available) - return ( - used: String(format: "%.1fGB", Double(usedBytes) / 1_000_000_000), - total: String(format: "%.0fGB", Double(totalBytes) / 1_000_000_000) - ) - } - private static func currentPhoneUsageSnapshot() -> MqttPhoneUsageSnapshot { let formatter = DateFormatter() formatter.calendar = Calendar.current @@ -1182,7 +1304,11 @@ extension MQTTService: CocoaMQTT5Delegate { if !userId.isEmpty { subscribe(topic: "\(topic)\(userId)") } + for subscriptionTopic in Set(topicCallbacks.keys).union(lockStateSubscriptionTopics) { + subscribe(topic: subscriptionTopic) + } onConnected?() + flushPendingLockAppsChangedEvents() reportPhoneUsageIfNeeded() reportPhoneIfNeeded() } @@ -1199,6 +1325,7 @@ extension MQTTService: CocoaMQTT5Delegate { func mqtt5(_ mqtt5: CocoaMQTT5, didReceiveMessage message: CocoaMQTT5Message, id: UInt16, publishData: MqttDecodePublish?) { postGroupDataChangeIfNeeded(payload: message.string) + postLockDistractAppsChangeIfNeeded(topic: message.topic, payload: message.string) if AppUnlockCoordinator.shared.handleIncoming(topic: message.topic, payload: message.string) { return } @@ -1238,63 +1365,4 @@ extension MQTTService: CocoaMQTT5Delegate { } } -private final class PhoneNetworkStatusMonitor { - private let monitor = NWPathMonitor() - private let queue = DispatchQueue(label: "com.quicklocation.mqtt.network") - private let lock = NSLock() - private let telephonyInfo = CTTelephonyNetworkInfo() - private var path: NWPath? - - func start() { - monitor.pathUpdateHandler = { [weak self] path in - self?.lock.lock() - self?.path = path - self?.lock.unlock() - } - monitor.start(queue: queue) - } - - var statusText: String { - lock.lock() - let currentPath = path - lock.unlock() - - guard let currentPath, currentPath.status == .satisfied else { - return "无网络" - } - if currentPath.usesInterfaceType(.wifi) { - return "Wi-Fi" - } - guard currentPath.usesInterfaceType(.cellular) else { - return "无网络" - } - return cellularGeneration - } - - private var cellularGeneration: String { - let technologies = telephonyInfo.serviceCurrentRadioAccessTechnology - .map { Array($0.values) } ?? [] - guard let technology = technologies.first else { return "蜂窝" } - switch technology { - case CTRadioAccessTechnologyNR, CTRadioAccessTechnologyNRNSA: - return "5G" - case CTRadioAccessTechnologyLTE: - return "4G" - case CTRadioAccessTechnologyWCDMA, - CTRadioAccessTechnologyHSDPA, - CTRadioAccessTechnologyHSUPA, - CTRadioAccessTechnologyCDMAEVDORev0, - CTRadioAccessTechnologyCDMAEVDORevA, - CTRadioAccessTechnologyCDMAEVDORevB, - CTRadioAccessTechnologyeHRPD: - return "3G" - case CTRadioAccessTechnologyGPRS, - CTRadioAccessTechnologyEdge, - CTRadioAccessTechnologyCDMA1x: - return "2G" - default: - return "蜂窝" - } - } -} diff --git a/QuickLocation/Manager/MQTT/PhoneStatusCollector.swift b/QuickLocation/Manager/MQTT/PhoneStatusCollector.swift new file mode 100644 index 00000000..21204a87 --- /dev/null +++ b/QuickLocation/Manager/MQTT/PhoneStatusCollector.swift @@ -0,0 +1,226 @@ +// +// PhoneStatusCollector.swift +// QuickLocation +// + +import AVFoundation +import CoreTelephony +import Foundation +import Network +import UIKit + +struct PhoneStatusSnapshot: Equatable { + let model: String + let batteryPercent: Int? + let batteryText: String + let isCharging: Bool + let network: String + let brightnessPercent: Int + let brightnessText: String + let volumePercent: Int + let volumeText: String + let memoryUsed: String? + let memoryTotal: String? + let storageRatio: CGFloat + let storageText: String +} + +final class PhoneStatusCollector: NSObject { + + static let shared = PhoneStatusCollector() + + private let networkMonitor = PhoneNetworkStatusMonitor() + private var volumeObservation: NSKeyValueObservation? + private var pendingNotify: DispatchWorkItem? + private var started = false + + private override init() { + super.init() + } + + func start() { + guard !started else { return } + started = true + UIDevice.current.isBatteryMonitoringEnabled = true + networkMonitor.start { [weak self] in + self?.emitChange() + } + + let center = NotificationCenter.default + center.addObserver( + self, + selector: #selector(handleChange), + name: UIDevice.batteryLevelDidChangeNotification, + object: nil + ) + center.addObserver( + self, + selector: #selector(handleChange), + name: UIDevice.batteryStateDidChangeNotification, + object: nil + ) + center.addObserver( + self, + selector: #selector(handleChange), + name: UIScreen.brightnessDidChangeNotification, + object: nil + ) + center.addObserver( + self, + selector: #selector(handleChange), + name: UIApplication.didBecomeActiveNotification, + object: nil + ) + volumeObservation = AVAudioSession.sharedInstance().observe(\.outputVolume, options: [.new]) { [weak self] _, _ in + self?.emitChange() + } + } + + func snapshot() -> PhoneStatusSnapshot { + start() + let batteryPercent = UIDevice.batteryPercent + let brightnessPercent = Int((UIScreen.main.brightness * 100).rounded()) + let volumePercent = Int((AVAudioSession.sharedInstance().outputVolume * 100).rounded()) + let storage = Self.storageInfo() + let used = storage?.used + let total = storage?.total + let ratio: CGFloat + if let usedValue = Self.firstNumber(in: used), + let totalValue = Self.firstNumber(in: total), + totalValue > 0 { + ratio = CGFloat(max(0, min(1, usedValue / totalValue))) + } else { + ratio = 0 + } + let storageText: String + if let used, let total { + storageText = "\(used)/\(total)" + } else { + storageText = "**" + } + return PhoneStatusSnapshot( + model: UIDevice.modelName, + batteryPercent: batteryPercent, + batteryText: batteryPercent.map { "\($0)%" } ?? "未知", + isCharging: UIDevice.isBatteryCharging, + network: networkMonitor.statusText, + brightnessPercent: brightnessPercent, + brightnessText: "\(brightnessPercent)%", + volumePercent: volumePercent, + volumeText: "\(volumePercent)%", + memoryUsed: used, + memoryTotal: total, + storageRatio: ratio, + storageText: storageText + ) + } + + @objc private func handleChange() { + emitChange() + } + + private func emitChange() { + let work = { + self.pendingNotify?.cancel() + let item = DispatchWorkItem { + NotificationCenter.default.post(name: .phoneStatusDidChange, object: nil) + } + self.pendingNotify = item + DispatchQueue.main.asyncAfter(deadline: .now() + 0.25, execute: item) + } + if Thread.isMainThread { + work() + } else { + DispatchQueue.main.async(execute: work) + } + } + + static func storageInfo() -> (used: String, total: String)? { + let url = URL(fileURLWithPath: NSHomeDirectory()) + let keys: Set = [ + .volumeTotalCapacityKey, + .volumeAvailableCapacityForImportantUsageKey + ] + guard let values = try? url.resourceValues(forKeys: keys), + let total = values.volumeTotalCapacity, + let available = values.volumeAvailableCapacityForImportantUsage, + total > 0 else { return nil } + + let totalBytes = Int64(total) + let usedBytes = max(0, totalBytes - available) + return ( + used: String(format: "%.1fGB", Double(usedBytes) / 1_000_000_000), + total: String(format: "%.0fGB", Double(totalBytes) / 1_000_000_000) + ) + } + + private static func firstNumber(in value: String?) -> Double? { + guard let value, + let range = value.range(of: #"\d+(?:\.\d+)?"#, options: .regularExpression) else { return nil } + return Double(value[range]) + } +} + +private final class PhoneNetworkStatusMonitor { + + private let monitor = NWPathMonitor() + private let queue = DispatchQueue(label: "com.quicklocation.phone.network") + private let lock = NSLock() + private let telephonyInfo = CTTelephonyNetworkInfo() + private var path: NWPath? + private var onChange: (() -> Void)? + + func start(onChange: @escaping () -> Void) { + self.onChange = onChange + monitor.pathUpdateHandler = { [weak self] path in + self?.lock.lock() + self?.path = path + self?.lock.unlock() + onChange() + } + monitor.start(queue: queue) + } + + var statusText: String { + lock.lock() + let currentPath = path + lock.unlock() + + guard let currentPath, currentPath.status == .satisfied else { + return "无网络" + } + if currentPath.usesInterfaceType(.wifi) { + return "Wi-Fi" + } + guard currentPath.usesInterfaceType(.cellular) else { + return "无网络" + } + return cellularGeneration + } + + private var cellularGeneration: String { + let technologies = telephonyInfo.serviceCurrentRadioAccessTechnology + .map { Array($0.values) } ?? [] + guard let technology = technologies.first else { return "蜂窝" } + switch technology { + case CTRadioAccessTechnologyNR, CTRadioAccessTechnologyNRNSA: + return "5G" + case CTRadioAccessTechnologyLTE: + return "4G" + case CTRadioAccessTechnologyWCDMA, + CTRadioAccessTechnologyHSDPA, + CTRadioAccessTechnologyHSUPA, + CTRadioAccessTechnologyCDMAEVDORev0, + CTRadioAccessTechnologyCDMAEVDORevA, + CTRadioAccessTechnologyCDMAEVDORevB, + CTRadioAccessTechnologyeHRPD: + return "3G" + case CTRadioAccessTechnologyGPRS, + CTRadioAccessTechnologyEdge, + CTRadioAccessTechnologyCDMA1x: + return "2G" + default: + return "蜂窝" + } + } +} diff --git a/QuickLocation/Manager/URL/URLManager.swift b/QuickLocation/Manager/URL/URLManager.swift index 80ec0bd4..f48fb543 100644 --- a/QuickLocation/Manager/URL/URLManager.swift +++ b/QuickLocation/Manager/URL/URLManager.swift @@ -86,12 +86,12 @@ extension DefaultsKeys { case -1: // UAT return "https://jsapi.zuom8.cn/" default: // SIT - return "http://172.16.10.21:9243/" + return "http://172.16.10.23:9243/" } } static let presetServers: [(title: String, url: String, env: Int)] = [ - ("开发", "http://172.16.10.21:9243/", 0), + ("开发", "http://172.16.10.23:9243/", 0), ("正式", "https://jsapi.zuom8.cn/", 1) ] diff --git a/QuickLocation/Model/GroupModel.swift b/QuickLocation/Model/GroupModel.swift index 3612ca64..d1b05cdb 100644 --- a/QuickLocation/Model/GroupModel.swift +++ b/QuickLocation/Model/GroupModel.swift @@ -228,6 +228,8 @@ struct GroupInfoModel: Mappable, Equatable { var level: String = "" /// 邀请码 var share_code: String = "" + /// 当前用户在该圈的隐私权限 + var privilege = GroupPrivilege() init?(map: Map) { @@ -246,9 +248,57 @@ struct GroupInfoModel: Mappable, Equatable { description <- map["description"] share_code <- map["share_code"] people_no <- (map["people_no"], kStrTransformInt) + privilege <- map["privilege"] + if map["app_usage_record"].isKeyPresent { + privilege.app_usage_record <- (map["app_usage_record"], kFlexibleBool) + } + if map["phone_report"].isKeyPresent { + privilege.phone_report <- (map["phone_report"], kFlexibleBool) + } + if map["app_lock"].isKeyPresent { + privilege.app_lock <- (map["app_lock"], kFlexibleBool) + } + if map["pigeon_mail"].isKeyPresent { + privilege.pigeon_mail <- (map["pigeon_mail"], kFlexibleBool) + } } } +struct GroupPrivilege: Mappable, Equatable { + var app_usage_record = false + var phone_report = false + var app_lock = false + var pigeon_mail = false + + init() {} + init?(map: Map) {} + + mutating func mapping(map: Map) { + app_usage_record <- (map["app_usage_record"], kFlexibleBool) + phone_report <- (map["phone_report"], kFlexibleBool) + app_lock <- (map["app_lock"], kFlexibleBool) + pigeon_mail <- (map["pigeon_mail"], kFlexibleBool) + } +} + +private let kFlexibleBool = TransformOf(fromJSON: { value in + switch value { + case let value as Bool: + return value + case let value as NSNumber: + return value.boolValue + case let value as Int: + return value != 0 + case let value as String: + let text = value.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() + return text == "1" || text == "true" || text == "yes" + default: + return false + } +}, toJSON: { value in + value +}) + extension UIImageView { @MainActor func setGroupIcon(_ model: GroupInfoModel) { @@ -279,17 +329,58 @@ extension GroupInfoModel: IdentifiableType { struct CommonGroupModel: Mappable, Equatable { var group_key: String = "" var group_name: String = "" + var icon: String = "" + var icon_index: Int = 1 + var group_template: GroupTemplateModel? + + var groupIconURL: String { + let templateIcon = group_template?.icon.trimmingCharacters(in: .whitespacesAndNewlines) ?? "" + if !templateIcon.isEmpty { return templateIcon } + return icon.trimmingCharacters(in: .whitespacesAndNewlines) + } + + var groupIcon: UIImage { + UIImage(named: "GroupIcon/\(icon_index)") + ?? UIImage(named: "GroupIcon/1") + ?? UIImage() + } init(groupKey: String, groupName: String) { group_key = groupKey group_name = groupName } + init(info: GroupInfoModel) { + group_key = info.group_key + group_name = info.name + icon = info.groupIconURL + icon_index = info.icon_index + group_template = info.group_template + } + init?(map: Map) {} mutating func mapping(map: Map) { group_key <- map["group_key"] group_name <- map["group_name"] + if group_name.isEmpty { + group_name <- map["name"] + } + icon <- map["icon"] + icon_index <- (map["icon_index"], kStrTransformInt) + group_template <- map["group_template"] + if icon.isEmpty { + icon = group_template?.icon ?? "" + } + } + + mutating func apply(_ info: GroupInfoModel) { + if group_name.isEmpty || group_name == "未知圈子" { + group_name = info.name + } + if icon.isEmpty { icon = info.groupIconURL } + if icon_index <= 1 { icon_index = info.icon_index } + if group_template == nil { group_template = info.group_template } } static func deduplicated(_ groups: [CommonGroupModel]) -> [CommonGroupModel] { @@ -415,12 +506,14 @@ struct GroupMemberModel: Mappable, Equatable { struct MemberExtra: Mappable, Equatable { var relation_idx: String = "" + var privilege = GroupPrivilege() init() {} init?(map: Map) {} mutating func mapping(map: Map) { relation_idx <- (map["relation_idx"], kMemberRelationIndexTransform) + privilege <- map["privilege"] } static func decode(_ value: Any?) -> MemberExtra { diff --git a/QuickLocation/Model/MailboxModel.swift b/QuickLocation/Model/MailboxModel.swift new file mode 100644 index 00000000..c5b299a3 --- /dev/null +++ b/QuickLocation/Model/MailboxModel.swift @@ -0,0 +1,100 @@ +// +// MailboxModel.swift +// QuickLocation +// + +import Foundation +import ObjectMapper + +enum MailboxCategory: Int, CaseIterable { + case system = 1 + case notice = 2 + case interaction = 3 + + static let displayOrder: [MailboxCategory] = [.interaction, .notice, .system] + + var title: String { + switch self { + case .interaction: + return "互动" + case .notice: + return "通知" + case .system: + return "系统" + } + } + + var detailTitle: String { "\(title)消息" } +} + +struct MailboxMessage: Mappable, Equatable { + var id = 0 + var title = "" + var content = "" + var isRead = false + var type = MailboxCategory.system.rawValue + var senderId = "" + var senderIcon = "" + var modifyTime = "" + + var category: MailboxCategory { + MailboxCategory(rawValue: type) ?? .system + } + + init?(map: Map) {} + + mutating func mapping(map: Map) { + id <- (map["id"], kStrTransformInt) + title <- (map["title"], kFlexString) + content <- (map["content"], kFlexString) + isRead <- map["is_read"] + type <- (map["type"], kStrTransformInt) + senderId <- (map["sender_id"], kFlexString) + senderIcon <- (map["sender_icon"], kFlexString) + modifyTime <- (map["mtime"], kFlexString) + } +} + +struct MailboxListData: Mappable { + var page = 1 + var size = 10 + var total = 0 + var messages: [MailboxMessage] = [] + + init?(map: Map) {} + + mutating func mapping(map: Map) { + page <- (map["page"], kStrTransformInt) + size <- (map["size"], kStrTransformInt) + total <- (map["total"], kStrTransformInt) + messages <- map["datas"] + } +} + +struct MailboxListResponse: BaseModelProtocol { + var code: String? + var message: String? + var data: MailboxListData? + + init?(map: Map) {} + + mutating func mapping(map: Map) { + code <- (map["code"], kIntTransformStr) + message <- map["message"] + data <- map["data"] + } +} + +struct MailboxDetailResponse: BaseModelProtocol { + var code: String? + var message: String? + var data: MailboxMessage? + + init?(map: Map) {} + + mutating func mapping(map: Map) { + code <- (map["code"], kIntTransformStr) + message <- map["message"] + data <- map["data"] + } +} diff --git a/QuickLocation/Section/AppRestrict/AppRestrictCell.swift b/QuickLocation/Section/AppRestrict/AppRestrictCell.swift index 3ca02021..eede749e 100644 --- a/QuickLocation/Section/AppRestrict/AppRestrictCell.swift +++ b/QuickLocation/Section/AppRestrict/AppRestrictCell.swift @@ -26,7 +26,7 @@ final class AppRestrictCell: UITableViewCell { private let systemIconHost = UIView() private let linkIconView = UIImageView() private let catalogIconView = UIImageView() - private let placeholderView = UIView() + private let placeholderView = UIButton(type: .custom) private let placeholderLab = UILabel() private let divider = UIView() @@ -87,6 +87,7 @@ final class AppRestrictCell: UITableViewCell { .centerY() .width(Metric.appIcon) .height(Metric.appIcon) + placeholderView.addTarget(self, action: #selector(tapPair), for: .touchUpInside) placeholderView.addSubview(placeholderLab) placeholderLab.text = "?" placeholderLab.font = .systemFont(ofSize: 18, weight: .bold) diff --git a/QuickLocation/Section/Group/GroupChat/GroupChatVC.swift b/QuickLocation/Section/Group/GroupChat/GroupChatVC.swift index 0b76f225..86fd5792 100644 --- a/QuickLocation/Section/Group/GroupChat/GroupChatVC.swift +++ b/QuickLocation/Section/Group/GroupChat/GroupChatVC.swift @@ -110,6 +110,7 @@ final class GroupChatVC: BaseViewController { override func viewWillDisappear(_ animated: Bool) { super.viewWillDisappear(animated) + viewModel.markAsRead() VoicePlayerManager.shared.stop() if isVoiceRecording { finishVoiceRecording(action: .discard) @@ -156,6 +157,7 @@ final class GroupChatVC: BaseViewController { guard self.rootView.voiceRecordView.isHidden else { return } guard self.rootView.emojiPanelView.isHidden else { return } let duration = (noti.userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? Double) ?? 0.25 + self.rootView.refreshComposer() UIView.animate(withDuration: duration) { self.rootView.bottomBar.layoutChain.bottom(kSafeBottomMargin) self.rootView.layoutIfNeeded() @@ -652,6 +654,7 @@ final class GroupChatVC: BaseViewController { guard !text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else { return } self.viewModel.input.sendMessage.onNext(text) self.rootView.textField.text = "" + self.rootView.refreshComposer() self.hideMentionPicker() }) .disposed(by: disposeBag) @@ -1095,6 +1098,7 @@ extension GroupChatVC: UITextFieldDelegate, UITableViewDataSource { guard !text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else { return true } viewModel.input.sendMessage.onNext(text) textField.text = "" + rootView.refreshComposer() hideMentionPicker() return true } diff --git a/QuickLocation/Section/Group/GroupChat/GroupChatView.swift b/QuickLocation/Section/Group/GroupChat/GroupChatView.swift index 4a7d9094..f8a40572 100644 --- a/QuickLocation/Section/Group/GroupChat/GroupChatView.swift +++ b/QuickLocation/Section/Group/GroupChat/GroupChatView.swift @@ -1750,9 +1750,29 @@ extension GroupChatView: UICollectionViewDelegate { +private enum VoiceBubbleLayout { + static let minWidth: CGFloat = 80 + static let maxWidthCap: CGFloat = 220 + static let maxWidthRatio: CGFloat = 0.55 + static let maxDurationSeconds = 60 + + static func durationSeconds(from content: String) -> Int { + let raw = content.int + let seconds = raw >= 1000 ? raw / 1000 : raw + return min(Int(max(seconds, 1)), maxDurationSeconds) + } + + static func bubbleWidth(durationSeconds: Int) -> CGFloat { + let maxW = min(UIScreen.main.bounds.width * maxWidthRatio, maxWidthCap) + let t = CGFloat(durationSeconds - 1) / CGFloat(maxDurationSeconds - 1) + return (minWidth + (maxW - minWidth) * t).rounded() + } +} + // MARK: - 发送的语音消息 final class VoiceSendMsgCell: UITableViewCell, VoicePlaybackView { var menuAnchorView: UIView { bubbleView } + private var bubbleWidthConstraint: NSLayoutConstraint! private let timeLabel: UILabel = { let label = UILabel() @@ -1828,10 +1848,12 @@ final class VoiceSendMsgCell: UITableViewCell, VoicePlaybackView { bubbleView.layoutChain .topToBottomOfView(senderNameView, offset: 5) .rightToView(senderNameView) - .width(105).height(39).bottom(10) + .height(39).bottom(10) + bubbleWidthConstraint = bubbleView.widthAnchor.constraint(equalToConstant: VoiceBubbleLayout.minWidth) + bubbleWidthConstraint.isActive = true playAnimation.layoutChain - .right(36) + .right(10) .centerY() .width(20).height(20) @@ -1849,8 +1871,9 @@ final class VoiceSendMsgCell: UITableViewCell, VoicePlaybackView { timeLabel.text = msg.showTime ? chatFormatTime(msg.timestamp) : nil avatarView.setHeadPic(msg.headPic) senderNameView.configure(name: msg.senderName, isOwner: msg.isCircleOwner, relationIdx: msg.relationIdx) - let dur = msg.content.int / 1000 - durationLabel.text = dur > 0 ? "\(dur)''" : "" + let dur = VoiceBubbleLayout.durationSeconds(from: msg.content) + durationLabel.text = "\(dur)''" + bubbleWidthConstraint.constant = VoiceBubbleLayout.bubbleWidth(durationSeconds: dur) voiceUrl = msg.voiceUrl } @@ -1887,14 +1910,16 @@ final class VoiceSendMsgCell: UITableViewCell, VoicePlaybackView { // MARK: - 收到的语音消息 final class VoiceReceivedMsgCell: UITableViewCell, VoicePlaybackView { var menuAnchorView: UIView { bubbleView } + private var bubbleWidthConstraint: NSLayoutConstraint! func configure(_ msg: ChatMessage) { timeLabel.isHidden = !msg.showTime timeLabel.text = msg.showTime ? chatFormatTime(msg.timestamp) : nil avatarView.setHeadPic(msg.headPic) senderNameView.configure(name: msg.senderName, isOwner: msg.isCircleOwner, relationIdx: msg.relationIdx) - let dur = msg.content.int / 1000 - durationLabel.text = dur > 0 ? "\(dur)''" : "" + let dur = VoiceBubbleLayout.durationSeconds(from: msg.content) + durationLabel.text = "\(dur)''" + bubbleWidthConstraint.constant = VoiceBubbleLayout.bubbleWidth(durationSeconds: dur) voiceUrl = msg.voiceUrl } @@ -1992,12 +2017,13 @@ final class VoiceReceivedMsgCell: UITableViewCell, VoicePlaybackView { bubbleView.layoutChain .topToBottomOfView(senderNameView, offset: 5) .leftToView(senderNameView) - .width(105) .height(39) .bottom(10) + bubbleWidthConstraint = bubbleView.widthAnchor.constraint(equalToConstant: VoiceBubbleLayout.minWidth) + bubbleWidthConstraint.isActive = true playAnimation.layoutChain - .left(36) + .left(10) .centerY() .width(20).height(20) diff --git a/QuickLocation/Section/Group/GroupChat/GroupChatViewModel.swift b/QuickLocation/Section/Group/GroupChat/GroupChatViewModel.swift index 10077b37..09e1f5b6 100644 --- a/QuickLocation/Section/Group/GroupChat/GroupChatViewModel.swift +++ b/QuickLocation/Section/Group/GroupChat/GroupChatViewModel.swift @@ -692,7 +692,8 @@ final class GroupChatViewModel { }) } - private func markAsRead() { + func markAsRead() { + guard !conversationID.isEmpty else { return } OIMManager.manager.markConversationMessage(asRead: conversationID, onSuccess: nil, onFailure: nil) @@ -716,6 +717,9 @@ final class GroupChatViewModel { // MARK: - Receive func onReceiveMessage(_ msg: OIMMessageInfo) { cacheMessage(msg) + if msg.sendID != AppContextManager.shared.userId { + markAsRead() + } guard let item = toSectionItem(msg) else { return } let ts = timestampFrom(item: item) var items = messagesSubject.value diff --git a/QuickLocation/Section/Group/GroupViewController.swift b/QuickLocation/Section/Group/GroupViewController.swift index e2255399..b9ae6a6e 100644 --- a/QuickLocation/Section/Group/GroupViewController.swift +++ b/QuickLocation/Section/Group/GroupViewController.swift @@ -142,6 +142,12 @@ final class GroupViewController: BaseViewController { }) .disposed(by: disposeBag) + rootView.messageBtn.rx.tap + .subscribe(onNext: { + AppRouter.push(Route.mailbox) + }) + .disposed(by: disposeBag) + // 子 Tab:全部圈子(0=joined) / 我的圈子(1=created) rootView.joinedTabLabel.rx.tapGesture .subscribe(onNext: { [weak self] _ in self?.switchToSegment(0) }) diff --git a/QuickLocation/Section/Group/Mailbox/MailboxDetailViewController.swift b/QuickLocation/Section/Group/Mailbox/MailboxDetailViewController.swift new file mode 100644 index 00000000..85748ecf --- /dev/null +++ b/QuickLocation/Section/Group/Mailbox/MailboxDetailViewController.swift @@ -0,0 +1,392 @@ +// +// MailboxDetailViewController.swift +// QuickLocation +// + +import UIKit +import RxSwift +import Lottie + +final class MailboxDetailViewController: UIViewController { + private var messages: [MailboxMessage] + private var currentIndex: Int + private var currentMessage: MailboxMessage + private let disposeBag = DisposeBag() + private let detailView = MailboxDetailView() + private var isLoading = false + + var onMessageRead: ((MailboxMessage) -> Void)? + + init(messages: [MailboxMessage], initialMessage: MailboxMessage) { + self.messages = messages + self.currentMessage = initialMessage + self.currentIndex = messages.firstIndex(where: { $0.id == initialMessage.id }) ?? 0 + super.init(nibName: nil, bundle: nil) + modalPresentationStyle = .overFullScreen + modalTransitionStyle = .crossDissolve + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + override func loadView() { + view = detailView + } + + override func viewDidLoad() { + super.viewDidLoad() + detailView.closeButton.addTarget(self, action: #selector(closeAction), for: .touchUpInside) + detailView.previousButton.addTarget(self, action: #selector(previousAction), for: .touchUpInside) + detailView.nextButton.addTarget(self, action: #selector(nextAction), for: .touchUpInside) + renderCurrentMessage() + } + + private func renderCurrentMessage() { + detailView.configure( + message: currentMessage, + canGoPrevious: currentIndex > 0, + canGoNext: currentIndex + 1 < messages.count + ) + } + + private func loadMessage(at index: Int) { + guard messages.indices.contains(index), !isLoading else { return } + let cachedMessage = messages[index] + isLoading = true + detailView.setControlsEnabled(false) + DLToast.showLoading() + + UserService.mailboxDetail(id: cachedMessage.id) + .subscribe(onNext: { [weak self] response in + guard let self else { return } + DLToast.dismiss() + self.isLoading = false + guard let responseMessage = response.data else { + self.detailView.setControlsEnabled(true) + DLToast.showError(text: response.message ?? "消息详情加载失败") + return + } + var detail = self.mergeDetail(responseMessage, fallback: cachedMessage) + detail.isRead = true + self.messages[index] = detail + self.currentIndex = index + self.currentMessage = detail + self.onMessageRead?(detail) + self.renderCurrentMessage() + }, onError: { [weak self] error in + DLToast.dismiss() + self?.isLoading = false + self?.detailView.setControlsEnabled(true) + DLToast.showError(text: error.localizedDescription) + }) + .disposed(by: disposeBag) + } + + private func mergeDetail(_ detail: MailboxMessage, fallback: MailboxMessage) -> MailboxMessage { + var merged = detail + if merged.id == 0 { merged.id = fallback.id } + if merged.title.isEmpty { merged.title = fallback.title } + if merged.content.isEmpty { merged.content = fallback.content } + if merged.senderId.isEmpty { merged.senderId = fallback.senderId } + if merged.senderIcon.isEmpty { merged.senderIcon = fallback.senderIcon } + if merged.modifyTime.isEmpty { merged.modifyTime = fallback.modifyTime } + if MailboxCategory(rawValue: merged.type) == nil { merged.type = fallback.type } + return merged + } + + @objc private func closeAction() { + dismiss(animated: true) + } + + @objc private func previousAction() { + loadMessage(at: currentIndex - 1) + } + + @objc private func nextAction() { + loadMessage(at: currentIndex + 1) + } +} + +private final class MailboxDetailView: UIView { + let previousButton = UIButton(type: .custom) + let closeButton = UIButton(type: .custom) + let nextButton = UIButton(type: .custom) + + private let cardView = UIView() + private let cardBackgroundView = UIImageView() + private let birdImageView = UIImageView(image: UIImage(named: "Mailbox/detail_bird")) + private let typeLabel = UILabel() + private let dividerView = UIView() + private let titleLabel = UILabel() + private let scrollView = UIScrollView() + private let contentContainerView = UIView() + private let contentLabel = UILabel() + private let lottieView = LottieAnimationView() + private let quickMessageLabel = UILabel() + private var animationName: String? + private var contentBottomConstraint: NSLayoutConstraint? + private var cardHeightConstraint: NSLayoutConstraint? + + override init(frame: CGRect) { + super.init(frame: frame) + setupUI() + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + func configure(message: MailboxMessage, canGoPrevious: Bool, canGoNext: Bool) { + typeLabel.text = message.category.detailTitle + titleLabel.text = message.title + configureContent(message: message) + previousButton.isEnabled = canGoPrevious + nextButton.isEnabled = canGoNext + updateButtonAppearance() + } + + func setControlsEnabled(_ enabled: Bool) { + previousButton.isUserInteractionEnabled = enabled + nextButton.isUserInteractionEnabled = enabled + closeButton.isUserInteractionEnabled = enabled + previousButton.alpha = enabled ? (previousButton.isEnabled ? 1 : 0.35) : 0.35 + nextButton.alpha = enabled ? (nextButton.isEnabled ? 1 : 0.35) : 0.35 + closeButton.alpha = enabled ? 1 : 0.55 + } + + private func setupUI() { + backgroundColor = UIColor.black.withAlphaComponent(0.68) + + cardView.layer.cornerRadius = 31 + cardView.clipsToBounds = true + cardBackgroundView.image = UIImage(named: "Mailbox/detail_card")?.resizableImage( + withCapInsets: UIEdgeInsets(top: 70, left: 70, bottom: 70, right: 70), + resizingMode: .stretch + ) + cardBackgroundView.contentMode = .scaleToFill + + birdImageView.contentMode = .scaleAspectFit + + typeLabel.font = .systemFont(ofSize: 18, weight: .medium) + typeLabel.textColor = UIColor(hexStr: "#14324E") + typeLabel.textAlignment = .center + + dividerView.backgroundColor = UIColor(hexStr: "#80D8FF", alpha: 0.55) + + titleLabel.font = .systemFont(ofSize: 18, weight: .medium) + titleLabel.textColor = UIColor(hexStr: "#333333") + titleLabel.textAlignment = .center + titleLabel.numberOfLines = 0 + + scrollView.showsVerticalScrollIndicator = false + scrollView.alwaysBounceVertical = false + + contentLabel.font = .systemFont(ofSize: 15) + contentLabel.textColor = UIColor(hexStr: "#858585") + contentLabel.textAlignment = .center + contentLabel.numberOfLines = 0 + + lottieView.contentMode = .scaleAspectFit + lottieView.loopMode = .loop + lottieView.backgroundBehavior = .pauseAndRestore + + quickMessageLabel.font = .systemFont(ofSize: 15) + quickMessageLabel.textColor = UIColor(hexStr: "#52606D") + quickMessageLabel.textAlignment = .center + quickMessageLabel.numberOfLines = 0 + quickMessageLabel.backgroundColor = UIColor(hexStr: "#DFF5FF") + quickMessageLabel.layer.cornerRadius = 9 + quickMessageLabel.clipsToBounds = true + + configureControlButton(previousButton, title: "上一条") + configureControlButton(nextButton, title: "下一条") + closeButton.setImage(UIImage(named: "Mailbox/detail_close"), for: .normal) + closeButton.accessibilityLabel = "关闭" + + addSubview(cardView) + cardView.addSubview(cardBackgroundView) + addSubview(birdImageView) + cardView.addSubview(typeLabel) + cardView.addSubview(dividerView) + cardView.addSubview(titleLabel) + cardView.addSubview(scrollView) + scrollView.addSubview(contentContainerView) + contentContainerView.addSubview(contentLabel) + contentContainerView.addSubview(lottieView) + contentContainerView.addSubview(quickMessageLabel) + addSubview(previousButton) + addSubview(closeButton) + addSubview(nextButton) + + [cardView, cardBackgroundView, birdImageView, typeLabel, dividerView, titleLabel, scrollView, + contentContainerView, contentLabel, lottieView, quickMessageLabel, previousButton, closeButton, + nextButton].forEach { $0.translatesAutoresizingMaskIntoConstraints = false } + + let cardWidth = min(kScreenWidth - 48, 360) + let cardHeightConstraint = cardView.heightAnchor.constraint(equalToConstant: 245) + self.cardHeightConstraint = cardHeightConstraint + NSLayoutConstraint.activate([ + cardView.centerXAnchor.constraint(equalTo: centerXAnchor), + cardView.centerYAnchor.constraint(equalTo: centerYAnchor, constant: -32), + cardView.widthAnchor.constraint(equalToConstant: cardWidth), + cardHeightConstraint, + cardBackgroundView.topAnchor.constraint(equalTo: cardView.topAnchor), + cardBackgroundView.leadingAnchor.constraint(equalTo: cardView.leadingAnchor), + cardBackgroundView.trailingAnchor.constraint(equalTo: cardView.trailingAnchor), + cardBackgroundView.bottomAnchor.constraint(equalTo: cardView.bottomAnchor), + birdImageView.leadingAnchor.constraint(equalTo: cardView.leadingAnchor, constant: 36), + birdImageView.bottomAnchor.constraint(equalTo: cardView.topAnchor, constant: 35), + birdImageView.widthAnchor.constraint(equalToConstant: 100), + birdImageView.heightAnchor.constraint(equalToConstant: 74), + typeLabel.topAnchor.constraint(equalTo: cardView.topAnchor, constant: 49), + typeLabel.leadingAnchor.constraint(equalTo: cardView.leadingAnchor, constant: 26), + typeLabel.trailingAnchor.constraint(equalTo: cardView.trailingAnchor, constant: -26), + dividerView.topAnchor.constraint(equalTo: typeLabel.bottomAnchor, constant: 15), + dividerView.leadingAnchor.constraint(equalTo: cardView.leadingAnchor, constant: 23), + dividerView.trailingAnchor.constraint(equalTo: cardView.trailingAnchor, constant: -23), + dividerView.heightAnchor.constraint(equalToConstant: 0.5), + titleLabel.topAnchor.constraint(equalTo: dividerView.bottomAnchor, constant: 20), + titleLabel.leadingAnchor.constraint(equalTo: cardView.leadingAnchor, constant: 30), + titleLabel.trailingAnchor.constraint(equalTo: cardView.trailingAnchor, constant: -30), + scrollView.topAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: 13), + scrollView.leadingAnchor.constraint(equalTo: cardView.leadingAnchor, constant: 28), + scrollView.trailingAnchor.constraint(equalTo: cardView.trailingAnchor, constant: -28), + scrollView.bottomAnchor.constraint(equalTo: cardView.bottomAnchor, constant: -25), + contentContainerView.topAnchor.constraint(equalTo: scrollView.contentLayoutGuide.topAnchor), + contentContainerView.leadingAnchor.constraint(equalTo: scrollView.contentLayoutGuide.leadingAnchor), + contentContainerView.trailingAnchor.constraint(equalTo: scrollView.contentLayoutGuide.trailingAnchor), + contentContainerView.bottomAnchor.constraint(equalTo: scrollView.contentLayoutGuide.bottomAnchor), + contentContainerView.widthAnchor.constraint(equalTo: scrollView.frameLayoutGuide.widthAnchor), + contentLabel.topAnchor.constraint(equalTo: contentContainerView.topAnchor), + contentLabel.leadingAnchor.constraint(equalTo: contentContainerView.leadingAnchor), + contentLabel.trailingAnchor.constraint(equalTo: contentContainerView.trailingAnchor), + lottieView.topAnchor.constraint(equalTo: contentLabel.bottomAnchor, constant: 10), + lottieView.centerXAnchor.constraint(equalTo: contentContainerView.centerXAnchor), + lottieView.widthAnchor.constraint(equalToConstant: 116), + lottieView.heightAnchor.constraint(equalToConstant: 116), + quickMessageLabel.topAnchor.constraint(equalTo: contentLabel.bottomAnchor, constant: 14), + quickMessageLabel.centerXAnchor.constraint(equalTo: contentContainerView.centerXAnchor), + quickMessageLabel.leadingAnchor.constraint(greaterThanOrEqualTo: contentContainerView.leadingAnchor, constant: 20), + quickMessageLabel.trailingAnchor.constraint(lessThanOrEqualTo: contentContainerView.trailingAnchor, constant: -20), + quickMessageLabel.heightAnchor.constraint(greaterThanOrEqualToConstant: 40), + previousButton.topAnchor.constraint(equalTo: cardView.bottomAnchor, constant: 20), + previousButton.leadingAnchor.constraint(equalTo: cardView.leadingAnchor, constant: 34), + previousButton.heightAnchor.constraint(equalToConstant: 40), + nextButton.topAnchor.constraint(equalTo: previousButton.topAnchor), + nextButton.trailingAnchor.constraint(equalTo: cardView.trailingAnchor, constant: -34), + nextButton.heightAnchor.constraint(equalTo: previousButton.heightAnchor), + closeButton.centerXAnchor.constraint(equalTo: centerXAnchor), + closeButton.centerYAnchor.constraint(equalTo: previousButton.centerYAnchor), + closeButton.widthAnchor.constraint(equalToConstant: 24), + closeButton.heightAnchor.constraint(equalToConstant: 24) + ]) + } + + private func configureControlButton(_ button: UIButton, title: String) { + button.setTitle(title, for: .normal) + button.setTitleColor(.white, for: .normal) + button.setTitleColor(UIColor.white.withAlphaComponent(0.45), for: .disabled) + button.titleLabel?.font = .systemFont(ofSize: 16) + } + + private func configureContent(message: MailboxMessage) { + animationName = nil + lottieView.stop() + lottieView.animation = nil + lottieView.isHidden = true + quickMessageLabel.isHidden = true + contentLabel.text = message.content + cardHeightConstraint?.constant = message.content.count > 80 ? 300 : 245 + + guard message.category == .interaction, + let payload = parsePayload(message.content) else { + updateContentBottomAnchor(visibleView: contentLabel) + return + } + + contentLabel.text = payload.prefix + switch payload.kind { + case let .animation(name): + cardHeightConstraint?.constant = 330 + animationName = name + lottieView.isHidden = false + updateContentBottomAnchor(visibleView: lottieView) + EmojiPanelCell.loadAnimation(for: name) { [weak self] animation in + guard let self, self.animationName == name else { return } + guard let animation else { + self.showFallbackContent(message.content) + return + } + self.lottieView.animation = animation + self.lottieView.currentProgress = 0 + self.lottieView.play() + } + case let .quickMessage(text): + cardHeightConstraint?.constant = 265 + quickMessageLabel.text = " \(text) " + quickMessageLabel.isHidden = false + updateContentBottomAnchor(visibleView: quickMessageLabel) + } + } + + private func updateContentBottomAnchor(visibleView: UIView) { + contentBottomConstraint?.isActive = false + contentBottomConstraint = visibleView.bottomAnchor.constraint(equalTo: contentContainerView.bottomAnchor) + contentBottomConstraint?.isActive = true + } + + private func showFallbackContent(_ content: String) { + animationName = nil + lottieView.stop() + lottieView.animation = nil + lottieView.isHidden = true + quickMessageLabel.isHidden = true + contentLabel.text = content + updateContentBottomAnchor(visibleView: contentLabel) + } + + private func parsePayload(_ content: String) -> MailboxPayload? { + guard let opening = content.firstIndex(of: "["), + let closing = content[opening...].firstIndex(of: "]"), + let lastOpening = content.lastIndex(of: "[") else { + return nil + } + let codeStart = content.index(after: opening) + let code = String(content[codeStart.. 1, let prefixCode = code.first else { return nil } + let value = String(code.dropFirst()) + let prefix = String(content[.. Void)? + + override init(frame: CGRect) { + super.init(frame: frame) + setupUI() + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + override func layoutSubviews() { + super.layoutSubviews() + headerGradientLayer.frame = CGRect(x: 0, y: 0, width: bounds.width, height: kNaviHeight + 132) + } + + func selectCategory(_ category: MailboxCategory) { + categoryViews.forEach { itemCategory, categoryView in + categoryView.setSelected(itemCategory == category) + } + } + + func updateUnreadCounts(_ counts: [MailboxCategory: Int]) { + categoryViews.forEach { category, categoryView in + categoryView.setUnreadCount(counts[category] ?? 0) + } + } + + func updateState(hasMessages: Bool, isLoading: Bool, reachedEnd: Bool) { + loadingIndicator.isHidden = !isLoading + if isLoading { + loadingIndicator.startAnimating() + } else { + loadingIndicator.stopAnimating() + } + emptyImageView.isHidden = isLoading || hasMessages || !reachedEnd + emptyLabel.isHidden = emptyImageView.isHidden + tableView.mj_footer?.isHidden = !hasMessages || reachedEnd + if reachedEnd { + tableView.mj_footer?.endRefreshingWithNoMoreData() + } else { + tableView.mj_footer?.resetNoMoreData() + tableView.mj_footer?.endRefreshing() + } + } + + private func setupUI() { + backgroundColor = .white + headerGradientLayer.colors = [ + UIColor(hexStr: "#DFF9FF").cgColor, + UIColor(hexStr: "#F3FFE9").cgColor, + UIColor.white.cgColor + ] + headerGradientLayer.locations = [0, 0.58, 1] + headerGradientLayer.startPoint = CGPoint(x: 0, y: 0) + headerGradientLayer.endPoint = CGPoint(x: 1, y: 1) + layer.insertSublayer(headerGradientLayer, at: 0) + + setupNavigationBar() + setupCategories() + setupTableView() + setupEmptyView() + } + + private func setupNavigationBar() { + titleLabel.text = "消息" + titleLabel.textColor = UIColor(hexStr: "#18304B") + titleLabel.font = .systemFont(ofSize: 18, weight: .medium) + titleLabel.textAlignment = .center + + configureNavigationButton(backButton, symbolName: "chevron.left") + configureNavigationButton(clearButton, symbolName: "trash.fill") + backButton.accessibilityLabel = "返回" + clearButton.accessibilityLabel = "清空全部消息" + + addSubview(titleLabel) + addSubview(backButton) + addSubview(clearButton) + titleLabel.translatesAutoresizingMaskIntoConstraints = false + backButton.translatesAutoresizingMaskIntoConstraints = false + clearButton.translatesAutoresizingMaskIntoConstraints = false + NSLayoutConstraint.activate([ + backButton.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 18), + backButton.topAnchor.constraint(equalTo: topAnchor, constant: kStatusBarHeight + 8), + backButton.widthAnchor.constraint(equalToConstant: 36), + backButton.heightAnchor.constraint(equalToConstant: 36), + clearButton.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -18), + clearButton.centerYAnchor.constraint(equalTo: backButton.centerYAnchor), + clearButton.widthAnchor.constraint(equalToConstant: 36), + clearButton.heightAnchor.constraint(equalToConstant: 36), + titleLabel.centerXAnchor.constraint(equalTo: centerXAnchor), + titleLabel.centerYAnchor.constraint(equalTo: backButton.centerYAnchor) + ]) + } + + private func configureNavigationButton(_ button: UIButton, symbolName: String) { + let configuration = UIImage.SymbolConfiguration(pointSize: 18, weight: .bold) + button.setImage(UIImage(systemName: symbolName, withConfiguration: configuration), for: .normal) + button.tintColor = UIColor(hexStr: "#213148") + button.backgroundColor = UIColor.white.withAlphaComponent(0.88) + button.layer.cornerRadius = 10 + button.layer.shadowColor = UIColor.black.withAlphaComponent(0.08).cgColor + button.layer.shadowOpacity = 1 + button.layer.shadowRadius = 8 + button.layer.shadowOffset = CGSize(width: 0, height: 3) + } + + private func setupCategories() { + categoryStackView.axis = .horizontal + categoryStackView.distribution = .fillEqually + categoryStackView.alignment = .fill + + MailboxCategory.displayOrder.forEach { category in + let categoryView = MailboxCategoryView(category: category) + categoryView.addTarget(self, action: #selector(categoryTapped(_:)), for: .touchUpInside) + categoryStackView.addArrangedSubview(categoryView) + categoryViews[category] = categoryView + } + + contentTopSeparator.backgroundColor = UIColor(hexStr: "#E8E8E8") + addSubview(categoryStackView) + addSubview(contentTopSeparator) + categoryStackView.translatesAutoresizingMaskIntoConstraints = false + contentTopSeparator.translatesAutoresizingMaskIntoConstraints = false + NSLayoutConstraint.activate([ + categoryStackView.topAnchor.constraint(equalTo: topAnchor, constant: kNaviHeight + 14), + categoryStackView.leadingAnchor.constraint(equalTo: leadingAnchor), + categoryStackView.trailingAnchor.constraint(equalTo: trailingAnchor), + categoryStackView.heightAnchor.constraint(equalToConstant: 112), + contentTopSeparator.topAnchor.constraint(equalTo: categoryStackView.bottomAnchor), + contentTopSeparator.leadingAnchor.constraint(equalTo: leadingAnchor), + contentTopSeparator.trailingAnchor.constraint(equalTo: trailingAnchor), + contentTopSeparator.heightAnchor.constraint(equalToConstant: 0.5) + ]) + } + + private func setupTableView() { + tableView.backgroundColor = .white + tableView.separatorStyle = .none + tableView.rowHeight = 66 + tableView.showsVerticalScrollIndicator = false + tableView.tableFooterView = UIView() + tableView.contentInset = UIEdgeInsets(top: 8, left: 0, bottom: kSafeBottomMargin + 18, right: 0) + tableView.register(MailboxMessageCell.self, forCellReuseIdentifier: MailboxMessageCell.reuseIdentifier) + + addSubview(tableView) + tableView.translatesAutoresizingMaskIntoConstraints = false + NSLayoutConstraint.activate([ + tableView.topAnchor.constraint(equalTo: contentTopSeparator.bottomAnchor), + tableView.leadingAnchor.constraint(equalTo: leadingAnchor), + tableView.trailingAnchor.constraint(equalTo: trailingAnchor), + tableView.bottomAnchor.constraint(equalTo: bottomAnchor) + ]) + } + + private func setupEmptyView() { + emptyView.isUserInteractionEnabled = false + emptyImageView.contentMode = .scaleAspectFit + emptyLabel.text = "这里怎么什么都没有~" + emptyLabel.textColor = UIColor(hexStr: "#B1B1B1") + emptyLabel.font = .systemFont(ofSize: 14) + emptyLabel.textAlignment = .center + loadingIndicator.color = UIColor(hexStr: "#16B3FF") + + addSubview(emptyView) + emptyView.addSubview(emptyImageView) + emptyView.addSubview(emptyLabel) + emptyView.addSubview(loadingIndicator) + emptyView.translatesAutoresizingMaskIntoConstraints = false + emptyImageView.translatesAutoresizingMaskIntoConstraints = false + emptyLabel.translatesAutoresizingMaskIntoConstraints = false + loadingIndicator.translatesAutoresizingMaskIntoConstraints = false + NSLayoutConstraint.activate([ + emptyView.topAnchor.constraint(equalTo: contentTopSeparator.bottomAnchor), + emptyView.leadingAnchor.constraint(equalTo: leadingAnchor), + emptyView.trailingAnchor.constraint(equalTo: trailingAnchor), + emptyView.bottomAnchor.constraint(equalTo: bottomAnchor), + emptyImageView.centerXAnchor.constraint(equalTo: emptyView.centerXAnchor), + emptyImageView.centerYAnchor.constraint(equalTo: emptyView.centerYAnchor, constant: -56), + emptyImageView.widthAnchor.constraint(equalToConstant: 140), + emptyImageView.heightAnchor.constraint(equalToConstant: 120), + emptyLabel.topAnchor.constraint(equalTo: emptyImageView.bottomAnchor, constant: 8), + emptyLabel.centerXAnchor.constraint(equalTo: emptyView.centerXAnchor), + loadingIndicator.centerXAnchor.constraint(equalTo: emptyView.centerXAnchor), + loadingIndicator.centerYAnchor.constraint(equalTo: emptyView.centerYAnchor, constant: -40) + ]) + } + + @objc private func categoryTapped(_ sender: MailboxCategoryView) { + onSelectCategory?(sender.category) + } +} + +final class MailboxCategoryView: UIControl { + let category: MailboxCategory + + private let iconBackgroundView = UIView() + private let iconImageView = UIImageView() + private let titleLabel = UILabel() + private let underlineView = UIView() + private let badgeLabel = UILabel() + + init(category: MailboxCategory) { + self.category = category + super.init(frame: .zero) + setupUI() + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + func setSelected(_ selected: Bool) { + titleLabel.textColor = UIColor(hexStr: "#26364A") + underlineView.isHidden = !selected + } + + func setUnreadCount(_ count: Int) { + badgeLabel.isHidden = count <= 0 + badgeLabel.text = count > 99 ? "99+" : "\(count)" + } + + private func setupUI() { + accessibilityLabel = category.title + iconBackgroundView.isUserInteractionEnabled = false + iconBackgroundView.backgroundColor = .clear + iconImageView.image = UIImage(named: category.iconAssetName) + iconImageView.contentMode = .scaleAspectFit + + titleLabel.text = category.title + titleLabel.textAlignment = .center + titleLabel.textColor = UIColor(hexStr: "#26364A") + titleLabel.font = .systemFont(ofSize: 15) + + underlineView.backgroundColor = UIColor(hexStr: "#13B6FB") + underlineView.layer.cornerRadius = 1.5 + underlineView.isHidden = true + + badgeLabel.backgroundColor = UIColor(hexStr: "#FF5260") + badgeLabel.textColor = .white + badgeLabel.font = .systemFont(ofSize: 10, weight: .medium) + badgeLabel.textAlignment = .center + badgeLabel.layer.cornerRadius = 9 + badgeLabel.clipsToBounds = true + badgeLabel.isHidden = true + + addSubview(iconBackgroundView) + iconBackgroundView.addSubview(iconImageView) + addSubview(titleLabel) + addSubview(underlineView) + addSubview(badgeLabel) + [iconBackgroundView, iconImageView, titleLabel, underlineView, badgeLabel].forEach { + $0.translatesAutoresizingMaskIntoConstraints = false + } + NSLayoutConstraint.activate([ + iconBackgroundView.topAnchor.constraint(equalTo: topAnchor, constant: 12), + iconBackgroundView.centerXAnchor.constraint(equalTo: centerXAnchor), + iconBackgroundView.widthAnchor.constraint(equalToConstant: 50), + iconBackgroundView.heightAnchor.constraint(equalToConstant: 50), + iconImageView.centerXAnchor.constraint(equalTo: iconBackgroundView.centerXAnchor), + iconImageView.centerYAnchor.constraint(equalTo: iconBackgroundView.centerYAnchor), + iconImageView.widthAnchor.constraint(equalToConstant: 50), + iconImageView.heightAnchor.constraint(equalToConstant: 50), + titleLabel.topAnchor.constraint(equalTo: iconBackgroundView.bottomAnchor, constant: 7), + titleLabel.centerXAnchor.constraint(equalTo: centerXAnchor), + underlineView.bottomAnchor.constraint(equalTo: bottomAnchor), + underlineView.centerXAnchor.constraint(equalTo: centerXAnchor), + underlineView.widthAnchor.constraint(equalToConstant: 18), + underlineView.heightAnchor.constraint(equalToConstant: 3), + badgeLabel.centerXAnchor.constraint(equalTo: iconBackgroundView.trailingAnchor, constant: -2), + badgeLabel.centerYAnchor.constraint(equalTo: iconBackgroundView.topAnchor, constant: 2), + badgeLabel.heightAnchor.constraint(equalToConstant: 18), + badgeLabel.widthAnchor.constraint(greaterThanOrEqualToConstant: 18) + ]) + } +} + +final class MailboxMessageCell: UITableViewCell { + static let reuseIdentifier = "MailboxMessageCell" + + private let avatarView = UIImageView() + private let defaultIconView = MailboxTypeIconView() + private let unreadDotView = UIView() + private let titleLabel = UILabel() + private let contentLabel = UILabel() + private let timeLabel = UILabel() + private let separatorView = UIView() + + override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { + super.init(style: style, reuseIdentifier: reuseIdentifier) + setupUI() + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + override func prepareForReuse() { + super.prepareForReuse() + avatarView.setHeadPic(nil) + } + + func configure(message: MailboxMessage) { + titleLabel.text = message.title + contentLabel.text = Self.previewText(for: message) + timeLabel.text = Self.timeText(from: message.modifyTime) + unreadDotView.isHidden = message.isRead + + let senderIcon = message.senderIcon.trimmingCharacters(in: .whitespacesAndNewlines) + let shouldShowAvatar = message.category != .system && !senderIcon.isEmpty && senderIcon != "0" + avatarView.isHidden = !shouldShowAvatar + defaultIconView.isHidden = shouldShowAvatar + if shouldShowAvatar { + avatarView.setHeadPic(senderIcon) + } else { + defaultIconView.configure(category: message.category) + } + } + + private func setupUI() { + selectionStyle = .none + backgroundColor = .white + + avatarView.contentMode = .scaleAspectFill + avatarView.layer.cornerRadius = 11 + avatarView.clipsToBounds = true + + unreadDotView.backgroundColor = UIColor(hexStr: "#FF5260") + unreadDotView.layer.cornerRadius = 4 + + titleLabel.font = .systemFont(ofSize: 15, weight: .medium) + titleLabel.textColor = UIColor(hexStr: "#26364A") + titleLabel.numberOfLines = 1 + + contentLabel.font = .systemFont(ofSize: 13) + contentLabel.textColor = UIColor(hexStr: "#AAAAAA") + contentLabel.numberOfLines = 1 + + timeLabel.font = .systemFont(ofSize: 12) + timeLabel.textColor = UIColor(hexStr: "#BBBBBB") + timeLabel.textAlignment = .right + + separatorView.backgroundColor = UIColor(hexStr: "#EEEEEE") + + contentView.addSubview(avatarView) + contentView.addSubview(defaultIconView) + contentView.addSubview(unreadDotView) + contentView.addSubview(titleLabel) + contentView.addSubview(contentLabel) + contentView.addSubview(timeLabel) + contentView.addSubview(separatorView) + [avatarView, defaultIconView, unreadDotView, titleLabel, contentLabel, timeLabel, separatorView].forEach { + $0.translatesAutoresizingMaskIntoConstraints = false + } + NSLayoutConstraint.activate([ + avatarView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: 26), + avatarView.centerYAnchor.constraint(equalTo: contentView.centerYAnchor), + avatarView.widthAnchor.constraint(equalToConstant: 42), + avatarView.heightAnchor.constraint(equalToConstant: 42), + defaultIconView.leadingAnchor.constraint(equalTo: avatarView.leadingAnchor), + defaultIconView.centerYAnchor.constraint(equalTo: avatarView.centerYAnchor), + defaultIconView.widthAnchor.constraint(equalTo: avatarView.widthAnchor), + defaultIconView.heightAnchor.constraint(equalTo: avatarView.heightAnchor), + unreadDotView.centerXAnchor.constraint(equalTo: avatarView.trailingAnchor, constant: -2), + unreadDotView.centerYAnchor.constraint(equalTo: avatarView.topAnchor, constant: 2), + unreadDotView.widthAnchor.constraint(equalToConstant: 8), + unreadDotView.heightAnchor.constraint(equalToConstant: 8), + timeLabel.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -16), + timeLabel.topAnchor.constraint(equalTo: contentView.topAnchor, constant: 15), + timeLabel.widthAnchor.constraint(equalToConstant: 46), + titleLabel.leadingAnchor.constraint(equalTo: avatarView.trailingAnchor, constant: 12), + titleLabel.trailingAnchor.constraint(lessThanOrEqualTo: timeLabel.leadingAnchor, constant: -8), + titleLabel.topAnchor.constraint(equalTo: contentView.topAnchor, constant: 11), + contentLabel.leadingAnchor.constraint(equalTo: titleLabel.leadingAnchor), + contentLabel.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -16), + contentLabel.topAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: 5), + separatorView.leadingAnchor.constraint(equalTo: titleLabel.leadingAnchor), + separatorView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -16), + separatorView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), + separatorView.heightAnchor.constraint(equalToConstant: 0.5) + ]) + } + + private static func previewText(for message: MailboxMessage) -> String { + guard message.category == .interaction, + message.content.contains("]"), + let bracketIndex = message.content.lastIndex(of: "[") else { + return message.content + } + return String(message.content[.. String { + guard value.count >= 16 else { return value } + let startIndex = value.index(value.startIndex, offsetBy: 11) + let endIndex = value.index(startIndex, offsetBy: 5, limitedBy: value.endIndex) ?? value.endIndex + return String(value[startIndex.. Bool { + if data.total == 0 || data.messages.isEmpty { + return true + } + if messages.count >= data.total { + return true + } + let pageSize = max(data.size, 1) + return max(data.page, currentPage) * pageSize >= data.total + } + + private func loadPendingCategoryIfNeeded() { + guard let category = pendingCategory ?? (visibleMessages.isEmpty ? selectedCategory : nil) else { return } + pendingCategory = nil + ensureMessagesLoaded(for: category) + } + + private func finishLoadingWithError(message: String) { + isLoading = false + finishRefreshControls() + updateContentState(showLoading: false) + DLToast.showError(text: message) + } + + private func finishRefreshControls() { + rootView.tableView.mj_header?.endRefreshing() + if reachedEnd { + rootView.tableView.mj_footer?.endRefreshingWithNoMoreData() + } else { + rootView.tableView.mj_footer?.endRefreshing() + } + } + + private func messages(for category: MailboxCategory) -> [MailboxMessage] { + messages.filter { $0.category == category } + } + + private func updateUnreadCounts() { + var counts: [MailboxCategory: Int] = [:] + MailboxCategory.displayOrder.forEach { category in + counts[category] = messages(for: category).filter { !$0.isRead }.count + } + rootView.updateUnreadCounts(counts) + } + + private func updateContentState(showLoading: Bool) { + rootView.updateState( + hasMessages: !visibleMessages.isEmpty, + isLoading: showLoading, + reachedEnd: reachedEnd + ) + } + + private func openMessage(_ message: MailboxMessage) { + DLToast.showLoading() + UserService.mailboxDetail(id: message.id) + .subscribe(onNext: { [weak self] response in + guard let self else { return } + DLToast.dismiss() + guard let responseMessage = response.data else { + DLToast.showError(text: response.message ?? "消息详情加载失败") + return + } + var detail = self.mergeDetail(responseMessage, fallback: message) + detail.isRead = true + self.updateMessage(detail) + let categoryMessages = self.messages(for: detail.category) + let detailController = MailboxDetailViewController( + messages: categoryMessages, + initialMessage: detail + ) + detailController.onMessageRead = { [weak self] updatedMessage in + self?.updateMessage(updatedMessage) + } + self.present(detailController, animated: true) + }, onError: { error in + DLToast.dismiss() + DLToast.showError(text: error.localizedDescription) + }) + .disposed(by: disposeBag) + } + + private func updateMessage(_ updatedMessage: MailboxMessage) { + guard let index = messages.firstIndex(where: { $0.id == updatedMessage.id }) else { return } + messages[index] = updatedMessage + rootView.tableView.reloadData() + updateUnreadCounts() + } + + private func mergeDetail(_ detail: MailboxMessage, fallback: MailboxMessage) -> MailboxMessage { + var merged = detail + if merged.id == 0 { merged.id = fallback.id } + if merged.title.isEmpty { merged.title = fallback.title } + if merged.content.isEmpty { merged.content = fallback.content } + if merged.senderId.isEmpty { merged.senderId = fallback.senderId } + if merged.senderIcon.isEmpty { merged.senderIcon = fallback.senderIcon } + if merged.modifyTime.isEmpty { merged.modifyTime = fallback.modifyTime } + if MailboxCategory(rawValue: merged.type) == nil { merged.type = fallback.type } + return merged + } + + @objc private func backAction() { + navigationController?.popViewController(animated: true) + } + + @objc private func clearAction() { + guard !messages.isEmpty else { + DLToast.show(text: "暂无消息") + return + } + showConfirmPop( + title: "清空全部消息", + message: "清空后无法恢复,是否继续?", + confirmText: "清空", + confirmBlock: { [weak self] in + self?.requestClearAll() + }, + cancelText: "取消" + ) + } + + private func requestClearAll() { + DLToast.showLoading() + UserService.clearMailbox() + .subscribe(onNext: { [weak self] response in + guard let self else { return } + DLToast.dismiss() + self.messages = [] + self.currentPage = 0 + self.total = 0 + self.reachedEnd = true + self.pendingCategory = nil + self.rootView.tableView.reloadData() + self.updateUnreadCounts() + self.finishRefreshControls() + self.updateContentState(showLoading: false) + DLToast.showSuccess(text: "已清空") + }, onError: { error in + DLToast.dismiss() + DLToast.showError(text: error.localizedDescription) + }) + .disposed(by: disposeBag) + } + +} + +extension MailboxViewController: UITableViewDataSource, UITableViewDelegate { + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + visibleMessages.count + } + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + guard let cell = tableView.dequeueReusableCell( + withIdentifier: MailboxMessageCell.reuseIdentifier, + for: indexPath + ) as? MailboxMessageCell else { + return UITableViewCell() + } + cell.configure(message: visibleMessages[indexPath.row]) + return cell + } + + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + openMessage(visibleMessages[indexPath.row]) + } +} diff --git a/QuickLocation/Section/Group/MemberInfo/MemberInfoVC.swift b/QuickLocation/Section/Group/MemberInfo/MemberInfoVC.swift index 7cf937f8..e155d937 100644 --- a/QuickLocation/Section/Group/MemberInfo/MemberInfoVC.swift +++ b/QuickLocation/Section/Group/MemberInfo/MemberInfoVC.swift @@ -13,12 +13,26 @@ final class MemberInfoVC: BaseViewController { private var members: [GroupMemberModel] private var selectedUserId: String private var groupModel: GroupModel? + private var routeGroupKey: String private var isLoadingRelations = false - init(members: [GroupMemberModel], selectedUserId: String, groupModel: GroupModel?) { + private var resolvedGroupKey: String { + let fromModel = groupModel?.default_group_key.trimmingCharacters(in: .whitespacesAndNewlines) ?? "" + if !fromModel.isEmpty { return fromModel } + let fromRoute = routeGroupKey.trimmingCharacters(in: .whitespacesAndNewlines) + if !fromRoute.isEmpty { return fromRoute } + let fromGroups = groupModel?.groups.first(where: { !$0.group_key.isEmpty })?.group_key + ?? groupModel?.groups.first?.group_key + ?? "" + if !fromGroups.isEmpty { return fromGroups } + return AppContextManager.shared.defaultGroupKey.trimmingCharacters(in: .whitespacesAndNewlines) + } + + init(members: [GroupMemberModel], selectedUserId: String, groupModel: GroupModel?, groupKey: String = "") { self.members = members self.selectedUserId = selectedUserId self.groupModel = groupModel + self.routeGroupKey = groupKey super.init(nibName: nil, bundle: nil) } @@ -35,7 +49,8 @@ final class MemberInfoVC: BaseViewController { let members = membersJson.compactMap { GroupMemberModel(JSON: $0) } let selected = (userInfo["userId"] as? String) ?? members.first?.user_id ?? "" let group = (userInfo["groupJson"] as? [String: Any]).flatMap { GroupModel(JSON: $0) } - self.init(members: members, selectedUserId: selected, groupModel: group) + let groupKey = (userInfo["groupKey"] as? String) ?? "" + self.init(members: members, selectedUserId: selected, groupModel: group, groupKey: groupKey) } required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } @@ -129,26 +144,23 @@ final class MemberInfoVC: BaseViewController { var groups = CommonGroupModel.deduplicated(member?.common_groups ?? []) let groupInfos = groupModel?.groups ?? [] - for index in groups.indices where groups[index].group_name.isEmpty { - groups[index].group_name = groupInfos.first { - $0.group_key == groups[index].group_key - }?.name ?? "未知圈子" + for index in groups.indices { + if let info = groupInfos.first(where: { $0.group_key == groups[index].group_key }) { + groups[index].apply(info) + } else if groups[index].group_name.isEmpty { + groups[index].group_name = "未知圈子" + } } - let currentGroup = groupInfos.first { $0.group_key == groupModel?.default_group_key } + let currentGroup = groupInfos.first { $0.group_key == resolvedGroupKey } ?? groupInfos.first if let currentGroup, !currentGroup.group_key.isEmpty { if let index = groups.firstIndex(where: { $0.group_key == currentGroup.group_key }) { var group = groups.remove(at: index) - if group.group_name.isEmpty || group.group_name == "未知圈子" { - group.group_name = currentGroup.name - } + group.apply(currentGroup) groups.insert(group, at: 0) } else { - groups.insert( - CommonGroupModel(groupKey: currentGroup.group_key, groupName: currentGroup.name), - at: 0 - ) + groups.insert(CommonGroupModel(info: currentGroup), at: 0) } } return CommonGroupModel.deduplicated(groups) @@ -195,7 +207,7 @@ final class MemberInfoVC: BaseViewController { let trimmed = remark.trimmingCharacters(in: .whitespacesAndNewlines) guard !trimmed.isEmpty, let member = members.first(where: { $0.user_id == selectedUserId }) else { return } - let groupKey = groupModel?.default_group_key ?? "" + let groupKey = resolvedGroupKey guard !groupKey.isEmpty else { DLToast.show(text: "圈子信息缺失") return @@ -256,7 +268,7 @@ final class MemberInfoVC: BaseViewController { private func requestEditRelation(_ idx: String) { guard let member = members.first(where: { $0.user_id == selectedUserId }) else { return } - let groupKey = groupModel?.default_group_key ?? "" + let groupKey = resolvedGroupKey guard !groupKey.isEmpty else { DLToast.show(text: "圈子信息缺失") return @@ -367,8 +379,28 @@ final class MemberInfoVC: BaseViewController { private func showCommonGroups(_ groups: [CommonGroupModel]) { guard groups.count > 1 else { return } - let popup = CommonGroupsPopVC(groups: groups, groupInfos: groupModel?.groups ?? []) - present(popup, animated: true) + let presentPopup: ([CommonGroupModel], [GroupInfoModel]) -> Void = { [weak self] groups, infos in + let popup = CommonGroupsPopVC(groups: groups, groupInfos: infos) + self?.present(popup, animated: true) + } + let infos = groupModel?.groups ?? [] + if !infos.isEmpty { + presentPopup(groups, infos) + return + } + DLToast.showLoading() + GroupService.groupInfo().subscribe(onNext: { [weak self] response in + DLToast.dismiss() + if let model = response.model { + self?.groupModel = model + } + presentPopup(self?.resolvedCommonGroups( + for: self?.members.first { $0.user_id == self?.selectedUserId } + ) ?? groups, response.model?.groups ?? []) + }, onError: { _ in + DLToast.dismiss() + presentPopup(groups, []) + }).disposed(by: disposeBag) } } diff --git a/QuickLocation/Section/Group/MemberInfo/MemberInfoView.swift b/QuickLocation/Section/Group/MemberInfo/MemberInfoView.swift index 0694e14c..5ae5f934 100644 --- a/QuickLocation/Section/Group/MemberInfo/MemberInfoView.swift +++ b/QuickLocation/Section/Group/MemberInfo/MemberInfoView.swift @@ -177,19 +177,6 @@ final class MemberInfoRowView: UIControl { stack.isUserInteractionEnabled = false addSubview(stack) - if row.showsMoreTags { - let moreLabel = UILabel() - moreLabel.text = "..." - moreLabel.font = .systemFont(ofSize: 14, weight: .medium) - moreLabel.textColor = UIColor(hexStr: "#D5923F") - moreLabel.backgroundColor = UIColor(hexStr: "#FFF9DD") - moreLabel.textAlignment = .center - moreLabel.layer.cornerRadius = 7 - moreLabel.clipsToBounds = true - stack.addArrangedSubview(moreLabel) - moreLabel.layoutChain.width(26).height(26) - } - let nameLabel = MemberInfoTagLabel() nameLabel.text = row.value nameLabel.font = .systemFont(ofSize: 14, weight: .medium) @@ -206,6 +193,17 @@ final class MemberInfoRowView: UIControl { nameLabel.widthAnchor.constraint(lessThanOrEqualToConstant: 160).isActive = true if row.showsMoreTags { + let moreLabel = UILabel() + moreLabel.text = "..." + moreLabel.font = .systemFont(ofSize: 14, weight: .medium) + moreLabel.textColor = UIColor(hexStr: "#D5923F") + moreLabel.backgroundColor = UIColor(hexStr: "#FFF9DD") + moreLabel.textAlignment = .center + moreLabel.layer.cornerRadius = 7 + moreLabel.clipsToBounds = true + stack.addArrangedSubview(moreLabel) + moreLabel.layoutChain.width(26).height(26) + arrow.contentMode = .scaleAspectFit stack.addArrangedSubview(arrow) arrow.layoutChain.width(12).height(12) @@ -368,10 +366,11 @@ private final class CommonGroupReadonlyCell: UITableViewCell { func configure(group: CommonGroupModel, info: GroupInfoModel?) { nameLabel.text = group.group_name.isEmpty ? "未知圈子" : group.group_name - if let info { - iconView.setGroupIcon(info) - } else { - iconView.setGroupIcon(url: "", fallback: UIImage(named: "GroupIcon/1")) - } + let url = info?.groupIconURL ?? group.groupIconURL + let fallback = info?.groupIcon ?? group.groupIcon + iconView.setGroupIcon( + url: url, + fallback: fallback.size.width > 0 ? fallback : UIImage(named: "GroupIcon/1") + ) } } diff --git a/QuickLocation/Section/Home/GroupMemberView2.swift b/QuickLocation/Section/Home/GroupMemberView2.swift index 88c5053b..d88f3074 100644 --- a/QuickLocation/Section/Home/GroupMemberView2.swift +++ b/QuickLocation/Section/Home/GroupMemberView2.swift @@ -20,6 +20,8 @@ class GroupMemberView2: UIView { private var currentMemberModel: GroupMemberModel? private var emojiEchoByUserId: [String: String] = [:] private var messageEchoByUserId: [String: String] = [:] + private var phoneStatusObserver: NSObjectProtocol? + private var weatherRequestID = UUID() var onCoupleMemberTap: ((GroupMemberModel) -> Void)? private static let batteryNormalColor = UIColor(hexStr: "#47DD00") @@ -45,12 +47,20 @@ class GroupMemberView2: UIView { updateMoodBadge(model.mood) statusDotView.backgroundColor = UIColor(hexStr: model.is_online ? "#67EA76" : "#D8D8D8") statusLab.text = model.is_online ? "在线" : "离线" - locationLab.text = model.lastLocation let isCurrentUser = model.user_id == AppContextManager.shared.userId - updateDistance(for: model, isCurrentUser: isCurrentUser) + if !model.is_online, !isCurrentUser { + locationLab.text = "**" + distanceView.isHidden = true + } else { + locationLab.text = model.lastLocation + updateDistance(for: model, isCurrentUser: isCurrentUser) + } applyPhoneUsage(phoneUsage) + if isCurrentUser { + requestLocalWeather() + } updateRealtimeInteractionVisibility(isCurrentUser: isCurrentUser) refreshRealtimeInteraction() } @@ -65,6 +75,7 @@ class GroupMemberView2: UIView { statusLab.text = "" locationLab.text = "" distanceView.isHidden = true + stopLocalPhoneStatusObserving() applyPhoneUsage(nil) updateRealtimeInteractionVisibility(isCurrentUser: true) refreshRealtimeInteraction() @@ -159,14 +170,148 @@ class GroupMemberView2: UIView { } private func applyPhoneUsage(_ usage: PhoneUsageTodayModel?) { - applyDeviceInfo(usage?.phoneInfo) + if isShowingCurrentUser { + applyLocalDeviceInfo() + startLocalPhoneStatusObserving() + } else { + stopLocalPhoneStatusObserving() + if isShowingOfflineOther { + applyOfflineDeviceInfo() + } else { + applyDeviceInfo(usage?.phoneInfo) + } + } + if isShowingOfflineOther { + phoneReportView.configure(with: nil) + appUsageView.configure(with: nil) + applyPrivilegeMasks(appUsagePreview: nil) + applyOfflineStayPoints() + return + } phoneReportView.configure(with: Self.phoneReportPreview(from: usage)) let appUsagePreview = MemberAppUsagePreview(topApps: usage?.topApps ?? []) appUsageView.configure(with: appUsagePreview) - updateAppUsageVisibility(appUsagePreview != nil) + applyPrivilegeMasks(appUsagePreview: appUsagePreview) applyStayPoints(usage?.stayPoints ?? []) } + var isPhoneReportDenied: Bool { phoneReportView.isDenied } + var isAppUsageDenied: Bool { appUsageView.isDenied } + var onPhoneReportRemind: (() -> Void)? + var onAppUsageRemind: (() -> Void)? + + private func applyPrivilegeMasks(appUsagePreview: MemberAppUsagePreview? = nil) { + guard currentMemberModel != nil else { + phoneReportView.setDenied(false) + appUsageView.setDenied(false) + updateAppUsageVisibility(appUsagePreview != nil) + return + } + let isSelf = isShowingCurrentUser + let privilege = currentMemberModel?.extra.privilege ?? GroupPrivilege() + let phoneDenied = !isSelf && !privilege.phone_report + let usageDenied = !isSelf && !privilege.app_usage_record + phoneReportView.setDenied(phoneDenied) + phoneReportView.onDeniedAction = { [weak self] in self?.onPhoneReportRemind?() } + appUsageView.setDenied(usageDenied) + appUsageView.onDeniedAction = { [weak self] in self?.onAppUsageRemind?() } + let showUsage = appUsagePreview != nil || usageDenied + if appUsagePreview == nil, usageDenied { + appUsageView.configure(with: nil) + } + updateAppUsageVisibility(showUsage) + } + + private var isShowingCurrentUser: Bool { + guard let userId = currentMemberModel?.user_id, !userId.isEmpty else { return false } + return userId == AppContextManager.shared.userId + } + + private var isShowingOfflineOther: Bool { + guard let model = currentMemberModel, !isShowingCurrentUser else { return false } + return !model.is_online + } + + private func applyOfflineDeviceInfo() { + phoneModelIcon.image = UIImage(named: "Home/member_phone_unknown") + phoneModelLab.text = "**" + phoneModelLab.textColor = Self.batteryDefaultTextColor + networkIcon.image = UIImage(named: "Home/member_network_unknown") + networkLab.text = "**" + networkLab.textColor = Self.batteryDefaultTextColor + applyBatteryUnknown(placeholder: "**") + applyUnknownWeather(text: "**") + } + + private func applyOfflineStayPoints() { + stayNumLab.text = "**" + stayLocationView.isHidden = true + stayNodataView.isHidden = false + stayLocationLab.text = "" + stayStatusLab.text = "" + } + + private func startLocalPhoneStatusObserving() { + guard phoneStatusObserver == nil else { return } + PhoneStatusCollector.shared.start() + phoneStatusObserver = NotificationCenter.default.addObserver( + forName: .phoneStatusDidChange, + object: nil, + queue: .main + ) { [weak self] _ in + guard let self, self.isShowingCurrentUser else { return } + self.applyLocalDeviceInfo() + } + } + + private func stopLocalPhoneStatusObserving() { + if let phoneStatusObserver { + NotificationCenter.default.removeObserver(phoneStatusObserver) + self.phoneStatusObserver = nil + } + weatherRequestID = UUID() + } + + private func applyLocalDeviceInfo() { + let snap = PhoneStatusCollector.shared.snapshot() + phoneModelIcon.image = UIImage(named: "Home/member_phone") + phoneModelLab.text = snap.model + phoneModelLab.textColor = Self.batteryDefaultTextColor + + let hasNetwork = snap.network != "无网络" + networkIcon.image = UIImage(named: hasNetwork ? "Home/member_wifi" : "Home/member_network_unknown") + networkLab.text = snap.network + networkLab.textColor = Self.batteryDefaultTextColor + + applyBatteryDisplay(percent: snap.batteryPercent) + } + + private func requestLocalWeather() { + let requestID = UUID() + weatherRequestID = requestID + applyUnknownWeather(text: "***") + guard let latitude = Defaults[\.currentLatitude], + let longitude = Defaults[\.currentLongitude] else { + applyUnknownWeather(text: "***") + return + } + let location = CLLocation(latitude: latitude, longitude: longitude) + guard CLLocationCoordinate2DIsValid(location.coordinate) else { + applyUnknownWeather(text: "***") + return + } + MemberWeatherService.shared.weather(for: location) { [weak self] result in + guard let self, self.weatherRequestID == requestID, self.isShowingCurrentUser else { return } + switch result { + case .success(let snapshot): + self.weatherIcon.image = UIImage(named: snapshot.assetName) + self.weatherLab.text = snapshot.text + case .failure: + self.applyUnknownWeather(text: "***") + } + } + } + private func updateAppUsageVisibility(_ visible: Bool) { if visible { phoneReportBottomConstraint?.isActive = false @@ -209,11 +354,11 @@ class GroupMemberView2: UIView { weatherLab.text = text } - private func applyBatteryUnknown() { + private func applyBatteryUnknown(placeholder: String = "***") { batteryIcon.image = UIImage(named: "Home/member_battery_unknown") batteryFillView.isHidden = true batteryFillView.layoutChain.width(0) - batteryLab.text = "***" + batteryLab.text = placeholder batteryLab.textColor = Self.batteryDefaultTextColor } @@ -1283,6 +1428,7 @@ class GroupMemberView2: UIView { } deinit { + stopLocalPhoneStatusObserving() NotificationCenter.default.removeObserver(self) } diff --git a/QuickLocation/Section/Home/HomeView2.swift b/QuickLocation/Section/Home/HomeView2.swift index 045d9ff1..683749e5 100644 --- a/QuickLocation/Section/Home/HomeView2.swift +++ b/QuickLocation/Section/Home/HomeView2.swift @@ -505,8 +505,36 @@ extension HomeView2: UIScrollViewDelegate { // MARK: - UIGestureRecognizerDelegate extension HomeView2: UIGestureRecognizerDelegate { + override func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool { + guard let pan = gestureRecognizer as? UIPanGestureRecognizer, + pan.view === groupMemberView else { return true } + let memberCV = groupMemberView.memberCV + guard !memberCV.isHidden, isTouch(pan, inside: memberCV) else { return true } + if memberCV.isDragging || memberCV.isDecelerating { + return false + } + let velocity = pan.velocity(in: groupMemberView) + let translation = pan.translation(in: groupMemberView) + let dx = max(abs(velocity.x), abs(translation.x) * 60) + let dy = max(abs(velocity.y), abs(translation.y) * 60) + return dy > dx * 1.8 + } + func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith other: UIGestureRecognizer) -> Bool { + if isMemberListPan(other) { + return false + } return true } + + private func isMemberListPan(_ gesture: UIGestureRecognizer) -> Bool { + let memberCV = groupMemberView.memberCV + if gesture.view === memberCV { return true } + return gesture.view?.isDescendant(of: memberCV) == true + } + + private func isTouch(_ pan: UIPanGestureRecognizer, inside view: UIView) -> Bool { + view.bounds.contains(pan.location(in: view)) + } } diff --git a/QuickLocation/Section/Home/HomeViewController.swift b/QuickLocation/Section/Home/HomeViewController.swift index 55b66408..80fb716e 100644 --- a/QuickLocation/Section/Home/HomeViewController.swift +++ b/QuickLocation/Section/Home/HomeViewController.swift @@ -343,13 +343,22 @@ class HomeViewController: BaseViewController { // 手机报告二级页 rootView.groupMemberView.phoneReportView.rx.tapGesture.subscribe(onNext: { [weak self] _ in - self?.openPhoneReportDetail() + guard let self, !self.rootView.groupMemberView.isPhoneReportDenied else { return } + self.openPhoneReportDetail() }).disposed(by: disposeBag) // APP 报告二级页 rootView.groupMemberView.appUsageView.rx.tapGesture.subscribe(onNext: { [weak self] _ in - self?.openAppUsageReport() + guard let self, !self.rootView.groupMemberView.isAppUsageDenied else { return } + self.openAppUsageReport() }).disposed(by: disposeBag) + + rootView.groupMemberView.onPhoneReportRemind = { + DLToast.show(text: "已提醒") + } + rootView.groupMemberView.onAppUsageRemind = { + DLToast.show(text: "已提醒") + } // 地图回到自己并重新开启自动跟随 rootView.locationView.rx.tapGesture.subscribe { _ in @@ -1493,7 +1502,6 @@ extension HomeViewController { let isSelf = (!record.userId.isEmpty && record.userId == selfId) || userId == selfId DispatchQueue.main.async { [weak self] in - NotificationCenter.default.post(name: .lockDistractAppsDidChange, object: nil) guard isSelf else { return } AppUnlockCoordinator.shared.registerIncomingLock(tokens: record.tokens) self?.applyIncomingLocks([record]) diff --git a/QuickLocation/Section/Home/MemberAppUsageView.swift b/QuickLocation/Section/Home/MemberAppUsageView.swift index 6578f70d..da850540 100644 --- a/QuickLocation/Section/Home/MemberAppUsageView.swift +++ b/QuickLocation/Section/Home/MemberAppUsageView.swift @@ -74,6 +74,9 @@ final class MemberAppUsageView: UIView { private let usageTitleLab = UILabel() private let topTitleLab = UILabel() private let topStack = UIStackView() + private let deniedOverlay = PrivilegeDeniedOverlay() + private(set) var isDenied = false + var onDeniedAction: (() -> Void)? override init(frame: CGRect) { super.init(frame: frame) @@ -85,6 +88,19 @@ final class MemberAppUsageView: UIView { fatalError("init(coder:) has not been implemented") } + func setDenied(_ denied: Bool) { + isDenied = denied + deniedOverlay.configure( + title: "TA未开启设置", + message: "无法查看app使用记录", + actionTitle: "提醒TA" + ) + deniedOverlay.onAction = { [weak self] in self?.onDeniedAction?() } + deniedOverlay.setVisible(denied) + deniedOverlay.layer.cornerRadius = cardView.layer.cornerRadius + gestureRecognizers?.forEach { $0.isEnabled = !denied } + } + func configure(with preview: MemberAppUsagePreview?) { topStack.arrangedSubviews.forEach { $0.removeFromSuperview() } @@ -134,6 +150,9 @@ final class MemberAppUsageView: UIView { .height(176) .bottom() + cardView.addSubview(deniedOverlay) + deniedOverlay.layoutChain.edges() + usageTitleLab.attributedText = Self.cardTitle("使用时长") cardView.addSubview(usageTitleLab) usageTitleLab.layoutChain @@ -179,6 +198,8 @@ final class MemberAppUsageView: UIView { .top(43) .left(160) .right(14) + + cardView.bringSubviewToFront(deniedOverlay) } private static func cardTitle(_ title: String) -> NSAttributedString { diff --git a/QuickLocation/Section/Home/MemberPhoneReportView.swift b/QuickLocation/Section/Home/MemberPhoneReportView.swift index a2c03c0e..02b7d5d2 100644 --- a/QuickLocation/Section/Home/MemberPhoneReportView.swift +++ b/QuickLocation/Section/Home/MemberPhoneReportView.swift @@ -52,6 +52,9 @@ final class MemberPhoneReportView: UIView { private let unlockIcon = UIImageView() private let unlockTitleLab = UILabel() private let unlockValueLab = UILabel() + private let deniedOverlay = PrivilegeDeniedOverlay() + private(set) var isDenied = false + var onDeniedAction: (() -> Void)? override init(frame: CGRect) { super.init(frame: frame) @@ -63,6 +66,19 @@ final class MemberPhoneReportView: UIView { fatalError("init(coder:) has not been implemented") } + func setDenied(_ denied: Bool) { + isDenied = denied + deniedOverlay.configure( + title: "TA未开启设置", + message: "无法查看手机报告", + actionTitle: "提醒TA" + ) + deniedOverlay.onAction = { [weak self] in self?.onDeniedAction?() } + deniedOverlay.setVisible(denied) + deniedOverlay.layer.cornerRadius = cardView.layer.cornerRadius + gestureRecognizers?.forEach { $0.isEnabled = !denied } + } + func configure(with preview: MemberPhoneReportPreview?) { if let preview { screenTimeBadge.configure(seconds: preview.screenTimeSeconds) @@ -103,6 +119,9 @@ final class MemberPhoneReportView: UIView { .edgesHorzontal(15) .bottom() + cardView.addSubview(deniedOverlay) + deniedOverlay.layoutChain.edges() + cardView.addSubview(leftPanel) cardView.addSubview(rightPanel) leftPanel.backgroundColor = UIColor(hexStr: "#FFFCEA") @@ -238,6 +257,8 @@ final class MemberPhoneReportView: UIView { unlockValueUnitLab.layoutChain .leftToRightOfView(unlockValueLab, offset: 3) .bottomToView(unlockValueLab, offset: -4) + + cardView.bringSubviewToFront(deniedOverlay) } } diff --git a/QuickLocation/Section/Home/PhoneReportDetail/PhoneReportDetailView.swift b/QuickLocation/Section/Home/PhoneReportDetail/PhoneReportDetailView.swift index fa34a1da..012e884b 100644 --- a/QuickLocation/Section/Home/PhoneReportDetail/PhoneReportDetailView.swift +++ b/QuickLocation/Section/Home/PhoneReportDetail/PhoneReportDetailView.swift @@ -339,7 +339,7 @@ final class PhoneBatteryRingView: UIView { func configure(percent: Int?, text: String, isCharging: Bool = false) { valueLab.text = text - bolt.isHidden = false + bolt.isHidden = !isCharging progress.strokeEnd = CGFloat(max(0, min(100, percent ?? 0))) / 100 } } diff --git a/QuickLocation/Section/Home/PhoneReportDetail/PhoneReportDetailViewModel.swift b/QuickLocation/Section/Home/PhoneReportDetail/PhoneReportDetailViewModel.swift index 34a0e5f2..86b8f8dc 100644 --- a/QuickLocation/Section/Home/PhoneReportDetail/PhoneReportDetailViewModel.swift +++ b/QuickLocation/Section/Home/PhoneReportDetail/PhoneReportDetailViewModel.swift @@ -40,6 +40,7 @@ final class PhoneReportDetailViewModel { private let groupKey: String private let disposeBag = DisposeBag() + private var statusObserveBag = DisposeBag() private let placeholder = "**" private var reportCache: [String: PhoneUsageReportModel] = [:] private var requestIDs: [String: UUID] = [:] @@ -59,15 +60,30 @@ final class PhoneReportDetailViewModel { .disposed(by: disposeBag) } + private func isCurrentUser(_ userId: String) -> Bool { + !userId.isEmpty && userId == AppContextManager.shared.userId + } + private func refresh(userId: String) { - guard !userId.isEmpty, !groupKey.isEmpty else { + let isSelf = isCurrentUser(userId) + updateStatusObserving(isSelf: isSelf) + + guard !userId.isEmpty else { snapshot.accept(Self.emptySnapshot()) return } + if groupKey.isEmpty { + snapshot.accept(isSelf ? makeLocalStatusSnapshot(report: nil) : Self.emptySnapshot()) + return + } + let cacheKey = "\(groupKey)|\(userId)" - if let cached = reportCache[cacheKey] { - snapshot.accept(makeSnapshot(report: cached)) + let cached = reportCache[cacheKey] + if isSelf { + snapshot.accept(makeLocalStatusSnapshot(report: cached)) + } else if let cached { + snapshot.accept(makeRemoteSnapshot(report: cached)) } else { snapshot.accept(Self.emptySnapshot()) } @@ -80,35 +96,72 @@ final class PhoneReportDetailViewModel { .subscribe(onNext: { [weak self] response in guard let self, self.requestIDs[cacheKey] == requestID else { return } self.requestIDs.removeValue(forKey: cacheKey) - guard response.code == "0", let report = response.model else { return } + guard response.code == "0", let report = response.model else { + guard self.selectedMemberId.value == userId, self.isCurrentUser(userId) else { return } + self.snapshot.accept(self.makeLocalStatusSnapshot(report: self.reportCache[cacheKey])) + return + } self.reportCache[cacheKey] = report guard self.selectedMemberId.value == userId else { return } - self.snapshot.accept(self.makeSnapshot(report: report)) + self.snapshot.accept(self.makeSnapshot(report: report, userId: userId)) }, onError: { [weak self] _ in guard let self, self.requestIDs[cacheKey] == requestID else { return } self.requestIDs.removeValue(forKey: cacheKey) + guard self.selectedMemberId.value == userId, self.isCurrentUser(userId) else { return } + self.snapshot.accept(self.makeLocalStatusSnapshot(report: self.reportCache[cacheKey])) }) .disposed(by: disposeBag) } - private func makeSnapshot(report: PhoneUsageReportModel) -> StatusSnapshot { - let info = report.phoneInfo - let storageRatio = Self.storageRatio(used: info?.memoryUsed, total: info?.memoryTotal) - let screenBars = Self.makeBars(from: report.screenUseTimes, value: { $0.useTime }) - let appUsageBars = Self.makeBars(from: report.appUseCounts, value: { $0.count }) + private func updateStatusObserving(isSelf: Bool) { + statusObserveBag = DisposeBag() + guard isSelf else { return } + PhoneStatusCollector.shared.start() + NotificationCenter.default.rx.notification(.phoneStatusDidChange) + .observe(on: MainScheduler.instance) + .subscribe(onNext: { [weak self] _ in + guard let self else { return } + let userId = self.selectedMemberId.value + guard self.isCurrentUser(userId) else { return } + let cacheKey = "\(self.groupKey)|\(userId)" + self.snapshot.accept(self.makeLocalStatusSnapshot(report: self.reportCache[cacheKey])) + }) + .disposed(by: statusObserveBag) + } - let todayScreenSeconds = Self.todayValue(in: report.screenUseTimes, value: { $0.useTime }) - ?? Self.nonnegativeInt(from: info?.useTime) - let todayAppUsageCount = Self.todayValue(in: report.appUseCounts, value: { $0.count }) - let screenTodayText: String - if let todayScreenSeconds { - screenTodayText = Self.formatDuration(todayScreenSeconds) - } else { - screenTodayText = placeholder + private func makeSnapshot(report: PhoneUsageReportModel, userId: String) -> StatusSnapshot { + if isCurrentUser(userId) { + return makeLocalStatusSnapshot(report: report) } - let appUsageTodayText = todayAppUsageCount.map { "\($0)次" } ?? placeholder + return makeRemoteSnapshot(report: report) + } + private func makeLocalStatusSnapshot(report: PhoneUsageReportModel?) -> StatusSnapshot { + let local = PhoneStatusCollector.shared.snapshot() + let charts = chartFields(from: report) + return StatusSnapshot( + batteryText: local.batteryPercent == nil ? placeholder : local.batteryText, + batteryPercent: local.batteryPercent, + isCharging: local.isCharging, + estimateText: placeholder, + brightnessText: local.brightnessText, + volumeText: local.volumeText, + wifiText: local.network, + deviceText: local.model, + storageText: local.memoryUsed == nil ? placeholder : local.storageText, + storageRatio: local.storageRatio, + brandIconURL: Self.validHTTPURLString(report?.brandIcon ?? "") ?? "", + screenTodayText: charts.screenTodayText, + appUsageTodayText: charts.appUsageTodayText, + screenBars: charts.screenBars, + appUsageBars: charts.appUsageBars + ) + } + + private func makeRemoteSnapshot(report: PhoneUsageReportModel) -> StatusSnapshot { + let info = report.phoneInfo + let charts = chartFields(from: report) return StatusSnapshot( batteryText: Self.displayText(info?.battery, placeholder: placeholder), batteryPercent: Self.percent(from: info?.battery), @@ -119,15 +172,35 @@ final class PhoneReportDetailViewModel { wifiText: Self.displayText(info?.network, placeholder: placeholder), deviceText: Self.displayText(info?.model, placeholder: placeholder), storageText: Self.storageText(used: info?.memoryUsed, total: info?.memoryTotal, placeholder: placeholder), - storageRatio: storageRatio, + storageRatio: Self.storageRatio(used: info?.memoryUsed, total: info?.memoryTotal), brandIconURL: Self.validHTTPURLString(report.brandIcon) ?? "", - screenTodayText: screenTodayText, - appUsageTodayText: appUsageTodayText, - screenBars: screenBars, - appUsageBars: appUsageBars + screenTodayText: charts.screenTodayText, + appUsageTodayText: charts.appUsageTodayText, + screenBars: charts.screenBars, + appUsageBars: charts.appUsageBars ) } + private func chartFields(from report: PhoneUsageReportModel?) -> ( + screenTodayText: String, + appUsageTodayText: String, + screenBars: [ChartBar], + appUsageBars: [ChartBar] + ) { + guard let report else { + return (placeholder, placeholder, [], []) + } + let info = report.phoneInfo + let screenBars = Self.makeBars(from: report.screenUseTimes, value: { $0.useTime }) + let appUsageBars = Self.makeBars(from: report.appUseCounts, value: { $0.count }) + let todayScreenSeconds = Self.todayValue(in: report.screenUseTimes, value: { $0.useTime }) + ?? Self.nonnegativeInt(from: info?.useTime) + let todayAppUsageCount = Self.todayValue(in: report.appUseCounts, value: { $0.count }) + let screenTodayText = todayScreenSeconds.map { Self.formatDuration($0) } ?? placeholder + let appUsageTodayText = todayAppUsageCount.map { "\($0)次" } ?? placeholder + return (screenTodayText, appUsageTodayText, screenBars, appUsageBars) + } + private static func emptySnapshot() -> StatusSnapshot { StatusSnapshot( batteryText: "**", diff --git a/QuickLocation/Section/Home/SOS/SOSAnimationViews.swift b/QuickLocation/Section/Home/SOS/SOSAnimationViews.swift index 48834767..8ebd1115 100644 --- a/QuickLocation/Section/Home/SOS/SOSAnimationViews.swift +++ b/QuickLocation/Section/Home/SOS/SOSAnimationViews.swift @@ -5,6 +5,19 @@ import UIKit +enum SOSConfiguration { + static let countdownDuration: TimeInterval = 5 + static let slideCancelCompletionRatio: CGFloat = 0.9 + + static var countdownSeconds: Int { + Int(ceil(countdownDuration)) + } + + static var countdownDescription: String { + "\(countdownSeconds)秒后,会将你的SOS和位置发送到你的圈子和紧急联系人。" + } +} + final class SOSPulseButtonView: UIView { var onTap: (() -> Void)? @@ -194,7 +207,7 @@ final class SOSCountdownRingView: UIView { private var countdownTimer: Timer? private var deadline: Date? - private var duration: TimeInterval = 10 + private var duration = SOSConfiguration.countdownDuration private var lastDisplayedValue = -1 private var completionDelivered = false private var progress: CGFloat = 1 @@ -241,7 +254,7 @@ final class SOSCountdownRingView: UIView { alarmContainer.addSubview(alarmRaysView) addSubview(alarmContainer) - render(progress: 1, value: 10) + render(progress: 1, value: SOSConfiguration.countdownSeconds) } required init?(coder: NSCoder) { @@ -301,7 +314,7 @@ final class SOSCountdownRingView: UIView { updateAlarmPosition(progress: progress) } - func start(duration: TimeInterval = 10) { + func start(duration: TimeInterval = SOSConfiguration.countdownDuration) { stop(reset: false) self.duration = max(0.1, duration) deadline = Date().addingTimeInterval(self.duration) @@ -327,7 +340,7 @@ final class SOSCountdownRingView: UIView { if reset { completionDelivered = false lastDisplayedValue = -1 - render(progress: 1, value: 10) + render(progress: 1, value: SOSConfiguration.countdownSeconds) } } @@ -335,7 +348,7 @@ final class SOSCountdownRingView: UIView { guard let deadline else { return } let remaining = max(0, deadline.timeIntervalSinceNow) let progress = CGFloat(min(1, remaining / duration)) - let value = max(0, min(10, Int(ceil(remaining)))) + let value = max(0, min(Int(ceil(duration)), Int(ceil(remaining)))) render(progress: progress, value: value) guard remaining <= 0, !completionDelivered else { return } @@ -564,7 +577,8 @@ final class SOSSlideCancelView: UIView { @objc private func handlePan(_ gesture: UIPanGestureRecognizer) { guard !isLocked else { return } - let maxX = max(2, bounds.width - thumbView.bounds.width - 2) + let minimumX: CGFloat = 2 + let maxX = max(minimumX, bounds.width - thumbView.bounds.width - minimumX) switch gesture.state { case .began: @@ -572,10 +586,11 @@ final class SOSSlideCancelView: UIView { startX = thumbView.frame.minX case .changed: let translation = gesture.translation(in: self) - thumbView.frame.origin.x = min(maxX, max(2, startX + translation.x)) + thumbView.frame.origin.x = min(maxX, max(minimumX, startX + translation.x)) case .ended, .cancelled, .failed: isDragging = false - if thumbView.frame.minX >= maxX - 4 { + let completionX = minimumX + (maxX - minimumX) * SOSConfiguration.slideCancelCompletionRatio + if thumbView.frame.minX >= completionX { isLocked = true thumbView.isUserInteractionEnabled = false onCompleted?() diff --git a/QuickLocation/Section/Home/SOS/SOSListViewController.swift b/QuickLocation/Section/Home/SOS/SOSListViewController.swift new file mode 100644 index 00000000..b5f43344 --- /dev/null +++ b/QuickLocation/Section/Home/SOS/SOSListViewController.swift @@ -0,0 +1,354 @@ +import UIKit +import ObjectMapper +import RxSwift + +struct SOSListResponse: BaseModelProtocol { + var code: String? + var message: String? + var list: [SOSListItem] = [] + + init?(map: Map) {} + + mutating func mapping(map: Map) { + code <- (map["code"], kIntTransformStr) + message <- map["message"] + if message == nil { + message <- map["msg"] + } + list <- map["data"] + if list.isEmpty { + list <- map["data.list"] + } + } +} + +struct SOSListItem: Mappable { + var userId = "" + var nickName = "" + var headPic = "" + var lastPosition = "" + var groupKey = "" + var groupName = "" + var sosTime = "" + + init?(map: Map) {} + + mutating func mapping(map: Map) { + userId <- (map["user_id"], kIntTransformStr) + nickName <- (map["nick_name"], kIntTransformStr) + headPic <- (map["head_pic"], kIntTransformStr) + lastPosition <- (map["last_position"], kIntTransformStr) + groupKey <- (map["group_key"], kIntTransformStr) + groupName <- (map["group_name"], kIntTransformStr) + sosTime <- (map["sos_time"], kIntTransformStr) + } + + var displayAddress: String { + let value = lastPosition.trimmed + let parts = value.split(separator: ":", maxSplits: 2, omittingEmptySubsequences: false) + guard parts.count == 3, + Double(parts[0]) != nil, + Double(parts[1]) != nil else { return value } + let address = String(parts[2]).trimmed + return address.isEmpty ? value : address + } + + var displayTime: String { + guard let date = parsedSOSDate else { return sosTime } + return Self.displayDateFormatter.string(from: date) + } + + private var parsedSOSDate: Date? { + let value = sosTime.trimmed + if let timestamp = TimeInterval(value) { + return Date(timeIntervalSince1970: timestamp > 10_000_000_000 ? timestamp / 1000 : timestamp) + } + for formatter in Self.apiDateFormatters { + if let date = formatter.date(from: value) { + return date + } + } + return ISO8601DateFormatter().date(from: value) + } + + private static let apiDateFormatters: [DateFormatter] = [ + "yyyy-MM-dd HH:mm:ss", + "yyyy-MM-dd HH:mm", + "yyyy/MM/dd HH:mm:ss", + "yyyy/MM/dd HH:mm" + ].map { format in + let formatter = DateFormatter() + formatter.locale = Locale(identifier: "en_US_POSIX") + formatter.timeZone = .current + formatter.dateFormat = format + return formatter + } + + private static let displayDateFormatter: DateFormatter = { + let formatter = DateFormatter() + formatter.locale = Locale(identifier: "zh_CN") + formatter.timeZone = .current + formatter.dateFormat = "M月d日 HH:mm" + return formatter + }() +} + +final class SOSListViewController: BaseViewController { + private var rootView: SOSListView! + private var items: [SOSListItem] = [] + private var isLoading = false + + override var isNavigationBarHidden: Bool { true } + + override func loadView() { + rootView = SOSListView(frame: UIScreen.main.bounds) + view = rootView + } + + override func viewDidLoad() { + super.viewDidLoad() + rootView.tableView.dataSource = self + rootView.tableView.delegate = self + rootView.refreshControl.addTarget(self, action: #selector(refresh), for: .valueChanged) + loadSOSList(showsLoading: true) + } + + @objc private func refresh() { + loadSOSList(showsLoading: false) + } + + private func loadSOSList(showsLoading: Bool) { + guard !isLoading else { return } + isLoading = true + if showsLoading { + DLToast.showLoading() + } + SystemService.sosList() + .observe(on: MainScheduler.instance) + .subscribe(onNext: { [weak self] response in + guard let self else { return } + self.finishLoading() + guard response.code == "0" else { + DLToast.showError(text: response.message ?? "获取求助列表失败") + return + } + self.items = response.list + self.rootView.showEmpty(self.items.isEmpty) + self.rootView.tableView.reloadData() + }, onError: { [weak self] error in + self?.finishLoading() + DLToast.showError(text: error.gatewayMessage ?? error.localizedDescription) + }) + .disposed(by: disposeBag) + } + + private func finishLoading() { + isLoading = false + DLToast.dismiss() + rootView.refreshControl.endRefreshing() + } + + private func showLocation(for item: SOSListItem) { + guard !item.groupKey.isEmpty, !item.lastPosition.isEmpty else { return } + NotificationCenter.default.post( + name: .ShowMemberLocationNotification, + object: nil, + userInfo: [ + "last_position": item.lastPosition, + "group_key": item.groupKey, + "user_id": item.userId + ] + ) + let mainTabBarController = tabBarController as? MainTabBarController + navigationController?.popToRootViewController(animated: true) + mainTabBarController?.selectTab(at: 0) + } +} + +extension SOSListViewController: UITableViewDataSource, UITableViewDelegate { + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + items.count + } + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: SOSListCell = tableView.dequeueReusableCell(for: indexPath) + cell.configure(with: items[indexPath.row]) + return cell + } + + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + tableView.deselectRow(at: indexPath, animated: true) + showLocation(for: items[indexPath.row]) + } +} + +final class SOSListView: UIView { + let tableView = UITableView(frame: .zero, style: .plain) + let refreshControl = UIRefreshControl() + private let navBackgroundView = UIImageView(image: UIImage(named: "Common/navBar_bg_2")) + private let navView = BaseNavigationView(title: "紧急求助") + private let emptyLabel = UILabel() + + override init(frame: CGRect) { + super.init(frame: frame) + setupUI() + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + func showEmpty(_ isEmpty: Bool) { + emptyLabel.isHidden = !isEmpty + } + + private func setupUI() { + backgroundColor = UIColor(hexStr: "#FAFAFA") + navBackgroundView.contentMode = .scaleAspectFill + navBackgroundView.clipsToBounds = true + addSubview(navBackgroundView) + addSubview(navView) + + tableView.backgroundColor = .clear + tableView.separatorStyle = .none + tableView.showsVerticalScrollIndicator = false + tableView.estimatedRowHeight = 126 + tableView.rowHeight = UITableView.automaticDimension + tableView.contentInset = UIEdgeInsets(top: 14, left: 0, bottom: kSafeBottomMargin + 16, right: 0) + tableView.register(SOSListCell.self) + tableView.refreshControl = refreshControl + addSubview(tableView) + + emptyLabel.text = "暂无紧急求助" + emptyLabel.textColor = UIColor(hexStr: "#A7ABB2") + emptyLabel.font = .systemFont(ofSize: 15) + emptyLabel.textAlignment = .center + emptyLabel.isHidden = true + addSubview(emptyLabel) + + navBackgroundView.translatesAutoresizingMaskIntoConstraints = false + navView.translatesAutoresizingMaskIntoConstraints = false + tableView.translatesAutoresizingMaskIntoConstraints = false + emptyLabel.translatesAutoresizingMaskIntoConstraints = false + NSLayoutConstraint.activate([ + navBackgroundView.topAnchor.constraint(equalTo: topAnchor), + navBackgroundView.leadingAnchor.constraint(equalTo: leadingAnchor), + navBackgroundView.trailingAnchor.constraint(equalTo: trailingAnchor), + navBackgroundView.heightAnchor.constraint(equalToConstant: max(kNaviHeight + 70, 150)), + navView.topAnchor.constraint(equalTo: topAnchor), + navView.leadingAnchor.constraint(equalTo: leadingAnchor), + navView.trailingAnchor.constraint(equalTo: trailingAnchor), + navView.heightAnchor.constraint(equalToConstant: kNaviHeight), + tableView.topAnchor.constraint(equalTo: navView.bottomAnchor), + tableView.leadingAnchor.constraint(equalTo: leadingAnchor), + tableView.trailingAnchor.constraint(equalTo: trailingAnchor), + tableView.bottomAnchor.constraint(equalTo: bottomAnchor), + emptyLabel.centerXAnchor.constraint(equalTo: centerXAnchor), + emptyLabel.centerYAnchor.constraint(equalTo: centerYAnchor, constant: -20) + ]) + } +} + +final class SOSListCell: UITableViewCell { + private let cardView = UIView() + private let avatarView = UIImageView() + private let titleLabel = UILabel() + private let addressLabel = UILabel() + private let timeLabel = UILabel() + + override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { + super.init(style: style, reuseIdentifier: reuseIdentifier) + setupUI() + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + override func prepareForReuse() { + super.prepareForReuse() + avatarView.image = nil + } + + func configure(with item: SOSListItem) { + avatarView.setHeadPic(item.headPic) + titleLabel.attributedText = makeTitle(item) + addressLabel.text = item.displayAddress.isEmpty ? "位置暂未获取" : item.displayAddress + timeLabel.text = item.displayTime + accessibilityLabel = [item.groupName, item.nickName, "紧急求助中", addressLabel.text, timeLabel.text] + .compactMap { $0 } + .filter { !$0.isEmpty } + .joined(separator: ",") + } + + private func makeTitle(_ item: SOSListItem) -> NSAttributedString { + let groupName = item.groupName.isEmpty ? "当前" : item.groupName + let nickName = item.nickName.isEmpty ? "圈子成员" : item.nickName + let text = "\(groupName)圈子的 \(nickName) 紧急求助中" + let result = NSMutableAttributedString( + string: text, + attributes: [ + .font: UIFont.systemFont(ofSize: 16, weight: .regular), + .foregroundColor: UIColor(hexStr: "#273246") + ] + ) + let highlightColor = UIColor(hexStr: "#04AFFF") + result.addAttribute(.foregroundColor, value: highlightColor, range: (text as NSString).range(of: groupName)) + result.addAttribute(.foregroundColor, value: highlightColor, range: (text as NSString).range(of: nickName)) + return result + } + + private func setupUI() { + backgroundColor = .clear + selectionStyle = .none + contentView.backgroundColor = .clear + + cardView.backgroundColor = .white + cardView.layer.cornerRadius = 22 + contentView.addSubview(cardView) + + avatarView.contentMode = .scaleAspectFill + avatarView.clipsToBounds = true + avatarView.layer.cornerRadius = 25 + cardView.addSubview(avatarView) + + titleLabel.numberOfLines = 2 + titleLabel.setContentCompressionResistancePriority(.required, for: .vertical) + cardView.addSubview(titleLabel) + + addressLabel.font = .systemFont(ofSize: 14) + addressLabel.textColor = UIColor(hexStr: "#8D9198") + addressLabel.numberOfLines = 2 + cardView.addSubview(addressLabel) + + timeLabel.font = .systemFont(ofSize: 13) + timeLabel.textColor = UIColor(hexStr: "#B6B9BE") + cardView.addSubview(timeLabel) + + cardView.translatesAutoresizingMaskIntoConstraints = false + avatarView.translatesAutoresizingMaskIntoConstraints = false + titleLabel.translatesAutoresizingMaskIntoConstraints = false + addressLabel.translatesAutoresizingMaskIntoConstraints = false + timeLabel.translatesAutoresizingMaskIntoConstraints = false + NSLayoutConstraint.activate([ + cardView.topAnchor.constraint(equalTo: contentView.topAnchor), + cardView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: 15), + cardView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -15), + cardView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -14), + avatarView.leadingAnchor.constraint(equalTo: cardView.leadingAnchor, constant: 15), + avatarView.topAnchor.constraint(equalTo: cardView.topAnchor, constant: 27), + avatarView.widthAnchor.constraint(equalToConstant: 50), + avatarView.heightAnchor.constraint(equalToConstant: 50), + titleLabel.topAnchor.constraint(equalTo: cardView.topAnchor, constant: 22), + titleLabel.leadingAnchor.constraint(equalTo: avatarView.trailingAnchor, constant: 15), + titleLabel.trailingAnchor.constraint(equalTo: cardView.trailingAnchor, constant: -15), + addressLabel.topAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: 6), + addressLabel.leadingAnchor.constraint(equalTo: titleLabel.leadingAnchor), + addressLabel.trailingAnchor.constraint(equalTo: titleLabel.trailingAnchor), + timeLabel.topAnchor.constraint(equalTo: addressLabel.bottomAnchor, constant: 7), + timeLabel.leadingAnchor.constraint(equalTo: titleLabel.leadingAnchor), + timeLabel.trailingAnchor.constraint(equalTo: titleLabel.trailingAnchor), + timeLabel.bottomAnchor.constraint(equalTo: cardView.bottomAnchor, constant: -16) + ]) + } +} diff --git a/QuickLocation/Section/Home/SOS/SOSPracticeView.swift b/QuickLocation/Section/Home/SOS/SOSPracticeView.swift index b10af6f9..27a06144 100644 --- a/QuickLocation/Section/Home/SOS/SOSPracticeView.swift +++ b/QuickLocation/Section/Home/SOS/SOSPracticeView.swift @@ -258,7 +258,7 @@ final class SOSPracticeView: UIView, UIScrollViewDelegate { titleLabel.translatesAutoresizingMaskIntoConstraints = false let bodyLabel = UILabel() - bodyLabel.text = "10秒后,会将你的SOS和位置发送到你的圈子和紧急联系人。" + bodyLabel.text = SOSConfiguration.countdownDescription bodyLabel.textColor = UIColor(hexStr: "#273246") bodyLabel.font = .systemFont(ofSize: 15, weight: .regular) bodyLabel.textAlignment = .center @@ -432,7 +432,7 @@ final class SOSPracticeView: UIView, UIScrollViewDelegate { practicePulseView.setAnimationEnabled(false) practiceSlider.configure(style: .practiceCountdown) practiceSlider.setInteractionEnabled(true) - practiceCountdownRing.start(duration: 10) + practiceCountdownRing.start() case .success: practiceCountdownRing.stop(reset: false) practicePulseView.setAnimationEnabled(false) diff --git a/QuickLocation/Section/Home/SOS/SOSView.swift b/QuickLocation/Section/Home/SOS/SOSView.swift index 61d4b3d9..a837ee0f 100644 --- a/QuickLocation/Section/Home/SOS/SOSView.swift +++ b/QuickLocation/Section/Home/SOS/SOSView.swift @@ -18,6 +18,7 @@ final class SOSView: UIView { var onCountdownCompleted: (() -> Void)? var onCancelActive: (() -> Void)? var onManageContacts: (() -> Void)? + var onShowSOSList: (() -> Void)? private(set) var state: SOSPageState = .idle let sosPracticeView = SOSPracticeView() @@ -83,10 +84,10 @@ final class SOSView: UIView { idlePulseView.setAnimationEnabled(false) activePulseView.setAnimationEnabled(false) countdownTitleLabel.attributedText = Self.cancelTitle - countdownBodyLabel.text = "10秒后,会将你的SOS和位置发送到你的圈子和紧急联系人。" + countdownBodyLabel.text = SOSConfiguration.countdownDescription countdownSlider.configure(style: .countdown) countdownSlider.setInteractionEnabled(true) - countdownRingView.start(duration: 10) + countdownRingView.start() case .sending: countdownRingView.stop(reset: false) countdownTitleLabel.text = "正在发送" @@ -194,10 +195,15 @@ final class SOSView: UIView { moreButton.widthAnchor.constraint(equalToConstant: 24).isActive = true moreButton.heightAnchor.constraint(equalToConstant: 24).isActive = true moreButton.transform = CGAffineTransform(a: 1.5, b: 0, c: 0, d: 1.5, tx: -7, ty: -7) - moreButton.accessibilityLabel = "更多" + moreButton.accessibilityLabel = "求助列表" + moreButton.addTarget(self, action: #selector(showSOSList), for: .touchUpInside) navView.addRightButton(moreButton) } + @objc private func showSOSList() { + onShowSOSList?() + } + private func setupInfoCard() { infoCard.backgroundColor = UIColor.white.withAlphaComponent(0.93) infoCard.layer.cornerRadius = 14 @@ -417,7 +423,7 @@ final class SOSView: UIView { contentView.addSubview(countdownTitleLabel) countdownTitleLabel.translatesAutoresizingMaskIntoConstraints = false - countdownBodyLabel.text = "10秒后,会将你的SOS和位置发送到你的圈子和紧急联系人。" + countdownBodyLabel.text = SOSConfiguration.countdownDescription countdownBodyLabel.textColor = UIColor(hexStr: "#273246") countdownBodyLabel.font = .systemFont(ofSize: 15, weight: .regular) countdownBodyLabel.textAlignment = .center diff --git a/QuickLocation/Section/Home/SOS/SOSViewController.swift b/QuickLocation/Section/Home/SOS/SOSViewController.swift index eae7f8ce..da1070a5 100644 --- a/QuickLocation/Section/Home/SOS/SOSViewController.swift +++ b/QuickLocation/Section/Home/SOS/SOSViewController.swift @@ -47,6 +47,9 @@ final class SOSViewController: BaseViewController { rootView.onManageContacts = { AppRouter.push(Route.emergencyContact) } + rootView.onShowSOSList = { + AppRouter.push(Route.sosList) + } } private func requestEmergencyContacts() { diff --git a/QuickLocation/Section/Launch/LaunchViewController.swift b/QuickLocation/Section/Launch/LaunchViewController.swift index 5213c0b0..97bc0465 100644 --- a/QuickLocation/Section/Launch/LaunchViewController.swift +++ b/QuickLocation/Section/Launch/LaunchViewController.swift @@ -60,6 +60,9 @@ class LaunchViewController: BaseViewController { MQTTService.shared.connect() Defaults[\.loginToken] = model.token RelationStore.shared.preload() + if #available(iOS 16.0, *) { + AppRestrictManager.shared.checkScreenTimePermissionAfterLogin() + } AppContextManager.shared.systemConfig = model.config diff --git a/QuickLocation/Section/LockDistract/LockDistractVC.swift b/QuickLocation/Section/LockDistract/LockDistractVC.swift index 2cdcb43a..78b6bcad 100644 --- a/QuickLocation/Section/LockDistract/LockDistractVC.swift +++ b/QuickLocation/Section/LockDistract/LockDistractVC.swift @@ -16,6 +16,7 @@ final class LockDistractVC: BaseViewController { private var members: [GroupMemberModel] = [] private var selectedIndex = 0 private var lockAppsDisposable: Disposable? + private let lockStateSubscriptionOwner = UUID() override var isNavigationBarHidden: Bool { true } @@ -31,6 +32,13 @@ final class LockDistractVC: BaseViewController { loadGroupMembers() } + @MainActor deinit { + MQTTService.shared.updateLockStateSubscriptions( + owner: lockStateSubscriptionOwner, + userIds: [] + ) + } + private func bind() { rootView.navView.onBackTapped = { [weak self] in self?.navigationController?.popViewController(animated: true) @@ -59,6 +67,15 @@ final class LockDistractVC: BaseViewController { LockDistractPermissionPopView.show() }).disposed(by: disposeBag) + rootView.onPrivilegeAction = { [weak self] in + guard let self else { return } + if self.selectedMember?.user_id == AppContextManager.shared.userId { + AppRouter.push(Route.privacySettings) + } else { + DLToast.show(text: "已提醒") + } + } + rootView.lockBtn.rx.tap .subscribe(onNext: { [weak self] in self?.performPrimaryAction() @@ -66,6 +83,18 @@ final class LockDistractVC: BaseViewController { .disposed(by: disposeBag) NotificationCenter.default.rx.notification(.lockDistractAppsDidChange) + .observe(on: MainScheduler.instance) + .subscribe(onNext: { [weak self] notification in + guard let self else { return } + let groupKey = notification.userInfo?[LockDistractAppsChangeUserInfoKey.groupKey] as? String ?? "" + let userId = notification.userInfo?[LockDistractAppsChangeUserInfoKey.userId] as? String ?? "" + guard groupKey.isEmpty || groupKey == self.activeGroupKey, + userId.isEmpty || userId == self.selectedMember?.user_id else { return } + self.loadLockableApps() + }) + .disposed(by: disposeBag) + + NotificationCenter.default.rx.notification(UIApplication.didBecomeActiveNotification) .observe(on: MainScheduler.instance) .subscribe(onNext: { [weak self] _ in self?.loadLockableApps() @@ -83,6 +112,10 @@ final class LockDistractVC: BaseViewController { private func applyOwnedGroups(from model: GroupModel) { let owned = model.groups.filter(\.is_owner) guard !owned.isEmpty else { + MQTTService.shared.updateLockStateSubscriptions( + owner: lockStateSubscriptionOwner, + userIds: [] + ) DLToast.show(text: "只有圈主才能使用此功能") { [weak self] in self?.navigationController?.popViewController(animated: true) } @@ -126,6 +159,10 @@ final class LockDistractVC: BaseViewController { private func applyMembers(_ members: [GroupMemberModel]) { self.members = members + MQTTService.shared.updateLockStateSubscriptions( + owner: lockStateSubscriptionOwner, + userIds: members.map(\.user_id) + ) selectedIndex = 0 refreshMember() rootView.setTodayLockCount(0) @@ -144,16 +181,19 @@ final class LockDistractVC: BaseViewController { guard members.indices.contains(selectedIndex) else { rootView.configureMember(name: " ") rootView.configureLocked(false) + rootView.setPrivilegeDenied(false, isCurrentUser: false) return } let m = members[selectedIndex] let name = m.showName + let isSelf = m.user_id.trimmed == AppContextManager.shared.userId.trimmed rootView.configureMember( name: name, headPic: m.displayHeadPic, - isCurrentUser: m.user_id.trimmed == AppContextManager.shared.userId.trimmed + isCurrentUser: isSelf ) rootView.configureLocked(false) + rootView.setPrivilegeDenied(!m.extra.privilege.app_lock, isCurrentUser: isSelf) } private func updateGroupName() { @@ -186,6 +226,10 @@ final class LockDistractVC: BaseViewController { lockAppsDisposable?.dispose() rootView.configureLockableApps([]) guard let member = selectedMember, !activeGroupKey.isEmpty else { return } + if !member.extra.privilege.app_lock { + rootView.setTodayLockCount(0) + return + } let targetUserId = member.user_id let requestGroupKey = activeGroupKey lockAppsDisposable = UserService.phoneLockApps(userId: targetUserId, groupKey: requestGroupKey) diff --git a/QuickLocation/Section/LockDistract/LockDistractView.swift b/QuickLocation/Section/LockDistract/LockDistractView.swift index ae46502c..1d2ab796 100644 --- a/QuickLocation/Section/LockDistract/LockDistractView.swift +++ b/QuickLocation/Section/LockDistract/LockDistractView.swift @@ -117,6 +117,24 @@ final class LockDistractView: UIView { (copyTF.text ?? "").trimmingCharacters(in: .whitespacesAndNewlines) } + var onPrivilegeAction: (() -> Void)? + private(set) var isPrivilegeDenied = false + private let privilegeOverlay = PrivilegeDeniedOverlay() + + func setPrivilegeDenied(_ denied: Bool, isCurrentUser: Bool) { + isPrivilegeDenied = denied + privilegeOverlay.configure( + title: "TA未开启权限", + message: "无法查看可锁应用", + actionTitle: isCurrentUser ? "去开启" : "提醒TA" + ) + privilegeOverlay.onAction = { [weak self] in self?.onPrivilegeAction?() } + privilegeOverlay.setVisible(denied) + if denied { + contentView.bringSubviewToFront(privilegeOverlay) + } + } + private func applyLockedState() { updateLockedEmptyImage() avatarLockView.isHidden = !isLocked @@ -166,6 +184,7 @@ final class LockDistractView: UIView { bottomStack.addArrangedSubview(styleSectionTitle) bottomStack.addArrangedSubview(styleCard) bottomStack.addArrangedSubview(lockedEmptyView) + contentView.addSubview(privilegeOverlay) navView.layoutChain .edges(excludingEdge: .bottom) @@ -228,6 +247,13 @@ final class LockDistractView: UIView { .edgesHorzontal(16) .bottom(20) + privilegeOverlay.layoutChain + .topToView(appsSectionTitle) + .left(16) + .right(16) + .bottomToView(bottomStack) + privilegeOverlay.layer.cornerRadius = 26 + styleSectionTitle.layoutChain.left(4) lockedEmptyView.layoutChain .centerX() diff --git a/QuickLocation/Section/Login/LoginViewModel.swift b/QuickLocation/Section/Login/LoginViewModel.swift index 63a96552..89c8178d 100644 --- a/QuickLocation/Section/Login/LoginViewModel.swift +++ b/QuickLocation/Section/Login/LoginViewModel.swift @@ -27,6 +27,9 @@ enum LoginSessionHandler { Defaults[\.loginToken] = model.token AppContextManager.shared.saveAccount(model) RelationStore.shared.preload() + if #available(iOS 16.0, *) { + AppRestrictManager.shared.checkScreenTimePermissionAfterLogin() + } DLToast.showSuccess(text: "登录成功") DispatchQueue.main.async { if let userId = model.uid { diff --git a/QuickLocation/Section/Mine/Account/AccountVC.swift b/QuickLocation/Section/Mine/Account/AccountVC.swift index e4301aaf..6dca3222 100644 --- a/QuickLocation/Section/Mine/Account/AccountVC.swift +++ b/QuickLocation/Section/Mine/Account/AccountVC.swift @@ -30,6 +30,7 @@ class AccountVC: BaseViewController { // Do any additional setup after loading the view. reactiveAction() + rootView.refreshProfile() DispatchQueue.global(qos: .background).async { let totalByte = AppCacheManager.totalCacheSize() @@ -40,6 +41,11 @@ class AccountVC: BaseViewController { } } } + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + rootView.refreshProfile() + } private func reactiveAction() { rootView.logoutBtn.rx.tap.subscribe(onNext: { _ in @@ -61,6 +67,97 @@ class AccountVC: BaseViewController { let versionTap = UITapGestureRecognizer(target: self, action: #selector(handleVersionViewTap)) rootView.versionView.addGestureRecognizer(versionTap) + + let avatarTap = UITapGestureRecognizer(target: self, action: #selector(handleAvatarTap)) + rootView.avatarView.addGestureRecognizer(avatarTap) + let nickTap = UITapGestureRecognizer(target: self, action: #selector(handleNickNameTap)) + rootView.nickNameView.addGestureRecognizer(nickTap) + let genderTap = UITapGestureRecognizer(target: self, action: #selector(handleGenderTap)) + rootView.genderView.addGestureRecognizer(genderTap) + + NotificationCenter.default.rx.notification(.RefreshUserConfigNotification) + .observe(on: MainScheduler.instance) + .subscribe(onNext: { [weak self] _ in + self?.rootView.refreshProfile() + }) + .disposed(by: disposeBag) + } + + @objc private func handleAvatarTap() { + let vc = AvatarIconListVC(iconIndex: AppContextManager.shared.head_pic) + vc.onSelectIcon = { [weak self] headPic in + self?.requestSetHeadPic(headPic) + } + navigationController?.pushViewController(vc, animated: true) + } + + @objc private func handleNickNameTap() { + let vc = TextInputViewController( + title: "昵称", + maxLength: 10, + initialText: AppContextManager.shared.name + ) { [weak self] text in + self?.requestSetNickName(text) + } + present(vc, animated: true) + } + + @objc private func handleGenderTap() { + let pop = GenderSelectPopVC(currentSex: AppContextManager.shared.sex) { [weak self] sex in + self?.requestSetGender(sex) + } + present(pop, animated: true) + } + + private func requestSetHeadPic(_ headPic: String) { + DLToast.showLoading() + UserService.setHeadPic(headPic: headPic).subscribe(onNext: { [weak self] _ in + DLToast.show(text: "更换成功") + if var account = AppContextManager.shared.account { + account.head_pic = headPic + account.avater = HeadPic.isRemote(headPic) ? headPic : "" + AppContextManager.shared.saveAccount(account) + } + self?.rootView.refreshProfile() + NotificationCenter.default.post(name: .RefreshUserConfigNotification, object: nil) + }, onError: { error in + DLToast.dismiss() + DLToast.show(text: error.localizedDescription) + }).disposed(by: disposeBag) + } + + private func requestSetNickName(_ name: String) { + let trimmed = name.trimmingCharacters(in: .whitespacesAndNewlines) + guard !trimmed.isEmpty else { return } + DLToast.showLoading() + UserService.setNickName(nick: trimmed).subscribe(onNext: { [weak self] _ in + DLToast.show(text: "修改成功") + if var account = AppContextManager.shared.account { + account.name = trimmed + AppContextManager.shared.saveAccount(account) + } + self?.rootView.refreshProfile() + NotificationCenter.default.post(name: .RefreshUserConfigNotification, object: nil) + }, onError: { error in + DLToast.dismiss() + DLToast.show(text: error.localizedDescription) + }).disposed(by: disposeBag) + } + + private func requestSetGender(_ sex: Int) { + DLToast.showLoading() + UserService.setGender(sex: sex).subscribe(onNext: { [weak self] _ in + DLToast.show(text: "修改成功") + if var account = AppContextManager.shared.account { + account.sex = sex + AppContextManager.shared.saveAccount(account) + } + self?.rootView.refreshProfile() + NotificationCenter.default.post(name: .RefreshUserConfigNotification, object: nil) + }, onError: { error in + DLToast.dismiss() + DLToast.show(text: error.localizedDescription) + }).disposed(by: disposeBag) } // MARK: - API diff --git a/QuickLocation/Section/Mine/Account/AccountView.swift b/QuickLocation/Section/Mine/Account/AccountView.swift index ac7557a8..4daaf380 100644 --- a/QuickLocation/Section/Mine/Account/AccountView.swift +++ b/QuickLocation/Section/Mine/Account/AccountView.swift @@ -33,6 +33,8 @@ class AccountView: UIView { addSubview(infoView) infoView.addSubview(infoStackView) + addSubview(profileView) + profileView.addSubview(profileStackView) addSubview(otherInfoView) otherInfoView.addSubview(otherInfoStackView) @@ -55,9 +57,18 @@ class AccountView: UIView { userIdView.layoutChain.height(52) phoneView.layoutChain.height(52) + + profileView.layoutChain + .topToBottomOfView(infoView, offset: 18) + .edgesHorzontal(16) + + profileStackView.layoutChain.edges() + avatarView.layoutChain.height(52) + nickNameView.layoutChain.height(52) + genderView.layoutChain.height(52) otherInfoView.layoutChain - .topToBottomOfView(infoView, offset: 18) + .topToBottomOfView(profileView, offset: 18) .edgesHorzontal(16) otherInfoStackView.layoutChain.edges() @@ -193,6 +204,111 @@ class AccountView: UIView { lab.textColor = UIColor(hexStr: "#1A1A1A") return lab }() + + lazy var profileView: UIView = { + let view = UIView() + view.backgroundColor = .clear + view.layer.shadowColor = UIColor(hexStr: "#0F2846", alpha: 0.1).cgColor + view.layer.shadowOffset = CGSize(width: 0, height: 0) + view.layer.shadowOpacity = 1 + view.layer.shadowRadius = 10 + return view + }() + + lazy var profileStackView: UIStackView = { + let view = UIStackView(arrangedSubviews: [avatarView, nickNameView, genderView]) + view.axis = .vertical + view.alignment = .fill + view.distribution = .fill + view.spacing = 0 + view.backgroundColor = .white + view.cornerRadius = 10 + return view + }() + + lazy var avatarView: UIView = { + makeProfileRow(title: "头像", accessory: avatarImgView, accessorySize: CGSize(width: 32, height: 32), showsLine: true) + }() + + lazy var avatarImgView: UIImageView = { + let iv = UIImageView() + iv.contentMode = .scaleAspectFill + iv.clipsToBounds = true + iv.cornerRadius = 16 + iv.backgroundColor = UIColor(hexStr: "#E0E0E0") + return iv + }() + + lazy var nickNameView: UIView = { + makeProfileRow(title: "昵称", accessory: nickNameLab, showsLine: true) + }() + + lazy var nickNameLab: UILabel = { + let lab = UILabel() + lab.font = .systemFont(ofSize: 14, weight: .medium) + lab.textColor = UIColor(hexStr: "#1A1A1A") + lab.textAlignment = .right + return lab + }() + + lazy var genderView: UIView = { + makeProfileRow(title: "性别", accessory: genderLab, showsLine: false) + }() + + lazy var genderLab: UILabel = { + let lab = UILabel() + lab.font = .systemFont(ofSize: 14, weight: .medium) + lab.textColor = UIColor(hexStr: "#1A1A1A") + lab.textAlignment = .right + return lab + }() + + private func makeProfileRow(title: String, accessory: UIView, accessorySize: CGSize? = nil, showsLine: Bool) -> UIView { + let view = UIView() + view.backgroundColor = .clear + + let titleLab = UILabel() + titleLab.text = title + titleLab.font = .systemFont(ofSize: 14, weight: .medium) + titleLab.textColor = UIColor(hexStr: "#1A1A1A") + view.addSubview(titleLab) + titleLab.layoutChain + .left(15) + .centerY() + + let arrow = UIImageView(image: UIImage(named: "Group/arrow")) + view.addSubview(arrow) + arrow.layoutChain + .right(15) + .width(14) + .height(14) + .centerY() + + view.addSubview(accessory) + if let accessorySize { + accessory.layoutChain + .rightToLeftOfView(arrow, offset: -8) + .centerY() + .width(accessorySize.width) + .height(accessorySize.height) + } else { + accessory.layoutChain + .rightToLeftOfView(arrow, offset: -8) + .centerY() + .leftToRightOfView(titleLab, offset: 12) + } + + if showsLine { + let line = UIView() + line.backgroundColor = ThemeManager.shared.color.lineColor + view.addSubview(line) + line.layoutChain + .bottom() + .height(0.5) + .edgesHorzontal(15) + } + return view + } // 其它 lazy var otherInfoView: UIView = { @@ -306,11 +422,28 @@ class AccountView: UIView { return btn }() + func refreshProfile() { + avatarImgView.setHeadPic(AppContextManager.shared.head_pic) + nickNameLab.text = AppContextManager.shared.name + genderLab.text = Self.genderText(AppContextManager.shared.sex) + phoneLab.text = AppContextManager.shared.userPhone + } + + static func genderText(_ sex: Int) -> String { + switch sex { + case 1: return "男" + case 2: return "女" + case 0: return "保密" + default: return "未设置" + } + } + override init(frame: CGRect) { super.init(frame: .zero) backgroundColor = UIColor(hexStr: "#FAFAFA") setupUI() setupRx() + refreshProfile() } required init?(coder aDecoder: NSCoder) { diff --git a/QuickLocation/Section/Mine/MinePhotoWallView.swift b/QuickLocation/Section/Mine/MinePhotoWallView.swift index 0ad81311..c21cf9e9 100644 --- a/QuickLocation/Section/Mine/MinePhotoWallView.swift +++ b/QuickLocation/Section/Mine/MinePhotoWallView.swift @@ -463,6 +463,9 @@ final class MinePhotoWallView: UIView { daysRow.isHidden = true return } + let selfColor = UIColor(hexStr: "#16B3FF") + let otherColor = UIColor(hexStr: "#293445") + let currentUserId = AppContextManager.shared.userId if isPairMode { titleLab.isHidden = true pairHeartImg.isHidden = members.count < 2 @@ -474,7 +477,9 @@ final class MinePhotoWallView: UIView { } pairLeftLab.text = names.first ?? " " pairRightLab.text = names.count >= 2 ? names[1] : "" - let selfMember = members.first { $0.user_id == AppContextManager.shared.userId } ?? model + pairLeftLab.textColor = otherColor + pairRightLab.textColor = otherColor + let selfMember = members.first { $0.user_id == currentUserId } ?? model daysLab.text = selfMember.joinDaysDisplay } else { titleLab.isHidden = false @@ -483,6 +488,7 @@ final class MinePhotoWallView: UIView { pairRightLab.isHidden = true let nickname = model.showName.trimmingCharacters(in: .whitespacesAndNewlines) titleLab.text = nickname.isEmpty ? "未设置昵称" : nickname + titleLab.textColor = model.user_id == currentUserId ? selfColor : otherColor daysLab.text = model.joinDaysDisplay } daysRow.isHidden = false diff --git a/QuickLocation/Section/Mine/MineView.swift b/QuickLocation/Section/Mine/MineView.swift index 34fa60ce..2313432a 100644 --- a/QuickLocation/Section/Mine/MineView.swift +++ b/QuickLocation/Section/Mine/MineView.swift @@ -15,7 +15,7 @@ final class MineView: UIView { private let vipCardHeight: CGFloat = 90 private let settingsRowHeight: CGFloat = 52 - private let quickItemTitles = ["权限检测", "数据安全", "状态设置", "账户设置"] + private let quickItemTitles = ["权限检测", "隐私设置", "状态设置", "账户设置"] var onQuickTap: ((String) -> Void)? @@ -257,7 +257,7 @@ final class MineView: UIView { private func setupQuickActions() { let icons = [ "Mine/quick_permission", - "Mine/quick_data_security", + "PrivacySettings/privacy_entry", "Mine/quick_status", "Mine/quick_account" ] diff --git a/QuickLocation/Section/Mine/MineViewController.swift b/QuickLocation/Section/Mine/MineViewController.swift index 60484b88..aa3f3775 100644 --- a/QuickLocation/Section/Mine/MineViewController.swift +++ b/QuickLocation/Section/Mine/MineViewController.swift @@ -96,17 +96,21 @@ final class MineViewController: BaseViewController { if !cached.isEmpty { groupKey = cached loadPhotoWallMembers(groupKey: cached) - return } GroupService.groupInfo().subscribe(onNext: { [weak self] response in guard let self = self, let model = response.model else { return } self.groupModel = model - self.groupKey = model.default_group_key - guard !model.default_group_key.isEmpty else { - self.reloadPhotoWall(members: [], groupKey: "") + let key = model.default_group_key + guard !key.isEmpty else { + if self.groupKey.isEmpty { + self.reloadPhotoWall(members: [], groupKey: "") + } return } - self.loadPhotoWallMembers(groupKey: model.default_group_key) + if self.groupKey != key { + self.groupKey = key + self.loadPhotoWallMembers(groupKey: key) + } }).disposed(by: disposeBag) } @@ -154,7 +158,8 @@ final class MineViewController: BaseViewController { guard !members.isEmpty else { return } var userInfo: [String: Any] = [ "members": members, - "userId": selectedUserId + "userId": selectedUserId, + "groupKey": groupKey ] if let group = groupModel { userInfo["groupJson"] = group.toJSON() diff --git a/QuickLocation/Section/Mine/MineViewModel.swift b/QuickLocation/Section/Mine/MineViewModel.swift index cb5f8ee4..a2f1d722 100644 --- a/QuickLocation/Section/Mine/MineViewModel.swift +++ b/QuickLocation/Section/Mine/MineViewModel.swift @@ -34,7 +34,7 @@ class MineViewModel { /// 快捷入口 let quickItems: [MineMenuItem] = [ MineMenuItem(icon: "Mine/quick_permission", title: "权限检测"), - MineMenuItem(icon: "Mine/quick_data_security", title: "数据安全"), + MineMenuItem(icon: "PrivacySettings/privacy_entry", title: "隐私设置"), MineMenuItem(icon: "Mine/quick_status", title: "状态设置"), MineMenuItem(icon: "Mine/quick_account", title: "账户设置") ] @@ -52,14 +52,14 @@ class MineViewModel { AppRouter.push(Route.account) case "紧急联系人": AppRouter.push(Route.emergencyContact) - case "隐私与协议", "隐私设置": + case "隐私与协议": AppRouter.push(Route.privacyPolicy) + case "隐私设置": + AppRouter.push(Route.privacySettings) case "在线客服": requestWechatService() case "权限检测": AppRouter.push(Route.checkPermission) - case "数据安全": - DLToast.show(text: "敬请期待") case "状态设置": AppRouter.push(Route.moodStatus) case "关于我们": diff --git a/QuickLocation/Section/Mine/PrivacySettings/PrivacySettingsViewController.swift b/QuickLocation/Section/Mine/PrivacySettings/PrivacySettingsViewController.swift new file mode 100644 index 00000000..abaf6ccc --- /dev/null +++ b/QuickLocation/Section/Mine/PrivacySettings/PrivacySettingsViewController.swift @@ -0,0 +1,663 @@ +// +// PrivacySettingsViewController.swift +// QuickLocation +// + +import UIKit +import RxSwift +import Kingfisher + +enum PrivacySettingItem: CaseIterable { + case phoneReport + case groupLock + case pigeonMessage + + var title: String { + switch self { + case .phoneReport: + return "手机报告" + case .groupLock: + return "一键锁机" + case .pigeonMessage: + return "飞鸽传书" + } + } + + var imageName: String { + switch self { + case .phoneReport: + return "PrivacySettings/phone_report" + case .groupLock: + return "PrivacySettings/group_lock" + case .pigeonMessage: + return "PrivacySettings/pigeon_message" + } + } + + var apiKey: String { + switch self { + case .phoneReport: + return "phone_report" + case .groupLock: + return "app_lock" + case .pigeonMessage: + return "pigeon_mail" + } + } +} + +final class PrivacySettingsViewController: BaseViewController { + + private var rootView: PrivacySettingsView! + private var groups: [GroupInfoModel] = [] + private var isSubmitting = false + + override func loadView() { + rootView = PrivacySettingsView(frame: UIScreen.main.bounds) + view = rootView + } + + override func viewDidLoad() { + super.viewDidLoad() + bind() + requestGroups() + } + + private func bind() { + rootView.onGroupChanged = { [weak self] in + guard let self else { return } + self.loadPrivilege(for: self.rootView.selectedGroupKey) + } + rootView.onToggle = { [weak self] item, isOn in + self?.changePrivilege(item: item, isOn: isOn) + } + } + + private func requestGroups() { + rootView.setSettingsEnabled(false) + GroupService.groupInfo() + .subscribe(onNext: { [weak self] response in + guard let self else { return } + guard let model = response.model else { + self.groups = [] + self.rootView.configure(groups: [], selectedGroupKey: "") + DLToast.showError(text: response.message ?? "获取圈子信息失败") + return + } + self.groups = model.groups + self.rootView.configure( + groups: model.groups, + selectedGroupKey: model.default_group_key + ) + self.loadPrivilege(for: self.rootView.selectedGroupKey) + }, onError: { [weak self] error in + self?.groups = [] + self?.rootView.configure(groups: [], selectedGroupKey: "") + DLToast.showError(text: error.localizedDescription) + }) + .disposed(by: disposeBag) + } + + private func applySelectedPrivilege() { + let privilege = groups.first(where: { $0.group_key == rootView.selectedGroupKey })?.privilege + ?? GroupPrivilege() + rootView.apply(privilege) + } + + private func loadPrivilege(for groupKey: String) { + guard !groupKey.isEmpty else { + applySelectedPrivilege() + return + } + rootView.setSettingsEnabled(false) + GroupService.groupUsers(groupKey: groupKey) + .subscribe(onNext: { [weak self] response in + guard let self else { return } + self.rootView.setSettingsEnabled(!self.groups.isEmpty) + guard response.isValid(for: groupKey), + self.rootView.selectedGroupKey == groupKey else { + self.applySelectedPrivilege() + return + } + let mine = response.list.first { $0.user_id == AppContextManager.shared.userId } + if let index = self.groups.firstIndex(where: { $0.group_key == groupKey }) { + self.groups[index].privilege = mine?.extra.privilege ?? GroupPrivilege() + } + self.applySelectedPrivilege() + }, onError: { [weak self] error in + self?.rootView.setSettingsEnabled(!(self?.groups.isEmpty ?? true)) + self?.applySelectedPrivilege() + DLToast.showError(text: error.localizedDescription) + }) + .disposed(by: disposeBag) + } + + private func changePrivilege(item: PrivacySettingItem, isOn: Bool) { + let groupKey = rootView.selectedGroupKey + guard !groupKey.isEmpty, + let index = groups.firstIndex(where: { $0.group_key == groupKey }) else { + applySelectedPrivilege() + return + } + guard !isSubmitting else { + applySelectedPrivilege() + return + } + + if item == .groupLock, !isOn { + interceptTurnOffAppLock { [weak self] blocked in + guard let self else { return } + if blocked { + self.applySelectedPrivilege() + return + } + self.submitPrivilege(item: item, isOn: isOn, groupKey: groupKey, index: index) + } + return + } + + submitPrivilege(item: item, isOn: isOn, groupKey: groupKey, index: index) + } + + private func interceptTurnOffAppLock(completion: @escaping (Bool) -> Void) { + if let record = lockRecordForPopup(from: PhoneLockSession.currentLocks) { + LockedAppPopView.show(record) + completion(true) + return + } + + let userId = AppContextManager.shared.userId.trimmed + let revision = AppUnlockCoordinator.shared.currentLockStateRevision() + isSubmitting = true + rootView.setSettingsEnabled(false) + UserService.phoneLocked(os: "ios") + .observe(on: MainScheduler.instance) + .subscribe(onNext: { [weak self] response in + guard let self else { return } + self.isSubmitting = false + self.rootView.setSettingsEnabled(!self.groups.isEmpty) + let locks = AppUnlockCoordinator.shared.locksForRestoration( + response.model?.locks ?? [], + startedAt: revision, + userId: userId + ) ?? [] + if !locks.isEmpty { + PhoneLockSession.currentLocks = locks + } + if let record = self.lockRecordForPopup(from: locks) { + LockedAppPopView.show(record) + completion(true) + } else { + completion(false) + } + }, onError: { [weak self] _ in + guard let self else { return } + self.isSubmitting = false + self.rootView.setSettingsEnabled(!self.groups.isEmpty) + completion(false) + }) + .disposed(by: disposeBag) + } + + private func lockRecordForPopup(from locks: [PhoneLockRecord]) -> PhoneLockRecord? { + let groupKey = rootView.selectedGroupKey + return locks.first { $0.groupKey == groupKey } ?? locks.first + } + + private func submitPrivilege(item: PrivacySettingItem, isOn: Bool, groupKey: String, index: Int) { + let previous = groups[index].privilege + var updated = previous + switch item { + case .phoneReport: + updated.phone_report = isOn + case .groupLock: + updated.app_lock = isOn + case .pigeonMessage: + updated.pigeon_mail = isOn + } + groups[index].privilege = updated + rootView.apply(updated) + + isSubmitting = true + rootView.setSettingsEnabled(false) + GroupService.operate( + opType: "changeprivilege", + requestData: [ + "group_key": groupKey, + "privilege_code": item.apiKey, + "enable": isOn + ] + ) + .subscribe(onNext: { [weak self] response in + guard let self else { return } + self.isSubmitting = false + self.rootView.setSettingsEnabled(!self.groups.isEmpty) + guard response.code == "0" else { + self.revertPrivilege(groupKey: groupKey, previous: previous) + DLToast.showError(text: response.message ?? "设置失败") + return + } + }, onError: { [weak self] error in + guard let self else { return } + self.isSubmitting = false + self.rootView.setSettingsEnabled(!self.groups.isEmpty) + self.revertPrivilege(groupKey: groupKey, previous: previous) + DLToast.showError(text: error.localizedDescription) + }) + .disposed(by: disposeBag) + } + + private func revertPrivilege(groupKey: String, previous: GroupPrivilege) { + if let index = groups.firstIndex(where: { $0.group_key == groupKey }) { + groups[index].privilege = previous + } + applySelectedPrivilege() + } +} + +final class PrivacySettingsView: UIView { + + var onGroupChanged: (() -> Void)? + var onToggle: ((PrivacySettingItem, Bool) -> Void)? + var selectedGroupKey: String { groupSelectorView.selectedGroupKey } + + private let navBackgroundView = UIImageView(image: UIImage(named: "Common/navBar_bg_2")) + private let navView = BaseNavigationView(title: "隐私设置") + private let scrollView = UIScrollView() + private let contentView = UIView() + private let groupSelectorView = PrivacyGroupSelectorView() + private let phoneReportRow = PrivacySettingRow(item: .phoneReport) + private let groupLockRow = PrivacySettingRow(item: .groupLock) + private let pigeonMessageRow = PrivacySettingRow(item: .pigeonMessage) + private let footerLabel = UILabel() + + override init(frame: CGRect) { + super.init(frame: frame) + setupUI() + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + func configure(groups: [GroupInfoModel], selectedGroupKey: String) { + groupSelectorView.configure(groups: groups, selectedGroupKey: selectedGroupKey) + setSettingsEnabled(!groups.isEmpty) + } + + func apply(_ privilege: GroupPrivilege) { + phoneReportRow.setOn(privilege.phone_report) + groupLockRow.setOn(privilege.app_lock) + pigeonMessageRow.setOn(privilege.pigeon_mail) + } + + func setSettingsEnabled(_ enabled: Bool) { + [phoneReportRow, groupLockRow, pigeonMessageRow].forEach { + $0.setSwitchEnabled(enabled) + } + } + + private func setupUI() { + backgroundColor = UIColor(hexStr: "#FAFAFA") + + navBackgroundView.contentMode = .scaleAspectFill + navBackgroundView.clipsToBounds = true + addSubview(navBackgroundView) + addSubview(navView) + + scrollView.showsVerticalScrollIndicator = false + scrollView.alwaysBounceVertical = false + addSubview(scrollView) + scrollView.addSubview(contentView) + + footerLabel.text = "ⓘ 仅对当前选中圈子生效哟~" + footerLabel.textColor = UIColor(hexStr: "#536177") + footerLabel.font = .systemFont(ofSize: 13, weight: .regular) + footerLabel.textAlignment = .center + addSubview(footerLabel) + + contentView.addSubview(groupSelectorView) + + let shareHeader = makeSectionHeader(title: "圈子中可以共享的数据") + contentView.addSubview(shareHeader) + contentView.addSubview(phoneReportRow) + + let ownerHeader = makeSectionHeader(title: "圈主可以对你使用的功能") + contentView.addSubview(ownerHeader) + contentView.addSubview(groupLockRow) + contentView.addSubview(pigeonMessageRow) + + navBackgroundView.layoutChain + .edges(excludingEdge: .bottom) + .height(kNaviHeight) + + navView.layoutChain + .edges(excludingEdge: .bottom) + .height(kNaviHeight) + + footerLabel.layoutChain + .left(20) + .right(20) + .bottom(kSafeBottomMargin + 12) + .height(24) + + scrollView.layoutChain + .topToBottomOfView(navView) + .left() + .right() + .bottomToTopOfView(footerLabel, offset: -8) + + contentView.layoutChain + .edges() + .widthToView(scrollView) + + groupSelectorView.layoutChain + .top(12) + .left(15) + .right(15) + .height(100) + + shareHeader.layoutChain + .topToBottomOfView(groupSelectorView, offset: 20) + .left(17) + .right(15) + .height(24) + + phoneReportRow.layoutChain + .topToBottomOfView(shareHeader, offset: 12) + .left(15) + .right(15) + .height(64) + + ownerHeader.layoutChain + .topToBottomOfView(phoneReportRow, offset: 18) + .left(17) + .right(15) + .height(24) + + groupLockRow.layoutChain + .topToBottomOfView(ownerHeader, offset: 12) + .left(15) + .right(15) + .height(64) + + pigeonMessageRow.layoutChain + .topToBottomOfView(groupLockRow, offset: 12) + .left(15) + .right(15) + .height(64) + .bottom(20) + + groupSelectorView.onSelectionChanged = { [weak self] in + self?.onGroupChanged?() + } + phoneReportRow.onToggle = { [weak self] isOn in + self?.onToggle?(.phoneReport, isOn) + } + groupLockRow.onToggle = { [weak self] isOn in + self?.onToggle?(.groupLock, isOn) + } + pigeonMessageRow.onToggle = { [weak self] isOn in + self?.onToggle?(.pigeonMessage, isOn) + } + } + + private func makeSectionHeader(title: String) -> UIView { + let view = UIView() + + let sparkleLabel = UILabel() + sparkleLabel.text = "✦" + sparkleLabel.textColor = UIColor(hexStr: "#08ADEF") + sparkleLabel.font = .systemFont(ofSize: 18, weight: .bold) + sparkleLabel.textAlignment = .center + view.addSubview(sparkleLabel) + + let titleLabel = UILabel() + titleLabel.text = title + titleLabel.textColor = UIColor(hexStr: "#28364B") + titleLabel.font = .systemFont(ofSize: 16, weight: .regular) + view.addSubview(titleLabel) + + sparkleLabel.layoutChain + .left() + .centerY() + .width(18) + .height(24) + + titleLabel.layoutChain + .leftToRightOfView(sparkleLabel, offset: 3) + .right() + .centerY() + .height(24) + + return view + } +} + +private final class PrivacyGroupSelectorView: UIView, + UICollectionViewDataSource, + UICollectionViewDelegateFlowLayout { + + var onSelectionChanged: (() -> Void)? + private(set) var selectedGroupKey = "" + + private let layout = UICollectionViewFlowLayout() + private lazy var collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout) + private let emptyLabel = UILabel() + private var groups: [GroupInfoModel] = [] + + override init(frame: CGRect) { + super.init(frame: frame) + backgroundColor = .white + layer.cornerRadius = 20 + clipsToBounds = true + + layout.scrollDirection = .horizontal + layout.minimumLineSpacing = 4 + layout.minimumInteritemSpacing = 4 + layout.sectionInset = UIEdgeInsets(top: 4, left: 6, bottom: 4, right: 6) + + collectionView.backgroundColor = .clear + collectionView.showsHorizontalScrollIndicator = false + collectionView.alwaysBounceHorizontal = true + collectionView.dataSource = self + collectionView.delegate = self + collectionView.register(PrivacyGroupCell.self) + addSubview(collectionView) + collectionView.layoutChain.edges() + + emptyLabel.text = "暂无圈子" + emptyLabel.textColor = UIColor(hexStr: "#9BA3AF") + emptyLabel.font = .systemFont(ofSize: 15, weight: .regular) + emptyLabel.textAlignment = .center + emptyLabel.isHidden = true + addSubview(emptyLabel) + emptyLabel.layoutChain.edges() + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + func configure(groups: [GroupInfoModel], selectedGroupKey: String) { + self.groups = groups + if groups.contains(where: { $0.group_key == selectedGroupKey }) { + self.selectedGroupKey = selectedGroupKey + } else { + self.selectedGroupKey = groups.first?.group_key ?? "" + } + emptyLabel.isHidden = !groups.isEmpty + collectionView.isHidden = groups.isEmpty + collectionView.reloadData() + + guard let index = groups.firstIndex(where: { $0.group_key == self.selectedGroupKey }) else { + return + } + collectionView.layoutIfNeeded() + collectionView.scrollToItem( + at: IndexPath(item: index, section: 0), + at: .centeredHorizontally, + animated: false + ) + } + + func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { + groups.count + } + + func collectionView(_ collectionView: UICollectionView, + cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { + let cell: PrivacyGroupCell = collectionView.dequeueReusableCell(for: indexPath) + let group = groups[indexPath.item] + cell.configure(group: group, selected: group.group_key == selectedGroupKey) + return cell + } + + func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { + let groupKey = groups[indexPath.item].group_key + guard selectedGroupKey != groupKey else { return } + selectedGroupKey = groupKey + collectionView.reloadData() + collectionView.scrollToItem(at: indexPath, at: .centeredHorizontally, animated: true) + onSelectionChanged?() + } + + func collectionView(_ collectionView: UICollectionView, + layout collectionViewLayout: UICollectionViewLayout, + sizeForItemAt indexPath: IndexPath) -> CGSize { + CGSize(width: 76, height: 92) + } +} + +private final class PrivacyGroupCell: UICollectionViewCell { + + private let selectionView = UIView() + private let selectionPointer = UIView() + private let iconView = UIImageView() + private let nameLabel = UILabel() + + override init(frame: CGRect) { + super.init(frame: frame) + + selectionView.backgroundColor = UIColor(hexStr: "#C9F4FF") + selectionView.layer.cornerRadius = 13 + selectionView.isHidden = true + contentView.addSubview(selectionView) + + selectionPointer.backgroundColor = UIColor(hexStr: "#C9F4FF") + selectionPointer.transform = CGAffineTransform(rotationAngle: .pi / 4) + selectionPointer.isHidden = true + contentView.addSubview(selectionPointer) + + iconView.contentMode = .scaleAspectFill + iconView.clipsToBounds = true + iconView.layer.cornerRadius = 25 + contentView.addSubview(iconView) + + nameLabel.textColor = UIColor(hexStr: "#26364B") + nameLabel.font = .systemFont(ofSize: 14, weight: .regular) + nameLabel.textAlignment = .center + nameLabel.lineBreakMode = .byTruncatingTail + contentView.addSubview(nameLabel) + + selectionView.layoutChain + .top(1) + .left(2) + .right(2) + .bottom(4) + + selectionPointer.layoutChain + .centerX() + .bottom(1) + .width(12) + .height(12) + + iconView.layoutChain + .top(8) + .centerX() + .width(50) + .height(50) + + nameLabel.layoutChain + .topToBottomOfView(iconView, offset: 5) + .left(5) + .right(5) + .height(20) + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + override func prepareForReuse() { + super.prepareForReuse() + iconView.kf.cancelDownloadTask() + iconView.image = nil + } + + func configure(group: GroupInfoModel, selected: Bool) { + nameLabel.text = group.name + iconView.setGroupIcon(group) + selectionView.isHidden = !selected + selectionPointer.isHidden = !selected + } +} + +private final class PrivacySettingRow: UIView { + + var onToggle: ((Bool) -> Void)? + private let settingSwitch = UISwitch() + + init(item: PrivacySettingItem) { + super.init(frame: .zero) + backgroundColor = .white + layer.cornerRadius = 20 + + let imageView = UIImageView(image: UIImage(named: item.imageName)) + imageView.contentMode = .scaleAspectFit + addSubview(imageView) + + let titleLabel = UILabel() + titleLabel.text = item.title + titleLabel.textColor = UIColor(hexStr: "#28364B") + titleLabel.font = .systemFont(ofSize: 17, weight: .regular) + addSubview(titleLabel) + + settingSwitch.onTintColor = UIColor(hexStr: "#08ADEF") + settingSwitch.setOn(false, animated: false) + settingSwitch.addTarget(self, action: #selector(switchChanged), for: .valueChanged) + addSubview(settingSwitch) + + imageView.layoutChain + .left(8) + .centerY() + .width(96) + .height(50) + + settingSwitch.layoutChain + .right(13) + .centerY() + + titleLabel.layoutChain + .leftToRightOfView(imageView, offset: 8) + .rightToLeftOfView(settingSwitch, offset: -8) + .centerY() + .height(26) + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + func setSwitchEnabled(_ enabled: Bool) { + settingSwitch.isEnabled = enabled + } + + func setOn(_ on: Bool) { + settingSwitch.setOn(on, animated: false) + } + + @objc private func switchChanged() { + onToggle?(settingSwitch.isOn) + } +} diff --git a/QuickLocation/Section/PigeonMessage/PigeonMessageVC.swift b/QuickLocation/Section/PigeonMessage/PigeonMessageVC.swift index 9edb3b93..579465a1 100644 --- a/QuickLocation/Section/PigeonMessage/PigeonMessageVC.swift +++ b/QuickLocation/Section/PigeonMessage/PigeonMessageVC.swift @@ -6,6 +6,7 @@ import UIKit import AVFoundation import RxSwift +import SwiftyUserDefaults final class PigeonMessageVC: BaseViewController { @@ -479,6 +480,10 @@ final class PigeonMessageVC: BaseViewController { } @objc private func sendMessage() { + if let wait = pigeonSendWaitSeconds() { + DLToast.show(text: "发送过于频繁,请\(Self.formatWaitDuration(wait))后再试") + return + } guard !selectedMembers.isEmpty else { DLToast.show(text: "请先选择收件人") return @@ -574,6 +579,7 @@ final class PigeonMessageVC: BaseViewController { self.rootView.clearImageDraft() self.cleanupAudio(deleteFile: true) self.rootView.clearVoiceDraft() + self.recordPigeonSendSuccess() DLToast.show(text: "发送成功") }, onError: { error in DLToast.dismiss() @@ -582,6 +588,44 @@ final class PigeonMessageVC: BaseViewController { .disposed(by: disposeBag) } + private func pigeonSendWaitSeconds() -> Int? { + guard let config = AppContextManager.shared.systemConfig?.pigeonConfig, + config.isEnabled else { return nil } + let userId = AppContextManager.shared.userId + guard !userId.isEmpty else { return nil } + let window = TimeInterval(config.times) + let now = Date().timeIntervalSince1970 + let recent = (Defaults[\.pigeonSendAtByUser][userId] ?? []).filter { now - $0 < window } + guard recent.count >= config.nums else { return nil } + let oldest = recent.min() ?? now + return max(1, Int(ceil(window - (now - oldest)))) + } + + static func formatWaitDuration(_ seconds: Int) -> String { + let total = max(0, seconds) + let hours = total / 3600 + let minutes = (total % 3600) / 60 + let secs = total % 60 + var parts: [String] = [] + if hours > 0 { parts.append("\(hours)小时") } + if minutes > 0 { parts.append("\(minutes)分钟") } + if secs > 0 || parts.isEmpty { parts.append("\(secs)秒") } + return parts.joined() + } + + private func recordPigeonSendSuccess() { + guard let config = AppContextManager.shared.systemConfig?.pigeonConfig, + config.isEnabled else { return } + let userId = AppContextManager.shared.userId + guard !userId.isEmpty else { return } + let now = Date().timeIntervalSince1970 + let window = TimeInterval(config.times) + var store = Defaults[\.pigeonSendAtByUser] + let recent = (store[userId] ?? []).filter { now - $0 < window } + store[userId] = recent + [now] + Defaults[\.pigeonSendAtByUser] = store + } + private func compressedPigeonJPEG(from image: UIImage) -> Data? { let maxEdge: CGFloat = 1280 let quality: CGFloat = 0.55 diff --git a/QuickLocation/Section/PigeonMessage/PigeonMessageView.swift b/QuickLocation/Section/PigeonMessage/PigeonMessageView.swift index 89992312..30f804a7 100644 --- a/QuickLocation/Section/PigeonMessage/PigeonMessageView.swift +++ b/QuickLocation/Section/PigeonMessage/PigeonMessageView.swift @@ -674,9 +674,13 @@ extension PigeonMessageView: UICollectionViewDataSource, UICollectionViewDelegat private extension PigeonMessageView { func toggleMember(at index: Int) { guard members.indices.contains(index) else { return } - let id = members[index].user_id + let member = members[index] + let id = member.user_id if selectedMemberIds.contains(id) { selectedMemberIds.remove(id) + } else if !member.extra.privilege.pigeon_mail { + DLToast.show(text: "该用户未开启设置,无法接收飞鸽传书") + return } else { selectedMemberIds.insert(id) } diff --git a/QuickLocation/Section/Web/Controller/WebViewController.swift b/QuickLocation/Section/Web/Controller/WebViewController.swift index 25a2c890..4645cccc 100644 --- a/QuickLocation/Section/Web/Controller/WebViewController.swift +++ b/QuickLocation/Section/Web/Controller/WebViewController.swift @@ -168,9 +168,8 @@ class FullscreenWebView: WKWebView { super.viewDidLoad() fd_interactivePopDisabled = true if style == "default" { - let btn = UIButton(type: .system) + let btn = UIButton(type: .custom) btn.setImage(UIImage(named: "Common/back"), for: .normal) - btn.tintColor = UIColor(hexStr: "#0F2846") btn.addTarget(self, action: #selector(leftBackClicked(_:)), for: .touchUpInside) navigationItem.leftBarButtonItem = UIBarButtonItem(customView: btn) } @@ -315,17 +314,19 @@ class FullscreenWebView: WKWebView { // backItem.tintColor = iconColor=="white" ? .white : .black // backItem.tag = 1 - let backBtn = UIButton(frame: CGRect(x: 0, y: 0, width: 19, height: 19)) + let backBtn = UIButton(type: .custom) + backBtn.frame = CGRect(x: 0, y: 0, width: 19, height: 19) backBtn.setImage(UIImage(named: "Common/back"), for: .normal) backBtn.addTarget(self, action: #selector(leftBackClicked(_:)), for: .touchUpInside) - backBtn.tintColor = .black +// backBtn.tintColor = .black backBtn.tag = 1 let backItem = UIBarButtonItem(customView: backBtn) - let popBtn = UIButton(frame: CGRect(x: 0, y: 0, width: 19, height: 19)) + let popBtn = UIButton(type: .custom) + popBtn.frame = CGRect(x: 0, y: 0, width: 19, height: 19) popBtn.setImage(UIImage(named: "Common/x_black"), for: .normal) popBtn.addTarget(self, action: #selector(leftBackClicked(_:)), for: .touchUpInside) - popBtn.tintColor = .black +// popBtn.tintColor = .black popBtn.tag = 2 let popItem = UIBarButtonItem(customView: popBtn) diff --git a/QuickLocation/Service/GroupService.swift b/QuickLocation/Service/GroupService.swift index 61072f00..3be7938e 100644 --- a/QuickLocation/Service/GroupService.swift +++ b/QuickLocation/Service/GroupService.swift @@ -13,7 +13,7 @@ struct GroupService { static let disposeBag = DisposeBag() private static let notifyingOperations: Set = [ - "create", "join", "setdefault", "editmateinfo" + "create", "join", "setdefault", "editmateinfo", "changeprivilege" ] private static func postGroupDataChange(operation: String, diff --git a/QuickLocation/Service/SystemService.swift b/QuickLocation/Service/SystemService.swift index e1800248..baf720e9 100644 --- a/QuickLocation/Service/SystemService.swift +++ b/QuickLocation/Service/SystemService.swift @@ -41,6 +41,13 @@ struct SystemService { .map(ResponseModel.self) .asObservable() } + + static func sosList() -> Observable { + let api = SystemAPI.sosList.multiTarget + return APIProvider.request(token: api, handle: false) + .map(SOSListResponse.self) + .asObservable() + } /// 查找 /// - Parameters: diff --git a/QuickLocation/Service/UserService.swift b/QuickLocation/Service/UserService.swift index 27a2b083..5fd5e4fd 100644 --- a/QuickLocation/Service/UserService.swift +++ b/QuickLocation/Service/UserService.swift @@ -371,6 +371,27 @@ struct UserService { .asObservable() } + static func mailboxList(page: Int, size: Int = 10) -> Observable { + let api = UserAPI.mailboxList(page: page, size: size).multiTarget + return APIProvider.request(token: api, handle: false) + .map(MailboxListResponse.self) + .asObservable() + } + + static func mailboxDetail(id: Int) -> Observable { + let api = UserAPI.mailboxOperate(opType: "info", id: id).multiTarget + return APIProvider.request(token: api, handle: false) + .map(MailboxDetailResponse.self) + .asObservable() + } + + static func clearMailbox() -> Observable { + let api = UserAPI.mailboxOperate(opType: "alldelete", id: nil).multiTarget + return APIProvider.request(token: api, handle: false) + .map(ResponseModel.self) + .asObservable() + } + /// 提交意见反馈 static func feedback( type: String, diff --git a/QuickLocation/UIKit/Alert/DLToast.swift b/QuickLocation/UIKit/Alert/DLToast.swift index c0ff2835..fad1b5be 100644 --- a/QuickLocation/UIKit/Alert/DLToast.swift +++ b/QuickLocation/UIKit/Alert/DLToast.swift @@ -22,7 +22,7 @@ public class DLToastConfig { /// 容器背景色 var containerBgColor: UIColor = .black.withAlphaComponent(0.7) /// 容器圆角 - var containerRadius: CGFloat = 12.0 + var containerRadius: CGFloat = 20.0 /// 文字颜色 var textColor: UIColor = .white /// 文字大小