feat:UI修改

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

@@ -214,7 +214,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         spannableString.setSpan(object : ClickableSpan() {
             override fun updateDrawState(ds: TextPaint) {
                 super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(this@RegisterAndLoginActivity,R.color.platform_color_1DA1F2)
+                ds.color = ContextCompat.getColor(this@RegisterAndLoginActivity,R.color.user_1da1f2trans)
                 ds.isUnderlineText = true      //设置下划线
             }
 
@@ -231,7 +231,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         spannableString.setSpan(object : ClickableSpan() {
             override fun updateDrawState(ds: TextPaint) {
                 super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(this@RegisterAndLoginActivity,R.color.platform_color_1DA1F2)
+                ds.color = ContextCompat.getColor(this@RegisterAndLoginActivity,R.color.user_1da1f2trans)
                 ds.isUnderlineText = true      //设置下划线
             }
 

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

@@ -87,17 +87,27 @@ class VerificationCodePresenterImpl(view: IVerificationCodeContract.View) : Base
                 .doOnSubscribe { mView.showLoading(true) }
                 .doAfterTerminate { mView.showLoading(false) }
                 .subscribe({
-                    if (it.code == 200) {
-                        //绑定手机号成功后清空本地保存时间
-                        YDLCacheUtils.saveCodeTime(param.phoneNumber, "")
 
-                        ToastUtil.toastShort("手机号绑定成功")
-                        mView.bindSuccess()
+                    if (it.data != null) {
+                        if (it.code == 200) {
+                            //绑定手机号成功后清空本地保存时间
+                            YDLCacheUtils.saveCodeTime(param.phoneNumber, "")
+
+                            ToastUtil.toastShort("手机号绑定成功")
+                            mView.bindSuccess()
+                        } else {
+//                            mView.startAnim()
+                            ToastUtil.toastShort(it.msg)
+                            mView.verificationErrorCode()
+                        }
                     } else {
-                        mView.startAnim()
+                        ToastUtil.toastShort(it.msg)//服务端返回{验证码错误&异常}信息
+//                        mView.startAnim()
+                        mView.verificationErrorCode()
                     }
                 }, {
-                    mView.startAnim()
+//                    mView.startAnim()
+                    mView.verificationErrorCode()
                     ToastUtil.toastShort(it.message)
                 })
 

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

@@ -8,7 +8,7 @@
         android:id="@+id/other_login_style"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="187dp"
+        android:layout_marginBottom="151dp"
         android:gravity="center"
         android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -85,7 +85,7 @@
             android:textSize="12sp"
             android:includeFontPadding="false"
             android:id="@+id/tv_protocol"
-            android:textColor="@color/platform_color_999999"
+            android:textColor="@color/platform_color_BFBFBF"
             android:text="同意壹点灵用户注册协议" />
     </LinearLayout>
 </merge>
\ No newline at end of file

m-user/src/main/res/values/colors.xml

@@ -26,4 +26,5 @@
     <color name="user_inactivePinFieldColor">#ebebeb</color>
     <color name="user_pinFieldLibraryTransparent">#00000000</color>
     <color name="user_bgcolorred">#ff5040</color>
+    <color name="user_1da1f2trans">#601da1f2</color>
 </resources>