修改注销账号文案和样式

BaseLibrary/src/main/res/values/colors.xml

@@ -165,6 +165,7 @@
     <color name="color_ffebd3">#FFEBD3</color>
     <color name="color_ffd5aa">#FFD5AA</color>
     <color name="color_ff8000">#FF8000</color>
+    <color name="color_fe2451">#FE2451</color>
 
     <color name="color_25292e">#25292E</color>
     <color name="color_F8F8F8">#F8F8F8</color>

usercenter/src/main/res/layout/ac_sign_out_account_layout.xml

@@ -1,197 +1,252 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
     <include
         android:id="@+id/toolbar_include"
-        layout="@layout/common_toolbar_layout"/>
+        layout="@layout/common_toolbar_layout" />
 
     <View
         android:id="@+id/view_bg"
-        android:background="@drawable/bg_white_10dp"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginStart="13dp"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="13dp"
-        android:layout_marginStart="13dp"
-        android:layout_marginBottom="30dp"
-        app:layout_constraintBottom_toTopOf="@+id/tv_confirm"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar_include"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"/>
+        android:layout_marginBottom="12dp"
+        android:background="@drawable/bg_white_10dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar_include" />
 
-    <ImageView
-        android:id="@+id/iv_tip"
-        android:layout_marginTop="32dp"
-        app:layout_constraintRight_toRightOf="@+id/view_bg"
+    <ScrollView
+        android:id="@+id/scrollView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginBottom="20dp"
+        android:scrollbars="vertical"
+        app:layout_constraintBottom_toTopOf="@+id/view_verify_code_bg"
         app:layout_constraintLeft_toLeftOf="@+id/view_bg"
-        app:layout_constraintTop_toTopOf="@+id/view_bg"
-        android:src="@drawable/icon_exclamation_mark_tip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-    <TextView
-        android:id="@+id/tv_title"
-        android:layout_marginTop="30dp"
         app:layout_constraintRight_toRightOf="@+id/view_bg"
-        app:layout_constraintLeft_toLeftOf="@+id/view_bg"
-        app:layout_constraintTop_toBottomOf="@+id/iv_tip"
-        android:textSize="@dimen/sp_18"
-        android:textStyle="bold"
-        android:textColor="@color/color_333333"
-        tools:text="将155****4306所绑定的账号注销"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        app:layout_constraintTop_toTopOf="@+id/view_bg">
 
-    <TextView
-        android:id="@+id/tv_tip"
-        android:paddingEnd="20dp"
-        android:paddingStart="20dp"
-        android:layout_marginTop="29dp"
-        app:layout_constraintRight_toRightOf="@+id/view_bg"
-        app:layout_constraintLeft_toLeftOf="@+id/view_bg"
-        app:layout_constraintTop_toBottomOf="@+id/tv_title"
-        android:text="注销后，您在相关产品/服务留存的信息将被清空且无法找回，具体包括："
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"/>
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:paddingBottom="10dp"
+            android:layout_height="wrap_content">
 
-    <TextView
-        android:includeFontPadding="false"
-        android:id="@+id/tv_des1"
-        android:layout_marginEnd="34dp"
-        android:layout_marginStart="34dp"
-        android:layout_marginTop="16dp"
-        app:layout_constraintRight_toRightOf="@+id/view_bg"
-        app:layout_constraintLeft_toLeftOf="@+id/view_bg"
-        app:layout_constraintTop_toBottomOf="@+id/tv_tip"
-        android:text="@string/str_sign_out_account_des2"
-        android:textColor="@color/color_333333"
-        android:textSize="@dimen/sp_14"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"/>
 
-    <TextView
-        android:includeFontPadding="false"
-        android:id="@+id/tv_des2"
-        android:layout_marginEnd="34dp"
-        android:layout_marginStart="34dp"
-        android:layout_marginTop="16dp"
-        app:layout_constraintRight_toRightOf="@+id/view_bg"
-        app:layout_constraintLeft_toLeftOf="@+id/view_bg"
-        app:layout_constraintTop_toBottomOf="@+id/tv_des1"
-        android:text="@string/str_sign_out_account_des1"
-        android:textColor="@color/color_333333"
-        android:textSize="@dimen/sp_14"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"/>
+            <ImageView
+                android:id="@+id/iv_tip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="32dp"
+                android:src="@drawable/icon_exclamation_mark_tip"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:includeFontPadding="false"
-        android:id="@+id/tv_des3"
-        android:layout_marginEnd="34dp"
-        android:layout_marginStart="34dp"
-        android:layout_marginTop="16dp"
-        app:layout_constraintRight_toRightOf="@+id/view_bg"
-        app:layout_constraintLeft_toLeftOf="@+id/view_bg"
-        app:layout_constraintTop_toBottomOf="@+id/tv_des2"
-        android:text="@string/str_sign_out_account_des3"
-        android:textColor="@color/color_333333"
-        android:textSize="@dimen/sp_14"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"/>
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:textColor="@color/color_333333"
+                android:textSize="@dimen/sp_18"
+                android:includeFontPadding="false"
+                android:textStyle="bold"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/iv_tip"
+                tools:text="将155****4306所绑定的账号注销" />
 
-    <View
-        android:layout_marginStart="20dp"
-        app:layout_constraintLeft_toLeftOf="@+id/view_bg"
-        app:layout_constraintBottom_toBottomOf="@+id/tv_des1"
-        android:background="@drawable/shape_fe2451_point"
-        app:layout_constraintTop_toTopOf="@+id/tv_des1"
-        android:layout_width="6dp"
-        android:layout_height="6dp"/>
+            <TextView
+                android:includeFontPadding="false"
+                android:id="@+id/tv_tip"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="注销账号后，此账号将无法登录和使用酷乐秀相关产品。账号—旦注销完成将无法恢复，请您在注销前慎重考虑。"
+                android:textColor="@color/color_666666"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_title" />
 
-    <View
-        android:layout_marginStart="20dp"
-        app:layout_constraintLeft_toLeftOf="@+id/view_bg"
-        app:layout_constraintBottom_toBottomOf="@+id/tv_des2"
-        android:background="@drawable/shape_fe2451_point"
-        app:layout_constraintTop_toTopOf="@+id/tv_des2"
-        android:layout_width="6dp"
-        android:layout_height="6dp"/>
+            <TextView
+                android:includeFontPadding="false"
+                android:id="@+id/tv_tip2"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="账号注销将会对您产生以下影响："
+                android:textColor="@color/color_fe2451"
+                android:textStyle="bold"
+                app:layout_constraintLeft_toLeftOf="@+id/tv_tip"
+                app:layout_constraintRight_toRightOf="@+id/tv_tip"
+                app:layout_constraintTop_toBottomOf="@+id/tv_tip" />
 
-    <View
-        android:layout_marginStart="20dp"
-        app:layout_constraintLeft_toLeftOf="@+id/view_bg"
-        app:layout_constraintBottom_toBottomOf="@+id/tv_des3"
-        android:background="@drawable/shape_fe2451_point"
-        app:layout_constraintTop_toTopOf="@+id/tv_des3"
-        android:layout_width="6dp"
-        android:layout_height="6dp"/>
+            <TextView
+                android:id="@+id/tv_des1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="34dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="34dp"
+                android:includeFontPadding="false"
+                android:text="@string/str_sign_out_account_des2"
+                android:textColor="@color/color_333333"
+                android:textSize="@dimen/sp_14"
+                android:textStyle="bold"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_tip2" />
+
+            <TextView
+                android:id="@+id/tv_des2"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="34dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="34dp"
+                android:includeFontPadding="false"
+                android:text="@string/str_sign_out_account_des1"
+                android:textColor="@color/color_333333"
+                android:textSize="@dimen/sp_14"
+                android:textStyle="bold"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_des1" />
+
+            <TextView
+                android:includeFontPadding="false"
+                android:id="@+id/tv_des2_detail"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:text="@string/str_sign_out_account_des2_detail"
+                android:textColor="@color/color_333333"
+                android:textSize="@dimen/sp_13"
+                app:layout_constraintLeft_toLeftOf="@+id/tv_des2"
+                app:layout_constraintRight_toRightOf="@+id/tv_des2"
+                app:layout_constraintTop_toBottomOf="@+id/tv_des2" />
+
+            <TextView
+                android:id="@+id/tv_des3"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="34dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="34dp"
+                android:includeFontPadding="false"
+                android:text="@string/str_sign_out_account_des3"
+                android:textColor="@color/color_333333"
+                android:textSize="@dimen/sp_14"
+                android:textStyle="bold"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_des2_detail" />
+
+            <View
+                android:layout_width="6dp"
+                android:layout_height="6dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="7dp"
+                android:background="@drawable/shape_fe2451_point"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/tv_des1" />
+
+            <View
+                android:layout_width="6dp"
+                android:layout_height="6dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="7dp"
+                android:background="@drawable/shape_fe2451_point"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/tv_des2" />
+
+            <View
+                android:layout_width="6dp"
+                android:layout_height="6dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="7dp"
+                android:background="@drawable/shape_fe2451_point"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/tv_des3" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
 
     <View
         android:id="@+id/view_verify_code_bg"
-        android:layout_marginEnd="12dp"
-        android:layout_marginTop="32dp"
+        android:layout_width="0dp"
+        android:layout_height="54dp"
         android:layout_marginStart="12dp"
-        app:layout_constraintRight_toRightOf="@+id/view_bg"
-        app:layout_constraintLeft_toLeftOf="@+id/view_bg"
-        app:layout_constraintTop_toBottomOf="@+id/tv_des3"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="23dp"
         android:background="@drawable/shape_6dp_border_eaeaea_1dp"
-        android:layout_width="0dp"
-        android:layout_height="54dp"/>
+        app:layout_constraintBottom_toTopOf="@+id/tv_confirm"
+        app:layout_constraintLeft_toLeftOf="@+id/view_bg"
+        app:layout_constraintRight_toRightOf="@+id/view_bg" />
 
 
     <TextView
         android:id="@+id/tv_send_verify_code"
-        app:layout_constraintRight_toRightOf="@+id/view_verify_code_bg"
-        app:layout_constraintBottom_toBottomOf="@+id/view_verify_code_bg"
-        app:layout_constraintTop_toTopOf="@+id/view_verify_code_bg"
+        android:layout_width="94dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="获取验证码"
         android:textColor="@color/color_ff2dc7aa"
         android:textSize="@dimen/sp_14"
-        android:text="获取验证码"
-        android:gravity="center"
-        android:layout_width="94dp"
-        android:layout_height="wrap_content"/>
-    
+        app:layout_constraintBottom_toBottomOf="@+id/view_verify_code_bg"
+        app:layout_constraintRight_toRightOf="@+id/view_verify_code_bg"
+        app:layout_constraintTop_toTopOf="@+id/view_verify_code_bg" />
+
     <View
         android:id="@+id/view_line"
-        app:layout_constraintRight_toLeftOf="@+id/tv_send_verify_code"
-        app:layout_constraintBottom_toBottomOf="@+id/tv_send_verify_code"
-        app:layout_constraintTop_toTopOf="@+id/tv_send_verify_code"
-        android:background="@color/color_ff2dc7aa"
         android:layout_width="1dp"
-        android:layout_height="18dp"/>
+        android:layout_height="18dp"
+        android:background="@color/color_ff2dc7aa"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_send_verify_code"
+        app:layout_constraintRight_toLeftOf="@+id/tv_send_verify_code"
+        app:layout_constraintTop_toTopOf="@+id/tv_send_verify_code" />
 
     <EditText
         android:id="@+id/et_num"
-        android:maxLines="1"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@color/transparent"
+        android:hint="请输入短信验证码"
         android:inputType="number"
         android:maxLength="6"
+        android:maxLines="1"
         android:paddingStart="12dp"
-        android:hint="请输入短信验证码"
-        android:textColorHint="@color/color_999999"
         android:textColor="@color/color_333333"
+        android:textColorHint="@color/color_999999"
         android:textSize="@dimen/sp_16"
-        android:background="@color/transparent"
-        app:layout_constraintRight_toLeftOf="@+id/view_line"
-        app:layout_constraintLeft_toLeftOf="@+id/view_verify_code_bg"
         app:layout_constraintBottom_toBottomOf="@+id/view_verify_code_bg"
-        app:layout_constraintTop_toTopOf="@+id/view_verify_code_bg"
-        android:layout_width="0dp"
-        android:layout_height="0dp"/>
-    
+        app:layout_constraintLeft_toLeftOf="@+id/view_verify_code_bg"
+        app:layout_constraintRight_toLeftOf="@+id/view_line"
+        app:layout_constraintTop_toTopOf="@+id/view_verify_code_bg" />
+
     <TextView
         android:id="@+id/tv_confirm"
-        android:layout_marginEnd="25dp"
+        android:layout_width="match_parent"
+        android:layout_height="44dp"
         android:layout_marginStart="25dp"
+        android:layout_marginEnd="25dp"
+        android:layout_marginBottom="23dp"
         android:background="@drawable/shape_login_bt_bg"
-        android:layout_marginBottom="56dp"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:textColor="@color/white"
         android:gravity="center"
-        android:textSize="@dimen/sp_18"
         android:text="注销账号"
-        android:layout_width="match_parent"
-        android:layout_height="44dp"/>
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_18"
+        app:layout_constraintBottom_toBottomOf="@+id/view_bg"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

usercenter/src/main/res/values/strings.xml

@@ -22,7 +22,8 @@
     <string name="login_privacy_tip2">《隐私政策》</string>
     <string name="nickname_fill_str">游客%1$s</string>
 
-    <string name="str_sign_out_account_des1">各产品/服务及权益信息</string>
-    <string name="str_sign_out_account_des3">您在使用各产品/服务时留存的其他信息</string>
-    <string name="str_sign_out_account_des2">个人资料，实名认证等身份信息</string>
+    <string name="str_sign_out_account_des1">2、注销后，您在相关产品/服务留存的信息将被清空且无法找回，具体包括:</string>
+    <string name="str_sign_out_account_des3">3、账号一旦注销完成，将无法恢复；您与我们曾签署过的相关用户协议、授权协议等相应终止。</string>
+    <string name="str_sign_out_account_des2">1、您将无法再以此账号登录/使用酷乐秀APP的相关服务。</string>
+    <string name="str_sign_out_account_des2_detail">( 1 ) 该账号下的所有内容、信息、数据、记录、个人资料（例如:头像、昵称等）及绑定信息（例如:绑定手机号等)；\n( 2 ) 该账号权益信息将被清除（例如:会员时长、购买单曲、专辑信息)。</string>
 </resources>