Просмотр исходного кода

[!]修复 PK 结束后贡献列表拉取异常的问题

陈文艺 5 месяцев назад
Родитель
Сommit
146f6c65a6

+ 121 - 38
MiMoLive/MiMoLive.xcodeproj/project.pbxproj

@@ -3183,6 +3183,38 @@
 		FB06A18A2E82B3FB00A3CD51 /* Fpnn.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A619FF982E40E83800F49C18 /* Fpnn.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		FB06A1B72E82B80100A3CD51 /* MOPreviewTestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB06A1B62E82B80100A3CD51 /* MOPreviewTestView.swift */; };
 		FB3763B22E77FB2A009AA0B6 /* MOLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = FB3763B12E77FB2A009AA0B6 /* MOLogFormatter.m */; };
+		FB4CE1892E9A42C70087C5B8 /* MOLineMember.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1852E9A42C70087C5B8 /* MOLineMember.swift */; };
+		FB4CE18A2E9A42C70087C5B8 /* MOLinePkCampInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1862E9A42C70087C5B8 /* MOLinePkCampInfo.swift */; };
+		FB4CE18B2E9A42C70087C5B8 /* MOLinePKViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1872E9A42C70087C5B8 /* MOLinePKViewModel.swift */; };
+		FB4CE18C2E9A42C70087C5B8 /* MOLineViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1882E9A42C70087C5B8 /* MOLineViewModel.swift */; };
+		FB4CE18D2E9A42C70087C5B8 /* MOLineMember.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1852E9A42C70087C5B8 /* MOLineMember.swift */; };
+		FB4CE18E2E9A42C70087C5B8 /* MOLinePkCampInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1862E9A42C70087C5B8 /* MOLinePkCampInfo.swift */; };
+		FB4CE18F2E9A42C70087C5B8 /* MOLinePKViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1872E9A42C70087C5B8 /* MOLinePKViewModel.swift */; };
+		FB4CE1902E9A42C70087C5B8 /* MOLineViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1882E9A42C70087C5B8 /* MOLineViewModel.swift */; };
+		FB4CE1A12E9A42C70087C5B8 /* MOLinePkTimeEditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1952E9A42C70087C5B8 /* MOLinePkTimeEditView.swift */; };
+		FB4CE1A22E9A42C70087C5B8 /* MOLineSearchUserView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1962E9A42C70087C5B8 /* MOLineSearchUserView.swift */; };
+		FB4CE1A32E9A42C70087C5B8 /* MOLineSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1972E9A42C70087C5B8 /* MOLineSearchView.swift */; };
+		FB4CE1A42E9A42C70087C5B8 /* MOLineSettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1982E9A42C70087C5B8 /* MOLineSettingView.swift */; };
+		FB4CE1A52E9A42C70087C5B8 /* MOLineUserListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1992E9A42C70087C5B8 /* MOLineUserListCell.swift */; };
+		FB4CE1A62E9A42C70087C5B8 /* MOLineUserListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE19A2E9A42C70087C5B8 /* MOLineUserListView.swift */; };
+		FB4CE1A72E9A42C70087C5B8 /* MOPkScoreView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE19B2E9A42C70087C5B8 /* MOPkScoreView.swift */; };
+		FB4CE1A82E9A42C70087C5B8 /* MOPkTopUsersItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE19C2E9A42C70087C5B8 /* MOPkTopUsersItemView.swift */; };
+		FB4CE1A92E9A42C70087C5B8 /* MOPkTopUsersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE19D2E9A42C70087C5B8 /* MOPkTopUsersView.swift */; };
+		FB4CE1AD2E9A42C70087C5B8 /* MOLinePkTimeEditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1952E9A42C70087C5B8 /* MOLinePkTimeEditView.swift */; };
+		FB4CE1AE2E9A42C70087C5B8 /* MOLineSearchUserView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1962E9A42C70087C5B8 /* MOLineSearchUserView.swift */; };
+		FB4CE1AF2E9A42C70087C5B8 /* MOLineSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1972E9A42C70087C5B8 /* MOLineSearchView.swift */; };
+		FB4CE1B02E9A42C70087C5B8 /* MOLineSettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1982E9A42C70087C5B8 /* MOLineSettingView.swift */; };
+		FB4CE1B12E9A42C70087C5B8 /* MOLineUserListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1992E9A42C70087C5B8 /* MOLineUserListCell.swift */; };
+		FB4CE1B22E9A42C70087C5B8 /* MOLineUserListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE19A2E9A42C70087C5B8 /* MOLineUserListView.swift */; };
+		FB4CE1B32E9A42C70087C5B8 /* MOPkScoreView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE19B2E9A42C70087C5B8 /* MOPkScoreView.swift */; };
+		FB4CE1B42E9A42C70087C5B8 /* MOPkTopUsersItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE19C2E9A42C70087C5B8 /* MOPkTopUsersItemView.swift */; };
+		FB4CE1B52E9A42C70087C5B8 /* MOPkTopUsersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE19D2E9A42C70087C5B8 /* MOPkTopUsersView.swift */; };
+		FB4CE1BB2E9A45170087C5B8 /* MOLinePkHistoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1B72E9A45170087C5B8 /* MOLinePkHistoryCell.swift */; };
+		FB4CE1BC2E9A45170087C5B8 /* MOLinePkHistoryListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1B82E9A45170087C5B8 /* MOLinePkHistoryListView.swift */; };
+		FB4CE1BD2E9A45170087C5B8 /* MOLinePkHistoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1B92E9A45170087C5B8 /* MOLinePkHistoryView.swift */; };
+		FB4CE1BE2E9A45170087C5B8 /* MOLinePkHistoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1B72E9A45170087C5B8 /* MOLinePkHistoryCell.swift */; };
+		FB4CE1BF2E9A45170087C5B8 /* MOLinePkHistoryListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1B82E9A45170087C5B8 /* MOLinePkHistoryListView.swift */; };
+		FB4CE1C02E9A45170087C5B8 /* MOLinePkHistoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4CE1B92E9A45170087C5B8 /* MOLinePkHistoryView.swift */; };
 		FB56C0A32E87BC81001E86DF /* MOCustomTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = A699F3542E8551FE00448188 /* MOCustomTabBar.m */; };
 		FB56C0A42E87BC8C001E86DF /* MOBeautyResLicense.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A8A070B2E812EE40081C87A /* MOBeautyResLicense.m */; };
 		FB56C0AC2E87C08C001E86DF /* MOLineLastPKResultView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB56C0AB2E87C08C001E86DF /* MOLineLastPKResultView.swift */; };
@@ -6064,6 +6096,22 @@
 		FB3763AE2E77F2BE009AA0B6 /* MOLog.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MOLog.h; sourceTree = "<group>"; };
 		FB3763B02E77FB2A009AA0B6 /* MOLogFormatter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MOLogFormatter.h; sourceTree = "<group>"; };
 		FB3763B12E77FB2A009AA0B6 /* MOLogFormatter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MOLogFormatter.m; sourceTree = "<group>"; };
+		FB4CE1852E9A42C70087C5B8 /* MOLineMember.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOLineMember.swift; sourceTree = "<group>"; };
+		FB4CE1862E9A42C70087C5B8 /* MOLinePkCampInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOLinePkCampInfo.swift; sourceTree = "<group>"; };
+		FB4CE1872E9A42C70087C5B8 /* MOLinePKViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOLinePKViewModel.swift; sourceTree = "<group>"; };
+		FB4CE1882E9A42C70087C5B8 /* MOLineViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOLineViewModel.swift; sourceTree = "<group>"; };
+		FB4CE1952E9A42C70087C5B8 /* MOLinePkTimeEditView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOLinePkTimeEditView.swift; sourceTree = "<group>"; };
+		FB4CE1962E9A42C70087C5B8 /* MOLineSearchUserView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOLineSearchUserView.swift; sourceTree = "<group>"; };
+		FB4CE1972E9A42C70087C5B8 /* MOLineSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOLineSearchView.swift; sourceTree = "<group>"; };
+		FB4CE1982E9A42C70087C5B8 /* MOLineSettingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOLineSettingView.swift; sourceTree = "<group>"; };
+		FB4CE1992E9A42C70087C5B8 /* MOLineUserListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOLineUserListCell.swift; sourceTree = "<group>"; };
+		FB4CE19A2E9A42C70087C5B8 /* MOLineUserListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOLineUserListView.swift; sourceTree = "<group>"; };
+		FB4CE19B2E9A42C70087C5B8 /* MOPkScoreView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOPkScoreView.swift; sourceTree = "<group>"; };
+		FB4CE19C2E9A42C70087C5B8 /* MOPkTopUsersItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOPkTopUsersItemView.swift; sourceTree = "<group>"; };
+		FB4CE19D2E9A42C70087C5B8 /* MOPkTopUsersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOPkTopUsersView.swift; sourceTree = "<group>"; };
+		FB4CE1B72E9A45170087C5B8 /* MOLinePkHistoryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOLinePkHistoryCell.swift; sourceTree = "<group>"; };
+		FB4CE1B82E9A45170087C5B8 /* MOLinePkHistoryListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOLinePkHistoryListView.swift; sourceTree = "<group>"; };
+		FB4CE1B92E9A45170087C5B8 /* MOLinePkHistoryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOLinePkHistoryView.swift; sourceTree = "<group>"; };
 		FB56C0AB2E87C08C001E86DF /* MOLineLastPKResultView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOLineLastPKResultView.swift; sourceTree = "<group>"; };
 		FB6C90872E7C1AB3004DF690 /* MOGiftListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOGiftListViewModel.swift; sourceTree = "<group>"; };
 		FB6C90EC2E7C2F41004DF690 /* Dictionary+Response.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Dictionary+Response.swift"; sourceTree = "<group>"; };
@@ -6100,41 +6148,8 @@
 		FCF0A923FC4BEAF036C81A51 /* Pods_MiMoLive.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MiMoLive.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
-/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
-		FB6A3AF22E84D968003C754B /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
-			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
-			membershipExceptions = (
-				History/MOLinePkHistoryCell.swift,
-				History/MOLinePkHistoryListView.swift,
-				History/MOLinePkHistoryView.swift,
-				MOLinePkTimeEditView.swift,
-				MOLineSearchUserView.swift,
-				MOLineSearchView.swift,
-				MOLineSettingView.swift,
-				MOLineUserListCell.swift,
-				MOLineUserListView.swift,
-				MOPkScoreView.swift,
-				MOPkTopUsersItemView.swift,
-				MOPkTopUsersView.swift,
-			);
-			target = FB069B622E82B3FB00A3CD51 /* MiMoLive_Preview */;
-		};
-		FB6A3AF62E84D97D003C754B /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
-			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
-			membershipExceptions = (
-				MOLineMember.swift,
-				MOLinePkCampInfo.swift,
-				MOLinePKViewModel.swift,
-				MOLineViewModel.swift,
-			);
-			target = FB069B622E82B3FB00A3CD51 /* MiMoLive_Preview */;
-		};
-/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
-
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		A6D34FB22E27469F00E57F79 /* CreateLive */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = CreateLive; sourceTree = "<group>"; };
-		FB8AEBCF2E8284560095CEB0 /* ViewModels */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (FB6A3AF62E84D97D003C754B /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = ViewModels; sourceTree = "<group>"; };
-		FBF574192E825170001B14D4 /* LineSearch */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (FB6A3AF22E84D968003C754B /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = LineSearch; sourceTree = "<group>"; };
 /* End PBXFileSystemSynchronizedRootGroup section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -6780,6 +6795,7 @@
 				3AFBC8612D6D6DC700385CC0 /* MOApiResponseCacheModel.m */,
 				A6B0A75D2DA4D335003FCE2C /* MOOtherNetAPIClient.h */,
 				A6B0A75E2DA4D335003FCE2C /* MOOtherNetAPIClient.m */,
+				FB6C90EC2E7C2F41004DF690 /* Dictionary+Response.swift */,
 			);
 			path = NetManager;
 			sourceTree = "<group>";
@@ -8032,7 +8048,6 @@
 				3A91ABC22E17B06000FC2B38 /* UILabel+VerticalAlign.m */,
 				FBE429392E7AA1EF000DEC99 /* UIImageView+Gift.h */,
 				FBE4293A2E7AA1EF000DEC99 /* UIImageView+Gift.m */,
-				FB6C90EC2E7C2F41004DF690 /* Dictionary+Response.swift */,
 				FBCB32042E86366B005E6E3C /* UIView+UserInfoStr.swift */,
 				FB9A8A7B2E8A239800488A61 /* UserDefaults+UserInfo.swift */,
 				FB03978F2E97CEC50050B148 /* UserDefaults+Common.swift */,
@@ -10305,12 +10320,12 @@
 		A696A07A2B2AFCE600E98158 /* MOPKListView */ = {
 			isa = PBXGroup;
 			children = (
+				FB4CE1C32E9A45400087C5B8 /* ViewModel */,
 				FBC2FEA12E9762B100ACD8F7 /* Models */,
 				A64F2B222E8BCD540032A58F /* OldPkView */,
-				FB8AEBCF2E8284560095CEB0 /* ViewModels */,
 				A6518D172E7BEF150000FB4A /* NewPK */,
 				A6C63F272B8236B300C0DB7A /* PKContribution */,
-				FBF574192E825170001B14D4 /* LineSearch */,
+				FB4CE1B62E9A45080087C5B8 /* LineSearch */,
 				FB56C0AB2E87C08C001E86DF /* MOLineLastPKResultView.swift */,
 				FB9A8B682E8AAE0000488A61 /* MOLineBeanView.swift */,
 				FB9A8B7B2E8AB6F400488A61 /* MOLinePkStartView.swift */,
@@ -12567,6 +12582,44 @@
 			path = PropertyWrapper;
 			sourceTree = "<group>";
 		};
+		FB4CE1B62E9A45080087C5B8 /* LineSearch */ = {
+			isa = PBXGroup;
+			children = (
+				FB4CE1C22E9A45280087C5B8 /* History */,
+				FB4CE1952E9A42C70087C5B8 /* MOLinePkTimeEditView.swift */,
+				FB4CE1962E9A42C70087C5B8 /* MOLineSearchUserView.swift */,
+				FB4CE1972E9A42C70087C5B8 /* MOLineSearchView.swift */,
+				FB4CE1982E9A42C70087C5B8 /* MOLineSettingView.swift */,
+				FB4CE1992E9A42C70087C5B8 /* MOLineUserListCell.swift */,
+				FB4CE19A2E9A42C70087C5B8 /* MOLineUserListView.swift */,
+				FB4CE19B2E9A42C70087C5B8 /* MOPkScoreView.swift */,
+				FB4CE19C2E9A42C70087C5B8 /* MOPkTopUsersItemView.swift */,
+				FB4CE19D2E9A42C70087C5B8 /* MOPkTopUsersView.swift */,
+			);
+			path = LineSearch;
+			sourceTree = "<group>";
+		};
+		FB4CE1C22E9A45280087C5B8 /* History */ = {
+			isa = PBXGroup;
+			children = (
+				FB4CE1B72E9A45170087C5B8 /* MOLinePkHistoryCell.swift */,
+				FB4CE1B82E9A45170087C5B8 /* MOLinePkHistoryListView.swift */,
+				FB4CE1B92E9A45170087C5B8 /* MOLinePkHistoryView.swift */,
+			);
+			path = History;
+			sourceTree = "<group>";
+		};
+		FB4CE1C32E9A45400087C5B8 /* ViewModel */ = {
+			isa = PBXGroup;
+			children = (
+				FB4CE1852E9A42C70087C5B8 /* MOLineMember.swift */,
+				FB4CE1862E9A42C70087C5B8 /* MOLinePkCampInfo.swift */,
+				FB4CE1872E9A42C70087C5B8 /* MOLinePKViewModel.swift */,
+				FB4CE1882E9A42C70087C5B8 /* MOLineViewModel.swift */,
+			);
+			path = ViewModel;
+			sourceTree = "<group>";
+		};
 		FBC2FEA12E9762B100ACD8F7 /* Models */ = {
 			isa = PBXGroup;
 			children = (
@@ -12618,8 +12671,6 @@
 			);
 			fileSystemSynchronizedGroups = (
 				A6D34FB22E27469F00E57F79 /* CreateLive */,
-				FB8AEBCF2E8284560095CEB0 /* ViewModels */,
-				FBF574192E825170001B14D4 /* LineSearch */,
 			);
 			name = MiMoLive;
 			productName = MiMoLive;
@@ -13869,6 +13920,15 @@
 				A6D9A7842D3607990039634D /* MOShimmerLabel.m in Sources */,
 				A65D8C172E12454300D62A68 /* UINavigationController+MOPreventRepeat.m in Sources */,
 				A681B1F42D86B08300702CFA /* MOGuildRequireInfoCell.m in Sources */,
+				FB4CE1A12E9A42C70087C5B8 /* MOLinePkTimeEditView.swift in Sources */,
+				FB4CE1A22E9A42C70087C5B8 /* MOLineSearchUserView.swift in Sources */,
+				FB4CE1A32E9A42C70087C5B8 /* MOLineSearchView.swift in Sources */,
+				FB4CE1A42E9A42C70087C5B8 /* MOLineSettingView.swift in Sources */,
+				FB4CE1A52E9A42C70087C5B8 /* MOLineUserListCell.swift in Sources */,
+				FB4CE1A62E9A42C70087C5B8 /* MOLineUserListView.swift in Sources */,
+				FB4CE1A72E9A42C70087C5B8 /* MOPkScoreView.swift in Sources */,
+				FB4CE1A82E9A42C70087C5B8 /* MOPkTopUsersItemView.swift in Sources */,
+				FB4CE1A92E9A42C70087C5B8 /* MOPkTopUsersView.swift in Sources */,
 				3A6A87912E49CDEB007B1FF3 /* MOSayHelloMainView.m in Sources */,
 				A695451B2E5C4FF3000BE37A /* MOBytesBeautyBasePreview.m in Sources */,
 				FB6C90ED2E7C2F41004DF690 /* Dictionary+Response.swift in Sources */,
@@ -14001,6 +14061,10 @@
 				A6BFACB72D2535E0000DDC2C /* MOVipMenuView.m in Sources */,
 				3A8A06CC2E7D48B10081C87A /* MOVersionModel.m in Sources */,
 				3A8A056E2E73B7F80081C87A /* MONewAnchorRankEntryView.m in Sources */,
+				FB4CE1892E9A42C70087C5B8 /* MOLineMember.swift in Sources */,
+				FB4CE18A2E9A42C70087C5B8 /* MOLinePkCampInfo.swift in Sources */,
+				FB4CE18B2E9A42C70087C5B8 /* MOLinePKViewModel.swift in Sources */,
+				FB4CE18C2E9A42C70087C5B8 /* MOLineViewModel.swift in Sources */,
 				A680B3022B4E459700DC6A1F /* MOFamilyMembersCell.m in Sources */,
 				A66122932BF214A300FC1CAD /* MOPinkStarsCell.m in Sources */,
 				A65083172E55FA4C002ECEB2 /* MOLinkMicSetSwitchCell.m in Sources */,
@@ -14277,6 +14341,7 @@
 				A6C3C1012AF7753A00735830 /* NSString+Common.m in Sources */,
 				A69559DA2B1F42AC003ADFA8 /* MOLiveCenterTableView.m in Sources */,
 				3ACE34F62DE05DF5001F7C22 /* MOActivityRewardView.m in Sources */,
+				FB4CE1BB2E9A45170087C5B8 /* MOLinePkHistoryCell.swift in Sources */,
 				A6A63EA42AF3C398009ED032 /* MOFamilyRankData.m in Sources */,
 				A69E40752B3E9E720036B51C /* MOLevelDanMuView.m in Sources */,
 				A6272BF52B0F6DD9006464EB /* MOGiftListView.m in Sources */,
@@ -14869,6 +14934,7 @@
 				3A8A051A2E71DA750081C87A /* MOContributeRankView.m in Sources */,
 				A60A0F3D2AD3E11000421EA4 /* MOBaseViewController.m in Sources */,
 				A6C1FB662AEE55C2000908C9 /* MOAnchorApplyVC.m in Sources */,
+				FB4CE1BC2E9A45170087C5B8 /* MOLinePkHistoryListView.swift in Sources */,
 				A6AAFDB92CEDD8E9004C4D59 /* MOWameListVC.m in Sources */,
 				A67908F92C0C794F001B73AE /* MOAnchorTaskTableView.m in Sources */,
 				A63664902AF0FDB9002C0BFC /* MONameplateDisplayCell.m in Sources */,
@@ -14939,6 +15005,7 @@
 				3ADC766F2DF2F5CC001DD63C /* MOLoginManager.m in Sources */,
 				FB05B9532E8B834A0055885D /* UIView+SnapKit.swift in Sources */,
 				A6CC14382CF86F0A001117FB /* MOActivityCenterCell.m in Sources */,
+				FB4CE1BD2E9A45170087C5B8 /* MOLinePkHistoryView.swift in Sources */,
 				3A9160D42DD8DA380070C668 /* MORedPacketInfoView.m in Sources */,
 				A6BC420D2AF8CB690095152A /* ChineseToPinyin.m in Sources */,
 				A69BCDDE2C6C8D9B001D5596 /* MOPrivilegeDefaultModel.m in Sources */,
@@ -15045,6 +15112,15 @@
 				FB069B8A2E82B3FB00A3CD51 /* MODiaWinMesData.m in Sources */,
 				FB069B8B2E82B3FB00A3CD51 /* String+Localizable_old.swift in Sources */,
 				FB069B8C2E82B3FB00A3CD51 /* MORedBaseView.m in Sources */,
+				FB4CE1AD2E9A42C70087C5B8 /* MOLinePkTimeEditView.swift in Sources */,
+				FB4CE1AE2E9A42C70087C5B8 /* MOLineSearchUserView.swift in Sources */,
+				FB4CE1AF2E9A42C70087C5B8 /* MOLineSearchView.swift in Sources */,
+				FB4CE1B02E9A42C70087C5B8 /* MOLineSettingView.swift in Sources */,
+				FB4CE1B12E9A42C70087C5B8 /* MOLineUserListCell.swift in Sources */,
+				FB4CE1B22E9A42C70087C5B8 /* MOLineUserListView.swift in Sources */,
+				FB4CE1B32E9A42C70087C5B8 /* MOPkScoreView.swift in Sources */,
+				FB4CE1B42E9A42C70087C5B8 /* MOPkTopUsersItemView.swift in Sources */,
+				FB4CE1B52E9A42C70087C5B8 /* MOPkTopUsersView.swift in Sources */,
 				FB9A87592E892D3200488A61 /* MOLiveManager.swift in Sources */,
 				FB069B8D2E82B3FB00A3CD51 /* MOShimmerLabel.m in Sources */,
 				FB069B8E2E82B3FB00A3CD51 /* UINavigationController+MOPreventRepeat.m in Sources */,
@@ -15177,6 +15253,10 @@
 				FB069C092E82B3FB00A3CD51 /* MBProgressHUD+JDragon.m in Sources */,
 				FB069C0A2E82B3FB00A3CD51 /* MOHeatRankData.m in Sources */,
 				FB069C0B2E82B3FB00A3CD51 /* MODataCache.m in Sources */,
+				FB4CE18D2E9A42C70087C5B8 /* MOLineMember.swift in Sources */,
+				FB4CE18E2E9A42C70087C5B8 /* MOLinePkCampInfo.swift in Sources */,
+				FB4CE18F2E9A42C70087C5B8 /* MOLinePKViewModel.swift in Sources */,
+				FB4CE1902E9A42C70087C5B8 /* MOLineViewModel.swift in Sources */,
 				FB069C0C2E82B3FB00A3CD51 /* MONameplateDisplayBaseCell.m in Sources */,
 				FB069C0D2E82B3FB00A3CD51 /* MOHomePageMenuCell.m in Sources */,
 				FB069C0E2E82B3FB00A3CD51 /* MOVipMenuView.m in Sources */,
@@ -15453,6 +15533,7 @@
 				FB069D132E82B3FB00A3CD51 /* MONormalRightMenuCell.m in Sources */,
 				FB069D142E82B3FB00A3CD51 /* UITextField+CustomClearButton.m in Sources */,
 				FB069D152E82B3FB00A3CD51 /* MOHPMedalCollectionViewCell.m in Sources */,
+				FB4CE1BE2E9A45170087C5B8 /* MOLinePkHistoryCell.swift in Sources */,
 				FB069D162E82B3FB00A3CD51 /* NSString+Common.m in Sources */,
 				FB069D172E82B3FB00A3CD51 /* MOLiveCenterTableView.m in Sources */,
 				FB069D182E82B3FB00A3CD51 /* MOActivityRewardView.m in Sources */,
@@ -16045,6 +16126,7 @@
 				FB069F4A2E82B3FB00A3CD51 /* EffectsAttribute.m in Sources */,
 				FB069F4B2E82B3FB00A3CD51 /* MOWishRecordCell.m in Sources */,
 				FB069F4C2E82B3FB00A3CD51 /* MOContributeRankView.m in Sources */,
+				FB4CE1BF2E9A45170087C5B8 /* MOLinePkHistoryListView.swift in Sources */,
 				FB069F4D2E82B3FB00A3CD51 /* MOBaseViewController.m in Sources */,
 				FB069F4E2E82B3FB00A3CD51 /* MOAnchorApplyVC.m in Sources */,
 				FB069F4F2E82B3FB00A3CD51 /* MOWameListVC.m in Sources */,
@@ -16115,6 +16197,7 @@
 				FB069F8E2E82B3FB00A3CD51 /* MOShopBaseCell.m in Sources */,
 				FB069F8F2E82B3FB00A3CD51 /* MOLoginManager.m in Sources */,
 				FB069F902E82B3FB00A3CD51 /* MOActivityCenterCell.m in Sources */,
+				FB4CE1C02E9A45170087C5B8 /* MOLinePkHistoryView.swift in Sources */,
 				FB069F912E82B3FB00A3CD51 /* MORedPacketInfoView.m in Sources */,
 				FB069F922E82B3FB00A3CD51 /* ChineseToPinyin.m in Sources */,
 				FB069F932E82B3FB00A3CD51 /* MOPrivilegeDefaultModel.m in Sources */,

+ 1 - 1
MiMoLive/MiMoLive/Classes/Live/MOShowLiveVC.m

@@ -4899,7 +4899,7 @@ static int mainRTMJoinNum = 0;
         MORtmEntity *entity = [MORtmEntity modelWithJSON:message.text];
         entity = [MORtmEntity prepareRealObjectWith:entity];
         
-        //点对点消息 因为是跨频道, 不懈怠需要频道ID
+        //点对点消息 因为是跨频道, 不需要频道ID
         [weakSelf switchMessageActionWith:entity andChannelId:peerId];
     };
     

+ 7 - 8
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/LineSearch/History/MOLinePkHistoryCell.swift

@@ -80,20 +80,19 @@ extension MOLinePkHistoryCell {
             make.width.height.equalTo(40)
         }
         
-        let invite = buildInvite()
-        contentView.addSubview(invite)
-        invite.snp.makeConstraints { make in
-            make.centerY.equalToSuperview()
-            make.trailing.equalToSuperview().offset(-12)
-        }
+//        let invite = buildInvite()
+//        contentView.addSubview(invite)
+//        invite.snp.makeConstraints { make in
+//            make.centerY.equalToSuperview()
+//            make.trailing.equalToSuperview().offset(-12)
+//        }
         
         let info = buildInfo()
         contentView.addSubview(info)
         info.snp.makeConstraints { make in
             make.centerY.equalToSuperview()
             make.leading.equalTo(avatar.snp.trailing).offset(12)
-            make.trailing.equalTo(invite.snp.leading).offset(-12)
-            make.trailing.lessThanOrEqualTo(invite.snp.leading).offset(-12)
+            make.trailing.equalToSuperview().offset(-12)
         }
     }
     

+ 12 - 4
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/LineSearch/MOLineUserListCell.swift

@@ -45,8 +45,7 @@ class MOLineUserListCell: UITableViewCell {
         audience.text = "\(data.item.viewerNum)"
         self.user = data
         
-        invite.alpha = 1.0
-        invite.isEnabled = true
+        enableInvite(data.item.canInvite)
     }
 }
 
@@ -60,12 +59,21 @@ extension MOLineUserListCell {
             MOLineViewModel.inviteLineUser(user.item.roomId, .line)
         }
         
-        invite.alpha = 0.5
-        invite.isEnabled = false
+        enableInvite(false)
     }
 }
 
 extension MOLineUserListCell {
+    private func enableInvite(_ enable: Bool) {
+        if enable {
+            invite.alpha = 1.0
+            invite.isEnabled = true
+        } else {
+            invite.alpha = 0.5
+            invite.isEnabled = false
+        }
+    }
+    
     private func setupViews() {
         avatar.backgroundColor = .red
         avatar.layer.cornerRadius = 20

+ 12 - 7
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/MOLineLastPKResultView.swift

@@ -9,6 +9,9 @@ import Foundation
 import UIKit
 
 class MOLineLastPKResultView: UIView, MOPopupViewProtocol {
+    private let pkMatchId: String
+    private let campCode: String
+    
     let container = UIView()
     let containerHeight: PopupViewHeight = .height(414)
     
@@ -19,10 +22,14 @@ class MOLineLastPKResultView: UIView, MOPopupViewProtocol {
     private let noMoreDataView = MONoMoreDataView()
     private let tableView = UITableView()
     
-    override init(frame: CGRect) {
-        super.init(frame: frame)
+    init(_ pkMatchId: String, _ campCode: String) {
+        self.pkMatchId = pkMatchId
+        self.campCode = campCode
+        super.init(frame: .zero)
         
         setupViews()
+        
+        reload()
     }
     
     required init?(coder: NSCoder) {
@@ -32,8 +39,7 @@ class MOLineLastPKResultView: UIView, MOPopupViewProtocol {
 
 extension MOLineLastPKResultView {
     private func reload() {
-        guard let viewModel = MOLiveManager.curPkViewModel else { return }
-        viewModel.loadContributeList(next: "", .mySide) { [weak self] list, hasMore in
+        MOLinePKViewModel.loadContributeList(pkMatchId: pkMatchId, next: "", campCode) { [weak self] list, hasMore in
             guard let self else { return }
             self.tableView.mj_header?.endRefreshing()
             
@@ -56,8 +62,7 @@ extension MOLineLastPKResultView {
             self.tableView.mj_footer?.endRefreshing()
             return
         }
-        guard let viewModel = MOLiveManager.curPkViewModel else { return }
-        viewModel.loadContributeList(next: self.nextTag, .mySide) { [weak self] list, hasMore in
+        MOLinePKViewModel.loadContributeList(pkMatchId: pkMatchId, next: self.nextTag, campCode) { [weak self] list, hasMore in
             guard let self else { return }
             self.tableView.mj_footer?.endRefreshing()
             
@@ -89,7 +94,7 @@ extension MOLineLastPKResultView: UITableViewDataSource {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: MOLinePkContributionCell.className())
         if let cell = cell as? MOLinePkContributionCell {
-            cell.updateContent(indexPath.row, userList[indexPath.row], .mySide)
+            cell.updateContent(indexPath.row, userList[indexPath.row], .mySide, false)
         }
         return cell!
     }

+ 26 - 18
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/MOLinePkStartView.swift

@@ -13,8 +13,6 @@ class MOLinePkStartView: UIView, MOPopupViewProtocol {
     let container = UIView()
     let containerHeight: PopupViewHeight = .height(414)
     
-    private let stateView = UIView()
-    
     override init(frame: CGRect) {
         super.init(frame: frame)
         
@@ -184,6 +182,9 @@ extension MOLinePkStartView {
             make.centerY.equalToSuperview()
             make.trailing.equalTo(close.snp.leading).offset(-22)
         }
+        if MOLiveManager.curLineViewModel?.isCreator != true {
+            config.isHidden = true
+        }
         
         let viewModel = MOLiveManager.curLive?.lineViewModel
         let peer = viewModel?.curPeerInfo?.userNickName ?? ""
@@ -249,6 +250,10 @@ extension MOLinePkStartView {
         startTitle.snp.makeConstraints { make in
             make.edges.equalToSuperview().inset(UIEdgeInsets(top: 3, left: 8, bottom: 3, right: 8))
         }
+        if MOLiveManager.curPkViewModel?.curState == .pking {
+            start.isEnabled = false
+            start.alpha = 0.5
+        }
         
         let info = UIView()
         container.addSubview(info)
@@ -268,22 +273,25 @@ extension MOLinePkStartView {
             make.leading.top.equalToSuperview()
         }
         
-        stateView.backgroundColor = .init(hex: "#4363FF").withAlphaComponent(0.1)
-        stateView.layer.cornerRadius = 4
-        info.addSubview(stateView)
-        stateView.snp.makeConstraints { make in
-            make.centerY.equalTo(title)
-            make.leading.equalTo(title.snp.trailing).offset(6)
-            make.trailing.lessThanOrEqualToSuperview()
-        }
-        
-        let stateTitle = UILabel()
-        stateTitle.text = "进行中"
-        stateTitle.font = .poppinsMediumFont(10)
-        stateTitle.textColor = .init(hex: "#4363FF")
-        stateView.addSubview(stateTitle)
-        stateTitle.snp.makeConstraints { make in
-            make.edges.equalToSuperview().inset(UIEdgeInsets(top: 1, left: 4, bottom: 1, right: 4))
+        if MOLiveManager.curPkViewModel?.curState == .pking {
+            let stateView = UIView()
+            stateView.backgroundColor = .init(hex: "#4363FF").withAlphaComponent(0.1)
+            stateView.layer.cornerRadius = 4
+            info.addSubview(stateView)
+            stateView.snp.makeConstraints { make in
+                make.centerY.equalTo(title)
+                make.leading.equalTo(title.snp.trailing).offset(6)
+                make.trailing.lessThanOrEqualToSuperview()
+            }
+            
+            let stateTitle = UILabel()
+            stateTitle.text = "进行中"
+            stateTitle.font = .poppinsMediumFont(10)
+            stateTitle.textColor = .init(hex: "#4363FF")
+            stateView.addSubview(stateTitle)
+            stateTitle.snp.makeConstraints { make in
+                make.edges.equalToSuperview().inset(UIEdgeInsets(top: 1, left: 4, bottom: 1, right: 4))
+            }
         }
         
         let desc = UILabel()

+ 16 - 6
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/MOLinePkView.swift

@@ -17,6 +17,10 @@ class MOLinePkView: UIView {
     private let pkResultIcon = UIImageView()
     private let pkResultButton = UIButton()
     
+    private var lastPkMatchId: String? = nil
+    private var lastOwnerCampCode: String? = nil
+    private var lastPeerCampCode: String? = nil
+    
     override init(frame: CGRect) {
         super.init(frame: frame)
         
@@ -27,6 +31,7 @@ class MOLinePkView: UIView {
         if let viewModel = MOLiveManager.curPkViewModel {
             onLinePkStateChanged(viewModel: viewModel, state: viewModel.curState)
             onLinePkCampInfoChanged(viewModel: viewModel)
+            lastPkMatchId = viewModel.pkMatchId
         }
     }
     
@@ -68,10 +73,12 @@ extension MOLinePkView: MOLinePKViewModelDelegate {
     func onLinePkCampInfoChanged(viewModel: MOLinePKViewModel) {
         if let ownerInfo = viewModel.curOwnerCampInfo {
             ownerTopUsersView.setupAvatars(with: ownerInfo.topUsers.compactMap({ $0.avatar }))
+            lastOwnerCampCode = ownerInfo.campCode
         }
         
         if let peerInfo = viewModel.curPeerCampInfo {
             peerTopUsersView.setupAvatars(with: peerInfo.topUsers.compactMap({ $0.avatar }))
+            lastPeerCampCode = peerInfo.campCode
         }
     }
     
@@ -110,22 +117,25 @@ extension MOLinePkView: MOLinePKViewModelDelegate {
 extension MOLinePkView {
     @objc
     private func handlerOwnerTopUserClick() {
-        guard let superview = superview?.superview else { return }
-        let view = MOLinePkContributionView(.mySide)
+        guard let lastPkMatchId, let lastOwnerCampCode,
+              let superview = superview?.superview else { return }
+        let view = MOLinePkContributionView(.mySide, lastPkMatchId, lastOwnerCampCode)
         view.showVIn(superview)
     }
     
     @objc
     private func handlePeerTopUserClick() {
-        guard let superview = superview?.superview else { return }
-        let view = MOLinePkContributionView(.peerSide)
+        guard let lastPkMatchId, let lastPeerCampCode,
+              let superview = superview?.superview else { return }
+        let view = MOLinePkContributionView(.peerSide, lastPkMatchId, lastPeerCampCode)
         view.showVIn(superview)
     }
     
     @objc
     private func handlePkResultClick() {
-        guard let superview = superview?.superview else { return }
-        let view = MOLineLastPKResultView()
+        guard let lastPkMatchId, let lastOwnerCampCode,
+              let superview = superview?.superview else { return }
+        let view = MOLineLastPKResultView(lastPkMatchId, lastOwnerCampCode)
         view.showVIn(superview)
     }
 }

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

@@ -28,6 +28,7 @@ class MOLivePkLinkInviteVO: Decodable {
     var roomId: String = ""
     // 观众人数
     var viewerNum: Int = 0
+    var canInvite: Bool = true
     var user: MOLineInviteListUser = MOLineInviteListUser()
 }
 

+ 2 - 2
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/PKContribution/MOLinePkContributionCell.swift

@@ -28,12 +28,12 @@ class MOLinePkContributionCell: UITableViewCell {
         fatalError("init(coder:) has not been implemented")
     }
     
-    func updateContent(_ index: Int, _ data: MOLivePkContributeUser, _ type: MOLinePkContributionViewType) {
+    func updateContent(_ index: Int, _ data: MOLivePkContributeUser, _ type: MOLinePkContributionViewType, _ hightLightFirst: Bool = true) {
         avatar.sd_setImage(with: URL(string: data.user.avatar), placeholderImage: UIImage(named: "icon_mine_placeHolder"))
         updateUserName(data.user.nickname, data.user.gender, data.user.level, 0)
         beans.text = MOTextTools.numberToString(with: Double(data.amount))
         self.user = data
-        updateIndexNum(index + 1, type)
+        updateIndexNum(index + 1, type, hightLightFirst)
     }
 }
 

+ 9 - 5
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/PKContribution/MOLinePkContributionView.swift

@@ -16,6 +16,9 @@ enum MOLinePkContributionViewType: Int {
 }
 
 class MOLinePkContributionView: UIView, MOPopupViewProtocol {
+    private let pkMatchId: String
+    private let campCode: String
+    
     private let curType: MOLinePkContributionViewType
     private var userList: [MOLivePkContributeUser] = []
     private var nextTag = ""
@@ -26,8 +29,10 @@ class MOLinePkContributionView: UIView, MOPopupViewProtocol {
     private let noMoreDataView = MONoMoreDataView()
     private let tableView = UITableView()
     
-    init(_ curType: MOLinePkContributionViewType) {
+    init(_ curType: MOLinePkContributionViewType, _ pkMatchId: String, _ campCode: String) {
         self.curType = curType
+        self.pkMatchId = pkMatchId
+        self.campCode = campCode
         
         super.init(frame: .zero)
         
@@ -42,8 +47,7 @@ class MOLinePkContributionView: UIView, MOPopupViewProtocol {
 
 extension MOLinePkContributionView {
     private func reload() {
-        guard let viewModel = MOLiveManager.curPkViewModel else { return }
-        viewModel.loadContributeList(next: "", curType) { [weak self] list, hasMore in
+        MOLinePKViewModel.loadContributeList(pkMatchId: pkMatchId, next: "", campCode) { [weak self] list, hasMore in
             guard let self else { return }
             self.tableView.mj_header?.endRefreshing()
             
@@ -66,8 +70,7 @@ extension MOLinePkContributionView {
             self.tableView.mj_footer?.endRefreshing()
             return
         }
-        guard let viewModel = MOLiveManager.curPkViewModel else { return }
-        viewModel.loadContributeList(next: self.nextTag, curType) { [weak self] list, hasMore in
+        MOLinePKViewModel.loadContributeList(pkMatchId: pkMatchId, next: self.nextTag, campCode) { [weak self] list, hasMore in
             guard let self else { return }
             self.tableView.mj_footer?.endRefreshing()
             
@@ -198,6 +201,7 @@ extension MOLinePkContributionView {
         tableView.dataSource = self
         tableView.allowsSelection = false
         tableView.backgroundColor = .clear
+        tableView.separatorColor = .clear
         tableView.backgroundView = noMoreDataView
         tableView.register(MOLinePkContributionCell.self, forCellReuseIdentifier: MOLinePkContributionCell.className())
         

+ 0 - 0
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/ViewModels/MOLineMember.swift → MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/ViewModel/MOLineMember.swift


+ 6 - 10
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/ViewModels/MOLinePKViewModel.swift → MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/ViewModel/MOLinePKViewModel.swift

@@ -58,9 +58,11 @@ class MOLinePKViewModel: NSObject {
         didSet {
             if oldValue != curState {
                 notifyLinePkStateChanged()
+                if oldValue == .pking {
+                    notifyLinePkResult()
+                }
                 if curState == .punishing {
                     startPunishTimeCountDown()
-                    notifyLinePkResult()
                 }
             }
         }
@@ -185,19 +187,13 @@ class MOLinePKViewModel: NSObject {
         }
     }
     
-    func loadContributeList(next: String, _ side: MOLinePkContributionViewType, _ handler: @escaping (MOLivePkContributeVO?, Bool) -> Void) {
-        let campCode = side == .mySide ? curOwnerCampInfo?.campCode : curPeerCampInfo?.campCode
-        guard let campCode else {
-            handler(nil, false)
-            return
-        }
-        
-        MOHttpManager.shared().getLinePkContributeList(pkMatchId, campCode, next, 30) { list, error in
+    static func loadContributeList(pkMatchId: String, next: String, _ campCode: String, _ handler: @escaping (MOLivePkContributeVO?, Bool) -> Void) {
+        MOHttpManager.shared().getLinePkContributeList(pkMatchId, campCode, next, 50) { list, error in
             if error != nil {
                 showNetError(err: error)
                 return
             }
-            handler(list, list?.list.count ?? 0 >= 30)
+            handler(list, list?.list.count ?? 0 >= 50)
         }
     }
     

+ 0 - 0
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/ViewModels/MOLinePkCampInfo.swift → MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/ViewModel/MOLinePkCampInfo.swift


+ 6 - 6
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/ViewModels/MOLineViewModel.swift → MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/ViewModel/MOLineViewModel.swift

@@ -557,20 +557,20 @@ extension MOLineViewModel {
 // MARK: Line 列表
 extension MOLineViewModel {
     static func loadLineMatchUsers(_ next: String? = nil, _ key: String = "", _ handler: @escaping (MONextVOLivePkLinkInviteVO?, Bool) -> Void) {
-        MOHttpManager.shared().getLineInviteList(next: next ?? "", size: 30, searchKey: key) { list, error in
+        MOHttpManager.shared().getLineInviteList(next: next ?? "", size: 50, searchKey: key) { list, error in
             if error != nil || list == nil {
                 showNetError(err: error)
             }
-            handler(list, list?.list.count ?? 0 >= 30)
+            handler(list, list?.list.count ?? 0 >= 50)
         }
     }
     
     static func loadLinePkMatchUsers(_ next: String? = nil, _ key: String = "", _ handler: @escaping (MONextVOLivePkLinkInviteVO?, Bool) -> Void) {
-        MOHttpManager.shared().getLinePkInviteList(next: next ?? "", size: 30, searchKey: key) { list, error in
+        MOHttpManager.shared().getLinePkInviteList(next: next ?? "", size: 50, searchKey: key) { list, error in
             if error != nil || list == nil {
                 showNetError(err: error)
             }
-            handler(list, list?.list.count ?? 0 >= 30)
+            handler(list, list?.list.count ?? 0 >= 50)
         }
     }
     
@@ -579,11 +579,11 @@ extension MOLineViewModel {
     }
     
     static func loadPkHistory(_ category: LinePkHistoryType, next: String? = nil, _ handler: @escaping (MONextVOLivePkV2RecordVo?, Bool) -> Void) {
-        MOHttpManager.shared().getLinePkHistory(historyType: category, next: next ?? "", size: 30) { list, error in
+        MOHttpManager.shared().getLinePkHistory(historyType: category, next: next ?? "", size: 50) { list, error in
             if error != nil || list == nil {
                 showNetError(err: error)
             }
-            handler(list, list?.list.count ?? 0 >= 30)
+            handler(list, list?.list.count ?? 0 >= 50)
         }
     }
 }

BIN
MiMoLive/MiMoLive/File/WebP/NewPk/icon_line_pk_start.webp


+ 0 - 0
MiMoLive/MiMoLive/Global/Category/Dictionary+Response.swift → MiMoLive/MiMoLive/Global/NetManager/Dictionary+Response.swift