合奏曲目显示

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -4665,8 +4665,8 @@
 			isa = PBXGroup;
 			children = (
 				BC12638828FEB5E600509E90 /* ChatUserInfo.h */,
-				BC12638928FEB5E600509E90 /* RecentPracticeModel.h */,
 				BC12638A28FEB5E600509E90 /* ChatUserInfo.m */,
+				BC12638928FEB5E600509E90 /* RecentPracticeModel.h */,
 				BC12638B28FEB5E600509E90 /* RecentPracticeModel.m */,
 			);
 			path = ChatUserInfo;

KulexiuForTeacher/KulexiuForTeacher/Info.plist

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
 	<key>CFBundleAllowMixedLocalizations</key>
 	<true/>
 	<key>CFBundleDocumentTypes</key>
@@ -63,6 +61,8 @@
 			</array>
 		</dict>
 	</array>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>alipays</string>

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Controller/TXCustom/KSTXBaseChatViewController.m

@@ -130,7 +130,12 @@ static UIView *gCustomTopView;
         owner = musicModel.addName;
     }
     [parm setValue:owner forKey:@"teacherName"];
-    [parm setValue:musicModel.subjectNames forKey:@"musicTagNames"];
+    if ([musicModel.musicSheetType isEqualToString:@"CONCERT"]) {
+        [parm setValue:@"合奏" forKey:@"musicTagNames"];
+    }
+    else {
+        [parm setValue:musicModel.subjectNames forKey:@"musicTagNames"];
+    }
     [parm setValue:musicModel.internalBaseClassIdentifier forKey:@"songId"];
     
     NSData *data = [NSJSONSerialization dataWithJSONObject:parm options:0 error:nil];

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

@@ -62,6 +62,8 @@
 @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;

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

@@ -59,7 +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,7 +120,7 @@ NSString *const kRecentPracticeModelSubmitAuditTime = @"submitAuditTime";
 @synthesize musicSubject = _musicSubject;
 @synthesize userId = _userId;
 @synthesize submitAuditTime = _submitAuditTime;
-
+@synthesize musicSheetType = _musicSheetType;
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
 {
@@ -185,7 +185,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];
     }
     
     return self;
@@ -246,7 +246,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 +324,7 @@ 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 +382,7 @@ 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 +442,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;

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/ShareMusic/View/MusicChooseCell.m

@@ -32,9 +32,15 @@
     self.songName.text = [NSString returnNoNullStringWithString:songMessage.musicSheetName];
     self.songAuth.text = [NSString returnNoNullStringWithString:songMessage.composer];
     NSArray *tagArray = nil;
-    if (![NSString isEmptyString:songMessage.subjectNames]) {
-        tagArray = [songMessage.subjectNames componentsSeparatedByString:@","];
+    if ([songMessage.musicSheetType isEqualToString:@"CONCERT"]) {
+        tagArray = @[@"合奏"];
     }
+    else {
+        if (![NSString isEmptyString:songMessage.subjectNames]) {
+            tagArray = [songMessage.subjectNames componentsSeparatedByString:@","];
+        }
+    }
+    
     NSString *owner = @"";
     if ([NSString isEmptyString:songMessage.addName]) {
         owner = [NSString stringWithFormat:@"游客%.0f",songMessage.userId];

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

@@ -89,9 +89,15 @@
         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 = @"";
     if ([NSString isEmptyString:sourceModel.addName]) {

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Model/HomeMusicModel.h

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

KulexiuForTeacher/KulexiuForTeacher/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,7 +121,7 @@ NSString *const kHomeMusicModelSubmitAuditTime = @"submitAuditTime";
 @synthesize musicSubject = _musicSubject;
 @synthesize userId = _userId;
 @synthesize submitAuditTime = _submitAuditTime;
-
+@synthesize musicSheetType = _musicSheetType;
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
 {
@@ -185,7 +186,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];
     }
     
     return self;
@@ -246,7 +247,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 +325,7 @@ 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 +383,7 @@ 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 +443,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;

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

@@ -55,6 +55,7 @@
 @property (nonatomic, assign) BOOL exquisiteFlag;
 @property (nonatomic, strong) NSString *paymentType;
 @property (nonatomic, assign) NSInteger albumNums;
+@property (nonatomic, strong) NSString *musicSheetType;
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
 - (instancetype)initWithDictionary:(NSDictionary *)dict;

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

@@ -51,6 +51,7 @@ NSString *const kMusicMessageModelTitleImg = @"titleImg";
 NSString *const kMusicMessageModelExquisiteFlag = @"exquisiteFlag";
 NSString *const kMusicMessageModelPaymentType = @"paymentType";
 NSString *const kMusicMessageModelAlbumNums = @"albumNums";
+NSString *const kMusicMessageModelMusicSheetType = @"musicSheetType";
 
 @interface MusicMessageModel ()
 
@@ -102,6 +103,8 @@ NSString *const kMusicMessageModelAlbumNums = @"albumNums";
 @synthesize exquisiteFlag = _exquisiteFlag;
 @synthesize paymentType = _paymentType;
 @synthesize albumNums = _albumNums;
+@synthesize musicSheetType = _musicSheetType;
+
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
 {
@@ -157,6 +160,7 @@ NSString *const kMusicMessageModelAlbumNums = @"albumNums";
         self.exquisiteFlag = [[self objectOrNilForKey:kMusicMessageModelExquisiteFlag fromDictionary:dict] integerValue];
         self.paymentType = [self objectOrNilForKey:kMusicMessageModelPaymentType fromDictionary:dict];
         self.albumNums = [[self objectOrNilForKey:kMusicMessageModelAlbumNums fromDictionary:dict] integerValue];
+        self.musicSheetType = [self objectOrNilForKey:kMusicMessageModelMusicSheetType fromDictionary:dict];
     }
     
     return self;
@@ -208,6 +212,7 @@ NSString *const kMusicMessageModelAlbumNums = @"albumNums";
     [mutableDict setValue:[NSNumber numberWithBool:self.exquisiteFlag] forKey:kMusicMessageModelExquisiteFlag];
     [mutableDict setValue:self.paymentType forKey:kMusicMessageModelPaymentType];
     [mutableDict setValue:[NSNumber numberWithInteger:self.albumNums] forKey:kMusicMessageModelAlbumNums];
+    [mutableDict setValue:self.musicSheetType forKey:kMusicMessageModelMusicSheetType];
     return [NSDictionary dictionaryWithDictionary:mutableDict];
 }
 
@@ -276,6 +281,7 @@ NSString *const kMusicMessageModelAlbumNums = @"albumNums";
     self.exquisiteFlag = [aDecoder decodeBoolForKey:kMusicMessageModelExquisiteFlag];
     self.paymentType = [aDecoder decodeObjectForKey:kMusicMessageModelPaymentType];
     self.albumNums = [aDecoder decodeIntegerForKey:kMusicMessageModelAlbumNums];
+    self.musicSheetType = [aDecoder decodeObjectForKey:kMusicMessageModelMusicSheetType];
     return self;
 }
 
@@ -324,6 +330,7 @@ NSString *const kMusicMessageModelAlbumNums = @"albumNums";
     [aCoder encodeBool:_exquisiteFlag forKey:kMusicMessageModelExquisiteFlag];
     [aCoder encodeObject:_paymentType forKey:kMusicMessageModelPaymentType];
     [aCoder encodeInteger:_albumNums forKey:kMusicMessageModelAlbumNums];
+    [aCoder encodeObject:_musicSheetType forKey:kMusicMessageModelMusicSheetType];
 }
 
 - (id)copyWithZone:(NSZone *)zone
@@ -374,6 +381,7 @@ NSString *const kMusicMessageModelAlbumNums = @"albumNums";
         copy.exquisiteFlag = self.exquisiteFlag;
         copy.paymentType = [self.paymentType copyWithZone:zone];
         copy.albumNums = self.albumNums;
+        copy.musicSheetType = [self.musicSheetType copyWithZone:zone];
     }
     
     return copy;

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

@@ -133,9 +133,15 @@
     self.songName.text = [NSString returnNoNullStringWithString:songMessage.musicSheetName];
     self.songAuth.text = authString;
     NSArray *tagArray = nil;
-    if (![NSString isEmptyString:songMessage.subjectNames]) {
-        tagArray = [songMessage.subjectNames componentsSeparatedByString:@","];
+    if ([songMessage.musicSheetType isEqualToString:@"CONCERT"]) {
+        tagArray = @[@"合奏"];
     }
+    else {
+        if (![NSString isEmptyString:songMessage.subjectNames]) {
+            tagArray = [songMessage.subjectNames componentsSeparatedByString:@","];
+        }
+    }
+    
     
     CGFloat maxWidth = [self getTagViewMaxWidth:authString];
     [self configTagViewWithTagArray:tagArray maxWidth:maxWidth];

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeMusic/HomeHotMusicCellView.m

@@ -88,9 +88,15 @@
         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 = @"";
     if ([NSString isEmptyString:sourceModel.addName]) {

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

@@ -98,9 +98,15 @@
     self.songAuth.text = authSting;
     
     NSArray *tagArray = nil;
-    if (![NSString isEmptyString:songMessage.subjectNames]) {
-        tagArray = [songMessage.subjectNames componentsSeparatedByString:@","];
-    };
+    if ([songMessage.musicSheetType isEqualToString:@"CONCERT"]) {
+        tagArray = @[@"合奏"];
+    }
+    else {
+        if (![NSString isEmptyString:songMessage.subjectNames]) {
+            tagArray = [songMessage.subjectNames componentsSeparatedByString:@","];
+        }
+    }
+    
    
     CGFloat maxWidth = [self getTagViewMaxWidth:authSting];
     [self configTagViewWithTagArray:tagArray maxWidth:maxWidth];

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

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