Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

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

@@ -95,14 +95,16 @@
 
                         <TextView
                             android:id="@+id/tv_myb_number"
-                            android:layout_width="155dp"
+                            android:layout_width="wrap_content"
+                            android:minWidth="155dp"
                             android:layout_height="wrap_content"
                             android:textColor="@color/black_444444"
                             android:textSize="@dimen/text_size_3" />
 
                         <TextView
                             android:id="@+id/tv_myb_recharge"
-                            android:layout_width="60dp"
+                            android:layout_width="wrap_content"
+                            android:minWidth="60dp"
                             android:layout_height="wrap_content"
                             android:clickable="true"
                             android:gravity="center_horizontal"