From 4980d96c8c0a78a15ed8c8d95091e9901202e52c Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Mon, 11 Mar 2019 18:24:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E7=9A=84=E6=B8=B8?=
 =?UTF-8?q?=E6=88=8F=E6=A0=87=E7=AD=BE=E6=97=B6=E4=BC=9A=E9=97=AA=E9=80=80?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gamedetail/desc/GameDetailBasicInfoAdapter.java      | 9 ++++++++-
 libraries/LGLibrary                                      | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailBasicInfoAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailBasicInfoAdapter.java
index 5abea0439e..2fc73eb2f9 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailBasicInfoAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailBasicInfoAdapter.java
@@ -106,7 +106,12 @@ public class GameDetailBasicInfoAdapter extends BaseRecyclerAdapter<RecyclerView
                     viewHolder.hintDv.setVisibility(View.GONE);
                 }
                 viewHolder.hintTv.setText(tagEntity.getName());
-                viewHolder.hintTv.setTextColor(Color.parseColor(tagEntity.getColor()));
+                try {
+                    // 有可能给的颜色有问题
+                    viewHolder.hintTv.setTextColor(Color.parseColor(tagEntity.getColor()));
+                } catch (Exception ignore) {
+
+                }
                 if (isOpen) {
                     viewHolder.hintContentTv.setVisibility(View.VISIBLE);
                     viewHolder.hintContentTv.setText(tagEntity.getDes());
@@ -124,6 +129,8 @@ public class GameDetailBasicInfoAdapter extends BaseRecyclerAdapter<RecyclerView
 
     @Override
     public int getItemCount() {
+        if (tags == null) return 0;
+
         if (tips.getTitle() != null) {
             return tags.size() + 1;
         }
diff --git a/libraries/LGLibrary b/libraries/LGLibrary
index 231a0e08d6..72b3007b44 160000
--- a/libraries/LGLibrary
+++ b/libraries/LGLibrary
@@ -1 +1 @@
-Subproject commit 231a0e08d6f0a314a68b9ed82598567136ec617a
+Subproject commit 72b3007b444765cf6059ee5bb724480a70d59ad9

From 8cf90193fc46787c582606f771f967b8a676bd35 Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Mon, 18 Mar 2019 16:12:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E6=95=B0=E7=BB=84=E8=B6=8A=E7=95=8C=E9=80=A0=E6=88=90=E7=9A=84?=
 =?UTF-8?q?=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gh/gamecenter/subject/tile/SubjectTypeListAdapter.kt    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTypeListAdapter.kt b/app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTypeListAdapter.kt
index 59bafaaf26..3299021689 100644
--- a/app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTypeListAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTypeListAdapter.kt
@@ -50,6 +50,8 @@ class SubjectTypeListAdapter(context: Context,
         }
 
         holder.type.setOnClickListener {
+            if (holder.adapterPosition == -1) return@setOnClickListener
+
             holder.type.isSelected = true
             mCurType = mGameType[holder.adapterPosition]
             mItemClickListener.invoke(mGameType[holder.adapterPosition])