版本升级维护

MKRRadioManager/Classes/MKRRadioManager/MKRWIFIDeviceManager/MKRWIFIDeviceManager.h

@@ -72,8 +72,8 @@
 
 /**
  * 播放channelNO频道从第index开始
- * 在播放之前 如果是临时频道（频道号>= 12） 需要先生成M3U列表
- * 如是正式频道(频道号 0~11) 可选生成M3U
+ * 在播放之前 如果是临时频道（频道号>= 13） 需要先生成M3U列表
+ * 如是正式频道(频道号 1~12) 可选生成M3U
  * @param channelNO      频道号
  * @param index          需要播放的下标
  * @param device         播放的设备
@@ -94,6 +94,26 @@
                        userID:(NSString *)userID;
 
 /**
+* 播放临时频道频道(频道13) 从第index首开始
+* @param index          需要播放的下标
+* @param device    需要播放的设备
+* @param userID    用户ID
+*/
+- (void)playTempChannelSongs:(NSArray <id <MKRRadioResorce>> *)songs
+                       index:(NSInteger)index
+                      device:(id <MKRUPnPDevice>)device
+                      userID:(NSString *)userID;
+
+/**
+* 播放临时频道频道(频道13) 从第index首开始
+* @param device    需要播放的设备
+* @param userID    用户ID
+*/
+- (void)playTempChannelSongs:(NSArray <id <MKRRadioResorce>> *)songs
+                      device:(id <MKRUPnPDevice>)device
+                      userID:(NSString *)userID;
+
+/**
  * 暂停
  * @param device 设备
  */

MKRRadioManager/Classes/MKRRadioManager/MKRWIFIDeviceManager/MKRWIFIDeviceManager.m

@@ -331,85 +331,44 @@ static inline void wd_playControl_queue(void (^block)(void)){
 }
 
 - (void)setM3UList:(MKRM3UListModel *)m3uListModel{
-    wd_playControl_queue(^{
-        libupnp_SetNewM3UListV2(m3uListModel.secondsList,
-                                m3uListModel.artistList,
-                                m3uListModel.titleList,
-                                m3uListModel.urlList,
-                                m3uListModel.songFromList,
-                                m3uListModel.channelNO,
-                                m3uListModel.playModeString,
-                                m3uListModel.timeString,
-                                m3uListModel.startIndex,
-                                m3uListModel.endIndex,
-                                m3uListModel.m3uSize,
-                                m3uListModel.channelID,
-                                m3uListModel.channelInfoString);
-    });
+    libupnp_SetNewM3UListV2(m3uListModel.secondsList,
+    m3uListModel.artistList,
+    m3uListModel.titleList,
+    m3uListModel.urlList,
+    m3uListModel.songFromList,
+    m3uListModel.channelNO,
+    m3uListModel.playModeString,
+    m3uListModel.timeString,
+    m3uListModel.startIndex,
+    m3uListModel.endIndex,
+    m3uListModel.m3uSize,
+    m3uListModel.channelID,
+    m3uListModel.channelInfoString);
 }
 
-//- (void)setM3UList:(MKRM3UListModel *)m3uListModel {
-//    wd_playControl_queue(^{
-//        libupnp_SetNewM3UList(
-//        m3uListModel.secondsList,
-//        m3uListModel.artistList,
-//        m3uListModel.titleList,
-//        m3uListModel.urlList,
-//        m3uListModel.cueList,
-//        m3uListModel.startTimeList,
-//        m3uListModel.endTimeList,
-//        m3uListModel.vipCanPlay,
-//        m3uListModel.albumList,
-//        m3uListModel.albumArtUriList,
-//        m3uListModel.durationList,
-//        m3uListModel.protocolInfoList,
-//        m3uListModel.upnpclassList,
-//        m3uListModel.channelNumList,
-//        m3uListModel.songOrderList,
-//        m3uListModel.userID,
-//        m3uListModel.songIDList,
-//        m3uListModel.songFromList,
-//        m3uListModel.songAlbumIDList,
-//        m3uListModel.channelNO,
-//        m3uListModel.playModeString,
-//        m3uListModel.timeString,
-//        m3uListModel.channelPure,
-//        m3uListModel.channelAlbumID,
-//        m3uListModel.channelInfoString,
-//        m3uListModel.userID,
-//        m3uListModel.startIndex,
-//        m3uListModel.endIndex,
-//        m3uListModel.m3uSize,
-//        @""
-//        );
-//    });
-//}
-
 - (void)setAVTransportURIWithSong:(id <MKRRadioResorce>)song
                            device:(id <MKRUPnPDevice>)device
                            userID:(NSString *)userID {
     NSString *timestamp = [NSString stringWithFormat:@"%.0f", [[NSDate date] timeIntervalSince1970]];
     NSString *channelNumString = [NSString stringWithFormat:@"CHANNEL_UPDATE_%zd",song.songChannel];
-    wd_playControl_queue(^{
-        libupnp_SetAVTransportURI(
-        device.avTransportUrl,
-        song.songUrl,
-        song.songName,
-        song.songArtist,
-        song.songAlbum,
-        song.songAlbumCover,
-        @"0",
-        @"null",
-        @"null",
-        timestamp,
-        channelNumString,
-        @"0",
-        userID,
-        @(song.songID).stringValue,
-        @(song.songFrom).stringValue,
-        song.songAlbumID?:@""
-        );
-    });
+    libupnp_SetAVTransportURI(
+    device.avTransportUrl,
+    song.songUrl,
+    song.songName,
+    song.songArtist,
+    song.songAlbum,
+    song.songAlbumCover,
+    @"0",
+    @"null",
+    @"null",
+    timestamp,
+    channelNumString,
+    @"0",
+    userID,
+    @(song.songID).stringValue,
+    @(song.songFrom).stringValue,
+    song.songAlbumID?:@""
+    );
     
 }
 
@@ -455,6 +414,33 @@ static inline void wd_playControl_queue(void (^block)(void)){
     });
 }
 
+- (void)playTempChannelSongs:(NSArray<id<MKRRadioResorce>> *)songs
+                       index:(NSInteger)index
+                      device:(id<MKRUPnPDevice>)device
+                      userID:(NSString *)userID{
+    MKRM3UListModel *m3uModel = [MKRM3UListModel tempChannelM3UModelWithSongs:songs startIndex:index];
+    m3uModel.userID = userID;
+    m3uModel.playModeString = @"REPEAT_ALL";
+    wd_playControl_queue(^{
+        [[MKRWIFIDeviceManager shareManager] setM3UList:m3uModel];
+        [self setAVTransportURIWithSong:songs[index] device:device userID:userID];
+        [self playSongWithChannelNO:13 index:index device:device userID:userID];
+    });
+}
+
+- (void)playTempChannelSongs:(NSArray<id<MKRRadioResorce>> *)songs
+                      device:(id<MKRUPnPDevice>)device
+                      userID:(NSString *)userID{
+    MKRM3UListModel *m3uModel = [MKRM3UListModel tempChannelM3UModelWithSongs:songs startIndex:index];
+    m3uModel.userID = userID;
+    m3uModel.playModeString = @"REPEAT_ALL";
+    wd_playControl_queue(^{
+        [[MKRWIFIDeviceManager shareManager] setM3UList:m3uModel];
+        [self setAVTransportURIWithSong:songs[0] device:device userID:userID];
+        [self playSongWithChannelNO:13 device:device userID:userID];
+    });
+}
+
 - (void)pauseWithDevice:(id <MKRUPnPDevice>)device {
     wd_playControl_queue(^{
         libupnp_Pause(device.avTransportUrl);