yyqxiaoyin 5 rokov pred
rodič
commit
b3fad51a4e

+ 9 - 5
MKRRadioManager/Classes/MKRRadioManager/MKRWIFIDeviceManager/MKRWIFIDeviceManager.m

@@ -588,11 +588,19 @@ static inline void wd_playControl_queue(void (^block)(void)){
             return ;
         }
         @synchronized (self.currentResource) {
+            if ([resultDic[@"TrackMetaData"][@"upnp:songType"] isKindOfClass:NSString.class]) {
+                NSInteger sourceType = [MKRM3UListModel convertSorceTypeWithAudioType:[resultDic[@"TrackMetaData"][@"upnp:songType"] integerValue]];
+                self.currentResource.sourceType = sourceType;
+            }
             if ([resultDic[@"TrackMetaData"][@"upnp:songName"] isKindOfClass:NSString.class]) {
                 self.currentResource.songName = resultDic[@"TrackMetaData"][@"upnp:songName"];
             }
             if ([resultDic[@"TrackMetaData"][@"upnp:songPlayer"] isKindOfClass:NSString.class]) {
-                self.currentResource.songArtist = resultDic[@"TrackMetaData"][@"upnp:songPlayer"];
+                if (self.currentResource.sourceType == MKRSourceTypeHandPick) {
+                    self.currentResource.songName = resultDic[@"TrackMetaData"][@"upnp:songPlayer"];
+                }else{
+                    self.currentResource.songArtist = resultDic[@"TrackMetaData"][@"upnp:songPlayer"];
+                }
             }
             if ([resultDic[@"TrackMetaData"][@"upnp:songThumb"] isKindOfClass:NSString.class]) {
                 self.currentResource.songAlbumCover = resultDic[@"TrackMetaData"][@"upnp:songThumb"];
@@ -612,10 +620,6 @@ static inline void wd_playControl_queue(void (^block)(void)){
             if ([resultDic[@"CurrentTransportState"] isKindOfClass:NSString.class]) {
                 self.currentResource.resourceStatus.playState = [self.currentResource.resourceStatus updatePlayState:resultDic[@"CurrentTransportState"]];
             }
-            if ([resultDic[@"TrackMetaData"][@"upnp:songType"] isKindOfClass:NSString.class]) {
-                NSInteger sourceType = [MKRM3UListModel convertSorceTypeWithAudioType:[resultDic[@"TrackMetaData"][@"upnp:songType"] integerValue]];
-                self.currentResource.sourceType = sourceType;
-            }
             if ([resultDic[@"TrackMetaData"][@"upnp:songAlbumID"] isKindOfClass:NSString.class]) {
                 id songAlbumID = resultDic[@"TrackMetaData"][@"upnp:songAlbumID"];
                 if ([songAlbumID isKindOfClass:NSString.class]) {