添加倒计时 付费屋

FuSiLive.xcworkspace/xcuserdata/server.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -19,128 +19,16 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "39FF1C38-2542-4416-A8C4-0315968F3941"
+            uuid = "557ED31B-F4DE-4254-9E50-0D51EFABE241"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/ActionSheet/FUSActionSheetView.m"
+            filePath = "Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Controller/FUSLiveMainViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "149"
-            endingLineNumber = "149"
-            landmarkName = "-showAcionSheetWithTitle:cancelTitle:enterTitle:otherTitles:buttonColors:clickBlock:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "1E153074-605C-4A42-B48F-38DF7C360A71"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/StreamView/LiveStreamView/Push/Capture/ByteRTC/FUSByteRTCPKStreamCaptureHelper.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "405"
-            endingLineNumber = "405"
-            landmarkName = "-fus_restartStreamPush"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "88E06B63-A6EE-4AA2-97A3-2DD86F138229"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/StreamView/LiveStreamView/Push/Capture/ByteRTC/FUSByteRTCPKStreamCaptureHelper.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "191"
-            endingLineNumber = "191"
-            landmarkName = "-fus_endLivePush"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "2178470A-240F-4C11-802C-507A47CD6F3D"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LinkMicro/Other/FUSAgoraHelper.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "592"
-            endingLineNumber = "592"
-            landmarkName = "-fus_switchAgoraLinkMicMode:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "A06C7465-3FBC-4337-ADC2-4320EA06A76B"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LinkMicro/Other/FUSAgoraHelper.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "180"
-            endingLineNumber = "180"
-            landmarkName = "-fus_enableVideo:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "4F5B7872-1C1A-4EA0-911F-1A4E6EFDF43E"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/StreamView/LiveStreamView/Push/Capture/TTSDK/Base/FUSStreamCatureHelper.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "626"
-            endingLineNumber = "626"
-            landmarkName = "-fus_setupCaptureEnable:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "4B4C9D12-5F36-4B96-BE77-C1250DFEBE1B"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartSetPrivacyView.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "355"
-            endingLineNumber = "355"
-            landmarkName = "fus_requestLiveBeforeReadyIfNeeded(completion:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "47DDFACE-B633-4A68-B5D3-CC4B6253CB4F"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHelper.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "954"
-            endingLineNumber = "954"
-            landmarkName = "-joinRoomFailuerWithErrorDict:code:msg:currentRoomId:password:behaviorSrc:otherInfo:"
+            startingLineNumber = "1648"
+            endingLineNumber = "1648"
+            landmarkName = "-payRoomSwitch:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Controller/FUSLiveMainViewController.m

@@ -1404,6 +1404,8 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(liveStatus:) name:STR(ROOM_CID_LIVE_STATU) object:nil];
     // 被踢出直播
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(forceKick:) name:STR(ROOM_CID_FORCEKICK_NOTICE) object:nil];
+    // 付费房模式切换
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(payRoomSwitch:) name:STR(ROOM_CID_PAYROOM_SWITCH) object:nil];
     // 包房重连
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(roomReconnected:) name:FUSLiveNotificationKeys.fus_Baofang_Socket_Reconnected object:nil];
     // 5555 回调
@@ -1602,6 +1604,13 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
     FUSSocketMessageModel *messageModel = noti.object;
     NSDictionary *dict = [messageModel fus_getJsonDict];
     
+    if ([dict[@"exitType"] integerValue] == 1) {
+        NSString *roomId = [FUSLiveHelper shareInstance].roomInfoModel.roomId;
+        [[FUSLiveHelper shareInstance] fus_endPayRoomPreviewWithRoomId:roomId];
+        [FUSDialogView fus_showDialog:[FUSFormatContentHelper fus_getContentFromArr:dict[@"multiContents"]]];
+        return;
+    }
+    
     if ([[FUSLiveHelper shareInstance] liveType] == FUSLiveTypeAudience) {
         // 播放
         [_streamView.playView fus_stopALLPlayer];
@@ -1634,6 +1643,26 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
     [FUSLiveHelper fus_quitLiveWithCompletion:nil];
 }
 
+- (void)payRoomSwitch:(NSNotification *)noti
+{
+    FUSSocketMessageModel *messageModel = noti.object;
+    NSDictionary *dict = [messageModel fus_getJsonDict];
+    
+    NSString *roomId = [[dict[@"roomId"] description] length] ? [dict[@"roomId"] description] : [dict[@"roomid"] description];
+    if ([NSString isNull:roomId]) {
+        roomId = [NSString stringWithFormat:@"%d", messageModel.extend1];
+    }
+    if (![roomId isEqualToString:[FUSLiveHelper shareInstance].roomInfoModel.roomId]) {
+        return;
+    }
+    
+    if ([dict[@"mode"] integerValue] != 0) {
+        return;
+    }
+    
+    [[FUSLiveHelper shareInstance] fus_handlePayRoomSwitchToNormalPlayWithRoomId:roomId];
+}
+
 -(void)recieveScreenCaptureNotification:(NSNotification *)notification {
     
     if ([FUSConfig sharedInstanced].devConfigs.appStatus == NO) {

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHelper.h

@@ -274,6 +274,12 @@ typedef NS_ENUM(NSInteger,FUSLiveRoomScopeType) {
 
 + (void)fus_quitLiveWithCompletion:(void(^_Nullable)(void))completion animated:(BOOL)animated;
 
+/// 结束付费房试看：停止拉流并回到付费入口磨砂弹层
+- (void)fus_endPayRoomPreviewWithRoomId:(NSString *)roomId;
+
+/// 付费房模式切到非付费（mode=0）：恢复正常UI并重置播放
+- (void)fus_handlePayRoomSwitchToNormalPlayWithRoomId:(NSString *)roomId;
+
 // 最小化直播间
 + (void)fus_minimizeLiveCompletion: (void (^ __nullable)(void))completion;