|
@@ -85,6 +85,23 @@
|
|
|
[dataArr addObject:model];
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ //数组按第一次预览时间倒序
|
|
|
+ if(dataArr.count >= 2){
|
|
|
+ NSArray *sortArr = [dataArr sortedArrayUsingComparator:^NSComparisonResult(lastFileModel* obj1, lastFileModel* obj2) {
|
|
|
+ NSTimeInterval time1 = obj1.lastPreTime;
|
|
|
+ NSTimeInterval time2 = obj2.lastPreTime;
|
|
|
+ if (time1 < time2) {
|
|
|
+ return NSOrderedDescending;
|
|
|
+ }
|
|
|
+ if (time1 > time2) {
|
|
|
+ return NSOrderedAscending;
|
|
|
+ }
|
|
|
+ return NSOrderedSame;
|
|
|
+ }];
|
|
|
+
|
|
|
+ dataArr = [NSMutableArray arrayWithArray:sortArr];
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -119,20 +136,24 @@
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- model.localPath = [self getAudioCacheFullPathBy:model.name];
|
|
|
+ //把原来的数据加到saveDictArr
|
|
|
+ //lastFileMod.localPath = [self getAudioCacheFullPathBy:model.name];
|
|
|
NSDictionary *dict = [model lastFileInfoFun];
|
|
|
[saveDictArr addObject:dict];
|
|
|
}
|
|
|
|
|
|
if(isInPlayList){
|
|
|
HLog(@"音乐保存在播放列表里面了")
|
|
|
- return YES;
|
|
|
+ return NO;
|
|
|
}
|
|
|
|
|
|
//1.写到内存
|
|
|
- [dataArr addObject:lastFileMod];
|
|
|
+ //[dataArr addObject:lastFileMod];
|
|
|
+ [dataArr insertObject:lastFileMod atIndex:0];
|
|
|
|
|
|
- //2.本地持久化
|
|
|
+ //2.本地持久化 把新的的数据加到saveDictArr
|
|
|
+ lastFileMod.lastPreTime = [iTools getNowTimeStamp];
|
|
|
+ lastFileMod.localPath = [self getAudioCacheFullPathBy:lastFileMod.name];
|
|
|
NSDictionary *dict = [lastFileMod lastFileInfoFun];
|
|
|
[saveDictArr addObject:dict];
|
|
|
|