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

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

@@ -11,13 +11,9 @@ import android.text.method.HideReturnsTransformationMethod
 import android.text.method.PasswordTransformationMethod
 import android.view.View
 import android.view.animation.AnimationUtils
-import com.umeng.socialize.UMShareAPI
-import com.umeng.socialize.UMShareConfig
-import com.umeng.socialize.bean.SHARE_MEDIA
 import com.ydl.ydlcommon.base.BaseMvpActivity
 import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.StatusBarUtils
-
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.view.dialog.CommonDialog
 import com.yidianling.common.tools.RxKeyboardTool
@@ -34,8 +30,6 @@ import kotlinx.android.synthetic.main.user_activity_input_password_new.iv_visibi
 import kotlinx.android.synthetic.main.user_activity_input_password_new.tv_forget
 import kotlinx.android.synthetic.main.user_activity_input_password_new.tv_msm_login
 import kotlinx.android.synthetic.main.user_activity_input_password_new.view_lin
-import kotlinx.android.synthetic.main.user_activity_register_and_login_bottom.*
-import kotlinx.android.synthetic.main.user_activity_register_and_login_new.*
 
 /**
  * @author jiucheng

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

@@ -27,7 +27,6 @@ import com.umeng.socialize.bean.SHARE_MEDIA
 import com.ydl.ydlcommon.base.BaseMvpActivity
 import com.ydl.ydlcommon.data.PlatformRamImpl
 import com.ydl.ydlcommon.utils.ActivityManager
-import com.ydl.ydlcommon.utils.SharedPreferencesEditor
 import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils

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

@@ -5,11 +5,10 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
-import android.os.Handler
 import android.support.v4.content.ContextCompat
 import android.text.TextUtils
 import android.view.View
+import android.view.animation.AnimationUtils
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import com.ydl.ydlcommon.base.BaseMvpActivity
@@ -17,7 +16,6 @@ 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
@@ -35,6 +33,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.user_activity_verification_code_new.*
+import kotlinx.android.synthetic.main.user_activity_verification_code_new.img_reg_back
 import java.util.concurrent.TimeUnit
 
 /**
@@ -283,6 +282,8 @@ class VerificationCodeActivity :
         verify_code.highlightPaintColor=getColor(R.color.user_bgcolorred)
         verify_code.invalidate()
         dismissProgressDialog()
+        val shake = AnimationUtils.loadAnimation(this, R.anim.user_shake_input)//加载动画资源文件 
+        verify_code.startAnimation(shake)
     }
 
     /**
@@ -405,10 +406,6 @@ class VerificationCodeActivity :
 //        pc_1.startAnimation(shake)
         //设置红色边框
 //        verify_code.setErrorColor()
-
-        //验证码设置红色边框，验证码错误&验证码过期
-
-
     }
 
     private fun closeAnim(hasAnim: Boolean) {

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

@@ -25,5 +25,5 @@
     <color name="user_pinFieldLibraryAccent">#1da1f2</color>
     <color name="user_inactivePinFieldColor">#ebebeb</color>
     <color name="user_pinFieldLibraryTransparent">#00000000</color>
-    <color name="user_bgcolorred">#990000</color>
+    <color name="user_bgcolorred">#ff5040</color>
 </resources>