diff --git a/app/src/main/java/com/qhclh/ytzh/index/planorder/OrderActivity.java b/app/src/main/java/com/qhclh/ytzh/index/planorder/OrderActivity.java index 5614988..53d7c83 100644 --- a/app/src/main/java/com/qhclh/ytzh/index/planorder/OrderActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/index/planorder/OrderActivity.java @@ -59,5 +59,6 @@ public class OrderActivity extends BaseActivity { @OnClick({R.id.order_sendcar}) public void onClick(View v){ startActivity(new Intent(this,CarsActivity.class)); + finish(); } } diff --git a/app/src/main/res/layout/act_order.xml b/app/src/main/res/layout/act_order.xml index ba7ac56..400166a 100644 --- a/app/src/main/res/layout/act_order.xml +++ b/app/src/main/res/layout/act_order.xml @@ -21,7 +21,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_20" - android:layout_marginTop="@dimen/dp_20" + android:layout_marginTop="@dimen/dp_25" android:background="@color/white"> + android:textSize="@dimen/text_size_18" /> + android:textSize="@dimen/text_size_18" /> + android:textSize="@dimen/text_size_18" /> + android:textSize="@dimen/text_size_18" /> + android:textSize="@dimen/text_size_18" /> + android:textSize="@dimen/text_size_18" /> + android:textSize="@dimen/text_size_18" /> + android:textSize="@dimen/text_size_18" /> + android:textSize="@dimen/text_size_18" /> + android:textSize="@dimen/text_size_18" /> diff --git a/app/src/main/res/layout/act_order1.xml b/app/src/main/res/layout/act_order1.xml index ebef187..e784e1b 100644 --- a/app/src/main/res/layout/act_order1.xml +++ b/app/src/main/res/layout/act_order1.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:text="@string/date" android:textColor="@color/grey888888" - android:textSize="@dimen/text_size_20" /> + android:textSize="@dimen/text_size_18" /> + android:textSize="@dimen/text_size_18" /> @@ -53,7 +53,7 @@ android:layout_height="wrap_content" android:text="@string/supplier" android:textColor="@color/grey888888" - android:textSize="@dimen/text_size_20" /> + android:textSize="@dimen/text_size_18" /> + android:textSize="@dimen/text_size_18" /> @@ -77,7 +77,7 @@ android:layout_height="wrap_content" android:text="@string/variety" android:textColor="@color/grey888888" - android:textSize="@dimen/text_size_20" /> + android:textSize="@dimen/text_size_18" /> + android:textSize="@dimen/text_size_18" /> @@ -101,7 +101,7 @@ android:layout_height="wrap_content" android:text="@string/driver" android:textColor="@color/grey888888" - android:textSize="@dimen/text_size_20" /> + android:textSize="@dimen/text_size_18" /> + android:textSize="@dimen/text_size_18" /> @@ -125,7 +125,7 @@ android:layout_height="wrap_content" android:text="@string/number" android:textColor="@color/grey888888" - android:textSize="@dimen/text_size_20" /> + android:textSize="@dimen/text_size_18" /> + android:textSize="@dimen/text_size_18" />