add 登录页面UI

CommonLib/Common/src/main/java/com/yidian/common/widget/EditTextInputCallback.kt

+package com.yidian.common.widget
+
+interface EditTextInputCallback {
+    fun inputCallback(s: String)
+}
\ No newline at end of file

CommonLib/Common/src/main/java/com/yidian/common/widget/PhoneNumberTextWatcher.kt

+package com.yidian.common.widget
+
+import android.text.Editable
+import android.text.TextWatcher
+import android.widget.EditText
+
+class PhoneNumberTextWatcher(var editText: EditText, var inputCallback: EditTextInputCallback): TextWatcher {
+    private var isDelete = false
+    private var lastContentLength = 0
+    private val sb = StringBuffer()
+
+    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+
+    }
+
+    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+        sb.delete(0, sb.length)
+        sb.append(s)
+        isDelete = s?.length!! <= lastContentLength
+        if(!isDelete && (s.length == 4 || s.length == 9)){
+            if(s.length == 4) {
+                sb.insert(3, " ")
+            }else {
+                sb.insert(8, " ")
+            }
+            setContent(sb)
+        }
+        if (isDelete && (s.length == 4 || s.length == 9)) {
+            sb.deleteCharAt(sb.length - 1)
+            setContent(sb)
+        }
+        lastContentLength = sb.length
+        inputCallback.inputCallback(sb.toString())
+    }
+
+    override fun afterTextChanged(s: Editable?) {
+
+    }
+
+    private fun setContent(sb: StringBuffer){
+        editText.setText(sb.toString())
+        editText.setSelection(sb.length)
+    }
+}
\ No newline at end of file

CommonLib/Common/src/main/java/com/yidian/common/wxapi/WXEntryActivity.kt

-package com.yidian.common.wxapi
-
-//import com.umeng.socialize.weixin.view.WXCallbackActivity
-
-class WXEntryActivity: WXCallbackActivity()
\ No newline at end of file

CommonLib/Common/src/main/res/drawable/protocol_checkbox_bg.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@mipmap/cb_select_on" android:state_checked="true" />
+    <item android:drawable="@mipmap/cb_select_off" android:state_checked="false" />
+</selector>
\ No newline at end of file

CommonLib/Common/src/main/res/values/styles.xml

@@ -10,6 +10,10 @@
         <item name="android:button">@drawable/checkbox_bg</item>
     </style>
 
+    <style name="protocol_checkboxBg" parent="@android:style/Widget.CompoundButton.CheckBox">
+        <item name="android:button">@drawable/protocol_checkbox_bg</item>
+    </style>
+
     <style name="normal_dialog" parent="android:style/Theme.Dialog">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowNoTitle">true</item>

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/LoginLifeCircleActivity.kt

 package com.yidian.shenghuoquan.newscontent.ui
 
-import android.content.Intent
 import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
 import com.yidian.common.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE
 import com.yidian.common.base.BaseActivity
+import com.yidian.common.widget.EditTextInputCallback
+import com.yidian.common.widget.PhoneNumberTextWatcher
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityLoginBinding
-import com.yidian.shenghuoquan.newscontent.ui.alive.AliveTestActivity
-import com.yidian.shenghuoquan.newscontent.ui.idcard.IDCardTestActivity
 import com.yidian.shenghuoquan.newscontent.utils.CountDownTimerUtils
+import com.yidian.utils.ToastUtil
 
 /**
- * Author: sym
- * Date: 2021/5/18 5:14 PM
+ * Author: zhb
+ * Date: 2021/5/26 16:05 PM
  * Describe:短信登陆页面
  */
 class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>() {
     private lateinit var mCountDownTimerUtils: CountDownTimerUtils
+    private var mobileFinish = false
+    private var codeFinish = false
+    private var protocolAgree = false
 
     override fun createViewBinding(): ActivityLoginBinding {
         return ActivityLoginBinding.inflate(layoutInflater)
@@ -32,17 +37,83 @@ class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>() {
     }
 
     private fun initView() {
-//        mCountDownTimerUtils = CountDownTimerUtils(viewBind.getBtn, 60000, 1000)
+        setLoginButtonStatus(false)
+        mCountDownTimerUtils = CountDownTimerUtils(viewBind.tvGetCode, 60000, 1000)
     }
 
     private fun setOnListener() {
-//        viewBind.getBtn.setOnClickListener {
-//            mCountDownTimerUtils.start()
-//        }
+        viewBind.tvGetCode.setOnClickListener {
+            mCountDownTimerUtils.start()
+        }
+
+        viewBind.etMobileNo.addTextChangedListener(PhoneNumberTextWatcher(viewBind.etMobileNo, object: EditTextInputCallback{
+            override fun inputCallback(s: String) {
+                if(s.length == 13){
+                    mobileFinish = true
+                    changeLoginButtonStatus()
+                }else if(mobileFinish){
+                    mobileFinish = false
+                    changeLoginButtonStatus()
+                }
+            }
+        }))
+
+        viewBind.etCode.addTextChangedListener(object: TextWatcher{
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+
+            }
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                if(s?.length == 6){
+                    codeFinish = true
+                    changeLoginButtonStatus()
+                }else if(codeFinish){
+                    codeFinish = false
+                    changeLoginButtonStatus()
+                }
+            }
+
+            override fun afterTextChanged(s: Editable?) {
+
+            }
+
+        })
 
-//        viewBind.loginBtn.setOnClickListener {
+        viewBind.tvLogin.setOnClickListener {
+            ToastUtil.showToast(this, "登录")
 //            startActivity(Intent(this@LoginLifeCircleActivity, IDCardTestActivity::class.java))
 //            startActivity(Intent(this@LoginLifeCircleActivity, AliveTestActivity::class.java))
-//        }
+        }
+
+        viewBind.cbProtocol.setOnCheckedChangeListener { buttonView, isChecked ->
+            protocolAgree = isChecked
+            changeLoginButtonStatus()
+        }
+
+        viewBind.tvProtocol.setOnClickListener {
+            ToastUtil.showToast(this, "用户协议")
+        }
+
+        viewBind.tvPrivacy.setOnClickListener {
+            ToastUtil.showToast(this, "隐私政策")
+        }
+    }
+
+    private fun changeLoginButtonStatus(){
+        if(mobileFinish && codeFinish && protocolAgree){
+            setLoginButtonStatus(true)
+        }else{
+            setLoginButtonStatus(false)
+        }
+    }
+
+    private fun setLoginButtonStatus(flag: Boolean){
+        if(flag){
+            viewBind.tvLogin.alpha = 1.0f
+            viewBind.tvLogin.isEnabled = true
+        }else{
+            viewBind.tvLogin.alpha = 0.32f
+            viewBind.tvLogin.isEnabled = false
+        }
     }
 }
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/utils/CountDownTimerUtils.kt

 package com.yidian.shenghuoquan.newscontent.utils
 
+import android.annotation.SuppressLint
+import android.graphics.Color
 import android.os.CountDownTimer
 import android.widget.TextView
 
@@ -8,24 +10,24 @@ import android.widget.TextView
  * Date: 2021/5/18 7:43 PM
  * Describe:
  */
-class CountDownTimerUtils : CountDownTimer {
-    private var mTextView: TextView? = null
-
-    constructor(textView: TextView, millisInFuture: Long, countDownInterval: Long) : super(millisInFuture, countDownInterval) {
-        mTextView = textView
-    }
+class CountDownTimerUtils(textView: TextView, millisInFuture: Long, countDownInterval: Long) :
+    CountDownTimer(millisInFuture, countDownInterval) {
+    private var mTextView: TextView? = textView
 
+    @SuppressLint("SetTextI18n")
     override fun onTick(millisUntilFinished: Long) {
         mTextView!!.isClickable = false //设置不可点击
-        var temp: Long = millisUntilFinished / 1000
+        mTextView!!.setTextColor(Color.rgb(0xc2,0xc2,0xc2))
+        val temp: Long = millisUntilFinished / 1000
         if (temp.toString() != "0") {
-            mTextView!!.text = temp.toString() + "s后重新获取"//设置倒计时时间
+            mTextView!!.text = temp.toString() + "s"//设置倒计时时间
         } else {
             mTextView!!.text = "获取验证码"
         }
     }
 
     override fun onFinish() {
+        mTextView!!.setTextColor(Color.rgb(0x18,0x52,0xf1))
         mTextView!!.text = "获取验证码"
         mTextView!!.isClickable = true //重新获得点击
     }

Components/newscontent/src/main/res/layout/activity_login.xml

@@ -38,6 +38,7 @@
             android:gravity="center_vertical"
             android:background="@null"
             android:inputType="number"
+            android:maxLength="13"
             android:textColor="#333333"
             android:textSize="16sp"
             tools:ignore="TextFields"
@@ -106,7 +107,7 @@
 
 
     <TextView
-        android:id="@+id/btn_login"
+        android:id="@+id/tv_login"
         android:layout_width="match_parent"
         android:layout_height="44dp"
         android:layout_marginStart="40dp"
@@ -115,18 +116,21 @@
         android:gravity="center"
         android:textSize="18sp"
         android:textColor="@color/white"
+        android:background="@drawable/account_btn_gradient_bg"
         android:text="登   录" />
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="16dp"
+        android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
         android:gravity="center"
         android:orientation="horizontal">
 
         <CheckBox
+            android:id="@+id/cb_protocol"
             android:layout_width="25dp"
-            android:layout_height="25dp" />
+            android:layout_height="23dp"
+            style="@style/protocol_checkboxBg"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -137,6 +141,7 @@
             android:text="我同意"/>
 
         <TextView
+            android:id="@+id/tv_protocol"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="14sp"
@@ -144,6 +149,7 @@
             android:text="《用户协议》"/>
 
         <TextView
+            android:id="@+id/tv_privacy"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="14sp"