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

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

@@ -6,7 +6,7 @@
     <LinearLayout
         android:id="@+id/l_layout"
         android:layout_width="match_parent"
-        android:layout_height="150dp"
+        android:layout_height="180dp"
         android:layout_marginStart="25dp"
         android:layout_marginEnd="25dp"
         android:layout_centerInParent="true"
@@ -40,7 +40,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="15dp"
+            android:layout_marginTop="35dp"
             android:background="@drawable/shape_get_redpackage_text_yellow"
             android:gravity="center"
             android:text="领取红包"