Commit 621603f9 authored by yqz's avatar yqz

Merge branch 'dev_main' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager into dev_main

* 'dev_main' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager:
  【优化】排序
parents 7b883d71 4e3e7033
......@@ -159,7 +159,7 @@ class HomeViewModel {
} completionHandler: {[weak self] totalGroup in
guard let weakSelf = self else { return }
print("获取相似图片完成",totalGroup.count)
weakSelf.photoManager.similarModels = totalGroup
weakSelf.photoManager.similarModels = weakSelf.sortDataToLatest(source: totalGroup)
weakSelf.filterResource()
weakSelf.homeDataChanged?(0,type.index,true)
......@@ -183,7 +183,7 @@ class HomeViewModel {
} completionHandler: {[weak self] totalGroup in
guard let weakSelf = self else { return }
print("获取相似截图完成",totalGroup.count)
weakSelf.photoManager.similarScreenShotModels = totalGroup
weakSelf.photoManager.similarScreenShotModels = weakSelf.sortDataToLatest(source: totalGroup)
weakSelf.filterResource()
weakSelf.homeDataChanged?(1,type.index,false)
}
......@@ -203,7 +203,7 @@ class HomeViewModel {
} completionHandler: {[weak self] totalGroup in
print("获取相似视频完成",totalGroup.count)
guard let weakSelf = self else { return }
weakSelf.photoManager.similarVideoModels = totalGroup
weakSelf.photoManager.similarVideoModels = weakSelf.sortDataToLatest(source: totalGroup)
weakSelf.filterResource()
weakSelf.homeDataChanged?(1,type.index,false)
}
......@@ -256,5 +256,13 @@ class HomeViewModel {
func filterResource(){
photoManager.filterResource()
}
func sortDataToLatest(source: [[AssetModel]]) -> [[AssetModel]] {
return source.sorted { subArray1, subArray2 in
guard let max1 = subArray1.max(by: { $0.createDate < $1.createDate })?.createDate else { return false }
guard let max2 = subArray2.max(by: { $0.createDate < $1.createDate })?.createDate else { return true }
return max1 > max2
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment