屏蔽声音

MusicGradeExam/MusicGradeExam/UI/Classroom/Service/Classroom/ClassroomService.m

@@ -725,6 +725,7 @@
         }
         else if (msg.action == MemberChangeActionIgnore) { // 屏蔽声音列表
             RoomMember *mem = [self.currentRoom getMember:msg.userId];
+            mem.shieldUserId = msg.shieldUserId;
             if ([self.classroomDelegate respondsToSelector:@selector(memberIgnoreAction:)]) {
                 [self.classroomDelegate memberIgnoreAction:mem];
             }

MusicGradeExam/MusicGradeExam/UI/Classroom/Service/Classroom/Model/Classroom.m

@@ -13,6 +13,8 @@
 @property (nonatomic, copy) NSString *currentMemberId;
 @property (nonatomic, assign) long long joinTime;
 @property (nonatomic, assign) NSInteger surplusTime;
+@property (nonatomic, strong) RoomMember *currentMember;
+
 @end
 
 @implementation Classroom
@@ -34,6 +36,7 @@
     room.memberList = memberList;
     NSDictionary *userDic = dic[@"userInfo"];
     RoomMember *currentMember = [RoomMember memberFromJson:userDic];
+    room.currentMember = currentMember;
     room.currentMemberId = currentMember.userId;
     room.joinTime = currentMember.joinTime;
     
@@ -170,9 +173,9 @@
     return nil;
 }
 
-- (RoomMember *)currentMember {
-    return [self getMember:self.currentMemberId];
-}
+//- (RoomMember *)currentMember {
+//    return [self getMember:self.currentMemberId];
+//}
 
 - (int)getMemberCountWithoutAudience {
     int count = 0;

MusicGradeExam/MusicGradeExam/UI/Classroom/Service/RTCService/RTCService.m

@@ -258,7 +258,7 @@
                 NSString *shieldUserId = curMember.shieldUserId;
                 NSArray *memberIdArray = [shieldUserId componentsSeparatedByString:@","];
                 // 在屏蔽状态下，进入后订阅自动屏蔽对应成员声音
-                if ([memberIdArray containsObject:curMember.userId]) {
+                if ([memberIdArray containsObject:remoteUser.userId]) {
                     for (RongRTCAVInputStream *stream in remoteUser.remoteAVStreams) {
                         if (stream.streamType == RTCMediaTypeAudio) {
                             stream.disable = YES;
@@ -604,7 +604,7 @@
     if(!_captureParam) {
         _captureParam = [[RongRTCVideoCaptureParam alloc] init];
         _captureParam.videoOrientation = AVCaptureVideoOrientationLandscapeRight;
-        _captureParam.videoSizePreset = RongRTCVideoSizePreset720x480;
+        _captureParam.videoSizePreset = RongRTCVideoSizePreset640x480;
 //        _captureParam.maxBitrate = 1000;
         _captureParam.minBitrate = 500;
     }

MusicGradeExam/MusicGradeExam/UI/Login/Controller/RegisterViewController.m

@@ -79,7 +79,7 @@
 - (void)protocalDisplay {
     KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
     webCtrl.hiddenNavBar = NO;
-    webCtrl.url = [NSString stringWithFormat:@"%@/#/userProtocol", WEBHOST];
+    webCtrl.url = [NSString stringWithFormat:@"%@/#/SmallProtocol", WEBHOST];
     [self.navigationController pushViewController:webCtrl animated:YES];
 }
 

MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/Controller/SettingViewController.m

@@ -59,7 +59,7 @@
         case SETTINGTYPE_POLICY:
         {
             KSBaseWKWebViewController *ctrl = [[KSBaseWKWebViewController alloc] init];
-            ctrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/privacy"];
+            ctrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/privacyProtocol"];
             [self.navigationController pushViewController:ctrl animated:YES];
         }
             break;