From b915ea01be1fc7d666595df68b111a67b275fe48 Mon Sep 17 00:00:00 2001
From: huangzhuanghua <401742778@qq.com>
Date: Tue, 19 Jul 2016 09:42:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E9=A2=98=E6=95=B0=E6=8D=AE=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gamecenter/game/Game1FragmentAdapter.java | 35 +++++++++++++++----
 .../gamecenter/game/Game2FragmentAdapter.java | 31 ++++++++++++----
 2 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java
index 9930a82910..608165809b 100644
--- a/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java
@@ -31,6 +31,7 @@ import com.gh.common.util.GameViewUtils;
 import com.gh.common.util.ImageUtils;
 import com.gh.common.util.PlatformUtils;
 import com.gh.common.util.TimestampUtils;
+import com.gh.common.util.Utils;
 import com.gh.common.view.AutoScrollViewPager;
 import com.gh.download.DownloadEntry;
 import com.gh.gamecenter.GameDetailsActivity;
@@ -216,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--;
+                                        }
                                     }
                                 }
                             }
@@ -828,7 +848,8 @@ public class Game1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         for (int i = 0, size = subjectList.size(); i < size; i++) {
             if (position >= offset && position <= subjectList.get(i).getData().size() + offset){
                 gameEntity = subjectList.get(i).getData().get(position - offset);
-                if (position == offset && TextUtils.isEmpty(gameEntity.getImage()) || position == offset+1&&!TextUtils.isEmpty(subjectList.get(i).getData().get(0).getImage())) {
+                if (position == offset && TextUtils.isEmpty(gameEntity.getImage())
+                        || position == offset + 1 && !TextUtils.isEmpty(subjectList.get(i).getData().get(0).getImage())) {
                     holder.thumb.setVisibility(View.GONE);
                     holder.title.setText(subjectList.get(i).getName());
                     holder.title.setTextColor(Color.BLACK);
diff --git a/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java
index c9ec280a80..14244be888 100644
--- a/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java
@@ -134,12 +134,31 @@ public class Game2FragmentAdapter 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--;
+                                        }
                                     }
                                 }
                             }