Merge remote-tracking branch 'origin/4.1.64' into 4.1.64

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

@@ -34,6 +34,7 @@ class VerificationCodePresenterImpl(view: IVerificationCodeContract.View) : Base
     }
 
     //发送登录验证码
+    @SuppressLint("CheckResult")
     override fun sendLoginCode(phone: String, phoneCountryCode: String) {
         mModel.sendLoginMsgCode(phone, phoneCountryCode)
                 .subscribeOn(Schedulers.io())
@@ -43,10 +44,10 @@ class VerificationCodePresenterImpl(view: IVerificationCodeContract.View) : Base
                 .subscribe({
                     if (it.code == 200) {
                         YDLCacheUtils.saveCodeTime(phone, System.currentTimeMillis().toString())
-//                        ToastUtil.toastShort("验证码已发送")
                         mView.startCountdown(60)
                     } else {
                         mView.startAnim()
+                        ToastUtil.toastShort(it.msg)
                     }
                 }, {
                     mView.startAnim()
@@ -57,6 +58,7 @@ class VerificationCodePresenterImpl(view: IVerificationCodeContract.View) : Base
     /**
      * 重置密码的验证码
      */
+    @SuppressLint("CheckResult")
     override fun sendResetCode(phone: String, countryCode: String) {
         mModel.sendResetCode(phone, countryCode)
                 .subscribeOn(Schedulers.io())
@@ -80,6 +82,7 @@ class VerificationCodePresenterImpl(view: IVerificationCodeContract.View) : Base
     /**
      * 绑定手机号
      */
+    @SuppressLint("CheckResult")
     override fun bindPhone(param: BindPhoneJavaParam) {
         mModel.bindPhone(param)
                 .subscribeOn(Schedulers.io())
@@ -116,6 +119,7 @@ class VerificationCodePresenterImpl(view: IVerificationCodeContract.View) : Base
     /**
      * 检查重置密码的验证码(重置密码就是忘记密码)
      */
+    @SuppressLint("CheckResult")
     override fun checkResetCode(phone: String, countryCode: String, msgCode: String) {
         mModel.checkResetCode(phone, countryCode, msgCode)
                 .subscribeOn(Schedulers.io())

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

@@ -112,12 +112,13 @@
         android:background="@null"
         android:gravity="center_vertical|left"
         android:hint="输入手机号"
-        android:inputType="phone"
+        android:inputType="number"
         android:lines="1"
         android:maxLength="13"
         android:textColor="@color/platform_color_242424"
         android:textColorHint="@color/platform_color_EBEBEB"
         android:textSize="20sp"
+        android:textCursorDrawable="@null"
         app:layout_constraintBottom_toBottomOf="@id/country_code"
         app:layout_constraintStart_toEndOf="@id/country_code"
         app:layout_constraintEnd_toStartOf="@id/iv_del"