直播更新

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

@@ -36,5 +36,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "D8787347-799B-4DBE-861B-5DE6C3F36A29"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "679"
+            endingLineNumber = "679"
+            landmarkName = "-updateVideoViewContainer"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Live/liveroom_close.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "liveroom_close@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "liveroom_close@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Live/liveroom_empty.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "liveroom_empty@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "liveroom_empty@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

@@ -333,7 +333,7 @@ static int clickPraiseBtnTimes  = 0;
                 // Fallback on earlier versions
                 make.bottom.mas_equalTo(self.videoContainerView.mas_bottom).offset(-14);
             }
-            make.centerX.mas_equalTo(self.videoContainerView.mas_right).offset(-128);
+            make.centerX.mas_equalTo(self.videoContainerView.mas_right).offset(-84);
             make.width.mas_equalTo(48);
             make.height.mas_equalTo(56);
         }];
@@ -391,7 +391,7 @@ static int clickPraiseBtnTimes  = 0;
         KSLiveChatroomWelcome *joinChatroomMessage = [[KSLiveChatroomWelcome alloc] init];
         [joinChatroomMessage setMsgId:[RCIM sharedRCIM].currentUserInfo.userId];
         MJWeakSelf;
-        [self sendMessage:joinChatroomMessage displayMessage:YES callback:^(BOOL success) {
+        [self sendMessage:joinChatroomMessage displayMessage:NO callback:^(BOOL success) {
             weakSelf.hasSendWelcomeMessage = YES;
             NSString *contentString = [NSString stringWithFormat:@"%@ 进入直播间",UserDefault(NicknameKey)];;
             [weakSelf showAnimationView:YES showMessag:contentString];
@@ -935,7 +935,7 @@ static int clickPraiseBtnTimes  = 0;
         [self connectHostWithStatus:NO];
     }
     self.micStatus = MICSTATUS_NOMAL;
-    [self.seatContainer removeFromSuperview];
+    [self removeSeatContainer];
 }
 
 - (void)resetMicWaitToNomal {
@@ -1160,7 +1160,7 @@ static int clickPraiseBtnTimes  = 0;
         if (stream.mediaType == RTCMediaTypeVideo) {
             streamId = stream.streamId;
             if ([stream.userId isEqualToString:self.createrId]) {
-                self.videoView.streamUserId = @"";
+                [self clearVideoViewSource];
                 self.isCreaterVideoEnable = NO;
                 // 主讲老师停止发布视频流
                 NSLog(@"----- 停止发布视频流");
@@ -1613,7 +1613,7 @@ static int clickPraiseBtnTimes  = 0;
             
             KSLiveChatroomLike *praiseSendMessage = [[KSLiveChatroomLike alloc] init];
             praiseSendMessage.counts = clickPraiseBtnTimes;
-            [weakSelf sendMessage:praiseSendMessage displayMessage:YES callback:^(BOOL success) {
+            [weakSelf sendMessage:praiseSendMessage displayMessage:NO callback:^(BOOL success) {
                 
             }];
             clickPraiseBtnTimes = 0;

KulexiuForStudent/KulexiuForStudent/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);
     }];

KulexiuForStudent/KulexiuForStudent/Module/Live/View/LiveRoomBottomView.xib

@@ -23,7 +23,7 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="liveroom_chat" translatesAutoresizingMaskIntoConstraints="NO" id="7BB-Z5-2eQ">
-                            <rect key="frame" x="206" y="6" width="26" height="26"/>
+                            <rect key="frame" x="208" y="7" width="24" height="24"/>
                         </imageView>
                     </subviews>
                     <color key="backgroundColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="0.25" colorSpace="calibratedRGB"/>
@@ -86,7 +86,6 @@
                         <constraint firstAttribute="height" constant="44" id="M5j-GZ-lq1"/>
                     </constraints>
                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                    <state key="normal" image="live_shop"/>
                     <connections>
                         <action selector="shopAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="Mak-uN-ghX"/>
                     </connections>
@@ -127,8 +126,7 @@
     </objects>
     <resources>
         <image name="like_button" width="38" height="38"/>
-        <image name="live_shop" width="38" height="38"/>
-        <image name="liveroom_chat" width="26" height="26"/>
+        <image name="liveroom_chat" width="24" height="24"/>
         <image name="seat_nomal" width="38" height="38"/>
     </resources>
 </document>

KulexiuForStudent/KulexiuForStudent/Module/Live/View/LiveRoomHeadView.xib

@@ -16,7 +16,7 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yl0-aO-J0L">
                     <rect key="frame" x="11" y="10" width="120" height="38"/>
                     <subviews>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="GvE-me-Ml5">
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="GvE-me-Ml5">
                             <rect key="frame" x="2" y="2" width="34" height="34"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="34" id="7xb-3N-CS9"/>