From fb4e38e50f7eebe303a03ddb1cd4a0838c8cfad9 Mon Sep 17 00:00:00 2001
From: lyr <liuyirong@ghzhushou.com>
Date: Wed, 11 May 2022 11:46:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E7=9A=84=E5=88=87=E6=8D=A2(=E8=B4=A6=E5=8F=B7=E4=B8=8E?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=A1=B5=E9=9D=A2)=20https://git.shanqu.cc/h?=
 =?UTF-8?q?alo/android/assistant-android/-/issues/65?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/common/util/DialogUtils.java  |  3 ++-
 .../gamecenter/security/BindPhoneFragment.kt  | 25 +++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java
index d6336149fa..0efdcb5fe5 100644
--- a/app/src/main/java/com/gh/common/util/DialogUtils.java
+++ b/app/src/main/java/com/gh/common/util/DialogUtils.java
@@ -2115,7 +2115,7 @@ public class DialogUtils {
         dialog.show();
     }
 
-    public static void showBindPhoneDialog(Context context, ConfirmListener listener) {
+    public static Dialog showBindPhoneDialog(Context context, ConfirmListener listener) {
         context = checkDialogContext(context);
 
         final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
@@ -2133,6 +2133,7 @@ public class DialogUtils {
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(binding.getRoot());
         dialog.show();
+        return dialog;
     }
 
     public static void showReceiveLibaoSuccessDialog(Context context, String title, String des, String libaoCode, ConfirmListener listener) {
diff --git a/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt b/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt
index ea6ce1bf7f..ee4bd002d5 100644
--- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt
@@ -1,5 +1,6 @@
 package com.gh.gamecenter.security
 
+import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
 import android.os.Message
@@ -22,6 +23,7 @@ class BindPhoneFragment : NormalFragment() {
 
     private lateinit var mViewModel: BindPhoneViewModel
     private val mBinding by lazy { FragmentBindPhoneBinding.inflate(layoutInflater) }
+    private var mDialog: Dialog? = null
 
     override fun handleMessage(msg: Message) {
         if (msg.what == 0) { // 验证码倒计时
@@ -66,7 +68,7 @@ class BindPhoneFragment : NormalFragment() {
             it.setOnClickListener(this)
         }
 
-        mBinding.bindPhoneSkip.goneIf(!mFromLogin)
+        mBinding.bindPhoneSkip.goneIf(!true)
         mBinding.bindPhoneTitle.text = if (mChangePhone) requireContext().resources.getString(R.string.bind_phone_title2)
                             else requireContext().resources.getString(R.string.bind_phone_title1)
         mBinding.bindPhoneDesc.text = if (mChangePhone) {
@@ -206,7 +208,7 @@ class BindPhoneFragment : NormalFragment() {
 
         when (v.id) {
             R.id.bind_phone_skip -> {
-                DialogUtils.showBindPhoneDialog(requireContext()) { requireActivity().finish() }
+                showBindPhoneDialog()
             }
 
             R.id.bind_phone_captcha -> {
@@ -261,6 +263,15 @@ class BindPhoneFragment : NormalFragment() {
         }
     }
 
+    private fun showBindPhoneDialog() {
+        mDialog = DialogUtils.showBindPhoneDialog(requireContext()) { requireActivity().finish() }
+    }
+
+    override fun onStop() {
+        super.onStop()
+        mDialog = null
+    }
+
     override fun onNightModeChange() {
         super.onNightModeChange()
         mBinding.run {
@@ -274,6 +285,16 @@ class BindPhoneFragment : NormalFragment() {
                     it.setTextColor(R.color.text_title.toColor(requireContext()))
                 }
             }
+
+            bindPhoneBtn.run {
+                background = R.drawable.download_button_normal_style.toDrawable(requireContext())
+                setTextColor(R.color.text_white.toColor(requireContext()))
+            }
+
+            if (mDialog != null && mDialog!!.isShowing) {
+                mDialog?.dismiss()
+                showBindPhoneDialog()
+            }
         }
     }
 }
\ No newline at end of file