11

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

@@ -40,6 +40,7 @@
                 android:layout_height="350dp"
                 android:layout_alignParentBottom="true"
                 android:layout_centerHorizontal="true"
+                android:layout_marginTop="@dimen/dp_10"
                 android:layout_marginBottom="20dp"
                 android:background="@mipmap/icon_content_bg">
 

userinfo/src/main/res/layout/activity_setting.xml

@@ -17,28 +17,29 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="26dp"
             android:src="@drawable/icon_back_red" />
+
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_marginTop="-20dp"
+            android:layout_height="wrap_content"
             android:layout_below="@+id/id_iv_back"
-            android:layout_height="wrap_content">
+            android:layout_marginTop="-35dp">
 
-<!--            android:background="@drawable/icon_rl_content"-->
+            <!--            android:background="@drawable/icon_rl_content"-->
 
 
             <ImageView
-                android:background="@drawable/icon_rl_content"
-                android:adjustViewBounds="true"
-                android:layout_marginBottom="20dp"
-                android:layout_marginTop="20dp"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"/>
+                android:layout_height="match_parent"
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="20dp"
+                android:adjustViewBounds="true"
+                android:background="@drawable/icon_rl_content" />
 
             <androidx.core.widget.NestedScrollView
-            android:paddingBottom="40dp"
-            android:paddingTop="40dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:paddingTop="40dp"
+                android:paddingBottom="40dp"
 
                 >