- 新增屏蔽元素 未安装微信
This commit is contained in:
parent
15ba209901
commit
d88176a8bc
|
|
@ -83,6 +83,11 @@ struct SystemConfigModel: Mappable {
|
||||||
/// 全局控制显示隐藏 弹窗和充值
|
/// 全局控制显示隐藏 弹窗和充值
|
||||||
var globalDisplay: Bool = true
|
var globalDisplay: Bool = true
|
||||||
|
|
||||||
|
/// 是否拦截
|
||||||
|
var isIntercept: Bool {
|
||||||
|
return globalDisplay == false || !WXApi.isWXAppInstalled() // 未安装微信
|
||||||
|
}
|
||||||
|
|
||||||
init?(map: Map) {
|
init?(map: Map) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,7 @@ class CreateGroupViewModel {
|
||||||
}, onError: { (error) in
|
}, onError: { (error) in
|
||||||
guard let code = error.underlyingError?.code else { return }
|
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 { // "您创建的圈子个数已达上限,请升级会员等级"
|
if code == 20009 { // "您创建的圈子个数已达上限,请升级会员等级"
|
||||||
CreateGroupVipPopView.show()
|
CreateGroupVipPopView.show()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ class GroupMemberListVC: BaseViewController {
|
||||||
|
|
||||||
requestGroupInfo()
|
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
|
rootView.unlockVipMaskView.isHidden = true
|
||||||
if AppContextManager.shared.vip == 1 {
|
if AppContextManager.shared.vip == 1 {
|
||||||
rootView.tipsImg.image = UIImage(named: "GroupMemberList/mask_tips")
|
rootView.tipsImg.image = UIImage(named: "GroupMemberList/mask_tips")
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ class CreateBubbleVC: BaseViewController {
|
||||||
doneBtn.rx.tap.subscribe(onNext: { [weak self] in
|
doneBtn.rx.tap.subscribe(onNext: { [weak self] in
|
||||||
guard let self = self else { return }
|
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
|
let hours = self.rootView.createBubbleTiemView.selectedHour.value
|
||||||
requestSetBubble(enable: true, keep_time: hours)
|
requestSetBubble(enable: true, keep_time: hours)
|
||||||
return
|
return
|
||||||
|
|
|
||||||
|
|
@ -258,7 +258,7 @@ class HomeView: UIView {
|
||||||
quickMessageView.isHidden = true
|
quickMessageView.isHidden = true
|
||||||
interactionView.isHidden = true
|
interactionView.isHidden = true
|
||||||
toolsView.isHidden = false
|
toolsView.isHidden = false
|
||||||
searchLottieView.isHidden = AppContextManager.shared.systemConfig?.globalDisplay == false
|
searchLottieView.isHidden = AppContextManager.shared.systemConfig?.isIntercept == true
|
||||||
onDismissPanel?()
|
onDismissPanel?()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -206,7 +206,7 @@ class HomeViewController: BaseViewController {
|
||||||
guard let self = self, let model = response.model else { return }
|
guard let self = self, let model = response.model else { return }
|
||||||
Defaults[\.loginToken] = model.token
|
Defaults[\.loginToken] = model.token
|
||||||
AppContextManager.shared.systemConfig = model.config
|
AppContextManager.shared.systemConfig = model.config
|
||||||
rootView.searchLottieView.isHidden = model.config?.globalDisplay == false
|
rootView.searchLottieView.isHidden = model.config?.isIntercept == true
|
||||||
self.getUserIMToken()
|
self.getUserIMToken()
|
||||||
self.requestUserInfo { [weak self] in
|
self.requestUserInfo { [weak self] in
|
||||||
self?.requestGroupInfo()
|
self?.requestGroupInfo()
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ final class MineView: UIView {
|
||||||
private let vipBtnTextColor = UIColor(hexStr: "#00343B")
|
private let vipBtnTextColor = UIColor(hexStr: "#00343B")
|
||||||
|
|
||||||
func setupData(_ model: UserConfigModel) {
|
func setupData(_ model: UserConfigModel) {
|
||||||
guard AppContextManager.shared.systemConfig?.globalDisplay == true else {
|
guard AppContextManager.shared.systemConfig?.isIntercept == false else {
|
||||||
maskBgView.isHidden = false
|
maskBgView.isHidden = false
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ class PopupQueueManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
private func executeNextStep() {
|
private func executeNextStep() {
|
||||||
guard AppContextManager.shared.systemConfig?.globalDisplay == true else { return }
|
guard AppContextManager.shared.systemConfig?.isIntercept == false else { return }
|
||||||
switch currentStep {
|
switch currentStep {
|
||||||
case 0:
|
case 0:
|
||||||
tryStartPromotionalActivities()
|
tryStartPromotionalActivities()
|
||||||
|
|
|
||||||
|
|
@ -111,7 +111,7 @@ class CreateScheduleVC: BaseViewController, MAMapViewDelegate {
|
||||||
}, onError: { error in
|
}, onError: { error in
|
||||||
guard let code = error.underlyingError?.code else { return }
|
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 { // "创建的行程数达到上限"
|
if code == 20010 { // "创建的行程数达到上限"
|
||||||
CreateScheduleVipPopView.show()
|
CreateScheduleVipPopView.show()
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ class ScheduleDetailVC: BaseViewController {
|
||||||
override func viewWillAppear(_ animated: Bool) {
|
override func viewWillAppear(_ animated: Bool) {
|
||||||
super.viewWillAppear(animated)
|
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,可查看具体人员与节点"
|
rootView.vipTipsLab.text = AppContextManager.shared.vip > 1 ? "" : "升级 VIP,可查看具体人员与节点"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue