konghe пре 1 година
родитељ
комит
1d5a3cce92

+ 5 - 4
res/layout/finished_product_handover_head_view.xml

@@ -3,10 +3,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
+
      <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal" >
+         android:layout_width="fill_parent"
+         android:layout_height="1dp"
+         android:orientation="horizontal" >
 
                     <com.jiaju.widget.JustifyTextView
                         android:id="@+id/orderTitle"
@@ -14,7 +15,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
                         android:layout_marginTop="10dp"
-                        android:text="生产订单"
+                        android:text="1生产订单"
                         android:textColor="@color/white"
                         android:textSize="@dimen/textsize_16" />
 

+ 20 - 20
src/com/jiaju/activity/FinishedProductHandOverActivity.java

@@ -100,7 +100,7 @@ public class FinishedProductHandOverActivity extends Activity {
 		setContentView(R.layout.activity_finished_product_handover);
 		initView();
 		statisticsTv.setVisibility(View.VISIBLE);
-		statisticsTv.setText("统计");
+		//statisticsTv.setText("统计");
 		preferences = getSharedPreferences("user", Context.MODE_PRIVATE);
 		ServerAddress_ip = preferences.getString("ServerAddress_ip", "");
 		ServerAddress_port = preferences.getString("ServerAddress_duankou", "");
@@ -111,16 +111,16 @@ public class FinishedProductHandOverActivity extends Activity {
 		Bundle b = getIntent().getExtras();
 		String title = b.getString("title");
 		tvTitle.setText(title);
-		orderEdt.setFocusable(true);
-		orderEdt.requestFocus();
-		orderEdt.findFocus();
+		barcodeEdt.setFocusable(true);
+		barcodeEdt.requestFocus();
+		barcodeEdt.findFocus();
 		CommonUtil.BarcodeMaxLength(barcodeEdt, 50);
 		allListeners();
-		thread = new HandlerThread("trademarkThread", 5);
-		thread.start();
-		mHandler = new Handler(thread.getLooper());
-		OrderListRunnable orderListRunnable = new OrderListRunnable(obj);
-		mHandler.post(orderListRunnable);
+		//thread = new HandlerThread("trademarkThread", 5);
+		//.start();
+		//mHandler = new Handler(thread.getLooper());
+		//OrderListRunnable orderListRunnable = new OrderListRunnable(obj);
+		//mHandler.post(orderListRunnable);
 	}
 
 	private void initView() {
@@ -206,17 +206,17 @@ public class FinishedProductHandOverActivity extends Activity {
 			public void onClick(View v) {
 
 				Order order = (Order) orderSpinner.getSelectedItem();
-				int orderId;
-				if (order == null) {
-					CustomToast.showToast(getApplicationContext(), "订单不能为空", 2000);
-					return;
-				} else {
-					orderId = order.getOrderId();
-					if (orderId == -1) {
-						CustomToast.showToast(getApplicationContext(), "请选择订单", 2000);
-						return;
-					}
-				}
+				int orderId=0;
+				//if (order == null) {
+					//CustomToast.showToast(getApplicationContext(), "订单不能为空", 2000);
+					//return;
+				//} else {
+					//orderId = order.getOrderId();
+					//if (orderId == -1) {
+					//	CustomToast.showToast(getApplicationContext(), "请选择订单", 2000);
+					//	return;
+					//}
+				//}
 				if (barcodeInfoList == null || barcodeInfoList.size() == 0) {
 					CustomToast.showToast(getApplicationContext(), "条码信息不能为空", 2000);
 					return;