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

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

@@ -281,7 +281,10 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         }
 
         setCountryIcon(countryCode)
-
+        if (et_phone_number.text.length==13){
+            ll_next.isEnabled=true
+            ll_next.background=ContextCompat.getDrawable(this,R.drawable.bg_one_click_login)
+        }
 
         if (isFromGuide) {
             img_reg_back.visibility = View.INVISIBLE

m-user/src/main/java/com/yidianling/user/widget/PinField/PinField.kt

@@ -12,6 +12,7 @@ import android.text.method.TransformationMethod
 import android.util.AttributeSet
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
+import com.yidianling.common.tools.LogUtil
 import com.yidianling.user.R
 
 
@@ -43,7 +44,6 @@ open class PinField : AppCompatEditText {
         }
 
     protected var singleFieldWidth = 0
-
     var lineThickness = dp2px(1.0f)
         set(value) {
             field = value
@@ -82,7 +82,7 @@ open class PinField : AppCompatEditText {
 
     protected var yPadding = dp2px(10f)
 
-    public var highlightSingleFieldType =
+    var highlightSingleFieldType =
         HighlightType.ALL_FIELDS
 
     private var lastCursorChangeState: Long = -1
@@ -141,7 +141,6 @@ open class PinField : AppCompatEditText {
         highlightPaint = Paint(fieldPaint)
         highlightPaint.color = highlightPaintColor
         highlightPaint.strokeWidth = highLightThickness.toFloat()
-
         fieldBgColor = Color.TRANSPARENT
         fieldBgPaint.style = Paint.Style.FILL
     }

m-user/src/main/res/drawable/login_password_unable_bg_24dp.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <gradient
-        android:startColor="#a5dafa"
-        android:endColor="#a5dafa"
-        android:angle="90"
-        />
-    <corners android:radius="@dimen/platform_dp_24" />
-</shape>
\ No newline at end of file

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

@@ -155,7 +155,7 @@
         app:layout_constraintTop_toBottomOf="@id/view_lin"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="@dimen/platform_dp_40"
+        android:layout_marginTop="@dimen/platform_dp_25"
         android:background="@drawable/login_password_unable_bg_24dp"
         android:gravity="center"
         android:layout_marginStart="@dimen/platform_dp_40"

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

@@ -91,5 +91,6 @@
         app:layout_constraintRight_toRightOf="@id/verify_code"
         app:layout_constraintTop_toTopOf="@id/login_password"
         app:layout_constraintBottom_toBottomOf="@id/login_password"
+        app:layout_goneMarginTop="@dimen/platform_dp_15"
         />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file