Merge branch 'dev' into feature/im_update

# Conflicts:
#	app/src/main/java/com/ydl/component/base/DemoAppLifecycles.java

app/src/main/java/com/ydl/component/base/DemoAppLifecycles.java

@@ -121,7 +121,6 @@ public class DemoAppLifecycles implements IAppLifecycles {
                     PlatformConfig.setQQZone("1107931541", "8dCvxUpi525uPGTJ");
                 }
 
-//                MobclickAgent.setScenarioType(application, MobclickAgent.EScenarioType.E_DUM_NORMAL);
                 // 选用AUTO页面采集模式
                 MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.AUTO);
                 MobclickAgent.setCatchUncaughtExceptions(!BuildConfig.DEBUG);

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

@@ -193,7 +193,8 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
 
 
     private fun showSoftKeyBord() {
-        RxKeyboardTool.showKeyboard(this, true)
+        RxKeyboardTool.toggleSoftInput(this, et_input_password)
+
     }
 
     /**

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

@@ -333,6 +333,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
 
 
         setHint()
+        requestFocus()
 
         if (isUmengLoginState) {
             tv_skip.visibility = View.VISIBLE
@@ -374,6 +375,14 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         }
     }
 
+    private fun requestFocus(){
+        et_phone_number.post {
+            et_phone_number.requestFocus()
+            et_phone_number.isFocusable = true
+            et_phone_number.isFocusableInTouchMode = true
+        }
+    }
+
     private fun setHint() {
         val hintStr = SpannableString(resources.getString(R.string.user_edittext_hint))// 定义hint的值
         val ass = AbsoluteSizeSpan(16, true)// 设置字体大小 true表示单位是SP

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

@@ -31,7 +31,7 @@
                 android:layout_height="2dp"
                 android:layout_marginLeft="4dp"
                 android:layout_marginRight="4dp"
-                android:background="@color/user_main_theme_light" />
+                android:background="#2EB0FF" />
         </LinearLayout>
 
         <LinearLayout