feat:手机号\登陆注册页面

m-user/src/main/res/layout/user_activity_register_and_login_bottom.xml

@@ -83,6 +83,8 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/platform_dp_4"
             android:textSize="12sp"
+            android:id="@+id/tv_protocol"
+            android:textColor="@color/platform_color_999999"
             android:text="同意壹点灵用户注册协议" />
     </LinearLayout>
 </merge>
\ No newline at end of file

m-user/src/main/res/layout/user_activity_register_and_login_new.xml

@@ -10,11 +10,50 @@
         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:layout_marginTop="@dimen/platform_dp_30"
         android:src="@drawable/user_ic_back_black"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+    <LinearLayout
+        android:id="@+id/ll_success"
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:background="#fff"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp">
+
+            <ImageView
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:src="@drawable/user_ic_log_succee" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6dp"
+                android:text="登录成功!"
+                android:textColor="#32D296"
+                android:textSize="13dp"
+                android:textStyle="bold" />
+        </LinearLayout>
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="35dp"
+            android:text="您已通过阿里云号码认证服务，一键登录更安全。"
+            android:textColor="#666666"
+            android:textSize="13dp" />
+    </LinearLayout>
     <TextView
         android:id="@+id/tv_login_title"
         android:layout_width="wrap_content"
@@ -41,7 +80,7 @@
 
     <com.ydl.ydlcommon.view.PhoneEditText
         android:id="@+id/et_phone_number"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginLeft="@dimen/platform_dp_24"
@@ -52,10 +91,12 @@
         android:inputType="phone"
         android:lines="1"
         android:maxLength="13"
+        android:textColor="@color/platform_color_242424"
         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_constraintStart_toEndOf="@id/country_code"
+        app:layout_constraintEnd_toStartOf="@id/iv_del"
         app:layout_constraintTop_toTopOf="@id/country_code" />
 
     <View
@@ -69,7 +110,20 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/country_code" />
+    <ImageView
+        android:id="@+id/iv_del"
+        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:visibility="gone"
+        app:layout_constraintEnd_toEndOf="@id/view_lin"
+       app:layout_constraintTop_toTopOf="@id/et_phone_number"
+        app:layout_constraintBottom_toBottomOf="@id/et_phone_number"
 
+        />
     <TextView
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -85,6 +139,7 @@
         android:paddingTop="@dimen/platform_dp_13"
         android:paddingBottom="@dimen/platform_dp_13"
         android:textSize="15sp"
+        android:id="@+id/ll_next"
         android:textColor="@color/white"
         />
     <include layout="@layout/user_activity_register_and_login_bottom" />