优化游戏切换

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/LoginActivity.kt

@@ -80,7 +80,7 @@ class LoginActivity : BaseActivity()
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
         return if (keyCode == KeyEvent.KEYCODE_BACK) {
             val channel = CommonUtils.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME")
-            if (!TextUtils.equals(channel, Constant.CHANNEL_SHARE)) {
+            if (!TextUtils.equals(channel, Constant.CHANNEL_SHARE) && !loginFlag) {
                 finish()
             }
             true
@@ -93,7 +93,7 @@ class LoginActivity : BaseActivity()
         when (v?.id) {
             R.id.ivLoginBack -> {
                 val channel = CommonUtils.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME")
-                if (!TextUtils.equals(channel, Constant.CHANNEL_SHARE)) {
+                if (!TextUtils.equals(channel, Constant.CHANNEL_SHARE) && !loginFlag) {
                     finish()
                 }
             }
@@ -193,7 +193,7 @@ class LoginActivity : BaseActivity()
         }
 
         val channel = CommonUtils.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME")
-        if (TextUtils.equals(channel, Constant.CHANNEL_SHARE)) {
+        if (TextUtils.equals(channel, Constant.CHANNEL_SHARE) && !loginFlag) {
             readyGo(MainActivity::class.java)
         }
 

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/DhGameFragment.kt

@@ -5,11 +5,14 @@ import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.net.Uri
 import android.os.Build
+import android.text.TextUtils
 import android.view.View
 import android.view.ViewGroup
 import android.webkit.WebSettings
 import android.webkit.WebViewClient
 import com.mints.goodmoney.R
+import com.mints.goodmoney.common.AppConfig
+import com.mints.goodmoney.common.Constant
 import com.mints.goodmoney.manager.UserManager
 import com.mints.goodmoney.ui.fragment.base.LazyLoadBaseFragment
 import com.mints.goodmoney.utils.LogUtil

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MoneyFragment.kt

@@ -19,6 +19,7 @@ import java.util.*
 class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener {
 
     private var mainFragment: MainFragment? = null
+    private var dhGameFragment: DhGameFragment? = null
 
     private var curPosition = 0//当前标签选中的下标
 
@@ -31,6 +32,8 @@ class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener {
     override fun onHiddenChanged(hidden: Boolean) {
         if (curPosition == 0) {
             mainFragment?.onHiddenChanged(hidden)
+        } else if (curPosition == 2) {
+            dhGameFragment?.onHiddenChanged(hidden)
         }
         super.onHiddenChanged(hidden)
     }
@@ -50,9 +53,10 @@ class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener {
 
         val fragments: MutableList<Fragment> = ArrayList()
         mainFragment = MainFragment()
+        dhGameFragment = DhGameFragment()
         fragments.add(mainFragment!!)
         fragments.add(ZhangyueFragment())
-        fragments.add(DhGameFragment())
+        fragments.add(dhGameFragment!!)
 
         //去除两侧应阴影
         vpFragmentMoney.overScrollMode = ViewPager.OVER_SCROLL_NEVER