diff --git a/MoviaBox/Base/Networking/Base/SPURLPath.swift b/MoviaBox/Base/Networking/Base/SPURLPath.swift index 6592d1a..76617bc 100644 --- a/MoviaBox/Base/Networking/Base/SPURLPath.swift +++ b/MoviaBox/Base/Networking/Base/SPURLPath.swift @@ -52,6 +52,6 @@ let SPFeedBackListWebUrl = SPCampaignWebURL + "/pages/leave/list" ///反馈详情 let SPFeedBackDetailWebUrl = SPCampaignWebURL + "/pages/leave/detail" ///活动页面 -let SPRewardsWebUrl = SPCampaignWebURL +let SPRewardsWebUrl = SPCampaignWebURL + "/pages/reward/theme2" diff --git a/MoviaBox/Base/WebView/SPCampaignWebViewController.swift b/MoviaBox/Base/WebView/SPCampaignWebViewController.swift index 405e613..107ba5c 100644 --- a/MoviaBox/Base/WebView/SPCampaignWebViewController.swift +++ b/MoviaBox/Base/WebView/SPCampaignWebViewController.swift @@ -11,6 +11,8 @@ class SPCampaignWebViewController: SPWebViewController { var id: String? + var theme: String? = "theme_1" + ///重试次数 private var receiveDataCount = 0 @@ -60,8 +62,12 @@ extension SPCampaignWebViewController { "time_zone" : String.timeZone(), "lang" : SPLocalizedManager.shared.currentLocalizedKey, "type" : "ios", - "theme" : "theme_1", +// "theme" : "theme_1", ] + if let theme = theme { + dic["theme"] = theme + } + if let id = id { dic["id"] = id } diff --git a/MoviaBox/Class/Mine/Controller/SPMineViewController.swift b/MoviaBox/Class/Mine/Controller/SPMineViewController.swift index 1f63e26..401affa 100644 --- a/MoviaBox/Class/Mine/Controller/SPMineViewController.swift +++ b/MoviaBox/Class/Mine/Controller/SPMineViewController.swift @@ -24,6 +24,7 @@ class SPMineViewController: SPViewController { ///是否进入过 private var isHaveEntered = false + weak var vipAlertView: SPVipAlertView? //MARK: UI 属性 private lazy var headerView: SPMineHeaderView = { let view = SPMineHeaderView() @@ -96,11 +97,14 @@ extension SPMineViewController { SPWalletAPI.requestPayTemplate { model in guard let list = model?.list_sub_vip else { return } + if !self.isDidAppear { return } + if self.vipAlertView != nil { return } let alert = SPVipAlertView(dataArr: list).show(in: SPAPPTool.getKeyWindow()) alert.buyFinishHandle = { [weak self] in guard let self = self else { return } self.requestUserInfo() } + self.vipAlertView = alert } } diff --git a/MoviaBox/Class/Rewards/Controller/SPRewardsViewController.swift b/MoviaBox/Class/Rewards/Controller/SPRewardsViewController.swift index a90b328..9b6c6ce 100644 --- a/MoviaBox/Class/Rewards/Controller/SPRewardsViewController.swift +++ b/MoviaBox/Class/Rewards/Controller/SPRewardsViewController.swift @@ -18,15 +18,27 @@ class SPRewardsViewController: SPCampaignWebViewController { override func viewDidLoad() { self.urlStr = SPRewardsWebUrl - super.viewDidLoad() + self.edgesForExtendedLayout = .top + + self.theme = nil + NotificationCenter.default.addObserver(self, selector: #selector(reachabilityDidChangeNotification), name: SPNetworkReachabilityManager.reachabilityDidChangeNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(loginStateDidChangeNotification), name: SPLoginManager.loginStateDidChangeNotification, object: nil) + self.webView.backgroundColor = .clear + self.webView.scrollView.backgroundColor = .clear setEmptyView() + + setBackgroundView(isShowGradient: false, bgImage: UIImage(named: "rewards_bg_image")) } + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + setNavigationNormalStyle(backgroundColor: .clear, isTranslucent: true) + } override func viewDidAppear(_ animated: Bool) { diff --git a/MoviaBox/Source/Assets.xcassets/image/rewards_bg_image.imageset/Contents.json b/MoviaBox/Source/Assets.xcassets/image/rewards_bg_image.imageset/Contents.json new file mode 100644 index 0000000..bd98d3c --- /dev/null +++ b/MoviaBox/Source/Assets.xcassets/image/rewards_bg_image.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "lQLPJwvP6usd4ePNAyzNAXew2fMtKVt3jeMIDIWgS4A-AA_375_812.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/MoviaBox/Source/Assets.xcassets/image/rewards_bg_image.imageset/lQLPJwvP6usd4ePNAyzNAXew2fMtKVt3jeMIDIWgS4A-AA_375_812.png b/MoviaBox/Source/Assets.xcassets/image/rewards_bg_image.imageset/lQLPJwvP6usd4ePNAyzNAXew2fMtKVt3jeMIDIWgS4A-AA_375_812.png new file mode 100644 index 0000000..a0c1cee Binary files /dev/null and b/MoviaBox/Source/Assets.xcassets/image/rewards_bg_image.imageset/lQLPJwvP6usd4ePNAyzNAXew2fMtKVt3jeMIDIWgS4A-AA_375_812.png differ