소스 검색

版本升级维护

yyqxiaoyin 5 년 전
부모
커밋
52e3a150b1

+ 3 - 0
MKRRadioManager/Classes/MKRRadioManager/MKRWIFIDeviceManager/MKRM3UListModel.h

@@ -31,6 +31,9 @@
 @property (nonatomic, strong) NSMutableArray *songIDList;
 @property (nonatomic, strong) NSMutableArray *songFromList;
 @property (nonatomic, strong) NSMutableArray *songAlbumIDList;
+//后台给回来的每个频道对应的唯一ID
+@property (nonatomic, strong) NSString *channelID;
+//频道号
 @property (nonatomic, strong) NSString *channelNO;
 @property (nonatomic, strong) NSString *playModeString;
 @property (nonatomic, strong) NSString *userID;

+ 20 - 7
MKRRadioManager/Classes/MKRRadioManager/MKRWIFIDeviceManager/MKRM3UListModel.m

@@ -16,18 +16,31 @@
     return self;
 }
 
-+ (instancetype)tempChannelM3UModelWithSongs:(NSArray <id <MKRRadioResorce>> *)songs
-                                  startIndex:(NSInteger)startIndex {
+//+ (instancetype)tempChannelM3UModelWithSongs:(NSArray <id <MKRRadioResorce>> *)songs
+//                                  startIndex:(NSInteger)startIndex {
+//    MKRM3UListModel *model = [[MKRM3UListModel alloc] init];
+//    [model selectTempChannelTargetSongsForM3u:songs startIndex:startIndex];
+//    model.startIndex = 0;
+//    model.endIndex = (int)(songs.count > 50 ? 49 : songs.count - 1);
+//    model.channelNO = @"12";
+//    model.m3uSize = (int)(songs.count >= 50 ? 50 : songs.count);
+//    model.channelPure = @"NO";
+//    model.channelAlbumID = @"FREESTYLE";
+//    model.channelInfoString = @"3//NULL//NULL//NULL";
+//    model.timeString = [NSString stringWithFormat:@"%.0f", [[NSDate date] timeIntervalSince1970]];
+//    return model;
+//}
+
++ (instancetype)tempChannelM3UModelWithSongs:(NSArray<id<MKRRadioResorce>> *)songs startIndex:(NSInteger)startIndex{
     MKRM3UListModel *model = [[MKRM3UListModel alloc] init];
     [model selectTempChannelTargetSongsForM3u:songs startIndex:startIndex];
+    model.channelNO = @"13";
+    model.timeString = [NSString stringWithFormat:@"%.0f", [[NSDate date] timeIntervalSince1970]];
     model.startIndex = 0;
     model.endIndex = (int)(songs.count > 50 ? 49 : songs.count - 1);
-    model.channelNO = @"12";
     model.m3uSize = (int)(songs.count >= 50 ? 50 : songs.count);
-    model.channelPure = @"NO";
-    model.channelAlbumID = @"FREESTYLE";
-    model.channelInfoString = @"3//NULL//NULL//NULL";
-    model.timeString = [NSString stringWithFormat:@"%.0f", [[NSDate date] timeIntervalSince1970]];
+    model.channelInfoString = @"NULL";
+    model.channelID = @"0";
     return model;
 }