Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并后代码恢复

Browse Source
This commit is contained in:
huangzhuanghua
2016-07-19 09:56:03 +08:00
parent 87c5c5a0d8
commit 1b03e434a7
1 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java
View File

@ -96,6 +96,8 @@ public class Game1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
private List<GameEntity> pluginList;
private List<SubjectEntity> subjectList;
private int pluginSize;
private boolean isNetworkError;
private boolean isSlideError;
private boolean isListError;
@ -142,6 +144,8 @@ public class Game1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
pluginList = new ArrayList<GameEntity>();
subjectList = new ArrayList<SubjectEntity>();
pluginSize = 0;
isNetworkError = false;
isSlideError = false;
isListError = false;
@ -213,12 +217,31 @@ public class Game1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
if (list != null && !list.isEmpty()) {
subjectList = list;
GameManager manager = new GameManager(context);
for (SubjectEntity subjectEntity : subjectList) {
for (GameEntity gameEntity : subjectEntity.getData()) {
gameEntity.setEntryMap(gameMap.get(gameEntity.getName()));
for (ApkEntity apkEntity : gameEntity.getApk()) {
manager.addOrUpdate(new GameInfo(apkEntity.getPackageName(),
gameEntity.getId(), gameEntity.getName()));
SubjectEntity subjectEntity;
GameEntity gameEntity;
for (int j = 0; j < subjectList.size(); j++) {
subjectEntity = subjectList.get(j);
if (subjectEntity.getData().size() == 1
&& !TextUtils.isEmpty(subjectEntity.getData().get(0).getImage())){
subjectList.remove(j);
continue;
}
for (int i = 0; i < subjectEntity.getData().size(); i++) {
gameEntity = subjectEntity.getData().get(i);
if (gameEntity.getApk() != null && !gameEntity.getApk().isEmpty()) {
gameEntity.setEntryMap(gameMap.get(gameEntity.getName()));
for (ApkEntity apkEntity : gameEntity.getApk()) {
manager.addOrUpdate(new GameInfo(apkEntity.getPackageName(),
gameEntity.getId(), gameEntity.getName()));
}
} else {
if (TextUtils.isEmpty(gameEntity.getType())
|| TextUtils.isEmpty(gameEntity.getLink())
|| TextUtils.isEmpty(gameEntity.getName())
|| TextUtils.isEmpty(gameEntity.getImage())) {
subjectEntity.getData().remove(i);
i--;
}
}
}
}
@ -332,14 +355,14 @@ public class Game1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
GameEntity gameEntity;
for (ConcernInfo info : infos) {
map = info.getPackageNames();
for (int i = 0, size = list.size(); i < size; i++) {
gameEntity = list.get(i);
if (gameEntity.getId().equals(info.getId())
&& gameEntity.getTag() != null && gameEntity.getTag().size() != 0
&& gameEntity.getApk() != null) {
for (String key : map.keySet()) {
if (map.get(key)) {
if (!mPackageManager.isSignature(key)) {
for (String key : map.keySet()) {
if (map.get(key)) {
if (!mPackageManager.isSignature(key)) {
for (int i = 0, size = list.size(); i < size; i++) {
gameEntity = list.get(i);
if (gameEntity.getId().equals(info.getId())
&& gameEntity.getTag() != null && gameEntity.getTag().size() != 0
&& gameEntity.getApk() != null) {
for (ApkEntity apkEntity : gameEntity.getApk()) {
if (apkEntity.getPackageName().equals(key)) {
GameEntity entity = gameEntity.clone();
@ -348,18 +371,9 @@ public class Game1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
ArrayList<ApkEntity> apkList = new ArrayList<ApkEntity>();
apkList.add(apkEntity);
entity.setApk(apkList);
pluginList.add(entity);
if (pluginList.size() == 3) {
GameManager manager = new GameManager(context);
for (GameEntity gEntity : pluginList) {
gEntity.setEntryMap(gameMap.get(gEntity.getName()));
for (ApkEntity aEntity : gEntity.getApk()) {
manager.addOrUpdate(new GameInfo(aEntity.getPackageName(),
gEntity.getId(), gEntity.getName()));
}
}
notifyItemRangeInserted(1, pluginList.size() + 1);
initLocationMap();
pluginSize++;
if (pluginList.size()< 3) {
pluginList.add(entity);
return;
}
break;