Commit 40033022 authored by yinjiacheng's avatar yinjiacheng

fix SHQBD-103 统一社会信用代码输入限制18位字符、数字+大小写英文字母

parent 5f0dc74f
...@@ -78,8 +78,14 @@ class LifeAccountBusinessLicenseAuthFragment : ...@@ -78,8 +78,14 @@ class LifeAccountBusinessLicenseAuthFragment :
private fun initView() { private fun initView() {
// 输入过滤 // 输入过滤
// 企业名称限制40汉字
viewBinding.evRegistrationName.setInputFilters(InputFilterUtil.getRegistrationNameFilter(), InputFilter.LengthFilter(40)) viewBinding.evRegistrationName.setInputFilters(InputFilterUtil.getRegistrationNameFilter(), InputFilter.LengthFilter(40))
viewBinding.evRegistrationCode.setInputFilters(InputFilterUtil.getRegistrationCodeFilter(), InputFilter.LengthFilter(18)) // 统一信用代码限制18位数字+大小写英文字母 小写字母自动转换大写字母
viewBinding.evRegistrationCode.setInputFilters(
InputFilterUtil.getRegistrationCodeFilter(),
InputFilter.LengthFilter(18),
InputFilter.AllCaps()
)
} }
......
...@@ -66,11 +66,11 @@ class InputFilterUtil { ...@@ -66,11 +66,11 @@ class InputFilterUtil {
/** /**
* 统一社会信用代码过滤 * 统一社会信用代码过滤
* 数字 + 大写字母 * 数字 + 大写字母
*/ */
fun getRegistrationCodeFilter(): InputFilter { fun getRegistrationCodeFilter(): InputFilter {
return InputFilter { source, _, _, _, _, _ -> return InputFilter { source, _, _, _, _, _ ->
val pattern = Pattern.compile("[0-9A-Z]+") val pattern = Pattern.compile("[0-9A-Za-z]+")
val matcher = pattern.matcher(source.toString()) val matcher = pattern.matcher(source.toString())
if (!matcher.matches()) return@InputFilter "" if (!matcher.matches()) return@InputFilter ""
return@InputFilter null return@InputFilter null
...@@ -81,7 +81,7 @@ class InputFilterUtil { ...@@ -81,7 +81,7 @@ class InputFilterUtil {
* 带回调的输入长度过滤 * 带回调的输入长度过滤
*/ */
fun getLengthFilter(maxLength: Int, callback: OnLengthFilterCallback?): InputFilter { fun getLengthFilter(maxLength: Int, callback: OnLengthFilterCallback?): InputFilter {
return InputFilter { source, start, end, dest, dstart, dend -> return InputFilter { _, _, end, _, dstart, _ ->
if (dstart + end >= maxLength + 1) { if (dstart + end >= maxLength + 1) {
callback?.onLengthOverrun(maxLength) callback?.onLengthOverrun(maxLength)
return@InputFilter "" return@InputFilter ""
......
...@@ -58,6 +58,7 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor( ...@@ -58,6 +58,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
highLightEditContent()
} }
/** /**
...@@ -66,6 +67,7 @@ class LifeAccountAuthBusinessInfoEditView @JvmOverloads constructor( ...@@ -66,6 +67,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 = ""
cancelHighLightEditContent()
} }
/** /**
......
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