BWPB3
/
ytzh_Android_ZhongHui
9
0
Fork 0
Code Issues 0 Pull Requests 0 Activity
Browse Source

no message

master
lh 8 years ago
parent
ccadcf8145
commit
62e0e96c2f
5 changed files with 86 additions and 32 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -2
      app/src/main/java/com/qhclh/ytzh/index/planorder/OrderActivity.java
  2. +4
    -2
      app/src/main/java/com/qhclh/ytzh/index/planorder/OrderOActivity.java
  3. +36
    -12
      app/src/main/res/layout/act_order.xml
  4. +40
    -16
      app/src/main/res/layout/act_order1.xml
  5. +2
    -0
      app/src/main/res/values/strings.xml

+ 4
- 2
app/src/main/java/com/qhclh/ytzh/index/planorder/OrderActivity.java View File

@ -21,8 +21,10 @@ public class OrderActivity extends BaseActivity {
Toolbar mToolbar; Toolbar mToolbar;
@BindView(R.id.order_sendcar) @BindView(R.id.order_sendcar)
Button 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) @BindView(R.id.order_supplier)
TextView order_supplier; TextView order_supplier;
@BindView(R.id.order_variety) @BindView(R.id.order_variety)


+ 4
- 2
app/src/main/java/com/qhclh/ytzh/index/planorder/OrderOActivity.java View File

@ -17,8 +17,10 @@ import butterknife.BindView;
public class OrderOActivity extends BaseActivity { public class OrderOActivity extends BaseActivity {
@BindView(R.id.toolbar) @BindView(R.id.toolbar)
Toolbar mToolbar; 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) @BindView(R.id.order1_supplier)
TextView order1_supplier; TextView order1_supplier;
@BindView(R.id.order1_variety) @BindView(R.id.order1_variety)


+ 36
- 12
app/src/main/res/layout/act_order.xml View File

@ -27,17 +27,41 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/date"
android:text="@string/outtime"
android:textColor="@color/grey888888" android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView <TextView
android:id="@+id/order_date"
android:id="@+id/order_outtime"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5" android:layout_marginLeft="@dimen/dp_5"
android:textColor="@color/black303030" 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>
<LinearLayout <LinearLayout
@ -52,7 +76,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/supplier" android:text="@string/supplier"
android:textColor="@color/grey888888" android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView <TextView
android:id="@+id/order_supplier" android:id="@+id/order_supplier"
@ -60,7 +84,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5" android:layout_marginLeft="@dimen/dp_5"
android:textColor="@color/black303030" android:textColor="@color/black303030"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -75,7 +99,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/variety" android:text="@string/variety"
android:textColor="@color/grey888888" android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView <TextView
android:id="@+id/order_variety" android:id="@+id/order_variety"
@ -83,7 +107,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5" android:layout_marginLeft="@dimen/dp_5"
android:textColor="@color/black303030" android:textColor="@color/black303030"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -98,7 +122,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/driver" android:text="@string/driver"
android:textColor="@color/grey888888" android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView <TextView
android:id="@+id/driver" android:id="@+id/driver"
@ -106,7 +130,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5" android:layout_marginLeft="@dimen/dp_5"
android:textColor="@color/black303030" android:textColor="@color/black303030"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -121,7 +145,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/number" android:text="@string/number"
android:textColor="@color/grey888888" android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView <TextView
android:id="@+id/order_number" android:id="@+id/order_number"
@ -129,7 +153,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5" android:layout_marginLeft="@dimen/dp_5"
android:textColor="@color/black303030" android:textColor="@color/black303030"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
</LinearLayout> </LinearLayout>


+ 40
- 16
app/src/main/res/layout/act_order1.xml View File

@ -27,17 +27,17 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/date"
android:text="@string/outtime"
android:textColor="@color/grey888888" android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView <TextView
android:id="@+id/order1_date"
android:id="@+id/order1_outtime"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5" android:layout_marginLeft="@dimen/dp_5"
android:textColor="@color/black303030" android:textColor="@color/black303030"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
</LinearLayout> </LinearLayout>
<include layout="@layout/include_line" /> <include layout="@layout/include_line" />
@ -45,7 +45,31 @@
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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"> android:background="@color/white">
<TextView <TextView
@ -53,7 +77,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/supplier" android:text="@string/supplier"
android:textColor="@color/grey888888" android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView <TextView
android:id="@+id/order1_supplier" android:id="@+id/order1_supplier"
@ -61,7 +85,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5" android:layout_marginLeft="@dimen/dp_5"
android:textColor="@color/black303030" android:textColor="@color/black303030"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
</LinearLayout> </LinearLayout>
<include layout="@layout/include_line" /> <include layout="@layout/include_line" />
@ -69,7 +93,7 @@
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_20"
android:background="@color/white"> android:background="@color/white">
<TextView <TextView
@ -77,7 +101,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/variety" android:text="@string/variety"
android:textColor="@color/grey888888" android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView <TextView
android:id="@+id/order1_variety" android:id="@+id/order1_variety"
@ -85,7 +109,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5" android:layout_marginLeft="@dimen/dp_5"
android:textColor="@color/black303030" android:textColor="@color/black303030"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
</LinearLayout> </LinearLayout>
<include layout="@layout/include_line" /> <include layout="@layout/include_line" />
@ -93,7 +117,7 @@
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_20"
android:background="@color/white"> android:background="@color/white">
<TextView <TextView
@ -101,7 +125,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/driver" android:text="@string/driver"
android:textColor="@color/grey888888" android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView <TextView
android:id="@+id/driver1" android:id="@+id/driver1"
@ -109,7 +133,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5" android:layout_marginLeft="@dimen/dp_5"
android:textColor="@color/black303030" android:textColor="@color/black303030"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
</LinearLayout> </LinearLayout>
<include layout="@layout/include_line" /> <include layout="@layout/include_line" />
@ -117,7 +141,7 @@
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_20"
android:background="@color/white"> android:background="@color/white">
<TextView <TextView
@ -125,7 +149,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/number" android:text="@string/number"
android:textColor="@color/grey888888" android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView <TextView
android:id="@+id/order1_number" android:id="@+id/order1_number"
@ -133,7 +157,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5" android:layout_marginLeft="@dimen/dp_5"
android:textColor="@color/black303030" android:textColor="@color/black303030"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
</LinearLayout> </LinearLayout>
<include layout="@layout/include_line" /> <include layout="@layout/include_line" />


+ 2
- 0
app/src/main/res/values/strings.xml View File

@ -75,5 +75,7 @@
<string name="eliminatee">淘汰</string> <string name="eliminatee">淘汰</string>
<string name="water">饮水:</string> <string name="water">饮水:</string>
<string name="plachose">请选择</string> <string name="plachose">请选择</string>
<string name="outtime">出厂时间:</string>
<string name="intime">到厂时间:</string>
</resources> </resources>

Write Preview
Loading…
Cancel
Save