乐谱接口替换

KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.m

@@ -970,15 +970,14 @@
 }
 
 #pragma mark ---- 老师曲谱列表查询
-// /api-admin/music/sheet/list
+// /api-teacher/music/sheet/list
 + (void)musicListRequest:(NSString *)post auditStatus:(NSString *)auditStatus pageNo:(NSInteger)pageNo pageSize:(NSInteger)pageSize success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
     [self configRequestMethodJSON];
-    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-admin/music/sheet/list"];
+    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/music/sheet/list"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:auditStatus forKey:@"auditStatus"];
-    [parm setValue:@(pageNo) forKey:@"pageNo"];
-    [parm setValue:@(pageSize) forKey:@"pageSize"];
-    [parm setValue:UserDefault(UIDKey) forKey:@"userId"];
+    [parm setValue:@(pageNo) forKey:@"page"];
+    [parm setValue:@(pageSize) forKey:@"rows"];
     [self request:post andWithUrl:url and:parm success:success faliure:faliure];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/Model/MusicMessageModel.h

@@ -1,7 +1,7 @@
 //
 //  MusicMessageModel.h
 //
-//  Created by   on 2022/3/29
+//  Created by Steven  on 2022/5/9
 //  Copyright (c) 2022 __MyCompanyName__. All rights reserved.
 //
 
@@ -11,33 +11,44 @@
 
 @interface MusicMessageModel : NSObject <NSCoding, NSCopying>
 
-@property (nonatomic, strong) NSString *composer;
+@property (nonatomic, strong) NSString *metronomeUrl;
+@property (nonatomic, strong) NSString *musicSheetName;
+@property (nonatomic, assign) double internalBaseClassIdentifier;
 @property (nonatomic, strong) NSString *xmlFileUrl;
+@property (nonatomic, assign) double showFingering;
+@property (nonatomic, strong) NSString *remark;
+@property (nonatomic, assign) double state;
+@property (nonatomic, strong) NSString *url;
+@property (nonatomic, assign) double musicPrice;
+@property (nonatomic, assign) double sortNumber;
+@property (nonatomic, strong) NSString *addUserAvatar;
 @property (nonatomic, strong) NSString *audioType;
-@property (nonatomic, strong) NSString *musicSubject;
+@property (nonatomic, assign) double canEvaluate;
+@property (nonatomic, assign) BOOL delFlag;
+@property (nonatomic, strong) NSString *musicTagNames;
+@property (nonatomic, strong) NSString *subjectNames;
+@property (nonatomic, strong) NSString *chargeType;
 @property (nonatomic, strong) NSString *updateTime;
-@property (nonatomic, assign) double auditStatus;
+@property (nonatomic, assign) double updateBy;
 @property (nonatomic, strong) NSString *musicTag;
-@property (nonatomic, assign) double musicPrice;
-@property (nonatomic, strong) NSString *audioFileUrl;
-@property (nonatomic, assign) double sortNumber;
-@property (nonatomic, assign) double topFlag;
-@property (nonatomic, assign) double playSpeed;
-@property (nonatomic, assign) double internalBaseClassIdentifier;
+@property (nonatomic, strong) NSString *addName;
+@property (nonatomic, strong) NSString *favorite;
+@property (nonatomic, strong) NSString *auditStatus;
 @property (nonatomic, assign) double createBy;
-@property (nonatomic, assign) double updateBy;
-@property (nonatomic, assign) double showFingering;
-@property (nonatomic, strong) NSString *musicSheetName;
-@property (nonatomic, assign) double canEvaluate;
-@property (nonatomic, assign) double hotFlag;
+@property (nonatomic, strong) NSString *midiUrl;
+@property (nonatomic, strong) NSString *topFlag;
+@property (nonatomic, strong) NSString *composer;
+@property (nonatomic, strong) NSString *sourceType;
+@property (nonatomic, strong) NSString *hotFlag;
+@property (nonatomic, strong) NSString *mp3Type;
+@property (nonatomic, assign) double playSpeed;
 @property (nonatomic, strong) NSString *createTime;
-@property (nonatomic, assign) double chargeType;
-@property (nonatomic, strong) NSString *remark;
-@property (nonatomic, assign) double hasBeat;
+@property (nonatomic, strong) NSString *audioFileUrl;
+@property (nonatomic, strong) NSString *hasBeat;
+@property (nonatomic, assign) double auditVersion;
+@property (nonatomic, strong) NSString *musicSubject;
 @property (nonatomic, assign) double userId;
-@property (nonatomic, strong) NSString *avatar;
-@property (nonatomic, strong) NSString *username;
-
+@property (nonatomic, strong) NSString *submitAuditTime;
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
 - (instancetype)initWithDictionary:(NSDictionary *)dict;

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/Model/MusicMessageModel.m

@@ -1,39 +1,52 @@
 //
 //  MusicMessageModel.m
 //
-//  Created by   on 2022/3/29
+//  Created by Steven  on 2022/5/9
 //  Copyright (c) 2022 __MyCompanyName__. All rights reserved.
 //
 
 #import "MusicMessageModel.h"
 
 
-NSString *const kMusicMessageModelComposer = @"composer";
+NSString *const kMusicMessageModelMetronomeUrl = @"metronomeUrl";
+NSString *const kMusicMessageModelMusicSheetName = @"musicSheetName";
+NSString *const kMusicMessageModelId = @"id";
 NSString *const kMusicMessageModelXmlFileUrl = @"xmlFileUrl";
+NSString *const kMusicMessageModelShowFingering = @"showFingering";
+NSString *const kMusicMessageModelRemark = @"remark";
+NSString *const kMusicMessageModelState = @"state";
+NSString *const kMusicMessageModelUrl = @"url";
+NSString *const kMusicMessageModelMusicPrice = @"musicPrice";
+NSString *const kMusicMessageModelSortNumber = @"sortNumber";
+NSString *const kMusicMessageModelAddUserAvatar = @"addUserAvatar";
 NSString *const kMusicMessageModelAudioType = @"audioType";
-NSString *const kMusicMessageModelMusicSubject = @"musicSubject";
+NSString *const kMusicMessageModelCanEvaluate = @"canEvaluate";
+NSString *const kMusicMessageModelDelFlag = @"delFlag";
+NSString *const kMusicMessageModelMusicTagNames = @"musicTagNames";
+NSString *const kMusicMessageModelSubjectNames = @"subjectNames";
+NSString *const kMusicMessageModelChargeType = @"chargeType";
 NSString *const kMusicMessageModelUpdateTime = @"updateTime";
-NSString *const kMusicMessageModelAuditStatus = @"auditStatus";
+NSString *const kMusicMessageModelUpdateBy = @"updateBy";
 NSString *const kMusicMessageModelMusicTag = @"musicTag";
-NSString *const kMusicMessageModelMusicPrice = @"musicPrice";
-NSString *const kMusicMessageModelAudioFileUrl = @"audioFileUrl";
-NSString *const kMusicMessageModelSortNumber = @"sortNumber";
-NSString *const kMusicMessageModelTopFlag = @"topFlag";
-NSString *const kMusicMessageModelPlaySpeed = @"playSpeed";
-NSString *const kMusicMessageModelId = @"id";
+NSString *const kMusicMessageModelAddName = @"addName";
+NSString *const kMusicMessageModelFavorite = @"favorite";
+NSString *const kMusicMessageModelAuditStatus = @"auditStatus";
 NSString *const kMusicMessageModelCreateBy = @"createBy";
-NSString *const kMusicMessageModelUpdateBy = @"updateBy";
-NSString *const kMusicMessageModelShowFingering = @"showFingering";
-NSString *const kMusicMessageModelMusicSheetName = @"musicSheetName";
-NSString *const kMusicMessageModelCanEvaluate = @"canEvaluate";
+NSString *const kMusicMessageModelMidiUrl = @"midiUrl";
+NSString *const kMusicMessageModelTopFlag = @"topFlag";
+NSString *const kMusicMessageModelComposer = @"composer";
+NSString *const kMusicMessageModelSourceType = @"sourceType";
 NSString *const kMusicMessageModelHotFlag = @"hotFlag";
+NSString *const kMusicMessageModelMp3Type = @"mp3Type";
+NSString *const kMusicMessageModelPlaySpeed = @"playSpeed";
 NSString *const kMusicMessageModelCreateTime = @"createTime";
-NSString *const kMusicMessageModelChargeType = @"chargeType";
-NSString *const kMusicMessageModelRemark = @"remark";
+NSString *const kMusicMessageModelAudioFileUrl = @"audioFileUrl";
 NSString *const kMusicMessageModelHasBeat = @"hasBeat";
+NSString *const kMusicMessageModelAuditVersion = @"auditVersion";
+NSString *const kMusicMessageModelMusicSubject = @"musicSubject";
 NSString *const kMusicMessageModelUserId = @"userId";
-NSString *const kMusicMessageModelAvatar = @"avatar";
-NSString *const kMusicMessageModelUsername = @"username";
+NSString *const kMusicMessageModelSubmitAuditTime = @"submitAuditTime";
+
 
 @interface MusicMessageModel ()
 
@@ -43,32 +56,44 @@ NSString *const kMusicMessageModelUsername = @"username";
 
 @implementation MusicMessageModel
 
-@synthesize composer = _composer;
+@synthesize metronomeUrl = _metronomeUrl;
+@synthesize musicSheetName = _musicSheetName;
+@synthesize internalBaseClassIdentifier = _internalBaseClassIdentifier;
 @synthesize xmlFileUrl = _xmlFileUrl;
+@synthesize showFingering = _showFingering;
+@synthesize remark = _remark;
+@synthesize state = _state;
+@synthesize url = _url;
+@synthesize musicPrice = _musicPrice;
+@synthesize sortNumber = _sortNumber;
+@synthesize addUserAvatar = _addUserAvatar;
 @synthesize audioType = _audioType;
-@synthesize musicSubject = _musicSubject;
+@synthesize canEvaluate = _canEvaluate;
+@synthesize delFlag = _delFlag;
+@synthesize musicTagNames = _musicTagNames;
+@synthesize subjectNames = _subjectNames;
+@synthesize chargeType = _chargeType;
 @synthesize updateTime = _updateTime;
-@synthesize auditStatus = _auditStatus;
+@synthesize updateBy = _updateBy;
 @synthesize musicTag = _musicTag;
-@synthesize musicPrice = _musicPrice;
-@synthesize audioFileUrl = _audioFileUrl;
-@synthesize sortNumber = _sortNumber;
-@synthesize topFlag = _topFlag;
-@synthesize playSpeed = _playSpeed;
-@synthesize internalBaseClassIdentifier = _internalBaseClassIdentifier;
+@synthesize addName = _addName;
+@synthesize favorite = _favorite;
+@synthesize auditStatus = _auditStatus;
 @synthesize createBy = _createBy;
-@synthesize updateBy = _updateBy;
-@synthesize showFingering = _showFingering;
-@synthesize musicSheetName = _musicSheetName;
-@synthesize canEvaluate = _canEvaluate;
+@synthesize midiUrl = _midiUrl;
+@synthesize topFlag = _topFlag;
+@synthesize composer = _composer;
+@synthesize sourceType = _sourceType;
 @synthesize hotFlag = _hotFlag;
+@synthesize mp3Type = _mp3Type;
+@synthesize playSpeed = _playSpeed;
 @synthesize createTime = _createTime;
-@synthesize chargeType = _chargeType;
-@synthesize remark = _remark;
+@synthesize audioFileUrl = _audioFileUrl;
 @synthesize hasBeat = _hasBeat;
+@synthesize auditVersion = _auditVersion;
+@synthesize musicSubject = _musicSubject;
 @synthesize userId = _userId;
-@synthesize avatar = _avatar;
-@synthesize username = _username;
+@synthesize submitAuditTime = _submitAuditTime;
 
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
@@ -83,32 +108,45 @@ NSString *const kMusicMessageModelUsername = @"username";
     // This check serves to make sure that a non-NSDictionary object
     // passed into the model class doesn't break the parsing.
     if(self && [dict isKindOfClass:[NSDictionary class]]) {
-        self.composer = [self objectOrNilForKey:kMusicMessageModelComposer fromDictionary:dict];
-        self.xmlFileUrl = [self objectOrNilForKey:kMusicMessageModelXmlFileUrl fromDictionary:dict];
-        self.audioType = [self objectOrNilForKey:kMusicMessageModelAudioType fromDictionary:dict];
-        self.musicSubject = [self objectOrNilForKey:kMusicMessageModelMusicSubject fromDictionary:dict];
-        self.updateTime = [self objectOrNilForKey:kMusicMessageModelUpdateTime fromDictionary:dict];
-        self.auditStatus = [[self objectOrNilForKey:kMusicMessageModelAuditStatus fromDictionary:dict] doubleValue];
-        self.musicTag = [self objectOrNilForKey:kMusicMessageModelMusicTag fromDictionary:dict];
-        self.musicPrice = [[self objectOrNilForKey:kMusicMessageModelMusicPrice fromDictionary:dict] doubleValue];
-        self.audioFileUrl = [self objectOrNilForKey:kMusicMessageModelAudioFileUrl fromDictionary:dict];
-        self.sortNumber = [[self objectOrNilForKey:kMusicMessageModelSortNumber fromDictionary:dict] doubleValue];
-        self.topFlag = [[self objectOrNilForKey:kMusicMessageModelTopFlag fromDictionary:dict] doubleValue];
-        self.playSpeed = [[self objectOrNilForKey:kMusicMessageModelPlaySpeed fromDictionary:dict] doubleValue];
-        self.internalBaseClassIdentifier = [[self objectOrNilForKey:kMusicMessageModelId fromDictionary:dict] doubleValue];
-        self.createBy = [[self objectOrNilForKey:kMusicMessageModelCreateBy fromDictionary:dict] doubleValue];
-        self.updateBy = [[self objectOrNilForKey:kMusicMessageModelUpdateBy fromDictionary:dict] doubleValue];
-        self.showFingering = [[self objectOrNilForKey:kMusicMessageModelShowFingering fromDictionary:dict] doubleValue];
-        self.musicSheetName = [self objectOrNilForKey:kMusicMessageModelMusicSheetName fromDictionary:dict];
-        self.canEvaluate = [[self objectOrNilForKey:kMusicMessageModelCanEvaluate fromDictionary:dict] doubleValue];
-        self.hotFlag = [[self objectOrNilForKey:kMusicMessageModelHotFlag fromDictionary:dict] doubleValue];
-        self.createTime = [self objectOrNilForKey:kMusicMessageModelCreateTime fromDictionary:dict];
-        self.chargeType = [[self objectOrNilForKey:kMusicMessageModelChargeType fromDictionary:dict] doubleValue];
-        self.remark = [self objectOrNilForKey:kMusicMessageModelRemark fromDictionary:dict];
-        self.hasBeat = [[self objectOrNilForKey:kMusicMessageModelHasBeat fromDictionary:dict] doubleValue];
-        self.userId = [[self objectOrNilForKey:kMusicMessageModelUserId fromDictionary:dict] doubleValue];
-        self.avatar = [self objectOrNilForKey:kMusicMessageModelAvatar fromDictionary:dict];
-        self.username = [self objectOrNilForKey:kMusicMessageModelUsername fromDictionary:dict];
+            self.metronomeUrl = [self objectOrNilForKey:kMusicMessageModelMetronomeUrl fromDictionary:dict];
+            self.musicSheetName = [self objectOrNilForKey:kMusicMessageModelMusicSheetName fromDictionary:dict];
+            self.internalBaseClassIdentifier = [[self objectOrNilForKey:kMusicMessageModelId fromDictionary:dict] doubleValue];
+            self.xmlFileUrl = [self objectOrNilForKey:kMusicMessageModelXmlFileUrl fromDictionary:dict];
+            self.showFingering = [[self objectOrNilForKey:kMusicMessageModelShowFingering fromDictionary:dict] doubleValue];
+            self.remark = [self objectOrNilForKey:kMusicMessageModelRemark fromDictionary:dict];
+            self.state = [[self objectOrNilForKey:kMusicMessageModelState fromDictionary:dict] doubleValue];
+            self.url = [self objectOrNilForKey:kMusicMessageModelUrl fromDictionary:dict];
+            self.musicPrice = [[self objectOrNilForKey:kMusicMessageModelMusicPrice fromDictionary:dict] doubleValue];
+            self.sortNumber = [[self objectOrNilForKey:kMusicMessageModelSortNumber fromDictionary:dict] doubleValue];
+            self.addUserAvatar = [self objectOrNilForKey:kMusicMessageModelAddUserAvatar fromDictionary:dict];
+            self.audioType = [self objectOrNilForKey:kMusicMessageModelAudioType fromDictionary:dict];
+            self.canEvaluate = [[self objectOrNilForKey:kMusicMessageModelCanEvaluate fromDictionary:dict] doubleValue];
+            self.delFlag = [[self objectOrNilForKey:kMusicMessageModelDelFlag fromDictionary:dict] boolValue];
+            self.musicTagNames = [self objectOrNilForKey:kMusicMessageModelMusicTagNames fromDictionary:dict];
+            self.subjectNames = [self objectOrNilForKey:kMusicMessageModelSubjectNames fromDictionary:dict];
+            self.chargeType = [self objectOrNilForKey:kMusicMessageModelChargeType fromDictionary:dict];
+            self.updateTime = [self objectOrNilForKey:kMusicMessageModelUpdateTime fromDictionary:dict];
+            self.updateBy = [[self objectOrNilForKey:kMusicMessageModelUpdateBy fromDictionary:dict] doubleValue];
+            self.musicTag = [self objectOrNilForKey:kMusicMessageModelMusicTag fromDictionary:dict];
+            self.addName = [self objectOrNilForKey:kMusicMessageModelAddName fromDictionary:dict];
+            self.favorite = [self objectOrNilForKey:kMusicMessageModelFavorite fromDictionary:dict];
+            self.auditStatus = [self objectOrNilForKey:kMusicMessageModelAuditStatus fromDictionary:dict];
+            self.createBy = [[self objectOrNilForKey:kMusicMessageModelCreateBy fromDictionary:dict] doubleValue];
+            self.midiUrl = [self objectOrNilForKey:kMusicMessageModelMidiUrl fromDictionary:dict];
+            self.topFlag = [self objectOrNilForKey:kMusicMessageModelTopFlag fromDictionary:dict];
+            self.composer = [self objectOrNilForKey:kMusicMessageModelComposer fromDictionary:dict];
+            self.sourceType = [self objectOrNilForKey:kMusicMessageModelSourceType fromDictionary:dict];
+            self.hotFlag = [self objectOrNilForKey:kMusicMessageModelHotFlag fromDictionary:dict];
+            self.mp3Type = [self objectOrNilForKey:kMusicMessageModelMp3Type fromDictionary:dict];
+            self.playSpeed = [[self objectOrNilForKey:kMusicMessageModelPlaySpeed fromDictionary:dict] doubleValue];
+            self.createTime = [self objectOrNilForKey:kMusicMessageModelCreateTime fromDictionary:dict];
+            self.audioFileUrl = [self objectOrNilForKey:kMusicMessageModelAudioFileUrl fromDictionary:dict];
+            self.hasBeat = [self objectOrNilForKey:kMusicMessageModelHasBeat fromDictionary:dict];
+            self.auditVersion = [[self objectOrNilForKey:kMusicMessageModelAuditVersion fromDictionary:dict] doubleValue];
+            self.musicSubject = [self objectOrNilForKey:kMusicMessageModelMusicSubject fromDictionary:dict];
+            self.userId = [[self objectOrNilForKey:kMusicMessageModelUserId fromDictionary:dict] doubleValue];
+            self.submitAuditTime = [self objectOrNilForKey:kMusicMessageModelSubmitAuditTime fromDictionary:dict];
+
     }
     
     return self;
@@ -118,32 +156,45 @@ NSString *const kMusicMessageModelUsername = @"username";
 - (NSDictionary *)dictionaryRepresentation
 {
     NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
-    [mutableDict setValue:self.composer forKey:kMusicMessageModelComposer];
+    [mutableDict setValue:self.metronomeUrl forKey:kMusicMessageModelMetronomeUrl];
+    [mutableDict setValue:self.musicSheetName forKey:kMusicMessageModelMusicSheetName];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.internalBaseClassIdentifier] forKey:kMusicMessageModelId];
     [mutableDict setValue:self.xmlFileUrl forKey:kMusicMessageModelXmlFileUrl];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.showFingering] forKey:kMusicMessageModelShowFingering];
+    [mutableDict setValue:self.remark forKey:kMusicMessageModelRemark];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.state] forKey:kMusicMessageModelState];
+    [mutableDict setValue:self.url forKey:kMusicMessageModelUrl];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.musicPrice] forKey:kMusicMessageModelMusicPrice];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.sortNumber] forKey:kMusicMessageModelSortNumber];
+    [mutableDict setValue:self.addUserAvatar forKey:kMusicMessageModelAddUserAvatar];
     [mutableDict setValue:self.audioType forKey:kMusicMessageModelAudioType];
-    [mutableDict setValue:self.musicSubject forKey:kMusicMessageModelMusicSubject];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.canEvaluate] forKey:kMusicMessageModelCanEvaluate];
+    [mutableDict setValue:[NSNumber numberWithBool:self.delFlag] forKey:kMusicMessageModelDelFlag];
+    [mutableDict setValue:self.musicTagNames forKey:kMusicMessageModelMusicTagNames];
+    [mutableDict setValue:self.subjectNames forKey:kMusicMessageModelSubjectNames];
+    [mutableDict setValue:self.chargeType forKey:kMusicMessageModelChargeType];
     [mutableDict setValue:self.updateTime forKey:kMusicMessageModelUpdateTime];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.auditStatus] forKey:kMusicMessageModelAuditStatus];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.updateBy] forKey:kMusicMessageModelUpdateBy];
     [mutableDict setValue:self.musicTag forKey:kMusicMessageModelMusicTag];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.musicPrice] forKey:kMusicMessageModelMusicPrice];
-    [mutableDict setValue:self.audioFileUrl forKey:kMusicMessageModelAudioFileUrl];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.sortNumber] forKey:kMusicMessageModelSortNumber];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.topFlag] forKey:kMusicMessageModelTopFlag];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.playSpeed] forKey:kMusicMessageModelPlaySpeed];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.internalBaseClassIdentifier] forKey:kMusicMessageModelId];
+    [mutableDict setValue:self.addName forKey:kMusicMessageModelAddName];
+    [mutableDict setValue:self.favorite forKey:kMusicMessageModelFavorite];
+    [mutableDict setValue:self.auditStatus forKey:kMusicMessageModelAuditStatus];
     [mutableDict setValue:[NSNumber numberWithDouble:self.createBy] forKey:kMusicMessageModelCreateBy];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.updateBy] forKey:kMusicMessageModelUpdateBy];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.showFingering] forKey:kMusicMessageModelShowFingering];
-    [mutableDict setValue:self.musicSheetName forKey:kMusicMessageModelMusicSheetName];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.canEvaluate] forKey:kMusicMessageModelCanEvaluate];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.hotFlag] forKey:kMusicMessageModelHotFlag];
+    [mutableDict setValue:self.midiUrl forKey:kMusicMessageModelMidiUrl];
+    [mutableDict setValue:self.topFlag forKey:kMusicMessageModelTopFlag];
+    [mutableDict setValue:self.composer forKey:kMusicMessageModelComposer];
+    [mutableDict setValue:self.sourceType forKey:kMusicMessageModelSourceType];
+    [mutableDict setValue:self.hotFlag forKey:kMusicMessageModelHotFlag];
+    [mutableDict setValue:self.mp3Type forKey:kMusicMessageModelMp3Type];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.playSpeed] forKey:kMusicMessageModelPlaySpeed];
     [mutableDict setValue:self.createTime forKey:kMusicMessageModelCreateTime];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.chargeType] forKey:kMusicMessageModelChargeType];
-    [mutableDict setValue:self.remark forKey:kMusicMessageModelRemark];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.hasBeat] forKey:kMusicMessageModelHasBeat];
+    [mutableDict setValue:self.audioFileUrl forKey:kMusicMessageModelAudioFileUrl];
+    [mutableDict setValue:self.hasBeat forKey:kMusicMessageModelHasBeat];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.auditVersion] forKey:kMusicMessageModelAuditVersion];
+    [mutableDict setValue:self.musicSubject forKey:kMusicMessageModelMusicSubject];
     [mutableDict setValue:[NSNumber numberWithDouble:self.userId] forKey:kMusicMessageModelUserId];
-    [mutableDict setValue:self.avatar forKey:kMusicMessageModelAvatar];
-    [mutableDict setValue:self.username forKey:kMusicMessageModelUsername];
+    [mutableDict setValue:self.submitAuditTime forKey:kMusicMessageModelSubmitAuditTime];
+
     return [NSDictionary dictionaryWithDictionary:mutableDict];
 }
 
@@ -170,65 +221,88 @@ NSString *const kMusicMessageModelUsername = @"username";
 {
     self = [super init];
 
-    self.composer = [aDecoder decodeObjectForKey:kMusicMessageModelComposer];
+    self.metronomeUrl = [aDecoder decodeObjectForKey:kMusicMessageModelMetronomeUrl];
+    self.musicSheetName = [aDecoder decodeObjectForKey:kMusicMessageModelMusicSheetName];
+    self.internalBaseClassIdentifier = [aDecoder decodeDoubleForKey:kMusicMessageModelId];
     self.xmlFileUrl = [aDecoder decodeObjectForKey:kMusicMessageModelXmlFileUrl];
+    self.showFingering = [aDecoder decodeDoubleForKey:kMusicMessageModelShowFingering];
+    self.remark = [aDecoder decodeObjectForKey:kMusicMessageModelRemark];
+    self.state = [aDecoder decodeDoubleForKey:kMusicMessageModelState];
+    self.url = [aDecoder decodeObjectForKey:kMusicMessageModelUrl];
+    self.musicPrice = [aDecoder decodeDoubleForKey:kMusicMessageModelMusicPrice];
+    self.sortNumber = [aDecoder decodeDoubleForKey:kMusicMessageModelSortNumber];
+    self.addUserAvatar = [aDecoder decodeObjectForKey:kMusicMessageModelAddUserAvatar];
     self.audioType = [aDecoder decodeObjectForKey:kMusicMessageModelAudioType];
-    self.musicSubject = [aDecoder decodeObjectForKey:kMusicMessageModelMusicSubject];
+    self.canEvaluate = [aDecoder decodeDoubleForKey:kMusicMessageModelCanEvaluate];
+    self.delFlag = [aDecoder decodeBoolForKey:kMusicMessageModelDelFlag];
+    self.musicTagNames = [aDecoder decodeObjectForKey:kMusicMessageModelMusicTagNames];
+    self.subjectNames = [aDecoder decodeObjectForKey:kMusicMessageModelSubjectNames];
+    self.chargeType = [aDecoder decodeObjectForKey:kMusicMessageModelChargeType];
     self.updateTime = [aDecoder decodeObjectForKey:kMusicMessageModelUpdateTime];
-    self.auditStatus = [aDecoder decodeDoubleForKey:kMusicMessageModelAuditStatus];
+    self.updateBy = [aDecoder decodeDoubleForKey:kMusicMessageModelUpdateBy];
     self.musicTag = [aDecoder decodeObjectForKey:kMusicMessageModelMusicTag];
-    self.musicPrice = [aDecoder decodeDoubleForKey:kMusicMessageModelMusicPrice];
-    self.audioFileUrl = [aDecoder decodeObjectForKey:kMusicMessageModelAudioFileUrl];
-    self.sortNumber = [aDecoder decodeDoubleForKey:kMusicMessageModelSortNumber];
-    self.topFlag = [aDecoder decodeDoubleForKey:kMusicMessageModelTopFlag];
-    self.playSpeed = [aDecoder decodeDoubleForKey:kMusicMessageModelPlaySpeed];
-    self.internalBaseClassIdentifier = [aDecoder decodeDoubleForKey:kMusicMessageModelId];
+    self.addName = [aDecoder decodeObjectForKey:kMusicMessageModelAddName];
+    self.favorite = [aDecoder decodeObjectForKey:kMusicMessageModelFavorite];
+    self.auditStatus = [aDecoder decodeObjectForKey:kMusicMessageModelAuditStatus];
     self.createBy = [aDecoder decodeDoubleForKey:kMusicMessageModelCreateBy];
-    self.updateBy = [aDecoder decodeDoubleForKey:kMusicMessageModelUpdateBy];
-    self.showFingering = [aDecoder decodeDoubleForKey:kMusicMessageModelShowFingering];
-    self.musicSheetName = [aDecoder decodeObjectForKey:kMusicMessageModelMusicSheetName];
-    self.canEvaluate = [aDecoder decodeDoubleForKey:kMusicMessageModelCanEvaluate];
-    self.hotFlag = [aDecoder decodeDoubleForKey:kMusicMessageModelHotFlag];
+    self.midiUrl = [aDecoder decodeObjectForKey:kMusicMessageModelMidiUrl];
+    self.topFlag = [aDecoder decodeObjectForKey:kMusicMessageModelTopFlag];
+    self.composer = [aDecoder decodeObjectForKey:kMusicMessageModelComposer];
+    self.sourceType = [aDecoder decodeObjectForKey:kMusicMessageModelSourceType];
+    self.hotFlag = [aDecoder decodeObjectForKey:kMusicMessageModelHotFlag];
+    self.mp3Type = [aDecoder decodeObjectForKey:kMusicMessageModelMp3Type];
+    self.playSpeed = [aDecoder decodeDoubleForKey:kMusicMessageModelPlaySpeed];
     self.createTime = [aDecoder decodeObjectForKey:kMusicMessageModelCreateTime];
-    self.chargeType = [aDecoder decodeDoubleForKey:kMusicMessageModelChargeType];
-    self.remark = [aDecoder decodeObjectForKey:kMusicMessageModelRemark];
-    self.hasBeat = [aDecoder decodeDoubleForKey:kMusicMessageModelHasBeat];
+    self.audioFileUrl = [aDecoder decodeObjectForKey:kMusicMessageModelAudioFileUrl];
+    self.hasBeat = [aDecoder decodeObjectForKey:kMusicMessageModelHasBeat];
+    self.auditVersion = [aDecoder decodeDoubleForKey:kMusicMessageModelAuditVersion];
+    self.musicSubject = [aDecoder decodeObjectForKey:kMusicMessageModelMusicSubject];
     self.userId = [aDecoder decodeDoubleForKey:kMusicMessageModelUserId];
-    self.avatar = [aDecoder decodeObjectForKey:kMusicMessageModelAvatar];
-    self.username = [aDecoder decodeObjectForKey:kMusicMessageModelUsername];
-    
+    self.submitAuditTime = [aDecoder decodeObjectForKey:kMusicMessageModelSubmitAuditTime];
     return self;
 }
 
 - (void)encodeWithCoder:(NSCoder *)aCoder
 {
 
-    [aCoder encodeObject:_composer forKey:kMusicMessageModelComposer];
+    [aCoder encodeObject:_metronomeUrl forKey:kMusicMessageModelMetronomeUrl];
+    [aCoder encodeObject:_musicSheetName forKey:kMusicMessageModelMusicSheetName];
+    [aCoder encodeDouble:_internalBaseClassIdentifier forKey:kMusicMessageModelId];
     [aCoder encodeObject:_xmlFileUrl forKey:kMusicMessageModelXmlFileUrl];
+    [aCoder encodeDouble:_showFingering forKey:kMusicMessageModelShowFingering];
+    [aCoder encodeObject:_remark forKey:kMusicMessageModelRemark];
+    [aCoder encodeDouble:_state forKey:kMusicMessageModelState];
+    [aCoder encodeObject:_url forKey:kMusicMessageModelUrl];
+    [aCoder encodeDouble:_musicPrice forKey:kMusicMessageModelMusicPrice];
+    [aCoder encodeDouble:_sortNumber forKey:kMusicMessageModelSortNumber];
+    [aCoder encodeObject:_addUserAvatar forKey:kMusicMessageModelAddUserAvatar];
     [aCoder encodeObject:_audioType forKey:kMusicMessageModelAudioType];
-    [aCoder encodeObject:_musicSubject forKey:kMusicMessageModelMusicSubject];
+    [aCoder encodeDouble:_canEvaluate forKey:kMusicMessageModelCanEvaluate];
+    [aCoder encodeBool:_delFlag forKey:kMusicMessageModelDelFlag];
+    [aCoder encodeObject:_musicTagNames forKey:kMusicMessageModelMusicTagNames];
+    [aCoder encodeObject:_subjectNames forKey:kMusicMessageModelSubjectNames];
+    [aCoder encodeObject:_chargeType forKey:kMusicMessageModelChargeType];
     [aCoder encodeObject:_updateTime forKey:kMusicMessageModelUpdateTime];
-    [aCoder encodeDouble:_auditStatus forKey:kMusicMessageModelAuditStatus];
+    [aCoder encodeDouble:_updateBy forKey:kMusicMessageModelUpdateBy];
     [aCoder encodeObject:_musicTag forKey:kMusicMessageModelMusicTag];
-    [aCoder encodeDouble:_musicPrice forKey:kMusicMessageModelMusicPrice];
-    [aCoder encodeObject:_audioFileUrl forKey:kMusicMessageModelAudioFileUrl];
-    [aCoder encodeDouble:_sortNumber forKey:kMusicMessageModelSortNumber];
-    [aCoder encodeDouble:_topFlag forKey:kMusicMessageModelTopFlag];
-    [aCoder encodeDouble:_playSpeed forKey:kMusicMessageModelPlaySpeed];
-    [aCoder encodeDouble:_internalBaseClassIdentifier forKey:kMusicMessageModelId];
+    [aCoder encodeObject:_addName forKey:kMusicMessageModelAddName];
+    [aCoder encodeObject:_favorite forKey:kMusicMessageModelFavorite];
+    [aCoder encodeObject:_auditStatus forKey:kMusicMessageModelAuditStatus];
     [aCoder encodeDouble:_createBy forKey:kMusicMessageModelCreateBy];
-    [aCoder encodeDouble:_updateBy forKey:kMusicMessageModelUpdateBy];
-    [aCoder encodeDouble:_showFingering forKey:kMusicMessageModelShowFingering];
-    [aCoder encodeObject:_musicSheetName forKey:kMusicMessageModelMusicSheetName];
-    [aCoder encodeDouble:_canEvaluate forKey:kMusicMessageModelCanEvaluate];
-    [aCoder encodeDouble:_hotFlag forKey:kMusicMessageModelHotFlag];
+    [aCoder encodeObject:_midiUrl forKey:kMusicMessageModelMidiUrl];
+    [aCoder encodeObject:_topFlag forKey:kMusicMessageModelTopFlag];
+    [aCoder encodeObject:_composer forKey:kMusicMessageModelComposer];
+    [aCoder encodeObject:_sourceType forKey:kMusicMessageModelSourceType];
+    [aCoder encodeObject:_hotFlag forKey:kMusicMessageModelHotFlag];
+    [aCoder encodeObject:_mp3Type forKey:kMusicMessageModelMp3Type];
+    [aCoder encodeDouble:_playSpeed forKey:kMusicMessageModelPlaySpeed];
     [aCoder encodeObject:_createTime forKey:kMusicMessageModelCreateTime];
-    [aCoder encodeDouble:_chargeType forKey:kMusicMessageModelChargeType];
-    [aCoder encodeObject:_remark forKey:kMusicMessageModelRemark];
-    [aCoder encodeDouble:_hasBeat forKey:kMusicMessageModelHasBeat];
+    [aCoder encodeObject:_audioFileUrl forKey:kMusicMessageModelAudioFileUrl];
+    [aCoder encodeObject:_hasBeat forKey:kMusicMessageModelHasBeat];
+    [aCoder encodeDouble:_auditVersion forKey:kMusicMessageModelAuditVersion];
+    [aCoder encodeObject:_musicSubject forKey:kMusicMessageModelMusicSubject];
     [aCoder encodeDouble:_userId forKey:kMusicMessageModelUserId];
-    [aCoder encodeObject:_avatar forKey:kMusicMessageModelAvatar];
-    [aCoder encodeObject:_username forKey:kMusicMessageModelUsername];
+    [aCoder encodeObject:_submitAuditTime forKey:kMusicMessageModelSubmitAuditTime];
 }
 
 - (id)copyWithZone:(NSZone *)zone
@@ -237,32 +311,44 @@ NSString *const kMusicMessageModelUsername = @"username";
     
     if (copy) {
 
-        copy.composer = [self.composer copyWithZone:zone];
+        copy.metronomeUrl = [self.metronomeUrl copyWithZone:zone];
+        copy.musicSheetName = [self.musicSheetName copyWithZone:zone];
+        copy.internalBaseClassIdentifier = self.internalBaseClassIdentifier;
         copy.xmlFileUrl = [self.xmlFileUrl copyWithZone:zone];
+        copy.showFingering = self.showFingering;
+        copy.remark = [self.remark copyWithZone:zone];
+        copy.state = self.state;
+        copy.url = [self.url copyWithZone:zone];
+        copy.musicPrice = self.musicPrice;
+        copy.sortNumber = self.sortNumber;
+        copy.addUserAvatar = [self.addUserAvatar copyWithZone:zone];
         copy.audioType = [self.audioType copyWithZone:zone];
-        copy.musicSubject = [self.musicSubject copyWithZone:zone];
+        copy.canEvaluate = self.canEvaluate;
+        copy.delFlag = self.delFlag;
+        copy.musicTagNames = [self.musicTagNames copyWithZone:zone];
+        copy.subjectNames = [self.subjectNames copyWithZone:zone];
+        copy.chargeType = [self.chargeType copyWithZone:zone];
         copy.updateTime = [self.updateTime copyWithZone:zone];
-        copy.auditStatus = self.auditStatus;
+        copy.updateBy = self.updateBy;
         copy.musicTag = [self.musicTag copyWithZone:zone];
-        copy.musicPrice = self.musicPrice;
-        copy.audioFileUrl = [self.audioFileUrl copyWithZone:zone];
-        copy.sortNumber = self.sortNumber;
-        copy.topFlag = self.topFlag;
-        copy.playSpeed = self.playSpeed;
-        copy.internalBaseClassIdentifier = self.internalBaseClassIdentifier;
+        copy.addName = [self.addName copyWithZone:zone];
+        copy.favorite = [self.favorite copyWithZone:zone];
+        copy.auditStatus = [self.auditStatus copyWithZone:zone];
         copy.createBy = self.createBy;
-        copy.updateBy = self.updateBy;
-        copy.showFingering = self.showFingering;
-        copy.musicSheetName = [self.musicSheetName copyWithZone:zone];
-        copy.canEvaluate = self.canEvaluate;
-        copy.hotFlag = self.hotFlag;
+        copy.midiUrl = [self.midiUrl copyWithZone:zone];
+        copy.topFlag = [self.topFlag copyWithZone:zone];
+        copy.composer = [self.composer copyWithZone:zone];
+        copy.sourceType = [self.sourceType copyWithZone:zone];
+        copy.hotFlag = [self.hotFlag copyWithZone:zone];
+        copy.mp3Type = [self.mp3Type copyWithZone:zone];
+        copy.playSpeed = self.playSpeed;
         copy.createTime = [self.createTime copyWithZone:zone];
-        copy.chargeType = self.chargeType;
-        copy.remark = [self.remark copyWithZone:zone];
-        copy.hasBeat = self.hasBeat;
+        copy.audioFileUrl = [self.audioFileUrl copyWithZone:zone];
+        copy.hasBeat = [self.hasBeat copyWithZone:zone];
+        copy.auditVersion = self.auditVersion;
+        copy.musicSubject = [self.musicSubject copyWithZone:zone];
         copy.userId = self.userId;
-        copy.avatar = [self.avatar copyWithZone:zone];
-        copy.username = [self.username copyWithZone:zone];
+        copy.submitAuditTime = [self.submitAuditTime copyWithZone:zone];
     }
     
     return copy;

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MusicMessageCell.m

@@ -29,14 +29,21 @@
 - (void)configWithMessage:(MusicMessageModel *)songMessage {
     self.songName.text = [NSString returnNoNullStringWithString:songMessage.musicSheetName];
     self.songAuth.text = [NSString returnNoNullStringWithString:songMessage.composer];
-    NSArray *tagArray = [songMessage.musicTag componentsSeparatedByString:@","];
-    CGFloat maxWidth = [self getTagViewMaxWidth:songMessage.username];
+    NSArray *tagArray = [songMessage.musicTagNames componentsSeparatedByString:@","];
+    NSString *owner = @"";
+    if ([NSString isEmptyString:songMessage.addName]) {
+        owner = [NSString stringWithFormat:@"游客%.0f",songMessage.userId];
+    }
+    else {
+        owner = songMessage.addName;
+    }
+    CGFloat maxWidth = [self getTagViewMaxWidth:owner];
     [self configTagViewWithTagArray:tagArray maxWidth:maxWidth];
     NSString *typeImgName = @"";
-    if (songMessage.chargeType == 1) {
+    if ([songMessage.chargeType isEqualToString:@"VIP"]) {
         typeImgName = @"music_vip";
     }
-    else if (songMessage.chargeType == 2) {
+    else if ([songMessage.chargeType isEqualToString:@"CHARGE"]) {
         typeImgName = @"music_order";
     }
     else {
@@ -44,8 +51,8 @@
     }
     [self.typeImage setImage:[UIImage imageNamed:typeImgName]];
     
-    self.uploaderName.text = [NSString returnNoNullStringWithString:songMessage.username];
-    [self.uploaderLogo sd_setImageWithURL:[NSURL URLWithString:[songMessage.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    self.uploaderName.text = [NSString returnNoNullStringWithString:owner];
+    [self.uploaderLogo sd_setImageWithURL:[NSURL URLWithString:[songMessage.addUserAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
 }
 
 - (CGFloat)getTagViewMaxWidth:(NSString *)teacherName {

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MyMusicBodyView.m

@@ -116,7 +116,7 @@
     [KSNetworkingManager musicListRequest:KS_POST auditStatus:self.audioStatus pageNo:self.pages pageSize:self.rows success:^(NSDictionary * _Nonnull dic) {
         [self endRefresh];
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
-            NSArray *sourceArray = [[dic dictionaryValueForKey:@"data"] arrayValueForKey:@"records"];
+            NSArray *sourceArray = [[dic dictionaryValueForKey:@"data"] arrayValueForKey:@"rows"];
             for (NSDictionary *parm in sourceArray) {
                 MusicMessageModel *model = [[MusicMessageModel alloc] initWithDictionary:parm];
                 [self.dataArray addObject:model];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageCourseView.m

@@ -172,7 +172,7 @@
         [KSNetworkingManager musicListRequest:KS_POST auditStatus:@"1" pageNo:self.pages pageSize:self.rows success:^(NSDictionary * _Nonnull dic) {
             [self endRefresh];
             if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
-                NSArray *sourceArray = [[dic dictionaryValueForKey:@"data"] arrayValueForKey:@"records"];
+                NSArray *sourceArray = [[dic dictionaryValueForKey:@"data"] arrayValueForKey:@"rows"];
                 for (NSDictionary *parm in sourceArray) {
                     MusicMessageModel *model = [[MusicMessageModel alloc] initWithDictionary:parm];
                     [self.dataArray addObject:model];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageMusicCell.m

@@ -29,14 +29,22 @@
 - (void)configWithMessage:(MusicMessageModel *)songMessage {
     self.songName.text = [NSString returnNoNullStringWithString:songMessage.musicSheetName];
     self.songAuth.text = [NSString returnNoNullStringWithString:songMessage.composer];
-    NSArray *tagArray = [songMessage.musicTag componentsSeparatedByString:@","];
-    CGFloat maxWidth = [self getTagViewMaxWidth:songMessage.username];
+    
+    NSArray *tagArray = [songMessage.musicTagNames componentsSeparatedByString:@","];
+    NSString *owner = @"";
+    if ([NSString isEmptyString:songMessage.addName]) {
+        owner = [NSString stringWithFormat:@"游客%.0f",songMessage.userId];
+    }
+    else {
+        owner = songMessage.addName;
+    }
+    CGFloat maxWidth = [self getTagViewMaxWidth:owner];
     [self configTagViewWithTagArray:tagArray maxWidth:maxWidth];
     NSString *typeImgName = @"";
-    if (songMessage.chargeType == 1) {
+    if ([songMessage.chargeType isEqualToString:@"VIP"]) {
         typeImgName = @"music_vip";
     }
-    else if (songMessage.chargeType == 2) {
+    else if ([songMessage.chargeType isEqualToString:@"CHARGE"]) {
         typeImgName = @"music_order";
     }
     else {
@@ -44,14 +52,8 @@
     }
     [self.typeImage setImage:[UIImage imageNamed:typeImgName]];
     
-    
-    if ([NSString isEmptyString:songMessage.username]) {
-        self.uploaderName.text = [NSString stringWithFormat:@"游客%.0f",songMessage.userId];
-    }
-    else {
-        self.uploaderName.text = songMessage.username;
-    }
-    [self.uploaderLogo sd_setImageWithURL:[NSURL URLWithString:[songMessage.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    self.uploaderName.text = owner;
+    [self.uploaderLogo sd_setImageWithURL:[NSURL URLWithString:[songMessage.addUserAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
 }
 
 - (CGFloat)getTagViewMaxWidth:(NSString *)teacherName {