From d88176a8bc26c96c95e6a78513597ff6bbe4a24d Mon Sep 17 00:00:00 2001 From: linshujie Date: Thu, 9 Jul 2026 18:33:34 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E6=96=B0=E5=A2=9E=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E5=85=83=E7=B4=A0=20=20=E6=9C=AA=E5=AE=89=E8=A3=85=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QuickLocation/Manager/Account/UserConfigModel.swift | 5 +++++ .../Section/Group/CreateGroup/CreateGroupViewModel.swift | 2 +- .../Section/Group/GroupMemberList/GroupMemberListVC.swift | 2 +- QuickLocation/Section/Home/Bubble/CreateBubbleVC.swift | 2 +- QuickLocation/Section/Home/HomeView.swift | 2 +- QuickLocation/Section/Home/HomeViewController.swift | 2 +- QuickLocation/Section/Mine/MineView.swift | 2 +- QuickLocation/Section/PopupWindow/PopupQueueManager.swift | 2 +- .../Section/Schedule/CreateSchedule/CreateScheduleVC.swift | 2 +- .../Section/Schedule/ScheduleDetail/ScheduleDetailVC.swift | 2 +- 10 files changed, 14 insertions(+), 9 deletions(-) diff --git a/QuickLocation/Manager/Account/UserConfigModel.swift b/QuickLocation/Manager/Account/UserConfigModel.swift index 9eaba19..7360d10 100644 --- a/QuickLocation/Manager/Account/UserConfigModel.swift +++ b/QuickLocation/Manager/Account/UserConfigModel.swift @@ -83,6 +83,11 @@ struct SystemConfigModel: Mappable { /// 全局控制显示隐藏 弹窗和充值 var globalDisplay: Bool = true + /// 是否拦截 + var isIntercept: Bool { + return globalDisplay == false || !WXApi.isWXAppInstalled() // 未安装微信 + } + init?(map: Map) { } diff --git a/QuickLocation/Section/Group/CreateGroup/CreateGroupViewModel.swift b/QuickLocation/Section/Group/CreateGroup/CreateGroupViewModel.swift index add0fdf..cc301f4 100644 --- a/QuickLocation/Section/Group/CreateGroup/CreateGroupViewModel.swift +++ b/QuickLocation/Section/Group/CreateGroup/CreateGroupViewModel.swift @@ -88,7 +88,7 @@ class CreateGroupViewModel { }, onError: { (error) in guard let code = error.underlyingError?.code else { return } - guard let systemConfig = AppContextManager.shared.systemConfig, systemConfig.globalDisplay else { return } + guard let systemConfig = AppContextManager.shared.systemConfig, systemConfig.isIntercept == false else { return } if code == 20009 { // "您创建的圈子个数已达上限，请升级会员等级" CreateGroupVipPopView.show() } diff --git a/QuickLocation/Section/Group/GroupMemberList/GroupMemberListVC.swift b/QuickLocation/Section/Group/GroupMemberList/GroupMemberListVC.swift index c450958..cf099da 100644 --- a/QuickLocation/Section/Group/GroupMemberList/GroupMemberListVC.swift +++ b/QuickLocation/Section/Group/GroupMemberList/GroupMemberListVC.swift @@ -30,7 +30,7 @@ class GroupMemberListVC: BaseViewController { requestGroupInfo() - guard let systemConfig = AppContextManager.shared.systemConfig, systemConfig.globalDisplay else { return } + guard let systemConfig = AppContextManager.shared.systemConfig, systemConfig.isIntercept == false else { return } rootView.unlockVipMaskView.isHidden = true if AppContextManager.shared.vip == 1 { rootView.tipsImg.image = UIImage(named: "GroupMemberList/mask_tips") diff --git a/QuickLocation/Section/Home/Bubble/CreateBubbleVC.swift b/QuickLocation/Section/Home/Bubble/CreateBubbleVC.swift index 877a4a2..cdf2049 100644 --- a/QuickLocation/Section/Home/Bubble/CreateBubbleVC.swift +++ b/QuickLocation/Section/Home/Bubble/CreateBubbleVC.swift @@ -33,7 +33,7 @@ class CreateBubbleVC: BaseViewController { doneBtn.rx.tap.subscribe(onNext: { [weak self] in guard let self = self else { return } - guard let systemConfig = AppContextManager.shared.systemConfig, systemConfig.globalDisplay else { + guard let systemConfig = AppContextManager.shared.systemConfig, systemConfig.isIntercept == false else { let hours = self.rootView.createBubbleTiemView.selectedHour.value requestSetBubble(enable: true, keep_time: hours) return diff --git a/QuickLocation/Section/Home/HomeView.swift b/QuickLocation/Section/Home/HomeView.swift index 4629d67..94788f2 100644 --- a/QuickLocation/Section/Home/HomeView.swift +++ b/QuickLocation/Section/Home/HomeView.swift @@ -258,7 +258,7 @@ class HomeView: UIView { quickMessageView.isHidden = true interactionView.isHidden = true toolsView.isHidden = false - searchLottieView.isHidden = AppContextManager.shared.systemConfig?.globalDisplay == false + searchLottieView.isHidden = AppContextManager.shared.systemConfig?.isIntercept == true onDismissPanel?() } diff --git a/QuickLocation/Section/Home/HomeViewController.swift b/QuickLocation/Section/Home/HomeViewController.swift index 8359d2e..542adec 100644 --- a/QuickLocation/Section/Home/HomeViewController.swift +++ b/QuickLocation/Section/Home/HomeViewController.swift @@ -206,7 +206,7 @@ class HomeViewController: BaseViewController { guard let self = self, let model = response.model else { return } Defaults[\.loginToken] = model.token AppContextManager.shared.systemConfig = model.config - rootView.searchLottieView.isHidden = model.config?.globalDisplay == false + rootView.searchLottieView.isHidden = model.config?.isIntercept == true self.getUserIMToken() self.requestUserInfo { [weak self] in self?.requestGroupInfo() diff --git a/QuickLocation/Section/Mine/MineView.swift b/QuickLocation/Section/Mine/MineView.swift index b184689..d91282c 100644 --- a/QuickLocation/Section/Mine/MineView.swift +++ b/QuickLocation/Section/Mine/MineView.swift @@ -29,7 +29,7 @@ final class MineView: UIView { private let vipBtnTextColor = UIColor(hexStr: "#00343B") func setupData(_ model: UserConfigModel) { - guard AppContextManager.shared.systemConfig?.globalDisplay == true else { + guard AppContextManager.shared.systemConfig?.isIntercept == false else { maskBgView.isHidden = false return } diff --git a/QuickLocation/Section/PopupWindow/PopupQueueManager.swift b/QuickLocation/Section/PopupWindow/PopupQueueManager.swift index 8f94c63..60eb339 100644 --- a/QuickLocation/Section/PopupWindow/PopupQueueManager.swift +++ b/QuickLocation/Section/PopupWindow/PopupQueueManager.swift @@ -60,7 +60,7 @@ class PopupQueueManager { } private func executeNextStep() { - guard AppContextManager.shared.systemConfig?.globalDisplay == true else { return } + guard AppContextManager.shared.systemConfig?.isIntercept == false else { return } switch currentStep { case 0: tryStartPromotionalActivities() diff --git a/QuickLocation/Section/Schedule/CreateSchedule/CreateScheduleVC.swift b/QuickLocation/Section/Schedule/CreateSchedule/CreateScheduleVC.swift index 768a7c3..5b3adea 100644 --- a/QuickLocation/Section/Schedule/CreateSchedule/CreateScheduleVC.swift +++ b/QuickLocation/Section/Schedule/CreateSchedule/CreateScheduleVC.swift @@ -111,7 +111,7 @@ class CreateScheduleVC: BaseViewController, MAMapViewDelegate { }, onError: { error in guard let code = error.underlyingError?.code else { return } - guard let systemConfig = AppContextManager.shared.systemConfig, systemConfig.globalDisplay else { return } + guard let systemConfig = AppContextManager.shared.systemConfig, systemConfig.isIntercept == false else { return } if code == 20010 { // "创建的行程数达到上限" CreateScheduleVipPopView.show() diff --git a/QuickLocation/Section/Schedule/ScheduleDetail/ScheduleDetailVC.swift b/QuickLocation/Section/Schedule/ScheduleDetail/ScheduleDetailVC.swift index cf3a002..d0171f1 100644 --- a/QuickLocation/Section/Schedule/ScheduleDetail/ScheduleDetailVC.swift +++ b/QuickLocation/Section/Schedule/ScheduleDetail/ScheduleDetailVC.swift @@ -37,7 +37,7 @@ class ScheduleDetailVC: BaseViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - guard let systemConfig = AppContextManager.shared.systemConfig, systemConfig.globalDisplay else { return } + guard let systemConfig = AppContextManager.shared.systemConfig, systemConfig.isIntercept == false else { return } rootView.vipTipsLab.text = AppContextManager.shared.vip > 1 ? "" : "升级 VIP，可查看具体人员与节点" }