Merge remote-tracking branch 'origin/develop_cache' into develop_cache

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

@@ -150,10 +150,10 @@
 
             <ImageView
                 android:id="@+id/lv_get_drop_close"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
                 android:layout_alignParentRight="true"
-                android:paddingRight="20dp"
+                android:layout_marginRight="@dimen/dp_30"
                 android:src="@mipmap/icon_main_popup_close" />
         </RelativeLayout>