Commit a69a23bd by 霍志良

feat:去掉国外手机号校验

parent ae51290b
...@@ -8,7 +8,7 @@ ext { ...@@ -8,7 +8,7 @@ ext {
"m-confide" : "0.0.48.91", "m-confide" : "0.0.48.91",
"m-consultant" : "0.0.59.40", "m-consultant" : "0.0.59.40",
"m-fm" : "0.0.30.00", "m-fm" : "0.0.30.00",
"m-user" : "0.0.60.52", "m-user" : "0.0.60.53",
"m-home" : "0.0.22.51", "m-home" : "0.0.22.51",
"m-im" : "0.0.18.30", "m-im" : "0.0.18.30",
"m-dynamic" : "0.0.7.13", "m-dynamic" : "0.0.7.13",
...@@ -91,7 +91,7 @@ ext { ...@@ -91,7 +91,7 @@ ext {
"m-confide" : "0.0.48.91", "m-confide" : "0.0.48.91",
"m-consultant" : "0.0.51.16", "m-consultant" : "0.0.51.16",
"m-fm" : "0.0.23.5", "m-fm" : "0.0.23.5",
"m-user" : "0.0.60.52", "m-user" : "0.0.60.53",
"m-home" : "0.0.22.51", "m-home" : "0.0.22.51",
"m-im" : "0.0.3.15", "m-im" : "0.0.3.15",
"m-dynamic" : "0.0.1.7", "m-dynamic" : "0.0.1.7",
......
...@@ -283,7 +283,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont ...@@ -283,7 +283,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
} }
setCountryIcon(countryCode) setCountryIcon(countryCode)
if (et_phone_number.text.length==13){ if (et_phone_number.text.length>0){
ll_next.isEnabled=true ll_next.isEnabled=true
ll_next.background=ContextCompat.getDrawable(this,R.drawable.bg_one_click_login) ll_next.background=ContextCompat.getDrawable(this,R.drawable.bg_one_click_login)
} }
...@@ -409,7 +409,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont ...@@ -409,7 +409,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
iv_del.visibility = View.VISIBLE iv_del.visibility = View.VISIBLE
iv_del.isEnabled = true iv_del.isEnabled = true
} }
if (it.toString().length==13){ if (it.toString().length==13||(!countryCode?.contains("86")!! &&et_phone_number.text.toString().length>0)){
ll_next.isEnabled=true ll_next.isEnabled=true
ll_next.background=ContextCompat.getDrawable(this,R.drawable.bg_one_click_login) ll_next.background=ContextCompat.getDrawable(this,R.drawable.bg_one_click_login)
}else{ }else{
......
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