From 62e0e96c2fc13e4c75a9a3ac0a777b69c9c56ebf Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Mon, 11 Dec 2017 09:27:16 +0800
Subject: [PATCH] no message

---
 .../ytzh/index/planorder/OrderActivity.java   |  6 +-
 .../ytzh/index/planorder/OrderOActivity.java  |  6 +-
 app/src/main/res/layout/act_order.xml         | 48 ++++++++++++----
 app/src/main/res/layout/act_order1.xml        | 56 +++++++++++++------
 app/src/main/res/values/strings.xml           |  2 +
 5 files changed, 86 insertions(+), 32 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 e469f30..0c7ffa5 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
@@ -21,8 +21,10 @@ public class OrderActivity extends BaseActivity {
     Toolbar mToolbar;
     @BindView(R.id.order_sendcar)
     Button order_sendcar;
-    @BindView(R.id.order_date)
-    TextView order_date;
+    @BindView(R.id.order_outtime)
+    TextView order_outtime;
+    @BindView(R.id.order_intime)
+    TextView order_intime;
     @BindView(R.id.order_supplier)
     TextView order_supplier;
     @BindView(R.id.order_variety)
diff --git a/app/src/main/java/com/qhclh/ytzh/index/planorder/OrderOActivity.java b/app/src/main/java/com/qhclh/ytzh/index/planorder/OrderOActivity.java
index 3534fc1..de24058 100644
--- a/app/src/main/java/com/qhclh/ytzh/index/planorder/OrderOActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/index/planorder/OrderOActivity.java
@@ -17,8 +17,10 @@ import butterknife.BindView;
 public class OrderOActivity extends BaseActivity {
     @BindView(R.id.toolbar)
     Toolbar mToolbar;
-    @BindView(R.id.order1_date)
-    TextView order1_date;
+    @BindView(R.id.order1_outtime)
+    TextView order1_outtime;
+    @BindView(R.id.order1_intime)
+    TextView order1_intime;
     @BindView(R.id.order1_supplier)
     TextView order1_supplier;
     @BindView(R.id.order1_variety)
diff --git a/app/src/main/res/layout/act_order.xml b/app/src/main/res/layout/act_order.xml
index 3912d13..a5605e1 100644
--- a/app/src/main/res/layout/act_order.xml
+++ b/app/src/main/res/layout/act_order.xml
@@ -27,17 +27,41 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/date"
+                android:text="@string/outtime"
                 android:textColor="@color/grey888888"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
 
             <TextView
-                android:id="@+id/order_date"
+                android:id="@+id/order_outtime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_20"
+            android:layout_marginTop="@dimen/dp_15"
+            android:background="@color/white">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/intime"
+                android:textColor="@color/grey888888"
+                android:textSize="@dimen/text_size_16" />
+
+            <TextView
+                android:id="@+id/order_intime"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_5"
+                android:textColor="@color/black303030"
+                android:textSize="@dimen/text_size_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -52,7 +76,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/supplier"
                 android:textColor="@color/grey888888"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
 
             <TextView
                 android:id="@+id/order_supplier"
@@ -60,7 +84,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -75,7 +99,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/variety"
                 android:textColor="@color/grey888888"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
 
             <TextView
                 android:id="@+id/order_variety"
@@ -83,7 +107,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -98,7 +122,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/driver"
                 android:textColor="@color/grey888888"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
 
             <TextView
                 android:id="@+id/driver"
@@ -106,7 +130,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -121,7 +145,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/number"
                 android:textColor="@color/grey888888"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
 
             <TextView
                 android:id="@+id/order_number"
@@ -129,7 +153,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
         </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/act_order1.xml b/app/src/main/res/layout/act_order1.xml
index e784e1b..dc50ea0 100644
--- a/app/src/main/res/layout/act_order1.xml
+++ b/app/src/main/res/layout/act_order1.xml
@@ -27,17 +27,17 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/date"
+                android:text="@string/outtime"
                 android:textColor="@color/grey888888"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
 
             <TextView
-                android:id="@+id/order1_date"
+                android:id="@+id/order1_outtime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
         </LinearLayout>
 
         <include layout="@layout/include_line" />
@@ -45,7 +45,31 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_30"
+            android:layout_marginTop="@dimen/dp_20"
+            android:background="@color/white">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/intime"
+                android:textColor="@color/grey888888"
+                android:textSize="@dimen/text_size_16" />
+
+            <TextView
+                android:id="@+id/order1_intime"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_5"
+                android:textColor="@color/black303030"
+                android:textSize="@dimen/text_size_16" />
+        </LinearLayout>
+
+        <include layout="@layout/include_line" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_20"
             android:background="@color/white">
 
             <TextView
@@ -53,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/supplier"
                 android:textColor="@color/grey888888"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
 
             <TextView
                 android:id="@+id/order1_supplier"
@@ -61,7 +85,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
         </LinearLayout>
 
         <include layout="@layout/include_line" />
@@ -69,7 +93,7 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_30"
+            android:layout_marginTop="@dimen/dp_20"
             android:background="@color/white">
 
             <TextView
@@ -77,7 +101,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/variety"
                 android:textColor="@color/grey888888"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
 
             <TextView
                 android:id="@+id/order1_variety"
@@ -85,7 +109,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
         </LinearLayout>
 
         <include layout="@layout/include_line" />
@@ -93,7 +117,7 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_30"
+            android:layout_marginTop="@dimen/dp_20"
             android:background="@color/white">
 
             <TextView
@@ -101,7 +125,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/driver"
                 android:textColor="@color/grey888888"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
 
             <TextView
                 android:id="@+id/driver1"
@@ -109,7 +133,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
         </LinearLayout>
 
         <include layout="@layout/include_line" />
@@ -117,7 +141,7 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_30"
+            android:layout_marginTop="@dimen/dp_20"
             android:background="@color/white">
 
             <TextView
@@ -125,7 +149,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/number"
                 android:textColor="@color/grey888888"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
 
             <TextView
                 android:id="@+id/order1_number"
@@ -133,7 +157,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_18" />
+                android:textSize="@dimen/text_size_16" />
         </LinearLayout>
 
         <include layout="@layout/include_line" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 34526b0..4ca288d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -75,5 +75,7 @@
     <string name="eliminatee">淘汰</string>
     <string name="water">饮水:</string>
     <string name="plachose">请选择</string>
+    <string name="outtime">出厂时间:</string>
+    <string name="intime">到厂时间:</string>
 
 </resources>