Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive…

Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m

@@ -414,7 +414,7 @@ BDAlphaPlayerMetalViewDelegate
     }
     
     
-    [self initContentView];
+    [self initContentView]; //头顶view
     
     [self initCloseButton];
     
@@ -507,7 +507,7 @@ BDAlphaPlayerMetalViewDelegate
     [self initEmitterView];
     
     // 搭建顶部信息显示 View
-    [self initHeadView];
+    [self initHeadView]; //头顶view
     
     // 搭建顶部露水增加 View
     [self initDewIncreaseView];

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/HeadView/FUSLiveHeadView.h

@@ -14,7 +14,7 @@
 @class FUSLiveHeaderUserListViewModel;
 
 
-#define HEAD_VIEW_HEIGHT 135
+#define HEAD_VIEW_HEIGHT 103//135
 
 // 热力值变化通知
 extern NSString * const kDidHotScoreChangeNotification;

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSModel/FUSPKViewModel.swift

@@ -318,7 +318,15 @@ import SwiftyJSON
                         case .inPunishTime:
                             FUSSwiftLiveHelper.shared.pkHelper.getPKNextStep(retryTime: 3)
                         case .inEndTime:
-                            FUSSwiftLiveHelper.shared.pkHelper.fus_finishPK(type: .ok, normalHangUp: true, isRemoteFirstStop: false)
+                            // finalResult是最终结果，如果是1的时候才调用ff_finishPK
+                            if self.finalResult.value == 1 {
+                                FUSSwiftLiveHelper.shared.pkHelper.fus_finishPK(type: .ok, normalHangUp: true, isRemoteFirstStop: false)
+                            } else {
+                                // 其他结果调用更新pk信息
+                                if let roomId = FUSSwiftLiveHelper.shared.roomInfoModel?.roomId {
+                                    FUSSwiftLiveHelper.shared.pkHelper.getRoomPKInfo(roomId: roomId, reconnect: 0)
+                                }
+                            }
                         }
                     }
                     

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSOther/FUSPKHelper.swift

@@ -1239,9 +1239,11 @@ public extension FUSPKHelper {
             guard let self = self else { return }
             
             FUSLog.info("---------->上报服务器PK失败")
-            FUSLog.info("suolong::: 断网弹窗")
-            //索隆:显示重试弹窗
-            self.handleNetworkFailure()
+            if code == -1000
+            {
+                print("suolong::: 断网弹窗")
+                self.handleNetworkFailure()
+            }
         }
     }
     
@@ -1333,9 +1335,13 @@ public extension FUSPKHelper {
             }
         } failure: {[weak self] msg, code in
             guard let self = self else { return }
-            FUSLog.info("suolong::: 断网弹窗")
             FUSDialogView.fus_showDialog(msg)
-            self.handleNetworkFailure()
+            //索隆:显示重试弹窗
+            if code == -1000
+            {
+                print("suolong::: 断网弹窗")
+                self.handleNetworkFailure()
+            }
         }
     }
     
@@ -1720,9 +1726,11 @@ public extension FUSPKHelper {
                 }
             } failure: {[weak self] msg , code in
                 self?.isRequestingPKNextStep = false
-                FUSLog.info("suolong::: 断网弹窗")
-                //索隆:显示重试弹窗
-                self?.handleNetworkFailure()
+                if code == -1000
+                {
+                    print("suolong::: 断网弹窗")
+                    self?.handleNetworkFailure()
+                }
                 
                 failure?(msg, Int(code))
                 
@@ -1773,9 +1781,11 @@ public extension FUSPKHelper {
             success?()
         } failure: {[weak self] msg, code in
             FUSLoadingView.fus_dismissProgressView()
-            FUSLog.info("suolong::: 断网弹窗")
-            //索隆:显示重试弹窗
-            self?.handleNetworkFailure()
+            if code == -1000
+            {
+                print("suolong::: 断网弹窗")
+                self?.handleNetworkFailure()
+            }
             failure?(msg, Int(code))
         }
     }
@@ -1799,11 +1809,7 @@ public extension FUSPKHelper {
 //            self.fus_finishPK(type: .localTimeoutConnectFail, normalHangUp: false, isRemoteFirstStop: false)
             let localhansLink = self.viewModel.value.localAnchorModel.value.hasLink.value
             let remotehansLink = self.viewModel.value.remoteAnchorModel.value.hasLink.value
-            
-            print("suolong::: 断网弹窗")
             print("localhanslink + \(localhansLink) remotehansLink + \(remotehansLink)")
-            //索隆:显示重试弹窗
-//            self.handleNetworkFailure()
             if self.viewModel.value.localAnchorModel.value.hasLink.value == false {
                 FUSDialogView.fus_showDialog(.fus_localString("PK连线失败"))
             } else if self.viewModel.value.remoteAnchorModel.value.hasLink.value == false {
@@ -1837,10 +1843,12 @@ public extension FUSPKHelper {
             
             FUSLoadingIndicator.fus_dismiss()
             FUSDialogView.fus_showDialog(msg)
-            FUSLog.info("suolong::: 断网弹窗")
             self?.isRequestingStartPKing = false
-            //索隆:显示重试弹窗
-            self?.handleNetworkFailure()
+            if code == -1000
+            {
+                print("suolong::: 断网弹窗")
+                self?.handleNetworkFailure()
+            }
         }
     }
     
@@ -1869,9 +1877,11 @@ public extension FUSPKHelper {
                 
                 self.viewModel.value.giftBombModel.accept(.createFrom(json["vsGiftBomb"]))
             } failure: {[weak self] msg, code in
-                FUSLog.info("suolong::: 断网弹窗")
-                //索隆:显示重试弹窗
-                self?.handleNetworkFailure()
+                if code == -1000
+                {
+                    print("suolong::: 断网弹窗")
+                    self?.handleNetworkFailure()
+                }
                 
                 failure?(msg, code)
                 FUSDialogView.fus_showDialog(msg)

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKContentView/SubViews/FUSPKAnchorView.swift

@@ -56,8 +56,8 @@ class FUSPKAnchorView: FUSBaseView {
         self.muteUserBtn.layer.cornerRadius = 10
         self.muteUserBtn.layer.masksToBounds = true
         self.muteUserBtn.backgroundColor = .init(white: 0, alpha: 0.28)
-        self.muteUserBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_pk_remote_anchor_mute"), for: .normal)
-        self.muteUserBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_pk_remote_anchor_cancel_mute"), for: .selected)
+        self.muteUserBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_pk_remote_anchor_cancel_mute"), for: .normal)
+        self.muteUserBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_pk_remote_anchor_mute"), for: .selected)
         
         self.infoView.addSubview(self.muteUserBtn)