合奏曲目显示

KulexiuForStudent/KulexiuForStudent/Module/Chat/Model/ChatUserInfo/RecentPracticeModel.h

@@ -62,6 +62,7 @@
 @property (nonatomic, strong) NSString *musicSubject;
 @property (nonatomic, assign) double userId;
 @property (nonatomic, strong) NSString *submitAuditTime;
+@property (nonatomic, strong) NSString *musicSheetType;
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
 - (instancetype)initWithDictionary:(NSDictionary *)dict;

KulexiuForStudent/KulexiuForStudent/Module/Chat/Model/ChatUserInfo/RecentPracticeModel.m

@@ -59,6 +59,7 @@ NSString *const kRecentPracticeModelAuditVersion = @"auditVersion";
 NSString *const kRecentPracticeModelMusicSubject = @"musicSubject";
 NSString *const kRecentPracticeModelUserId = @"userId";
 NSString *const kRecentPracticeModelSubmitAuditTime = @"submitAuditTime";
+NSString *const kRecentPracticeModelMusicSheetType = @"musicSheetType";
 
 
 @interface RecentPracticeModel ()
@@ -120,6 +121,7 @@ NSString *const kRecentPracticeModelSubmitAuditTime = @"submitAuditTime";
 @synthesize musicSubject = _musicSubject;
 @synthesize userId = _userId;
 @synthesize submitAuditTime = _submitAuditTime;
+@synthesize musicSheetType = _musicSheetType;
 
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
@@ -185,6 +187,7 @@ NSString *const kRecentPracticeModelSubmitAuditTime = @"submitAuditTime";
             self.musicSubject = [self objectOrNilForKey:kRecentPracticeModelMusicSubject fromDictionary:dict];
             self.userId = [[self objectOrNilForKey:kRecentPracticeModelUserId fromDictionary:dict] doubleValue];
             self.submitAuditTime = [self objectOrNilForKey:kRecentPracticeModelSubmitAuditTime fromDictionary:dict];
+        self.musicSheetType = [self objectOrNilForKey:kRecentPracticeModelMusicSheetType fromDictionary:dict];
 
     }
     
@@ -246,6 +249,7 @@ NSString *const kRecentPracticeModelSubmitAuditTime = @"submitAuditTime";
     [mutableDict setValue:self.musicSubject forKey:kRecentPracticeModelMusicSubject];
     [mutableDict setValue:[NSNumber numberWithDouble:self.userId] forKey:kRecentPracticeModelUserId];
     [mutableDict setValue:self.submitAuditTime forKey:kRecentPracticeModelSubmitAuditTime];
+    [mutableDict setValue:self.musicSheetType forKey:kRecentPracticeModelMusicSheetType];
 
     return [NSDictionary dictionaryWithDictionary:mutableDict];
 }
@@ -324,6 +328,8 @@ NSString *const kRecentPracticeModelSubmitAuditTime = @"submitAuditTime";
     self.musicSubject = [aDecoder decodeObjectForKey:kRecentPracticeModelMusicSubject];
     self.userId = [aDecoder decodeDoubleForKey:kRecentPracticeModelUserId];
     self.submitAuditTime = [aDecoder decodeObjectForKey:kRecentPracticeModelSubmitAuditTime];
+    self.musicSheetType = [aDecoder decodeObjectForKey:kRecentPracticeModelMusicSheetType];
+
     return self;
 }
 
@@ -381,6 +387,8 @@ NSString *const kRecentPracticeModelSubmitAuditTime = @"submitAuditTime";
     [aCoder encodeObject:_musicSubject forKey:kRecentPracticeModelMusicSubject];
     [aCoder encodeDouble:_userId forKey:kRecentPracticeModelUserId];
     [aCoder encodeObject:_submitAuditTime forKey:kRecentPracticeModelSubmitAuditTime];
+    [aCoder encodeObject:_musicSheetType forKey:kRecentPracticeModelMusicSheetType];
+
 }
 
 - (id)copyWithZone:(NSZone *)zone
@@ -440,6 +448,7 @@ NSString *const kRecentPracticeModelSubmitAuditTime = @"submitAuditTime";
         copy.musicSubject = [self.musicSubject copyWithZone:zone];
         copy.userId = self.userId;
         copy.submitAuditTime = [self.submitAuditTime copyWithZone:zone];
+        copy.musicSheetType = [self.musicSheetType copyWithZone:zone];
     }
     
     return copy;

KulexiuForStudent/KulexiuForStudent/Module/Chat/View/ChatUserInfo/RecentMusicView.m

@@ -89,8 +89,13 @@
         self.songAuth.text = songAuth;
     }
     NSArray *tagArray = nil;
-    if (![NSString isEmptyString:sourceModel.subjectNames]) {
-        tagArray = [sourceModel.subjectNames componentsSeparatedByString:@","];
+    if ([sourceModel.musicSheetType isEqualToString:@"CONCERT"]) {
+        tagArray = @[@"合奏"];
+    }
+    else {
+        if (![NSString isEmptyString:sourceModel.subjectNames]) {
+            tagArray = [sourceModel.subjectNames componentsSeparatedByString:@","];
+        }
     }
     
     NSString *owner = @"";

KulexiuForStudent/KulexiuForStudent/Module/Home/Model/HomeHotMusicModel.h

@@ -58,6 +58,8 @@
 @property (nonatomic, strong) NSString *paymentType;
 @property (nonatomic, assign) NSInteger albumNums;
 
+@property (nonatomic, strong) NSString *musicSheetType;
+
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
 - (instancetype)initWithDictionary:(NSDictionary *)dict;
 - (NSDictionary *)dictionaryRepresentation;

KulexiuForStudent/KulexiuForStudent/Module/Home/Model/HomeHotMusicModel.m

@@ -55,6 +55,7 @@ NSString *const kHomeHotMusicModelSubmitAuditTime = @"submitAuditTime";
 NSString *const kHomeHotMusicModelExquisiteFlag = @"exquisiteFlag";
 NSString *const kMusicMessageModelPaymentType = @"paymentType";
 NSString *const kHomeHotMusicModelAlbumNums = @"albumNums";
+NSString *const kHomeHotMusicModelMusicSheetType = @"musicSheetType";
 
 @interface HomeHotMusicModel ()
 
@@ -110,6 +111,8 @@ NSString *const kHomeHotMusicModelAlbumNums = @"albumNums";
 @synthesize exquisiteFlag = _exquisiteFlag;
 @synthesize paymentType = _paymentType;
 @synthesize albumNums = _albumNums;
+@synthesize musicSheetType = _musicSheetType;
+
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
 {
@@ -170,6 +173,8 @@ NSString *const kHomeHotMusicModelAlbumNums = @"albumNums";
                               boolValue];
         self.paymentType = [self objectOrNilForKey:kMusicMessageModelPaymentType fromDictionary:dict];
         self.albumNums = [[self objectOrNilForKey:kHomeHotMusicModelAlbumNums fromDictionary:dict] integerValue];
+        self.musicSheetType = [self objectOrNilForKey:kHomeHotMusicModelMusicSheetType fromDictionary:dict];
+
     }
     
     return self;
@@ -225,6 +230,8 @@ NSString *const kHomeHotMusicModelAlbumNums = @"albumNums";
     [mutableDict setValue:[NSNumber numberWithBool:self.exquisiteFlag] forKey:kHomeHotMusicModelExquisiteFlag];
     [mutableDict setValue:self.paymentType forKey:kMusicMessageModelPaymentType];
     [mutableDict setValue:[NSNumber numberWithInteger:self.albumNums] forKey:kHomeHotMusicModelAlbumNums];
+    [mutableDict setValue:self.musicSheetType forKey:kHomeHotMusicModelMusicSheetType];
+
     return [NSDictionary dictionaryWithDictionary:mutableDict];
 }
 
@@ -297,6 +304,7 @@ NSString *const kHomeHotMusicModelAlbumNums = @"albumNums";
     self.exquisiteFlag = [aDecoder decodeBoolForKey:kHomeHotMusicModelExquisiteFlag];
     self.paymentType = [aDecoder decodeObjectForKey:kMusicMessageModelPaymentType];
     self.albumNums = [aDecoder decodeIntegerForKey:kHomeHotMusicModelAlbumNums];
+    self.musicSheetType = [aDecoder decodeObjectForKey:kHomeHotMusicModelMusicSheetType];
 
     return self;
 }
@@ -350,6 +358,8 @@ NSString *const kHomeHotMusicModelAlbumNums = @"albumNums";
     [aCoder encodeBool:_exquisiteFlag forKey:kHomeHotMusicModelExquisiteFlag];
     [aCoder encodeObject:_paymentType forKey:kMusicMessageModelPaymentType];
     [aCoder encodeInteger:_albumNums forKey:kHomeHotMusicModelAlbumNums];
+    [aCoder encodeObject:_musicSheetType forKey:kHomeHotMusicModelMusicSheetType];
+
 }
 
 - (id)copyWithZone:(NSZone *)zone
@@ -404,6 +414,8 @@ NSString *const kHomeHotMusicModelAlbumNums = @"albumNums";
         copy.exquisiteFlag = self.exquisiteFlag;
         copy.paymentType = [self.paymentType copyWithZone:zone];
         copy.albumNums = self.albumNums;
+        copy.musicSheetType = [self.musicSheetType copyWithZone:zone];
+
     }
     
     return copy;

KulexiuForStudent/KulexiuForStudent/Module/Home/Model/HomeMusicModel.h

@@ -62,6 +62,7 @@
 @property (nonatomic, strong) NSString *musicSubject;
 @property (nonatomic, assign) double userId;
 @property (nonatomic, strong) NSString *submitAuditTime;
+@property (nonatomic, strong) NSString *musicSheetType;
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
 - (instancetype)initWithDictionary:(NSDictionary *)dict;

KulexiuForStudent/KulexiuForStudent/Module/Home/Model/HomeMusicModel.m

@@ -59,6 +59,7 @@ NSString *const kHomeMusicModelAuditVersion = @"auditVersion";
 NSString *const kHomeMusicModelMusicSubject = @"musicSubject";
 NSString *const kHomeMusicModelUserId = @"userId";
 NSString *const kHomeMusicModelSubmitAuditTime = @"submitAuditTime";
+NSString *const kHomeMusicModelMusicSheetType = @"musicSheetType";
 
 
 @interface HomeMusicModel ()
@@ -120,6 +121,7 @@ NSString *const kHomeMusicModelSubmitAuditTime = @"submitAuditTime";
 @synthesize musicSubject = _musicSubject;
 @synthesize userId = _userId;
 @synthesize submitAuditTime = _submitAuditTime;
+@synthesize musicSheetType = _musicSheetType;
 
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
@@ -185,6 +187,7 @@ NSString *const kHomeMusicModelSubmitAuditTime = @"submitAuditTime";
             self.musicSubject = [self objectOrNilForKey:kHomeMusicModelMusicSubject fromDictionary:dict];
             self.userId = [[self objectOrNilForKey:kHomeMusicModelUserId fromDictionary:dict] doubleValue];
             self.submitAuditTime = [self objectOrNilForKey:kHomeMusicModelSubmitAuditTime fromDictionary:dict];
+        self.musicSheetType = [self objectOrNilForKey:kHomeMusicModelMusicSheetType fromDictionary:dict];
 
     }
     
@@ -246,6 +249,7 @@ NSString *const kHomeMusicModelSubmitAuditTime = @"submitAuditTime";
     [mutableDict setValue:self.musicSubject forKey:kHomeMusicModelMusicSubject];
     [mutableDict setValue:[NSNumber numberWithDouble:self.userId] forKey:kHomeMusicModelUserId];
     [mutableDict setValue:self.submitAuditTime forKey:kHomeMusicModelSubmitAuditTime];
+    [mutableDict setValue:self.musicSheetType forKey:kHomeMusicModelMusicSheetType];
 
     return [NSDictionary dictionaryWithDictionary:mutableDict];
 }
@@ -324,6 +328,8 @@ NSString *const kHomeMusicModelSubmitAuditTime = @"submitAuditTime";
     self.musicSubject = [aDecoder decodeObjectForKey:kHomeMusicModelMusicSubject];
     self.userId = [aDecoder decodeDoubleForKey:kHomeMusicModelUserId];
     self.submitAuditTime = [aDecoder decodeObjectForKey:kHomeMusicModelSubmitAuditTime];
+    self.musicSheetType = [aDecoder decodeObjectForKey:kHomeMusicModelMusicSheetType];
+
     return self;
 }
 
@@ -381,6 +387,8 @@ NSString *const kHomeMusicModelSubmitAuditTime = @"submitAuditTime";
     [aCoder encodeObject:_musicSubject forKey:kHomeMusicModelMusicSubject];
     [aCoder encodeDouble:_userId forKey:kHomeMusicModelUserId];
     [aCoder encodeObject:_submitAuditTime forKey:kHomeMusicModelSubmitAuditTime];
+    [aCoder encodeObject:_musicSheetType forKey:kHomeMusicModelMusicSheetType];
+
 }
 
 - (id)copyWithZone:(NSZone *)zone
@@ -440,6 +448,7 @@ NSString *const kHomeMusicModelSubmitAuditTime = @"submitAuditTime";
         copy.musicSubject = [self.musicSubject copyWithZone:zone];
         copy.userId = self.userId;
         copy.submitAuditTime = [self.submitAuditTime copyWithZone:zone];
+        copy.musicSheetType = [self.musicSheetType copyWithZone:zone];
     }
     
     return copy;

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotMusic/HomeHotMusicCellView.m

@@ -88,8 +88,14 @@
         self.songAuth.text = songAuth;
     }
     NSArray *tagArray = nil;
-    if (![NSString isEmptyString:sourceModel.subjectNames]) {
-        tagArray = [sourceModel.subjectNames componentsSeparatedByString:@","];
+    
+    if ([sourceModel.musicSheetType isEqualToString:@"CONCERT"]) {
+        tagArray = @[@"合奏"];
+    }
+    else {
+        if (![NSString isEmptyString:sourceModel.subjectNames]) {
+            tagArray = [sourceModel.subjectNames componentsSeparatedByString:@","];
+        }
     }
     
     NSString *owner = @"";

KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/DeleteAccount/Controller/AccountDeleteViewController.m

@@ -90,7 +90,7 @@
             }];
         }
         else if ([dic ks_integerValueForKey:@"code"] == 5201) {
-            [self showFailAlert:@[]];
+            [self showFailAlert:[dic ks_arrayValueForKey:@"message"]];
         }
         else {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];