商品详情页关闭小窗 首页开启审核按钮设置

galaxy/galaxy/AppDelegate.swift

@@ -166,15 +166,6 @@ extension AppDelegate {
 #else
         Bugly.start(withAppId: YhConstant.Bugly.appidForRelease)
 #endif
-        
-        
-        //3、AGC 短链相关
-        AGCInstance.startUp()
-        AGCAppLinking.instance().handle { (link, error) in
-            let deepLink = link?.deepLink
-            //TODO: 增加deeplink地址跳转
-            print(deepLink as Any)
-        }
     }
     
     //2.通用全局UI设置相关

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -80,9 +80,10 @@ class YHHomePageViewController: YHBaseViewController {
         guard YHPlayerManager.shared.isConfigFloating != false else {
             return
         }
-//        guard let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_integral_open else {
-//            return
-//        }
+        guard let configModel = YHConfigManager.shared.reqVM.configModel, configModel.is_integral_open else {
+            // 关闭就不让显示直播浮窗
+            return
+        }
         viewModel.getHomeFloatingLive { [weak self] success, error in
             guard let self = self else {
                 return
@@ -221,14 +222,14 @@ private extension YHHomePageViewController {
     }
     
     func addDefaultData() {
-        homeHeaderView.homeBannerView.dataArr = getCacheDataForBanner()
-//        if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_integral_open {
-//            homeHeaderView.homeBannerView.dataArr = getCacheDataForBanner()
-//        } else {
-//            homeHeaderView.homeBannerView.dataArr = getCacheDataForBanner().filter {
-//                ($0.skip_type != 100) && ($0.skip_type != 101) && ($0.skip_type != 102)
-//            }
-//        }
+        // 关闭就不让显示直播浮窗
+        if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_integral_open {
+            homeHeaderView.homeBannerView.dataArr = getCacheDataForBanner()
+        } else {
+            homeHeaderView.homeBannerView.dataArr = getCacheDataForBanner().filter {
+                ($0.skip_type != 100) && ($0.skip_type != 101) && ($0.skip_type != 102)
+            }
+        }
         
         getCacheDataForHomeNewsData()
     }
@@ -287,14 +288,13 @@ private extension YHHomePageViewController {
             self.viewModel.getHomeBanner(0) {[weak self] success, error in
                 guard let self = self else { return }
                 DispatchQueue.main.async {
-                    self.homeHeaderView.homeBannerView.dataArr = self.viewModel.banners ?? self.getCacheDataForBanner()
-//                    if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_integral_open {
-//                        self.homeHeaderView.homeBannerView.dataArr = self.viewModel.banners ?? self.getCacheDataForBanner()
-//                    } else {
-//                        self.homeHeaderView.homeBannerView.dataArr = (self.viewModel.banners ?? self.getCacheDataForBanner()).filter {
-//                            ($0.skip_type != 100) && ($0.skip_type != 101) && ($0.skip_type != 102)
-//                        }
-//                    }
+                    if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_integral_open {
+                        self.homeHeaderView.homeBannerView.dataArr = self.viewModel.banners ?? self.getCacheDataForBanner()
+                    } else {
+                        self.homeHeaderView.homeBannerView.dataArr = (self.viewModel.banners ?? self.getCacheDataForBanner()).filter {
+                            ($0.skip_type != 100) && ($0.skip_type != 101) && ($0.skip_type != 102)
+                        }
+                    }
                     
                     if let arrB = self.viewModel.banners,arrB.count > 0 {
                         let arrString = arrB.toJSONString()

galaxy/galaxy/Classes/Modules/Home(首页)/YHSelect/C/YHSelectViewController.swift

@@ -237,6 +237,8 @@ extension YHSelectViewController: UITableViewDelegate, UITableViewDataSource {
         let vc = YHH5WebViewVC()
         vc.url = tUrl
         vc.isHideNavigationBar = false
+        // 进详情页关闭小窗
+        YHPlayerManager.shared.exitFloating()
         UIViewController.current?.navigationController?.pushViewController(vc)
     }
 }