直播bug修复

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

@@ -80,9 +80,9 @@ 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,13 +221,14 @@ private extension YHHomePageViewController {
     }
     
     func addDefaultData() {
-        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)
-            }
-        }
+        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)
+//            }
+//        }
         
         getCacheDataForHomeNewsData()
     }
@@ -286,14 +287,14 @@ private extension YHHomePageViewController {
             self.viewModel.getHomeBanner(0) {[weak self] success, error in
                 guard let self = self else { return }
                 DispatchQueue.main.async {
-                    
-                    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)
-                        }
-                    }
+                    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 arrB = self.viewModel.banners,arrB.count > 0 {
                         let arrString = arrB.toJSONString()

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift

@@ -24,11 +24,17 @@ class YHHomeBannerView: UIView {
             self.indicatorView.curIndicatorIndex = 0
             // 指定显示图片为第一个
             bannerView.selectItem(at: 0, animated: false)
-            let noNeedAutoScroll = dataArr.contains(where: {
+            if let index = dataArr.firstIndex(where: {
                 $0.skip_type == 100
-            })
-            // 开启定时器开始滚动
-            bannerView.automaticSlidingInterval = noNeedAutoScroll ? 0 : bannerSildingInterval
+            }) {
+                // 开启定时器开始滚动
+                bannerView.automaticSlidingInterval = 0
+                bannerView.scrollToItem(at: index, animated: false)
+                indicatorView.curIndicatorIndex = index
+            } else {
+                // 开启定时器开始滚动
+                bannerView.automaticSlidingInterval = bannerSildingInterval
+            }
             bannerView.removesInfiniteLoopForSingleItem = true
             bannerView.alwaysBounceHorizontal = true
         }
@@ -242,7 +248,7 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
                 YHPlayerManager.shared.leaveChannel(for: player)
                 player.clearPlayerView()
             }
-            let playbackInfo = YHPlayerManager.PlaybackInfo(id: model.live_id, url: model.live_pull_url, title: nil, roomId: nil, token: model.token, channelId: model.rtmp_channel, uid: model.user_id != 0 ? UInt(model.user_id) : nil, isLive: true, scene: .fullscreen)
+            let playbackInfo = YHPlayerManager.PlaybackInfo(id: model.live_id, url: nil, title: nil, roomId: nil, token: model.token, channelId: model.rtmp_channel, uid: model.user_id != 0 ? UInt(model.user_id) : nil, isLive: true, scene: .fullscreen)
             YHPlayerManager.shared.enterLive(from: cell?.bannerImagV, playbackInfo: playbackInfo)
             printLog("跳转直播")
         case 101://录播
@@ -267,7 +273,7 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
                 player.clearPlayerView()
             }
             let cell: YHHomeBannerCollectionViewCell? = pagerView.cellForItem(at: index) as? YHHomeBannerCollectionViewCell
-            let playbackInfo = YHPlayerManager.PlaybackInfo(id: model.live_id, url: model.live_pull_url, title: nil, roomId: nil, token: model.token, channelId: model.rtmp_channel, uid: UInt(model.live_id), isLive: true, scene: .fullscreen)
+            let playbackInfo = YHPlayerManager.PlaybackInfo(id: model.live_id, url: model.live_pull_url, title: nil, roomId: nil, token: model.token, channelId: model.rtmp_channel, uid: UInt(model.user_id), isLive: true, scene: .fullscreen)
             YHPlayerManager.shared.enterLive(from: cell?.bannerImagV, playbackInfo: playbackInfo)
         case 0://0 不需要跳转
             printLog("0 不需要跳转")
@@ -297,7 +303,7 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
         }
         if let cell = cell as? YHHomeBannerCollectionViewCell {
             if model.skip_type == 100 {
-                let playbackInfo = YHPlayerManager.PlaybackInfo(id: model.live_id, token: model.token, channelId: model.rtmp_channel, uid: UInt(model.live_id), isLive: true, scene: .banner, playerType: .secondary)
+                let playbackInfo = YHPlayerManager.PlaybackInfo(id: model.live_id, token: model.token, channelId: model.rtmp_channel, uid: UInt(model.user_id), isLive: true, scene: .banner, playerType: .secondary)
                 YHPlayerManager.shared.enterBanner(playbackInfo: playbackInfo, inView: cell.bannerImagV)
             } else {
                 if let player = YHPlayerManager.shared.getPlayer(.secondary) {

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHMessageInputViewController.swift

@@ -165,13 +165,20 @@ extension YHMessageInputViewController {
     }
 
     @objc private func sendButtonTapped() {
+        // 禁用按钮
+        sendButton.isEnabled = false
         let text = textView.text ?? ""
         let currentText = text.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
         guard currentText.count > 0 else {
             YHHUD.flash(message: nullInputTips)
+            sendButton.isEnabled = true
             return
         }
         inputCallback?(self, currentText)
+        // 延迟启用按钮
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+            self.sendButton.isEnabled = true
+        }
     }
 
     @objc func closeKeyboard(_ sender: UIGestureRecognizer?) {

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/V/YHLiveShopView.swift

@@ -243,6 +243,7 @@ class YHLiveShopViewCell: UITableViewCell {
             let c: ASAttributedString = .init("\(dataSource.price)", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor(hex:0x8993a2)), .strikethrough(.single))
             subPriceLabel.attributed.text = c
             flagLabel.text = "\(dataSource.flag)"
+            subPriceLabel.isHidden = dataSource.linePrice == dataSource.price
         }
     }
     override func awakeFromNib() {