no message

FuSiLive.xcodeproj/project.pbxproj

@@ -102,7 +102,7 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
-		00E501FF2E0543A800579DB0 /* Exceptions for "NotificationService" folder in "NotificationService" target */ = {
+		00E501FF2E0543A800579DB0 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
 				"NotificationService-Info.plist",
@@ -112,18 +112,7 @@
 /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
 
 /* Begin PBXFileSystemSynchronizedRootGroup section */
-		00E501F42E0543A800579DB0 /* NotificationService */ = {
-			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-				00E501FF2E0543A800579DB0 /* Exceptions for "NotificationService" folder in "NotificationService" target */,
-			);
-			explicitFileTypes = {
-			};
-			explicitFolders = (
-			);
-			path = NotificationService;
-			sourceTree = "<group>";
-		};
+		00E501F42E0543A800579DB0 /* NotificationService */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (00E501FF2E0543A800579DB0 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = NotificationService; sourceTree = "<group>"; };
 /* End PBXFileSystemSynchronizedRootGroup section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -426,10 +415,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks.sh\"\n";
@@ -443,10 +436,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources.sh\"\n";
@@ -676,7 +673,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 202506260027;
+				CURRENT_PROJECT_VERSION = 202506260028;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 6GG26BHUMC;
 				ENABLE_ON_DEMAND_RESOURCES = NO;
@@ -941,7 +938,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 202506260027;
+				CURRENT_PROJECT_VERSION = 202506260028;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 6GG26BHUMC;
 				ENABLE_ON_DEMAND_RESOURCES = NO;

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/daily_check_inrotation_lightimg.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "daily_check_inrotation_lightimg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "daily_check_inrotation_lightimg@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_control_menu_down_arrow.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "live_pk_control_menu_down_arrow@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "live_pk_control_menu_down_arrow@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_remote_anchor_cancel_mute.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "live_pk_remote_anchor_cancel_mute@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "live_pk_remote_anchor_cancel_mute@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_remote_anchor_mute.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "live_pk_remote_anchor_mute@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "live_pk_remote_anchor_mute@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_resault_top_icon_draw.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "live_pk_resault_top_icon_draw@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "live_pk_resault_top_icon_draw@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_resault_top_icon_lose.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "live_pk_resault_top_icon_lose@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "live_pk_resault_top_icon_lose@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_resault_top_icon_win.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "live_pk_resault_top_icon_win@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "live_pk_resault_top_icon_win@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/pk_user_contribute_burst_dew_light_dot.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "pk_user_contribute_burst_dew_light_dot@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

@@ -112,6 +112,10 @@ extension FFPKSideColor {
         anchorModel.level = FUSSwiftLiveHelper.shared.roomInfoModel?.level?.intValue ?? 0
         anchorModel.age = FUSSwiftLiveHelper.shared.roomInfoModel?.age?.intValue ?? 0
         anchorModel.sex = FUSSwiftLiveHelper.shared.roomInfoModel?.sex?.intValue ?? 0
+        
+        if FUSSwiftLiveHelper.shared.roomInfoModel?.privilege.fus_intValue(key: "richPower") == 1 {
+            anchorModel.vip = 1
+        }
         return anchorModel
     }
     

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKContentView/Anims/FFPKStartAnimation.swift

@@ -9,17 +9,21 @@ import UIKit
 
 class FFPKStartAnimation: FUSBaseView {
     
+    let nameSpaceMaxWidth: CGFloat = 94
+    let nameVipSpacing: CGFloat = 4
     
     let leftView = UIView(frame: .zero)
     let leftBgImageView = UIImageView()
     let leftNameLabel = UILabel()
-    let leftfaceImageView = UIImageView(frame: .init(x: 0, y: 0, width: 40, height: 40))
+    let leftVipImageView = UIImageView()
+    let leftfaceImageView = UIImageView(frame: .init(x: 0, y: 0, width: 48, height: 48))
     
     
     let rightView = UIView(frame: .zero)
     let rightBgImageView = UIImageView()
     let rightNameLabel = UILabel()
-    let rightfaceImageView = UIImageView(frame: .init(x: 0, y: 0, width: 40, height: 40))
+    let rightVipImageView = UIImageView()
+    let rightfaceImageView = UIImageView(frame: .init(x: 0, y: 0, width: 48, height: 48))
     
     let animImageView = UIImageView(frame: .init(x: 0, y: 0, width: 217, height: 300))
     var finishBlock:(()->Void)?
@@ -89,7 +93,7 @@ class FFPKStartAnimation: FUSBaseView {
     
     func ff_setupLeftView() {
         
-        self.leftView.frame = .init(x: -134, y: 100, width: 134, height: 89)
+        self.leftView.frame = .init(x: -170, y: 142, width: 170, height: 90)
         self.addSubview(self.leftView)
         /// bg imageView
         self.leftBgImageView.frame = self.leftView.bounds
@@ -102,33 +106,51 @@ class FFPKStartAnimation: FUSBaseView {
         }
         
         /// set nickname
-        self.leftNameLabel.font = .fus_themeFont(13)
+        self.leftNameLabel.font = .fus_themeBoldFont(13)
         self.leftNameLabel.textColor = .white
         self.leftNameLabel.text = FUSSwiftLiveHelper.shared.pkHelper.viewModel.value.localAnchorModel.value.nickname
+        self.leftNameLabel.fus_addShadow()
         self.leftView.addSubview(self.leftNameLabel)
         self.leftNameLabel.sizeToFit()
-        if self.leftNameLabel.width > 48 {
-            self.leftNameLabel.width = 48
+        
+        var vipLevel = 0
+        if FUSSwiftLiveHelper.shared.pkHelper.viewModel.value.localAnchorModel.value.vip == 1 {
+            vipLevel = FUSSwiftLiveHelper.shared.pkHelper.viewModel.value.localAnchorModel.value.level
         }
+        self.leftVipImageView.image = .fus_image(withLevel: vipLevel)
+        self.leftView.addSubview(self.leftVipImageView)
+        self.leftVipImageView.sizeToFit()
         
-        self.leftNameLabel.x = 5.5
-        self.leftNameLabel.centerY = self.leftView.height / 2.0
+        if self.leftNameLabel.width + self.nameVipSpacing + self.leftVipImageView.width > self.nameSpaceMaxWidth {
+            self.leftNameLabel.width = self.nameSpaceMaxWidth - self.leftVipImageView.width - self.nameVipSpacing
+        }
+        
+//        self.leftNameLabel.x = 5.5
+//        self.leftNameLabel.centerY = self.leftView.height / 2.0
+//        self.leftVipImageView.x = self.leftNameLabel.right
+//        self.leftVipImageView.centerY = self.leftNameLabel.centerY
         
         /// set face image
         self.leftfaceImageView.setWebImageWithSubURLString(FUSSwiftLiveHelper.shared.pkHelper.viewModel.value.localAnchorModel.value.face)
-        self.leftfaceImageView.layer.cornerRadius = 20
+        self.leftfaceImageView.layer.cornerRadius = self.leftfaceImageView.height / 2.0
         self.leftfaceImageView.layer.masksToBounds = true
         self.leftfaceImageView.layer.borderColor = UIColor.white.cgColor
         self.leftfaceImageView.layer.borderWidth = 1
         self.leftView.addSubview(self.leftfaceImageView)
         
-        self.leftfaceImageView.centerY = self.leftNameLabel.centerY
-        self.leftfaceImageView.x = self.leftNameLabel.right + 4
+        self.leftfaceImageView.centerY = self.leftView.height / 2.0
+        self.leftfaceImageView.right = self.leftView.width - 18
+        
+        self.leftVipImageView.right = self.leftfaceImageView.left - 6
+        self.leftVipImageView.centerY = self.leftView.height / 2.0
+        self.leftNameLabel.right = self.leftVipImageView.left - self.nameVipSpacing
+        self.leftNameLabel.centerY = self.leftView.height / 2.0
+        
     }
     
     func ff_setupRightView() {
         
-        self.rightView.frame = .init(x: UIView.fus_screenW(), y: 142, width: 126, height: 89)
+        self.rightView.frame = .init(x: UIView.fus_screenW(), y: 142, width: 170, height: 90)
         self.addSubview(self.rightView)
         /// bg imageView
         self.rightBgImageView.frame = self.rightView.bounds
@@ -144,27 +166,39 @@ class FFPKStartAnimation: FUSBaseView {
         
         /// set face image
         self.rightfaceImageView.setWebImageWithSubURLString(FUSSwiftLiveHelper.shared.pkHelper.viewModel.value.remoteAnchorModel.value.face)
-        self.rightfaceImageView.layer.cornerRadius = 20
+        self.rightfaceImageView.layer.cornerRadius = self.rightfaceImageView.height / 2.0
         self.rightfaceImageView.layer.masksToBounds = true
         self.rightfaceImageView.layer.borderColor = UIColor.white.cgColor
         self.rightfaceImageView.layer.borderWidth = 1
         self.rightView.addSubview(self.rightfaceImageView)
         
         self.rightfaceImageView.centerY = self.rightView.height / 2.0
-        self.rightfaceImageView.x = 35
+        self.rightfaceImageView.x = 18
         
         /// set nickname
-        self.rightNameLabel.font = .fus_themeFont(13)
+        self.rightNameLabel.font = .fus_themeBoldFont(13)
         self.rightNameLabel.textColor = .white
         self.rightNameLabel.text = FUSSwiftLiveHelper.shared.pkHelper.viewModel.value.remoteAnchorModel.value.nickname
+        self.rightNameLabel.fus_addShadow()
         self.rightView.addSubview(self.rightNameLabel)
         self.rightNameLabel.sizeToFit()
-        if self.rightNameLabel.width > 48 {
-            self.rightNameLabel.width = 48
+        
+        var vipLevel = 0
+        if FUSSwiftLiveHelper.shared.pkHelper.viewModel.value.remoteAnchorModel.value.vip == 1 {
+            vipLevel = FUSSwiftLiveHelper.shared.pkHelper.viewModel.value.remoteAnchorModel.value.level
+        }
+        self.rightVipImageView.image = .fus_image(withLevel: vipLevel)
+        self.rightView.addSubview(self.rightVipImageView)
+        self.rightVipImageView.sizeToFit()
+        
+        if self.rightNameLabel.width + self.nameVipSpacing + self.rightVipImageView.width > self.nameSpaceMaxWidth {
+            self.rightNameLabel.width = self.nameSpaceMaxWidth - self.rightVipImageView.width - self.nameVipSpacing
         }
         
-        self.rightNameLabel.left = self.rightfaceImageView.right + 4
+        self.rightNameLabel.left = self.rightfaceImageView.right + 6
         self.rightNameLabel.centerY = self.rightfaceImageView.centerY
+        self.rightVipImageView.x = self.rightNameLabel.right + self.nameVipSpacing
+        self.rightVipImageView.centerY = self.rightNameLabel.centerY
     }
 
     override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {

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

@@ -89,7 +89,7 @@ class FFPKAnchorStateView: FUSBaseView {
             }
         case .pause:
             self.imageView.stopAnimating()
-            self.imageView.image = FUSShowRoomCenterBunble.versionImageNamed("PK_Anchor_Pause")
+            self.imageView.image = FUSShowRoomCenterBunble.imageNamed("PK_Anchor_Pause")
             self.tipLabel.text = .fus_versionLocalString("主播暂停,马上回来")
         }
     }

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

@@ -56,8 +56,8 @@ class FFPKAnchorView: FUSBaseView {
         self.muteUserBtn.layer.cornerRadius = 10
         self.muteUserBtn.layer.masksToBounds = true
         self.muteUserBtn.backgroundColor = .init(white: 0, alpha: 0.28)
-        self.muteUserBtn.setImage(FUSShowRoomCenterBunble.versionImageNamed("live_pk_remote_anchor_mute"), for: .normal)
-        self.muteUserBtn.setImage(FUSShowRoomCenterBunble.versionImageNamed("live_pk_remote_anchor_cancel_mute"), for: .selected)
+        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.infoView.addSubview(self.muteUserBtn)
         

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

@@ -68,7 +68,7 @@ class FFPKBurstDewAnimateView: FUSBaseView {
             for i in 0..<maxFrame{
                 // 让动画完成后保持在最后一帧的办法
                 let imgIndex = i > 34 ? 34 : i
-                if let image = FUSShowRoomCenterBunble.versionImageNamed("pk_user_contribute_burst_dew_type_one_\(imgIndex)"){
+                if let image = FUSShowRoomCenterBunble.imageNamed("pk_user_contribute_burst_dew_type_one_\(imgIndex)"){
                     imagesList.append(image)
                 }
             }
@@ -83,7 +83,7 @@ class FFPKBurstDewAnimateView: FUSBaseView {
             let imgName = self.state == .win ? "pk_user_contribute_burst_dew_type_two_left_" : "pk_user_contribute_burst_dew_type_two_right_"
             for i in 0..<maxFrame{
                 let imgIndex = i > 69 ? 69 : i
-                if let image = FUSShowRoomCenterBunble.versionImageNamed("\(imgName)\(imgIndex)"){
+                if let image = FUSShowRoomCenterBunble.imageNamed("\(imgName)\(imgIndex)"){
                     imagesList.append(image)
                 }
             }

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

@@ -138,7 +138,7 @@ class FFPKMultiRoundResultPanelView: FUSBaseView {
         for index in 0..<allTotal{
             let roundResultView = YYAnimatedImageView(frame: CGRectMake(0, 0, 28, 28))
             roundResultView.contentMode = .scaleAspectFit
-            roundResultView.image = FUSShowRoomCenterBunble.versionImageNamed("pk_multi_round_result_state_pending_animation")
+            roundResultView.image = FUSShowRoomCenterBunble.imageNamed("pk_multi_round_result_state_pending_animation")
             self.roundResultBgView.addSubview(roundResultView)
             roundResultView.snp.makeConstraints { make in
                 make.size.equalTo(CGSizeMake(28, 28))
@@ -166,7 +166,7 @@ class FFPKMultiRoundResultPanelView: FUSBaseView {
         for (index, tempView) in self.roundResultViewList.enumerated() {
             
             if model.roundResult.count <= index {
-                tempView.image = FUSShowRoomCenterBunble.versionImageNamed("pk_multi_round_result_state_pending_animation")
+                tempView.image = FUSShowRoomCenterBunble.imageNamed("pk_multi_round_result_state_pending_animation")
             }
             else {
                 
@@ -174,7 +174,7 @@ class FFPKMultiRoundResultPanelView: FUSBaseView {
                 
                 if resultModel.win == "-1" {
                     // 平局
-                    tempView.image = FUSShowRoomCenterBunble.versionWebpImageName("pk_multi_round_result_state_draw_animation")
+                    tempView.image = FUSShowRoomCenterBunble.webpImageName("pk_multi_round_result_state_draw_animation")
                 }
                 else {
                     var winAnchor: FFPKAnchorModel = FUSSwiftLiveHelper.shared.pkHelper.viewModel.value.remoteAnchorModel.value
@@ -183,19 +183,12 @@ class FFPKMultiRoundResultPanelView: FUSBaseView {
                     }
                     // 赢的那方是什么颜色就显示什么颜色
                     if winAnchor.sideColor == .red {
-                        tempView.image = FUSShowRoomCenterBunble.versionWebpImageName("pk_multi_round_result_state_red_win_animation")
+                        tempView.image = FUSShowRoomCenterBunble.webpImageName("pk_multi_round_result_state_red_win_animation")
                     }
                     else {
-                        tempView.image = FUSShowRoomCenterBunble.versionWebpImageName("pk_multi_round_result_state_blue_lose_animation")
+                        tempView.image = FUSShowRoomCenterBunble.webpImageName("pk_multi_round_result_state_blue_lose_animation")
                     }
                 }
-//                else if resultModel.win == FUSSwiftLiveHelper.shared.pkHelper.viewModel.value.localAnchorModel.value.uid {
-//                    // 自己这方赢了
-//                    tempView.image = FUSShowRoomCenterBunble.versionWebpImageName("pk_multi_round_result_state_red_win_animation")
-//                }
-//                else {
-//                    tempView.image = FUSShowRoomCenterBunble.versionWebpImageName("pk_multi_round_result_state_blue_lose_animation")
-//                }
             }
             
         }

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

@@ -343,12 +343,12 @@ extension FFPKPunishTypesView {
             }
             let positionBtn = self.typesBtnList[index]
             positionBtn.isHidden = false
-            positionBtn.setImage(self.ff_getPunishTypeIcon(type: model.type, isLight: isPunishLight), for: .normal)
+            positionBtn.setImage(FFPKPunishTypesView.ff_getPunishTypeIcon(type: model.type, isLight: isPunishLight), for: .normal)
             
             // 激活中的就高亮
             if let activatePunish = activatePunish,
                activatePunish.pid == model.pid {
-                positionBtn.setImage(self.ff_getPunishTypeIcon(type: model.type, isLight: true), for: .normal)
+                positionBtn.setImage(FFPKPunishTypesView.ff_getPunishTypeIcon(type: model.type, isLight: true), for: .normal)
             }
         }
         
@@ -374,8 +374,8 @@ extension FFPKPunishTypesView {
     ///   - type: （1:脸部特效、2:动作惩罚、3：声音惩罚、4：画面惩罚）
     ///   - isLight: 是否是亮图标
     /// - Returns: 图片
-    func ff_getPunishTypeIcon(type: Int, isLight: Bool) -> UIImage? {
-        var prefixName = ""
+    public static func ff_getPunishTypeIcon(type: Int, isLight: Bool) -> UIImage? {
+        var prefixName = "live_pk_punish_viewIcon_face"
         switch type{
         case 1:
             prefixName = "live_pk_punish_viewIcon_face"

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

@@ -53,12 +53,12 @@ class FFPKScoreProgressView: FUSBaseView {
         
         self.addSubview(self.lightImageView)
         
-        var animImages:[UIImage] = .init()
-        for i in 0..<20 {
-            if let img = FUSShowRoomCenterBunble.versionImageNamed("live_pk_progress_light_anim_\(i)") {
-                animImages.append(img)
-            }
-        }
+//        var animImages:[UIImage] = .init()
+//        for i in 0..<20 {
+//            if let img = FUSShowRoomCenterBunble.versionImageNamed("live_pk_progress_light_anim_\(i)") {
+//                animImages.append(img)
+//            }
+//        }
         self.addSubview(self.progressLightImageView)
 //        self.progressLightImageView.image = animImages.first
 //        self.progressLightImageView.animationImages = animImages

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

@@ -34,7 +34,7 @@ class FFPKUserContributeCell: FUSSwiftCollectionViewCell {
         var animImages:[UIImage] = .init()
         let imgStr = "pk_user_contribute_light_circle_animation_"
         for i in 1..<41{
-            if let img = FUSShowRoomCenterBunble.versionImageNamed("\(imgStr)\(i)"){
+            if let img = FUSShowRoomCenterBunble.imageNamed("\(imgStr)\(i)"){
                 animImages.append(img)
             }
         }

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

@@ -332,87 +332,6 @@ class FFPKUserContributeListView: FUSBaseView {
     
     // MARK: -- burst dew animate part
     
-    // 为了优化暴奖做的
-//    private var dewImageViewPool: [UIImageView] = .init()
-//    private var lightImageViewPool: [UIImageView] = .init()
-//    private var numberLabelPool: [UILabel] = .init()
-//    
-//    private func ff_reloadPoolViewIfIneed(){
-//        
-//        let maxPoolCount: Int = 40
-//        
-//        if dewImageViewPool.count < maxPoolCount {
-//            dewImageViewPool = (0..<maxPoolCount).map { _ in
-//                let imageView = UIImageView(image: .ff_dewIcon)
-//                imageView.contentMode = .scaleAspectFit
-//                return imageView
-//            }
-//            FUSLog.info("ludy  ff_reloadPoolViewIfIneed  创建dewImageViewPool：\(dewImageViewPool.count)")
-//        }
-//        
-//        delay(0.5) { [weak self] in
-//            guard let self = self else { return }
-//            if FUSSwiftLiveHelper.shared.pkHelper.viewModel.value.pkState.value != .inPKTime {
-//                // 过回合了，不要创建了，怕阻塞
-//                return
-//            }
-//            if self.lightImageViewPool.count < 30 {
-//                self.lightImageViewPool = (0..<30).map { _ in
-//                    let lightDotImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("pk_user_contribute_burst_dew_light_dot"))
-//                    lightDotImageView.contentMode = .scaleAspectFit
-//                    return lightDotImageView
-//                }
-//                FUSLog.info("ludy  ff_reloadPoolViewIfIneed  创建lightImageViewPool：\(lightImageViewPool.count)")
-//            }
-//        }
-//        
-//        delay(1) { [weak self] in
-//            guard let self = self else { return }
-//            if FUSSwiftLiveHelper.shared.pkHelper.viewModel.value.pkState.value != .inPKTime {
-//                // 过回合了，不要创建了，怕阻塞
-//                return
-//            }
-//            if self.numberLabelPool.count < 30 {
-//                self.numberLabelPool = (0..<30).map{ _ in
-//                    let numberLabel = UILabel(frame: CGRectMake(0, 0, 30, 14))
-//                    numberLabel.textAlignment = .center
-//                    return numberLabel
-//                }
-//                FUSLog.info("ludy  ff_reloadPoolViewIfIneed  创建numberLabelPool：\(numberLabelPool.count)")
-//            }
-//        }
-//    }
-//    
-//    private func ff_getDewImagViewInPool() -> UIImageView {
-//        if let dewImageView = self.dewImageViewPool.popLast(){
-//            return dewImageView
-//        }else {
-//            let imageView = UIImageView(image: .ff_dewIcon)
-//            imageView.contentMode = .scaleAspectFit
-//            return imageView
-//        }
-//    }
-//    
-//    private func ff_getLightImageViewInPool() -> UIImageView {
-//        if let lightImageView = self.lightImageViewPool.popLast(){
-//            return lightImageView
-//        }else {
-//            let lightDotImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("pk_user_contribute_burst_dew_light_dot"))
-//            lightDotImageView.contentMode = .scaleAspectFit
-//            return lightDotImageView
-//        }
-//    }
-//    
-//    private func ff_getNumberLabelInPool() -> UILabel {
-//        if let numberLabel = self.numberLabelPool.popLast(){
-//            return numberLabel
-//        }else {
-//            let numberLabel = UILabel(frame: CGRectMake(0, 0, 30, 14))
-//            numberLabel.textAlignment = .center
-//            return numberLabel
-//        }
-//    }
-    
     private func startAnimation(beginPoint: CGPoint, endPoint: CGPoint, effectType: Int, cell: FFPKUserContributeCell, showAddNum: Bool) {
         
         FUSLog.info("------dew burst uid:\(cell.user?.uid ?? 0)")
@@ -493,7 +412,7 @@ class FFPKUserContributeListView: FUSBaseView {
         if showAddNum == true {
             
             // 光点
-            let lightDotImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("pk_user_contribute_burst_dew_light_dot"))
+            let lightDotImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("pk_user_contribute_burst_dew_light_dot"))
             lightDotImageView.contentMode = .scaleAspectFit
 //            let lightDotImageView = ff_getLightImageViewInPool()
             lightDotImageView.center = beginPoint

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/Cell/FFPKControlContributionUserBlankCell.swift

@@ -26,7 +26,6 @@ class FFPKControlContributionUserBlankCell: UITableViewCell{
         fatalError("init(coder:) has not been implemented")
     }
     
-//    let bgImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_contribution_blank_all"))
     let bgImageView = UIImageView()
     let faceView = UIImageView(frame: CGRectMake(0, 0, 40, 40))
 //    let richImageView = UIImageView(frame: .init(x: 0, y: 0, width: 37, height: 14))
@@ -275,7 +274,7 @@ class FFPKControlContributionHotDataListHeader: FUSBaseView {
             make.append("  ")
             make.append(title + " ").textColor(.fus_textColorRich())
             make.append { make in
-                make.image = FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_menu_down_arrow")
+                make.image = FUSShowRoomCenterBunble.imageNamed("live_pk_control_menu_down_arrow")
                 make.alignment = .center
             }
             make.append("  ")
@@ -285,7 +284,7 @@ class FFPKControlContributionHotDataListHeader: FUSBaseView {
             make.append("  ")
             make.append(title + " ").textColor(.fus_textColorRich())
             make.append { make in
-                make.image = FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_menu_down_arrow")?.byRotate180()
+                make.image = FUSShowRoomCenterBunble.imageNamed("live_pk_control_menu_down_arrow")?.byRotate180()
                 make.alignment = .center
             }
             make.append("  ")

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKControlContributionView.swift

@@ -501,9 +501,8 @@ class FFPKControlContributionPkStatusView: FUSBaseView {
     let pkStatus: BehaviorRelay<FFPKControlContributionPkStatusType> = .init(value: .matching)
     
     let bgView = UIButton(type: .custom)
-//    let pkIconImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_contribution_pkStatus_pk_icon"))
     let pkIconImageView = YYAnimatedImageView(image: FUSShowRoomCenterBunble.webpImageName("live_pk_control_contribute_bottom_inpk_animate"))
-    let pkHeadImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_contribution_pkStatus_pk_avatar"))
+    let pkHeadImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_pk_control_contribution_pkStatus_pk_avatar"))
     var raderView = FFUserGuideRippleView()
     let descLabel = UILabel()
     

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKControlSubBaseView.swift

@@ -36,12 +36,6 @@ public class FFPKControlSubBaseView: FUSBaseView {
         contentView.backgroundColor = .white
         self.addSubview(contentView)
         
-        let bgImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_alert_bg"))
-        contentView.addSubview(bgImageView)
-        bgImageView.snp.makeConstraints { make in
-            make.edges.equalToSuperview()
-        }
-        
         contentView.bringSubviewToFront(contentView.lineView)
         
         contentView.addSubview(naviView)

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKMessageAlertView.swift

@@ -91,19 +91,6 @@ extension FFPKMessageAlertView{
             make.top.equalTo(20)
         }
         
-        let leftDotImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_MessageAlert_ligth_dot_left"))
-        contentView.addSubview(leftDotImageView)
-        leftDotImageView.snp.makeConstraints { make in
-            make.right.equalTo(titleLabel.snp.left)
-            make.centerY.equalTo(titleLabel.snp.centerY).offset(-3)
-        }
-        
-        let rightDotImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_MessageAlert_ligth_dot_right"))
-        contentView.addSubview(rightDotImageView)
-        rightDotImageView.snp.makeConstraints { make in
-            make.left.equalTo(titleLabel.snp.right)
-            make.centerY.equalTo(titleLabel.snp.centerY).offset(-4)
-        }
         
         countDownLabel.isHidden = true
         countDownLabel.font = .fus_themeMediumFont(15)

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKPunishDetailAlertView.swift

@@ -14,7 +14,7 @@ class FFPKPunishDetailAlertView: FFPKControlSubBaseView {
     let backBtn = UIButton(type: .custom)
     let punishIconImageView = YYAnimatedImageView()
     let punishNameLabel = UILabel()
-    let punishTypeIconImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_punish_detail_pkType_face"))
+    let punishTypeIconImageView = UIImageView(image: FFPKPunishTypesView.ff_getPunishTypeIcon(type: 1, isLight: true))
     let punishTypeLabel = UILabel()
     let descLabel = UILabel()
     
@@ -151,6 +151,7 @@ class FFPKPunishDetailAlertView: FFPKControlSubBaseView {
                     bgURLStr = bgURLStr.fus_bigCdn
                 }
                 
+                self.punishTypeIconImageView.image = FFPKPunishTypesView.ff_getPunishTypeIcon(type: punishData.type, isLight: true)
                 self.punishIconImageView.setImageWith(.init(string: bgURLStr))
                 self.punishNameLabel.text = punishData.name.removingPercentEncoding
                 self.punishTypeLabel.text = .fus_versionLocalString("惩罚类型：") + punishData.typeName

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKPunishSelectAlertView.swift

@@ -98,7 +98,7 @@ class FFPKPunishSelectAlertView: FFPKControlSubBaseView {
             for index in 0..<self.vsPunishMaxLimit {
                 
                 let itemBtn = FFPKPunishSelectItemButton(type: .custom)
-                itemBtn.setImage(FUSShowRoomCenterBunble.versionImageNamed("live_pk_punish_select_btn_none"), for: .normal)
+                itemBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_pk_punish_select_btn_none"), for: .normal)
                 itemBtn.tag = index
                 selectItemBtnsBgView.addSubview(itemBtn)
                 itemBtn.snp.makeConstraints { make in

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKResaultRewardAlertView.swift

@@ -63,6 +63,9 @@ class FFPKResaultRewardAlertView: FUSBaseView {
             make.edges.equalToSuperview()
         }
         
+        contentView.layer.cornerRadius = 8
+        contentView.layer.masksToBounds = true
+        contentView.backgroundColor = .white
         contentView.isUserInteractionEnabled = true
         self.addSubview(contentView)
         contentView.snp.makeConstraints { make in
@@ -70,7 +73,6 @@ class FFPKResaultRewardAlertView: FUSBaseView {
             make.width.equalTo(300)
         }
         
-        contentView.backgroundColor = .white
         contentView.addSubview(iconImageView)
         iconImageView.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
@@ -289,14 +291,14 @@ class FFPKResaultRewardAlertViewCell: FUSSwiftCollectionViewCell{
         self.contentView.backgroundColor = .clear
         self.backgroundColor = .clear
         
-        bgView.backgroundColor = .white.withAlphaComponent(0.08)
+        bgView.backgroundColor = .init(hex: "#F0F0F0")
         bgView.layer.cornerRadius = 8
         self.contentView.addSubview(bgView)
         bgView.snp.makeConstraints { make in
             make.edges.equalToSuperview()
         }
         
-        lightImageView.image = FUSShowRoomCenterBunble.versionImageNamed("daily_check_inrotation_lightimg")
+        lightImageView.image = FUSShowRoomCenterBunble.imageNamed("daily_check_inrotation_lightimg")
         bgView.addSubview(lightImageView)
         lightImageView.snp.makeConstraints { make in
             make.left.right.equalToSuperview().inset(4)
@@ -357,11 +359,11 @@ extension FFPKResultState {
     func ff_getRewardIcon() -> UIImage?{
         switch self {
         case .win:
-            return FUSShowRoomCenterBunble.versionImageNamed("live_pk_resault_top_icon_win")
+            return FUSShowRoomCenterBunble.imageNamed("live_pk_resault_top_icon_win")
         case .lose:
-            return FUSShowRoomCenterBunble.versionImageNamed("live_pk_resault_top_icon_lose")
+            return FUSShowRoomCenterBunble.imageNamed("live_pk_resault_top_icon_lose")
         case .draw:
-            return FUSShowRoomCenterBunble.versionImageNamed("live_pk_resault_top_icon_draw")
+            return FUSShowRoomCenterBunble.imageNamed("live_pk_resault_top_icon_draw")
         default:
             return nil
         }

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPushRTMStreamChangeDataAlertView.swift

@@ -43,12 +43,6 @@ import UIKit
         contentView.backgroundColor = .white
         self.addSubview(contentView)
         
-        let bgImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_alert_bg"))
-        contentView.addSubview(bgImageView)
-        bgImageView.snp.makeConstraints { make in
-            make.edges.equalToSuperview()
-        }
-        
         contentView.bringSubviewToFront(contentView.lineView)
         
         contentView.addSubview(naviView)

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/View/FFPKScoreProgressLargeSmallView.swift

@@ -88,12 +88,12 @@ class FFPKScoreProgressLargeSmallView: FUSBaseView {
         self.rightScoreImageView.contentMode = .scaleAspectFit
         self.addSubview(self.rightScoreImageView)
         
-        var animImages:[UIImage] = .init()
-        for i in 0..<20 {
-            if let img = FUSShowRoomCenterBunble.imageNamed("live_pk_progress_light_anim_\(i)") {
-                animImages.append(img)
-            }
-        }
+//        var animImages:[UIImage] = .init()
+//        for i in 0..<20 {
+//            if let img = FUSShowRoomCenterBunble.imageNamed("live_pk_progress_light_anim_\(i)") {
+//                animImages.append(img)
+//            }
+//        }
         self.addSubview(self.progressLightImageView)
 //        self.progressLightImageView.image = animImages.first
 //        self.progressLightImageView.animationImages = animImages
@@ -297,14 +297,6 @@ class FFPKScoreProgressLargeSmallView: FUSBaseView {
                 }
                 else if gameplay == 104 {
                     // 礼物pk，进度条有分左右的
-//                    let isLeftSideRedColor = FUSSwiftLiveHelper.shared.pkHelper.viewModel.value.localAnchorModel.value.sideColor == .red
-//                    if leftside == true {
-//                        // 点击左边的，那么就是左边大，那么就是得大是左边颜色
-//                        self.lightImageView.image = isLeftSideRedColor ? FUSShowRoomCenterBunble.versionImageNamed("live_pk_progress_light_largeSmall_img_gift_red") : FUSShowRoomCenterBunble.versionImageNamed("live_pk_progress_light_largeSmall_img_gift_blue")
-//                    }else {
-//                        // 点击的是右边，那么就是右边大，那么大的就得是右边的颜色
-//                        self.lightImageView.image = isLeftSideRedColor ? FUSShowRoomCenterBunble.versionImageNamed("live_pk_progress_light_largeSmall_img_gift_blue") : FUSShowRoomCenterBunble.versionImageNamed("live_pk_progress_light_largeSmall_img_gift_red")
-//                    }
                     self.lightImageView.image = FUSShowRoomCenterBunble.imageNamed("live_pk_progress_light_largeSmall_img_gift")
                 }
             })