1.修改dialog布局中部分button的圆角保持一致。

app/src/main/res/layout/layout_changecode_dialog.xml

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="355dp"
     android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/shape_whiteradiu_bg"
     android:gravity="center_horizontal"
     android:minHeight="333dp"
@@ -175,16 +176,28 @@
                     android:textColor="#339DFF"
                     android:textSize="17sp" />
 
-                <TextView
-                    android:id="@+id/dialog_enter_tv"
+                <FrameLayout
                     android:layout_width="147dp"
                     android:layout_height="40dp"
-                    android:layout_marginLeft="17dp"
-                    android:background="@drawable/icon_login"
-                    android:gravity="center"
-                    android:text="@string/enter"
-                    android:textColor="@color/white"
-                    android:textSize="17sp" />
+                    android:layout_marginLeft="17dp">
+
+                    <com.makeramen.roundedimageview.RoundedImageView
+                        android:layout_width="147dp"
+                        android:layout_height="40dp"
+                        android:gravity="center"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/icon_login"
+                        app:riv_corner_radius="10dp" />
+
+                    <TextView
+                        android:id="@+id/dialog_enter_tv"
+                        android:layout_width="147dp"
+                        android:layout_height="40dp"
+                        android:gravity="center"
+                        android:text="@string/enter"
+                        android:textColor="@color/white"
+                        android:textSize="17sp" />
+                </FrameLayout>
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>

app/src/main/res/layout/layout_edit_dialog.xml

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="353dp"
     android:layout_height="185dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:gravity="center_horizontal"
     android:background="@drawable/shape_whiteradiu_bg"
     android:orientation="vertical">
@@ -55,15 +56,27 @@
             android:textColor="#339DFF"
             android:textSize="17sp" />
 
-        <TextView
-            android:id="@+id/dialog_enter_tv"
+        <FrameLayout
             android:layout_width="147dp"
             android:layout_height="40dp"
-            android:layout_marginLeft="17dp"
-            android:background="@drawable/icon_login"
-            android:gravity="center"
-            android:text="@string/enter"
-            android:textColor="@color/white"
-            android:textSize="17sp" />
+            android:layout_marginLeft="17dp">
+
+            <com.makeramen.roundedimageview.RoundedImageView
+                android:layout_width="147dp"
+                android:layout_height="40dp"
+                android:gravity="center"
+                android:scaleType="centerCrop"
+                android:src="@drawable/icon_login"
+                app:riv_corner_radius="10dp" />
+
+            <TextView
+                android:id="@+id/dialog_enter_tv"
+                android:layout_width="147dp"
+                android:layout_height="40dp"
+                android:gravity="center"
+                android:text="@string/enter"
+                android:textColor="@color/white"
+                android:textSize="17sp" />
+        </FrameLayout>
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/layout_twobtn_dialog.xml

@@ -55,7 +55,6 @@
                 android:gravity="center"
                 android:scaleType="centerCrop"
                 android:src="@drawable/icon_login"
-
                 app:riv_corner_radius="10dp" />
 
             <TextView