版本升级维护

MKRRadioManager/Classes/MKRRadioManager/MKRWIFIDeviceManager/MKRM3UListModel.m

@@ -69,11 +69,11 @@
     [songs enumerateObjectsUsingBlock:^(id <MKRRadioResorce> obj, NSUInteger idx, BOOL *stop) {
         [self.durationList addObject:@"00:00:00"];
         [self.secondsList addObject:@"0"];
-        [self.artistList addObject:obj.songArtist];
-        [self.albumList addObject:obj.songAlbum];
-        [self.titleList addObject:obj.songName];
-        [self.albumArtUriList addObject:obj.songAlbumCover];
-        [self.urlList addObject:obj.songUrl];
+        [self.artistList addObject:obj.songArtist?:@""];
+        [self.albumList addObject:obj.songAlbum?:@""];
+        [self.titleList addObject:obj.songName?:@""];
+        [self.albumArtUriList addObject:obj.songAlbumCover?:@""];
+        [self.urlList addObject:obj.songUrl?:@""];
         [self.protocolInfoList addObject:@"http-get:*:audio/mpeg:*"];
         [self.upnpclassList addObject:@"object.item.audioItem.musicTrack"];
         [self.channelNumList addObject:@(obj.songChannel).stringValue];

MKRRadioManager/Classes/MKRRadioManager/MKRWIFIDeviceManager/MKRWIFIDeviceManager.m

@@ -330,43 +330,61 @@ static inline void wd_playControl_queue(void (^block)(void)){
     });
 }
 
-- (void)setM3UList:(MKRM3UListModel *)m3uListModel {
+- (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,
-        @""
-        );
+        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 {