Quellcode durchsuchen

版本升级维护

ZHJ vor 5 Jahren
Ursprung
Commit
0a9c3a05f8

+ 1 - 1
MKRRadioManager/Classes/MKRRadioManager/MKRRadioResorce.h

@@ -22,7 +22,7 @@
 /** 歌曲专辑封面 */
 @property(nonatomic, strong) NSString *songAlbumCover;
 /** 歌曲ID */
-@property(nonatomic, strong) NSString *songInfoID;
+@property(nonatomic, assign) NSInteger songID;
 /** 歌曲来源 */
 @property(nonatomic, assign) MKRSourcePlatform songFrom;
 /** 节目专辑ID */

+ 1 - 1
MKRRadioManager/Classes/MKRRadioManager/MKRRadioResorce.m

@@ -14,7 +14,7 @@
 @synthesize songArtist;
 @synthesize songChannel;
 @synthesize songFrom;
-@synthesize songInfoID;
+@synthesize songID;
 @synthesize songName;
 @synthesize songUrl;
 @synthesize vip_canPlay;

+ 1 - 1
MKRRadioManager/Classes/MKRRadioManager/MKRWIFIDeviceManager/MKRM3UListModel.m

@@ -69,7 +69,7 @@
         [self.startTimeList addObject:@"00:00:00"];
         [self.endTimeList addObject:@"00:00:00"];
         [self.vipCanPlay addObject:[NSString stringWithFormat:@"%zd",obj.vip_canPlay]];
-        [self.songIDList addObject:obj.songInfoID?:@""];
+        [self.songIDList addObject:@(obj.songID).stringValue?:@""];
         [self.songFromList addObject:[NSString stringWithFormat:@"%zd",obj.songFrom]];
         [self.songAlbumIDList addObject:obj.songAlbumID?:@""];
     }];

+ 3 - 3
MKRRadioManager/Classes/MKRRadioManager/MKRWIFIDeviceManager/MKRWIFIDeviceManager.m

@@ -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;
 }