修改网络教室曲目ID接收和传参类型为string

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/Controller/TXClassroomViewController.m

@@ -790,7 +790,7 @@
         });
     }
     else {
-        if (currentMember.musicScoreAccompanimentId != 0) { // 如果有记录当前播放曲目
+        if (![NSString isEmptyString:currentMember.musicScoreAccompanimentId]) { // 如果有记录当前播放曲目
             BOOL needPlay = currentMember.accompanimentPlayStatus || currentMember.playStatus;
             if (needPlay) {
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/Service/TXClassroom/ClassroomService.m

@@ -214,47 +214,6 @@ isAudience:(BOOL)audience
                               }];
 }
 
-// 操作全员设备
-- (void)enableMutilMemberDevice:(BOOL)enable
-                           type:(DeviceType)type
-                         songId:(NSInteger)songId
-                    soundVolume:(NSInteger)soundVolume
-                        forUser:(NSString *)userId {
-    
-    if (![self checkWhetherInRoom]) {
-        [self callbackFailureDescription:ErrorCodeUserNotExistInRoom];
-        return;
-    }
-    NSMutableDictionary *dic = [[NSMutableDictionary alloc] init];
-    [dic setObject:self.currentRoom.roomId forKey:@"roomId"];
-    [dic setValue:[self getDeviceTypeWithEnum:type] forKey:@"deviceType"];
-    [dic setValue:@(enable) forKey:@"enable"];
-     if (DeviceTypeMusicScore == type) { // 原音
-        [dic setObject:@(songId) forKey:@"musicScoreAccompanimentId"];
-        [dic setObject:@(soundVolume) forKey:@"soundVolume"];
-    }
-    else if (DeviceTypeAccompany == type) { // 伴奏
-        [dic setObject:@(songId) forKey:@"musicScoreAccompanimentId"];
-        [dic setObject:@(soundVolume) forKey:@"soundVolume"];
-    }
-    
-    if (![NSString isEmptyString:userId]) {
-        [dic setObject:userId forKey:@"userId"];
-    }
-    [dic setValue:@"STUDENT" forKey:@"clientType"];
-
-    [HTTPUtility requestWithHTTPMethod:HTTPMethodPost
-                             URLString:@"/room/device/batchControl"
-                            parameters:dic
-                              response:^(HTTPResult *result) {
-        if (result.success) {
-            
-        } else {
-            [self callbackFailureDescription:result.errorCode];
-        }
-    }];
-}
-
 - (void)enableMutiMicOff:(BOOL)cancelMuteFlag setMicOff:(BOOL)setMicOff {
     if (![self checkWhetherInRoom]) {
         [self callbackFailureDescription:ErrorCodeUserNotExistInRoom];
@@ -516,14 +475,14 @@ isAudience:(BOOL)audience
         }
         else if (msg.type == DeviceTypeAccompany) { // 伴奏
             self.currentRoom.soundVolume = msg.soundVolume;
-            [self.currentRoom updateMember:userId forAccompany:msg.enable songId:[msg.songId intValue]];
+            [self.currentRoom updateMember:userId forAccompany:msg.enable songId:msg.songId];
             if ([self.classroomDelegate respondsToSelector:@selector(controlDeviceDidEnable:type:forUser:)]) {
                 [self.classroomDelegate controlDeviceDidEnable:msg.enable type:DeviceTypeAccompany forUser:[self.currentRoom getMember:userId]];
             }
         }
         else if (msg.type == DeviceTypeMusicScore) { // 原声
             self.currentRoom.soundVolume = msg.soundVolume;
-            [self.currentRoom updateMember:userId forMusicScore:msg.enable songId:[msg.songId intValue]];
+            [self.currentRoom updateMember:userId forMusicScore:msg.enable songId:msg.songId];
             if ([self.classroomDelegate respondsToSelector:@selector(controlDeviceDidEnable:type:forUser:)]) {
                 [self.classroomDelegate controlDeviceDidEnable:msg.enable type:DeviceTypeMusicScore forUser:[self.currentRoom getMember:userId]];
             }
@@ -657,7 +616,7 @@ isAudience:(BOOL)audience
             if (!isEmpty) {
                 // 记录曲目
                 ClassSongMessage *songMessage = [[ClassSongMessage alloc] init];
-                songMessage.musicScoreAccompanimentId = msg.examSongId.intValue;
+                songMessage.musicScoreAccompanimentId = msg.examSongId;
                 songMessage.speed = msg.speed;
                 songMessage.url = msg.url;
                 songMessage.mp3Url = msg.mp3Url;

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/Service/TXClassroom/Message/TXClassroomDeviceMsg.h

@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, assign) DeviceType type;
 
-@property (nonatomic, assign) int songId;
+@property (nonatomic, strong) NSString *songId;
 @property (nonatomic, assign) int soundVolume;
 @end
 

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/Service/TXClassroom/Message/TXClassroomDeviceMsg.m

@@ -17,8 +17,12 @@
     [content setValue:[self.userInfo getUserInfoDic] forKey:@"sendUserInfo"];
     [content setValue:@(self.enable) forKey:@"enable"];
     [content setValue:@(self.type) forKey:@"type"];
+    [content setValue:self.songId forKey:@"musicScoreAccompanimentId"];
+    [content setValue:@(self.soundVolume) forKey:@"soundVolume"];
     [parm setValue:self.objectName forKey:@"objectName"];
+    
     [parm setValue:content forKey:@"content"];
+    
     return [NSJSONSerialization dataWithJSONObject:parm options:kNilOptions error:nil];
 
 }
@@ -37,6 +41,9 @@
     self.userInfo = [TXClassroomUserInfo evaluateUserInfo:[content ks_dictionaryValueForKey:@"sendUserInfo"]];
     self.enable = [content ks_boolValueForKey:@"enable"];
     self.type = [content ks_integerValueForKey:@"type"];
+    self.songId = [content ks_stringValueForKey:@"musicScoreAccompanimentId"];
+    self.soundVolume = [content ks_intValueForKey:@"soundVolume"];
+
 }
 
 + (NSString *)getObjectName {

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/Service/TXClassroom/Model/ClassSongMessage.h

@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface ClassSongMessage : NSObject
 
-@property (nonatomic, assign) int musicScoreAccompanimentId;
+@property (nonatomic, strong) NSString *musicScoreAccompanimentId;
 @property (nonatomic, assign) BOOL accompanimentPlayStatus;
 @property (nonatomic, assign) BOOL downStatus;
 @property (nonatomic, assign) BOOL playStatus;

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/Service/TXClassroom/Model/ClassSongMessage.m

@@ -12,7 +12,7 @@
 
 + (instancetype)messageFromJson:(NSDictionary *)dic {
     ClassSongMessage *message = [[ClassSongMessage alloc] init];
-    message.musicScoreAccompanimentId = [dic ks_intValueForKey:@"musicScoreAccompanimentId"];
+    message.musicScoreAccompanimentId = [dic ks_stringValueForKey:@"musicScoreAccompanimentId"];
     message.accompanimentPlayStatus = [dic ks_boolValueForKey:@"accompanimentPlayStatus"];
     message.downStatus = [dic ks_boolValueForKey:@"downStatus"];
     message.playStatus = [dic ks_boolValueForKey:@"playStatus"];

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/Service/TXClassroom/Model/Classroom.h

@@ -77,9 +77,9 @@ typedef NS_ENUM(NSUInteger, DisplayType) {
 
 - (void)updateMember:(NSString *)userId forExamSong:(BOOL)enable;
 
-- (void)updateMember:(NSString *)userId forMusicScore:(BOOL)enable songId:(int)songId;
+- (void)updateMember:(NSString *)userId forMusicScore:(BOOL)enable songId:(NSString *)songId;
 
-- (void)updateMember:(NSString *)userId forAccompany:(BOOL)enable songId:(int)songId;
+- (void)updateMember:(NSString *)userId forAccompany:(BOOL)enable songId:(NSString *)songId;
 
 - (void)updateMemberAccompamy:(NSString *)userId songMessage:(ClassSongMessage *)songMessage;
 

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/Service/TXClassroom/Model/Classroom.m

@@ -116,14 +116,14 @@
     [self updateMemeber:member];
 }
 
-- (void)updateMember:(NSString *)userId forMusicScore:(BOOL)enable songId:(int)songId {
+- (void)updateMember:(NSString *)userId forMusicScore:(BOOL)enable songId:(NSString *)songId {
     RoomMember *member = [self getMember:userId];
     member.musicScoreAccompanimentId = songId;
     member.playStatus = enable;
     member.accompanimentPlayStatus = NO;
     // 获取成员当前曲目
     for (ClassSongMessage *songMessage in member.songMessage) {
-        if (songMessage.musicScoreAccompanimentId == songId) {
+        if ([songMessage.musicScoreAccompanimentId isEqualToString:songId]) {
             member.url = songMessage.url;
             member.mp3Url = songMessage.mp3Url;
             break;
@@ -132,14 +132,14 @@
     [self updateMemeber:member];
 }
 
-- (void)updateMember:(NSString *)userId forAccompany:(BOOL)enable songId:(int)songId {
+- (void)updateMember:(NSString *)userId forAccompany:(BOOL)enable songId:(NSString *)songId {
     RoomMember *member = [self getMember:userId];
     member.accompanimentPlayStatus = enable;
     member.playStatus = NO;
     member.musicScoreAccompanimentId = songId;
     // 获取成员当前曲目
     for (ClassSongMessage *songMessage in member.songMessage) {
-        if (songMessage.musicScoreAccompanimentId == songId) {
+        if ([songMessage.musicScoreAccompanimentId isEqualToString:songId]) {
             member.url = songMessage.url;
             member.mp3Url = songMessage.mp3Url;
             break;
@@ -153,7 +153,7 @@
     RoomMember *member = [self getMember:userId];
     BOOL hasRecordSong = NO;
     for (ClassSongMessage *recordSongMessage in member.songMessage) {
-        if (songMessage.musicScoreAccompanimentId == recordSongMessage.musicScoreAccompanimentId) {
+        if ([songMessage.musicScoreAccompanimentId isEqualToString:recordSongMessage.musicScoreAccompanimentId]) {
             hasRecordSong = YES;
             break;
         }

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/Service/TXClassroom/Model/RoomMember.h

@@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong) NSMutableArray *songMessage;
 
-@property (nonatomic, assign) int musicScoreAccompanimentId;
+@property (nonatomic, strong) NSString *musicScoreAccompanimentId;
 @property (nonatomic, assign) BOOL accompanimentPlayStatus;
 @property (nonatomic, assign) int downStatus;
 @property (nonatomic, assign) BOOL playStatus;

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/Service/TXClassroom/Model/RoomMember.m

@@ -37,7 +37,7 @@
         [member.songMessage addObject:songModel];
         // 如果当前在播放伴奏或原声
         if ([parm ks_boolValueForKey:@"playStatus"] || [parm ks_boolValueForKey:@"accompanimentPlayStatus"]) {
-            member.musicScoreAccompanimentId = [parm ks_intValueForKey:@"musicScoreAccompanimentId"];
+            member.musicScoreAccompanimentId = [parm ks_stringValueForKey:@"musicScoreAccompanimentId"];
             member.accompanimentPlayStatus = [parm ks_boolValueForKey:@"accompanimentPlayStatus"];
             member.downStatus = [parm ks_intValueForKey:@"downStatus"];
             member.playStatus = [parm ks_boolValueForKey:@"playStatus"];