跳转直播间

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

@@ -684,48 +684,44 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "8272C212-EE21-41ED-B0BA-077F7D627D24"
-            shouldBeEnabled = "Yes"
+            uuid = "5B92F24C-589F-4C1C-A286-C93D3204DB38"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Module/Course/View/CourseForLiveCell.m"
+            filePath = "KulexiuForTeacher/Module/Home/Homework/View/HomeworkListCell.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "53"
-            endingLineNumber = "53"
-            landmarkName = "-configWithSource:beforeTime:callback:"
+            startingLineNumber = "64"
+            endingLineNumber = "64"
+            landmarkName = "-configWithSource:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
          <BreakpointContent
-            uuid = "21EF9B34-7339-4858-A87A-FAE0DECB3FFF"
+            uuid = "D1EDB888-A775-447F-94E6-7F5F253F0C85"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Module/Course/Controller/CourseViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "355"
-            endingLineNumber = "355"
-            landmarkName = "-getCourseByDate:"
-            landmarkType = "7">
+            breakpointStackSelectionBehavior = "1"
+            scope = "1"
+            stopOnStyle = "0">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "5B92F24C-589F-4C1C-A286-C93D3204DB38"
-            shouldBeEnabled = "No"
+            uuid = "CDACD52A-B7CC-4644-AC66-4556DD17D414"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Module/Home/Homework/View/HomeworkListCell.m"
+            filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "64"
-            endingLineNumber = "64"
-            landmarkName = "-configWithSource:"
+            startingLineNumber = "1791"
+            endingLineNumber = "1791"
+            landmarkName = "-showAnimationView:showMessag:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.m

@@ -1128,7 +1128,7 @@
     [parm setValue:coverPic forKey:@"coverPic"];
     [parm setValue:liveRemark forKey:@"liveRemark"];
     [parm setValue:roomTitle forKey:@"roomTitle"];
-    [parm setValue:@(400) forKey:@"liveTime"];
+    [parm setValue:@(40) forKey:@"liveTime"];
     [self request:post andWithUrl:url and:parm success:success faliure:faliure];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Course/Controller/CourseViewController.m

@@ -589,7 +589,7 @@
 
 - (void)liveCourseDetail:(NSString *)courseId courseGroupId:(NSString *)courseGroupId {
     KSBaseWKWebViewController *ctrl = [[KSBaseWKWebViewController alloc] init];
-    ctrl.url = [NSString stringWithFormat:@"%@/#/liveDetail?groupId=%@&classId=%@", WEBHOST, courseGroupId,courseId];
+    ctrl.url = [NSString stringWithFormat:@"%@/#/liveDetail?joinRoom=1&groupId=%@&classId=%@", WEBHOST, courseGroupId,courseId];
     [self.navigationController pushViewController:ctrl animated:YES];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Controller/HomeViewController.m

@@ -417,7 +417,7 @@
     }
     else {
         KSBaseWKWebViewController *ctrl = [[KSBaseWKWebViewController alloc] init];
-        ctrl.url = [NSString stringWithFormat:@"%@/#/liveDetail?groupId=%@&classId=%@", WEBHOST, courseModel.courseGroupId,courseModel.courseId];
+        ctrl.url = [NSString stringWithFormat:@"%@/#/liveDetail?joinRoom=1&groupId=%@&classId=%@", WEBHOST, courseModel.courseGroupId,courseModel.courseId];
         [self.navigationController pushViewController:ctrl animated:YES];
     }
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonBodyView.m

@@ -481,7 +481,7 @@
     else { // 直播课程组详情
         LiveLessonModel *model = self.dataArray[indexPath.row];
         KSBaseWKWebViewController *ctrl = [[KSBaseWKWebViewController alloc] init];
-        NSString *url = [NSString stringWithFormat:@"%@/#/liveDetail?groupId=%@&classId=%@", WEBHOST, model.courseGroupId,model.courseId];
+        NSString *url = [NSString stringWithFormat:@"%@/#/liveDetail?joinRoom=1&groupId=%@&classId=%@", WEBHOST, model.courseGroupId,model.courseId];
         ctrl.url = url;
         [self.naviController pushViewController:ctrl animated:YES];
         

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

@@ -525,10 +525,10 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
     [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.livePageView);
         if (@available(iOS 11.0, *)) {
-            make.bottom.mas_equalTo(self.livePageView.mas_safeAreaLayoutGuideBottom).offset(-10);
+            make.bottom.mas_equalTo(self.livePageView.mas_safeAreaLayoutGuideBottom).offset(-5);
         } else {
             // Fallback on earlier versions
-            make.bottom.mas_equalTo(self.livePageView.mas_bottom).offset(-10);
+            make.bottom.mas_equalTo(self.livePageView.mas_bottom).offset(-5);
         }
         make.height.mas_equalTo(44);
     }];
@@ -536,8 +536,8 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
     [self.messageContentView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(self.livePageView.mas_left);
         make.right.mas_equalTo(self.livePageView.mas_right);
-        make.bottom.mas_equalTo(self.bottomView.mas_top).offset(-10);
-        make.height.mas_equalTo(270);
+        make.bottom.mas_equalTo(self.bottomView.mas_top).offset(-5);
+        make.height.mas_equalTo(180);
     }];
     [self.livePageView addSubview:self.inputBar];
     [_inputBar setBackgroundColor: [UIColor whiteColor]];
@@ -548,7 +548,7 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
     [self.messageContentView addSubview:self.conversationMessageTableView];
     [self.conversationMessageTableView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.top.mas_equalTo(self.messageContentView);
-        make.width.mas_equalTo(240);
+        make.width.mas_equalTo(KPortraitWidth);
         make.bottom.mas_equalTo(self.messageContentView.mas_bottom);
     }];
     
@@ -1782,6 +1782,9 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
         return;
     }
     else {
+        if (self.pageType == LIVEPAGE_PREVIEW) {
+            return;
+        }
         ANIMATIONTYPE type = isJoinRoom ? ANIMATIONTYPE_JOIN : ANIMATIONTYPE_RUSH;
         self.animationView = [[LiveAnimationView alloc] initWithTitle:message animationType:type];
         [self.view addSubview:self.animationView];

KulexiuForTeacher/KulexiuForTeacher/Module/Live/View/KSChatroomTextCell.m

@@ -43,7 +43,7 @@
     [self.containerView addSubview:self.contentLabel];
     [self.containerView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(self.contentView.mas_left).offset(8);
-        make.right.lessThanOrEqualTo(self.contentView.mas_right).offset(-8);
+        make.right.lessThanOrEqualTo(self.contentView.mas_right).offset(-(KPortraitWidth / 3));
         make.top.mas_equalTo(self.contentView.mas_top).offset(3);
         make.bottom.mas_equalTo(self.contentView.mas_bottom).offset(-3);
     }];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/LiveCourse/View/MyLiveCourseBodyView.m

@@ -223,7 +223,7 @@
 
 - (void)displayLiveCourseDetailWithGroupId:(NSString *)groupId {
     KSBaseWKWebViewController *ctrl = [[KSBaseWKWebViewController alloc] init];
-    NSString *url = [NSString stringWithFormat:@"%@%@%@", WEBHOST, @"/#/liveDetail?groupId=",groupId];
+    NSString *url = [NSString stringWithFormat:@"%@%@%@", WEBHOST, @"/#/liveDetail?joinRoom=1&groupId=",groupId];
     ctrl.url = url;
     [self.naviController pushViewController:ctrl animated:YES];
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageCourseView.m

@@ -353,7 +353,7 @@
     if (self.selectIndex == 2) { // 直播课详情
         LiveCourseModel *model = self.dataArray[indexPath.row];
         KSBaseWKWebViewController *ctrl = [[KSBaseWKWebViewController alloc] init];
-        NSString *url = [NSString stringWithFormat:@"%@%@%.0f", WEBHOST, @"/#/liveDetail?groupId=",model.courseGroupId];
+        NSString *url = [NSString stringWithFormat:@"%@%@%.0f", WEBHOST, @"/#/liveDetail?joinRoom=1&groupId=",model.courseGroupId];
         ctrl.url = url;
         [self.naviController pushViewController:ctrl animated:YES];
     }