feat:一些UI小逻辑

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

@@ -254,7 +254,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         requestFocus()
 
         if (isUmengLoginState) {
-//            tv_skip.visibility = View.VISIBLE
+            skip_bind.visibility = View.VISIBLE
 //            tv_des.text = "首次绑定即送大礼包"
 //            tv_des.visibility = View.GONE//"同意"
             iv_select_protocol.visibility = View.GONE
@@ -262,6 +262,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
             login_wechat.visibility = View.GONE
             login_qq.visibility = View.GONE
             tv_login_title.text = "手机号绑定"
+            ll_next.text="发送验证码"
             tv_protocol.visibility = View.GONE
         }
 
@@ -285,7 +286,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         if (isFromGuide) {
             img_reg_back.visibility = View.INVISIBLE
             img_reg_back.isEnabled = false
-//            tv_skip.visibility = View.VISIBLE
+//            skip_bind.visibility = View.VISIBLE
 //            tv_skip.text = "随便逛逛"
         }
         //根据来源不同为当前页面埋点
@@ -329,11 +330,11 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
      * 设置点击事件
      */
     private fun setClickEvent() {
-//        tv_skip.setOnClickListener {
-//            ActionCountUtils.count(uid = "", partId = UserBIConstants.PART_ID_LOGIN_MAIN, position = UserBIConstants.POSITION_LOOK_AROUND_CLICK, url = "无url",api =  "无api", sign1 = "")
-//            RxKeyboardTool.hideSoftInput(this)
-//            onBackPressed()
-//        }
+        skip_bind.setOnClickListener {
+            ActionCountUtils.count(uid = "", partId = UserBIConstants.PART_ID_LOGIN_MAIN, position = UserBIConstants.POSITION_LOOK_AROUND_CLICK, url = "无url",api =  "无api", sign1 = "")
+            RxKeyboardTool.hideSoftInput(this)
+            onBackPressed()
+        }
         img_reg_back.setOnClickListener {
             RxKeyboardTool.hideSoftInput(this)
             onBackPressed()
@@ -474,14 +475,15 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         if (bindPhone != 1) {
             countryCode = userInfo.country_code
             isUmengLoginState = true
-//            tv_skip.visibility = View.VISIBLE
+            skip_bind.visibility = View.VISIBLE
 //            tv_des.text = "首次绑定即送大礼包"
 //            tv_des.visibility = View.GONE
             iv_select_protocol.visibility = View.GONE
 //            tv_des_first.visibility = View.VISIBLE
+            bind_phone_hint.visibility=View.VISIBLE
             login_wechat.visibility = View.GONE
             login_qq.visibility = View.GONE
-            tv_login_title.text = "手机号绑定"
+            tv_login_title.text = "绑定手机号"
             tv_protocol.visibility = View.GONE
         } else {
             LoginUtils.LoginSuccessOperate(this)

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

@@ -64,7 +64,31 @@
         android:textSize="22sp"
         app:layout_constraintLeft_toRightOf="@id/img_reg_back"
         app:layout_constraintTop_toBottomOf="@id/img_reg_back" />
-
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/tv_login_title"
+        app:layout_constraintStart_toStartOf="@id/tv_login_title"
+        android:text="请输入您的常用手机号"
+        android:textColor="@color/platform_color_242424"
+        android:textSize="13sp"
+        android:layout_marginTop="@dimen/platform_dp_5"
+        android:id="@+id/bind_phone_hint"
+        android:visibility="gone"
+        >
+    </TextView>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="跳过"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/img_reg_back"
+        app:layout_constraintBottom_toBottomOf="@id/img_reg_back"
+        android:layout_marginEnd="@dimen/platform_dp_16"
+        android:id="@+id/skip_bind"
+        android:visibility="gone"
+        >
+    </TextView>
     <TextView
         android:id="@+id/country_code"
         android:layout_width="wrap_content"