|
@@ -341,7 +341,7 @@ static inline void wd_main_queue(void (^block)(void)){
|
|
|
channelNumString,
|
|
|
@"0",
|
|
|
userID,
|
|
|
- song.songInfoID,
|
|
|
+ @(song.songID).stringValue,
|
|
|
@(song.songFrom).stringValue,
|
|
|
song.songAlbumID?:@""
|
|
|
);
|
|
@@ -420,7 +420,7 @@ static inline void wd_main_queue(void (^block)(void)){
|
|
|
resource.songArtist = dmrPositionInfo[3];
|
|
|
resource.songAlbumCover = dmrPositionInfo[5];
|
|
|
resource.songUrl = dmrPositionInfo[7];
|
|
|
- resource.songInfoID = dmrPositionInfo[16];
|
|
|
+ resource.songID = [dmrPositionInfo[16] integerValue];
|
|
|
NSString *songFrom = dmrPositionInfo[17];
|
|
|
if ([songFrom containsString:@"//"]) {
|
|
|
NSArray *arr = [songFrom componentsSeparatedByString:@"//"];
|
|
@@ -443,7 +443,7 @@ static inline void wd_main_queue(void (^block)(void)){
|
|
|
// status.totalTime = [oneSong.songLength integerValue];
|
|
|
NSString *songChannelUid = [NSString stringWithFormat:@"%@-%@-%zd",self.userID,device.deviceUUID,resource.songChannel];
|
|
|
resource.songChannelUid = songChannelUid;
|
|
|
- resource.songFlag = [NSString stringWithFormat:@"%@_%@_%@",songChannelUid,resource.songInfoID,songFrom];
|
|
|
+ resource.songFlag = [NSString stringWithFormat:@"%@_%@_%@",songChannelUid,resource.songID,songFrom];
|
|
|
return resource;
|
|
|
}
|
|
|
|