v1.0.0开发：debug包引入leakcanary

demo/build.gradle

@@ -69,4 +69,6 @@ android {
 dependencies {
 
     api project(':library_core')
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
+
 }

demo/src/main/assets/yyxx_game/yyxx_cfg.properties

@@ -7,9 +7,9 @@ YYXX_ADJUST_APP_ID=3lb7knrx3yww
 # 事件打点开关,没配置的情况下默认开启（true）
 #YYXX_ADJUST_ENABLE=false
 # Google AppId
-YYXX_GOOGLE_APP_ID=633652677873
+YYXX_GOOGLE_APP_ID=70429070957
 # Google Server Client Id
-YYXX_GOOGLE_CLIENT_ID=633652677873-m2f480tq9t2elrvit98vf3nsbleo1pab.apps.googleusercontent.com
+YYXX_GOOGLE_CLIENT_ID=70429070957-7clr9u565jrjgbgg474ksg8q2esq2okj.apps.googleusercontent.com
 # Facebook AppId
 YYXX_FACEBOOK_ID=1047370039003298
 #debug模式（cp出正式包请关闭）

demo/src/main/java/com/eyuangame/demo/DemoActivity.kt

@@ -11,7 +11,7 @@ import android.view.View
 import android.widget.*
 import cn.yyxx.eyuangame.base.EYuanGame
 import cn.yyxx.eyuangame.base.internal.ICallback
-import cn.yyxx.eyuangame.core.impl.center.MemberActivity
+import cn.yyxx.eyuangame.core.ui.dialog.ScaleLoadingDialog
 import cn.yyxx.support.hawkeye.LogUtils
 import kotlin.system.exitProcess
 
@@ -112,6 +112,9 @@ class DemoActivity : Activity(), View.OnClickListener {
                         }
                     })
                 }
+                3 -> {
+                    ScaleLoadingDialog(this@DemoActivity, "").show()
+                }
             }
         }
     }

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/SdkBridgeImpl.kt

@@ -21,6 +21,7 @@ import cn.yyxx.eyuangame.core.internal.IImplCallback
 import cn.yyxx.eyuangame.core.internal.IRequestCallback
 import cn.yyxx.eyuangame.core.network.Host
 import cn.yyxx.eyuangame.core.network.SdkRequest
+import cn.yyxx.eyuangame.core.ui.dialog.ScaleLoadingDialog
 import cn.yyxx.eyuangame.core.ui.dialog.TipsDialog
 import cn.yyxx.eyuangame.core.utils.MMKVUtils
 import cn.yyxx.support.BeanUtils
@@ -63,6 +64,10 @@ class SdkBridgeImpl(context: Context) {
 
     private var exitDialog: TipsDialog? = null
 
+    private var initLoadingDialog: ScaleLoadingDialog? = null
+    private var chargeLoadingDialog: ScaleLoadingDialog? = null
+
+
     init {
         Host.initHostModel(context)
         LogUtils.DEBUG = OwnDebugUtils.isOwnDebug(context, "yyxx_cfg.properties", "yyxx_game", "YYXX_OWN_DEBUG")
@@ -119,7 +124,7 @@ class SdkBridgeImpl(context: Context) {
 
         if (!hasReadGaid) {
             Logger.e("还未完成gaid加载，将延迟初始化")
-            //TODO showInitDialog
+            showInitLoadingDialog(activity)
             Thread {
                 while (!hasReadGaid) {
                     try {
@@ -136,7 +141,7 @@ class SdkBridgeImpl(context: Context) {
                     } else {
                         Logger.i("加载gaid成功，共延迟${timeCount}s初始化，将进行初始化操作...")
                     }
-                    //TODO hideInitDialog
+                    hideInitLoadingDialog()
                     startSdkInit(activity, callback, initCallback)
                 }
             }
@@ -371,6 +376,23 @@ class SdkBridgeImpl(context: Context) {
         return SdkBackLoginInfo.instance.userId
     }
 
+    private fun showInitLoadingDialog(context: Context) {
+        initLoadingDialog?.apply {
+            dismiss()
+            initLoadingDialog = null
+        }
+
+        initLoadingDialog = ScaleLoadingDialog(context, "")
+        initLoadingDialog?.show()
+    }
+
+    private fun hideInitLoadingDialog() {
+        initLoadingDialog?.apply {
+            dismiss()
+            initLoadingDialog = null
+        }
+    }
+
     companion object {
         var isLand = false
         lateinit var initBean: InitBean

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/center/MemberActivity.kt

@@ -16,7 +16,7 @@ import cn.yyxx.eyuangame.core.impl.center.fragment.BindAccountFragment
 import cn.yyxx.eyuangame.core.impl.center.fragment.BindPhoneFragment
 import cn.yyxx.eyuangame.core.impl.center.fragment.MainFragment
 import cn.yyxx.eyuangame.core.impl.center.fragment.ModifyPwdFragment
-import cn.yyxx.eyuangame.core.internal.IImplCallback
+import cn.yyxx.eyuangame.core.utils.TimeDownUtils
 import cn.yyxx.support.AndroidBug5497Workaround
 import cn.yyxx.support.ResUtils
 import java.util.*
@@ -27,8 +27,6 @@ import java.util.*
  */
 class MemberActivity : FragmentActivity() {
 
-    private lateinit var memberCenterImpl: MemberCenterImpl
-
     private var mainFragment: MainFragment? = null
     private var bindAccountFragment: BindAccountFragment? = null
     private var bindPhoneFragment: BindPhoneFragment? = null
@@ -41,11 +39,6 @@ class MemberActivity : FragmentActivity() {
         super.onCreate(savedInstanceState)
         initView()
         initFragment()
-        memberCenterImpl = MemberCenterImpl(object : IImplCallback {
-            override fun onResult(code: Int, result: String) {
-
-            }
-        })
     }
 
     private fun initView() {
@@ -187,6 +180,11 @@ class MemberActivity : FragmentActivity() {
         hideBar()
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        TimeDownUtils.cancel()
+    }
+
     override fun onBackPressed() {
         if (!fragmentStack.isNullOrEmpty() && fragmentStack.size > 1) {
             fragmentStack.removeLast()

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/center/MemberCenterImpl.kt

@@ -1,103 +0,0 @@
-package cn.yyxx.eyuangame.core.impl.center
-
-import android.app.Activity
-import cn.yyxx.eyuangame.core.entity.ResultInfo
-import cn.yyxx.eyuangame.core.entity.SdkBackLoginInfo
-import cn.yyxx.eyuangame.core.internal.IImplCallback
-import cn.yyxx.eyuangame.core.internal.IRequestCallback
-import cn.yyxx.eyuangame.core.network.SdkRequest
-import org.json.JSONException
-import org.json.JSONObject
-
-/**
- * @author #Suyghur.
- * Created on 2021/06/30
- */
-class MemberCenterImpl(val implCallback: IImplCallback) {
-
-    fun bindAccount(activity: Activity, userName: String, pwd: String) {
-        try {
-            with(JSONObject()) {
-                put("uid", SdkBackLoginInfo.instance.userId)
-                put("login_type", SdkBackLoginInfo.instance.loginType)
-                put("uname", userName)
-                put("pwd", pwd)
-                SdkRequest.instance.bindAccount(activity, this, object : IRequestCallback {
-                    override fun onResponse(resultInfo: ResultInfo) {
-                        if (resultInfo.code == 1) {
-                            implCallback.onResult(0, resultInfo.data)
-                        } else {
-                            implCallback.onResult(-1, resultInfo.data)
-                        }
-                    }
-                })
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-
-    fun getCaptcha(activity: Activity, phoneNum: String) {
-        try {
-            with(JSONObject()) {
-                put("phone_num", phoneNum)
-                SdkRequest.instance.getCaptcha(activity, this, object : IRequestCallback {
-                    override fun onResponse(resultInfo: ResultInfo) {
-                        if (resultInfo.code == 1) {
-                            implCallback.onResult(0, resultInfo.data)
-                        } else {
-                            implCallback.onResult(-1, resultInfo.data)
-                        }
-                    }
-                })
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    fun bnindPhone(activity: Activity, phoneNum: String, captcha: String) {
-        try {
-            with(JSONObject()) {
-                put("phone_num", phoneNum)
-                put("captcha", captcha)
-                put("uid", SdkBackLoginInfo.instance.userId)
-
-                SdkRequest.instance.bindPhone(activity, this, object : IRequestCallback {
-                    override fun onResponse(resultInfo: ResultInfo) {
-                        if (resultInfo.code == 1) {
-                            implCallback.onResult(0, resultInfo.data)
-                        } else {
-                            implCallback.onResult(-1, resultInfo.data)
-                        }
-                    }
-                })
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    fun modifyPwd(activity: Activity, oldPwd: String, newPwd: String) {
-        try {
-            with(JSONObject()) {
-                put("uid", SdkBackLoginInfo.instance.userId)
-                put("old_pwd", oldPwd)
-                put("new_pwd", newPwd)
-
-                SdkRequest.instance.modifyUserPwd(activity, this, object : IRequestCallback {
-                    override fun onResponse(resultInfo: ResultInfo) {
-                        if (resultInfo.code == 1) {
-                            implCallback.onResult(0, resultInfo.data)
-                        } else {
-                            implCallback.onResult(-1, resultInfo.data)
-                        }
-                    }
-                })
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-}

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/center/fragment/BindAccountFragment.kt

@@ -9,9 +9,16 @@ import android.widget.Button
 import android.widget.ImageView
 import androidx.fragment.app.Fragment
 import cn.yyxx.eyuangame.core.entity.ClickType
+import cn.yyxx.eyuangame.core.entity.ResultInfo
+import cn.yyxx.eyuangame.core.entity.SdkBackLoginInfo
 import cn.yyxx.eyuangame.core.impl.center.MemberActivity
+import cn.yyxx.eyuangame.core.internal.IRequestCallback
+import cn.yyxx.eyuangame.core.network.SdkRequest
 import cn.yyxx.eyuangame.core.ui.EventEditText
+import cn.yyxx.eyuangame.core.utils.EditTextUtils
 import cn.yyxx.support.ResUtils
+import cn.yyxx.support.hawkeye.ToastUtils
+import org.json.JSONObject
 
 /**
  * @author #Suyghur.
@@ -87,11 +94,47 @@ class BindAccountFragment : Fragment(), View.OnClickListener {
         }
     }
 
+    private fun callBindAccount() {
+        val userName = eetAccount.editText.text.trim().toString()
+        val pwd = eetPwd.editText.text.trim().toString()
+
+        if (!EditTextUtils.filterAccount(userName)) {
+            ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_account_format_error"))
+            return
+        }
+        if (!EditTextUtils.filterPwd(pwd)) {
+            ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_pwd_format_error"))
+            return
+        }
+
+        try {
+            with(JSONObject()) {
+                put("uid", SdkBackLoginInfo.instance.userId)
+                put("login_type", SdkBackLoginInfo.instance.loginType)
+                put("uname", userName)
+                put("pwd", pwd)
+                SdkRequest.instance.bindAccount(requireActivity(), this, object : IRequestCallback {
+                    override fun onResponse(resultInfo: ResultInfo) {
+                        if (resultInfo.code == 1) {
+                            ToastUtils.toastInfo(requireActivity(), resultInfo.msg)
+                            requireActivity().onBackPressed()
+                        } else {
+                            ToastUtils.toastInfo(requireActivity(), resultInfo.msg)
+                        }
+                    }
+                })
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+
+    }
+
     override fun onClick(v: View?) {
         v?.apply {
             when (tag as Int) {
                 ClickType.ACTION_RETURN -> requireActivity().onBackPressed()
-                ClickType.ACTION_CONFIRM->memberImpl
+                ClickType.ACTION_CONFIRM -> callBindAccount()
             }
         }
     }

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/center/fragment/BindPhoneFragment.kt

@@ -3,16 +3,30 @@ package cn.yyxx.eyuangame.core.impl.center.fragment
 import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.os.Message
+import android.text.TextUtils
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.fragment.app.Fragment
+import cn.yyxx.eyuangame.base.utils.Logger
 import cn.yyxx.eyuangame.core.entity.ClickType
+import cn.yyxx.eyuangame.core.entity.ResultInfo
+import cn.yyxx.eyuangame.core.entity.SdkBackLoginInfo
 import cn.yyxx.eyuangame.core.impl.center.MemberActivity
+import cn.yyxx.eyuangame.core.internal.IRequestCallback
+import cn.yyxx.eyuangame.core.network.SdkRequest
 import cn.yyxx.eyuangame.core.ui.EventEditText
+import cn.yyxx.eyuangame.core.utils.EditTextUtils
+import cn.yyxx.eyuangame.core.utils.TimeDownUtils
 import cn.yyxx.support.ResUtils
+import cn.yyxx.support.hawkeye.ToastUtils
+import org.json.JSONObject
 
 /**
  * @author #Suyghur.
@@ -23,14 +37,18 @@ class BindPhoneFragment : Fragment(), View.OnClickListener {
     private lateinit var mView: View
     private lateinit var memberImpl: MemberActivity
 
+    private lateinit var llGroup1: LinearLayout
+    private lateinit var llGroup2: LinearLayout
+    private lateinit var clTips: ConstraintLayout
+
     private lateinit var ivReturn: ImageView
     private lateinit var eetPhone: EventEditText
     private lateinit var eetCaptcha: EventEditText
     private lateinit var btnCaptCha: Button
     private lateinit var btnConfirm: Button
-
     private lateinit var tvArea: TextView
     private lateinit var ivArrow: ImageView
+    private lateinit var tvBindTips: TextView
 
     private lateinit var rlAreaList: RelativeLayout
     private lateinit var llAreaList: LinearLayout
@@ -43,6 +61,14 @@ class BindPhoneFragment : Fragment(), View.OnClickListener {
 
     private var code = ""
 
+    private val handler = object : Handler(Looper.getMainLooper()) {
+        override fun handleMessage(msg: Message) {
+            if (msg.what == 101) {
+                changeTimeView(msg.obj as Int)
+            }
+        }
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
         memberImpl = requireActivity() as MemberActivity
@@ -62,6 +88,10 @@ class BindPhoneFragment : Fragment(), View.OnClickListener {
             setOnClickListener(this@BindPhoneFragment)
         }
 
+        llGroup1 = view.findViewById(ResUtils.getResId(requireActivity(), "yyxx_ll_group1", "id"))
+        llGroup2 = view.findViewById(ResUtils.getResId(requireActivity(), "yyxx_ll_group2", "id"))
+        clTips = view.findViewById(ResUtils.getResId(requireActivity(), "yyxx_cl_tips", "id"))
+
         eetPhone = view.findViewById(ResUtils.getResId(requireActivity(), "yyxx_eet_phone", "id"))
         eetPhone.editText.hint = ResUtils.getResString(requireActivity(), "yyxx_hint_forget_phone")
 
@@ -80,19 +110,22 @@ class BindPhoneFragment : Fragment(), View.OnClickListener {
             setOnClickListener(this@BindPhoneFragment)
         }
 
-        rlAreaList = view.findViewById(ResUtils.getResId(context, "yyxx_rl_area_list", "id"))
+        rlAreaList = view.findViewById(ResUtils.getResId(requireActivity(), "yyxx_rl_area_list", "id"))
         rlAreaList.visibility = View.GONE
-        llAreaList = view.findViewById(ResUtils.getResId(context, "yyxx_ll_area_list", "id"))
-        svAreaList = view.findViewById(ResUtils.getResId(context, "yyxx_sv_area_list", "id"))
+        llAreaList = view.findViewById(ResUtils.getResId(requireActivity(), "yyxx_ll_area_list", "id"))
+        svAreaList = view.findViewById(ResUtils.getResId(requireActivity(), "yyxx_sv_area_list", "id"))
 
 
-        tvArea = view.findViewById(ResUtils.getResId(context, "yyxx_tv_area", "id"))
-        ivArrow = view.findViewById(ResUtils.getResId(context, "yyxx_iv_arrow", "id"))
+        tvArea = view.findViewById(ResUtils.getResId(requireActivity(), "yyxx_tv_area", "id"))
+        ivArrow = view.findViewById(ResUtils.getResId(requireActivity(), "yyxx_iv_arrow", "id"))
         ivArrow.setOnClickListener {
             changeAreaList()
         }
 
         autoFillAreaList(requireActivity())
+
+        tvBindTips = view.findViewById(ResUtils.getResId(requireActivity(), "yyxx_tv_tips2", "id"))
+        tvBindTips.text = "${ResUtils.getResString(requireActivity(), "yyxx_iv_bind_phone_tips2")}135xxxx0963"
     }
 
     private fun autoFillAreaList(context: Context) {
@@ -148,7 +181,6 @@ class BindPhoneFragment : Fragment(), View.OnClickListener {
                     val tvAreaCode = findViewById<TextView>(ResUtils.getResId(context, "yyxx_tv_area", "id"))
                     tvAreaCode.gravity = Gravity.CENTER
                     tvAreaCode.text = areaCode
-                    code = areaCode
                     setOnClickListener(OnItemClick(areaCode))
                     layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, height)
                     llAreaList.addView(this, llAreaList.childCount)
@@ -169,6 +201,129 @@ class BindPhoneFragment : Fragment(), View.OnClickListener {
         }
     }
 
+    private fun callGetCaptcha() {
+        val areaCode = code
+        Logger.d("$areaCode ...")
+        val phoneNum = eetPhone.editText.text.trim().toString()
+
+        if (TextUtils.isEmpty(areaCode)) {
+            ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_area_code_format_error"))
+            return
+        }
+
+        if (!EditTextUtils.filterPwd(phoneNum)) {
+            ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_phone_format_error"))
+            return
+        }
+
+        try {
+            with(JSONObject()) {
+                put("sms_type", "bind_phone")
+                put("area_code", areaCode)
+                put("phone_number", phoneNum)
+                SdkRequest.instance.getCaptcha(requireActivity(), this, object : IRequestCallback {
+                    override fun onResponse(resultInfo: ResultInfo) {
+                        if (resultInfo.code == 1) {
+                            ToastUtils.toastInfo(requireActivity(), resultInfo.msg)
+                            changeTimeNum()
+                        } else {
+                            ToastUtils.toastInfo(requireActivity(), resultInfo.msg)
+                        }
+                    }
+                })
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    private fun callBindPhone() {
+        val phoneNum = eetPhone.editText.text.trim().toString()
+        val captcha = eetCaptcha.editText.text.trim().toString()
+
+        if (TextUtils.isEmpty(captcha)) {
+            ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_captcha_format_error"))
+            return
+        }
+        if (!EditTextUtils.filterPhone(phoneNum)) {
+            ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_phone_format_error"))
+            return
+        }
+
+        try {
+            with(JSONObject()) {
+                put("uid", SdkBackLoginInfo.instance.userId)
+                put("phone_number", phoneNum)
+                put("sms_code", captcha)
+                SdkRequest.instance.bindPhone(requireActivity(), this, object : IRequestCallback {
+                    override fun onResponse(resultInfo: ResultInfo) {
+                        if (resultInfo.code == 1) {
+                            ToastUtils.toastInfo(requireActivity(), resultInfo.msg)
+                            requireActivity().onBackPressed()
+                        } else {
+                            ToastUtils.toastInfo(requireActivity(), resultInfo.msg)
+                        }
+                    }
+                })
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    private fun changeTimeView(time: Int) {
+        btnCaptCha.apply {
+            text = if (time <= 0) {
+                this.isEnabled = true
+                ResUtils.getResString(requireActivity(), "yyxx_tv_get_captcha")
+            } else {
+                this.isEnabled = false
+                "${time}s"
+            }
+        }
+    }
+
+    private fun changeTimeNum() {
+        if (!TimeDownUtils.isRunning()) {
+            TimeDownUtils.start(60, object : TimeDownUtils.TimeCallback {
+                override fun onTime(time: Int) {
+                    val msg = Message.obtain()
+                    msg.what = 101
+                    msg.obj = time
+                    handler.sendMessage(msg)
+                }
+            })
+        } else {
+            TimeDownUtils.resetCallback(object : TimeDownUtils.TimeCallback {
+                override fun onTime(time: Int) {
+                    val msg = Message.obtain()
+                    msg.what = 101
+                    msg.obj = time
+                    handler.sendMessage(msg)
+                }
+            })
+        }
+    }
+
+    private fun showOrHideTips() {
+        if (TextUtils.isEmpty(SdkBackLoginInfo.instance.phoneNum)) {
+            llGroup1.visibility = View.VISIBLE
+            llGroup2.visibility = View.VISIBLE
+            clTips.visibility = View.GONE
+            btnConfirm.visibility = View.VISIBLE
+        } else {
+            llGroup1.visibility = View.GONE
+            llGroup2.visibility = View.GONE
+            clTips.visibility = View.VISIBLE
+            btnConfirm.visibility = View.GONE
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        showOrHideTips()
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         areaList.clear()
@@ -179,6 +334,8 @@ class BindPhoneFragment : Fragment(), View.OnClickListener {
         v?.apply {
             when (tag as Int) {
                 ClickType.ACTION_RETURN -> requireActivity().onBackPressed()
+                ClickType.ACTION_GET_CAPTCHA -> callGetCaptcha()
+                ClickType.ACTION_CONFIRM -> callBindPhone()
             }
         }
     }
@@ -191,6 +348,7 @@ class BindPhoneFragment : Fragment(), View.OnClickListener {
             tvArea.apply {
                 changeAreaList()
                 tvArea.text = areaCode
+                this@BindPhoneFragment.code = areaCode
             }
         }
     }

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/center/fragment/MainFragment.kt

@@ -1,6 +1,7 @@
 package cn.yyxx.eyuangame.core.impl.center.fragment
 
 import android.os.Bundle
+import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -86,6 +87,37 @@ class MainFragment : Fragment(), View.OnClickListener {
 
     }
 
+    private fun showOrHideBindAccount() {
+        clBindAccount.visibility = if (SdkBackLoginInfo.instance.hasBindAccount) {
+            View.GONE
+        } else {
+            View.VISIBLE
+        }
+    }
+
+    private fun showOrHideBindPhone() {
+        clBindPhone.visibility = if (SdkBackLoginInfo.instance.hasBindAccount) {
+            View.VISIBLE
+        } else {
+            View.GONE
+        }
+    }
+
+    private fun showOrHideModifyPwd() {
+        clModifyPwd.visibility = if (SdkBackLoginInfo.instance.hasBindAccount && !TextUtils.isEmpty(SdkBackLoginInfo.instance.phoneNum)) {
+            View.VISIBLE
+        } else {
+            View.GONE
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        showOrHideBindAccount()
+        showOrHideBindPhone()
+        showOrHideModifyPwd()
+    }
+
     override fun onClick(v: View?) {
         v?.apply {
             when (tag as Int) {

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/center/fragment/ModifyPwdFragment.kt

@@ -9,9 +9,16 @@ import android.widget.Button
 import android.widget.ImageView
 import androidx.fragment.app.Fragment
 import cn.yyxx.eyuangame.core.entity.ClickType
+import cn.yyxx.eyuangame.core.entity.ResultInfo
+import cn.yyxx.eyuangame.core.entity.SdkBackLoginInfo
 import cn.yyxx.eyuangame.core.impl.center.MemberActivity
+import cn.yyxx.eyuangame.core.internal.IRequestCallback
+import cn.yyxx.eyuangame.core.network.SdkRequest
 import cn.yyxx.eyuangame.core.ui.EventEditText
+import cn.yyxx.eyuangame.core.utils.EditTextUtils
 import cn.yyxx.support.ResUtils
+import cn.yyxx.support.hawkeye.ToastUtils
+import org.json.JSONObject
 
 /**
  * @author #Suyghur.
@@ -104,10 +111,47 @@ class ModifyPwdFragment : Fragment(), View.OnClickListener {
 
     }
 
+    private fun callModifyPwd() {
+        val oldPwd = eetOldPwd.editText.text.trim().toString()
+        val newPwd = eetNewPwd.editText.text.trim().toString()
+
+        if (!EditTextUtils.filterPwd(oldPwd)) {
+            ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_old_pwd_format_error"))
+            return
+        }
+
+        if (!EditTextUtils.filterPwd(newPwd)) {
+            ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_new_pwd_format_error"))
+            return
+        }
+
+        try {
+            with(JSONObject()) {
+                put("uid", SdkBackLoginInfo.instance.userId)
+                put("old_pwd", oldPwd)
+                put("new_pwd", newPwd)
+                SdkRequest.instance.modifyUserPwd(requireActivity(), this, object : IRequestCallback {
+                    override fun onResponse(resultInfo: ResultInfo) {
+                        if (resultInfo.code == 1) {
+                            ToastUtils.toastInfo(requireActivity(), resultInfo.msg)
+                            requireActivity().onBackPressed()
+                        } else {
+                            ToastUtils.toastInfo(requireActivity(), resultInfo.msg)
+                        }
+                    }
+
+                })
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
     override fun onClick(v: View?) {
         v?.apply {
             when (tag as Int) {
                 ClickType.ACTION_RETURN -> requireActivity().onBackPressed()
+                ClickType.ACTION_CONFIRM -> callModifyPwd()
             }
         }
     }

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/floatball/FloatCenterService.kt

@@ -20,8 +20,6 @@ import cn.yyxx.support.ResUtils
  */
 class FloatCenterService : Service() {
 
-//    private var floatCenter: FloatLogoMenu? = null
-
     private var floatingBall: FloatingBall? = null
     private var mActivity: Activity? = null
 
@@ -31,13 +29,23 @@ class FloatCenterService : Service() {
         }
 
         override fun onInitMenuData(): MutableList<FloatingBallMenu.FloatingBallMenuItem> {
-            return mutableListOf(
-                FloatingBallMenu.FloatingBallMenuItem(FloatFeature.FEATURE_MEMBER, "", ""),
-                FloatingBallMenu.FloatingBallMenuItem(FloatFeature.FEATURE_GIF, "", ""),
-                FloatingBallMenu.FloatingBallMenuItem(FloatFeature.FEATURE_GM, "", ""),
-                FloatingBallMenu.FloatingBallMenuItem(FloatFeature.FEATURE_CHARGE, "", ""),
-                FloatingBallMenu.FloatingBallMenuItem(FloatFeature.FEATURE_INVITE, "", "")
-            )
+            val items = mutableListOf<FloatingBallMenu.FloatingBallMenuItem>()
+            if (SdkBridgeImpl.initBean.floatCfg.memberCfg.switch == 1) {
+                items.add(FloatingBallMenu.FloatingBallMenuItem(FloatFeature.FEATURE_MEMBER, "", ""))
+            }
+            if (SdkBridgeImpl.initBean.floatCfg.gifCfg.switch == 1) {
+                items.add(FloatingBallMenu.FloatingBallMenuItem(FloatFeature.FEATURE_GIF, "", ""))
+            }
+            if (SdkBridgeImpl.initBean.floatCfg.gmCfg.switch == 1) {
+                items.add(FloatingBallMenu.FloatingBallMenuItem(FloatFeature.FEATURE_GM, "", ""))
+            }
+            if (SdkBridgeImpl.initBean.floatCfg.chargeCfg.switch == 1) {
+                items.add(FloatingBallMenu.FloatingBallMenuItem(FloatFeature.FEATURE_CHARGE, "", ""))
+            }
+            if (SdkBridgeImpl.initBean.floatCfg.inviteCfg.switch == 1) {
+                items.add(FloatingBallMenu.FloatingBallMenuItem(FloatFeature.FEATURE_INVITE, "", ""))
+            }
+            return items
         }
 
         override fun onMenuItemClick(item: FloatingBallMenu.FloatingBallMenuItem, pos: Int) {
@@ -48,7 +56,6 @@ class FloatCenterService : Service() {
         }
 
         override fun onExpandMenu(hasRedDot: Boolean) {
-            Logger.d("onExpandMenu")
         }
 
         override fun onDismissMenu() {

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/floatball/FloatCenterServiceManager.kt

@@ -9,6 +9,7 @@ import android.os.IBinder
 import android.text.TextUtils
 import cn.yyxx.eyuangame.base.utils.Logger
 import cn.yyxx.eyuangame.core.entity.SdkBackLoginInfo
+import cn.yyxx.eyuangame.core.impl.SdkBridgeImpl
 
 /**
  * @author #Suyghur.
@@ -47,7 +48,7 @@ class FloatCenterServiceManager private constructor() {
             Logger.e("浮标服务未初始化或发生异常")
             return
         }
-        if (!TextUtils.isEmpty(SdkBackLoginInfo.instance.userId)) {
+        if (!TextUtils.isEmpty(SdkBackLoginInfo.instance.userId) && SdkBridgeImpl.initBean.floatCfg.switch == 1) {
             mService?.attach()
         } else {
             detach()

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/login/LoginActivity.kt

@@ -21,6 +21,7 @@ import cn.yyxx.eyuangame.core.internal.IImplCallback
 import cn.yyxx.eyuangame.core.ui.NoScrollViewPager
 import cn.yyxx.eyuangame.core.ui.dialog.AutoLoginDialog
 import cn.yyxx.eyuangame.core.ui.dialog.ChooseLoginDialog
+import cn.yyxx.eyuangame.core.ui.dialog.ScaleLoadingDialog
 import cn.yyxx.eyuangame.core.utils.SessionUtils
 import cn.yyxx.eyuangame.core.utils.TimeDownUtils
 import cn.yyxx.support.AndroidBug5497Workaround
@@ -54,8 +55,8 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
 
     private var showChooseDialog = true
     private var showAutoLoginDialog = false
+    private var loginLoadingDialog: ScaleLoadingDialog? = null
 
-    private var showFragment = false
 
     private val handler = object : Handler(Looper.getMainLooper()) {
         override fun handleMessage(msg: Message) {
@@ -89,13 +90,22 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
             override fun onSuccess(result: String) {
                 hideAutoLoginDialog()
                 hideChooseDialog()
+                hideLoadingDialog()
                 this@LoginActivity.finish()
                 implCallback?.onResult(0, result)
             }
 
             override fun onFailed(result: String) {
                 //TODO 失败情况需要测试
-                hideChooseDialog()
+                if (showAutoLoginDialog) {
+                    showAutoLoginDialog = false
+                    showChooseDialog = true
+                    hideAutoLoginDialog()
+                }
+                if (loginContainer.visibility == View.GONE) {
+                    showChooseDialog()
+                }
+                hideLoadingDialog()
                 implCallback?.onResult(-1, result)
             }
 
@@ -353,14 +363,21 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
     override fun onClick(v: View?) {
         v?.apply {
             when (tag as Int) {
-                ClickType.ACTION_GOOGLE_MODE -> userSignInImpl.googleLogin(this@LoginActivity)
-                ClickType.ACTION_FACEBOOK_MODE -> userSignInImpl.facebookLogin(this@LoginActivity)
+                ClickType.ACTION_GOOGLE_MODE -> {
+                    showLoadingDialog()
+                    userSignInImpl.googleLogin(this@LoginActivity)
+                }
+                ClickType.ACTION_FACEBOOK_MODE -> {
+                    showLoadingDialog()
+                    userSignInImpl.facebookLogin(this@LoginActivity)
+                }
                 ClickType.ACTION_ACCOUNT_MODE -> {
                     chooseDialog?.dismiss()
                     chooseDialog = null
                     loginContainer.visibility = View.VISIBLE
                 }
                 ClickType.ACTION_GUEST_MODE -> {
+                    showLoadingDialog()
                     userSignInImpl.guestLogin(this@LoginActivity)
                 }
             }
@@ -372,6 +389,11 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
         hideBar()
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        TimeDownUtils.cancel()
+    }
+
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
@@ -390,6 +412,12 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
 
     private fun userAutoLogin() {
         session?.apply {
+            if (showAutoLoginDialog) {
+                showAutoLoginDialog = false
+                showChooseDialog = true
+                hideAutoLoginDialog()
+            }
+            showLoadingDialog()
             when (loginType) {
                 LoginType.TYPE_GUEST_LOGIN -> userSignInImpl.guestLogin(this@LoginActivity)
                 LoginType.TYPE_FACEBOOK_LOGIN -> userSignInImpl.facebookLogin(this@LoginActivity)
@@ -399,22 +427,6 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
         }
     }
 
-//    fun userRegister(registerParams: JSONObject) {
-//        SdkRequest.getInstance().registerUser(this, registerParams, object : IRequestCallback {
-//            override fun onResponse(resultInfo: ResultInfo) {
-//                Logger.d(resultInfo)
-//            }
-//        })
-//    }
-//
-//    private fun userLoginVerify(loginParams: JSONObject) {
-//        SdkRequest.getInstance().userVerify(this, loginParams, object : IRequestCallback {
-//            override fun onResponse(resultInfo: ResultInfo) {
-//                Logger.d(resultInfo)
-//            }
-//        })
-//    }
-
     private fun changeTimeNum() {
         if (!TimeDownUtils.isRunning()) {
             TimeDownUtils.start(2, object : TimeDownUtils.TimeCallback {
@@ -437,6 +449,26 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
         }
     }
 
+    fun showLoadingDialog() {
+        loginLoadingDialog?.apply {
+            if (isShowing) {
+                dismiss()
+            }
+            loginLoadingDialog = null
+        }
+
+        loginLoadingDialog = ScaleLoadingDialog(this, "")
+        loginLoadingDialog?.show()
+    }
+
+    fun hideLoadingDialog() {
+        loginLoadingDialog?.apply {
+            if (isShowing) {
+                dismiss()
+            }
+            loginLoadingDialog = null
+        }
+    }
 
     companion object {
 

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/login/UserSignInImpl.kt

@@ -12,6 +12,7 @@ import cn.yyxx.eyuangame.core.entity.SdkBackLoginInfo
 import cn.yyxx.eyuangame.core.entity.Session
 import cn.yyxx.eyuangame.core.internal.IRequestCallback
 import cn.yyxx.eyuangame.core.network.SdkRequest
+import cn.yyxx.eyuangame.core.ui.dialog.ScaleLoadingDialog
 import cn.yyxx.eyuangame.core.utils.SessionUtils
 import cn.yyxx.support.hawkeye.ToastUtils
 import com.facebook.*

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/login/fragment/LauncherFragment.kt

@@ -11,9 +11,12 @@ import androidx.fragment.app.Fragment
 import cn.yyxx.eyuangame.base.utils.Logger
 import cn.yyxx.eyuangame.core.entity.ClickType
 import cn.yyxx.eyuangame.core.entity.LoginType
+import cn.yyxx.eyuangame.core.entity.ResultInfo
 import cn.yyxx.eyuangame.core.entity.Session
 import cn.yyxx.eyuangame.core.impl.SdkBridgeImpl
 import cn.yyxx.eyuangame.core.impl.login.LoginActivity
+import cn.yyxx.eyuangame.core.internal.IRequestCallback
+import cn.yyxx.eyuangame.core.network.SdkRequest
 import cn.yyxx.eyuangame.core.ui.EventEditText
 import cn.yyxx.eyuangame.core.ui.dialog.AgreementDialog
 import cn.yyxx.eyuangame.core.ui.dialog.ForgetPwdDialog
@@ -21,6 +24,7 @@ import cn.yyxx.eyuangame.core.utils.EditTextUtils
 import cn.yyxx.eyuangame.core.utils.SessionUtils
 import cn.yyxx.support.ResUtils
 import cn.yyxx.support.hawkeye.ToastUtils
+import org.json.JSONObject
 
 /**
  * @author #Suyghur.
@@ -312,21 +316,6 @@ class LauncherFragment : Fragment(), View.OnClickListener {
 
             })
             btnConfirm.setOnClickListener {
-                val userName = eetAccount.editText.text.trim().toString()
-                val phoneNum = eetPhone.editText.text.trim().toString()
-
-                if (!EditTextUtils.filterAccount(userName)) {
-                    ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_account_format_error"))
-                    return@setOnClickListener
-                }
-                if (!EditTextUtils.filterPhone(phoneNum)) {
-                    ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_phone_format_error"))
-                    return@setOnClickListener
-                }
-                if (TextUtils.isEmpty(code)) {
-                    ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_area_code_format_error"))
-                    return@setOnClickListener
-                }
                 invokeForgetPwd()
             }
             show()
@@ -360,7 +349,41 @@ class LauncherFragment : Fragment(), View.OnClickListener {
     }
 
     private fun invokeForgetPwd() {
+        forgetPwdDialog?.apply {
+            val userName = eetAccount.editText.text.trim().toString()
+            val areaCode = code
+            val phoneNum = eetPhone.editText.text.trim().toString()
+
+            if (!EditTextUtils.filterAccount(userName)) {
+                ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_account_format_error"))
+                return
+            }
+
+            if (TextUtils.isEmpty(areaCode)) {
+                ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_area_code_format_error"))
+                return
+            }
+            if (!EditTextUtils.filterPhone(phoneNum)) {
+                ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_phone_format_error"))
+                return
+            }
 
+            with(JSONObject()) {
+                put("uname", userName)
+                put("area_code", areaCode)
+                put("phone_number", phoneNum)
+                SdkRequest.instance.forgetUserPwd(requireActivity(), this, object : IRequestCallback {
+                    override fun onResponse(resultInfo: ResultInfo) {
+                        if (resultInfo.code == 1) {
+                            ToastUtils.toastInfo(requireActivity(), resultInfo.msg)
+                            this@apply.dismiss()
+                        } else {
+                            ToastUtils.toastInfo(requireActivity(), resultInfo.msg)
+                        }
+                    }
+                })
+            }
+        }
     }
 
     override fun onClick(v: View?) {
@@ -378,13 +401,23 @@ class LauncherFragment : Fragment(), View.OnClickListener {
                         ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_pwd_format_error"))
                         return
                     }
+                    loginImpl.showLoadingDialog()
                     loginImpl.userSignInImpl.accountLogin(requireActivity(), userName, pwd)
                 }
                 ClickType.ACTION_CLICK_CHECK -> changeCheck()
                 ClickType.ACTION_CLICK_AGREEMENT -> showAgreementDialog()
-                ClickType.ACTION_GOOGLE_MODE -> loginImpl.userSignInImpl.googleLogin(requireActivity())
-                ClickType.ACTION_FACEBOOK_MODE -> loginImpl.userSignInImpl.facebookLogin(requireActivity())
-                ClickType.ACTION_GUEST_MODE -> loginImpl.userSignInImpl.guestLogin(requireActivity())
+                ClickType.ACTION_GOOGLE_MODE -> {
+                    loginImpl.showLoadingDialog()
+                    loginImpl.userSignInImpl.googleLogin(requireActivity())
+                }
+                ClickType.ACTION_FACEBOOK_MODE -> {
+                    loginImpl.showLoadingDialog()
+                    loginImpl.userSignInImpl.facebookLogin(requireActivity())
+                }
+                ClickType.ACTION_GUEST_MODE -> {
+                    loginImpl.showLoadingDialog()
+                    loginImpl.userSignInImpl.guestLogin(requireActivity())
+                }
             }
         }
     }

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/login/fragment/RegisterFragment.kt

@@ -175,6 +175,7 @@ class RegisterFragment : Fragment(), View.OnClickListener {
                             ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_pwd_format_error"))
                             return
                         }
+                        loginImpl.showLoadingDialog()
                         loginImpl.userSignInImpl.userRegister(requireActivity(), userName, pwd)
                     } catch (e: JSONException) {
                         e.printStackTrace()

library_core/src/main/java/cn/yyxx/eyuangame/core/network/Host.kt

@@ -39,7 +39,7 @@ object Host {
         setDefaultHost()
     }
 
-    fun setDefaultHost() {
+    private fun setDefaultHost() {
         when (IP_MODEL) {
             HostModelUtils.ENV_TEST -> HOST = DEFAULT_TEST_HOST
             HostModelUtils.ENV_ONLINE -> HOST = DEFAULT_ONLINE_HOST

library_core/src/main/java/cn/yyxx/eyuangame/core/ui/dialog/AutoLoginDialog.kt

@@ -51,6 +51,4 @@ class AutoLoginDialog(context: Context) : Dialog(context), DialogInterface.OnKey
     override fun onKey(dialog: DialogInterface?, keyCode: Int, event: KeyEvent): Boolean {
         return keyCode == KeyEvent.KEYCODE_BACK && event.repeatCount == 0
     }
-
-
 }

library_core/src/main/java/cn/yyxx/eyuangame/core/ui/dialog/ScaleLoadingDialog.kt

@@ -0,0 +1,72 @@
+package cn.yyxx.eyuangame.core.ui.dialog
+
+import android.app.Dialog
+import android.content.Context
+import android.content.DialogInterface
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.text.TextUtils
+import android.view.*
+import android.widget.LinearLayout
+import android.widget.TextView
+import cn.yyxx.support.DensityUtils
+import cn.yyxx.support.ui.scaleprogress.ScaleLoadingView
+
+/**
+ * @author #Suyghur.
+ * Created on 2021/07/01
+ */
+class ScaleLoadingDialog constructor(context: Context, desc: String) : Dialog(context), DialogInterface.OnKeyListener {
+
+    private lateinit var layout: LinearLayout
+
+    private var loadingView: ScaleLoadingView? = null
+
+    init {
+        setCanceledOnTouchOutside(false)
+        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        initView(context, desc)
+    }
+
+    private fun initView(context: Context, desc: String) {
+        val attr = window?.attributes as WindowManager.LayoutParams
+        //设置dialog在布局中的位置
+        attr.gravity = Gravity.CENTER
+
+        val params = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+        layout = LinearLayout(context)
+        layout.orientation = LinearLayout.VERTICAL
+
+        val viewSize = DensityUtils.dip2px(context, 60f)
+        val divideSize = DensityUtils.dip2px(context, 3f)
+        val count = 5
+        val color = Color.parseColor("#1DB1AD")
+        loadingView = ScaleLoadingView(context, viewSize, divideSize, count, color)
+        val loadingViewParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT)
+        loadingViewParams.gravity = Gravity.CENTER
+        layout.addView(loadingView, loadingViewParams)
+
+        if (!TextUtils.isEmpty(desc)) {
+            val textView = TextView(context)
+            textView.text = desc
+            val textViewParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT)
+            textViewParams.gravity = Gravity.CENTER
+            layout.addView(textView, textViewParams)
+        }
+
+        addContentView(layout, params)
+        setOnKeyListener(this)
+    }
+
+
+    override fun dismiss() {
+        super.dismiss()
+        loadingView?.cancel()
+        layout.removeAllViews()
+    }
+
+    override fun onKey(dialog: DialogInterface?, keyCode: Int, event: KeyEvent): Boolean {
+        return keyCode == KeyEvent.KEYCODE_BACK && event.repeatCount == 0
+    }
+}

library_core/src/main/java/cn/yyxx/eyuangame/core/ui/floatview/FloatingBall.kt

@@ -138,6 +138,7 @@ class FloatingBall(val activity: Activity, private val isLandscape: Boolean, pri
             setBackgroundDrawable(ColorDrawable())
             isOutsideTouchable = true
             setOnDismissListener {
+                hasShowContent = false
                 invokeDisplayTimerWork()
             }
         }
@@ -156,8 +157,8 @@ class FloatingBall(val activity: Activity, private val isLandscape: Boolean, pri
 
     private fun invokeMenuShowOrDismiss() {
         if (hasShowContent) {
-            menu.dismiss()
             hasShowContent = false
+            menu.dismiss()
         } else {
             hasShowContent = true
             callback.onExpandMenu(false)
@@ -189,16 +190,38 @@ class FloatingBall(val activity: Activity, private val isLandscape: Boolean, pri
 
     fun attach() {
         if (visibility == View.GONE) {
+            invokeDisplayTimerWork()
+            ballView.visibility = View.VISIBLE
+            frameLayout.visibility = View.VISIBLE
+            rootLinearLayout.visibility = View.VISIBLE
             visibility = View.VISIBLE
+//            invalidate()
+//            requestLayout()
+//            wm.updateViewLayout(this, wlp)
         }
     }
 
     fun detach() {
         if (visibility == View.VISIBLE) {
             if (hasShowContent) {
-                dismissMenu()
+//                dismissMenu()
+                hasShowContent = false
+                menu.dismiss()
             }
+
+            displayWorker?.cancel()
+//            ballView.clearAnimation()
+//            frameLayout.clearAnimation()
+//            rootLinearLayout.clearAnimation()
+//            clearAnimation()
+
+            ballView.visibility = View.GONE
+            frameLayout.visibility = View.GONE
+            rootLinearLayout.visibility = View.GONE
             visibility = View.GONE
+//            invalidate()
+//            requestLayout()
+//            wm.updateViewLayout(this, wlp)
         }
     }
 

library_core/src/main/res/layout/yyxx_loading_dialog.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/yyxx_transparent">
+
+    <FrameLayout
+        android:id="@+id/yyxx_fl_container"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:background="@color/yyxx_color_green_blue"
+        app:layout_constraintBottom_toTopOf="@id/yyxx_tv_desc"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/yyxx_tv_desc"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="abc1231"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/yyxx_fl_container" />
+</androidx.constraintlayout.widget.ConstraintLayout>

library_core/src/main/res/layout/yyxx_member_bind_phone.xml

@@ -45,12 +45,52 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/yyxx_title_container">
 
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/yyxx_cl_tips"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="30dp"
+            android:layout_marginBottom="30dp"
+            android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <TextView
+                android:id="@+id/yyxx_tv_tips1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/yyxx_iv_bind_phone_tips1"
+                android:textColor="@color/yyxx_color_black_gray"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/yyxx_tv_tips2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/yyxx_iv_bind_phone_tips2"
+                android:textColor="@color/yyxx_color_black_gray"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/yyxx_tv_tips1" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
         <LinearLayout
             android:id="@+id/yyxx_ll_group1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:orientation="horizontal"
+            android:visibility="gone"
             app:layout_constraintBottom_toTopOf="@id/yyxx_ll_group2"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -127,6 +167,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:orientation="horizontal"
+            android:visibility="gone"
             app:layout_constraintBottom_toTopOf="@id/yyxx_btn_confirm"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -160,6 +201,7 @@
             android:background="@drawable/yyxx_area_list_bg"
             android:paddingTop="3.5dp"
             android:paddingBottom="3.5dp"
+            android:visibility="gone"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/yyxx_ll_group1">
 
@@ -184,11 +226,12 @@
             style="?android:attr/borderlessButtonStyle"
             android:layout_width="match_parent"
             android:layout_height="35dp"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="30dp"
             android:background="@drawable/yyxx_btn_green_blue_bg"
             android:text="@string/yyxx_tv_confirm"
             android:textColor="@color/yyxx_color_white"
             android:textSize="16sp"
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

library_core/src/main/res/values/yyxx_strings.xml

@@ -32,6 +32,8 @@
     <string name="yyxx_tv_exit_left">下次再見</string>
     <string name="yyxx_tv_exit_right">再玩一下</string>
     <string name="yyxx_tv_bind_account_tips">注：此處帳號為新建帳號，請不要輸入已經註冊過的帳號</string>
+    <string name="yyxx_iv_bind_phone_tips1">該賬號已經綁定手機</string>
+    <string name="yyxx_iv_bind_phone_tips2">綁定的手機號為：</string>
     <string name="yyxx_tv_get_captcha">獲取驗證碼</string>
 
     <string name="yyxx_tv_float_member_desc">會員</string>
@@ -59,8 +61,10 @@
     <string name="yyxx_hint_modify_pwd_new">請輸入您的新密碼</string>
 
     <string name="yyxx_tips_account_format_error">您輸入的帳號格式有誤，請重新輸入</string>
-    <string name="yyxx_tips_pwd_format_error">您輸入的帳號格式有誤，請重新輸入</string>
-    <string name="yyxx_tips_phone_format_error">您輸入的帳號格式有誤，請重新輸入</string>
-    <string name="yyxx_tips_area_code_format_error">您選擇的有誤，請重新選擇</string>
-
+    <string name="yyxx_tips_pwd_format_error">您輸入的密碼格式有誤，請重新輸入</string>
+    <string name="yyxx_tips_old_pwd_format_error">您輸入的舊密碼格式有誤，請重新輸入</string>
+    <string name="yyxx_tips_new_pwd_format_error">您輸入的新密碼格式有誤，請重新輸入</string>
+    <string name="yyxx_tips_phone_format_error">您輸入的手機門號格式有誤，請重新輸入</string>
+    <string name="yyxx_tips_area_code_format_error">您選擇的區號有誤，請重新選擇</string>
+<string name="yyxx_tips_captcha_format_error">您輸入的手機驗證碼格式有誤，請重新輸入</string>
 </resources>