nothing

KulexiuForStudent/KulexiuForStudent.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -126,9 +126,9 @@
             filePath = "KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "699"
-            endingLineNumber = "699"
-            landmarkName = "-countMemberCount"
+            startingLineNumber = "731"
+            endingLineNumber = "731"
+            landmarkName = "-updateVideoViewContainer"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -327,38 +327,6 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "8DB26C48-6635-4828-8D19-00B85EACBC87"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Home/Controller/HomeViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "379"
-            endingLineNumber = "379"
-            landmarkName = "-requestNotice"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "F28FC635-A864-490E-86E4-29EA85185C31"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Home/Controller/HomeViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "631"
-            endingLineNumber = "631"
-            landmarkName = "-requestTeacherStyle"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
             uuid = "FCB14E61-608A-420C-8647-6FA260784A4F"
             shouldBeEnabled = "No"
             ignoreCount = "0"
@@ -503,64 +471,112 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "84DE9E35-E62D-4C6B-AB45-37F619865FD1"
+            uuid = "BC893046-7BBE-47D7-9C82-A0579FCE0066"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "725"
-            endingLineNumber = "725"
-            landmarkName = "-updateVideoViewContainer"
+            startingLineNumber = "653"
+            endingLineNumber = "653"
+            landmarkName = "-connectHostWithStatus:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "F6BB8FD9-538B-4DE7-8949-EF8139997B4D"
+            uuid = "09BECFEC-866D-4A1F-B953-C759DA4F4E13"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m"
+            filePath = "KulexiuForStudent/Module/Home/View/HomeNavView.h"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "554"
-            endingLineNumber = "554"
-            landmarkName = "-connectHostWithStatus:"
+            startingLineNumber = "10"
+            endingLineNumber = "10"
+            landmarkName = "NAVACTION"
+            landmarkType = "16">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "BEE7E2A1-DDA6-4112-8335-BB5135F0B33E"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForStudent/Module/Home/View/HomePageView/HomeInformationBodyView.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "55"
+            endingLineNumber = "55"
+            landmarkName = "-tableView:numberOfRowsInSection:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "A8FC4392-7631-409C-A01A-EB2D3FF3209E"
+            uuid = "93CBB2C8-2270-4AAE-8188-10A6F79D324A"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
+            filePath = "KulexiuForStudent/Module/Home/View/HomePageView/HomeInformationBodyView.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "60"
+            endingLineNumber = "60"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "6A779C41-B368-4644-A567-8BF717DAE151"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
             filePath = "KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "813"
-            endingLineNumber = "813"
-            landmarkName = "-subscribeRemoteResource:isTiny:"
+            startingLineNumber = "1147"
+            endingLineNumber = "1147"
+            landmarkName = "-insertMessage:userInfo:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "BC893046-7BBE-47D7-9C82-A0579FCE0066"
+            uuid = "924EF05B-AA29-4BD0-A6D1-229DEEB0165F"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m"
+            filePath = "KulexiuForStudent/Common/Base/KSBaseWKWebViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "631"
-            endingLineNumber = "631"
-            landmarkName = "-connectHostWithStatus:"
+            startingLineNumber = "306"
+            endingLineNumber = "306"
+            landmarkName = "-handleScriptMessageSource:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E6E62FBC-A127-4D54-89DD-51559D5CCEC6"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForStudent/Common/Base/KSBaseWKWebViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "436"
+            endingLineNumber = "436"
+            landmarkName = "-handleScriptMessageSource:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

KulexiuForStudent/KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m

@@ -542,6 +542,8 @@ static int clickPraiseBtnTimes  = 0;
 }
 
 - (void)setRoleType {
+    self.micStatus = MICSTATUS_NOMAL;
+    [self hideApplyingView];
     // 1.设置切换听筒为扬声器
     [self.engine setDefaultAudioRouteToSpeaker:YES];
     // 2.加入RTC房间
@@ -550,6 +552,7 @@ static int clickPraiseBtnTimes  = 0;
 
 // 观众上下麦
 - (void)connectHostWithStatus:(BOOL)isConnect {
+
     //  转换中，不再处理转换身份
     if (self.isTransferRole) {
         return;
@@ -1363,7 +1366,11 @@ static int clickPraiseBtnTimes  = 0;
                     RCChatroomSeatsControl *seatControlMessage = (RCChatroomSeatsControl *)rcMessage.content;
                     if (seatControlMessage.seatBan) { // 禁止连麦
                         __blockSelf.enableSeat = NO;
-                        __blockSelf.micStatus = MICSTATUS_NOMAL;
+                        // 未连麦情况下才重置
+                        if (__blockSelf.micStatus != MICSTATUS_CONNECTING) {
+                            __blockSelf.micStatus = MICSTATUS_NOMAL;
+                        }
+                        
                         [__blockSelf hideApplyView];
                         [__blockSelf hideApplyingView];
                     }

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/KSDownSeatAllMessage.m

@@ -12,7 +12,9 @@
 
 - (NSData *)encode {
     NSMutableDictionary *multableDict = [NSMutableDictionary dictionary];
-    
+    if (self.senderUserInfo) {
+        [multableDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
+    }
     return [NSJSONSerialization dataWithJSONObject:multableDict options:kNilOptions error:nil];
 }
 
@@ -21,6 +23,8 @@
     NSDictionary *dictionary = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:nil];
     NSDictionary *json = [[NSDictionary alloc] initWithDictionary:dictionary];
     if (json == nil) return;
+    NSDictionary *userinfoDic = dictionary[@"user"];
+    [self decodeUserInfo:userinfoDic];
 }
 
 

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/KSRCPauseLiveMessage.m

@@ -11,7 +11,9 @@
 @implementation KSRCPauseLiveMessage
 - (NSData *)encode {
     NSMutableDictionary *multableDict = [NSMutableDictionary dictionary];
-    
+    if (self.senderUserInfo) {
+        [multableDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
+    }
     return [NSJSONSerialization dataWithJSONObject:multableDict options:kNilOptions error:nil];
 }
 
@@ -20,6 +22,8 @@
     NSDictionary *dictionary = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:nil];
     NSDictionary *json = [[NSDictionary alloc] initWithDictionary:dictionary];
     if (json == nil) return;
+    NSDictionary *userinfoDic = dictionary[@"user"];
+    [self decodeUserInfo:userinfoDic];
 }
 
 

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/KSRCShopRushMessage.m

@@ -22,6 +22,9 @@
     } else {
         [mutableDict setObject:@"" forKey:@"userName"];
     }
+    if (self.senderUserInfo) {
+        [mutableDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
+    }
     return [NSJSONSerialization dataWithJSONObject:mutableDict options:kNilOptions error:nil];
 }
 
@@ -32,6 +35,8 @@
     if (json == nil) return;
     self.userId = [json stringValueForKey:@"userId"];
     self.userName = [json stringValueForKey:@"userName"];
+    NSDictionary *userinfoDic = dictionary[@"user"];
+    [self decodeUserInfo:userinfoDic];
 }
 
 + (NSString *)getObjectName {

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/KSRejectAllSeatMessage.m

@@ -12,7 +12,9 @@
 
 - (NSData *)encode {
     NSMutableDictionary *multableDict = [NSMutableDictionary dictionary];
-    
+    if (self.senderUserInfo) {
+        [multableDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
+    }
     return [NSJSONSerialization dataWithJSONObject:multableDict options:kNilOptions error:nil];
 }
 
@@ -21,6 +23,8 @@
     NSDictionary *dictionary = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:nil];
     NSDictionary *json = [[NSDictionary alloc] initWithDictionary:dictionary];
     if (json == nil) return;
+    NSDictionary *userinfoDic = dictionary[@"user"];
+    [self decodeUserInfo:userinfoDic];
 }
 
 

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/RCChatroomSeatsControl.m

@@ -23,6 +23,9 @@
         [mutableDict setObject:@"" forKey:@"userName"];
     }
     [mutableDict setObject:@(self.seatBan) forKey:@"seatBan"];
+    if (self.senderUserInfo) {
+        [mutableDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
+    }
     return [NSJSONSerialization dataWithJSONObject:mutableDict options:kNilOptions error:nil];
 }
 
@@ -34,6 +37,8 @@
     self.userId = [json stringValueForKey:@"userId"];
     self.userName = [json stringValueForKey:@"userName"];
     self.seatBan = [[json stringValueForKey:@"seatBan"] boolValue];
+    NSDictionary *userinfoDic = dictionary[@"user"];
+    [self decodeUserInfo:userinfoDic];
 }
 
 + (NSString *)getObjectName {