nothing

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

@@ -23,16 +23,247 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "6C8F310D-3DDD-4BA9-94AE-FF9EE9C5DA14"
+            uuid = "ACDBE2BD-DEF9-4FDF-BD1E-B43504F15607"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonBodyView.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "163"
+            endingLineNumber = "163"
+            landmarkName = "-requestData"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "69305BAD-5286-4E73-A12D-41D295DB519E"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Home/View/HomeNewHeadView.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "87"
+            endingLineNumber = "87"
+            landmarkName = "-configMessage:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "B760AAB9-2DF2-4135-BE10-4D482271BC52"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1632"
+            endingLineNumber = "1632"
+            landmarkName = "-pauseLiveActionBack:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "643"
+            endingLineNumber = "643"
+            landmarkName = "-configIMConnect"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - d204ca35ec8ae2b6"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[LiveRoomViewController IMConnetedCallback]"
+                  moduleName = "KulexiuForTeacher"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "635"
+                  endingLineNumber = "635"
+                  offsetFromSymbolStart = "24">
+               </Location>
+               <Location
+                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - 3a084d2c1ad9f33a"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke"
+                  moduleName = "KulexiuForTeacher"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "635"
+                  endingLineNumber = "635"
+                  offsetFromSymbolStart = "32">
+               </Location>
+               <Location
+                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - d3d03a555397ad49"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke_2"
+                  moduleName = "KulexiuForTeacher"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "635"
+                  endingLineNumber = "635"
+                  offsetFromSymbolStart = "40">
+               </Location>
+               <Location
+                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - d3d03a555397ad49"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke_2"
+                  moduleName = "KulexiuForTeacher"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "635"
+                  endingLineNumber = "635"
+                  offsetFromSymbolStart = "112">
+               </Location>
+               <Location
+                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - d3d03a54d397ad56"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke_3"
+                  moduleName = "KulexiuForTeacher"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "635"
+                  endingLineNumber = "635"
+                  offsetFromSymbolStart = "24">
+               </Location>
+               <Location
+                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - 3d9a4aa3c53a99b5"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke.496"
+                  moduleName = "KulexiuForTeacher"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "635"
+                  endingLineNumber = "635"
+                  offsetFromSymbolStart = "60">
+               </Location>
+               <Location
+                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - f2c662b6142070c0"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke_2.500"
+                  moduleName = "KulexiuForTeacher"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "635"
+                  endingLineNumber = "635"
+                  offsetFromSymbolStart = "32">
+               </Location>
+               <Location
+                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - f2c662a13fea5cde"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke_3.501"
+                  moduleName = "KulexiuForTeacher"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "635"
+                  endingLineNumber = "635"
+                  offsetFromSymbolStart = "40">
+               </Location>
+               <Location
+                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - f2c662a13fea5cde"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke_3.501"
+                  moduleName = "KulexiuForTeacher"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "635"
+                  endingLineNumber = "635"
+                  offsetFromSymbolStart = "112">
+               </Location>
+               <Location
+                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - d3d03a545397ad57"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke_4"
+                  moduleName = "KulexiuForTeacher"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "635"
+                  endingLineNumber = "635"
+                  offsetFromSymbolStart = "24">
+               </Location>
+               <Location
+                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - d3d03a57d397ad54"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke_5"
+                  moduleName = "KulexiuForTeacher"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "635"
+                  endingLineNumber = "635"
+                  offsetFromSymbolStart = "60">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "EA9FEA48-4616-4094-BBE4-66F574A0FB75"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Module/Live/View/SeatListView/LiveMemberSeatCell.m"
+            filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "43"
-            endingLineNumber = "43"
-            landmarkName = "-configCellWithSource:isApply:callback:"
+            startingLineNumber = "510"
+            endingLineNumber = "510"
+            landmarkName = "-appBecomeActive"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

KulexiuForTeacher/KulexiuForTeacher/Common/Base/RCConnectionManager.m

@@ -60,6 +60,7 @@
     if (status == ConnectionStatus_Connected) { // RTC会自动断线重连 此处多余
         self.isConnected = YES;
         NSLog(@"connect im success");
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"RongIMConnected" object:nil];
     }
     else if (status == ConnectionStatus_KICKED_OFFLINE_BY_OTHER_CLIENT) { // 账号被挤掉
         

KulexiuForTeacher/KulexiuForTeacher/Module/Classroom/View/DownloadView/DownloadStatusCell.m

@@ -34,7 +34,7 @@
     }
     self.member = member;
     
-    [self.userLogo sd_setImageWithURL:[NSURL URLWithString:member.headUrl] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.userLogo sd_setImageWithURL:[NSURL URLWithString:[member.headUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
     self.userName.text = [NSString returnNoNullStringWithString:member.name];
     
     NSInteger downStatus = member.downStatus;

KulexiuForTeacher/KulexiuForTeacher/Module/Classroom/View/MemberList/MemberListCell.m

@@ -33,7 +33,7 @@
     }
     self.member = member;
     [self refreshButtonStatus:self.micButton enable:member.microphoneEnable];
-    [self.userImage sd_setImageWithURL:[NSURL URLWithString:member.headUrl] placeholderImage:[UIImage imageNamed:USER_LOGO_RECTANGLE]];
+    [self.userImage sd_setImageWithURL:[NSURL URLWithString:[member.headUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USER_LOGO_RECTANGLE]];
     self.userName.text = [NSString returnNoNullStringWithString:member.name];
     self.handUpImage.hidden = !member.handUpOn;
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeBannerCell.m

@@ -27,7 +27,7 @@
     }
     else {
         url = [url getUrlEndcodeString];
-        [self.bannerImage sd_setImageWithURL:[NSURL URLWithString:url] placeholderImage:[UIImage imageNamed:@"video_placeholder"]];
+        [self.bannerImage sd_setImageWithURL:[NSURL URLWithString:[url getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"video_placeholder"]];
     }
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m

@@ -157,6 +157,8 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
 
 @property (nonatomic, strong)  UITapGestureRecognizer *gesture;
 
+@property (nonatomic, assign) BOOL needPublishStream;
+
 @end
 
 
@@ -500,8 +502,14 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
 
 - (void)appBecomeActive {
     if (self.isEnterBackground && self.pageType == LIVEPAGE_LIVE && self.isOtherLogin == NO) {
-        // 开启推流
-        [self startPublishStream];
+        if ([USER_MANAGER checkIMConnected]) {
+            // 开启推流
+            [self startPublishStream];
+        }
+        else {
+            self.needPublishStream = YES;
+        }
+        
     }
     self.isEnterBackground = NO;
 }
@@ -535,7 +543,7 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
     
     self.headView.boardcastName.text = [NSString returnNoNullStringWithString:self.createrName];
     if (![NSString isEmptyString:self.createrAvatal]) {
-        [self.headView.boardcastAvatal sd_setImageWithURL:[NSURL URLWithString:self.createrAvatal] placeholderImage:[UIImage imageNamed:@"teacher_logo"]];
+        [self.headView.boardcastAvatal sd_setImageWithURL:[NSURL URLWithString:[self.createrAvatal getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"teacher_logo"]];
     }
     [self countLikeMessageCount];
     
@@ -657,6 +665,9 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
                 
             }];
         }
+        if (self.needPublishStream) {
+            [self startPublishStream];
+        }
     });
 }
 
@@ -736,7 +747,9 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
     NSMutableArray *seatArray = [NSMutableArray array];
     NSArray *remoteUserArray = [self.room.remoteUsers mutableCopy];
     for (RCRTCRemoteUser *user in remoteUserArray) {
-        [seatArray addObject:user.userId];
+        if (![user.userId containsString:@"rc_mc_"]) {
+            [seatArray addObject:user.userId];
+        }
     }
     if (seatArray.count) {
         if (![self.livePageView.subviews containsObject:self.seatContainer]) {
@@ -1007,7 +1020,7 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
     MJWeakSelf;
     [self.room.localUser publishDefaultLiveStreams:^(BOOL isSuccess, RCRTCCode code, RCRTCLiveInfo * _Nullable liveInfo) {
         if (code == RCRTCCodeSuccess) {
-            
+            weakSelf.needPublishStream = NO;
         }
         else {
             [weakSelf MBPShow:@"视频流发布失败"];
@@ -1606,6 +1619,7 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
     }];
 }
 - (void)pauseLiveActionBack:(BOOL)backPreView {
+    self.needPublishStream = NO;
     KSRCPauseLiveMessage *pauseMsg = [[KSRCPauseLiveMessage alloc] init];
     MJWeakSelf;
     [self sendMessage:pauseMsg displayMessage:NO callback:^(BOOL success) {
@@ -1794,8 +1808,9 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
             message.userId = self.createrId;
             message.userName = self.createrName;
             message.seatBan = YES;
+            MJWeakSelf;
             [self sendMessage:message displayMessage:NO callback:^(BOOL success) {
-                            
+                [weakSelf removeSeatMember:YES];
             }];
         }
             break;

KulexiuForTeacher/KulexiuForTeacher/Module/Live/View/SeatListView/LiveMemberSeatCell.m

@@ -41,7 +41,7 @@
         self.callback = callback;
     }
     self.member = member;
-    [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:member.avatar] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[member.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
     self.userName.text = [NSString returnNoNullStringWithString:member.name];
     if (isApply) {
         [self.approveButton setTitle:@"上麦" forState:UIControlStateNormal];