From d4be850e681e599747e28ca45f8077e775034827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com>
Date: Tue, 19 May 2020 10:15:55 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E9=87=8D=E6=9E=84=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=202.=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=B1=82=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=BC=80=E5=85=B3=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/common/constant/Config.java    |  2 +-
 .../gamedetail/dialog/GameTagsDialog.kt        | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/gh/common/constant/Config.java b/app/src/main/java/com/gh/common/constant/Config.java
index 3b27711e5e..6dee0f56eb 100644
--- a/app/src/main/java/com/gh/common/constant/Config.java
+++ b/app/src/main/java/com/gh/common/constant/Config.java
@@ -235,7 +235,7 @@ public class Config {
     }
 
     public static boolean isGameDomeSwitchOpen() {
-        return getSettings().getGameDomeSwitch().equals("on");
+        return getSettings().getGameDomeSwitch() != null && getSettings().getGameDomeSwitch().equals("on");
     }
 
     public static void fixHideFunction() {
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt
index eab5c90556..090aa90d04 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt
@@ -1,13 +1,15 @@
 package com.gh.gamecenter.gamedetail.dialog
 
 import android.app.Dialog
-import android.content.DialogInterface
 import android.os.Bundle
-import android.view.*
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.core.content.ContextCompat
+import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.gh.base.fragment.BaseDialogFragment
 import com.gh.common.dialog.BaseTrackableDialogFragment
 import com.gh.common.util.DisplayUtils
 import com.gh.common.util.MtaHelper
@@ -18,7 +20,6 @@ import com.gh.gamecenter.entity.TagStyleEntity
 import com.gh.gamecenter.tag.TagsActivity
 import com.halo.assistant.HaloApp
 import kotlinx.android.synthetic.main.dialog_game_tags.view.*
-import java.util.concurrent.atomic.AtomicBoolean
 
 class GameTagsDialog : BaseTrackableDialogFragment() {
 
@@ -26,6 +27,12 @@ class GameTagsDialog : BaseTrackableDialogFragment() {
     lateinit var mTagStyles: ArrayList<TagStyleEntity>
     lateinit var mGameName: String
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        mGameName = requireArguments().getString("gameName") ?: ""
+        mTagStyles = requireArguments().getParcelableArrayList("tagStyles") ?: ArrayList()
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val createDialog = super.onCreateDialog(savedInstanceState)
         createDialog.setCanceledOnTouchOutside(true)
@@ -76,8 +83,7 @@ class GameTagsDialog : BaseTrackableDialogFragment() {
     companion object {
         fun showGameTagsDialog(context: FragmentActivity, tagStyles: ArrayList<TagStyleEntity>, gameName: String) {
             val dialog = GameTagsDialog().apply {
-                mTagStyles = tagStyles
-                mGameName = gameName
+                arguments = bundleOf("gameName" to gameName, "tagStyles" to tagStyles)
             }
             dialog.show(context.supportFragmentManager, DownloadDialog::class.java.name)
         }