Commit f7515ae7 authored by yinjiacheng's avatar yinjiacheng

fix SHQBD-224 个人认证完成页、个人认证信息页、企业认证生活号创建完成页处理生活号名称过长时UI显示

parent 3cdf8fdf
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="@dimen/dp283" android:layout_width="@dimen/dp283"
android:layout_height="@dimen/dp174" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp32" android:layout_marginTop="@dimen/dp32"
android:background="@drawable/shape_bg_merchant_info" android:background="@drawable/shape_bg_merchant_info"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -15,13 +15,15 @@ ...@@ -15,13 +15,15 @@
<TextView <TextView
android:id="@+id/tv_life_account_name" android:id="@+id/tv_life_account_name"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp19" android:layout_marginStart="@dimen/dp19"
android:layout_marginTop="@dimen/dp38" android:layout_marginTop="@dimen/dp38"
android:layout_marginEnd="@dimen/dp19"
android:includeFontPadding="false" android:includeFontPadding="false"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="@dimen/sp23" android:textSize="@dimen/sp23"
app:layout_constraintEnd_toStartOf="@id/view_auth_complete"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
...@@ -54,10 +56,12 @@ ...@@ -54,10 +56,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp19" android:layout_marginTop="@dimen/dp19"
android:layout_marginBottom="@dimen/dp19"
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="@string/phone_number" android:text="@string/phone_number"
android:textColor="@color/color_999999" android:textColor="@color/color_999999"
android:textSize="@dimen/sp15" android:textSize="@dimen/sp15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_life_account_name" app:layout_constraintStart_toStartOf="@id/tv_life_account_name"
app:layout_constraintTop_toBottomOf="@id/tv_title_manager" /> app:layout_constraintTop_toBottomOf="@id/tv_title_manager" />
...@@ -74,6 +78,7 @@ ...@@ -74,6 +78,7 @@
app:layout_constraintTop_toBottomOf="@id/tv_title_manager" /> app:layout_constraintTop_toBottomOf="@id/tv_title_manager" />
<View <View
android:id="@+id/view_auth_complete"
android:layout_width="@dimen/dp49" android:layout_width="@dimen/dp49"
android:layout_height="@dimen/dp58" android:layout_height="@dimen/dp58"
android:layout_marginTop="@dimen/dp36" android:layout_marginTop="@dimen/dp36"
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="@dimen/dp283" android:layout_width="@dimen/dp283"
android:layout_height="@dimen/dp259" android:layout_height="wrap_content"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
android:background="@drawable/shape_bg_merchant_info" android:background="@drawable/shape_bg_merchant_info"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -14,15 +14,16 @@ ...@@ -14,15 +14,16 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<TextView <TextView
android:id="@+id/tv_title" android:id="@+id/tv_life_account_name"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp19" android:layout_marginStart="@dimen/dp19"
android:layout_marginTop="@dimen/dp47" android:layout_marginTop="@dimen/dp47"
android:layout_marginEnd="@dimen/dp19"
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="@string/personal_shop"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="@dimen/sp15" android:textSize="@dimen/sp15"
app:layout_constraintEnd_toStartOf="@id/view_auth_complete"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
...@@ -35,8 +36,8 @@ ...@@ -35,8 +36,8 @@
android:text="@string/occupation_label" android:text="@string/occupation_label"
android:textColor="@color/color_999999" android:textColor="@color/color_999999"
android:textSize="@dimen/sp15" android:textSize="@dimen/sp15"
app:layout_constraintStart_toStartOf="@id/tv_title" app:layout_constraintStart_toStartOf="@id/tv_life_account_name"
app:layout_constraintTop_toBottomOf="@id/tv_title" /> app:layout_constraintTop_toBottomOf="@id/tv_life_account_name" />
<TextView <TextView
android:id="@+id/tv_content_occupation_label" android:id="@+id/tv_content_occupation_label"
...@@ -48,7 +49,7 @@ ...@@ -48,7 +49,7 @@
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="@dimen/sp15" android:textSize="@dimen/sp15"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_title" /> app:layout_constraintTop_toBottomOf="@id/tv_life_account_name" />
<TextView <TextView
android:id="@+id/tv_title_real_name" android:id="@+id/tv_title_real_name"
...@@ -59,7 +60,7 @@ ...@@ -59,7 +60,7 @@
android:text="@string/real_name" android:text="@string/real_name"
android:textColor="@color/color_999999" android:textColor="@color/color_999999"
android:textSize="@dimen/sp15" android:textSize="@dimen/sp15"
app:layout_constraintStart_toStartOf="@id/tv_title" app:layout_constraintStart_toStartOf="@id/tv_life_account_name"
app:layout_constraintTop_toBottomOf="@id/tv_title_occupation_label" /> app:layout_constraintTop_toBottomOf="@id/tv_title_occupation_label" />
<TextView <TextView
...@@ -83,7 +84,7 @@ ...@@ -83,7 +84,7 @@
android:text="@string/id_card_number" android:text="@string/id_card_number"
android:textColor="@color/color_999999" android:textColor="@color/color_999999"
android:textSize="@dimen/sp15" android:textSize="@dimen/sp15"
app:layout_constraintStart_toStartOf="@id/tv_title" app:layout_constraintStart_toStartOf="@id/tv_life_account_name"
app:layout_constraintTop_toBottomOf="@id/tv_content_real_name" /> app:layout_constraintTop_toBottomOf="@id/tv_content_real_name" />
<TextView <TextView
...@@ -103,11 +104,13 @@ ...@@ -103,11 +104,13 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp19" android:layout_marginTop="@dimen/dp19"
android:layout_marginBottom="@dimen/dp19"
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="@string/phone_number" android:text="@string/phone_number"
android:textColor="@color/color_999999" android:textColor="@color/color_999999"
android:textSize="@dimen/sp15" android:textSize="@dimen/sp15"
app:layout_constraintStart_toStartOf="@id/tv_title" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_life_account_name"
app:layout_constraintTop_toBottomOf="@id/tv_title_id_card_no" /> app:layout_constraintTop_toBottomOf="@id/tv_title_id_card_no" />
<TextView <TextView
...@@ -123,11 +126,12 @@ ...@@ -123,11 +126,12 @@
app:layout_constraintTop_toBottomOf="@id/tv_title_id_card_no" /> app:layout_constraintTop_toBottomOf="@id/tv_title_id_card_no" />
<View <View
android:id="@+id/view_auth_complete"
android:layout_width="@dimen/dp49" android:layout_width="@dimen/dp49"
android:layout_height="@dimen/dp59" android:layout_height="@dimen/dp59"
android:layout_marginTop="@dimen/dp36" android:layout_marginTop="@dimen/dp36"
android:background="@mipmap/icon_seal"
android:layout_marginEnd="@dimen/dp1" android:layout_marginEnd="@dimen/dp1"
android:background="@mipmap/icon_seal"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
......
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