|
@@ -461,7 +461,8 @@ static inline void wd_playControl_queue(void (^block)(void)){
|
|
|
self.currentResource.songID = [dic[@"TrackMetaData"][@"upnp:songInfoID"] integerValue];
|
|
|
self.currentResource.songFrom = [dic[@"TrackMetaData"][@"upnp:songPlatform"] integerValue];
|
|
|
self.currentResource.resourceStatus.totalTime = [dic[@"TrackMetaData"][@"upnp:songDuration"] integerValue];
|
|
|
- self.currentResource.sourceType = [dic[@"TrackMetaData"][@"upnp:songType"] integerValue];
|
|
|
+ NSInteger sourceType = [self convertSorceTypeWithAudioType:[dic[@"TrackMetaData"][@"upnp:songType"] integerValue]];
|
|
|
+ self.currentResource.sourceType = sourceType;
|
|
|
self.currentResource.songAlbumID = dic[@"TrackMetaData"][@"upnp:songAlbumID"];
|
|
|
NSString *channelString = dic[@"TrackMetaData"][@"upnp:songFlag"];
|
|
|
NSInteger songChannel = 0;
|
|
@@ -480,6 +481,25 @@ static inline void wd_playControl_queue(void (^block)(void)){
|
|
|
return self.currentResource;
|
|
|
}
|
|
|
|
|
|
+//后台资源类型转成本地资源类型
|
|
|
+//type:1音乐直播 2直播电台 3音乐歌单 4主播电台 5音乐单曲 6电台节目 7电台精选
|
|
|
+- (MKRSourceType)convertSorceTypeWithAudioType:(NSInteger)type{
|
|
|
+
|
|
|
+#define ConvertSourceTypeCase(_value,_sourceType) case _value: \
|
|
|
+ return _sourceType; \
|
|
|
+ break;
|
|
|
+ switch (type) {
|
|
|
+ ConvertSourceTypeCase(1, MKRSourceTypeMusicRadio);
|
|
|
+ ConvertSourceTypeCase(2, MKRSourceTypeBroadcast);
|
|
|
+ ConvertSourceTypeCase(3, MKRSourceTypeMusic);
|
|
|
+ ConvertSourceTypeCase(4, MKRSourceTypePodcast);
|
|
|
+ ConvertSourceTypeCase(5, MKRSourceTypeMusic);
|
|
|
+ ConvertSourceTypeCase(6, MKRSourceTypePodcast);
|
|
|
+ ConvertSourceTypeCase(7, MKRSourceTypeHandPick);
|
|
|
+ }
|
|
|
+ return MKRSourceTypeMusic;
|
|
|
+}
|
|
|
+
|
|
|
- (id<MKRRadioResorce>)currentResource{
|
|
|
if (!_currentResource) {
|
|
|
_currentResource = [[MKRRadioResorce alloc] init];
|