From bbd93bc92af0bc30444ab487dff3397c1fb1f737 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Wed, 29 Nov 2017 10:46:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ytzh/work/scan/ScanResultActivity.java    |  2 --
 app/src/main/res/layout/act_order.xml         | 34 +++++++++----------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/qhclh/ytzh/work/scan/ScanResultActivity.java b/app/src/main/java/com/qhclh/ytzh/work/scan/ScanResultActivity.java
index 3779f42..4718422 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/scan/ScanResultActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/scan/ScanResultActivity.java
@@ -88,10 +88,8 @@ public class ScanResultActivity extends BaseActivity {
         IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
         if (result != null) {
             if (result.getContents() == null) {
-                showToast("扫码取消！");
                 finish();
             } else {
-                showToast("扫描成功");
                 scanStr = result.getContents();
             }
         } else {
diff --git a/app/src/main/res/layout/act_order.xml b/app/src/main/res/layout/act_order.xml
index bed2701..ba7ac56 100644
--- a/app/src/main/res/layout/act_order.xml
+++ b/app/src/main/res/layout/act_order.xml
@@ -11,8 +11,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="@dimen/dp_120"
-        android:layout_marginLeft="@dimen/dp_60"
-        android:layout_marginRight="@dimen/dp_60"
+        android:layout_marginLeft="@dimen/dp_50"
+        android:layout_marginRight="@dimen/dp_50"
         android:layout_marginTop="@dimen/dp_60"
         android:background="@drawable/bg_shadow"
         android:orientation="vertical">
@@ -29,15 +29,15 @@
                 android:layout_height="wrap_content"
                 android:text="@string/date"
                 android:textColor="@color/grey888888"
-                android:textSize="@dimen/text_size_22" />
+                android:textSize="@dimen/text_size_20" />
 
             <TextView
+                android:id="@+id/order_date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
-                android:text="@string/app_name"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_22" />
+                android:textSize="@dimen/text_size_20" />
         </LinearLayout>
 
         <LinearLayout
@@ -52,15 +52,15 @@
                 android:layout_height="wrap_content"
                 android:text="@string/supplier"
                 android:textColor="@color/grey888888"
-                android:textSize="@dimen/text_size_22" />
+                android:textSize="@dimen/text_size_20" />
 
             <TextView
+                android:id="@+id/order_supplier"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
-                android:text="@string/app_name"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_22" />
+                android:textSize="@dimen/text_size_20" />
         </LinearLayout>
 
         <LinearLayout
@@ -75,15 +75,15 @@
                 android:layout_height="wrap_content"
                 android:text="@string/variety"
                 android:textColor="@color/grey888888"
-                android:textSize="@dimen/text_size_22" />
+                android:textSize="@dimen/text_size_20" />
 
             <TextView
+                android:id="@+id/order_variety"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
-                android:text="@string/app_name"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_22" />
+                android:textSize="@dimen/text_size_20" />
         </LinearLayout>
 
         <LinearLayout
@@ -98,15 +98,15 @@
                 android:layout_height="wrap_content"
                 android:text="@string/driver"
                 android:textColor="@color/grey888888"
-                android:textSize="@dimen/text_size_22" />
+                android:textSize="@dimen/text_size_20" />
 
             <TextView
+                android:id="@+id/driver"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
-                android:text="@string/app_name"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_22" />
+                android:textSize="@dimen/text_size_20" />
         </LinearLayout>
 
         <LinearLayout
@@ -121,15 +121,15 @@
                 android:layout_height="wrap_content"
                 android:text="@string/number"
                 android:textColor="@color/grey888888"
-                android:textSize="@dimen/text_size_22" />
+                android:textSize="@dimen/text_size_20" />
 
             <TextView
+                android:id="@+id/order_number"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_5"
-                android:text="@string/app_name"
                 android:textColor="@color/black303030"
-                android:textSize="@dimen/text_size_22" />
+                android:textSize="@dimen/text_size_20" />
         </LinearLayout>