app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/layout/activity_change_password.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/layout/activity_register_account.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/layout/dialog_static_list.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/layout/fragment_me.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/values-en/strings.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/values-zh/strings.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/values/strings.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java
@@ -72,27 +72,27 @@ initView(); //初始化界面监听器 initEvent(); KeyboardStateObserverUtils.getKeyboardStateObserver(_mActivity).setKeyboardVisibilityListener(new KeyboardStateObserverUtils.OnKeyboardVisibilityListener() { @Override public void onKeyboardShow(int h) { ConstraintSet cs = new ConstraintSet(); cs.clone(viewBinding.parentCl); cs.connect(viewBinding.registerConfirmPswEt.getId(), ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, px2dip(h));// //应用约束 cs.applyTo(viewBinding.parentCl); } @Override public void onKeyboardHide(int h) { ConstraintSet cs = new ConstraintSet(); cs.clone(viewBinding.parentCl); cs.connect(viewBinding.registerConfirmPswEt.getId(), ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, px2dip(h));// //应用约束 cs.applyTo(viewBinding.parentCl); } }); // KeyboardStateObserverUtils.getKeyboardStateObserver(_mActivity).setKeyboardVisibilityListener(new KeyboardStateObserverUtils.OnKeyboardVisibilityListener() { // @Override // public void onKeyboardShow(int h) { // ConstraintSet cs = new ConstraintSet(); // cs.clone(viewBinding.parentCl); // cs.connect(viewBinding.registerConfirmPswEt.getId(), ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, px2dip(h));// // //应用约束 // cs.applyTo(viewBinding.parentCl); // } // // @Override // // public void onKeyboardHide(int h) { // ConstraintSet cs = new ConstraintSet(); // cs.clone(viewBinding.parentCl); // cs.connect(viewBinding.registerConfirmPswEt.getId(), ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, px2dip(h));// // //应用约束 // cs.applyTo(viewBinding.parentCl); // } // // }); } app/src/main/res/layout/activity_change_password.xml
@@ -7,368 +7,382 @@ android:background="@drawable/login" tools:context=".ui.account.ChangePassword"> <TextView android:id="@+id/change_back_tv" android:layout_width="@dimen/dp_30" android:layout_height="@dimen/dp_30" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_38" android:background="@drawable/back" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <TextView android:id="@+id/change_title_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_39" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_39" android:text="@string/home_login_change_password" android:textAlignment="center" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_28" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/change_back_tv" /> <!--手机号--> <include android:id="@+id/change_phone_ic" layout="@layout/text_underline" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_43" app:layout_constraintStart_toStartOf="@+id/change_title_tv" app:layout_constraintTop_toBottomOf="@+id/change_title_tv" /> <!--邮箱--> <include android:id="@+id/change_mail_rl" layout="@layout/text_underline" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_28" android:layout_marginTop="@dimen/dp_43" app:layout_constraintStart_toEndOf="@+id/change_phone_ic" app:layout_constraintTop_toBottomOf="@+id/change_title_tv" /> <View android:id="@+id/interval" <androidx.core.widget.NestedScrollView android:id="@+id/parent_nsv" android:layout_width="match_parent" android:layout_height="2.5dp" android:layout_marginTop="100dp" app:layout_constraintStart_toStartOf="@+id/change_title_tv" app:layout_constraintTop_toBottomOf="@+id/change_title_tv" /> android:layout_height="match_parent" android:fillViewport="true" android:overScrollMode="never"> <RelativeLayout android:id="@+id/region_account_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/interval"> <TextView android:id="@+id/region_account_tv" <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/parent_cl1" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_150" android:gravity="center_vertical" android:text="@string/home_chinese_mainland" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> android:layout_height="match_parent"> <TextView android:id="@+id/region_account_number_tv" android:layout_width="@dimen/dp_90" android:layout_height="match_parent" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_58" android:gravity="center_vertical|end" android:text="+86" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" <TextView android:id="@+id/change_back_tv" android:layout_width="@dimen/dp_30" android:layout_height="@dimen/dp_30" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_38" android:background="@drawable/back" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> /> <TextView android:id="@+id/change_title_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_39" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_39" android:text="@string/home_login_change_password" android:textAlignment="center" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_28" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/change_back_tv" /> <!--手机号--> <include android:id="@+id/change_phone_ic" layout="@layout/text_underline" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_43" app:layout_constraintStart_toStartOf="@+id/change_title_tv" app:layout_constraintTop_toBottomOf="@+id/change_title_tv" /> <!--邮箱--> <include android:id="@+id/change_mail_rl" layout="@layout/text_underline" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_28" android:layout_marginTop="@dimen/dp_43" app:layout_constraintStart_toEndOf="@+id/change_phone_ic" app:layout_constraintTop_toBottomOf="@+id/change_title_tv" /> <ImageView android:id="@+id/region_account_next_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_26" android:src="@drawable/spinner" /> <View android:id="@+id/interval" android:layout_width="match_parent" android:layout_height="2.5dp" android:layout_marginTop="100dp" app:layout_constraintStart_toStartOf="@+id/change_title_tv" app:layout_constraintTop_toBottomOf="@+id/change_title_tv" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> <RelativeLayout android:id="@+id/region_account_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/interval"> </RelativeLayout> <TextView android:id="@+id/region_account_tv" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_150" android:gravity="center_vertical" android:text="@string/home_chinese_mainland" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <RelativeLayout android:id="@+id/change_account_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/region_account_rl"> <TextView android:id="@+id/region_account_number_tv" android:layout_width="@dimen/dp_90" android:layout_height="match_parent" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_58" android:gravity="center_vertical|end" android:text="+86" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" <EditText android:id="@+id/change_account_et" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_60" android:background="@null" android:hint="@string/home_login_input_phone" android:inputType="text" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> <ImageView android:id="@+id/region_account_next_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_26" android:src="@drawable/spinner" /> </RelativeLayout> <!--手机获取验证码--> <RelativeLayout android:id="@+id/change_phone_verification_code_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/change_account_rl"> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> </RelativeLayout> <RelativeLayout android:id="@+id/change_account_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/region_account_rl"> <EditText android:id="@+id/change_account_et" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_60" android:background="@null" android:hint="@string/home_login_input_phone" android:inputType="text" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> </RelativeLayout> <!--手机获取验证码--> <RelativeLayout android:id="@+id/change_phone_verification_code_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/change_account_rl"> <TextView android:id="@+id/change_phone_verification_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentEnd="true" android:layout_marginEnd="@dimen/dp_20" android:gravity="center" android:padding="@dimen/dp_16" android:text="@string/home_login_verification_code" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/change_phone_verification_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentEnd="true" android:layout_marginEnd="@dimen/dp_20" android:gravity="center" android:padding="@dimen/dp_16" android:text="@string/home_login_verification_code" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <View android:id="@+id/change_phone_verification_v" android:layout_width="0.5dp" android:layout_height="20dp" android:layout_alignStart="@+id/change_phone_verification_tv" android:layout_centerInParent="true" android:background="@color/text_1AFFFFFF" /> <View android:id="@+id/change_phone_verification_v" android:layout_width="0.5dp" android:layout_height="20dp" android:layout_alignStart="@+id/change_phone_verification_tv" android:layout_centerInParent="true" android:background="@color/text_1AFFFFFF" /> <EditText android:id="@+id/change_phone_verification_et" android:layout_width="@dimen/dp_150" android:layout_height="match_parent" android:layout_alignStart="@+id/change_phone_verification_v" android:layout_alignParentStart="true" android:layout_marginStart="@dimen/dp_20" android:background="@null" android:hint="@string/home_login_input_verification_code" android:inputType="text" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" <EditText android:id="@+id/change_phone_verification_et" android:layout_width="@dimen/dp_150" android:layout_height="match_parent" android:layout_alignStart="@+id/change_phone_verification_v" android:layout_alignParentStart="true" android:layout_marginStart="@dimen/dp_20" android:background="@null" android:hint="@string/home_login_input_verification_code" android:inputType="text" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> </RelativeLayout> <!--邮箱获取验证码--> <RelativeLayout android:id="@+id/change_mail_verification_code_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/change_account_rl"> </RelativeLayout> <!--邮箱获取验证码--> <RelativeLayout android:id="@+id/change_mail_verification_code_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/change_account_rl"> <TextView android:id="@+id/change_mail_verification_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentEnd="true" android:layout_marginEnd="@dimen/dp_20" android:gravity="center" android:padding="@dimen/dp_16" android:text="@string/home_login_verification_code" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/change_mail_verification_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentEnd="true" android:layout_marginEnd="@dimen/dp_20" android:gravity="center" android:padding="@dimen/dp_16" android:text="@string/home_login_verification_code" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <View android:id="@+id/change_mail_verification_v" android:layout_width="0.5dp" android:layout_height="20dp" android:layout_alignStart="@+id/change_mail_verification_tv" android:layout_centerInParent="true" android:background="@color/text_1AFFFFFF" /> <View android:id="@+id/change_mail_verification_v" android:layout_width="0.5dp" android:layout_height="20dp" android:layout_alignStart="@+id/change_mail_verification_tv" android:layout_centerInParent="true" android:background="@color/text_1AFFFFFF" /> <EditText android:id="@+id/change_mail_verification_et" android:layout_width="@dimen/dp_150" android:layout_height="match_parent" android:layout_alignStart="@+id/change_mail_verification_v" android:layout_alignParentStart="true" android:layout_marginStart="@dimen/dp_20" android:background="@null" android:hint="@string/home_login_input_verification_code" android:inputType="text" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" <EditText android:id="@+id/change_mail_verification_et" android:layout_width="@dimen/dp_150" android:layout_height="match_parent" android:layout_alignStart="@+id/change_mail_verification_v" android:layout_alignParentStart="true" android:layout_marginStart="@dimen/dp_20" android:background="@null" android:hint="@string/home_login_input_verification_code" android:inputType="text" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> </RelativeLayout> </RelativeLayout> <RelativeLayout android:id="@+id/change_psw_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" android:layout_marginTop="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/change_account_rl"> <RelativeLayout android:id="@+id/change_psw_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" android:layout_marginTop="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/change_account_rl"> <EditText android:id="@+id/change_psw_et" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_60" android:background="@null" android:hint="@string/home_login_input_6_16" android:inputType="textPassword" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> <EditText android:id="@+id/change_psw_et" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_60" android:background="@null" android:hint="@string/home_login_input_6_16" android:inputType="textPassword" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> <ImageView android:id="@+id/change_psw_hide_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_32" android:src="@drawable/hide" /> <ImageView android:id="@+id/change_psw_hide_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_32" android:src="@drawable/hide" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> </RelativeLayout> </RelativeLayout> <RelativeLayout android:id="@+id/change_confirm_psw_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/change_psw_rl"> <RelativeLayout android:id="@+id/change_confirm_psw_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/change_psw_rl"> <EditText android:id="@+id/change_confirm_psw_et" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_60" android:background="@null" android:hint="@string/home_login_confirm_psw" android:inputType="textPassword" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> <EditText android:id="@+id/change_confirm_psw_et" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_60" android:background="@null" android:hint="@string/home_login_confirm_psw" android:inputType="textPassword" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> <ImageView android:id="@+id/change_confirm_psw_hide_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_32" android:src="@drawable/hide" /> <ImageView android:id="@+id/change_confirm_psw_hide_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_32" android:src="@drawable/hide" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> </RelativeLayout> </RelativeLayout> <!--错误提示--> <TextView android:id="@+id/text_error_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_20" android:textColor="@color/text_D34545" android:textSize="12sp" app:layout_constraintStart_toStartOf="@+id/change_confirm_psw_rl" app:layout_constraintTop_toBottomOf="@+id/change_confirm_psw_rl" /> <!--错误提示--> <TextView android:id="@+id/text_error_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_20" android:textColor="@color/text_D34545" android:textSize="12sp" app:layout_constraintStart_toStartOf="@+id/change_confirm_psw_rl" app:layout_constraintTop_toBottomOf="@+id/change_confirm_psw_rl" /> <TextView android:id="@+id/confirm_tv" android:layout_width="0dp" android:layout_height="52dp" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_42" android:layout_marginEnd="@dimen/dp_20" android:background="@drawable/bj_ccffff_13" android:enabled="false" android:gravity="center" android:text="@string/home_login_confirm_reset" android:textColor="@color/text_66FFFFFF" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/change_confirm_psw_rl" /> <TextView android:id="@+id/confirm_tv" android:layout_width="0dp" android:layout_height="52dp" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_42" android:layout_marginEnd="@dimen/dp_20" android:background="@drawable/bj_ccffff_13" android:enabled="false" android:gravity="center" android:text="@string/home_login_confirm_reset" android:textColor="@color/text_66FFFFFF" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/change_confirm_psw_rl" /> </androidx.constraintlayout.widget.ConstraintLayout> </androidx.core.widget.NestedScrollView> </androidx.constraintlayout.widget.ConstraintLayout> app/src/main/res/layout/activity_register_account.xml
@@ -8,421 +8,434 @@ android:background="@drawable/login" tools:context=".ui.account.RegisterAccountActivity"> <!-- <ImageView--> <!-- android:layout_width="0dp"--> <!-- android:layout_height="0dp"--> <!-- android:background="@drawable/bj"--> <!-- app:layout_constraintBottom_toBottomOf="parent"--> <!-- app:layout_constraintEnd_toEndOf="parent"--> <!-- app:layout_constraintStart_toStartOf="parent"--> <!-- app:layout_constraintTop_toTopOf="parent" />--> <TextView android:id="@+id/register_back_tv" android:layout_width="@dimen/dp_30" android:layout_height="@dimen/dp_30" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_38" android:background="@drawable/back" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <TextView android:id="@+id/register_title_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_39" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_39" android:text="@string/home_login_register" android:textAlignment="center" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_28" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/register_back_tv" /> <!--手机号--> <include android:id="@+id/register_phone_title_ic" layout="@layout/text_underline" android:layout_width="wrap_content" android:layout_height="@dimen/dp_31" android:layout_marginTop="@dimen/dp_43" app:layout_constraintStart_toStartOf="@+id/register_title_tv" app:layout_constraintTop_toBottomOf="@+id/register_title_tv" /> <!--邮箱--> <include android:id="@+id/register_mail_title_ic" layout="@layout/text_underline" android:layout_width="wrap_content" android:layout_height="@dimen/dp_31" android:layout_marginStart="@dimen/dp_28" android:layout_marginTop="@dimen/dp_43" app:layout_constraintStart_toEndOf="@+id/register_phone_title_ic" app:layout_constraintTop_toBottomOf="@+id/register_title_tv" /> <RelativeLayout android:id="@+id/register_region_server_rl" <androidx.core.widget.NestedScrollView android:id="@+id/parent_nsv" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" android:layout_marginTop="102.5dp" app:layout_constraintStart_toStartOf="@+id/register_title_tv" app:layout_constraintTop_toBottomOf="@+id/register_title_tv"> android:layout_height="match_parent" android:fillViewport="true" android:overScrollMode="never"> <ImageView android:id="@+id/region_iv" android:layout_width="@dimen/dp_13" android:layout_height="@dimen/dp_13" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_20" android:src="@drawable/l" /> <TextView android:id="@+id/region_tv" <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/parent_cl1" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="9dp" android:layout_marginEnd="@dimen/dp_20" android:layout_toEndOf="@+id/region_iv" android:gravity="center_vertical" android:text="HDL China" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> android:layout_height="match_parent"> <ImageView android:id="@+id/region_next_iv" android:layout_width="@dimen/dp_13" android:layout_height="@dimen/dp_13" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_26" android:src="@drawable/next" /> <!-- <ImageView--> <!-- android:layout_width="0dp"--> <!-- android:layout_height="0dp"--> <!-- android:background="@drawable/bj"--> <!-- app:layout_constraintBottom_toBottomOf="parent"--> <!-- app:layout_constraintEnd_toEndOf="parent"--> <!-- app:layout_constraintStart_toStartOf="parent"--> <!-- app:layout_constraintTop_toTopOf="parent" />--> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> <TextView android:id="@+id/register_back_tv" android:layout_width="@dimen/dp_30" android:layout_height="@dimen/dp_30" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_38" android:background="@drawable/back" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> </RelativeLayout> <RelativeLayout android:id="@+id/register_region_account_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/register_region_server_rl"> <TextView android:id="@+id/region_account_tv" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_150" android:gravity="center_vertical" android:text="@string/home_chinese_mainland" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/region_account_number_tv" android:layout_width="@dimen/dp_90" android:layout_height="match_parent" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_58" android:gravity="center_vertical|end" android:text="+86" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <ImageView android:id="@+id/region_account_next_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_26" android:src="@drawable/spinner" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> </RelativeLayout> <RelativeLayout android:id="@+id/register_account_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/register_region_account_rl"> <EditText android:id="@+id/register_account_et" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_60" android:background="@null" android:hint="@string/home_login_input_phone" android:inputType="text" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> </RelativeLayout> <RelativeLayout android:id="@+id/register_psw_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/register_account_rl"> <EditText android:id="@+id/register_psw_et" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_60" android:background="@null" android:hint="@string/home_login_input_6_16" android:inputType="textPassword" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> <ImageView android:id="@+id/register_psw_hide_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_32" android:src="@drawable/hide" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> </RelativeLayout> <RelativeLayout android:id="@+id/register_confirm_psw_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/register_psw_rl"> <EditText android:id="@+id/register_confirm_psw_et" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_60" android:background="@null" android:hint="@string/home_login_confirm_psw" android:inputType="textPassword" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> <ImageView android:id="@+id/register_confirm_psw_hide_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_32" android:src="@drawable/hide" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> </RelativeLayout> <!--手机号验证码--> <RelativeLayout android:id="@+id/register_phone_verification_code_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl"> <TextView android:id="@+id/register_title_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_39" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_39" android:text="@string/home_login_register" android:textAlignment="center" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_28" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/register_back_tv" /> <!--手机号--> <include android:id="@+id/register_phone_title_ic" layout="@layout/text_underline" android:layout_width="wrap_content" android:layout_height="@dimen/dp_31" android:layout_marginTop="@dimen/dp_43" app:layout_constraintStart_toStartOf="@+id/register_title_tv" app:layout_constraintTop_toBottomOf="@+id/register_title_tv" /> <!--邮箱--> <include android:id="@+id/register_mail_title_ic" layout="@layout/text_underline" android:layout_width="wrap_content" android:layout_height="@dimen/dp_31" android:layout_marginStart="@dimen/dp_28" android:layout_marginTop="@dimen/dp_43" app:layout_constraintStart_toEndOf="@+id/register_phone_title_ic" app:layout_constraintTop_toBottomOf="@+id/register_title_tv" /> <TextView android:id="@+id/register_phone_verification_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentEnd="true" android:layout_marginEnd="@dimen/dp_20" android:gravity="center" android:padding="@dimen/dp_16" android:text="@string/home_login_verification_code" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <RelativeLayout android:id="@+id/register_region_server_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" android:layout_marginTop="102.5dp" app:layout_constraintStart_toStartOf="@+id/register_title_tv" app:layout_constraintTop_toBottomOf="@+id/register_title_tv"> <View android:id="@+id/register_phone_verification_v" android:layout_width="0.5dp" android:layout_height="20dp" android:layout_alignStart="@+id/register_phone_verification_tv" android:layout_centerInParent="true" android:background="@color/text_1AFFFFFF" /> <EditText android:id="@+id/register_phone_verification_et" android:layout_width="@dimen/dp_150" android:layout_height="match_parent" android:layout_alignStart="@+id/register_phone_verification_v" android:layout_alignParentStart="true" android:layout_marginStart="@dimen/dp_20" android:background="@null" android:hint="@string/home_login_input_verification_code" android:inputType="text" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> <ImageView android:id="@+id/region_iv" android:layout_width="@dimen/dp_13" android:layout_height="@dimen/dp_13" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_20" android:src="@drawable/l" /> </RelativeLayout> <TextView android:id="@+id/region_tv" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="9dp" android:layout_marginEnd="@dimen/dp_20" android:layout_toEndOf="@+id/region_iv" android:gravity="center_vertical" android:text="HDL China" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <!--邮箱验证码--> <RelativeLayout android:id="@+id/register_mail_verification_code_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl"> <ImageView android:id="@+id/region_next_iv" android:layout_width="@dimen/dp_13" android:layout_height="@dimen/dp_13" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_26" android:src="@drawable/next" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> </RelativeLayout> <RelativeLayout android:id="@+id/register_region_account_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/register_region_server_rl"> <TextView android:id="@+id/region_account_tv" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_150" android:gravity="center_vertical" android:text="@string/home_chinese_mainland" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/region_account_number_tv" android:layout_width="@dimen/dp_90" android:layout_height="match_parent" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_58" android:gravity="center_vertical|end" android:text="+86" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <ImageView android:id="@+id/region_account_next_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_26" android:src="@drawable/spinner" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> </RelativeLayout> <RelativeLayout android:id="@+id/register_account_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/register_region_account_rl"> <EditText android:id="@+id/register_account_et" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_60" android:background="@null" android:hint="@string/home_login_input_phone" android:inputType="text" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> </RelativeLayout> <RelativeLayout android:id="@+id/register_psw_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/register_account_rl"> <EditText android:id="@+id/register_psw_et" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_60" android:background="@null" android:hint="@string/home_login_input_6_16" android:inputType="textPassword" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> <ImageView android:id="@+id/register_psw_hide_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_32" android:src="@drawable/hide" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> </RelativeLayout> <RelativeLayout android:id="@+id/register_confirm_psw_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/register_psw_rl"> <EditText android:id="@+id/register_confirm_psw_et" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_60" android:background="@null" android:hint="@string/home_login_confirm_psw" android:inputType="textPassword" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> <ImageView android:id="@+id/register_confirm_psw_hide_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_32" android:src="@drawable/hide" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> </RelativeLayout> <!--手机号验证码--> <RelativeLayout android:id="@+id/register_phone_verification_code_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl"> <TextView android:id="@+id/register_mail_verification_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentEnd="true" android:layout_marginEnd="@dimen/dp_20" android:gravity="center" android:padding="@dimen/dp_16" android:text="@string/home_login_send_mail" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/register_phone_verification_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentEnd="true" android:layout_marginEnd="@dimen/dp_20" android:gravity="center" android:padding="@dimen/dp_16" android:text="@string/home_login_verification_code" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <View android:id="@+id/register_mail_verification_v" android:layout_width="0.5dp" android:layout_height="20dp" android:layout_alignStart="@+id/register_mail_verification_tv" android:layout_centerInParent="true" android:background="@color/text_1AFFFFFF" /> <View android:id="@+id/register_phone_verification_v" android:layout_width="0.5dp" android:layout_height="20dp" android:layout_alignStart="@+id/register_phone_verification_tv" android:layout_centerInParent="true" android:background="@color/text_1AFFFFFF" /> <EditText android:id="@+id/register_mail_verification_et" android:layout_width="@dimen/dp_150" android:layout_height="match_parent" android:layout_alignStart="@+id/register_mail_verification_v" android:layout_alignParentStart="true" android:layout_marginStart="@dimen/dp_20" android:background="@null" android:hint="@string/home_login_input_verification_code" android:inputType="text" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" <EditText android:id="@+id/register_phone_verification_et" android:layout_width="@dimen/dp_150" android:layout_height="match_parent" android:layout_alignStart="@+id/register_phone_verification_v" android:layout_alignParentStart="true" android:layout_marginStart="@dimen/dp_20" android:background="@null" android:hint="@string/home_login_input_verification_code" android:inputType="text" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> </RelativeLayout> <!--错误提示--> <TextView android:id="@+id/text_error_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_60" android:textColor="@color/text_D34545" android:textSize="12sp" app:layout_constraintStart_toStartOf="@+id/register_confirm_psw_rl" app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl" /> </RelativeLayout> <TextView android:id="@+id/register_complete_tv" android:layout_width="0dp" android:layout_height="52dp" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="102dp" android:layout_marginEnd="@dimen/dp_20" android:background="@drawable/bj_ccffff_13" android:enabled="false" android:gravity="center" android:text="@string/home_login_register" android:textColor="@color/text_66FFFFFF" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl" /> <!--邮箱验证码--> <RelativeLayout android:id="@+id/register_mail_verification_code_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_60" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl"> <TextView android:id="@+id/register_mail_verification_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentEnd="true" android:layout_marginEnd="@dimen/dp_20" android:gravity="center" android:padding="@dimen/dp_16" android:text="@string/home_login_send_mail" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <View android:id="@+id/register_mail_verification_v" android:layout_width="0.5dp" android:layout_height="20dp" android:layout_alignStart="@+id/register_mail_verification_tv" android:layout_centerInParent="true" android:background="@color/text_1AFFFFFF" /> <EditText android:id="@+id/register_mail_verification_et" android:layout_width="@dimen/dp_150" android:layout_height="match_parent" android:layout_alignStart="@+id/register_mail_verification_v" android:layout_alignParentStart="true" android:layout_marginStart="@dimen/dp_20" android:background="@null" android:hint="@string/home_login_input_verification_code" android:inputType="text" android:lines="1" android:maxLines="1" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_1AFFFFFF" /> </RelativeLayout> <!--错误提示--> <TextView android:id="@+id/text_error_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_60" android:textColor="@color/text_D34545" android:textSize="12sp" app:layout_constraintStart_toStartOf="@+id/register_confirm_psw_rl" app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl" /> <TextView android:id="@+id/register_complete_tv" android:layout_width="0dp" android:layout_height="52dp" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="102dp" android:layout_marginEnd="@dimen/dp_20" android:background="@drawable/bj_ccffff_13" android:enabled="false" android:gravity="center" android:text="@string/home_login_register" android:textColor="@color/text_66FFFFFF" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl" /> </androidx.constraintlayout.widget.ConstraintLayout> </androidx.core.widget.NestedScrollView> </androidx.constraintlayout.widget.ConstraintLayout> app/src/main/res/layout/dialog_static_list.xml
@@ -52,7 +52,7 @@ <View android:layout_width="match_parent" android:layout_height="20dp" android:layout_height="10dp" android:background="@color/text_FF000000" /> app/src/main/res/layout/fragment_me.xml
@@ -34,6 +34,7 @@ android:layout_centerInParent="true" android:text="@string/me" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_18" /> app/src/main/res/values-en/strings.xml
@@ -345,7 +345,7 @@ <string name="account">Account</string> <string name="psw">Password</string> <string name="battery_capacity_indicator">Battery capacity</string> <string name="battery_capacity_indicator">Battery energy</string> <string name="be_debugging">Debugging in progress</string> <string name="debugging_completed">Debugging completed</string> <string name="delivered">Delivered</string> app/src/main/res/values-zh/strings.xml
@@ -341,7 +341,7 @@ <string name="account_not_recoverable">注销账户是不可恢复的操作,注销账户之后,您APP所有账户数据(包括昵称、头像、二维码照片等)都会被删除,且无法再找回。</string> <string name="account">账号</string> <string name="psw">密码</string> <string name="battery_capacity_indicator">电池容量</string> <string name="battery_capacity_indicator">电池能量</string> <string name="be_debugging">调试中</string> <string name="debugging_completed">调试完成</string> <string name="delivered">已交付</string> app/src/main/res/values/strings.xml
@@ -341,7 +341,7 @@ <string name="account_not_recoverable">注销账户是不可恢复的操作,注销账户之后,您APP所有账户数据(包括昵称、头像、二维码照片等)都会被删除,且无法再找回。</string> <string name="account">账号</string> <string name="psw">密码</string> <string name="battery_capacity_indicator">电池容量</string> <string name="battery_capacity_indicator">电池能量</string> <string name="be_debugging">调试中</string> <string name="debugging_completed">调试完成</string> <string name="delivered">已交付</string>