Merge remote-tracking branch 'origin/release' into dev
# Conflicts: # app/src/main/java/com/gh/common/FixedRateJobHelper.kt # app/src/main/java/com/gh/common/databind/BindingAdapters.java # app/src/main/java/com/gh/common/util/DetailDownloadUtils.java # app/src/main/java/com/gh/common/util/DialogUtils.java # app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java # app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListViewModel.kt # dependencies.gradle
This commit is contained in:
@ -69,7 +69,9 @@ import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.LinkedBlockingQueue;
|
||||
|
||||
public class DownloadManager implements DownloadStatusListener {
|
||||
@ -83,7 +85,7 @@ public class DownloadManager implements DownloadStatusListener {
|
||||
|
||||
private final ArrayMap<String, Long> lastTimeMap;
|
||||
private final ArrayMap<String, LinkedBlockingQueue<String>> platformMap;
|
||||
private final ArrayMap<String, ArrayMap<String, DownloadEntity>> gameMap;
|
||||
private final Map<String, ArrayMap<String, DownloadEntity>> gameMap;
|
||||
|
||||
private final ArrayMap<String, DownloadStatus> statusMap;
|
||||
private final ArrayMap<String, DownloadEntity> downloadingMap;
|
||||
@ -173,7 +175,7 @@ public class DownloadManager implements DownloadStatusListener {
|
||||
|
||||
lastTimeMap = new ArrayMap<>();
|
||||
platformMap = new ArrayMap<>();
|
||||
gameMap = new ArrayMap<>();
|
||||
gameMap = new ConcurrentHashMap<>();
|
||||
statusMap = new ArrayMap<>();
|
||||
downloadingMap = new ArrayMap<>();
|
||||
// mDownloadSnapshotList = new ArrayList<>();
|
||||
@ -649,7 +651,7 @@ public class DownloadManager implements DownloadStatusListener {
|
||||
public void initGameMap() {
|
||||
gameMap.clear();
|
||||
List<DownloadEntity> list = getAllDownloadEntitySnapshots();
|
||||
if (list != null && list.size() != 0) {
|
||||
if (list.size() != 0) {
|
||||
String name;
|
||||
for (DownloadEntity downloadEntity : list) {
|
||||
name = downloadEntity.getName();
|
||||
|
||||
Reference in New Issue
Block a user