曲目类型和视频课ID通过字符串接收

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/MoreMusicPage/TenantMusicCellView.m

@@ -98,7 +98,7 @@
 
 - (IBAction)buttonAction:(id)sender {
     if (self.callback) {
-        NSString *songId = [NSString stringWithFormat:@"%.0f",self.model.internalBaseClassIdentifier];
+        NSString *songId = self.model.internalBaseClassIdentifier;
         self.callback(songId);
     }
 }

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

@@ -14,7 +14,7 @@
 @property (nonatomic, strong) NSString *metronomeUrl;
 @property (nonatomic, strong) NSString *musicSheetName;
 @property (nonatomic, assign) double albumNums;
-@property (nonatomic, assign) double internalBaseClassIdentifier;
+@property (nonatomic, strong) NSString *internalBaseClassIdentifier;
 @property (nonatomic, strong) NSString *xmlFileUrl;
 @property (nonatomic, assign) double showFingering;
 @property (nonatomic, assign) double albumSortNumber;

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

@@ -137,7 +137,7 @@ NSString *const kRecentPracticeModelSubmitAuditTime = @"submitAuditTime";
             self.metronomeUrl = [self objectOrNilForKey:kRecentPracticeModelMetronomeUrl fromDictionary:dict];
             self.musicSheetName = [self objectOrNilForKey:kRecentPracticeModelMusicSheetName fromDictionary:dict];
             self.albumNums = [[self objectOrNilForKey:kRecentPracticeModelAlbumNums fromDictionary:dict] doubleValue];
-            self.internalBaseClassIdentifier = [[self objectOrNilForKey:kRecentPracticeModelId fromDictionary:dict] doubleValue];
+            self.internalBaseClassIdentifier = [self objectOrNilForKey:kRecentPracticeModelId fromDictionary:dict];
             self.xmlFileUrl = [self objectOrNilForKey:kRecentPracticeModelXmlFileUrl fromDictionary:dict];
             self.showFingering = [[self objectOrNilForKey:kRecentPracticeModelShowFingering fromDictionary:dict] doubleValue];
             self.albumSortNumber = [[self objectOrNilForKey:kRecentPracticeModelAlbumSortNumber fromDictionary:dict] doubleValue];
@@ -198,7 +198,7 @@ NSString *const kRecentPracticeModelSubmitAuditTime = @"submitAuditTime";
     [mutableDict setValue:self.metronomeUrl forKey:kRecentPracticeModelMetronomeUrl];
     [mutableDict setValue:self.musicSheetName forKey:kRecentPracticeModelMusicSheetName];
     [mutableDict setValue:[NSNumber numberWithDouble:self.albumNums] forKey:kRecentPracticeModelAlbumNums];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.internalBaseClassIdentifier] forKey:kRecentPracticeModelId];
+    [mutableDict setValue:self.internalBaseClassIdentifier forKey:kRecentPracticeModelId];
     [mutableDict setValue:self.xmlFileUrl forKey:kRecentPracticeModelXmlFileUrl];
     [mutableDict setValue:[NSNumber numberWithDouble:self.showFingering] forKey:kRecentPracticeModelShowFingering];
     [mutableDict setValue:[NSNumber numberWithDouble:self.albumSortNumber] forKey:kRecentPracticeModelAlbumSortNumber];
@@ -276,7 +276,7 @@ NSString *const kRecentPracticeModelSubmitAuditTime = @"submitAuditTime";
     self.metronomeUrl = [aDecoder decodeObjectForKey:kRecentPracticeModelMetronomeUrl];
     self.musicSheetName = [aDecoder decodeObjectForKey:kRecentPracticeModelMusicSheetName];
     self.albumNums = [aDecoder decodeDoubleForKey:kRecentPracticeModelAlbumNums];
-    self.internalBaseClassIdentifier = [aDecoder decodeDoubleForKey:kRecentPracticeModelId];
+    self.internalBaseClassIdentifier = [aDecoder decodeObjectForKey:kRecentPracticeModelId];
     self.xmlFileUrl = [aDecoder decodeObjectForKey:kRecentPracticeModelXmlFileUrl];
     self.showFingering = [aDecoder decodeDoubleForKey:kRecentPracticeModelShowFingering];
     self.albumSortNumber = [aDecoder decodeDoubleForKey:kRecentPracticeModelAlbumSortNumber];
@@ -333,7 +333,7 @@ NSString *const kRecentPracticeModelSubmitAuditTime = @"submitAuditTime";
     [aCoder encodeObject:_metronomeUrl forKey:kRecentPracticeModelMetronomeUrl];
     [aCoder encodeObject:_musicSheetName forKey:kRecentPracticeModelMusicSheetName];
     [aCoder encodeDouble:_albumNums forKey:kRecentPracticeModelAlbumNums];
-    [aCoder encodeDouble:_internalBaseClassIdentifier forKey:kRecentPracticeModelId];
+    [aCoder encodeObject:_internalBaseClassIdentifier forKey:kRecentPracticeModelId];
     [aCoder encodeObject:_xmlFileUrl forKey:kRecentPracticeModelXmlFileUrl];
     [aCoder encodeDouble:_showFingering forKey:kRecentPracticeModelShowFingering];
     [aCoder encodeDouble:_albumSortNumber forKey:kRecentPracticeModelAlbumSortNumber];
@@ -392,7 +392,7 @@ NSString *const kRecentPracticeModelSubmitAuditTime = @"submitAuditTime";
         copy.metronomeUrl = [self.metronomeUrl copyWithZone:zone];
         copy.musicSheetName = [self.musicSheetName copyWithZone:zone];
         copy.albumNums = self.albumNums;
-        copy.internalBaseClassIdentifier = self.internalBaseClassIdentifier;
+        copy.internalBaseClassIdentifier = [self.internalBaseClassIdentifier copyWithZone:zone];
         copy.xmlFileUrl = [self.xmlFileUrl copyWithZone:zone];
         copy.showFingering = self.showFingering;
         copy.albumSortNumber = self.albumSortNumber;

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

@@ -170,7 +170,7 @@
 
 - (IBAction)buttonAction:(id)sender {
     if (self.callback) {
-        NSString *songId = [NSString stringWithFormat:@"%.0f",self.model.internalBaseClassIdentifier];
+        NSString *songId = self.model.internalBaseClassIdentifier;
         self.callback(songId);
     }
 }

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

@@ -14,7 +14,7 @@
 @property (nonatomic, strong) NSString *metronomeUrl;
 @property (nonatomic, strong) NSString *musicSheetName;
 @property (nonatomic, assign) double notation;
-@property (nonatomic, assign) double internalBaseClassIdentifier;
+@property (nonatomic, strong) NSString *internalBaseClassIdentifier;
 @property (nonatomic, strong) NSString *xmlFileUrl;
 @property (nonatomic, assign) double showFingering;
 @property (nonatomic, strong) NSString *remark;

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

@@ -126,7 +126,7 @@ NSString *const kHomeHotMusicModelAlbumNums = @"albumNums";
             self.metronomeUrl = [self objectOrNilForKey:kHomeHotMusicModelMetronomeUrl fromDictionary:dict];
             self.musicSheetName = [self objectOrNilForKey:kHomeHotMusicModelMusicSheetName fromDictionary:dict];
             self.notation = [[self objectOrNilForKey:kHomeHotMusicModelNotation fromDictionary:dict] doubleValue];
-            self.internalBaseClassIdentifier = [[self objectOrNilForKey:kHomeHotMusicModelId fromDictionary:dict] doubleValue];
+            self.internalBaseClassIdentifier = [self objectOrNilForKey:kHomeHotMusicModelId fromDictionary:dict];
             self.xmlFileUrl = [self objectOrNilForKey:kHomeHotMusicModelXmlFileUrl fromDictionary:dict];
             self.showFingering = [[self objectOrNilForKey:kHomeHotMusicModelShowFingering fromDictionary:dict] doubleValue];
             self.remark = [self objectOrNilForKey:kHomeHotMusicModelRemark fromDictionary:dict];
@@ -182,7 +182,7 @@ NSString *const kHomeHotMusicModelAlbumNums = @"albumNums";
     [mutableDict setValue:self.metronomeUrl forKey:kHomeHotMusicModelMetronomeUrl];
     [mutableDict setValue:self.musicSheetName forKey:kHomeHotMusicModelMusicSheetName];
     [mutableDict setValue:[NSNumber numberWithDouble:self.notation] forKey:kHomeHotMusicModelNotation];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.internalBaseClassIdentifier] forKey:kHomeHotMusicModelId];
+    [mutableDict setValue:self.internalBaseClassIdentifier forKey:kHomeHotMusicModelId];
     [mutableDict setValue:self.xmlFileUrl forKey:kHomeHotMusicModelXmlFileUrl];
     [mutableDict setValue:[NSNumber numberWithDouble:self.showFingering] forKey:kHomeHotMusicModelShowFingering];
     [mutableDict setValue:self.remark forKey:kHomeHotMusicModelRemark];
@@ -254,7 +254,7 @@ NSString *const kHomeHotMusicModelAlbumNums = @"albumNums";
     self.metronomeUrl = [aDecoder decodeObjectForKey:kHomeHotMusicModelMetronomeUrl];
     self.musicSheetName = [aDecoder decodeObjectForKey:kHomeHotMusicModelMusicSheetName];
     self.notation = [aDecoder decodeDoubleForKey:kHomeHotMusicModelNotation];
-    self.internalBaseClassIdentifier = [aDecoder decodeDoubleForKey:kHomeHotMusicModelId];
+    self.internalBaseClassIdentifier = [aDecoder decodeObjectForKey:kHomeHotMusicModelId];
     self.xmlFileUrl = [aDecoder decodeObjectForKey:kHomeHotMusicModelXmlFileUrl];
     self.showFingering = [aDecoder decodeDoubleForKey:kHomeHotMusicModelShowFingering];
     self.remark = [aDecoder decodeObjectForKey:kHomeHotMusicModelRemark];
@@ -307,7 +307,7 @@ NSString *const kHomeHotMusicModelAlbumNums = @"albumNums";
     [aCoder encodeObject:_metronomeUrl forKey:kHomeHotMusicModelMetronomeUrl];
     [aCoder encodeObject:_musicSheetName forKey:kHomeHotMusicModelMusicSheetName];
     [aCoder encodeDouble:_notation forKey:kHomeHotMusicModelNotation];
-    [aCoder encodeDouble:_internalBaseClassIdentifier forKey:kHomeHotMusicModelId];
+    [aCoder encodeObject:_internalBaseClassIdentifier forKey:kHomeHotMusicModelId];
     [aCoder encodeObject:_xmlFileUrl forKey:kHomeHotMusicModelXmlFileUrl];
     [aCoder encodeDouble:_showFingering forKey:kHomeHotMusicModelShowFingering];
     [aCoder encodeObject:_remark forKey:kHomeHotMusicModelRemark];
@@ -361,7 +361,7 @@ NSString *const kHomeHotMusicModelAlbumNums = @"albumNums";
         copy.metronomeUrl = [self.metronomeUrl copyWithZone:zone];
         copy.musicSheetName = [self.musicSheetName copyWithZone:zone];
         copy.notation = self.notation;
-        copy.internalBaseClassIdentifier = self.internalBaseClassIdentifier;
+        copy.internalBaseClassIdentifier = [self.internalBaseClassIdentifier copyWithZone:zone];
         copy.xmlFileUrl = [self.xmlFileUrl copyWithZone:zone];
         copy.showFingering = self.showFingering;
         copy.remark = [self.remark copyWithZone:zone];

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

@@ -14,7 +14,7 @@
 @property (nonatomic, strong) NSString *metronomeUrl;
 @property (nonatomic, strong) NSString *musicSheetName;
 @property (nonatomic, assign) double albumNums;
-@property (nonatomic, assign) double internalBaseClassIdentifier;
+@property (nonatomic, strong) NSString *internalBaseClassIdentifier;
 @property (nonatomic, strong) NSString *xmlFileUrl;
 @property (nonatomic, assign) double showFingering;
 @property (nonatomic, assign) double albumSortNumber;

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

@@ -137,7 +137,7 @@ NSString *const kHomeMusicModelSubmitAuditTime = @"submitAuditTime";
             self.metronomeUrl = [self objectOrNilForKey:kHomeMusicModelMetronomeUrl fromDictionary:dict];
             self.musicSheetName = [self objectOrNilForKey:kHomeMusicModelMusicSheetName fromDictionary:dict];
             self.albumNums = [[self objectOrNilForKey:kHomeMusicModelAlbumNums fromDictionary:dict] doubleValue];
-            self.internalBaseClassIdentifier = [[self objectOrNilForKey:kHomeMusicModelId fromDictionary:dict] doubleValue];
+            self.internalBaseClassIdentifier = [self objectOrNilForKey:kHomeMusicModelId fromDictionary:dict];
             self.xmlFileUrl = [self objectOrNilForKey:kHomeMusicModelXmlFileUrl fromDictionary:dict];
             self.showFingering = [[self objectOrNilForKey:kHomeMusicModelShowFingering fromDictionary:dict] doubleValue];
             self.albumSortNumber = [[self objectOrNilForKey:kHomeMusicModelAlbumSortNumber fromDictionary:dict] doubleValue];
@@ -198,7 +198,7 @@ NSString *const kHomeMusicModelSubmitAuditTime = @"submitAuditTime";
     [mutableDict setValue:self.metronomeUrl forKey:kHomeMusicModelMetronomeUrl];
     [mutableDict setValue:self.musicSheetName forKey:kHomeMusicModelMusicSheetName];
     [mutableDict setValue:[NSNumber numberWithDouble:self.albumNums] forKey:kHomeMusicModelAlbumNums];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.internalBaseClassIdentifier] forKey:kHomeMusicModelId];
+    [mutableDict setValue:self.internalBaseClassIdentifier forKey:kHomeMusicModelId];
     [mutableDict setValue:self.xmlFileUrl forKey:kHomeMusicModelXmlFileUrl];
     [mutableDict setValue:[NSNumber numberWithDouble:self.showFingering] forKey:kHomeMusicModelShowFingering];
     [mutableDict setValue:[NSNumber numberWithDouble:self.albumSortNumber] forKey:kHomeMusicModelAlbumSortNumber];
@@ -276,7 +276,7 @@ NSString *const kHomeMusicModelSubmitAuditTime = @"submitAuditTime";
     self.metronomeUrl = [aDecoder decodeObjectForKey:kHomeMusicModelMetronomeUrl];
     self.musicSheetName = [aDecoder decodeObjectForKey:kHomeMusicModelMusicSheetName];
     self.albumNums = [aDecoder decodeDoubleForKey:kHomeMusicModelAlbumNums];
-    self.internalBaseClassIdentifier = [aDecoder decodeDoubleForKey:kHomeMusicModelId];
+    self.internalBaseClassIdentifier = [aDecoder decodeObjectForKey:kHomeMusicModelId];
     self.xmlFileUrl = [aDecoder decodeObjectForKey:kHomeMusicModelXmlFileUrl];
     self.showFingering = [aDecoder decodeDoubleForKey:kHomeMusicModelShowFingering];
     self.albumSortNumber = [aDecoder decodeDoubleForKey:kHomeMusicModelAlbumSortNumber];
@@ -333,7 +333,7 @@ NSString *const kHomeMusicModelSubmitAuditTime = @"submitAuditTime";
     [aCoder encodeObject:_metronomeUrl forKey:kHomeMusicModelMetronomeUrl];
     [aCoder encodeObject:_musicSheetName forKey:kHomeMusicModelMusicSheetName];
     [aCoder encodeDouble:_albumNums forKey:kHomeMusicModelAlbumNums];
-    [aCoder encodeDouble:_internalBaseClassIdentifier forKey:kHomeMusicModelId];
+    [aCoder encodeObject:_internalBaseClassIdentifier forKey:kHomeMusicModelId];
     [aCoder encodeObject:_xmlFileUrl forKey:kHomeMusicModelXmlFileUrl];
     [aCoder encodeDouble:_showFingering forKey:kHomeMusicModelShowFingering];
     [aCoder encodeDouble:_albumSortNumber forKey:kHomeMusicModelAlbumSortNumber];
@@ -392,7 +392,7 @@ NSString *const kHomeMusicModelSubmitAuditTime = @"submitAuditTime";
         copy.metronomeUrl = [self.metronomeUrl copyWithZone:zone];
         copy.musicSheetName = [self.musicSheetName copyWithZone:zone];
         copy.albumNums = self.albumNums;
-        copy.internalBaseClassIdentifier = self.internalBaseClassIdentifier;
+        copy.internalBaseClassIdentifier = [self.internalBaseClassIdentifier copyWithZone:zone];
         copy.xmlFileUrl = [self.xmlFileUrl copyWithZone:zone];
         copy.showFingering = self.showFingering;
         copy.albumSortNumber = self.albumSortNumber;

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

@@ -171,7 +171,7 @@
 
 - (IBAction)buttonAction:(id)sender {
     if (self.callback) {
-        NSString *songId = [NSString stringWithFormat:@"%.0f",self.model.internalBaseClassIdentifier];
+        NSString *songId = self.model.internalBaseClassIdentifier;
         self.callback(songId);
     }
 }

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/Model/VideoCourseModel.h

@@ -11,7 +11,7 @@
 
 @interface VideoCourseModel : NSObject <NSCoding, NSCopying>
 
-@property (nonatomic, assign) double internalBaseClassIdentifier;
+@property (nonatomic, strong) NSString *internalBaseClassIdentifier;
 @property (nonatomic, strong) NSString *lessonCoverUrl;
 @property (nonatomic, assign) double lessonCount;
 @property (nonatomic, strong) NSString *lessonDesc;

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/Model/VideoCourseModel.m

@@ -70,7 +70,7 @@ NSString *const kVideoCourseModelPayType = @"payType";
     // 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.internalBaseClassIdentifier = [[self objectOrNilForKey:kVideoCourseModelId fromDictionary:dict] doubleValue];
+            self.internalBaseClassIdentifier = [self objectOrNilForKey:kVideoCourseModelId fromDictionary:dict];
             self.lessonCoverUrl = [self objectOrNilForKey:kVideoCourseModelLessonCoverUrl fromDictionary:dict];
             self.lessonCount = [[self objectOrNilForKey:kVideoCourseModelLessonCount fromDictionary:dict] doubleValue];
             self.lessonDesc = [self objectOrNilForKey:kVideoCourseModelLessonDesc fromDictionary:dict];
@@ -99,7 +99,7 @@ NSString *const kVideoCourseModelPayType = @"payType";
 - (NSDictionary *)dictionaryRepresentation
 {
     NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.internalBaseClassIdentifier] forKey:kVideoCourseModelId];
+    [mutableDict setValue:self.internalBaseClassIdentifier forKey:kVideoCourseModelId];
     [mutableDict setValue:self.lessonCoverUrl forKey:kVideoCourseModelLessonCoverUrl];
     [mutableDict setValue:[NSNumber numberWithDouble:self.lessonCount] forKey:kVideoCourseModelLessonCount];
     [mutableDict setValue:self.lessonDesc forKey:kVideoCourseModelLessonDesc];
@@ -145,7 +145,7 @@ NSString *const kVideoCourseModelPayType = @"payType";
 {
     self = [super init];
 
-    self.internalBaseClassIdentifier = [aDecoder decodeDoubleForKey:kVideoCourseModelId];
+    self.internalBaseClassIdentifier = [aDecoder decodeObjectForKey:kVideoCourseModelId];
     self.lessonCoverUrl = [aDecoder decodeObjectForKey:kVideoCourseModelLessonCoverUrl];
     self.lessonCount = [aDecoder decodeDoubleForKey:kVideoCourseModelLessonCount];
     self.lessonDesc = [aDecoder decodeObjectForKey:kVideoCourseModelLessonDesc];
@@ -172,7 +172,7 @@ NSString *const kVideoCourseModelPayType = @"payType";
 - (void)encodeWithCoder:(NSCoder *)aCoder
 {
 
-    [aCoder encodeDouble:_internalBaseClassIdentifier forKey:kVideoCourseModelId];
+    [aCoder encodeObject:_internalBaseClassIdentifier forKey:kVideoCourseModelId];
     [aCoder encodeObject:_lessonCoverUrl forKey:kVideoCourseModelLessonCoverUrl];
     [aCoder encodeDouble:_lessonCount forKey:kVideoCourseModelLessonCount];
     [aCoder encodeObject:_lessonDesc forKey:kVideoCourseModelLessonDesc];
@@ -200,7 +200,7 @@ NSString *const kVideoCourseModelPayType = @"payType";
     
     if (copy) {
 
-        copy.internalBaseClassIdentifier = self.internalBaseClassIdentifier;
+        copy.internalBaseClassIdentifier = [self.internalBaseClassIdentifier copyWithZone:zone];
         copy.lessonCoverUrl = [self.lessonCoverUrl copyWithZone:zone];
         copy.lessonCount = self.lessonCount;
         copy.lessonDesc = [self.lessonDesc copyWithZone:zone];

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MyVideoCourseBodyView.m

@@ -206,7 +206,7 @@
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
     VideoCourseModel *model = [self.dataArray objectAtIndex:indexPath.row];
-    NSString *url = [NSString stringWithFormat:@"%@%@%.0f", WEBHOST, @"/#/videoDetail?groupId=",model.internalBaseClassIdentifier];
+    NSString *url = [NSString stringWithFormat:@"%@%@%@", WEBHOST, @"/#/videoDetail?groupId=",model.internalBaseClassIdentifier];
     KSBaseWKWebViewController *ctrl = [[KSBaseWKWebViewController alloc] init];
     ctrl.url = url;
     [self.naviController pushViewController:ctrl animated:YES];