Commit 684d0bbf authored by yinjiacheng's avatar yinjiacheng

fix UI走查 身份信息、营业执照信息表单样式

parent 7d3aa55f
...@@ -12,6 +12,7 @@ import android.util.Log ...@@ -12,6 +12,7 @@ import android.util.Log
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.content.ContextCompat
import androidx.core.content.FileProvider import androidx.core.content.FileProvider
import androidx.core.view.isVisible import androidx.core.view.isVisible
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
...@@ -254,6 +255,7 @@ class LifeAccountBusinessLicenseAuthFragment : ...@@ -254,6 +255,7 @@ class LifeAccountBusinessLicenseAuthFragment :
viewBinding.ivBusinessLicense.setImageDrawable(null) viewBinding.ivBusinessLicense.setImageDrawable(null)
// 清除错误提示 // 清除错误提示
viewBinding.tvUploadErrorTips.isVisible = false viewBinding.tvUploadErrorTips.isVisible = false
activity?.let { viewBinding.viewBusinessLicenseUploadDivider.setBackgroundColor(ContextCompat.getColor(it, R.color.color_FFF2F2F2)) }
viewBinding.ivClear.isVisible = false viewBinding.ivClear.isVisible = false
// 清除OCR或用户输入内容 // 清除OCR或用户输入内容
viewBinding.evRegistrationName.clearEditContent() viewBinding.evRegistrationName.clearEditContent()
...@@ -310,6 +312,7 @@ class LifeAccountBusinessLicenseAuthFragment : ...@@ -310,6 +312,7 @@ class LifeAccountBusinessLicenseAuthFragment :
viewBinding.tvUploadErrorTips.isVisible = true viewBinding.tvUploadErrorTips.isVisible = true
viewBinding.tvUploadErrorTips.text = viewBinding.tvUploadErrorTips.text =
resources.getString(R.string.check_business_license_distinct) resources.getString(R.string.check_business_license_distinct)
activity?.let { viewBinding.viewBusinessLicenseUploadDivider.setBackgroundColor(ContextCompat.getColor(it, R.color.color_FFFF3A3A)) }
} }
override fun onTextClear(from: LifeAccountAuthBusinessInfoEditView) { override fun onTextClear(from: LifeAccountAuthBusinessInfoEditView) {
......
...@@ -8,6 +8,7 @@ import android.text.TextUtils ...@@ -8,6 +8,7 @@ import android.text.TextUtils
import android.text.TextWatcher import android.text.TextWatcher
import android.util.AttributeSet import android.util.AttributeSet
import android.view.View import android.view.View
import androidx.core.content.ContextCompat
import androidx.core.view.isVisible import androidx.core.view.isVisible
import com.yidian.nightmode.widget.YdConstraintLayout import com.yidian.nightmode.widget.YdConstraintLayout
import com.yidian.shenghuoquan.newscontent.R import com.yidian.shenghuoquan.newscontent.R
...@@ -22,7 +23,7 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor( ...@@ -22,7 +23,7 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor(
context: Context, context: Context,
attrs: AttributeSet? = null, attrs: AttributeSet? = null,
defStyle: Int = 0 defStyle: Int = 0
) : YdConstraintLayout(context, attrs, defStyle), View.OnClickListener, TextWatcher { ) : YdConstraintLayout(context, attrs, defStyle), View.OnClickListener, TextWatcher, View.OnFocusChangeListener {
private val viewBinding: ViewLifeAccountAuthBusinessInfoEditBinding = private val viewBinding: ViewLifeAccountAuthBusinessInfoEditBinding =
ViewLifeAccountAuthBusinessInfoEditBinding.bind( ViewLifeAccountAuthBusinessInfoEditBinding.bind(
...@@ -50,6 +51,7 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor( ...@@ -50,6 +51,7 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor(
typedArray.recycle() typedArray.recycle()
viewBinding.ivClear.setOnClickListener(this) viewBinding.ivClear.setOnClickListener(this)
viewBinding.etContent.addTextChangedListener(this) viewBinding.etContent.addTextChangedListener(this)
viewBinding.etContent.onFocusChangeListener = this
} }
/** /**
...@@ -58,6 +60,7 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor( ...@@ -58,6 +60,7 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor(
fun showErrorTips(tips: String) { fun showErrorTips(tips: String) {
viewBinding.tvErrorTips.isVisible = true viewBinding.tvErrorTips.isVisible = true
viewBinding.tvErrorTips.text = tips viewBinding.tvErrorTips.text = tips
viewBinding.viewDivider.setBackgroundColor(ContextCompat.getColor(context, R.color.color_FFFF3A3A))
highLightEditContent() highLightEditContent()
} }
...@@ -67,6 +70,7 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor( ...@@ -67,6 +70,7 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor(
private fun dismissErrorTips() { private fun dismissErrorTips() {
viewBinding.tvErrorTips.isVisible = false viewBinding.tvErrorTips.isVisible = false
viewBinding.tvErrorTips.text = "" viewBinding.tvErrorTips.text = ""
viewBinding.viewDivider.setBackgroundColor(ContextCompat.getColor(context, R.color.color_333333))
cancelHighLightEditContent() cancelHighLightEditContent()
} }
...@@ -77,7 +81,6 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor( ...@@ -77,7 +81,6 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor(
viewBinding.etContent.setText("") viewBinding.etContent.setText("")
if (isInputError) { if (isInputError) {
dismissErrorTips() dismissErrorTips()
cancelHighLightEditContent()
} }
callback?.onTextClear(this) callback?.onTextClear(this)
} }
...@@ -105,7 +108,7 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor( ...@@ -105,7 +108,7 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor(
*/ */
fun highLightEditContent() { fun highLightEditContent() {
isInputError = true isInputError = true
viewBinding.etContent.setTextColor(Color.parseColor("#FFFF3A3A")) viewBinding.etContent.setTextColor(ContextCompat.getColor(context, R.color.color_FFFF3A3A))
} }
/** /**
...@@ -113,7 +116,7 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor( ...@@ -113,7 +116,7 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor(
*/ */
private fun cancelHighLightEditContent() { private fun cancelHighLightEditContent() {
isInputError = false isInputError = false
viewBinding.etContent.setTextColor(Color.parseColor("#FF333333")) viewBinding.etContent.setTextColor(ContextCompat.getColor(context, R.color.color_333333))
} }
/** /**
...@@ -144,7 +147,16 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor( ...@@ -144,7 +147,16 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor(
callback?.onTextChange(this, s.toString()) callback?.onTextChange(this, s.toString())
if (isInputError) { if (isInputError) {
dismissErrorTips() dismissErrorTips()
cancelHighLightEditContent() }
}
override fun onFocusChange(v: View?, hasFocus: Boolean) {
if (hasFocus) {
// 获得焦点
viewBinding.viewDivider.setBackgroundColor(ContextCompat.getColor(context, R.color.color_333333))
} else {
// 失去焦点
viewBinding.viewDivider.setBackgroundColor(ContextCompat.getColor(context, R.color.color_FFF2F2F2))
} }
} }
......
package com.yidian.shenghuoquan.newscontent.widget package com.yidian.shenghuoquan.newscontent.widget
import android.content.Context import android.content.Context
import android.graphics.Color
import android.text.Editable import android.text.Editable
import android.text.InputFilter import android.text.InputFilter
import android.text.TextUtils import android.text.TextUtils
import android.text.TextWatcher import android.text.TextWatcher
import android.util.AttributeSet import android.util.AttributeSet
import android.view.View import android.view.View
import androidx.core.content.ContextCompat
import com.yidian.nightmode.widget.YdConstraintLayout import com.yidian.nightmode.widget.YdConstraintLayout
import com.yidian.shenghuoquan.newscontent.R import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.databinding.ViewLifeAccountAuthIdentityInfoEditBinding import com.yidian.shenghuoquan.newscontent.databinding.ViewLifeAccountAuthIdentityInfoEditBinding
...@@ -21,7 +21,7 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor( ...@@ -21,7 +21,7 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor(
context: Context, context: Context,
attrs: AttributeSet? = null, attrs: AttributeSet? = null,
defStyle: Int = 0 defStyle: Int = 0
) : YdConstraintLayout(context, attrs, defStyle), View.OnClickListener, TextWatcher { ) : YdConstraintLayout(context, attrs, defStyle), View.OnClickListener, TextWatcher, View.OnFocusChangeListener {
private val viewBinding: ViewLifeAccountAuthIdentityInfoEditBinding = private val viewBinding: ViewLifeAccountAuthIdentityInfoEditBinding =
ViewLifeAccountAuthIdentityInfoEditBinding.bind( ViewLifeAccountAuthIdentityInfoEditBinding.bind(
...@@ -49,6 +49,7 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor( ...@@ -49,6 +49,7 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor(
typedArray.recycle() typedArray.recycle()
viewBinding.ivClear.setOnClickListener(this) viewBinding.ivClear.setOnClickListener(this)
viewBinding.etContent.addTextChangedListener(this) viewBinding.etContent.addTextChangedListener(this)
viewBinding.etContent.onFocusChangeListener = this
} }
/** /**
...@@ -64,6 +65,7 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor( ...@@ -64,6 +65,7 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor(
fun showErrorTips(tips: String) { fun showErrorTips(tips: String) {
viewBinding.tvErrorTips.visibility = View.VISIBLE viewBinding.tvErrorTips.visibility = View.VISIBLE
viewBinding.tvErrorTips.text = tips viewBinding.tvErrorTips.text = tips
viewBinding.viewDivider.setBackgroundColor(ContextCompat.getColor(context, R.color.color_FFFF3A3A))
highLightEditContent() highLightEditContent()
} }
...@@ -73,6 +75,7 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor( ...@@ -73,6 +75,7 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor(
private fun dismissErrorTips() { private fun dismissErrorTips() {
viewBinding.tvErrorTips.visibility = View.GONE viewBinding.tvErrorTips.visibility = View.GONE
viewBinding.tvErrorTips.text = "" viewBinding.tvErrorTips.text = ""
viewBinding.viewDivider.setBackgroundColor(ContextCompat.getColor(context, R.color.color_333333))
cancelHighLightEditContent() cancelHighLightEditContent()
} }
...@@ -83,7 +86,6 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor( ...@@ -83,7 +86,6 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor(
viewBinding.etContent.setText("") viewBinding.etContent.setText("")
if (isInputError) { if (isInputError) {
dismissErrorTips() dismissErrorTips()
cancelHighLightEditContent()
} }
callback?.onTextClear(this) callback?.onTextClear(this)
} }
...@@ -111,7 +113,7 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor( ...@@ -111,7 +113,7 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor(
*/ */
fun highLightEditContent() { fun highLightEditContent() {
isInputError = true isInputError = true
viewBinding.etContent.setTextColor(Color.parseColor("#FFFF3A3A")) viewBinding.etContent.setTextColor(ContextCompat.getColor(context, R.color.color_FFFF3A3A))
} }
/** /**
...@@ -119,7 +121,7 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor( ...@@ -119,7 +121,7 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor(
*/ */
fun cancelHighLightEditContent() { fun cancelHighLightEditContent() {
isInputError = false isInputError = false
viewBinding.etContent.setTextColor(Color.parseColor("#FF333333")) viewBinding.etContent.setTextColor(ContextCompat.getColor(context, R.color.color_333333))
} }
/** /**
...@@ -166,7 +168,16 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor( ...@@ -166,7 +168,16 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor(
callback?.onTextChange(this, s.toString()) callback?.onTextChange(this, s.toString())
if (isInputError) { if (isInputError) {
dismissErrorTips() dismissErrorTips()
cancelHighLightEditContent() }
}
override fun onFocusChange(v: View?, hasFocus: Boolean) {
if (hasFocus) {
// 获得焦点
viewBinding.viewDivider.setBackgroundColor(ContextCompat.getColor(context, R.color.color_333333))
} else {
// 失去焦点
viewBinding.viewDivider.setBackgroundColor(ContextCompat.getColor(context, R.color.color_FFF2F2F2))
} }
} }
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_FF1852F1" />
<size
android:width="@dimen/dp2"
android:height="@dimen/dp19" />
</shape>
\ No newline at end of file
...@@ -24,7 +24,9 @@ ...@@ -24,7 +24,9 @@
android:includeFontPadding="false" android:includeFontPadding="false"
android:textColor="#FF333333" android:textColor="#FF333333"
android:textColorHint="#FFC2C2C2" android:textColorHint="#FFC2C2C2"
android:textCursorDrawable="@drawable/shape_bg_input_cursor"
android:textSize="15sp" android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintTop_toBottomOf="@id/tv_content" /> app:layout_constraintTop_toBottomOf="@id/tv_content" />
<com.yidian.nightmode.widget.YdImageView <com.yidian.nightmode.widget.YdImageView
......
...@@ -28,9 +28,11 @@ ...@@ -28,9 +28,11 @@
android:singleLine="true" android:singleLine="true"
android:textColor="#FF333333" android:textColor="#FF333333"
android:textColorHint="#FFC2C2C2" android:textColorHint="#FFC2C2C2"
android:textCursorDrawable="@drawable/shape_bg_input_cursor"
android:textSize="15sp" android:textSize="15sp"
app:layout_constraintStart_toEndOf="@id/tv_content" android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@id/iv_clear" app:layout_constraintEnd_toStartOf="@id/iv_clear"
app:layout_constraintStart_toEndOf="@id/tv_content"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<com.yidian.nightmode.widget.YdImageView <com.yidian.nightmode.widget.YdImageView
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment