Ver código fonte

直播功能完善

Steven 3 anos atrás
pai
commit
8a02b0dfeb

BIN
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate


+ 4 - 20
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -30,8 +30,8 @@
             filePath = "KulexiuForTeacher/Module/Live/Controller/LiveVideoRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "342"
-            endingLineNumber = "342"
+            startingLineNumber = "350"
+            endingLineNumber = "350"
             landmarkName = "-didPublishStreams:"
             landmarkType = "7">
          </BreakpointContent>
@@ -46,27 +46,11 @@
             filePath = "KulexiuForTeacher/Module/Live/Controller/LiveVideoRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "347"
-            endingLineNumber = "347"
+            startingLineNumber = "355"
+            endingLineNumber = "355"
             landmarkName = "-subscribeRemoteResource:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "3B221876-4402-4D21-858B-AA325637EF5C"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Module/Live/View/SeatContentView.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "102"
-            endingLineNumber = "102"
-            landmarkName = "-queryUserInfoWithUserId:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 10 - 9
KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveVideoRoomViewController.m

@@ -205,6 +205,14 @@
         make.bottom.mas_equalTo(self.messageContentView.mas_bottom);
     }];
     
+    [self.view addSubview:self.seatApplyTips];
+    [self.seatApplyTips hideView];
+    [self.seatApplyTips mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.bottom.mas_equalTo(self.bottomView.mas_top).offset(2);
+        make.height.mas_equalTo(20);
+        make.left.mas_equalTo(self.bottomView.mas_right).offset(-72);
+    }];
+    
     UITapGestureRecognizer *resetBottomTapGesture =[[UITapGestureRecognizer alloc]
                                                     initWithTarget:self
                                                     action:@selector(resetBottomGesture:)];
@@ -681,19 +689,12 @@
 
 - (void)showSeatTips:(NSInteger)count {
     NSString *countDesc = count >= 100 ? @"99+" : [NSString stringWithFormat:@"%zd",count];
-    if (![self.view.subviews containsObject:self.seatApplyTips]) {
-        [self.view addSubview:self.seatApplyTips];
-        [self.seatApplyTips mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.bottom.mas_equalTo(self.bottomView.mas_top).offset(2);
-            make.height.mas_equalTo(20);
-            make.left.mas_equalTo(self.bottomView.mas_right).offset(-72);
-        }];
-    }
     [self.seatApplyTips configCountMessage:countDesc];
+    [self.seatApplyTips showTipsView];
 }
 
 - (void)hideSeatTips {
-    [self.seatApplyTips removeFromSuperview];
+    [self.seatApplyTips hideView];
 }
 // 发送人数同步消息
 - (void)sendMemberCountMessage {

+ 1 - 3
KulexiuForTeacher/KulexiuForTeacher/Module/Live/Model/KSEnterLiveroomManager.m

@@ -14,7 +14,6 @@
     [KSNetworkingManager liveRoomJoinRoomRequest:KS_GET roomUid:roomId success:^(NSDictionary * _Nonnull dic) {
         callback();
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
-            [dic setValue:@"COOLESHOW-TEMP-7-1648802348522" forKey:@"roomUid"];
             [self joinRoomWithMessage:[dic dictionaryValueForKey:@"data"] controller:navCtrl];
         }
         else {
@@ -27,8 +26,7 @@
 
 + (void)joinRoomWithMessage:(NSDictionary *)source controller:(CustomNavViewController *)navCtrl {
     LiveVideoRoomViewController *liveVC = [[LiveVideoRoomViewController alloc] init];
-//    liveVC.roomId = [source stringValueForKey:@"roomUid"];
-    liveVC.roomId = @"COOLESHOW-TEMP-7-1648802348522";
+    liveVC.roomId = [source stringValueForKey:@"roomUid"];
     liveVC.liveRoleType = RCRTCLiveRoleTypeBroadcaster;
     liveVC.createrId = [source stringValueForKey:@"speakerId"];
     liveVC.createrName = [source stringValueForKey:@"speakerName"];

+ 4 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Live/View/SeatTipsView.h

@@ -13,6 +13,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)configCountMessage:(NSString *)countString;
 
+- (void)showTipsView;
+
+- (void)hideView;
+
 @end
 
 NS_ASSUME_NONNULL_END

+ 8 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Live/View/SeatTipsView.m

@@ -29,6 +29,7 @@
             make.right.mas_equalTo(self.mas_right).offset(-7);
             make.bottom.mas_equalTo(self.mas_bottom).offset(-2);
         }];
+        [self hideView];
     }
     return self;
 }
@@ -52,6 +53,13 @@
     self.countLabel.text = countString;
 }
 
+- (void)showTipsView {
+    self.hidden = NO;
+}
+- (void)hideView {
+    self.hidden = YES;
+}
+
 - (UILabel *)countLabel {
     if (!_countLabel) {
         _countLabel = [[UILabel alloc] init];