feat:UI修改

config.gradle

@@ -8,7 +8,7 @@ ext {
             "m-confide"       : "0.0.48.91",
             "m-consultant"    : "0.0.59.40",
             "m-fm"            : "0.0.30.00",
-            "m-user"          : "0.0.60.65",
+            "m-user"          : "0.0.60.67",
             "m-home"          : "0.0.22.51",
             "m-im"            : "0.0.18.30",
             "m-dynamic"       : "0.0.7.13",
@@ -91,7 +91,7 @@ ext {
             "m-confide"       : "0.0.48.91",
             "m-consultant"    : "0.0.51.16",
             "m-fm"            : "0.0.23.5",
-            "m-user"          : "0.0.60.65",
+            "m-user"          : "0.0.60.67",
             "m-home"          : "0.0.22.51",
             "m-im"            : "0.0.3.15",
             "m-dynamic"       : "0.0.1.7",

m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt

@@ -414,7 +414,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
                 iv_del.visibility = View.VISIBLE
                 iv_del.isEnabled = true
             }
-            if (it.toString().length == 13 || (!countryCode?.contains("86")!! && et_phone_number.text.toString().length > 0)) {
+            if (it.toString().length == 13 || (!countryCode?.equals("+86")!! && et_phone_number.text.toString().length > 0)) {
                 ll_next.isEnabled = true
                 ll_next.background = ContextCompat.getDrawable(this, R.drawable.bg_one_click_login)
             } else {

m-user/src/main/java/com/yidianling/user/ui/login/VerificationCodeActivity.kt

@@ -17,6 +17,7 @@ import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
+import com.yidianling.common.tools.LogUtil
 import com.yidianling.common.tools.RxKeyboardTool
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.user.LoginUtils
@@ -165,15 +166,16 @@ class VerificationCodeActivity :
                 }
             }
         }
+        val splitCountryCode=countryCode?.substring(2)
 
         if (!TextUtils.isEmpty(userPhoneNumber) && userPhoneNumber!!.length == 11) {
             val sb = StringBuffer(userPhoneNumber)
             sb.insert(3, " ")
             sb.insert(8, " ")
-            val splitCountryCode=countryCode?.substring(2)
             tv_phone.text = "已发送至 +${splitCountryCode}  $sb"
         } else {
-            tv_phone.text = userPhoneNumber
+//            tv_phone.text = userPhoneNumber
+            tv_phone.text = "已发送至 +${splitCountryCode}  "+userPhoneNumber
         }
 
         if (codeType == STATUS_FORGET_PWD) {//忘记密码界面

m-user/src/main/res/layout/user_activity_verification_code_new.xml

@@ -89,6 +89,7 @@
         android:layout_height="wrap_content"
         android:text="收不到验证码?"
         android:textSize="13sp"
+        android:padding="@dimen/platform_dp_5"
         android:id="@+id/not_get_code"
         android:textColor="@color/platform_color_666666"
         app:layout_constraintRight_toRightOf="@id/verify_code"