feat:验证码登录界面

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

@@ -110,7 +110,8 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
     }
 
     private fun setWindowStatusBarColor() {
-        StatusBarUtils.setWindowStatusBarColor(this, R.color.platform_color_075b66)
+        StatusBarUtils.Companion.setWindowStatusBarColor(this, R.color.white)
+        StatusBarUtils.Companion.setStatusBarLightMode(this,true)
     }
 
     private fun initView() {

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

@@ -2,15 +2,16 @@ package com.yidianling.user.ui.login
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.content.Context
 import android.content.Intent
 import android.os.Handler
 import android.support.v4.content.ContextCompat
 import android.text.TextUtils
 import android.view.View
+import android.view.inputmethod.InputMethodManager
+import android.widget.EditText
 import com.ydl.ydlcommon.base.BaseMvpActivity
-import com.ydl.ydlcommon.bean.StatusBarOptions
 import com.ydl.ydlcommon.utils.ActivityManager
-import com.ydl.ydlcommon.utils.DeviceTool
 import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
@@ -21,17 +22,14 @@ import com.yidianling.user.R
 import com.yidianling.user.UserHelper
 import com.yidianling.user.constants.UserBIConstants
 import com.yidianling.user.http.request.BindPhoneJavaParam
-import com.yidianling.user.route.UserIn
-import com.yidianling.user.safePrivate.FingerPrintCheckActivity
-import com.yidianling.user.safePrivate.FingerPrintUtil
-import com.yidianling.user.safePrivate.HandUnlockCheckActivity
 import com.yidianling.user.ui.login.contract.IVerificationCodeContract
 import com.yidianling.user.ui.login.presenter.VerificationCodePresenterImpl
+import com.yidianling.user.widget.PinField.PinField
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.user_activity_verification_code.*
+import kotlinx.android.synthetic.main.user_activity_verification_code_new.*
 import java.util.concurrent.TimeUnit
 
 /**
@@ -119,7 +117,7 @@ class VerificationCodeActivity :
     }
 
     override fun layoutResId(): Int {
-        return R.layout.user_activity_verification_code
+        return R.layout.user_activity_verification_code_new
     }
 
     override fun initDataAndEvent() {
@@ -128,11 +126,14 @@ class VerificationCodeActivity :
         initView()
         setClickEvent()
         sendMsgCode()
-        showSoftKeyBord()
+        verify_code.postDelayed({
+            showSoftKeyboardNew(verify_code)
+        },300)
     }
 
     private fun setWindowStatusBarColor() {
-        StatusBarUtils.setWindowStatusBarColor(this, R.color.platform_color_075b66)
+        StatusBarUtils.Companion.setWindowStatusBarColor(this, R.color.white)
+        StatusBarUtils.Companion.setStatusBarLightMode(this,true)
     }
 
     private fun getIntentData() {
@@ -144,44 +145,57 @@ class VerificationCodeActivity :
     }
 
     private fun initView() {
+        /*
+        * 注册登录改版优化，忘记密码界面和验证码登录界面没有UI区分
+        *
+        * */
         when (codeType) {
             STATUS_FORGET_PWD -> {//忘记密码界面
-                tv_title.text = "身份认证"
-                tv_first.visibility = View.VISIBLE
-                tv_passWord.visibility = View.GONE
+//                tv_title.text = "身份认证"
+//                tv_first.visibility = View.VISIBLE
+//                tv_passWord.visibility = View.GONE
             }
             STATUS_LOGIN_BY_CODE -> {//验证码登录界面
                 if (hasPassword) {
-                    tv_passWord.visibility = View.VISIBLE
+                    login_password.visibility = View.VISIBLE
                 } else {
-                    tv_passWord.visibility = View.GONE
+                    login_password.visibility = View.GONE
                 }
             }
         }
 
-
         if (!TextUtils.isEmpty(userPhoneNumber) && userPhoneNumber!!.length == 11) {
             val sb = StringBuffer(userPhoneNumber)
             sb.insert(3, " ")
             sb.insert(8, " ")
-            tv_phone.text = sb.toString()
+            tv_phone.text = "已发送至 +"+sb.toString()
         } else {
             tv_phone.text = userPhoneNumber
         }
 
         if (codeType == STATUS_FORGET_PWD) {//忘记密码界面
-            tv_title.text = "身份认证"
-            tv_first.visibility = View.VISIBLE
-            tv_passWord.visibility = View.GONE
+//            tv_title.text = "身份认证"
+//            tv_first.visibility = View.VISIBLE
+//            tv_passWord.visibility = View.GONE
+        }
+    }
+    fun showSoftKeyboardNew(editText: EditText?) {
+        editText?.let {
+            it.requestFocus()
+            val inputManager = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+            inputManager.showSoftInput(editText, 0)
         }
     }
-
     private fun setClickEvent() {
-        pc_1.setOnMsgCodeInputCompleteListener {
-            login()
+        verify_code.onTextCompleteListener=object :PinField.OnTextCompleteListener{
+            override fun onTextComplete(enteredText: String): Boolean {
+                login()
+                return true
+            }
         }
 
-        img_goback.setOnClickListener {
+
+        img_reg_back.setOnClickListener {
             if (ActivityManager.getInstance().getSecondTaskActivity() == null) {
                 closeAnim(true)
             } else {
@@ -194,7 +208,7 @@ class VerificationCodeActivity :
                 }
             }
         }
-        //下一步
+        /*//下一步
         ver_iv_next.setOnClickListener {
 
             if (TextUtils.isEmpty(pc_1.phoneCode) || pc_1.phoneCode.length != 4) {
@@ -202,16 +216,14 @@ class VerificationCodeActivity :
                 return@setOnClickListener
             }
             login()
-        }
+        }*/
 
         //重新发送验证码
         tv_countdown_time.setOnClickListener {
             sendMsgCode()
         }
 
-        tv_passWord.setOnClickListener {
-
-
+        login_password.setOnClickListener {
             if (ActivityManager.getInstance().getSecondTaskActivity() == null) {
                 closeAnim(true)
             } else {
@@ -226,18 +238,13 @@ class VerificationCodeActivity :
         }
     }
 
-    private fun showSoftKeyBord() {
-        Handler().postDelayed({
-            RxKeyboardTool.showKeyboard(this, true)
-        }, 300)
 
-    }
 
     /**
      * 登录
      */
     fun login() {
-        val msgCode = pc_1.phoneCode
+        val msgCode = verify_code.text.toString()
         if (codeType == STATUS_LOGIN_BY_CODE) {//验证码登录界面
             if (isBindPhone) {
                 var param = BindPhoneJavaParam(
@@ -356,12 +363,17 @@ class VerificationCodeActivity :
      *菊花框
      */
     override fun showLoading(state: Boolean) {
-        if (state) {
+        /*if (state) {
             ver_iv_next.visibility = View.GONE
             pb_load.visibility = View.VISIBLE
         } else {
             ver_iv_next.visibility = View.VISIBLE
             pb_load.visibility = View.GONE
+        }*/
+        if (state){
+            showProgressDialog()
+        }else{
+            dismissProgressDialog()
         }
     }
 
@@ -379,7 +391,9 @@ class VerificationCodeActivity :
 //        val shake = AnimationUtils.loadAnimation(this, R.anim.user_shake_input)//加载动画资源文件 
 //        pc_1.startAnimation(shake)
         //设置红色边框
-        pc_1.setErrorColor()
+//        verify_code.setErrorColor()
+
+        //验证码设置红色边框，验证码错误
     }
 
     private fun closeAnim(hasAnim: Boolean) {

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

@@ -20,7 +20,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/platform_dp_40"
-        android:text="输入短信验证码"
+        android:text="输入验证码"
         android:textColor="@color/pay_color_242424"
         android:textSize="22sp"
         app:layout_constraintLeft_toRightOf="@id/img_reg_back"