From b964a4e7768123fc40ceed3f0375bf58e6ac075e Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Wed, 29 Nov 2017 15:36:02 +0800
Subject: [PATCH] no message

---
 .../ytzh/index/planorder/OrderActivity.java   |  1 +
 app/src/main/res/layout/act_order.xml         | 30 +++++++++----------
 app/src/main/res/layout/act_order1.xml        | 20 ++++++-------
 3 files changed, 26 insertions(+), 25 deletions(-)

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">
 
             <TextView
@@ -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" />
 
             <TextView
                 android:id="@+id/order_date"
@@ -37,14 +37,14 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_20" />
+                android:textSize="@dimen/text_size_18" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_20"
-            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginTop="@dimen/dp_15"
             android:background="@color/white">
 
             <TextView
@@ -52,7 +52,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" />
 
             <TextView
                 android:id="@+id/order_supplier"
@@ -60,14 +60,14 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_20" />
+                android:textSize="@dimen/text_size_18" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_20"
-            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginTop="@dimen/dp_15"
             android:background="@color/white">
 
             <TextView
@@ -75,7 +75,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" />
 
             <TextView
                 android:id="@+id/order_variety"
@@ -83,14 +83,14 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_20" />
+                android:textSize="@dimen/text_size_18" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_20"
-            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginTop="@dimen/dp_15"
             android:background="@color/white">
 
             <TextView
@@ -98,7 +98,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" />
 
             <TextView
                 android:id="@+id/driver"
@@ -106,14 +106,14 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_20" />
+                android:textSize="@dimen/text_size_18" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_20"
-            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginTop="@dimen/dp_15"
             android:background="@color/white">
 
             <TextView
@@ -121,7 +121,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" />
 
             <TextView
                 android:id="@+id/order_number"
@@ -129,7 +129,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_20" />
+                android:textSize="@dimen/text_size_18" />
         </LinearLayout>
 
 
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" />
 
             <TextView
                 android:id="@+id/order1_date"
@@ -37,7 +37,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_20" />
+                android:textSize="@dimen/text_size_18" />
         </LinearLayout>
 
         <include layout="@layout/include_line" />
@@ -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" />
 
             <TextView
                 android:id="@+id/order1_supplier"
@@ -61,7 +61,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_20" />
+                android:textSize="@dimen/text_size_18" />
         </LinearLayout>
 
         <include layout="@layout/include_line" />
@@ -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" />
 
             <TextView
                 android:id="@+id/order1_variety"
@@ -85,7 +85,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_20" />
+                android:textSize="@dimen/text_size_18" />
         </LinearLayout>
 
         <include layout="@layout/include_line" />
@@ -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" />
 
             <TextView
                 android:id="@+id/driver1"
@@ -109,7 +109,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_20" />
+                android:textSize="@dimen/text_size_18" />
         </LinearLayout>
 
         <include layout="@layout/include_line" />
@@ -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" />
 
             <TextView
                 android:id="@+id/order1_number"
@@ -133,7 +133,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_20" />
+                android:textSize="@dimen/text_size_18" />
         </LinearLayout>
 
         <include layout="@layout/include_line" />