个人认证人脸识别去验证按钮点击事件优化

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/widget/LifeAccountFaceAuthView.kt

@@ -4,6 +4,8 @@ import android.content.Context
 import android.graphics.Color
 import android.util.AttributeSet
 import android.view.View
+import com.yidian.common.extensions.hide
+import com.yidian.common.extensions.show
 import com.yidian.nightmode.widget.YdConstraintLayout
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ViewLifeAccountFaceAuthBinding
@@ -14,66 +16,69 @@ import com.yidian.shenghuoquan.newscontent.databinding.ViewLifeAccountFaceAuthBi
  * description: 生活号认证 人脸认证
  */
 class LifeAccountFaceAuthView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyle: Int = 0
+  context: Context,
+  attrs: AttributeSet? = null,
+  defStyle: Int = 0
 ) : YdConstraintLayout(context, attrs, defStyle), View.OnClickListener {
 
-    private val viewBinding = ViewLifeAccountFaceAuthBinding.bind(
-        View.inflate(
-            getContext(), R.layout.view_life_account_face_auth, this
-        )
+  private val viewBinding = ViewLifeAccountFaceAuthBinding.bind(
+    View.inflate(
+      getContext(), R.layout.view_life_account_face_auth, this
     )
+  )
 
-    private var callback: OnLifeAccountFaceAuthCallback? = null
+  private var callback: OnLifeAccountFaceAuthCallback? = null
 
-    init {
-        viewBinding.ivFaceAuthStart.setOnClickListener(this)
-    }
+  init {
+    viewBinding.tvFaceAuthStart.setOnClickListener(this)
+  }
 
-    /**
-     * 人脸验证结果UI
-     * @param result true为验证通过 false为验证未通过
-     */
-    fun showFaceAuthResult(result: Boolean) {
-        if (result) {
-            viewBinding.tvFaceAuthResult.text = resources.getText(R.string.face_auth_success)
-            viewBinding.tvFaceAuthResult.setTextColor(Color.parseColor("#FF6BB81F"))
-            viewBinding.ivFaceAuthStart.visibility = View.GONE
-            viewBinding.tvFaceAuthErrorTips.visibility = View.GONE
-        } else {
-            viewBinding.tvFaceAuthResult.text = resources.getText(R.string.face_auth_fail)
-            viewBinding.tvFaceAuthResult.setTextColor(Color.parseColor("#FFFF3A3A"))
-            viewBinding.tvFaceAuthErrorTips.visibility = View.VISIBLE
-            viewBinding.tvFaceAuthErrorTips.text = resources.getText(R.string.face_auth_error_tips)
-        }
+  /**
+   * 人脸验证结果UI
+   * @param result true为验证通过 false为验证未通过
+   */
+  fun showFaceAuthResult(result: Boolean) {
+    if (result) {
+      viewBinding.tvFaceAuthResult.show()
+      viewBinding.tvFaceAuthResult.text = resources.getText(R.string.face_auth_success)
+      viewBinding.tvFaceAuthResult.setTextColor(Color.parseColor("#FF6BB81F"))
+      viewBinding.tvFaceAuthStart.hide()
+      viewBinding.tvFaceAuthErrorTips.hide()
+    } else {
+      viewBinding.tvFaceAuthResult.text = resources.getText(R.string.face_auth_fail)
+      viewBinding.tvFaceAuthResult.setTextColor(Color.parseColor("#FFFF3A3A"))
+      viewBinding.tvFaceAuthErrorTips.visibility = View.VISIBLE
+      viewBinding.tvFaceAuthErrorTips.text = resources.getText(R.string.face_auth_error_tips)
     }
+  }
 
-    /**
-     * 人脸验证结果成功UI
-     */
-    fun showFaceAuthSuccess() {
-        viewBinding.tvFaceAuthResult.text = resources.getText(R.string.face_auth_success)
-        viewBinding.tvFaceAuthResult.setTextColor(Color.parseColor("#FF6BB81F"))
-        viewBinding.ivFaceAuthStart.visibility = View.GONE
-        viewBinding.tvFaceAuthErrorTips.visibility = View.GONE
-    }
+  /**
+   * 人脸验证结果成功UI
+   */
+  fun showFaceAuthSuccess() {
+    viewBinding.tvFaceAuthResult.show()
+    viewBinding.tvFaceAuthResult.text = resources.getText(R.string.face_auth_success)
+    viewBinding.tvFaceAuthResult.setTextColor(Color.parseColor("#FF6BB81F"))
+    viewBinding.tvFaceAuthStart.hide()
+    viewBinding.tvFaceAuthErrorTips.hide()
+  }
 
-    override fun onClick(v: View?) {
-        if (v?.id == R.id.iv_face_auth_start) {
-            callback?.onStartFaceAuth()
-        }
+  override fun onClick(v: View?) {
+    // 去验证
+    if (v?.id == R.id.tv_face_auth_start) {
+      callback?.onStartFaceAuth()
     }
+  }
 
-    fun setOnLifeAccountFaceAuthCallback(callback: OnLifeAccountFaceAuthCallback) {
-        this.callback = callback
-    }
+  fun setOnLifeAccountFaceAuthCallback(callback: OnLifeAccountFaceAuthCallback) {
+    this.callback = callback
+  }
 
-    interface OnLifeAccountFaceAuthCallback {
-        /**
-         * 进行人脸验证
-         */
-        fun onStartFaceAuth()
-    }
+  interface OnLifeAccountFaceAuthCallback {
+    /**
+     * 进行人脸验证
+     */
+    fun onStartFaceAuth()
+  }
 
-}
\ No newline at end of file
+}

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

@@ -23,17 +23,23 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="2dp"
         android:includeFontPadding="false"
-        android:text="@string/start_face_auth"
+        android:text="@string/face_auth_fail"
         android:textColor="#FF1852F1"
         android:textSize="15sp"
-        app:layout_constraintEnd_toStartOf="@id/iv_face_auth_start"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.yidian.nightmode.widget.YdImageView
-        android:id="@+id/iv_face_auth_start"
-        android:layout_width="23dp"
-        android:layout_height="23dp"
-        android:src="@mipmap/icon_next"
+    <com.yidian.nightmode.widget.YdTextView
+        android:id="@+id/tv_face_auth_start"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/dp2"
+        android:drawableEnd="@mipmap/icon_next"
+        android:text="去验证"
+        android:textColor="#FF1852F1"
+        android:textSize="15sp"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="@id/tv_face_auth"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/tv_face_auth" />