Forráskód Böngészése

修复网络教室video list列表偶现麦克风摄像头状态错误的问题

Steven 1 éve
szülő
commit
adc7eac189

+ 2 - 2
KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -6284,10 +6284,10 @@
 			children = (
 				BCC0F6CB2A8CE06800C4EFA4 /* KSBeatView.h */,
 				BCC0F6CC2A8CE06800C4EFA4 /* KSBeatView.m */,
-				BCC0F6152A8CD8F400C4EFA4 /* TXClassroomVideoListCell.m */,
-				BCC0F6162A8CD8F400C4EFA4 /* TXClassroomVideoListView.m */,
 				BCC0F6172A8CD8F400C4EFA4 /* TXClassroomVideoListCell.h */,
+				BCC0F6152A8CD8F400C4EFA4 /* TXClassroomVideoListCell.m */,
 				BCC0F6182A8CD8F400C4EFA4 /* TXClassroomVideoListView.h */,
+				BCC0F6162A8CD8F400C4EFA4 /* TXClassroomVideoListView.m */,
 			);
 			path = VideoList;
 			sourceTree = "<group>";

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/VideoList/TXClassroomVideoListCell.h

@@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)setModel:(RoomMember *)member showTeacherPrompt:(BOOL)teacherPrompt;
 
-- (void)renderVideo:(RoomMember *)member;
+//- (void)renderVideo:(RoomMember *)member;
 
 - (void)updateQuality:(TXNetWorkingStatus)quality;
 

+ 10 - 8
KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/VideoList/TXClassroomVideoListCell.m

@@ -167,13 +167,15 @@
         self.roleView.hidden = YES;
     }
     else {
-        [self.avatarView sd_setImageWithURL:[NSURL URLWithString:[member.headUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+        RoomMember *roomMember = [[ClassroomService sharedService].currentRoom getMember:member.userId];
 
-        self.member = member;
-        self.userId = member.userId;
-        [self remakeNameLable:member];
+        [self.avatarView sd_setImageWithURL:[NSURL URLWithString:[roomMember.headUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
 
-        if (([member.userId isEqualToString:[ClassroomService sharedService].currentRoom.teacher.userId])) {
+        self.member = roomMember;
+        self.userId = roomMember.userId;
+        [self remakeNameLable:roomMember];
+
+        if (([roomMember.userId isEqualToString:[ClassroomService sharedService].currentRoom.teacher.userId])) {
             self.roleView.hidden = NO;
             if (teacherPrompt) {
                 self.promptLable.text = @"讲师正在授课";
@@ -191,7 +193,7 @@
             }
         }
         else {
-            if (([member.userId isEqualToString:[ClassroomService sharedService].currentRoom.currentMemberId])) {
+            if (([roomMember.userId isEqualToString:[ClassroomService sharedService].currentRoom.currentMemberId])) {
                 self.roleView.hidden = NO;
                 self.roleView.backgroundColor = HexRGB(0xFE5219);
                 self.roleLabel.text = @"我";
@@ -206,10 +208,10 @@
                 
             }
             // 判断是否显示举手按钮
-            self.handView.hidden = !member.handUpOn;
+            self.handView.hidden = !roomMember.handUpOn;
         }
         
-        [self renderVideo:member];
+        [self renderVideo:roomMember];
     }
 }
 

+ 3 - 1
KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/VideoList/TXClassroomVideoListView.m

@@ -155,11 +155,13 @@
         for(int i = 0;i < self.videoDataSource.count; i++) {
             RoomMember *member = self.videoDataSource[i];
             if([member.userId isEqualToString:userId]) {
+                RoomMember *currentMember = [[ClassroomService sharedService].currentRoom getMember:userId];
+
                 NSIndexPath *index = [NSIndexPath indexPathForRow:i inSection:0];
                 dispatch_async(dispatch_get_main_queue(), ^{
                     TXClassroomVideoListCell * cell = [self.videoListTableView cellForRowAtIndexPath:index];
                     if (cell) {
-                        [cell updateUserVolume:volume isCloseMic:!member.microphoneEnable];
+                        [cell updateUserVolume:volume isCloseMic:!currentMember.microphoneEnable];
                     }
                 });
             }