Skip to content

Y
YDL-Component-Medical
Commit a7018484 by 霍志良
Options

feat:UI

parent 26956085
Showing with 139 additions and 10 deletions
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
......@@ -451,16 +451,12 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
}
//下一步
iv_next.setOnClickListener {
if (BuildConfig.DEBUG){
testLoginActivity.start(this)
}else{
if (iv_select_protocol.visibility == View.VISIBLE && !isAgreeProtocol) {
ToastUtil.toastShort("请您先同意壹点灵《用户使用协议》、《隐私保护政策》，才能登录使用")
return@setOnClickListener
}
if (checkPhone()) {
mPresenter.checkPhoneStatus(userPhoneNumber!!, countryCode!!, isUmengLoginState)
}
if (iv_select_protocol.visibility == View.VISIBLE && !isAgreeProtocol) {
ToastUtil.toastShort("请您先同意壹点灵《用户使用协议》、《隐私保护政策》，才能登录使用")
return@setOnClickListener
}
if (checkPhone()) {
mPresenter.checkPhoneStatus(userPhoneNumber!!, countryCode!!, isUmengLoginState)
}
}
......
m-user/src/main/res/layout/user_activity_bindphone.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
<ImageView
android:id="@+id/img_reg_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/platform_dp_16"
android:layout_marginTop="@dimen/platform_dp_20"
android:src="@drawable/user_ic_back_black"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_login_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/platform_dp_40"
android:text="绑定手机号"
android:textColor="@color/pay_color_242424"
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"
android:text="请输入您的常用手机号码"
android:textColor="@color/pay_color_242424"
android:textSize="13sp"
app:layout_constraintTop_toBottomOf="@id/tv_login_title"
app:layout_constraintStart_toStartOf="@id/tv_login_title"
android:layout_marginTop="@dimen/platform_dp_5"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="跳过"
android:textColor="@color/platform_color_666666"
android:textSize="@dimen/platform_dp_15"
app:layout_constraintTop_toTopOf="@id/img_reg_back"
app:layout_constraintBottom_toBottomOf="@id/img_reg_back"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/platform_dp_16"
android:id="@+id/skip_bind"
/>
<TextView
android:id="@+id/country_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="90dp"
android:drawableRight="@drawable/user_triangle_down"
android:drawablePadding="@dimen/platform_dp_4"
android:text="+86"
android:textColor="@color/pay_color_666666"
android:textSize="17sp"
app:layout_constraintStart_toStartOf="@id/tv_login_title"
app:layout_constraintTop_toBottomOf="@id/tv_login_title" />
<com.ydl.ydlcommon.view.PhoneEditText
android:id="@+id/et_phone_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/platform_dp_24"
android:layout_weight="1"
android:background="@null"
android:gravity="center_vertical|left"
android:hint="输入手机号"
android:inputType="phone"
android:lines="1"
android:maxLength="13"
android:textColorHint="@color/platform_color_EBEBEB"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="@id/country_code"
app:layout_constraintLeft_toRightOf="@id/country_code"
app:layout_constraintTop_toTopOf="@id/country_code" />
<View
android:id="@+id/view_lin"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginStart="@dimen/platform_dp_40"
android:layout_marginTop="@dimen/platform_dp_10"
android:layout_marginEnd="@dimen/platform_dp_40"
android:background="@color/platform_color_EBEBEB"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/country_code" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="发送验证码"
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:background="@drawable/login_password_unable_bg_24dp"
android:gravity="center"
android:layout_marginStart="@dimen/platform_dp_40"
android:layout_marginEnd="@dimen/platform_dp_40"
android:paddingTop="@dimen/platform_dp_13"
android:paddingBottom="@dimen/platform_dp_13"
android:textSize="15sp"
android:textColor="@color/white"
/>
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
m-user/src/main/res/layout/user_activity_register_and_login_new.xml
......@@ -70,6 +70,23 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/country_code" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="下一步"
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:background="@drawable/login_password_unable_bg_24dp"
android:gravity="center"
android:layout_marginStart="@dimen/platform_dp_40"
android:layout_marginEnd="@dimen/platform_dp_40"
android:paddingTop="@dimen/platform_dp_13"
android:paddingBottom="@dimen/platform_dp_13"
android:textSize="15sp"
android:textColor="@color/white"
/>
<include layout="@layout/user_activity_register_and_login_bottom" />
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment