diff --git a/src/com/ectrip/cyt/ui/IDOrderListActivity.java b/src/com/ectrip/cyt/ui/IDOrderListActivity.java
index 2eae0bb..27818e0 100644
--- a/src/com/ectrip/cyt/ui/IDOrderListActivity.java
+++ b/src/com/ectrip/cyt/ui/IDOrderListActivity.java
@@ -50,382 +50,383 @@ import com.ectrip.trips.view.AnimatedExpandableListView;
  * 身份证列表
  */
 public class IDOrderListActivity extends BaseActivity implements
-		ListOnclickCallback {
-
-	private AnimatedExpandableListView orderList;
-	private ReportExpandableListAdapter adapter;
-	private String idcardNumber;
-	private List<OrderInfo> orderInfos;
-	private Integer type;
-	private View errorLayout;
-	private TextView errorInfo;
-	private Integer Select;
-	private int pageSize = 15;
-	private int pageSizeDown = 0;
-	private int count;
-	private View moreView;
-	private View footLayout;
-	private TextView load_more;
-	private ProgressBar load_progress;
-	private boolean isUpMove = false;
-	private int allItem;
-	List<String> list = new ArrayList<>();
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.id_order_list_activity);
-		initView();
-		init();
-	}
-
-	private void initFootView() {
-		moreView = View.inflate(this, R.layout.listview_loding,
-				null);
-		footLayout = moreView.findViewById(R.id.footLayout);
-		load_more = (TextView) moreView.findViewById(R.id.load_text);
-		load_progress = (ProgressBar) moreView.findViewById(R.id.load_progress);
-		orderList.addFooterView(moreView);
-		footLayout.setVisibility(View.GONE);
-		footLayout.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				if (pageSizeDown>=pageSize){
-
-					load_progress.setVisibility(View.VISIBLE);
-					load_more.setText("加载中...");
-					HttpHelper.getInstance(IDOrderListActivity.this).queryOrder("ID", null,
-							null, idcardNumber, null, null, null,pageSize+"", count+"",
-							new MyHttpCallback());
-				}
-			}
-		});
-
-		/**
-		 * 滑动监听,上拉加载
-		 */
-		orderList.setOnScrollListener(new AbsListView.OnScrollListener() {
-
-
-
-			@Override
-			public void onScrollStateChanged(AbsListView absListView, int scrollState) {
-				int position = orderList.getLastVisiblePosition();
-
-
-				if (adapter!=null&&position== allItem){
-					isUpMove = true;
-				}else {
-					isUpMove = false;
-				}
-
-
-			}
-
-			@Override
-			public void onScroll(AbsListView absListView, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-
-
-				if (footLayout!=null){
-					if (visibleItemCount==totalItemCount-1){
-						footLayout.setVisibility(View.VISIBLE);
-						load_progress.setVisibility(View.GONE);
-						load_more.setText("点击加载更多");
-
-					}
-
-				}
-
-			}
-		});
-
-
-		orderList.setOnTouchListener(new View.OnTouchListener() {
-			float x_temp01 = 0.0f;
-			float y_temp01 = 0.0f;
-			float x_temp02 = 0.0f;
-			float y_temp02 = 0.0f;
-			@Override
-			public boolean onTouch(View view, MotionEvent motionEvent) {
-
-				//获得当前坐标
-				float x = motionEvent.getX();
-				float y = motionEvent.getY();
-				 switch (motionEvent.getAction()){
-					 case MotionEvent.ACTION_DOWN:
-
-						 x_temp01 = x;
-						 y_temp01 = y;
-						 break;
-					 case MotionEvent.ACTION_MOVE:
-
-						 break;
-
-					 case MotionEvent.ACTION_UP:
-
-						 x_temp02 = x;
-						 y_temp02 = y;
-						 if (isUpMove&&y_temp01-y_temp02>0&&Math.abs(y_temp02-y_temp01)>Math.abs(x_temp02-x_temp01)){
-							 if (pageSizeDown>=pageSize){
-								 load_progress.setVisibility(View.VISIBLE);
-								 load_more.setText("加载中...");
-								 HttpHelper.getInstance(IDOrderListActivity.this).queryOrder("ID", null,
-										 null, idcardNumber, null, null, null,pageSize+"", count+"",
-										 new MyHttpCallback());
-							 }
-						 }
-						 break;
-				 }
-
-				return false;
-			}
-		});
-
-
-
-	}
-
-	private void initView() {
-		errorLayout = findViewById(R.id.errorLayout);
-		errorInfo = (TextView) errorLayout.findViewById(R.id.errorInfo);
-		Select = SharedPreferences2Obj.getInstance(IDOrderListActivity.this)
-				.setName("SelectAction").getObject("Select", Integer.class);
-		if (Select != null) {
-			if (Select == SelectAction.Check.getValue()) {
-				((TextView) findViewById(R.id.title))
-						.setText(getString(R.string.order_list_check));
-			} else if (Select == SelectAction.Reprint.getValue()) {
-				((TextView) findViewById(R.id.title))
-						.setText(getString(R.string.order_list_reprint));
-			} else if (Select == SelectAction.Query.getValue()) {
-				((TextView) findViewById(R.id.title))
-						.setText(getString(R.string.order_list_query));
-			}
-		} else {
-			((TextView) findViewById(R.id.title))
-					.setText(getString(R.string.order_list));
-		}
-		((TextView) findViewById(R.id.title)).setVisibility(View.VISIBLE);
-		orderList = (AnimatedExpandableListView) findViewById(R.id.orderList);
-		orderList.setGroupIndicator(null);
-
-		initFootView();
-
-		findViewById(R.id.topBack).setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				finish();
-			}
-		});
-	}
-
-	private void init() {
-		type = SharedPreferences2Obj.getInstance(IDOrderListActivity.this)
-				.setName("MachineType").getObject("type", Integer.class);
-		idcardNumber = getIntent().getStringExtra("idcardNumber");
-		count = 1;
-		orderInfos = new ArrayList<OrderInfo>() ;
-		HttpHelper.getInstance(IDOrderListActivity.this).queryOrder("ID", null,
-				null, idcardNumber, null, null, null,pageSize+"", count+"",
-				new MyHttpCallback());
-	}
-
-	/**
-	 * @author jigo 查询订单
-	 */
-	public class MyHttpCallback extends HttpCallback<DataTrans> {
-		ProgressDialog dialog = null;
-		private String signed;
-		private String data;
-
-		@Override
-		public void onStopCallback() {
-		}
-
-		@Override
-		public void onPreCallback() {
-			if (dialog == null) {
-				// 显示ProgressDialog
-				dialog = new ProgressDialog(IDOrderListActivity.this);
-				dialog.setMessage(getString(R.string.get_order));
-				dialog.setCanceledOnTouchOutside(true);
-				dialog.setCancelable(true);
-				if (type == DeviceType.HANDSET.getValue()) {
-					dialog.getWindow().setType(
-							WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
-				}
-				try {
-					if (dialog != null && !dialog.isShowing()) {
-						dialog.show();
-					}
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			} else {
-				dialog.setMessage(getString(R.string.get_order));
-			}
-		}
-
-		@Override
-		public void onFailureCallback(String FailureStr) {
-			orderList.setEmptyView(errorLayout);
-			errorLayout.setVisibility(View.VISIBLE); // 错误信息提示
-			if (dialog != null && dialog.isShowing()) {
-				try {
-					dialog.dismiss();
-				} catch (Exception e) {
-					e.printStackTrace();
-				} catch (Throwable e) {
-					e.printStackTrace();
-				}
-			}
-			//播放语音
-			SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.wuxiaopiao);
-			if (FailureStr != null) {
-				errorInfo.setText(FailureStr);
-				MToast(IDOrderListActivity.this, FailureStr, Toast.LENGTH_LONG);
-			}
-		}
-
-		@Override
-		public void onCompletedCallback(DataTrans result) {
-		}
-
-		@Override
-		public void afterCompletedCallback(DataTrans result) {
-			LogUtil.d("IDOrderListActivity","result_data = "+result.getData());
-			if (result != null) {
-				signed = result.getSigned();
-				data = result.getData();
-				parse2(result.getData(), QueryOrderResponse.class,IDOrderListActivity.this);
-			} else {
-				if (dialog != null && dialog.isShowing()) {
-					try {
-						dialog.dismiss();
-					} catch (Exception e) {
-						e.printStackTrace();
-					} catch (Throwable e) {
-						e.printStackTrace();
-					}
-				}
-				//播放语音
-				SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
-				MToast(IDOrderListActivity.this,
-						getString(R.string.get_order_error), Toast.LENGTH_LONG);
-			}
-		}
-
-		@Override
-		public void onAgainParseCallback(Object parse) {
-			if (dialog != null && dialog.isShowing()) {
-				try {
-					dialog.dismiss();
-				} catch (Exception e) {
-					e.printStackTrace();
-				} catch (Throwable e) {
-					e.printStackTrace();
-				}
-			}
-			if (parse != null) {
-				QueryOrderResponse orderResponse = (QueryOrderResponse) parse;
-				String code = orderResponse.getCode();
-				if (code != null && OrderCode.SUCESS.getValue().equals(code)) {
-					Intent intent = new Intent("cyt.idcard.action");
-					intent.putExtra("sucess",true);
-					sendBroadcast(intent); //成功的情况,通知前一个页面,清空输入信息
-					if (signed == null
-							|| signed.equals(DataTool.getSign(MyApp
-							.getInstance().getSignkey(), data))) {
-						pageSizeDown = orderResponse.getOrderInfos().size();
-						if (pageSizeDown<pageSize){
-							footLayout.setVisibility(View.VISIBLE);
-							load_more.setText("已经加载全部");
-							load_progress.setVisibility(View.GONE);
-						}else {
-							footLayout.setVisibility(View.VISIBLE);
-							load_progress.setVisibility(View.GONE);
-							load_more.setText("点击加载更多");
-						}
-						orderInfos.addAll(orderResponse.getOrderInfos());
-						count++;
-
-						allItem = orderInfos.size();
-						for (int i=0;i<orderInfos.size();i++){
-							allItem = allItem +orderInfos.get(i).getProducts().size();
-						}
-						if (orderInfos != null) {
-							if (adapter==null){
-								adapter = new ReportExpandableListAdapter(
-										IDOrderListActivity.this,
-										IDOrderListActivity.this, orderInfos,1);
-								orderList.setAdapter(adapter);
-							}else {
-								adapter.notifyDataSetChanged();
-							}
-
-
-							//取消分割线
-							orderList.setDivider(null);
-							//默认展开
-							for (int i = 0; i < orderInfos.size(); i++) {
-								orderList.expandGroup(i);
-							}
-
-							//点击不可收缩
-							orderList.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
-
-								@Override
-								public boolean onGroupClick(ExpandableListView parent, View v,
-															int groupPosition, long id) {
-									return true;
-								}
-							});
-
-						} else {
-							//播放语音
-							SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
-							MToast(IDOrderListActivity.this,
-									getString(R.string.get_order_error),
-									Toast.LENGTH_LONG);
-						}
-					} else {
-						//播放语音
-						SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
-						onFailureCallback(getString(R.string.sign_not_pass));
-						MToast(IDOrderListActivity.this,
-								getString(R.string.sign_not_pass),
-								Toast.LENGTH_LONG);
-					}
-				} else {
-					//播放语音
-					SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
-					onFailureCallback(orderResponse.getDescribe());
-					MToast(IDOrderListActivity.this,
-							orderResponse.getDescribe(), Toast.LENGTH_LONG);
-				}
-			}
-		}
-	}
-
-	CenterHandle centerHandle;
-
-	@Override
-	public void onclickCallback(View view, int position) {
-		if (view.getId() == R.id.ticketPrint) {
-			String pwd = orderInfos.get(position).getCredentials();
-			pwd = pwd.substring(6, 14);
-			if (centerHandle == null) {
-				centerHandle = new CenterHandle(IDOrderListActivity.this,
-						orderInfos, pwd, "TRUE", IDOrderListActivity.this);
-			}
-			centerHandle.allTicket(position, pwd, "TRUE");
-		} else if (view.getId() == R.id.part) {
-			try {
-				String pwd = orderInfos.get(position).getCredentials();
-				pwd = pwd.substring(6, 14);
-				if (centerHandle == null) {
-					centerHandle = new CenterHandle(IDOrderListActivity.this,
-							orderInfos, pwd, "TRUE", IDOrderListActivity.this);
-				}
+        ListOnclickCallback {
+
+    private AnimatedExpandableListView orderList;
+    private ReportExpandableListAdapter adapter;
+    private String idcardNumber;
+    private List<OrderInfo> orderInfos;
+    private Integer type;
+    private View errorLayout;
+    private TextView errorInfo;
+    private Integer Select;
+    private int pageSize = 15;
+    private int pageSizeDown = 0;
+    private int count;
+    private View moreView;
+    private View footLayout;
+    private TextView load_more;
+    private ProgressBar load_progress;
+    private boolean isUpMove = false;
+    private int allItem;
+    List<String> list = new ArrayList<>();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.id_order_list_activity);
+        initView();
+        init();
+    }
+
+    private void initFootView() {
+        moreView = View.inflate(this, R.layout.listview_loding,
+                null);
+        footLayout = moreView.findViewById(R.id.footLayout);
+        load_more = (TextView) moreView.findViewById(R.id.load_text);
+        load_progress = (ProgressBar) moreView.findViewById(R.id.load_progress);
+        orderList.addFooterView(moreView);
+        footLayout.setVisibility(View.GONE);
+        footLayout.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (pageSizeDown >= pageSize) {
+
+                    load_progress.setVisibility(View.VISIBLE);
+                    load_more.setText("加载中...");
+                    HttpHelper.getInstance(IDOrderListActivity.this).queryOrder("ID", null,
+                            null, idcardNumber, null, null, null, pageSize + "", count + "",
+                            new MyHttpCallback());
+                }
+            }
+        });
+
+        /**
+         * 滑动监听,上拉加载
+         */
+        orderList.setOnScrollListener(new AbsListView.OnScrollListener() {
+
+
+            @Override
+            public void onScrollStateChanged(AbsListView absListView, int scrollState) {
+                int position = orderList.getLastVisiblePosition();
+
+
+                if (adapter != null && position == allItem) {
+                    isUpMove = true;
+                } else {
+                    isUpMove = false;
+                }
+
+
+            }
+
+            @Override
+            public void onScroll(AbsListView absListView, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+
+
+                if (footLayout != null) {
+                    if (visibleItemCount == totalItemCount - 1) {
+                        footLayout.setVisibility(View.VISIBLE);
+                        load_progress.setVisibility(View.GONE);
+                        load_more.setText("点击加载更多");
+
+                    }
+
+                }
+
+            }
+        });
+
+
+        orderList.setOnTouchListener(new View.OnTouchListener() {
+            float x_temp01 = 0.0f;
+            float y_temp01 = 0.0f;
+            float x_temp02 = 0.0f;
+            float y_temp02 = 0.0f;
+
+            @Override
+            public boolean onTouch(View view, MotionEvent motionEvent) {
+
+                //获得当前坐标
+                float x = motionEvent.getX();
+                float y = motionEvent.getY();
+                switch (motionEvent.getAction()) {
+                    case MotionEvent.ACTION_DOWN:
+
+                        x_temp01 = x;
+                        y_temp01 = y;
+                        break;
+                    case MotionEvent.ACTION_MOVE:
+
+                        break;
+
+                    case MotionEvent.ACTION_UP:
+
+                        x_temp02 = x;
+                        y_temp02 = y;
+                        if (isUpMove && y_temp01 - y_temp02 > 0 && Math.abs(y_temp02 - y_temp01) > Math.abs(x_temp02 - x_temp01)) {
+                            if (pageSizeDown >= pageSize) {
+                                load_progress.setVisibility(View.VISIBLE);
+                                load_more.setText("加载中...");
+                                HttpHelper.getInstance(IDOrderListActivity.this).queryOrder("ID", null,
+                                        null, idcardNumber, null, null, null, pageSize + "", count + "",
+                                        new MyHttpCallback());
+                            }
+                        }
+                        break;
+                }
+
+                return false;
+            }
+        });
+
+
+    }
+
+    private void initView() {
+        errorLayout = findViewById(R.id.errorLayout);
+        errorInfo = (TextView) errorLayout.findViewById(R.id.errorInfo);
+        Select = SharedPreferences2Obj.getInstance(IDOrderListActivity.this)
+                .setName("SelectAction").getObject("Select", Integer.class);
+        if (Select != null) {
+            if (Select == SelectAction.Check.getValue()) {
+                ((TextView) findViewById(R.id.title))
+                        .setText(getString(R.string.order_list_check));
+            } else if (Select == SelectAction.Reprint.getValue()) {
+                ((TextView) findViewById(R.id.title))
+                        .setText(getString(R.string.order_list_reprint));
+            } else if (Select == SelectAction.Query.getValue()) {
+                ((TextView) findViewById(R.id.title))
+                        .setText(getString(R.string.order_list_query));
+            }
+        } else {
+            ((TextView) findViewById(R.id.title))
+                    .setText(getString(R.string.order_list));
+        }
+        ((TextView) findViewById(R.id.title)).setVisibility(View.VISIBLE);
+        orderList = (AnimatedExpandableListView) findViewById(R.id.orderList);
+        orderList.setGroupIndicator(null);
+
+        initFootView();
+
+        findViewById(R.id.topBack).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+    }
+
+    private void init() {
+        type = SharedPreferences2Obj.getInstance(IDOrderListActivity.this)
+                .setName("MachineType").getObject("type", Integer.class);
+        idcardNumber = getIntent().getStringExtra("idcardNumber");
+        count = 1;
+        orderInfos = new ArrayList<OrderInfo>();
+        HttpHelper.getInstance(IDOrderListActivity.this).queryOrder("ID", null,
+                null, idcardNumber, null, null, null, pageSize + "", count + "",
+                new MyHttpCallback());
+    }
+
+    /**
+     * @author jigo 查询订单
+     */
+    public class MyHttpCallback extends HttpCallback<DataTrans> {
+        ProgressDialog dialog = null;
+        private String signed;
+        private String data;
+
+        @Override
+        public void onStopCallback() {
+        }
+
+        @Override
+        public void onPreCallback() {
+            if (dialog == null) {
+                // 显示ProgressDialog
+                dialog = new ProgressDialog(IDOrderListActivity.this);
+                dialog.setMessage(getString(R.string.get_order));
+                dialog.setCanceledOnTouchOutside(true);
+                dialog.setCancelable(true);
+                if (type == DeviceType.HANDSET.getValue()) {
+                    dialog.getWindow().setType(
+                            WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
+                }
+                try {
+                    if (dialog != null && !dialog.isShowing()) {
+                        dialog.show();
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } else {
+                dialog.setMessage(getString(R.string.get_order));
+            }
+        }
+
+        @Override
+        public void onFailureCallback(String FailureStr) {
+            orderList.setEmptyView(errorLayout);
+            errorLayout.setVisibility(View.VISIBLE); // 错误信息提示
+            if (dialog != null && dialog.isShowing()) {
+                try {
+                    dialog.dismiss();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                }
+            }
+            //播放语音
+            SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.wuxiaopiao);
+            if (FailureStr != null) {
+                errorInfo.setText(FailureStr);
+                MToast(IDOrderListActivity.this, FailureStr, Toast.LENGTH_LONG);
+            }
+        }
+
+        @Override
+        public void onCompletedCallback(DataTrans result) {
+        }
+
+        @Override
+        public void afterCompletedCallback(DataTrans result) {
+            LogUtil.d("IDOrderListActivity", "result_data = " + result.getData());
+            if (result != null) {
+                signed = result.getSigned();
+                data = result.getData();
+                parse2(result.getData(), QueryOrderResponse.class, IDOrderListActivity.this);
+            } else {
+                if (dialog != null && dialog.isShowing()) {
+                    try {
+                        dialog.dismiss();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    } catch (Throwable e) {
+                        e.printStackTrace();
+                    }
+                }
+                //播放语音
+                SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
+                MToast(IDOrderListActivity.this,
+                        getString(R.string.get_order_error), Toast.LENGTH_LONG);
+            }
+        }
+
+        @Override
+        public void onAgainParseCallback(Object parse) {
+            if (dialog != null && dialog.isShowing()) {
+                try {
+                    dialog.dismiss();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                }
+            }
+            if (parse != null) {
+                QueryOrderResponse orderResponse = (QueryOrderResponse) parse;
+                String code = orderResponse.getCode();
+                if (code != null && OrderCode.SUCESS.getValue().equals(code)) {
+                    Intent intent = new Intent("cyt.idcard.action");
+                    intent.putExtra("sucess", true);
+                    sendBroadcast(intent); //成功的情况,通知前一个页面,清空输入信息
+                    if (signed == null
+                            || signed.equals(DataTool.getSign(MyApp
+                            .getInstance().getSignkey(), data))) {
+                        pageSizeDown = orderResponse.getOrderInfos().size();
+                        if (pageSizeDown < pageSize) {
+                            footLayout.setVisibility(View.VISIBLE);
+                            load_more.setText("已经加载全部");
+                            load_progress.setVisibility(View.GONE);
+                        } else {
+                            footLayout.setVisibility(View.VISIBLE);
+                            load_progress.setVisibility(View.GONE);
+                            load_more.setText("点击加载更多");
+                        }
+                        orderInfos.addAll(orderResponse.getOrderInfos());
+                        count++;
+
+                        allItem = orderInfos.size();
+                        for (int i = 0; i < orderInfos.size(); i++) {
+                            allItem = allItem + orderInfos.get(i).getProducts().size();
+                        }
+                        if (orderInfos != null) {
+                            if (adapter == null) {
+                                adapter = new ReportExpandableListAdapter(
+                                        IDOrderListActivity.this,
+                                        IDOrderListActivity.this, orderInfos, 1);
+                                orderList.setAdapter(adapter);
+                            } else {
+                                adapter.notifyDataSetChanged();
+                            }
+
+
+                            //取消分割线
+                            orderList.setDivider(null);
+                            //默认展开
+                            for (int i = 0; i < orderInfos.size(); i++) {
+                                orderList.expandGroup(i);
+                            }
+
+                            //点击不可收缩
+                            orderList.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
+
+                                @Override
+                                public boolean onGroupClick(ExpandableListView parent, View v,
+                                                            int groupPosition, long id) {
+                                    return true;
+                                }
+                            });
+
+                        } else {
+                            //播放语音
+                            SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
+                            MToast(IDOrderListActivity.this,
+                                    getString(R.string.get_order_error),
+                                    Toast.LENGTH_LONG);
+                        }
+                    } else {
+                        //播放语音
+                        SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
+                        onFailureCallback(getString(R.string.sign_not_pass));
+                        MToast(IDOrderListActivity.this,
+                                getString(R.string.sign_not_pass),
+                                Toast.LENGTH_LONG);
+                    }
+                } else {
+                    //播放语音
+                    SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
+                    onFailureCallback(orderResponse.getDescribe());
+                    MToast(IDOrderListActivity.this,
+                            orderResponse.getDescribe(), Toast.LENGTH_LONG);
+                }
+            }
+        }
+    }
+
+    CenterHandle centerHandle;
+
+    @Override
+    public void onclickCallback(View view, int position) {
+        if (view.getId() == R.id.ticketPrint) {
+            String pwd = orderInfos.get(position).getCredentials();
+            pwd = pwd.substring(6, 14);
+            if (centerHandle == null) {
+                centerHandle = new CenterHandle(IDOrderListActivity.this,
+                        orderInfos, pwd, "TRUE", IDOrderListActivity.this);
+            }
+            centerHandle.allTicket(position, pwd, "TRUE");
+        } else if (view.getId() == R.id.part) {
+            try {
+                String pwd = orderInfos.get(position).getCredentials();
+                LogUtil.d(TAG, "pwd = " + pwd);
+                pwd = pwd.substring(6, 14);
+                if (centerHandle == null) {
+                    centerHandle = new CenterHandle(IDOrderListActivity.this,
+                            orderInfos, pwd, "TRUE", IDOrderListActivity.this);
+                }
 //				centerHandle.dialog(Integer.parseInt(orderInfos.get(position)
 //						.getOrderAmount()), position);
 
@@ -441,24 +442,24 @@ public class IDOrderListActivity extends BaseActivity implements
 //				// List集合转成数组
 //				String[] str = list.toArray(new String[0]);
 //				centerHandle.showDialog(str);
-				LogUtil.d("IDOrderListActivity","idcardNumber = "+idcardNumber);
-
-				List<ProductInfoQuery> products = orderInfos.get(position).getProducts();
-				for (int i = 0; i < products.size(); i++) {
-					List<PassengerInfosBean> passengerInfosBeans = products.get(i).getPassengerInfos();
-					for (PassengerInfosBean bean : passengerInfosBeans){
-						if(idcardNumber.equals(bean.getCredentials())){
-							LogUtil.d("IDOrderListActivity","getCredentials1 = "+bean.getCredentials());
-							if("ID_CARD".equals(bean.getCredentialsType())){
-								LogUtil.d("IDOrderListActivity","getCredentialsType = "+bean.getCredentialsType());
-								centerHandle.partTicket(position, pwd, "TRUE",bean.getCredentials(),true);
-							}else{
-								centerHandle.partTicket(position, pwd, "TRUE",bean.getVoucher(),false);
-							}
-
-						}
-					}
-				}
+                LogUtil.d("IDOrderListActivity", "idcardNumber = " + idcardNumber);
+
+                List<ProductInfoQuery> products = orderInfos.get(position).getProducts();
+                for (int i = 0; i < products.size(); i++) {
+                    List<PassengerInfosBean> passengerInfosBeans = products.get(i).getPassengerInfos();
+                    for (PassengerInfosBean bean : passengerInfosBeans) {
+                        if (idcardNumber.equals(bean.getCredentials())) {
+                            LogUtil.d("IDOrderListActivity", "getCredentials1 = " + bean.getCredentials());
+                            if ("ID_CARD".equals(bean.getCredentialsType())) {
+                                LogUtil.d("IDOrderListActivity", "getCredentialsType = " + bean.getCredentialsType());
+                                centerHandle.partTicket(position, pwd, "TRUE", bean.getCredentials(), true);
+                            } else {
+                                centerHandle.partTicket(position, pwd, "TRUE", bean.getVoucher(), false);
+                            }
+
+                        }
+                    }
+                }
 
 //				List<PassengerInfosBean> passengerInfosBeans = orderInfos.get(position).getProducts().get(position).getPassengerInfos();
 //				for (PassengerInfosBean bean : passengerInfosBeans){
@@ -474,53 +475,53 @@ public class IDOrderListActivity extends BaseActivity implements
 //					}
 //				}
 
-			} catch (NumberFormatException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-
-	@Override
-	public void onCenterCallback() {
-		adapter.notifyDataSetChanged();
-		centerHandle = null;
-	}
-
-	AtomicBoolean isonKey = new AtomicBoolean(false);
-
-	@Override
-	public void onPrintInfosCallback(String Infos) {
-		PrintHandle.getInstance().print(Infos, IDOrderListActivity.this);
-	}
-
-	@Override
-	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		if (keyCode == KeyEvent.KEYCODE_BACK && isonKey.get()) {
-			return true;
-		}
-		return super.onKeyDown(keyCode, event);
-	}
-
-	@Override
-	public void onProgress() {
-		isonKey.set(true);
-		TimerTask task = new TimerTask() {
-			public void run() {
-				try {
-					isonKey.set(false);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		};
-		Timer timer = new Timer();
-		timer.schedule(task, 3000);
-	}
-
-	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-		PrintHandle.getInstance().printClose();
-	}
+            } catch (NumberFormatException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    @Override
+    public void onCenterCallback() {
+        adapter.notifyDataSetChanged();
+        centerHandle = null;
+    }
+
+    AtomicBoolean isonKey = new AtomicBoolean(false);
+
+    @Override
+    public void onPrintInfosCallback(String Infos) {
+        PrintHandle.getInstance().print(Infos, IDOrderListActivity.this);
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK && isonKey.get()) {
+            return true;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public void onProgress() {
+        isonKey.set(true);
+        TimerTask task = new TimerTask() {
+            public void run() {
+                try {
+                    isonKey.set(false);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        };
+        Timer timer = new Timer();
+        timer.schedule(task, 3000);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        PrintHandle.getInstance().printClose();
+    }
 
 }
diff --git a/src/com/ectrip/cyt/ui/ScanerOrderActivity.java b/src/com/ectrip/cyt/ui/ScanerOrderActivity.java
index 0a21cef..973956b 100644
--- a/src/com/ectrip/cyt/ui/ScanerOrderActivity.java
+++ b/src/com/ectrip/cyt/ui/ScanerOrderActivity.java
@@ -263,6 +263,8 @@ public class ScanerOrderActivity extends BaseActivity {
                     }
                 }
 
+            }else{
+                LogUtil.d(TAG,"未扫到数据");
             }
         }
     };
diff --git a/src/com/ectrip/cyt/zxing/decoding/DecodeFormatManager.java b/src/com/ectrip/cyt/zxing/decoding/DecodeFormatManager.java
index 2898a88..b3d4c64 100644
--- a/src/com/ectrip/cyt/zxing/decoding/DecodeFormatManager.java
+++ b/src/com/ectrip/cyt/zxing/decoding/DecodeFormatManager.java
@@ -39,7 +39,7 @@ final class DecodeFormatManager {
     PRODUCT_FORMATS.add(BarcodeFormat.UPC_E);
     PRODUCT_FORMATS.add(BarcodeFormat.EAN_13);
     PRODUCT_FORMATS.add(BarcodeFormat.EAN_8);
-    PRODUCT_FORMATS.add(BarcodeFormat.RSS14);
+    PRODUCT_FORMATS.add(BarcodeFormat.RSS_14);
     ONE_D_FORMATS = new Vector<BarcodeFormat>(PRODUCT_FORMATS.size() + 4);
     ONE_D_FORMATS.addAll(PRODUCT_FORMATS);
     ONE_D_FORMATS.add(BarcodeFormat.CODE_39);
diff --git a/src/com/ectrip/trips/net/HttpHelper.java b/src/com/ectrip/trips/net/HttpHelper.java
index 4289617..1cd2e69 100644
--- a/src/com/ectrip/trips/net/HttpHelper.java
+++ b/src/com/ectrip/trips/net/HttpHelper.java
@@ -33,7 +33,7 @@ import com.ectrip.cyt.utils.SharedPreferences2Obj;
  * @author jigo 网络访问工具类
  */
 public class HttpHelper extends HttpHelperCore {
-    public static final String TAG="HttpHelper";
+    public static final String TAG = "HttpHelper";
     private Context mContext;
     public static HttpHelper helper = null;
 
@@ -43,7 +43,7 @@ public class HttpHelper extends HttpHelperCore {
     private static BaseActivity activity;
     // public static final String action="/service/terminal-2.action";
 //    public final String action = "/service/terminal-3.do";
-    public final String action = "/prod-api/manager/service/terminal-3";
+    public final String action = "/service/terminal-3";
     private ArrayList<ConfigBean> configBeans = DbManager.GetConfigs();
 
     public static HttpHelper getInstance(Context mContext) {
@@ -90,11 +90,11 @@ public class HttpHelper extends HttpHelperCore {
         String requestParam = DataTool.envelopeData(orderRequest, MyApp
                 .getInstance().getSignkey(), MyApp.getInstance().getIdentity());
         map.put("requestParam", requestParam);
-        LogUtil.i(TAG,requestParam + "requestParam");
+        LogUtil.i(TAG, requestParam + "requestParam");
         executeHttpPost(
                 "https://" + MyApp.getInstance().getServiceIp() + action, "",
                 map, httpCallback, "data", DataTrans.class);
-        LogUtil.i(TAG,"url = " + "http://" + MyApp.getInstance().getServiceIp() + action);
+        LogUtil.i(TAG, "url = " + "http://" + MyApp.getInstance().getServiceIp() + action);
         if (testMOdel != null && testMOdel) { // 这个是调试弹框
             if (type == null) {
                 return;
@@ -132,7 +132,8 @@ public class HttpHelper extends HttpHelperCore {
         String requestParam = DataTool.envelopeData(consumeCount, MyApp
                 .getInstance().getSignkey(), MyApp.getInstance().getIdentity());
         map.put("requestParam", requestParam);
-        LogUtil.i(TAG,"requestParam" + requestParam);
+        LogUtil.i(TAG, "requestParam" + requestParam);
+        LogUtil.i(TAG, "url = " + "http://" + MyApp.getInstance().getServiceIp() + action);
         executeHttpPost(
                 "https://" + MyApp.getInstance().getServiceIp() + action, "",
                 map, httpCallback, "data", DataTrans.class);
@@ -172,7 +173,7 @@ public class HttpHelper extends HttpHelperCore {
         String requestParam = DataTool.envelopeData(consumeCount, MyApp
                 .getInstance().getSignkey(), MyApp.getInstance().getIdentity());
         map.put("requestParam", requestParam);
-        LogUtil.i(TAG,"requestParam" + requestParam);
+        LogUtil.i(TAG, "requestParam" + requestParam);
         executeHttpPost(
                 "https://" + MyApp.getInstance().getServiceIp() + action, "",
                 map, httpCallback, "data", DataTrans.class);
@@ -190,8 +191,9 @@ public class HttpHelper extends HttpHelperCore {
                     + ";", Toast.LENGTH_LONG);
         }
     }
+
     public void codeConsume(String orderId, String count, String password,
-                             String verifyPassword, String consumedSeq, List<ProductOfConsumeOrder> products, HttpCallback<DataTrans> httpCallback) {
+                            String verifyPassword, String consumedSeq, List<ProductOfConsumeOrder> products, HttpCallback<DataTrans> httpCallback) {
         Long accountId = MyApp.getInstance().getAccountId();
         ConsumeCodeRequest consumeCode = new ConsumeCodeRequest(orderId,
                 count, password, verifyPassword, consumedSeq, products);
@@ -206,8 +208,8 @@ public class HttpHelper extends HttpHelperCore {
         String requestParam = DataTool.envelopeData(consumeCode, MyApp
                 .getInstance().getSignkey(), MyApp.getInstance().getIdentity());
         map.put("requestParam", requestParam);
-        LogUtil.i(TAG,"requestParam" + requestParam);
-        LogUtil.i(TAG,"服务器地址：" + MyApp.getInstance().getServiceIp());
+        LogUtil.i(TAG, "requestParam" + requestParam);
+        LogUtil.i(TAG, "服务器地址：" + MyApp.getInstance().getServiceIp());
         executeHttpPost(
                 "https://" + MyApp.getInstance().getServiceIp() + action, "",
                 map, httpCallback, "data", DataTrans.class);
@@ -225,6 +227,7 @@ public class HttpHelper extends HttpHelperCore {
                     + ";", Toast.LENGTH_LONG);
         }
     }
+
     /**
      * @param startdate
      * @param enddate
@@ -246,7 +249,7 @@ public class HttpHelper extends HttpHelperCore {
         String requestParam = DataTool.envelopeData(consumeCount, MyApp
                 .getInstance().getSignkey(), MyApp.getInstance().getIdentity());
         map.put("requestParam", requestParam);
-        LogUtil.i(TAG,"requestParam" + requestParam);
+        LogUtil.i(TAG, "requestParam" + requestParam);
         executeHttpPost(
                 "https://" + MyApp.getInstance().getServiceIp() + action, "",
                 map, httpCallback, "data", DataTrans.class);
@@ -289,7 +292,7 @@ public class HttpHelper extends HttpHelperCore {
                 MyApp.getInstance().getSignkey(), MyApp.getInstance()
                         .getIdentity());
         map.put("requestParam", requestParam);
-        LogUtil.i(TAG,"requestParam" + requestParam);
+        LogUtil.i(TAG, "requestParam" + requestParam);
         executeHttpPost(
                 "https://" + MyApp.getInstance().getServiceIp() + action, "",
                 map, httpCallback, "data", DataTrans.class);
@@ -339,7 +342,7 @@ public class HttpHelper extends HttpHelperCore {
                 MyApp.getInstance().getSignkey(), MyApp.getInstance()
                         .getIdentity());
         map.put("requestParam", requestParam);
-        LogUtil.i(TAG,"requestParam" + requestParam);
+        LogUtil.i(TAG, "requestParam" + requestParam);
         executeHttpPost(
                 "https://" + MyApp.getInstance().getServiceIp() + action, "",
                 map, httpCallback, "data", DataTrans.class);
@@ -386,7 +389,8 @@ public class HttpHelper extends HttpHelperCore {
         String requestParam = DataTool.envelopeData(detectVersionRequest,
                 signkey, identity);
         map.put("requestParam", requestParam);
-        LogUtil.i(TAG,"requestParam" + requestParam);
+        LogUtil.i(TAG, "url = " + "https://" + url + action);
+        LogUtil.i(TAG, "requestParam" + requestParam);
         executeHttpPost("https://" + url + action, "", map, httpCallback,
                 "data", DataTrans.class);
     }
@@ -416,7 +420,7 @@ public class HttpHelper extends HttpHelperCore {
                 MyApp.getInstance().getSignkey(), MyApp.getInstance()
                         .getIdentity());
         map.put("requestParam", requestParam);
-        LogUtil.i(TAG,"requestParam" + requestParam);
+        LogUtil.i(TAG, "requestParam" + requestParam);
         executeHttpPost(
                 "https://" + MyApp.getInstance().getServiceIp() + action, "",
                 map, httpCallback, "data", DataTrans.class);