Merge remote-tracking branch 'origin/4.1.64' into 4.1.64

m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt

@@ -581,10 +581,11 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
      * 自动登录成功
      */
     override fun autoLoginSuccess() {
-        ll_success.visibility = View.VISIBLE
+        ll_success.visibility = View.GONE
+        ToastUtil.toastShort("登录成功")
         handler!!.postDelayed({
             LoginUtils.LoginSuccessOperate(this)
-        }, 3000)
+        }, 1500)
     }
 
     private fun finishPrePage() {

m-user/src/main/java/com/yidianling/user/ui/login/VerificationCodeActivity.kt

@@ -434,9 +434,12 @@ class VerificationCodeActivity :
                 .setContentView(R.layout.user_kefu_tipdialog)
                 .setOnClickListener(R.id.cancel_dialog) {
                     mKeFuDialog?.dismiss()
+                    mKeFuDialog=null
                 }
                 .setAnimation(0)//取消动画
                 .setOnClickListener(R.id.dial_right_now) {
+                    mKeFuDialog?.dismiss()
+                    mKeFuDialog=null
                     val dialIntent =
                         Intent(
                             Intent.ACTION_DIAL,

m-user/src/main/java/com/yidianling/user/ui/login/presenter/VerificationCodePresenterImpl.kt

@@ -142,7 +142,7 @@ class VerificationCodePresenterImpl(view: IVerificationCodeContract.View) : Base
                 .subscribe({
                     if (it.data != null) {
                         //登录成功后toast提示
-                        ToastUtil.toastShort("验证成功")
+                        ToastUtil.toastShort("登录成功")
                         //验证码登录成功后清空本地保存时间
                         YDLCacheUtils.saveCodeTime(phone, "")
 

m-user/src/main/res/layout/user_activity_verification_code_new.xml

@@ -78,6 +78,7 @@
         android:text="密码登录"
         android:textColor="@color/platform_color_666666"
         android:textSize="13sp"
+        android:visibility="invisible"
         app:layout_constraintStart_toStartOf="@id/verify_code"
         app:layout_constraintTop_toBottomOf="@id/verify_code" />