Эх сурвалжийг харах

[!]修复 PK画面比例不对

陈文艺 5 сар өмнө
parent
commit
3b7937b4eb

+ 16 - 22
MiMoLive/MiMoLive.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 70;
+	objectVersion = 56;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -1382,7 +1382,7 @@
 		A6FEDB8E2CCCE4CB0054178F /* MORedRainTipView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A6FEDB8D2CCCE4CB0054178F /* MORedRainTipView.xib */; };
 		C63B868DE1BF719B788A335A /* Pods_MiMoLive_Preview.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 816C81B40A7988A9CB2AD910 /* Pods_MiMoLive_Preview.framework */; };
 		D710FA76955C5B00E6D033AB /* Pods_MiMoLive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FCF0A923FC4BEAF036C81A51 /* Pods_MiMoLive.framework */; };
-		F5612EBB69D610C1330F566F /* (null) in Frameworks */ = {isa = PBXBuildFile; };
+		F5612EBB69D610C1330F566F /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
 		FB012AD02E88CBB3000770B4 /* MOHttpManager+Line+PK.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB012ACF2E88CBB3000770B4 /* MOHttpManager+Line+PK.swift */; };
 		FB012AD12E88CBB3000770B4 /* MOHttpManager+Line+PK.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB012ACF2E88CBB3000770B4 /* MOHttpManager+Line+PK.swift */; };
 		FB012AD32E88CEF8000770B4 /* MOHttpManager+Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB012AD22E88CEF8000770B4 /* MOHttpManager+Common.swift */; };
@@ -2642,7 +2642,7 @@
 		FB06A1032E82B3FB00A3CD51 /* MOModifyAvatarVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = A61944002AE52E8700D2878F /* MOModifyAvatarVC.xib */; };
 		FB06A1072E82B3FB00A3CD51 /* MOGiftListView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A6272BF62B0F6DF0006464EB /* MOGiftListView.xib */; };
 		FB06A1092E82B3FB00A3CD51 /* MOTaskBaseBtnView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A67908EE2C0C6763001B73AE /* MOTaskBaseBtnView.xib */; };
-		FB06A10A2E82B3FB00A3CD51 /* (null) in Resources */ = {isa = PBXBuildFile; };
+		FB06A10A2E82B3FB00A3CD51 /* BuildFile in Resources */ = {isa = PBXBuildFile; };
 		FB06A10C2E82B3FB00A3CD51 /* MODiaWinHistoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A6F8CE742C3564DC003475BE /* MODiaWinHistoryView.xib */; };
 		FB06A10D2E82B3FB00A3CD51 /* MOFamilyDetailVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = A6073C6E2B4D2CB700AAAAD9 /* MOFamilyDetailVC.xib */; };
 		FB06A10E2E82B3FB00A3CD51 /* MOTicketTimeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A60880862C3BE34000C950E3 /* MOTicketTimeView.xib */; };
@@ -5424,7 +5424,17 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedRootGroup section */
-		A6D34FB22E27469F00E57F79 /* CreateLive */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = CreateLive; sourceTree = "<group>"; };
+		A6D34FB22E27469F00E57F79 /* CreateLive */ = {
+			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
+			explicitFileTypes = {
+			};
+			explicitFolders = (
+			);
+			path = CreateLive;
+			sourceTree = "<group>";
+		};
 /* End PBXFileSystemSynchronizedRootGroup section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -5450,7 +5460,7 @@
 				A601BAC92AD7C59D0021CF03 /* SafariServices.framework in Frameworks */,
 				A64A155A2BB1ADD9004719CA /* SystemConfiguration.framework in Frameworks */,
 				A680E9BE2ADEBF3700DDFEC3 /* CoreTelephony.framework in Frameworks */,
-				F5612EBB69D610C1330F566F /* (null) in Frameworks */,
+				F5612EBB69D610C1330F566F /* BuildFile in Frameworks */,
 				A6673B382B43EB16002566A7 /* StoreKit.framework in Frameworks */,
 				D710FA76955C5B00E6D033AB /* Pods_MiMoLive.framework in Frameworks */,
 			);
@@ -12070,7 +12080,7 @@
 				FB06A1032E82B3FB00A3CD51 /* MOModifyAvatarVC.xib in Resources */,
 				FB06A1072E82B3FB00A3CD51 /* MOGiftListView.xib in Resources */,
 				FB06A1092E82B3FB00A3CD51 /* MOTaskBaseBtnView.xib in Resources */,
-				FB06A10A2E82B3FB00A3CD51 /* (null) in Resources */,
+				FB06A10A2E82B3FB00A3CD51 /* BuildFile in Resources */,
 				FB06A10C2E82B3FB00A3CD51 /* MODiaWinHistoryView.xib in Resources */,
 				FB06A10D2E82B3FB00A3CD51 /* MOFamilyDetailVC.xib in Resources */,
 				FB06A10E2E82B3FB00A3CD51 /* MOTicketTimeView.xib in Resources */,
@@ -12186,14 +12196,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-MiMoLive/Pods-MiMoLive-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-MiMoLive/Pods-MiMoLive-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MiMoLive/Pods-MiMoLive-resources.sh\"\n";
@@ -12246,14 +12252,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-MiMoLive/Pods-MiMoLive-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-MiMoLive/Pods-MiMoLive-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MiMoLive/Pods-MiMoLive-frameworks.sh\"\n";
@@ -12289,14 +12291,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-MiMoLive_Preview/Pods-MiMoLive_Preview-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-MiMoLive_Preview/Pods-MiMoLive_Preview-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MiMoLive_Preview/Pods-MiMoLive_Preview-frameworks.sh\"\n";
@@ -12310,14 +12308,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-MiMoLive_Preview/Pods-MiMoLive_Preview-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-MiMoLive_Preview/Pods-MiMoLive_Preview-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MiMoLive_Preview/Pods-MiMoLive_Preview-resources.sh\"\n";

+ 2 - 1
MiMoLive/MiMoLive/Classes/Live/View/LiveingView/ShowView/MOShowCanvasView.h

@@ -12,10 +12,11 @@ typedef NS_ENUM(NSUInteger, MOShowCanvasViewType)
     MOShowCanvasViewTypeMultiple    //多人连麦
 };
 
+#define kPkViewWidth (SCREENWIDTH / 2.0)
 #define kPkViewTop (STATUS_BAR_HEIGHT + 2.0 + 32.0 + 36.0 + 36.0 + 8.0 + 30 + 8)
 #define kMicViewTop (STATUS_BAR_HEIGHT + 2.0 + 32.0 + 36.0 + 36.0 + 8.0)
 #define kPkViewHeightBase (KIsiPhoneX ? 5.5 : 5.0)
-#define kPkViewHeight (SCREENWIDTH / 6.0 * kPkViewHeightBase)
+#define kPkViewHeight (kPkViewWidth / 188.0 * 280)
 
 #import <UIKit/UIKit.h>
 #import "MOShowLinkMicView.h"

+ 0 - 3
MiMoLive/MiMoLive/Classes/Live/View/LiveingView/ShowView/MOShowCanvasView.m

@@ -5,9 +5,6 @@
 //  Created by SuperC on 2023/11/12.
 //
 
-#define kPkViewWidth (SCREENWIDTH / 2.0)
-
-
 #define kMultipleViewBaseTag 8100
 
 #import "MOShowCanvasView.h"

+ 1 - 0
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/MOLineView.swift

@@ -215,6 +215,7 @@ extension MOLineView {
         peerInfoView.snp.makeConstraints { make in
             make.trailing.equalToSuperview().offset(-6)
             make.bottom.equalToSuperview().offset(-6)
+            make.width.lessThanOrEqualTo(88)
         }
         
         return hostsView

+ 1 - 1
MiMoLive/Podfile.lock

@@ -288,7 +288,7 @@ SPEC CHECKSUMS:
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
   SnapKit: d612e99e678a2d3b95bf60b0705ed0a35c03484a
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
-  SVGAPlayer-iOS: 6134099e78f88927186aa74bf9be1f0302834724
+  SVGAPlayer-iOS: a6c4a15c34b8a932ffc1102fbcd7c29edb820605
   TIMCommon: 39343d50032dd1e022aef14faafdd59041cd4cfa
   TIMPush: e1d85ff0ee0c22cc3f51010ddd8de5316d60102c
   TUIChat: 47d612d109c68854b427dcfe92e109171559ae6a