Skip to content

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

feat:ui修改

parent 3244fadf
Showing with 28 additions and 24 deletions
m-user/src/main/java/com/yidianling/user/ui/login/InputPassWordActivity.kt
......@@ -241,11 +241,11 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
*/
private fun switchPwdShowType() {
if (iv_visibility.isSelected) {
iv_visibility.setImageResource(R.drawable.user_ic_visibility)
iv_visibility.setImageResource(R.drawable.user_ic_visibility_new)
et_input_password.transformationMethod = HideReturnsTransformationMethod.getInstance()
et_input_password.hint = "当前密码可见"
} else {
iv_visibility.setImageResource(R.drawable.user_ic_invisibility)
iv_visibility.setImageResource(R.drawable.user_ic_invisibility_new)
et_input_password.transformationMethod = PasswordTransformationMethod.getInstance()
et_input_password.hint = "当前密码不可见"
}
......
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
......@@ -352,20 +352,20 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
val privacyOnOffType = PlatformRamImpl.getInstance().getGlobalInfo()?.info?.protocol_android ?: 2
val channel = WalleChannelReader.getChannel(applicationContext)
if (channel=="huawei"){
iv_select_protocol.setImageResource(R.drawable.user_login_protocol_unselected)
iv_select_protocol.setImageResource(R.drawable.user_login_protocol_unselected_new)
}else if (privacyOnOffType == 2 && (channel=="vivo")){
iv_select_protocol.setImageResource(R.drawable.user_login_protocol_unselected)
iv_select_protocol.setImageResource(R.drawable.user_login_protocol_unselected_new)
}else{
isAgreeProtocol = true
iv_select_protocol.setImageResource(R.drawable.user_login_protocol_selected)
iv_select_protocol.setImageResource(R.drawable.user_login_protocol_selected_new)
}
iv_select_protocol.setOnClickListener {
if (iv_select_protocol.visibility == View.VISIBLE) {
isAgreeProtocol = !isAgreeProtocol
if (isAgreeProtocol) {
iv_select_protocol.setImageResource(R.drawable.user_login_protocol_selected)
iv_select_protocol.setImageResource(R.drawable.user_login_protocol_selected_new)
} else {
iv_select_protocol.setImageResource(R.drawable.user_login_protocol_unselected)
iv_select_protocol.setImageResource(R.drawable.user_login_protocol_unselected_new)
}
}
}
......
m-user/src/main/res/layout/user_activity_input_password_new.xml
......@@ -28,12 +28,13 @@
<EditText
android:id="@+id/et_input_password"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
app:layout_constraintTop_toBottomOf="@id/tv_password_orSet_title"
android:layout_marginTop="100dp"
app:layout_constraintLeft_toLeftOf="@id/tv_password_orSet_title"
app:layout_constraintStart_toStartOf="@id/tv_password_orSet_title"
app:layout_constraintEnd_toStartOf="@id/iv_visibility"
android:layout_weight="1"
android:background="@null"
android:digits="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
......@@ -84,7 +85,7 @@
android:textSize="13sp"
app:layout_constraintTop_toBottomOf="@id/view_lin"
app:layout_constraintStart_toStartOf="@id/view_lin"
android:layout_marginTop="@dimen/platform_dp_15"
android:layout_marginTop="@dimen/platform_dp_12"
android:id="@+id/tv_msm_login"
>
</TextView>
......@@ -127,14 +128,16 @@
android:gravity="center"
android:textColor="@color/white"
android:text="登录"
android:textSize="15sp"
android:textSize="17sp"
android:id="@+id/login_password"
android:background="@drawable/login_password_unable_bg_24dp"
android:paddingTop="@dimen/platform_dp_14"
android:paddingBottom="@dimen/platform_dp_14"
app:layout_constraintTop_toBottomOf="@id/tv_msm_login"
app:layout_constraintStart_toStartOf="@id/tv_msm_login"
app:layout_constraintEnd_toEndOf="@id/tv_forget"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginStart="@dimen/platform_dp_28"
android:layout_marginEnd="@dimen/platform_dp_28"
android:layout_marginTop="@dimen/platform_dp_25"
app:layout_goneMarginTop="@dimen/platform_dp_25"
/>
......
m-user/src/main/res/layout/user_activity_register_and_login_new.xml
......@@ -107,7 +107,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/platform_dp_24"
android:layout_marginLeft="@dimen/platform_dp_16"
android:layout_weight="1"
android:background="@null"
android:gravity="center_vertical|left"
......@@ -139,9 +139,10 @@
android:layout_width="23dp"
android:layout_height="23dp"
android:layout_gravity="center_vertical"
android:padding="5dp"
android:scaleType="fitXY"
android:src="@drawable/user_ic_del"
android:paddingTop="@dimen/platform_dp_5"
android:paddingBottom="@dimen/platform_dp_5"
android:paddingLeft="@dimen/platform_dp_5"
android:src="@drawable/user_ic_del_new"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@id/view_lin"
app:layout_constraintTop_toTopOf="@id/et_phone_number"
......@@ -158,11 +159,11 @@
android:layout_marginTop="@dimen/platform_dp_25"
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:layout_marginStart="@dimen/platform_dp_28"
android:layout_marginEnd="@dimen/platform_dp_28"
android:paddingTop="@dimen/platform_dp_13"
android:paddingBottom="@dimen/platform_dp_13"
android:textSize="15sp"
android:textSize="17sp"
android:id="@+id/ll_next"
android:textColor="@color/white"
/>
......
m-user/src/main/res/layout/user_activity_verification_code_new.xml
......@@ -75,7 +75,7 @@
android:id="@+id/login_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/platform_dp_15"
android:layout_marginTop="@dimen/platform_dp_10"
android:text="密码登录"
android:textColor="@color/platform_color_666666"
android:textSize="13sp"
......
m-user/src/main/res/layout/user_kefu_tipdialog.xml
......@@ -2,8 +2,8 @@
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="38dp"
android:layout_marginEnd="38dp"
android:layout_marginStart="@dimen/platform_dp_38"
android:layout_marginEnd="@dimen/platform_dp_38"
android:background="@drawable/shape_bg_white_fillet8"
xmlns:app="http://schemas.android.com/apk/res-auto">
......@@ -17,7 +17,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/platform_dp_28"
android:layout_marginTop="@dimen/platform_dp_24"
android:id="@+id/title"
/>
......
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