diff --git a/res/layout-land/app_idcard_temple.xml b/res/layout-land/app_idcard_temple.xml
index 1967056..52cfc79 100644
--- a/res/layout-land/app_idcard_temple.xml
+++ b/res/layout-land/app_idcard_temple.xml
@@ -158,7 +158,7 @@
+ android:text="X" />
+ android:text="X" />
+ android:orientation="vertical">
+
+ android:layout_marginTop="10dp">
-
+
+ android:textColor="#333333"
+ android:textSize="20sp" />
+ android:textSize="18sp" />
+ android:textSize="18sp" />
@@ -91,39 +90,40 @@
-
-
+ android:orientation="horizontal">
+
+
+
+
diff --git a/res/layout/group_list_item2_ldip.xml b/res/layout/group_list_item2_ldip.xml
index ec2d489..3b0d60f 100644
--- a/res/layout/group_list_item2_ldip.xml
+++ b/res/layout/group_list_item2_ldip.xml
@@ -121,8 +121,8 @@
android:layout_marginLeft="20dp"
android:paddingTop="10dp"
android:paddingBottom="10dp"
- android:paddingLeft="3dp"
- android:paddingRight="3dp"
+ android:paddingLeft="10dp"
+ android:paddingRight="10dp"
android:background="@drawable/btn_part_shape"
android:text="@string/part_print"
android:textSize="22sp"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3de88f0..09934ec 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -227,7 +227,7 @@
消费金额:
流水号:
打票
- 部分检票
+ 检本票
1)必须打开蓝牙功能，才能连接打印机，才能打印小票。
2)看“已匹配设备”列表，是否存在你已经匹配的设备，选择设备打印；如果匹配列表中不存在您需要的设备，则“扫描设备”，从中获取您需要的设备进行匹配。
3)打印机的名称为“EZTPrinter。”
diff --git a/src/com/ectrip/cyt/adapter/ReportExpandableListAdapter.java b/src/com/ectrip/cyt/adapter/ReportExpandableListAdapter.java
index 830fd31..989ef7c 100644
--- a/src/com/ectrip/cyt/adapter/ReportExpandableListAdapter.java
+++ b/src/com/ectrip/cyt/adapter/ReportExpandableListAdapter.java
@@ -30,6 +30,7 @@ import com.ectrip.cyt.response.LoginResponse;
import com.ectrip.cyt.response.ProductInfoQuery;
import com.ectrip.cyt.ui.BaseActivity;
import com.ectrip.cyt.utils.DenstityUtils;
+import com.ectrip.cyt.utils.LogUtil;
import com.ectrip.cyt.utils.SharedPreferences2Obj;
import com.ectrip.trips.check.R;
import com.ectrip.trips.net.HttpHelper;
@@ -60,11 +61,13 @@ public class ReportExpandableListAdapter extends AnimatedExpandableListView.Anim
private static final int VALUE_NOT_PART = 0;// 2种不同的布局
private static final int VALUE_PART = 1;
private final int screenWidth;
+ private int type;
- public ReportExpandableListAdapter(ListOnclickCallback callback, Context context, List orderInfos) {
+ public ReportExpandableListAdapter(ListOnclickCallback callback, Context context, List orderInfos,int type) {
this.callback = callback;
this.context = context;
this.orderInfos = orderInfos;
+ this.type = type;
li = LayoutInflater.from(context);
Select = SharedPreferences2Obj.getInstance(context)
.setName("SelectAction").getObject("Select", Integer.class);
@@ -75,6 +78,7 @@ public class ReportExpandableListAdapter extends AnimatedExpandableListView.Anim
screenWidth = display.getWidth();
devtype = SharedPreferences2Obj.getInstance(context)
.setName("MachineType").getObject("type", Integer.class);
+ LogUtil.d("ReportExpandableListAdapter","Select = "+Select);
}
/**
@@ -260,8 +264,9 @@ public class ReportExpandableListAdapter extends AnimatedExpandableListView.Anim
holder = (GroupViewHolderNotPard) convertView.getTag();
}
- int type = getItemViewType(groupPosition);
+// int type = getItemViewType(groupPosition);
holder.ticket_print.setTag("" + groupPosition);
+ LogUtil.d("ReportExpandableListAdapter","type = "+type);
switch (type) {
case VALUE_NOT_PART: // 这种情况下是没有部分检票的
holder.part.setVisibility(View.GONE);
@@ -285,6 +290,7 @@ public class ReportExpandableListAdapter extends AnimatedExpandableListView.Anim
default:
break;
}
+
setConvertContent(holder, groupPosition);
if (groupPosition == 0) {
@@ -451,7 +457,7 @@ public class ReportExpandableListAdapter extends AnimatedExpandableListView.Anim
while (it.hasNext()) {
OrderInfo info = it.next();
if (info != null) {
- String count = info.getOrderAmount();
+ String count = String.valueOf(info.getOrderAmount());
if (count != null) {
int consumeCount = Integer.parseInt(count);
if (consumeCount > 0) {
diff --git a/src/com/ectrip/cyt/base/OrderInfo.java b/src/com/ectrip/cyt/base/OrderInfo.java
index f3d394b..932b182 100644
--- a/src/com/ectrip/cyt/base/OrderInfo.java
+++ b/src/com/ectrip/cyt/base/OrderInfo.java
@@ -3,117 +3,236 @@ package com.ectrip.cyt.base;
import com.ectrip.cyt.response.ProductInfoQuery;
import java.util.List;
-import java.util.Map;
public class OrderInfo {
+ /**
+ * code : 1000
+ * describe : 成功
+ * orderInfos : [{"contactorName":"111","distributorName":"li分销商","isRealNameOrder":0,"orderAmount":4,"orderId":"57230630999000032","orderStatus":"PRINTSUCCESS","paymentWay":"预付","products":[{"baseQuantity":1,"consumedQuantity":1,"endDate":"2023-08-31","name":"九寨沟_非实名测试0411","orderPassengers":[{"encryptTicketNum":"http://218.17.50.143:18253/tdos/qrcode.do?ticketNum=TY_8BAF91AD91032B9927FBED3DF832ED62","id":24910,"orderId":23249,"otoName":"LHJGYS","person":{"contactTicket":false,"credentialsType":"NOTHING","id":"24910","isDiscountObj":0},"status":5,"ticketNum":"TY_8BAF91AD91032B9927FBED3DF832ED62","unifiedUseCode":"TY_8BAF91AD91032B9927FBED3DF832ED62","updateTime":1688107002000},{"encryptTicketNum":"http://218.17.50.143:18253/tdos/qrcode.do?ticketNum=TY_F9685424CDF207BAC75F5D80A32C8A95","id":24911,"orderId":23249,"otoName":"LHJGYS","person":{"contactTicket":false,"credentialsType":"NOTHING","id":"24911","isDiscountObj":0},"status":4,"ticketNum":"TY_F9685424CDF207BAC75F5D80A32C8A95","unifiedUseCode":"TY_F9685424CDF207BAC75F5D80A32C8A95","updateTime":1688105298000},{"encryptTicketNum":"http://218.17.50.143:18253/tdos/qrcode.do?ticketNum=TY_274C2780861BE5686A469EE238297E5E","id":24912,"orderId":23249,"otoName":"LHJGYS","person":{"contactTicket":false,"credentialsType":"NOTHING","id":"24912","isDiscountObj":0},"status":4,"ticketNum":"TY_274C2780861BE5686A469EE238297E5E","unifiedUseCode":"TY_274C2780861BE5686A469EE238297E5E","updateTime":1688105298000},{"encryptTicketNum":"http://218.17.50.143:18253/tdos/qrcode.do?ticketNum=TY_A8B464B44AB6B0DF15E85844AA8AA095","id":24913,"orderId":23249,"otoName":"LHJGYS","person":{"contactTicket":false,"credentialsType":"NOTHING","id":"24913","isDiscountObj":0},"status":4,"ticketNum":"TY_A8B464B44AB6B0DF15E85844AA8AA095","unifiedUseCode":"TY_A8B464B44AB6B0DF15E85844AA8AA095","updateTime":1688105298000},{"encryptTicketNum":"http://218.17.50.143:18253/tdos/qrcode.do?ticketNum=TY_80A9E68D8CE3575BA181AB7E17948EBD","id":24914,"orderId":23249,"otoName":"LHJGYS","person":{"contactTicket":false,"credentialsType":"NOTHING","id":"24914","isDiscountObj":0},"status":4,"ticketNum":"TY_80A9E68D8CE3575BA181AB7E17948EBD","unifiedUseCode":"TY_80A9E68D8CE3575BA181AB7E17948EBD","updateTime":1688105298000}],"productId":"744","quantity":4,"startDate":"2023-06-30","totalQuantity":5}],"verifyPart":"true"},{"contactorName":"666","distributorName":"li分销商","isRealNameOrder":0,"orderAmount":2,"orderId":"57230630999000030","orderStatus":"PRINTSUCCESS","paymentWay":"预付","products":[{"baseQuantity":1,"consumedQuantity":0,"endDate":"2023-08-31","name":"九寨沟_非实名测试0411","orderPassengers":[{"encryptTicketNum":"http://218.17.50.143:18253/tdos/qrcode.do?ticketNum=TY_4E16A165C6EBA560E037C139D06D0EEE","id":24908,"orderId":23248,"otoName":"LHJGYS","person":{"contactTicket":false,"credentialsType":"NOTHING","id":"24908","isDiscountObj":0},"status":4,"ticketNum":"TY_4E16A165C6EBA560E037C139D06D0EEE","unifiedUseCode":"TY_4E16A165C6EBA560E037C139D06D0EEE","updateTime":1688105251000},{"encryptTicketNum":"http://218.17.50.143:18253/tdos/qrcode.do?ticketNum=TY_07CF8B0762B992FFDDF14847D098823E","id":24909,"orderId":23248,"otoName":"LHJGYS","person":{"contactTicket":false,"credentialsType":"NOTHING","id":"24909","isDiscountObj":0},"status":4,"ticketNum":"TY_07CF8B0762B992FFDDF14847D098823E","unifiedUseCode":"TY_07CF8B0762B992FFDDF14847D098823E","updateTime":1688105251000}],"productId":"744","quantity":2,"startDate":"2023-06-30","totalQuantity":2}],"verifyPart":"true"}]
+ */
+ /**
+ * contactorName : 111
+ * distributorName : li分销商
+ * isRealNameOrder : 0
+ * orderAmount : 4
+ * orderId : 57230630999000032
+ * orderStatus : PRINTSUCCESS
+ * paymentWay : 预付
+ * products : [{"baseQuantity":1,"consumedQuantity":1,"endDate":"2023-08-31","name":"九寨沟_非实名测试0411","orderPassengers":[{"encryptTicketNum":"http://218.17.50.143:18253/tdos/qrcode.do?ticketNum=TY_8BAF91AD91032B9927FBED3DF832ED62","id":24910,"orderId":23249,"otoName":"LHJGYS","person":{"contactTicket":false,"credentialsType":"NOTHING","id":"24910","isDiscountObj":0},"status":5,"ticketNum":"TY_8BAF91AD91032B9927FBED3DF832ED62","unifiedUseCode":"TY_8BAF91AD91032B9927FBED3DF832ED62","updateTime":1688107002000},{"encryptTicketNum":"http://218.17.50.143:18253/tdos/qrcode.do?ticketNum=TY_F9685424CDF207BAC75F5D80A32C8A95","id":24911,"orderId":23249,"otoName":"LHJGYS","person":{"contactTicket":false,"credentialsType":"NOTHING","id":"24911","isDiscountObj":0},"status":4,"ticketNum":"TY_F9685424CDF207BAC75F5D80A32C8A95","unifiedUseCode":"TY_F9685424CDF207BAC75F5D80A32C8A95","updateTime":1688105298000},{"encryptTicketNum":"http://218.17.50.143:18253/tdos/qrcode.do?ticketNum=TY_274C2780861BE5686A469EE238297E5E","id":24912,"orderId":23249,"otoName":"LHJGYS","person":{"contactTicket":false,"credentialsType":"NOTHING","id":"24912","isDiscountObj":0},"status":4,"ticketNum":"TY_274C2780861BE5686A469EE238297E5E","unifiedUseCode":"TY_274C2780861BE5686A469EE238297E5E","updateTime":1688105298000},{"encryptTicketNum":"http://218.17.50.143:18253/tdos/qrcode.do?ticketNum=TY_A8B464B44AB6B0DF15E85844AA8AA095","id":24913,"orderId":23249,"otoName":"LHJGYS","person":{"contactTicket":false,"credentialsType":"NOTHING","id":"24913","isDiscountObj":0},"status":4,"ticketNum":"TY_A8B464B44AB6B0DF15E85844AA8AA095","unifiedUseCode":"TY_A8B464B44AB6B0DF15E85844AA8AA095","updateTime":1688105298000},{"encryptTicketNum":"http://218.17.50.143:18253/tdos/qrcode.do?ticketNum=TY_80A9E68D8CE3575BA181AB7E17948EBD","id":24914,"orderId":23249,"otoName":"LHJGYS","person":{"contactTicket":false,"credentialsType":"NOTHING","id":"24914","isDiscountObj":0},"status":4,"ticketNum":"TY_80A9E68D8CE3575BA181AB7E17948EBD","unifiedUseCode":"TY_80A9E68D8CE3575BA181AB7E17948EBD","updateTime":1688105298000}],"productId":"744","quantity":4,"startDate":"2023-06-30","totalQuantity":5}]
+ * verifyPart : true
+ */
-
- private String orderId;// 订单号
+ private String contactorName;// 取票人姓名
+ private String credentials;//证件号码
private String distributorName;// 分销商名称
+ private int isRealNameOrder;
+ private String orderAmount;// 订单份数
+ private String orderId;// 订单号
private String orderStatus;// 订单状态
- private String contactorName;// 取票人姓名
- private String credentials;// 证件号码
- private String verifyPart;// 是否部分检票
private String paymentWay; //支付类型[PRE_PAY, CASH_PAY]
- private String orderAmount;// 订单份数
-
+ private String verifyPart;// 是否部分检票
private List products;
- public OrderInfo(String orderId, String distributorName, String orderStatus, String contactorName, String credentials, String verifyPart, String orderAmount, List products,String paymentWay) {
+ public OrderInfo(String orderId, String credentials, String distributorName, String orderStatus, String contactorName, int isRealNameOrder, String verifyPart, String orderAmount, List products,String paymentWay) {
this.orderId = orderId;
+ this.credentials = credentials;
this.distributorName = distributorName;
this.orderStatus = orderStatus;
this.contactorName = contactorName;
- this.credentials = credentials;
+ this.isRealNameOrder = isRealNameOrder;
this.verifyPart = verifyPart;
this.orderAmount = orderAmount;
this.products = products;
this.paymentWay = paymentWay;
}
- public String getPaymentWay() {
- return paymentWay;
+ public String getContactorName() {
+ return contactorName;
}
- public void setPaymentWay(String paymentWay) {
- this.paymentWay = paymentWay;
+ public void setContactorName(String contactorName) {
+ this.contactorName = contactorName;
}
- public String getOrderId() {
- return orderId;
+ public String getCredentials() {
+ return credentials;
}
- public String getDistributorName() {
- return distributorName;
+ public void setCredentials(String credentials) {
+ this.credentials = credentials;
}
- public String getOrderStatus() {
- return orderStatus;
+ public String getDistributorName() {
+ return distributorName;
}
- public String getContactorName() {
- return contactorName;
+ public void setDistributorName(String distributorName) {
+ this.distributorName = distributorName;
}
- public String getCredentials() {
- return credentials;
+ public int getIsRealNameOrder() {
+ return isRealNameOrder;
}
- public String getVerifyPart() {
- return verifyPart;
+ public void setIsRealNameOrder(int isRealNameOrder) {
+ this.isRealNameOrder = isRealNameOrder;
}
public String getOrderAmount() {
return orderAmount;
}
- public List getProducts() {
- return products;
+ public void setOrderAmount(String orderAmount) {
+ this.orderAmount = orderAmount;
+ }
+
+ public String getOrderId() {
+ return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
- public void setDistributorName(String distributorName) {
- this.distributorName = distributorName;
+ public String getOrderStatus() {
+ return orderStatus;
}
public void setOrderStatus(String orderStatus) {
this.orderStatus = orderStatus;
}
- public void setContactorName(String contactorName) {
- this.contactorName = contactorName;
+ public String getPaymentWay() {
+ return paymentWay;
}
- public void setCredentials(String credentials) {
- this.credentials = credentials;
+ public void setPaymentWay(String paymentWay) {
+ this.paymentWay = paymentWay;
+ }
+
+ public String getVerifyPart() {
+ return verifyPart;
}
public void setVerifyPart(String verifyPart) {
this.verifyPart = verifyPart;
}
- public void setOrderAmount(String orderAmount) {
- this.orderAmount = orderAmount;
+ public List getProducts() {
+ return products;
}
public void setProducts(List products) {
this.products = products;
}
- @Override
- public String toString() {
- return "OrderInfo{" +
- "id='" + orderId + '\'' +
- ", distributorName='" + distributorName + '\'' +
- ", orderStatus='" + orderStatus + '\'' +
- ", contactorName='" + contactorName + '\'' +
- ", credentials='" + credentials + '\'' +
- ", verifyPart='" + verifyPart + '\'' +
- ", orderAmount=" + orderAmount +
- ", products=" + products +
- '}';
- }
+
+// private String orderId;// 订单号
+// private String distributorName;// 分销商名称
+// private String orderStatus;// 订单状态
+// private String contactorName;// 取票人姓名
+// private String credentials;// 证件号码
+// private String verifyPart;// 是否部分检票
+// private String paymentWay; //支付类型[PRE_PAY, CASH_PAY]
+// private String orderAmount;// 订单份数
+//
+// private List products;
+
+// public OrderInfo(String orderId, String distributorName, String orderStatus, String contactorName, String credentials, String verifyPart, String orderAmount, List products,String paymentWay) {
+// this.orderId = orderId;
+// this.distributorName = distributorName;
+// this.orderStatus = orderStatus;
+// this.contactorName = contactorName;
+// this.credentials = credentials;
+// this.verifyPart = verifyPart;
+// this.orderAmount = orderAmount;
+// this.products = products;
+// this.paymentWay = paymentWay;
+// }
+//
+// public String getPaymentWay() {
+// return paymentWay;
+// }
+//
+// public void setPaymentWay(String paymentWay) {
+// this.paymentWay = paymentWay;
+// }
+//
+// public String getOrderId() {
+// return orderId;
+// }
+//
+// public String getDistributorName() {
+// return distributorName;
+// }
+//
+// public String getOrderStatus() {
+// return orderStatus;
+// }
+//
+// public String getContactorName() {
+// return contactorName;
+// }
+//
+// public String getCredentials() {
+// return credentials;
+// }
+//
+// public String getVerifyPart() {
+// return verifyPart;
+// }
+//
+// public String getOrderAmount() {
+// return orderAmount;
+// }
+//
+// public List getProducts() {
+// return products;
+// }
+//
+// public void setOrderId(String orderId) {
+// this.orderId = orderId;
+// }
+//
+// public void setDistributorName(String distributorName) {
+// this.distributorName = distributorName;
+// }
+//
+// public void setOrderStatus(String orderStatus) {
+// this.orderStatus = orderStatus;
+// }
+//
+// public void setContactorName(String contactorName) {
+// this.contactorName = contactorName;
+// }
+//
+// public void setCredentials(String credentials) {
+// this.credentials = credentials;
+// }
+//
+// public void setVerifyPart(String verifyPart) {
+// this.verifyPart = verifyPart;
+// }
+//
+// public void setOrderAmount(String orderAmount) {
+// this.orderAmount = orderAmount;
+// }
+//
+// public void setProducts(List products) {
+// this.products = products;
+// }
+//
+// @Override
+// public String toString() {
+// return "OrderInfo{" +
+// "id='" + orderId + '\'' +
+// ", distributorName='" + distributorName + '\'' +
+// ", orderStatus='" + orderStatus + '\'' +
+// ", contactorName='" + contactorName + '\'' +
+// ", credentials='" + credentials + '\'' +
+// ", verifyPart='" + verifyPart + '\'' +
+// ", orderAmount=" + orderAmount +
+// ", products=" + products +
+// '}';
+// }
}
diff --git a/src/com/ectrip/cyt/center/CenterHandle.java b/src/com/ectrip/cyt/center/CenterHandle.java
index 42a1b4a..bc26121 100644
--- a/src/com/ectrip/cyt/center/CenterHandle.java
+++ b/src/com/ectrip/cyt/center/CenterHandle.java
@@ -8,6 +8,7 @@ import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.res.Resources;
+import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
@@ -31,6 +32,7 @@ import com.ectrip.cyt.response.ConsumeOrderResponse;
import com.ectrip.cyt.response.ProductInfoQuery;
import com.ectrip.cyt.spinnerwheel.adapters.NumericWheelAdapter;
import com.ectrip.cyt.ui.BaseActivity;
+import com.ectrip.cyt.utils.LogUtil;
import com.ectrip.cyt.utils.SharedPreferences2Obj;
import com.ectrip.cyt.utils.SoundUtil;
import com.ectrip.trips.check.R;
@@ -50,6 +52,7 @@ import antistatic.spinnerwheel.AbstractWheel;
* @author jigo 部分检票和全部检票处理
*/
public class CenterHandle {
+ public final String TAG = "CenterHandle";
private Context context;
private AlertDialog dialog; // 部分检票弹框
ProgressDialog dialog2 = null;
@@ -68,7 +71,8 @@ public class CenterHandle {
private Integer type;
private int times = 0;
private boolean isAll;
-
+ private String idStr;
+ private boolean isRealId;
public CenterHandle(Context context, List orderInfos,
String password, String verifyPassword,
ListOnclickCallback onclickCallback) {
@@ -130,6 +134,34 @@ public class CenterHandle {
}
/**
+ * 部分检票
+ *
+ * @param position
+ * @param pwd
+ * @param verifyPassword
+ */
+ public void partTicket(int position, String pwd, String verifyPassword,String id,boolean isId) {
+ isAll = false;
+ idStr = id;
+ isRealId = isId;
+ getConsumedSeq(position);
+ products = orderInfos.get(position).getProducts();
+ Integer totle = new Integer(orderInfos.get(position).getOrderAmount());
+ productOfConsumeOrders = new ArrayList<>();
+ for (int i = 0; i < products.size(); i++) {
+ ProductOfConsumeOrder consumeOrder = new ProductOfConsumeOrder(products.get(i).getProductId(), 1);
+ productOfConsumeOrders.add(consumeOrder);
+ }
+
+ HttpHelper.getInstance(context).consumeOrderPart(
+ orderInfos.get(position).getOrderId(),
+ orderInfos.get(position).getOrderAmount(), pwd, verifyPassword,
+ consumedSeq, productOfConsumeOrders,id,isId,
+ new CenterConsumeCallback(position, false, 1));
+ }
+
+
+ /**
* 部分检票弹窗
*/
LayoutInflater inflater;
@@ -194,7 +226,46 @@ public class CenterHandle {
e.printStackTrace();
}
}
-
+ int position = 0;//表示单选列表中默认选择的位置为0
+
+ public void showDialog(final String str[]) {
+ position = 0;
+ AlertDialog dialog;
+ AlertDialog.Builder builder = new AlertDialog.Builder(context)
+ .setTitle("请选择票码")
+ .setCancelable(false)
+ .setSingleChoiceItems(str, position, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ position = which;//得到被点击的序号which
+ LogUtil.d(TAG, "position = " + position);
+ }
+ })
+ .setPositiveButton("确定", new DialogInterface.OnClickListener() {//添加“确定”按钮
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ LogUtil.d(TAG, "选择的票码 = " + str[position] + "\n" + "位置 = " + position);
+ dialog.dismiss();
+ String titcketCode = str[position];
+ if (!TextUtils.isEmpty(titcketCode)) {
+ isAll = false;
+ HttpHelper.getInstance(context).consumeOrder(
+ orderInfos.get(position).getOrderId(),
+ "1",
+ password, verifyPassword, consumedSeq, productOfConsumeOrders,
+ new CenterConsumeCallback(position, false, 1));
+ }
+ }
+ })
+ .setNegativeButton("取消", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ dialog.dismiss();
+ }
+ });
+ dialog = builder.create();
+ dialog.show();
+ }
private void initWheel(View view, int id, final int num) {
wheel = (AbstractWheel) view.findViewById(id);
wheel.setViewAdapter(new NumericWheelAdapter(context, 1, num));
@@ -302,11 +373,16 @@ public class CenterHandle {
consumedSeq, productOfConsumeOrders,
new CenterConsumeCallback(position, true, 0));
} else {
- HttpHelper.getInstance(context).consumeOrder(
+// HttpHelper.getInstance(context).consumeOrder(
+// orderInfos.get(position).getOrderId(),
+// (wheel.getCurrentItem() + 1) + "",
+// password, verifyPassword, consumedSeq, productOfConsumeOrders,
+// new CenterConsumeCallback(position, false, wheel.getCurrentItem() + 1));
+ HttpHelper.getInstance(context).consumeOrderPart(
orderInfos.get(position).getOrderId(),
- (wheel.getCurrentItem() + 1) + "",
- password, verifyPassword, consumedSeq, productOfConsumeOrders,
- new CenterConsumeCallback(position, false, wheel.getCurrentItem() + 1));
+ "1",
+ password, verifyPassword, consumedSeq, productOfConsumeOrders,idStr,isRealId,
+ new CenterConsumeCallback(position, false, 1));
}
} else {
MyApp.getInstance().setPid(null);
@@ -360,11 +436,16 @@ public class CenterHandle {
consumedSeq, productOfConsumeOrders,
new CenterConsumeCallback(position, true, 0));
} else {
+// HttpHelper.getInstance(context).consumeOrder(
+// orderInfos.get(position).getOrderId(),
+// (wheel.getCurrentItem() + 1) + "",
+// password, verifyPassword, consumedSeq, productOfConsumeOrders,
+// new CenterConsumeCallback(position, false, wheel.getCurrentItem() + 1));
HttpHelper.getInstance(context).consumeOrder(
orderInfos.get(position).getOrderId(),
- (wheel.getCurrentItem() + 1) + "",
+ "1",
password, verifyPassword, consumedSeq, productOfConsumeOrders,
- new CenterConsumeCallback(position, false, wheel.getCurrentItem() + 1));
+ new CenterConsumeCallback(position, false, 1));
}
} else {
((Activity) context).finish();
diff --git a/src/com/ectrip/cyt/request/ConsumeOrderRequest.java b/src/com/ectrip/cyt/request/ConsumeOrderRequest.java
index 63276e9..97cb7f8 100644
--- a/src/com/ectrip/cyt/request/ConsumeOrderRequest.java
+++ b/src/com/ectrip/cyt/request/ConsumeOrderRequest.java
@@ -11,8 +11,11 @@ public class ConsumeOrderRequest extends Request {
public String verifyPassword;// 验证密码
private Long accountId; //操作员ID
public List products;//产品信息
+ private String voucher;
public String consumedSeq;//流水号
+ public String code;
+ public String credentials;
public String note2;//
public String note3;//
public String note4;//
@@ -22,7 +25,7 @@ public class ConsumeOrderRequest extends Request {
public String note8;//
public ConsumeOrderRequest(String orderId, String consumeCount,
- String password, String verifyPassword,String consumedSeq,Listproducts) {
+ String password, String verifyPassword,String consumedSeq,List products) {
super();
this.orderId = orderId;
this.consumedAmount = consumeCount;
@@ -30,6 +33,7 @@ public class ConsumeOrderRequest extends Request {
this.verifyPassword = verifyPassword;
this.products = products;
this.consumedSeq = consumedSeq;
+
}
public void setOrderId(String orderId) {
@@ -154,4 +158,28 @@ public class ConsumeOrderRequest extends Request {
public void setNote8(String note8) {
this.note8 = note8;
}
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getCredentials() {
+ return credentials;
+ }
+
+ public void setCredentials(String credentials) {
+ this.credentials = credentials;
+ }
+
+ public String getVoucher() {
+ return voucher;
+ }
+
+ public void setVoucher(String voucher) {
+ this.voucher = voucher;
+ }
}
diff --git a/src/com/ectrip/cyt/request/QueryOrderRequest.java b/src/com/ectrip/cyt/request/QueryOrderRequest.java
index b06b62c..c05dde0 100644
--- a/src/com/ectrip/cyt/request/QueryOrderRequest.java
+++ b/src/com/ectrip/cyt/request/QueryOrderRequest.java
@@ -12,11 +12,12 @@ public class QueryOrderRequest extends Request {
private String endDate;// 截止日期
private String pageSize;// 分页大小
private String pageNo;// 页数
+ private String voucher;
public QueryOrderRequest() {
}
- public QueryOrderRequest( String method, String verifyCode, String phone, String credentials, String orderId, String startDate, String endDate,String pageSize,String pageNo) {
+ public QueryOrderRequest( String method, String verifyCode, String phone, String credentials, String orderId, String startDate, String endDate,String pageSize,String pageNo,String voucher) {
this.method = method;
this.orderId = orderId;
this.verifyCode = verifyCode;
@@ -26,6 +27,7 @@ public class QueryOrderRequest extends Request {
this.endDate = endDate;
this.pageSize = pageSize;
this.pageNo = pageNo;
+ this.voucher = voucher;
}
public void setMethod(String method) {
@@ -99,4 +101,12 @@ public class QueryOrderRequest extends Request {
public String getPageNo() {
return pageNo;
}
+
+ public String getVoucher() {
+ return voucher;
+ }
+
+ public void setVoucher(String voucher) {
+ this.voucher = voucher;
+ }
}
diff --git a/src/com/ectrip/cyt/response/ProductInfoQuery.java b/src/com/ectrip/cyt/response/ProductInfoQuery.java
index e272888..6f78e00 100644
--- a/src/com/ectrip/cyt/response/ProductInfoQuery.java
+++ b/src/com/ectrip/cyt/response/ProductInfoQuery.java
@@ -1,28 +1,27 @@
package com.ectrip.cyt.response;
+import com.ectrip.cyt.base.OrderInfo;
+
+import java.util.List;
+
/**
* This is
*
* @author Jiehao Ling, 5:28 PM,9/6/16
*/
public class ProductInfoQuery {
- private String productId;// 原始产品ID
- private String name;// 产品名称
- private String totalQuantity;// 总数量
- private String consumedQuantity;// 已消费数量
- private String quantity;// 订单剩余数量
- private String baseQuantity;// 基数
- private String startDate;// 开始日期（yyyy;//MM;//dd）
- private String endDate;// 截止日期（yyyy;//MM;//dd）
- private String price;// 单价
- private String money;// 金额
- private String paymentType;// 支付类型（预付、到付）
- private String pmsProductId;// 线下产品ID（窗口设备使用）
-
- public ProductInfoQuery() {
- }
-
- public ProductInfoQuery(String productId, String name, String totalQuantity, String consumedQuantity, String quantity, String baseQuantity, String startDate, String endDate, String price, String money, String paymentType, String pmsProductId) {
+
+ private String baseQuantity;
+ private String consumedQuantity;
+ private String endDate;
+ private String name;
+ private String productId;
+ private String quantity;
+ private String startDate;
+ private String totalQuantity;
+// private List orderPassengers;
+ private List passengerInfos;
+ public ProductInfoQuery(String productId, String name, String totalQuantity, String consumedQuantity, String quantity, String baseQuantity, String startDate, String endDate, List passengerInfos) {
this.productId = productId;
this.name = name;
this.totalQuantity = totalQuantity;
@@ -31,34 +30,15 @@ public class ProductInfoQuery {
this.baseQuantity = baseQuantity;
this.startDate = startDate;
this.endDate = endDate;
- this.price = price;
- this.money = money;
- this.paymentType = paymentType;
- this.pmsProductId = pmsProductId;
- }
-
- public String getProductId() {
- return productId;
- }
-
- public void setProductId(String productId) {
- this.productId = productId;
+ this.passengerInfos = passengerInfos;
}
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getTotalQuantity() {
- return totalQuantity;
+ public String getBaseQuantity() {
+ return baseQuantity;
}
- public void setTotalQuantity(String totalQuantity) {
- this.totalQuantity = totalQuantity;
+ public void setBaseQuantity(String baseQuantity) {
+ this.baseQuantity = baseQuantity;
}
public String getConsumedQuantity() {
@@ -69,67 +49,195 @@ public class ProductInfoQuery {
this.consumedQuantity = consumedQuantity;
}
- public String getQuantity() {
- return quantity;
+ public String getEndDate() {
+ return endDate;
}
- public void setQuantity(String quantity) {
- this.quantity = quantity;
+ public void setEndDate(String endDate) {
+ this.endDate = endDate;
}
- public String getBaseQuantity() {
- return baseQuantity;
+ public String getName() {
+ return name;
}
- public void setBaseQuantity(String baseQuantity) {
- this.baseQuantity = baseQuantity;
+ public void setName(String name) {
+ this.name = name;
}
- public String getStartDate() {
- return startDate;
+ public String getProductId() {
+ return productId;
}
- public void setStartDate(String startDate) {
- this.startDate = startDate;
+ public void setProductId(String productId) {
+ this.productId = productId;
}
- public String getEndDate() {
- return endDate;
+ public String getQuantity() {
+ return quantity;
}
- public void setEndDate(String endDate) {
- this.endDate = endDate;
+ public void setQuantity(String quantity) {
+ this.quantity = quantity;
}
- public String getPrice() {
- return price;
+ public String getStartDate() {
+ return startDate;
}
- public void setPrice(String price) {
- this.price = price;
+ public void setStartDate(String startDate) {
+ this.startDate = startDate;
}
- public String getMoney() {
- return money;
+ public String getTotalQuantity() {
+ return totalQuantity;
}
- public void setMoney(String money) {
- this.money = money;
+ public void setTotalQuantity(String totalQuantity) {
+ this.totalQuantity = totalQuantity;
}
- public String getPaymentType() {
- return paymentType;
- }
+// public List getOrderPassengers() {
+// return orderPassengers;
+// }
+//
+// public void setOrderPassengers(List orderPassengers) {
+// this.orderPassengers = orderPassengers;
- public void setPaymentType(String paymentType) {
- this.paymentType = paymentType;
- }
- public String getPmsProductId() {
- return pmsProductId;
+ public List getPassengerInfos() {
+ return passengerInfos;
}
- public void setPmsProductId(String pmsProductId) {
- this.pmsProductId = pmsProductId;
+ public void setPassengerInfos(List passengerInfos) {
+ this.passengerInfos = passengerInfos;
}
}
+
+// private String productId;// 原始产品ID
+// private String name;// 产品名称
+// private String totalQuantity;// 总数量
+// private String consumedQuantity;// 已消费数量
+// private String quantity;// 订单剩余数量
+// private String baseQuantity;// 基数
+// private String startDate;// 开始日期（yyyy;//MM;//dd）
+// private String endDate;// 截止日期（yyyy;//MM;//dd）
+// private String price;// 单价
+// private String money;// 金额
+// private String paymentType;// 支付类型（预付、到付）
+// private String pmsProductId;// 线下产品ID（窗口设备使用）
+
+// public ProductInfoQuery() {
+// }
+
+// public ProductInfoQuery(String productId, String name, String totalQuantity, String consumedQuantity, String quantity, String baseQuantity, String startDate, String endDate, String price, String money, String paymentType, String pmsProductId) {
+// this.productId = productId;
+// this.name = name;
+// this.totalQuantity = totalQuantity;
+// this.consumedQuantity = consumedQuantity;
+// this.quantity = quantity;
+// this.baseQuantity = baseQuantity;
+// this.startDate = startDate;
+// this.endDate = endDate;
+// this.price = price;
+// this.money = money;
+// this.paymentType = paymentType;
+// this.pmsProductId = pmsProductId;
+// }
+
+// public String getProductId() {
+// return productId;
+// }
+//
+// public void setProductId(String productId) {
+// this.productId = productId;
+// }
+//
+// public String getName() {
+// return name;
+// }
+//
+// public void setName(String name) {
+// this.name = name;
+// }
+//
+// public String getTotalQuantity() {
+// return totalQuantity;
+// }
+//
+// public void setTotalQuantity(String totalQuantity) {
+// this.totalQuantity = totalQuantity;
+// }
+//
+// public String getConsumedQuantity() {
+// return consumedQuantity;
+// }
+//
+// public void setConsumedQuantity(String consumedQuantity) {
+// this.consumedQuantity = consumedQuantity;
+// }
+//
+// public String getQuantity() {
+// return quantity;
+// }
+//
+// public void setQuantity(String quantity) {
+// this.quantity = quantity;
+// }
+//
+// public String getBaseQuantity() {
+// return baseQuantity;
+// }
+//
+// public void setBaseQuantity(String baseQuantity) {
+// this.baseQuantity = baseQuantity;
+// }
+//
+// public String getStartDate() {
+// return startDate;
+// }
+//
+// public void setStartDate(String startDate) {
+// this.startDate = startDate;
+// }
+//
+// public String getEndDate() {
+// return endDate;
+// }
+//
+// public void setEndDate(String endDate) {
+// this.endDate = endDate;
+// }
+//
+// public String getPrice() {
+// return price;
+// }
+//
+// public void setPrice(String price) {
+// this.price = price;
+// }
+//
+// public String getMoney() {
+// return money;
+// }
+//
+// public void setMoney(String money) {
+// this.money = money;
+// }
+//
+// public String getPaymentType() {
+// return paymentType;
+// }
+//
+// public void setPaymentType(String paymentType) {
+// this.paymentType = paymentType;
+// }
+//
+// public String getPmsProductId() {
+// return pmsProductId;
+// }
+//
+// public void setPmsProductId(String pmsProductId) {
+// this.pmsProductId = pmsProductId;
+// }
+//}
diff --git a/src/com/ectrip/cyt/ui/CodeOrderListActivity.java b/src/com/ectrip/cyt/ui/CodeOrderListActivity.java
index a91ca47..9fe832b 100644
--- a/src/com/ectrip/cyt/ui/CodeOrderListActivity.java
+++ b/src/com/ectrip/cyt/ui/CodeOrderListActivity.java
@@ -205,7 +205,7 @@ public class CodeOrderListActivity extends BaseActivity implements
if (orderInfos != null) {
adapter = new ReportExpandableListAdapter(
CodeOrderListActivity.this,
- CodeOrderListActivity.this, orderInfos);
+ CodeOrderListActivity.this, orderInfos,0);
orderList.setAdapter(adapter);
//取消分割线
diff --git a/src/com/ectrip/cyt/ui/IDOrderListActivity.java b/src/com/ectrip/cyt/ui/IDOrderListActivity.java
index fb15dc0..26e3332 100644
--- a/src/com/ectrip/cyt/ui/IDOrderListActivity.java
+++ b/src/com/ectrip/cyt/ui/IDOrderListActivity.java
@@ -35,7 +35,9 @@ import com.ectrip.cyt.config.MyApp;
import com.ectrip.cyt.constant.DeviceType;
import com.ectrip.cyt.constant.OrderCode;
import com.ectrip.cyt.constant.SelectAction;
+import com.ectrip.cyt.response.PassengerInfosBean;
import com.ectrip.cyt.response.QueryOrderResponse;
+import com.ectrip.cyt.utils.LogUtil;
import com.ectrip.cyt.utils.SharedPreferences2Obj;
import com.ectrip.cyt.utils.SoundUtil;
import com.ectrip.trips.check.R;
@@ -66,7 +68,7 @@ public class IDOrderListActivity extends BaseActivity implements
private ProgressBar load_progress;
private boolean isUpMove = false;
private int allItem;
-
+ List list = new ArrayList<>();
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -289,6 +291,7 @@ public class IDOrderListActivity extends BaseActivity implements
@Override
public void afterCompletedCallback(DataTrans result) {
+ LogUtil.d("IDOrderListActivity","result_data = "+result.getData());
if (result != null) {
signed = result.getSigned();
data = result.getData();
@@ -352,7 +355,7 @@ public class IDOrderListActivity extends BaseActivity implements
if (adapter==null){
adapter = new ReportExpandableListAdapter(
IDOrderListActivity.this,
- IDOrderListActivity.this, orderInfos);
+ IDOrderListActivity.this, orderInfos,1);
orderList.setAdapter(adapter);
}else {
adapter.notifyDataSetChanged();
@@ -422,8 +425,36 @@ public class IDOrderListActivity extends BaseActivity implements
centerHandle = new CenterHandle(IDOrderListActivity.this,
orderInfos, pwd, "TRUE", IDOrderListActivity.this);
}
- centerHandle.dialog(Integer.parseInt(orderInfos.get(position)
- .getOrderAmount()), position);
+// centerHandle.dialog(Integer.parseInt(orderInfos.get(position)
+// .getOrderAmount()), position);
+
+// list.clear();
+// List passengerInfosBeans = orderInfos.get(position).getProducts().get(position).getPassengerInfos();
+// for (PassengerInfosBean bean : passengerInfosBeans){
+// if("ID_CARD".equals(bean.getCredentialsType())){
+// list.add(bean.getCredentials());
+// }else{
+// list.add(bean.getVoucher());
+// }
+// }
+// // List集合转成数组
+// String[] str = list.toArray(new String[0]);
+// centerHandle.showDialog(str);
+ LogUtil.d("IDOrderListActivity","idcardNumber = "+idcardNumber);
+ List passengerInfosBeans = orderInfos.get(position).getProducts().get(position).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);
+ }
+
+ }
+ }
+
} catch (NumberFormatException e) {
e.printStackTrace();
}
diff --git a/src/com/ectrip/cyt/ui/InputOrderListActivity.java b/src/com/ectrip/cyt/ui/InputOrderListActivity.java
index 389a949..7d66b04 100644
--- a/src/com/ectrip/cyt/ui/InputOrderListActivity.java
+++ b/src/com/ectrip/cyt/ui/InputOrderListActivity.java
@@ -211,7 +211,7 @@ public class InputOrderListActivity extends BaseActivity implements
if (orderInfos != null) {
adapter = new ReportExpandableListAdapter(
InputOrderListActivity.this,
- InputOrderListActivity.this, orderInfos);
+ InputOrderListActivity.this, orderInfos,0);
orderList.setAdapter(adapter);
//取消分割线
diff --git a/src/com/ectrip/cyt/ui/MainActivity.java b/src/com/ectrip/cyt/ui/MainActivity.java
index b980817..e3a66a3 100644
--- a/src/com/ectrip/cyt/ui/MainActivity.java
+++ b/src/com/ectrip/cyt/ui/MainActivity.java
@@ -268,12 +268,12 @@ public class MainActivity extends BaseActivity implements OnItemClickListener, V
String ec_signkey = AESEncryptor.decrypt(constant.decrypt,
listConfig.get(0).getEc_signkey());
MyApp.getInstance().setSignkey(ec_signkey);
- LogUtil.i("MainActivity", ec_signkey);
+ LogUtil.i("MainActivity","ec_signkey = "+ ec_signkey);
} catch (Exception e) {
e.printStackTrace();
}
MyApp.getInstance().setIdentity(listConfig.get(0).getEc_identity());
- LogUtil.i("MainActivity", listConfig.get(0).getEc_identity());
+ LogUtil.i("MainActivity", "getEc_identity = "+listConfig.get(0).getEc_identity());
LogUtil.d(TAG, getString(R.string.current_ip)
+ MyApp.getInstance().getServiceIp());
return true;
diff --git a/src/com/ectrip/cyt/ui/NewHandleScanerActivity.java b/src/com/ectrip/cyt/ui/NewHandleScanerActivity.java
index a91db4a..bac449c 100644
--- a/src/com/ectrip/cyt/ui/NewHandleScanerActivity.java
+++ b/src/com/ectrip/cyt/ui/NewHandleScanerActivity.java
@@ -20,6 +20,7 @@ import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
+
import android_serialport_api.SerialPortNewHandset;
import com.ectrip.cyt.bean.ConfigBean;
@@ -29,6 +30,7 @@ import com.ectrip.cyt.constant.constant;
import com.ectrip.cyt.db.DbManager;
import com.ectrip.cyt.shield_home.LockLayer.MToast;
import com.ectrip.cyt.utils.AESEncryptor;
+import com.ectrip.cyt.utils.Base64;
import com.ectrip.cyt.utils.DesUtil;
import com.ectrip.trips.check.R;
@@ -36,259 +38,270 @@ import com.ectrip.trips.check.R;
* @author jigo 新的手持机二维码扫描
*/
public class NewHandleScanerActivity extends BaseActivity {
- private final String TAG = "qrcode";
- protected MyApp mApplication;
- protected SerialPortNewHandset mSerialPort;
- protected OutputStream mOutputStream;
- private InputStream mInputStream;
- private ReadThread mReadThread;
- private String titleName;
+ private final String TAG = "qrcode";
+ protected MyApp mApplication;
+ protected SerialPortNewHandset mSerialPort;
+ protected OutputStream mOutputStream;
+ private InputStream mInputStream;
+ private ReadThread mReadThread;
+ private String titleName;
- private Button scanerBtn;
- private View topBack;
- private TextView title;
+ private Button scanerBtn;
+ private View topBack;
+ private TextView title;
- private AtomicBoolean isStop = new AtomicBoolean(false);
+ private AtomicBoolean isStop = new AtomicBoolean(false);
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_newhandle_scaner);
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_newhandle_scaner);
- initView();
- init();
+ initView();
+ init();
- setpower("/sys/class/gpio/gpio28/value", false); // 给二代证下电
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- }
- setpower("/sys/class/gpio/gpio114/value", true);
+ setpower("/sys/class/gpio/gpio28/value", false); // 给二代证下电
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ }
+ setpower("/sys/class/gpio/gpio114/value", true);
- // setTitle("Loopback test");
- scanerBtn = (Button) findViewById(R.id.scanerBtn);
- scanerBtn.setOnClickListener(new View.OnClickListener() {
- public void onClick(View paramAnonymousView) {
- byte[] arrayOfByte = { 0x1b, 0x31 };
- try {
- NewHandleScanerActivity.this.mOutputStream
- .write(arrayOfByte);
- return;
- } catch (IOException localIOException) {
- localIOException.printStackTrace();
- }
- }
- });
- }
+ // setTitle("Loopback test");
+ scanerBtn = (Button) findViewById(R.id.scanerBtn);
+ scanerBtn.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View paramAnonymousView) {
+ byte[] arrayOfByte = {0x1b, 0x31};
+ try {
+ NewHandleScanerActivity.this.mOutputStream
+ .write(arrayOfByte);
+ return;
+ } catch (IOException localIOException) {
+ localIOException.printStackTrace();
+ }
+ }
+ });
+ }
- private void initView() {
- title = (TextView) findViewById(R.id.title);
- topBack = findViewById(R.id.topBack);
- topBack.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- close();
- finish();
- }
- });
- }
+ private void initView() {
+ title = (TextView) findViewById(R.id.title);
+ topBack = findViewById(R.id.topBack);
+ topBack.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ close();
+ finish();
+ }
+ });
+ }
- private void init() {
- mApplication = (MyApp) getApplication();
- titleName = getIntent().getStringExtra("titleName");
- title.setVisibility(View.VISIBLE);
- if (titleName != null) {
- title.setText(titleName);
- } else {
- title.setText(R.string.qr_code);
- }
+ private void init() {
+ mApplication = (MyApp) getApplication();
+ titleName = getIntent().getStringExtra("titleName");
+ title.setVisibility(View.VISIBLE);
+ if (titleName != null) {
+ title.setText(titleName);
+ } else {
+ title.setText(R.string.qr_code);
+ }
- try {
- mSerialPort = DevicTool.getInstance().getSerialPortNewHandset();
- mOutputStream = mSerialPort.getOutputStream();
- mInputStream = mSerialPort.getInputStream();
+ try {
+ mSerialPort = DevicTool.getInstance().getSerialPortNewHandset();
+ mOutputStream = mSerialPort.getOutputStream();
+ mInputStream = mSerialPort.getInputStream();
- /* Create a receiving thread */
- mReadThread = new ReadThread();
- mReadThread.start();
- } catch (SecurityException e) {
- DisplayError(R.string.error_security);
- } catch (IOException e) {
- DisplayError(R.string.error_unknown);
- } catch (InvalidParameterException e) {
- DisplayError(R.string.error_configuration);
- }
- }
+ /* Create a receiving thread */
+ mReadThread = new ReadThread();
+ mReadThread.start();
+ } catch (SecurityException e) {
+ DisplayError(R.string.error_security);
+ } catch (IOException e) {
+ DisplayError(R.string.error_unknown);
+ } catch (InvalidParameterException e) {
+ DisplayError(R.string.error_configuration);
+ }
+ }
- public void delay(int i) {
- for (int j = 0; j < 1000; j++)
- for (; i < 0; i--)
- ;
- }
+ public void delay(int i) {
+ for (int j = 0; j < 1000; j++)
+ for (; i < 0; i--)
+ ;
+ }
- protected void onDataReceived(final byte[] buffer, final int size) {
- runOnUiThread(new Runnable() {
- public void run() {
+ protected void onDataReceived(final byte[] buffer, final int size) {
+ runOnUiThread(new Runnable() {
+ public void run() {
- try {
- String tempstr = new String(buffer, 0, size);
- handleDecode(new String(tempstr.getBytes("GBK"), "GBK"));
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- } catch (Exception e) {
- e.printStackTrace();
- }
- // mReception.append(new String(buffer, 0, size));
- }
- });
- }
+ try {
+ String tempstr = new String(buffer, 0, size);
+ handleDecode(new String(tempstr.getBytes("GBK"), "GBK"));
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ // mReception.append(new String(buffer, 0, size));
+ }
+ });
+ }
- /**
- * 处理扫描结果
- *
- * @param result
- * @param barcode
- */
- public void handleDecode(String result) {
- if (result.equals("")) {
- MToast(NewHandleScanerActivity.this, getString(R.string.scan_fail),
- MToast.LENGTH_SHORT);
- } else {
- try {
- result = result.substring(result.indexOf("_") + 1,
- result.indexOf(","));
- ArrayList beans = DbManager.GetConfigs();
- // 畅游通生成的订单ID：
- String ec_name = beans.get(0).getEc_signkey();
- ec_name = AESEncryptor.decrypt(constant.decrypt, ec_name);
- result = DesUtil.decrypt(result, ec_name);
- } catch (Exception e) {
- e.printStackTrace();
- MToast(NewHandleScanerActivity.this,
- getString(R.string.order_id_incorrect),
- MToast.LENGTH_SHORT);
- }
+ /**
+ * 处理扫描结果
+ *
+ * @param result
+ * @param
+ */
+ public void handleDecode(String result) {
+ if (result.equals("")) {
+ MToast(NewHandleScanerActivity.this, getString(R.string.scan_fail),
+ MToast.LENGTH_SHORT);
+ } else {
+ try {
+ if (result.startsWith("CYT_")) {
+ result = result.substring(result.indexOf("_") + 1,
+ result.indexOf(","));
+ ArrayList beans = DbManager.GetConfigs();
+ // 畅游通生成的订单ID：
+ String ec_name = beans.get(0).getEc_signkey();
+ ec_name = AESEncryptor.decrypt(constant.decrypt, ec_name);
+ result = DesUtil.decrypt(result, ec_name);
+ } else if (result.startsWith("TDOS_")) {
+ result = result.substring(
+ result.indexOf("_") + 1,
+ result.indexOf(","));
+ result = new String(Base64.decode(result), "utf-8");
+ } else if ((result.startsWith("TY_") || (result.startsWith("PMS_")))) {
+ result = result;
+ } else {
+ result = result;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ MToast(NewHandleScanerActivity.this,
+ getString(R.string.order_id_incorrect),
+ MToast.LENGTH_SHORT);
+ }
- Intent intent = new Intent(NewHandleScanerActivity.this,
- QRCodeOrderListActivity.class);
- intent.putExtra("mode", 1);
- intent.putExtra("input_orid", result);
- if (result != null) {
- MToast(NewHandleScanerActivity.this, result, Toast.LENGTH_SHORT);
- }
- intent.putExtra("titleName",getString(R.string.show_result));
- startActivity(intent);
- finish();
- }
- finish();
- }
+ Intent intent = new Intent(NewHandleScanerActivity.this,
+ QRCodeOrderListActivity.class);
+ intent.putExtra("mode", 1);
+ intent.putExtra("input_orid", result);
+ if (result != null) {
+ MToast(NewHandleScanerActivity.this, result, Toast.LENGTH_SHORT);
+ }
+ intent.putExtra("titleName", getString(R.string.show_result));
+ startActivity(intent);
+ finish();
+ }
+ finish();
+ }
- private void setpower(String path, boolean on) {
- File file;
- FileWriter fr;
- try {
- file = new File(path);
- fr = new FileWriter(file);
- if (on)
- fr.write("1");
- else
- fr.write("0");
- fr.close();
- } catch (IOException e) {
- Log.e(TAG, e.toString());
- }
- }
+ private void setpower(String path, boolean on) {
+ File file;
+ FileWriter fr;
+ try {
+ file = new File(path);
+ fr = new FileWriter(file);
+ if (on)
+ fr.write("1");
+ else
+ fr.write("0");
+ fr.close();
+ } catch (IOException e) {
+ Log.e(TAG, e.toString());
+ }
+ }
- @Override
- public void onBackPressed() {
- super.onBackPressed();
- close();
- this.finish();
- }
+ @Override
+ public void onBackPressed() {
+ super.onBackPressed();
+ close();
+ this.finish();
+ }
- @Override
- protected void onResume() {
- super.onResume();
- setpower("/sys/class/gpio/gpio114/value", true);
- }
+ @Override
+ protected void onResume() {
+ super.onResume();
+ setpower("/sys/class/gpio/gpio114/value", true);
+ }
- private class ReadThread extends Thread {
+ private class ReadThread extends Thread {
- @Override
- public void run() {
- super.run();
- while (!isInterrupted() && !isStop.get()) {
- int size;
- try {
- byte[] buffer = new byte[64];
- if (mInputStream == null)
- return;
- size = mInputStream.read(buffer);
- if (size > 0) {
- onDataReceived(buffer, size);
- }
- } catch (IOException e) {
- e.printStackTrace();
- return;
- }
- }
- }
- }
+ @Override
+ public void run() {
+ super.run();
+ while (!isInterrupted() && !isStop.get()) {
+ int size;
+ try {
+ byte[] buffer = new byte[64];
+ if (mInputStream == null)
+ return;
+ size = mInputStream.read(buffer);
+ if (size > 0) {
+ onDataReceived(buffer, size);
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ return;
+ }
+ }
+ }
+ }
- @Override
- public void onPause() {
- // bContinue = false;
- try {
- Thread.sleep(600);
- } catch (InterruptedException e) {
- }
- // closeDrive();
- super.onPause();
- setpower("/sys/class/gpio/gpio114/value", false);
+ @Override
+ public void onPause() {
+ // bContinue = false;
+ try {
+ Thread.sleep(600);
+ } catch (InterruptedException e) {
+ }
+ // closeDrive();
+ super.onPause();
+ setpower("/sys/class/gpio/gpio114/value", false);
- }
+ }
- private void close() {
- isStop.set(true);
- if (mOutputStream != null) {
- try {
- mOutputStream.close();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- if (mOutputStream != null) {
- try {
- mOutputStream.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- if (mSerialPort != null) {
- mSerialPort.close();
- }
- if (mReadThread != null)
- mReadThread.interrupt();
- DevicTool.getInstance().closeSerialPortNewHandset();
- mSerialPort = null;
- }
+ private void close() {
+ isStop.set(true);
+ if (mOutputStream != null) {
+ try {
+ mOutputStream.close();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ if (mOutputStream != null) {
+ try {
+ mOutputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ if (mSerialPort != null) {
+ mSerialPort.close();
+ }
+ if (mReadThread != null)
+ mReadThread.interrupt();
+ DevicTool.getInstance().closeSerialPortNewHandset();
+ mSerialPort = null;
+ }
- @Override
- protected void onDestroy() {
- close();
- super.onDestroy();
- }
+ @Override
+ protected void onDestroy() {
+ close();
+ super.onDestroy();
+ }
- private void DisplayError(int resourceId) {
- AlertDialog.Builder b = new AlertDialog.Builder(this);
- b.setTitle("Error");
- b.setMessage(resourceId);
- b.setPositiveButton("OK", new OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- finish();
- }
- });
- b.show();
- }
+ private void DisplayError(int resourceId) {
+ AlertDialog.Builder b = new AlertDialog.Builder(this);
+ b.setTitle("Error");
+ b.setMessage(resourceId);
+ b.setPositiveButton("OK", new OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ finish();
+ }
+ });
+ b.show();
+ }
}
diff --git a/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java b/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java
index 1d98221..d133252 100644
--- a/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java
+++ b/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java
@@ -151,6 +151,10 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback {
resultString.indexOf("_") + 1,
resultString.indexOf(","));
resultString = new String(Base64.decode(resultString), "utf-8");
+ }else if((resultString.startsWith("TY_") || (resultString.startsWith("PMS_")))){
+ resultString = resultString;
+ }else{
+ resultString = resultString;
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/com/ectrip/cyt/ui/PhoneOrderListActivity.java b/src/com/ectrip/cyt/ui/PhoneOrderListActivity.java
index 3b20ae9..3bfce2d 100644
--- a/src/com/ectrip/cyt/ui/PhoneOrderListActivity.java
+++ b/src/com/ectrip/cyt/ui/PhoneOrderListActivity.java
@@ -38,6 +38,7 @@ import com.ectrip.cyt.constant.DeviceType;
import com.ectrip.cyt.constant.OrderCode;
import com.ectrip.cyt.constant.SelectAction;
import com.ectrip.cyt.response.QueryOrderResponse;
+import com.ectrip.cyt.utils.LogUtil;
import com.ectrip.cyt.utils.SharedPreferences2Obj;
import com.ectrip.cyt.utils.SoundUtil;
import com.ectrip.trips.check.R;
@@ -281,6 +282,7 @@ public class PhoneOrderListActivity extends BaseActivity implements
@Override
public void afterCompletedCallback(DataTrans result) {
+ LogUtil.d("PhoneOrderListActivity","result_data = "+result.getData());
if (result != null) {
signed = result.getSigned();
data = result.getData();
@@ -344,7 +346,7 @@ public class PhoneOrderListActivity extends BaseActivity implements
if (adapter==null){
adapter = new ReportExpandableListAdapter(
PhoneOrderListActivity.this,
- PhoneOrderListActivity.this, orderInfos);
+ PhoneOrderListActivity.this, orderInfos,0);
orderList.setAdapter(adapter);
}else {
diff --git a/src/com/ectrip/cyt/ui/QRCodeOrderListActivity.java b/src/com/ectrip/cyt/ui/QRCodeOrderListActivity.java
index adb9f1c..9bb165b 100644
--- a/src/com/ectrip/cyt/ui/QRCodeOrderListActivity.java
+++ b/src/com/ectrip/cyt/ui/QRCodeOrderListActivity.java
@@ -28,7 +28,9 @@ import com.ectrip.cyt.config.MyApp;
import com.ectrip.cyt.constant.DeviceType;
import com.ectrip.cyt.constant.OrderCode;
import com.ectrip.cyt.constant.SelectAction;
+import com.ectrip.cyt.response.PassengerInfosBean;
import com.ectrip.cyt.response.QueryOrderResponse;
+import com.ectrip.cyt.utils.LogUtil;
import com.ectrip.cyt.utils.SharedPreferences2Obj;
import com.ectrip.cyt.utils.SoundUtil;
import com.ectrip.trips.check.R;
@@ -39,287 +41,293 @@ import com.ectrip.trips.view.AnimatedExpandableListView;
/**
* 二维码列表
*/
-public class QRCodeOrderListActivity extends BaseActivity implements
- ListOnclickCallback {
+public class QRCodeOrderListActivity extends BaseActivity implements ListOnclickCallback {
+ private String TAG = "QRCodeOrderListActivity";
+ private AnimatedExpandableListView orderList;
+ private ReportExpandableListAdapter adapter;
+ private String orid;
+ private List orderInfos;
+ private Integer type;
+ private View errorLayout;
+ private TextView errorInfo;
+ private Integer Select;
- private AnimatedExpandableListView orderList;
- private ReportExpandableListAdapter adapter;
- private String orid;
- private List orderInfos;
- private Integer type;
- private View errorLayout;
- private TextView errorInfo;
- private Integer Select;
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.id_order_list_activity);
+ initView();
+ init();
+ }
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.id_order_list_activity);
- initView();
- init();
- }
+ private void initView() {
+ Select = SharedPreferences2Obj
+ .getInstance(QRCodeOrderListActivity.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));
+ }
+ errorLayout = findViewById(R.id.errorLayout);
+ errorInfo = (TextView) errorLayout.findViewById(R.id.errorInfo);
+ ((TextView) findViewById(R.id.title)).setVisibility(View.VISIBLE);
+ orderList = (AnimatedExpandableListView) findViewById(R.id.orderList);
+ orderList.setGroupIndicator(null);
+ findViewById(R.id.topBack).setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+ });
+ }
- private void initView() {
- Select = SharedPreferences2Obj
- .getInstance(QRCodeOrderListActivity.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));
- }
- errorLayout = findViewById(R.id.errorLayout);
- errorInfo = (TextView) errorLayout.findViewById(R.id.errorInfo);
- ((TextView) findViewById(R.id.title)).setVisibility(View.VISIBLE);
- orderList = (AnimatedExpandableListView) findViewById(R.id.orderList);
- orderList.setGroupIndicator(null);
- findViewById(R.id.topBack).setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- finish();
- }
- });
- }
+ private void init() {
+ type = SharedPreferences2Obj.getInstance(QRCodeOrderListActivity.this)
+ .setName("MachineType").getObject("type", Integer.class);
+ orid = getIntent().getStringExtra("input_orid");
+ LogUtil.d(TAG, "orid = " + orid);
+ HttpHelper.getInstance(QRCodeOrderListActivity.this).queryOrder(
+ "QRCODE", null, null, null, orid, null, null, "15", "1",
+ new MyHttpCallback());
+ }
- private void init() {
- type = SharedPreferences2Obj.getInstance(QRCodeOrderListActivity.this)
- .setName("MachineType").getObject("type", Integer.class);
- orid = getIntent().getStringExtra("input_orid");
- HttpHelper.getInstance(QRCodeOrderListActivity.this).queryOrder(
- "QRCODE", null, null, null, orid, null, null, "15","1",
- new MyHttpCallback());
- }
+ public class MyHttpCallback extends HttpCallback {
+ ProgressDialog dialog = null;
+ private String signed;
+ private String data;
- public class MyHttpCallback extends HttpCallback {
- ProgressDialog dialog = null;
- private String signed;
- private String data;
+ @Override
+ public void onStopCallback() {
- @Override
- public void onStopCallback() {
+ }
- }
+ @Override
+ public void onPreCallback() {
+ if (dialog == null) {
+ // 显示ProgressDialog
+ dialog = new ProgressDialog(QRCodeOrderListActivity.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 onPreCallback() {
- if (dialog == null) {
- // 显示ProgressDialog
- dialog = new ProgressDialog(QRCodeOrderListActivity.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(QRCodeOrderListActivity.this).playWavSound(R.raw.wuxiaopiao);
+ if (FailureStr != null) {
+ errorInfo.setText(FailureStr);
+ MToast(QRCodeOrderListActivity.this, FailureStr,
+ Toast.LENGTH_LONG);
+ }
+ }
- @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(QRCodeOrderListActivity.this).playWavSound(R.raw.wuxiaopiao);
- if (FailureStr != null) {
- errorInfo.setText(FailureStr);
- MToast(QRCodeOrderListActivity.this, FailureStr,
- Toast.LENGTH_LONG);
- }
- }
+ @Override
+ public void onCompletedCallback(DataTrans result) {
- @Override
- public void onCompletedCallback(DataTrans result) {
+ }
- }
+ @Override
+ public void afterCompletedCallback(DataTrans result) {
+ LogUtil.d("QRCodeOrderListActivity", "result_data = " + result.getData());
+ if (result != null) {
+ signed = result.getSigned();
+ data = result.getData();
+ parse2(result.getData(), QueryOrderResponse.class,
+ QRCodeOrderListActivity.this);
+ } else {
+ if (dialog != null && dialog.isShowing()) {
+ try {
+ dialog.dismiss();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+ }
+ //播放语音
+ SoundUtil.getInstents(QRCodeOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
+ MToast(QRCodeOrderListActivity.this,
+ getString(R.string.get_order_error), Toast.LENGTH_LONG);
+ }
+ }
- @Override
- public void afterCompletedCallback(DataTrans result) {
- if (result != null) {
- signed = result.getSigned();
- data = result.getData();
- parse2(result.getData(), QueryOrderResponse.class,
- QRCodeOrderListActivity.this);
- } else {
- if (dialog != null && dialog.isShowing()) {
- try {
- dialog.dismiss();
- } catch (Exception e) {
- e.printStackTrace();
- } catch (Throwable e) {
- e.printStackTrace();
- }
- }
- //播放语音
- SoundUtil.getInstents(QRCodeOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
- MToast(QRCodeOrderListActivity.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)) {
+ if (signed == null
+ || signed.equals(DataTool.getSign(MyApp
+ .getInstance().getSignkey(), data))) {
+ orderInfos = orderResponse.getOrderInfos();
+ if (orderInfos != null) {
+ adapter = new ReportExpandableListAdapter(
+ QRCodeOrderListActivity.this,
+ QRCodeOrderListActivity.this, orderInfos, 1);
+ orderList.setAdapter(adapter);
- @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)) {
- if (signed == null
- || signed.equals(DataTool.getSign(MyApp
- .getInstance().getSignkey(), data))) {
- orderInfos = orderResponse.getOrderInfos();
- if (orderInfos != null) {
- adapter = new ReportExpandableListAdapter(
- QRCodeOrderListActivity.this,
- QRCodeOrderListActivity.this, orderInfos);
- orderList.setAdapter(adapter);
+ //取消分割线
+ orderList.setDivider(null);
+ //默认展开
+ for (int i = 0; i < orderInfos.size(); i++) {
+ orderList.expandGroup(i);
+ }
- //取消分割线
- orderList.setDivider(null);
- //默认展开
- for (int i = 0; i < orderInfos.size(); i++) {
- orderList.expandGroup(i);
- }
+ //点击不可收缩
+ orderList.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
- //点击不可收缩
- orderList.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
+ @Override
+ public boolean onGroupClick(ExpandableListView parent, View v,
+ int groupPosition, long id) {
+ return true;
+ }
+ });
- @Override
- public boolean onGroupClick(ExpandableListView parent, View v,
- int groupPosition, long id) {
- return true;
- }
- });
+ } else {
+ //播放语音
+ SoundUtil.getInstents(QRCodeOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
+ MToast(QRCodeOrderListActivity.this,
+ getString(R.string.get_order_error),
+ Toast.LENGTH_LONG);
+ }
+ } else {
+ //播放语音
+ SoundUtil.getInstents(QRCodeOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
+ onFailureCallback(getString(R.string.sign_not_pass));
+ MToast(QRCodeOrderListActivity.this,
+ getString(R.string.sign_not_pass),
+ Toast.LENGTH_LONG);
+ }
+ } else {
+ onFailureCallback(orderResponse.getDescribe());
+ MToast(QRCodeOrderListActivity.this,
+ orderResponse.getDescribe(), Toast.LENGTH_LONG);
+ }
+ }
+ }
+ }
- } else {
- //播放语音
- SoundUtil.getInstents(QRCodeOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
- MToast(QRCodeOrderListActivity.this,
- getString(R.string.get_order_error),
- Toast.LENGTH_LONG);
- }
- } else {
- //播放语音
- SoundUtil.getInstents(QRCodeOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
- onFailureCallback(getString(R.string.sign_not_pass));
- MToast(QRCodeOrderListActivity.this,
- getString(R.string.sign_not_pass),
- Toast.LENGTH_LONG);
- }
- } else {
- onFailureCallback(orderResponse.getDescribe());
- MToast(QRCodeOrderListActivity.this,
- orderResponse.getDescribe(), Toast.LENGTH_LONG);
- }
- }
- }
- }
+ CenterHandle centerHandle;
- CenterHandle centerHandle;
-
- @Override
- public void onclickCallback(View view, int position) {
- if (view.getId() == R.id.ticketPrint) {
- if (centerHandle == null) {
- centerHandle = new CenterHandle(QRCodeOrderListActivity.this,
- orderInfos, "", "FALSE", QRCodeOrderListActivity.this);
- }
- centerHandle.allTicket(position, "", "FALSE");
- } else if (view.getId() == R.id.part) {
- try {
+ @Override
+ public void onclickCallback(View view, int position) {
+ if (view.getId() == R.id.ticketPrint) {
+ if (centerHandle == null) {
+ centerHandle = new CenterHandle(QRCodeOrderListActivity.this,
+ orderInfos, "", "FALSE", QRCodeOrderListActivity.this);
+ }
+ centerHandle.allTicket(position, "", "FALSE");
+ } 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(
- QRCodeOrderListActivity.this, orderInfos, "",
- "FALSE", QRCodeOrderListActivity.this);
- }
- centerHandle.dialog(
- Integer.parseInt(orderInfos.get(position).getOrderAmount()),
- position);
- } catch (NumberFormatException e) {
- e.printStackTrace();
- }
- }
- }
+ if (centerHandle == null) {
+ centerHandle = new CenterHandle(
+ QRCodeOrderListActivity.this, orderInfos, "",
+ "FALSE", QRCodeOrderListActivity.this);
+ }
+// centerHandle.dialog(Integer.parseInt(orderInfos.get(position).getOrderAmount()), position);
+ List passengerInfosBeans = orderInfos.get(position).getProducts().get(position).getPassengerInfos();
+ for (PassengerInfosBean bean : passengerInfosBeans) {
+ if (orid.equals(bean.getVoucher())) {
+ LogUtil.d("IDOrderListActivity", "getVoucher = " + bean.getVoucher());
+ centerHandle.partTicket(position, "", "TRUE", bean.getVoucher(), false);
+ }
+ }
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ }
+ }
+ }
- @Override
- public void onCenterCallback() {
- adapter.notifyDataSetChanged();
- centerHandle = null;
- }
+ @Override
+ public void onCenterCallback() {
+ adapter.notifyDataSetChanged();
+ centerHandle = null;
+ }
- AtomicBoolean isonKey = new AtomicBoolean(false);
+ AtomicBoolean isonKey = new AtomicBoolean(false);
- @Override
- public void onPrintInfosCallback(String Infos) {
- PrintHandle.getInstance().print(Infos, QRCodeOrderListActivity.this);
- }
+ @Override
+ public void onPrintInfosCallback(String Infos) {
+ PrintHandle.getInstance().print(Infos, QRCodeOrderListActivity.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 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
+ 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() {
- PrintHandle.getInstance().printClose();
- super.onDestroy();
- }
+ @Override
+ protected void onDestroy() {
+ PrintHandle.getInstance().printClose();
+ super.onDestroy();
+ }
}
diff --git a/src/com/ectrip/cyt/ui/ScanerOrderActivity.java b/src/com/ectrip/cyt/ui/ScanerOrderActivity.java
index 9d98d78..ec30a6b 100644
--- a/src/com/ectrip/cyt/ui/ScanerOrderActivity.java
+++ b/src/com/ectrip/cyt/ui/ScanerOrderActivity.java
@@ -29,6 +29,7 @@ import com.ectrip.cyt.db.DbManager;
import com.ectrip.cyt.shield_home.LockLayer.MToast;
import com.ectrip.cyt.utils.AESEncryptor;
import com.ectrip.cyt.utils.ActivitiesManager;
+import com.ectrip.cyt.utils.Base64;
import com.ectrip.cyt.utils.CommetryUtils;
import com.ectrip.cyt.utils.DesUtil;
import com.ectrip.cyt.utils.LogUtil;
@@ -50,363 +51,375 @@ import java.util.ArrayList;
*/
public class ScanerOrderActivity extends BaseActivity {
- public final String TAG = "ScanerOrderActivity";
-
- static {
- try {
- System.loadLibrary("iconv");
- } catch (Exception e) {
- e.printStackTrace();
- } catch (Throwable e) {
- e.printStackTrace();
- }
- }
- private String titleName;
-
- private final float BEEP_VOLUME = 0.10f;
- private final long VIBRATE_DURATION = 200L;
-
- @SuppressWarnings("deprecation")
- private Camera mCamera;
- private CameraPreview mPreview;
- @SuppressWarnings("deprecation")
- Parameters mParameters;
- MediaPlayer player;
- private MediaPlayer mediaPlayer;
- ImageScanner scanner;
-
- private boolean playBeep = true;
-
- private String scannerResult = "";
-
- private Integer Select; // 选择模式 检票 补票 查票
-
- private WifiManager wifi;
- private boolean isConnected;
-
- private MyHandler handler;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.app_ord_scanner);
- ActivitiesManager.getInstance().pushActivity(this);
-
- ConnectivityManager connManager = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
- NetworkInfo mWifi = connManager
- .getNetworkInfo(ConnectivityManager.TYPE_WIFI);
-
- if (mWifi.isConnected()) {
- isConnected = true;
- } else {
- wifi = (WifiManager) getApplicationContext().getSystemService(ScanerOrderActivity.WIFI_SERVICE);
- if (wifi.isWifiEnabled()) {
- } else {
- wifi.setWifiEnabled(true);
- }
- }
-
- initConfig();
- initView();
- }
-
- private void initConfig() {
- findViewById(R.id.topBack).setOnClickListener(new OnClickListener() {
-
- @Override
- public void onClick(View arg0) {
- finish();
- }
- });
- }
-
- @SuppressWarnings("deprecation")
- private void initView() {
- try {
- SharedPreferences2Obj.getInstance(ScanerOrderActivity.this)
- .setName("SelectAction").setObject("isStatistic", "0"); // 非统计
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- try {
- titleName = getIntent().getStringExtra("titleName");
- if (titleName != null) {
- ((TextView) findViewById(R.id.title)).setText(titleName);
- } else {
- ((TextView) findViewById(R.id.title))
- .setText(R.string.scan_qr_code);
- }
- ((TextView) findViewById(R.id.title)).setVisibility(View.VISIBLE);
- FrameLayout preview = (FrameLayout) findViewById(R.id.cameraPreview);
-
- handler = new MyHandler();
- mCamera = getCameraInstance();
- mPreview = new CameraPreview(ScanerOrderActivity.this, mCamera,
- previewCb);
- preview.addView(mPreview);
- mCamera.setPreviewCallbackWithBuffer(previewCb);
- mCamera.startPreview();
-
- if (isConnected == false && wifi != null && wifi.isWifiEnabled()) {
- wifi.setWifiEnabled(false);
- }
- } catch (Exception e1) {
- e1.printStackTrace();
- }
-
- new Thread(new Runnable() {
-
- @Override
- public void run() {
- try {
- player = MediaPlayer.create(ScanerOrderActivity.this,
- R.raw.bad);
-
- /* Instance barcode scanner */
- scanner = new ImageScanner();
- scanner.setConfig(0, Config.POSITION, 3);
- scanner.setConfig(0, Config.POSITION, 3);
-
- // 初始化声音和震动
- AudioManager audioService = (AudioManager) getSystemService(AUDIO_SERVICE);
- // 如果手机是震动模式就震动
- if (audioService.getRingerMode() != AudioManager.RINGER_MODE_NORMAL) {
- playBeep = false;
- }
- // 初始化声音
- initBeepSound();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }).start();
- }
-
- @SuppressWarnings("deprecation")
- PreviewCallback previewCb = new PreviewCallback() {
- @Override
- public void onPreviewFrame(byte[] data, Camera camera) {
- Camera.Parameters parameters = camera.getParameters();
- Size size = parameters.getPreviewSize();
-
- Image barcode = new Image(size.width, size.height, "NV21");
- barcode.setData(data);
- barcode = barcode.convert("Y800");
- int result = scanner.scanImage(barcode);
- // Toast.makeText(CameraTestActivity.this, result+"",
- // Toast.LENGTH_SHORT).show();
- if (result != 0) {
- mCamera.setPreviewCallback(null);
- mCamera.stopPreview();
-
- SymbolSet syms = scanner.getResults();
-
- playBeepSoundAndVibrate();// 播放声音和振动代表成功获取二维码
-
- for (Symbol sym : syms) {
-
- try {
-
- scannerResult = sym.getData();
- LogUtil.i(TAG, getString(R.string.scan_result)
- + scannerResult);
- scannerResult = scannerResult.substring(
- scannerResult.indexOf("_") + 1,
- scannerResult.indexOf(","));
- ArrayList beans = DbManager.GetConfigs();
- // 畅游通生成的订单ID：
- String ec_name = beans.get(0).getEc_signkey();
- ec_name = AESEncryptor.decrypt(constant.decrypt,
- ec_name);
- scannerResult = DesUtil.decrypt(scannerResult, ec_name);
- LogUtil.i(TAG, getString(R.string.scan_result)
- + scannerResult);
- Message msg = new Message();
- msg.what = 0;
- msg.obj = scannerResult;
- handler.handleMessage(msg);
- } catch (Exception e) {
- // player.start();
- try {
- scannerResult = "";
- e.printStackTrace();
- MToast(ScanerOrderActivity.this,
- getString(R.string.setting_is_correct),
- MToast.LENGTH_LONG);
- errorGoon();// 播放错误信息
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
- }
-
- }
- }
- };
-
- @Override
- public void onPause() {
- super.onPause();
- releaseCamera();
- }
-
- @SuppressWarnings("deprecation")
- public static Camera getCameraInstance() {
- Camera c = null;
- try {
- c = Camera.open();
-
- } catch (Exception e) {
- }
- return c;
- }
-
- @SuppressWarnings("deprecation")
- private void releaseCamera() {
- try {
- if (mCamera != null) {
- mCamera.setPreviewCallback(null);
- mCamera.stopPreview();
- mCamera.release();
-
- mCamera = null;
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- @SuppressWarnings("deprecation")
- public void errorGoon() {
- player.start();
- mCamera.setPreviewCallback(previewCb);
- sleep(3000);
- mCamera.startPreview();
- }
-
- private void sleep(int ms) {
-
- try {
- java.lang.Thread.sleep(ms);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 初始化声音
- */
- private void initBeepSound() {
- if (playBeep && mediaPlayer == null) {
- setVolumeControlStream(AudioManager.STREAM_MUSIC);
- mediaPlayer = new MediaPlayer();
- mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
- mediaPlayer.setOnCompletionListener(beepListener);
- AssetFileDescriptor file = getResources().openRawResourceFd(
- R.raw.beep);
- try {
- mediaPlayer.setDataSource(file.getFileDescriptor(),
- file.getStartOffset(), file.getLength());
- file.close();
- mediaPlayer.setVolume(BEEP_VOLUME, BEEP_VOLUME);
- mediaPlayer.prepare();
- } catch (IOException e) {
- mediaPlayer = null;
- }
- }
- }
-
- /**
- * 播放声音和震动
- */
- private void playBeepSoundAndVibrate() {
- if (playBeep && mediaPlayer != null) {
- mediaPlayer.start();
- }
- // 打开震动
- Vibrator vibrator = (Vibrator) getSystemService(VIBRATOR_SERVICE);
- vibrator.vibrate(VIBRATE_DURATION);
- }
-
- private final OnCompletionListener beepListener = new OnCompletionListener() {
- @Override
- public void onCompletion(MediaPlayer mediaPlayer) {
- mediaPlayer.seekTo(0);
- }
- };
-
- @Override
- public boolean onKeyDown(int keyCode, KeyEvent event) {
- if (keyCode == KeyEvent.KEYCODE_BACK) {
- try {
- CommetryUtils.releaseCommery(this);
- } catch (Exception e) {
- e.printStackTrace();
- }
- finish();
- }
- return false;
-
- };
-
- @SuppressLint("HandlerLeak")
- private class MyHandler extends Handler {
- @Override
- public void handleMessage(Message msg) {
- if (Select == null) {
- try {
- Select = SharedPreferences2Obj
- .getInstance(ScanerOrderActivity.this)
- .setName("SelectAction")
- .getObject("Select", Integer.class);
- LogUtil.i(TAG, "====tempMode===" + Select + "");
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- switch (msg.what) {
- case 0:
- Intent intent = new Intent(ScanerOrderActivity.this,
- QRCodeOrderListActivity.class);
- intent.putExtra("mode", 1);
- intent.putExtra("input_orid", msg.obj.toString());
- intent.putExtra("titleName",getString(R.string.show_result));
- startActivity(intent);
- finish();
- break;
- }
- }
- }
-
- @Override
- protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-
- if (data == null) {
- return;
- }
-
- if (requestCode == 2 && resultCode == 2) {
- // initConfig();
- // initView();
- }
-
- }
-
- @Override
- protected void onDestroy() {
- if (isConnected == false && wifi != null && wifi.isWifiEnabled()) {
- try {
- wifi.setWifiEnabled(false);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- super.onDestroy();
- try {
- CommetryUtils.releaseCommery(this);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
+ public final String TAG = "ScanerOrderActivity";
+
+ static {
+ try {
+ System.loadLibrary("iconv");
+ } catch (Exception e) {
+ e.printStackTrace();
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+ }
+
+ private String titleName;
+
+ private final float BEEP_VOLUME = 0.10f;
+ private final long VIBRATE_DURATION = 200L;
+
+ @SuppressWarnings("deprecation")
+ private Camera mCamera;
+ private CameraPreview mPreview;
+ @SuppressWarnings("deprecation")
+ Parameters mParameters;
+ MediaPlayer player;
+ private MediaPlayer mediaPlayer;
+ ImageScanner scanner;
+
+ private boolean playBeep = true;
+
+ private String scannerResult = "";
+
+ private Integer Select; // 选择模式 检票 补票 查票
+
+ private WifiManager wifi;
+ private boolean isConnected;
+
+ private MyHandler handler;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.app_ord_scanner);
+ ActivitiesManager.getInstance().pushActivity(this);
+
+ ConnectivityManager connManager = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
+ NetworkInfo mWifi = connManager
+ .getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+
+ if (mWifi.isConnected()) {
+ isConnected = true;
+ } else {
+ wifi = (WifiManager) getApplicationContext().getSystemService(ScanerOrderActivity.WIFI_SERVICE);
+ if (wifi.isWifiEnabled()) {
+ } else {
+ wifi.setWifiEnabled(true);
+ }
+ }
+
+ initConfig();
+ initView();
+ }
+
+ private void initConfig() {
+ findViewById(R.id.topBack).setOnClickListener(new OnClickListener() {
+
+ @Override
+ public void onClick(View arg0) {
+ finish();
+ }
+ });
+ }
+
+ @SuppressWarnings("deprecation")
+ private void initView() {
+ try {
+ SharedPreferences2Obj.getInstance(ScanerOrderActivity.this)
+ .setName("SelectAction").setObject("isStatistic", "0"); // 非统计
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ try {
+ titleName = getIntent().getStringExtra("titleName");
+ if (titleName != null) {
+ ((TextView) findViewById(R.id.title)).setText(titleName);
+ } else {
+ ((TextView) findViewById(R.id.title))
+ .setText(R.string.scan_qr_code);
+ }
+ ((TextView) findViewById(R.id.title)).setVisibility(View.VISIBLE);
+ FrameLayout preview = (FrameLayout) findViewById(R.id.cameraPreview);
+
+ handler = new MyHandler();
+ mCamera = getCameraInstance();
+ mPreview = new CameraPreview(ScanerOrderActivity.this, mCamera,
+ previewCb);
+ preview.addView(mPreview);
+ mCamera.setPreviewCallbackWithBuffer(previewCb);
+ mCamera.startPreview();
+
+ if (isConnected == false && wifi != null && wifi.isWifiEnabled()) {
+ wifi.setWifiEnabled(false);
+ }
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+
+ new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ player = MediaPlayer.create(ScanerOrderActivity.this,
+ R.raw.bad);
+
+ /* Instance barcode scanner */
+ scanner = new ImageScanner();
+ scanner.setConfig(0, Config.POSITION, 3);
+ scanner.setConfig(0, Config.POSITION, 3);
+
+ // 初始化声音和震动
+ AudioManager audioService = (AudioManager) getSystemService(AUDIO_SERVICE);
+ // 如果手机是震动模式就震动
+ if (audioService.getRingerMode() != AudioManager.RINGER_MODE_NORMAL) {
+ playBeep = false;
+ }
+ // 初始化声音
+ initBeepSound();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }).start();
+ }
+
+ @SuppressWarnings("deprecation")
+ PreviewCallback previewCb = new PreviewCallback() {
+ @Override
+ public void onPreviewFrame(byte[] data, Camera camera) {
+ Camera.Parameters parameters = camera.getParameters();
+ Size size = parameters.getPreviewSize();
+
+ Image barcode = new Image(size.width, size.height, "NV21");
+ barcode.setData(data);
+ barcode = barcode.convert("Y800");
+ int result = scanner.scanImage(barcode);
+ // Toast.makeText(CameraTestActivity.this, result+"",
+ // Toast.LENGTH_SHORT).show();
+ if (result != 0) {
+ mCamera.setPreviewCallback(null);
+ mCamera.stopPreview();
+
+ SymbolSet syms = scanner.getResults();
+
+ playBeepSoundAndVibrate();// 播放声音和振动代表成功获取二维码
+
+ for (Symbol sym : syms) {
+
+ try {
+
+ scannerResult = sym.getData();
+ LogUtil.i(TAG, getString(R.string.scan_result)
+ + " = " + scannerResult);
+ if (scannerResult.startsWith("CYT_")) {
+ scannerResult = scannerResult.substring(
+ scannerResult.indexOf("_") + 1,
+ scannerResult.indexOf(","));
+ ArrayList beans = DbManager.GetConfigs();
+ // 畅游通生成的订单ID：
+ String ec_name = beans.get(0).getEc_signkey();
+ ec_name = AESEncryptor.decrypt(constant.decrypt,
+ ec_name);
+ scannerResult = DesUtil.decrypt(scannerResult, ec_name);
+ } else if (scannerResult.startsWith("TDOS_")) {
+ scannerResult = scannerResult.substring(
+ scannerResult.indexOf("_") + 1,
+ scannerResult.indexOf(","));
+ scannerResult = new String(Base64.decode(scannerResult), "utf-8");
+ } else if ((scannerResult.startsWith("TY_") || (scannerResult.startsWith("PMS_")))) {
+ scannerResult = scannerResult;
+ } else {
+ scannerResult = scannerResult;
+ }
+ Message msg = new Message();
+ msg.what = 0;
+ msg.obj = scannerResult;
+ handler.handleMessage(msg);
+ } catch (Exception e) {
+ // player.start();
+ try {
+ scannerResult = "";
+ e.printStackTrace();
+ MToast(ScanerOrderActivity.this,
+ getString(R.string.setting_is_correct),
+ MToast.LENGTH_LONG);
+ errorGoon();// 播放错误信息
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+
+ }
+ }
+ };
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ releaseCamera();
+ }
+
+ @SuppressWarnings("deprecation")
+ public static Camera getCameraInstance() {
+ Camera c = null;
+ try {
+ c = Camera.open();
+
+ } catch (Exception e) {
+ }
+ return c;
+ }
+
+ @SuppressWarnings("deprecation")
+ private void releaseCamera() {
+ try {
+ if (mCamera != null) {
+ mCamera.setPreviewCallback(null);
+ mCamera.stopPreview();
+ mCamera.release();
+
+ mCamera = null;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ @SuppressWarnings("deprecation")
+ public void errorGoon() {
+ player.start();
+ mCamera.setPreviewCallback(previewCb);
+ sleep(3000);
+ mCamera.startPreview();
+ }
+
+ private void sleep(int ms) {
+
+ try {
+ java.lang.Thread.sleep(ms);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 初始化声音
+ */
+ private void initBeepSound() {
+ if (playBeep && mediaPlayer == null) {
+ setVolumeControlStream(AudioManager.STREAM_MUSIC);
+ mediaPlayer = new MediaPlayer();
+ mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+ mediaPlayer.setOnCompletionListener(beepListener);
+ AssetFileDescriptor file = getResources().openRawResourceFd(
+ R.raw.beep);
+ try {
+ mediaPlayer.setDataSource(file.getFileDescriptor(),
+ file.getStartOffset(), file.getLength());
+ file.close();
+ mediaPlayer.setVolume(BEEP_VOLUME, BEEP_VOLUME);
+ mediaPlayer.prepare();
+ } catch (IOException e) {
+ mediaPlayer = null;
+ }
+ }
+ }
+
+ /**
+ * 播放声音和震动
+ */
+ private void playBeepSoundAndVibrate() {
+ if (playBeep && mediaPlayer != null) {
+ mediaPlayer.start();
+ }
+ // 打开震动
+ Vibrator vibrator = (Vibrator) getSystemService(VIBRATOR_SERVICE);
+ vibrator.vibrate(VIBRATE_DURATION);
+ }
+
+ private final OnCompletionListener beepListener = new OnCompletionListener() {
+ @Override
+ public void onCompletion(MediaPlayer mediaPlayer) {
+ mediaPlayer.seekTo(0);
+ }
+ };
+
+ @Override
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
+ if (keyCode == KeyEvent.KEYCODE_BACK) {
+ try {
+ CommetryUtils.releaseCommery(this);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ finish();
+ }
+ return false;
+
+ }
+
+ ;
+
+ @SuppressLint("HandlerLeak")
+ private class MyHandler extends Handler {
+ @Override
+ public void handleMessage(Message msg) {
+ if (Select == null) {
+ try {
+ Select = SharedPreferences2Obj
+ .getInstance(ScanerOrderActivity.this)
+ .setName("SelectAction")
+ .getObject("Select", Integer.class);
+ LogUtil.i(TAG, "====tempMode===" + Select + "");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ switch (msg.what) {
+ case 0:
+ Intent intent = new Intent(ScanerOrderActivity.this,
+ QRCodeOrderListActivity.class);
+ intent.putExtra("mode", 1);
+ intent.putExtra("input_orid", msg.obj.toString());
+ intent.putExtra("titleName", getString(R.string.show_result));
+ startActivity(intent);
+ finish();
+ break;
+ }
+ }
+ }
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+
+ if (data == null) {
+ return;
+ }
+
+ if (requestCode == 2 && resultCode == 2) {
+ // initConfig();
+ // initView();
+ }
+
+ }
+
+ @Override
+ protected void onDestroy() {
+ if (isConnected == false && wifi != null && wifi.isWifiEnabled()) {
+ try {
+ wifi.setWifiEnabled(false);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ super.onDestroy();
+ try {
+ CommetryUtils.releaseCommery(this);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
diff --git a/src/com/ectrip/trips/net/HttpHelper.java b/src/com/ectrip/trips/net/HttpHelper.java
index 732a6ca..0c66128 100644
--- a/src/com/ectrip/trips/net/HttpHelper.java
+++ b/src/com/ectrip/trips/net/HttpHelper.java
@@ -29,303 +29,339 @@ import com.ectrip.cyt.utils.SharedPreferences2Obj;
*/
public class HttpHelper extends HttpHelperCore {
- private Context mContext;
- public static HttpHelper helper = null;
+ private Context mContext;
+ public static HttpHelper helper = null;
- private String devType = "MDEV"; // 移动终端:MDEV 售票窗口:WDEV
- private static Boolean testMOdel = null;
- private Integer type;
- private static BaseActivity activity;
- // public static final String action="/service/terminal-2.action";
- public final String action = "/service/terminal-3.do";
+ private String devType = "MDEV"; // 移动终端:MDEV 售票窗口:WDEV
+ private static Boolean testMOdel = null;
+ private Integer type;
+ private static BaseActivity activity;
+ // public static final String action="/service/terminal-2.action";
+ public final String action = "/service/terminal-3.do";
- public static HttpHelper getInstance(Context mContext) {
- if (helper == null) {
- helper = new HttpHelper(mContext);
- }
- activity = (BaseActivity) mContext;
- return helper;
- }
- private HttpHelper(Context mContext) {
- this.mContext = mContext;
- testMOdel = SharedPreferences2Obj.getInstance(mContext)
- .setName("config").getObject("testMOdel", Boolean.class);
- type = SharedPreferences2Obj.getInstance(mContext)
- .setName("MachineType").getObject("type", Integer.class);
- }
+ public static HttpHelper getInstance(Context mContext) {
+ if (helper == null) {
+ helper = new HttpHelper(mContext);
+ }
+ activity = (BaseActivity) mContext;
+ return helper;
+ }
- /**
- * 获取终端获取订单信息
- *
- * @param method
- * 验证码： CODE 手机号码： PHONE 证件号码： ID 订单号码： ORDER
- * @param code
- */
- public void queryOrder(String method, String code, String phone,
- String credentials, String orderId, String startDate,
- String endDate, String pageSize, String count, HttpCallback httpCallback) {
- QueryOrderRequest orderRequest = new QueryOrderRequest(method, code,
- phone, credentials, orderId, startDate, endDate, pageSize,count);
- orderRequest.setVer(MyApp.getInstance().getVer());
- orderRequest.setVerType(MyApp.getInstance().getVerType());
- orderRequest.setDevId(DevicTool.getInstance().getDevId());
- orderRequest.setDevType(devType);
- HashMap map = new HashMap();
- map.put("method", "queryOrder");
- String requestParam = DataTool.envelopeData(orderRequest, MyApp
- .getInstance().getSignkey(), MyApp.getInstance().getIdentity());
- map.put("requestParam", requestParam);
- LogUtil.i(requestParam + "requestParam");
- executeHttpPost(
- "http://" + MyApp.getInstance().getServiceIp() + action, "",
- map, httpCallback, "data", DataTrans.class);
+ private HttpHelper(Context mContext) {
+ this.mContext = mContext;
+ testMOdel = SharedPreferences2Obj.getInstance(mContext)
+ .setName("config").getObject("testMOdel", Boolean.class);
+ type = SharedPreferences2Obj.getInstance(mContext)
+ .setName("MachineType").getObject("type", Integer.class);
+ }
- if (testMOdel != null && testMOdel) { // 这个是调试弹框
- if (type == null) {
- return;
- }
- if(activity==null){
- return;
- }
- activity.MToast(mContext, "服务地址："
- + MyApp.getInstance().getServiceIp() + ";" + "机器码："
- + DevicTool.getInstance().getDevId() + ";" + credentials + ";"
- + phone + ";", Toast.LENGTH_LONG);
- }
- }
+ /**
+ * 获取终端获取订单信息
+ *
+ * @param method 验证码： CODE 手机号码： PHONE 证件号码： ID 订单号码： ORDER
+ * @param code
+ */
+ QueryOrderRequest orderRequest;
+
+ public void queryOrder(String method, String code, String phone,
+ String credentials, String orderId, String startDate,
+ String endDate, String pageSize, String count, HttpCallback httpCallback) {
+ if ((orderId.startsWith("TY_") || (orderId.startsWith("PMS_")))) {
+ String voucher = orderId;
+ orderRequest = new QueryOrderRequest(method, code,
+ phone, credentials, "", startDate, endDate, pageSize, count, voucher);
+ } else {
+ orderRequest = new QueryOrderRequest(method, code,
+ phone, credentials, orderId, startDate, endDate, pageSize, count, "");
+ }
+ orderRequest.setVer(MyApp.getInstance().getVer());
+ orderRequest.setVerType(MyApp.getInstance().getVerType());
+ orderRequest.setDevId(DevicTool.getInstance().getDevId());
+ orderRequest.setDevType(devType);
+ HashMap map = new HashMap();
+ map.put("method", "queryOrder");
+ String requestParam = DataTool.envelopeData(orderRequest, MyApp
+ .getInstance().getSignkey(), MyApp.getInstance().getIdentity());
+ map.put("requestParam", requestParam);
+ LogUtil.i(requestParam + "requestParam");
+ executeHttpPost(
+ "http://" + MyApp.getInstance().getServiceIp() + action, "",
+ map, httpCallback, "data", DataTrans.class);
+ LogUtil.i("url = " + "http://" + MyApp.getInstance().getServiceIp() + action);
+ if (testMOdel != null && testMOdel) { // 这个是调试弹框
+ if (type == null) {
+ return;
+ }
+ if (activity == null) {
+ return;
+ }
+ activity.MToast(mContext, "服务地址："
+ + MyApp.getInstance().getServiceIp() + ";" + "机器码："
+ + DevicTool.getInstance().getDevId() + ";" + credentials + ";"
+ + phone + ";", Toast.LENGTH_LONG);
+ }
+ }
+
+ /**
+ * @param orderId 订单 ID
+ * @param count 消费数量
+ * @param password 订单密码
+ * @param verifyPassword 是否验证密码 是： TRUE 否： FALSE
+ * @param httpCallback 回调
+ */
+ public void consumeOrder(String orderId, String count, String password,
+ String verifyPassword, String consumedSeq, List products, HttpCallback httpCallback) {
+ Long accountId = MyApp.getInstance().getAccountId();
+ ConsumeOrderRequest consumeCount = new ConsumeOrderRequest(orderId,
+ count, password, verifyPassword, consumedSeq, products);
+ consumeCount.setVer(MyApp.getInstance().getVer());
+ consumeCount.setVerType(MyApp.getInstance().getVerType());
+ consumeCount.setDevId(DevicTool.getInstance().getDevId());
+ consumeCount.setAccountId(accountId);
+ consumeCount.setDevType(devType);
+
+ HashMap map = new HashMap();
+ map.put("method", "consumeOrder");
+ String requestParam = DataTool.envelopeData(consumeCount, MyApp
+ .getInstance().getSignkey(), MyApp.getInstance().getIdentity());
+ map.put("requestParam", requestParam);
+ LogUtil.i("requestParam" + requestParam);
+ executeHttpPost(
+ "http://" + MyApp.getInstance().getServiceIp() + action, "",
+ map, httpCallback, "data", DataTrans.class);
- /**
- * @param orderId
- * 订单 ID
- * @param count
- * 消费数量
- * @param password
- * 订单密码
- * @param verifyPassword
- * 是否验证密码 是： TRUE 否： FALSE
- * @param httpCallback
- * 回调
- */
- public void consumeOrder(String orderId, String count, String password,
- String verifyPassword, String consumedSeq, List products, HttpCallback httpCallback) {
- Long accountId=MyApp.getInstance().getAccountId();
- ConsumeOrderRequest consumeCount = new ConsumeOrderRequest(orderId,
- count, password, verifyPassword,consumedSeq,products);
- consumeCount.setVer(MyApp.getInstance().getVer());
- consumeCount.setVerType(MyApp.getInstance().getVerType());
- consumeCount.setDevId(DevicTool.getInstance().getDevId());
- consumeCount.setAccountId(accountId);
- consumeCount.setDevType(devType);
- HashMap map = new HashMap();
- map.put("method", "consumeOrder");
- String requestParam = DataTool.envelopeData(consumeCount, MyApp
- .getInstance().getSignkey(), MyApp.getInstance().getIdentity());
- map.put("requestParam", requestParam);
- LogUtil.i("requestParam" + requestParam);
- executeHttpPost(
- "http://" + MyApp.getInstance().getServiceIp() + action, "",
- map, httpCallback, "data", DataTrans.class);
+ if (testMOdel != null && testMOdel) { // 这个是调试弹框
+ if (type == null) {
+ return;
+ }
+ if (activity == null) {
+ return;
+ }
+ activity.MToast(mContext, "服务地址："
+ + MyApp.getInstance().getServiceIp() + ";" + "机器码："
+ + DevicTool.getInstance().getDevId() + ";" + "订单号：" + orderId
+ + ";", Toast.LENGTH_LONG);
+ }
+ }
- if (testMOdel != null && testMOdel) { // 这个是调试弹框
- if (type == null) {
- return;
- }
- if(activity==null){
- return;
- }
- activity.MToast(mContext, "服务地址："
- + MyApp.getInstance().getServiceIp() + ";" + "机器码："
- + DevicTool.getInstance().getDevId() + ";" + "订单号：" + orderId
- + ";", Toast.LENGTH_LONG);
- }
- }
+ public void consumeOrderPart(String orderId, String count, String password,
+ String verifyPassword, String consumedSeq, List products, String id, boolean isId, HttpCallback httpCallback) {
+ Long accountId = MyApp.getInstance().getAccountId();
+ ConsumeOrderRequest consumeCount = new ConsumeOrderRequest(orderId,
+ count, password, verifyPassword, consumedSeq, products);
+ consumeCount.setVer(MyApp.getInstance().getVer());
+ consumeCount.setVerType(MyApp.getInstance().getVerType());
+ consumeCount.setDevId(DevicTool.getInstance().getDevId());
+ consumeCount.setAccountId(accountId);
+ consumeCount.setDevType(devType);
+ if (isId) {
+ consumeCount.setCredentials(id);
+ } else {
+ consumeCount.setVoucher(id);
+ }
- /**
- * @param startdate
- * @param enddate
- * @param month
- * @param httpCallback
- * @param method
- * DAY MON 统计订单
- */
- public void statisticsOrder(String method, String startdate,
- String enddate, String month, HttpCallback httpCallback) {
- StatisticOrderRequest consumeCount = new StatisticOrderRequest(method,
- startdate, enddate, month);
- consumeCount.setVer(MyApp.getInstance().getVer());
- consumeCount.setVerType(MyApp.getInstance().getVerType());
- consumeCount.setDevId(DevicTool.getInstance().getDevId());
- consumeCount.setDevType(devType);
- HashMap map = new HashMap();
- map.put("method", "consumeSummary");
- String requestParam = DataTool.envelopeData(consumeCount, MyApp
- .getInstance().getSignkey(), MyApp.getInstance().getIdentity());
- map.put("requestParam", requestParam);
- LogUtil.i("requestParam" + requestParam);
- executeHttpPost(
- "http://" + MyApp.getInstance().getServiceIp() + action, "",
- map, httpCallback, "data", DataTrans.class);
- if (testMOdel != null && testMOdel) { // 这个是调试弹框
- if (type == null) {
- return;
- }
- if(activity==null){
- return;
- }
- activity.MToast(mContext, "服务地址："
- + MyApp.getInstance().getServiceIp() + ";" + "机器码："
- + DevicTool.getInstance().getDevId() + ";" + "开始时间："
- + startdate + ";" + "结束：" + enddate + ";" + "月份：" + month,
- Toast.LENGTH_LONG);
- }
- }
+ HashMap map = new HashMap();
+ map.put("method", "consumeOrder");
+ String requestParam = DataTool.envelopeData(consumeCount, MyApp
+ .getInstance().getSignkey(), MyApp.getInstance().getIdentity());
+ map.put("requestParam", requestParam);
+ LogUtil.i("requestParam" + requestParam);
+ executeHttpPost(
+ "http://" + MyApp.getInstance().getServiceIp() + action, "",
+ map, httpCallback, "data", DataTrans.class);
- /**
- * @param orderId
- * 订单号
- * @param httpCallback
- * 不打小票列表
- */
- public void queryConsumedDetail(String orderId,
- HttpCallback httpCallback) {
- QueryConsumedDetailRequest reprintVoucherRequest = new QueryConsumedDetailRequest();
- reprintVoucherRequest.setOrderId(orderId);
- reprintVoucherRequest.setVer(MyApp.getInstance().getVer());
- reprintVoucherRequest.setVerType(MyApp.getInstance().getVerType());
- reprintVoucherRequest.setDevId(DevicTool.getInstance().getDevId());
- reprintVoucherRequest.setDevType(devType);
- HashMap map = new HashMap();
- map.put("method", "consumeHistoryQuery");
- String requestParam = DataTool.envelopeData(reprintVoucherRequest,
- MyApp.getInstance().getSignkey(), MyApp.getInstance()
- .getIdentity());
- map.put("requestParam", requestParam);
- LogUtil.i("requestParam" + requestParam);
- executeHttpPost(
- "http://" + MyApp.getInstance().getServiceIp() + action, "",
- map, httpCallback, "data", DataTrans.class);
- if (testMOdel != null && testMOdel) { // 这个是调试弹框
- if (type == null) {
- return;
- }
- if(activity==null){
- return;
- }
- activity.MToast(mContext, "服务地址："
- + MyApp.getInstance().getServiceIp() + ";" + "机器码："
- + DevicTool.getInstance().getDevId() + ";" + "补打订单：" + orderId,
- Toast.LENGTH_LONG);
- }
- }
+ if (testMOdel != null && testMOdel) { // 这个是调试弹框
+ if (type == null) {
+ return;
+ }
+ if (activity == null) {
+ return;
+ }
+ activity.MToast(mContext, "服务地址："
+ + MyApp.getInstance().getServiceIp() + ";" + "机器码："
+ + DevicTool.getInstance().getDevId() + ";" + "订单号：" + orderId
+ + ";", Toast.LENGTH_LONG);
+ }
+ }
- /**
- * @param orderId
- * 订单号
- * @param httpCallback
- * 补打小票信息
- */
- public void reprintVoucher(String orderId, List orderDetailIds,
- HttpCallback httpCallback) {
- ReprintVoucherRequest reprintVoucherRequest = new ReprintVoucherRequest();
- reprintVoucherRequest.setOrderId(orderId);
- StringBuffer buffer = new StringBuffer();
- for (int i = 0;i map = new HashMap();
- map.put("method", "reprintVoucher");
- String requestParam = DataTool.envelopeData(reprintVoucherRequest,
- MyApp.getInstance().getSignkey(), MyApp.getInstance()
- .getIdentity());
- map.put("requestParam", requestParam);
- LogUtil.i("requestParam" + requestParam);
- executeHttpPost(
- "http://" + MyApp.getInstance().getServiceIp() + action, "",
- map, httpCallback, "data", DataTrans.class);
- if (testMOdel != null && testMOdel) { // 这个是调试弹框
- if (type == null) {
- return;
- }
- if(activity==null){
- return;
- }
- activity.MToast(mContext, "服务地址："
- + MyApp.getInstance().getServiceIp() + ";" + "机器码："
- + DevicTool.getInstance().getDevId() + ";" + "补打订单：" + orderId,
- Toast.LENGTH_LONG);
- }
- }
+ /**
+ * @param startdate
+ * @param enddate
+ * @param month
+ * @param httpCallback
+ * @param method DAY MON 统计订单
+ */
+ public void statisticsOrder(String method, String startdate,
+ String enddate, String month, HttpCallback httpCallback) {
+ StatisticOrderRequest consumeCount = new StatisticOrderRequest(method,
+ startdate, enddate, month);
+ consumeCount.setVer(MyApp.getInstance().getVer());
+ consumeCount.setVerType(MyApp.getInstance().getVerType());
+ consumeCount.setDevId(DevicTool.getInstance().getDevId());
+ consumeCount.setDevType(devType);
+ HashMap map = new HashMap();
+ map.put("method", "consumeSummary");
+ String requestParam = DataTool.envelopeData(consumeCount, MyApp
+ .getInstance().getSignkey(), MyApp.getInstance().getIdentity());
+ map.put("requestParam", requestParam);
+ LogUtil.i("requestParam" + requestParam);
+ executeHttpPost(
+ "http://" + MyApp.getInstance().getServiceIp() + action, "",
+ map, httpCallback, "data", DataTrans.class);
+ if (testMOdel != null && testMOdel) { // 这个是调试弹框
+ if (type == null) {
+ return;
+ }
+ if (activity == null) {
+ return;
+ }
+ activity.MToast(mContext, "服务地址："
+ + MyApp.getInstance().getServiceIp() + ";" + "机器码："
+ + DevicTool.getInstance().getDevId() + ";" + "开始时间："
+ + startdate + ";" + "结束：" + enddate + ";" + "月份：" + month,
+ Toast.LENGTH_LONG);
+ }
+ }
- /**
- * 在线升级
- *
- * @param curVersionName
- * @param signkey
- * 标识
- * @param identity
- * 编码
- * @param url
- * ip或者域名
- */
- public void versionUpdate(String curVersionName, String signkey,
- String identity, String url, HttpCallback httpCallback) {
- DetectVersionRequest detectVersionRequest = new DetectVersionRequest();
- detectVersionRequest.setDevId(DevicTool.getInstance().getDevId());
- detectVersionRequest.setDevType("MDEV");
- detectVersionRequest.setVer(curVersionName);
- if (constant.logoMark == LogoType.CYT.getValue()||constant.logoMark == LogoType.EMC.getValue()) {
- detectVersionRequest.setVerType("CT");
- } else if (constant.logoMark == LogoType.QNE.getValue()) {
- detectVersionRequest.setVerType("QT");
- }
- HashMap map = new HashMap();
- map.put("method", "detectVersion");
- String requestParam = DataTool.envelopeData(detectVersionRequest,
- signkey, identity);
- map.put("requestParam", requestParam);
- LogUtil.i("requestParam" + requestParam);
- executeHttpPost("http://" + url + action, "", map, httpCallback,
- "data", DataTrans.class);
- }
+ /**
+ * @param orderId 订单号
+ * @param httpCallback 不打小票列表
+ */
+ public void queryConsumedDetail(String orderId,
+ HttpCallback httpCallback) {
+ QueryConsumedDetailRequest reprintVoucherRequest = new QueryConsumedDetailRequest();
+ reprintVoucherRequest.setOrderId(orderId);
+ reprintVoucherRequest.setVer(MyApp.getInstance().getVer());
+ reprintVoucherRequest.setVerType(MyApp.getInstance().getVerType());
+ reprintVoucherRequest.setDevId(DevicTool.getInstance().getDevId());
+ reprintVoucherRequest.setDevType(devType);
+ HashMap map = new HashMap();
+ map.put("method", "consumeHistoryQuery");
+ String requestParam = DataTool.envelopeData(reprintVoucherRequest,
+ MyApp.getInstance().getSignkey(), MyApp.getInstance()
+ .getIdentity());
+ map.put("requestParam", requestParam);
+ LogUtil.i("requestParam" + requestParam);
+ executeHttpPost(
+ "http://" + MyApp.getInstance().getServiceIp() + action, "",
+ map, httpCallback, "data", DataTrans.class);
+ if (testMOdel != null && testMOdel) { // 这个是调试弹框
+ if (type == null) {
+ return;
+ }
+ if (activity == null) {
+ return;
+ }
+ activity.MToast(mContext, "服务地址："
+ + MyApp.getInstance().getServiceIp() + ";" + "机器码："
+ + DevicTool.getInstance().getDevId() + ";" + "补打订单：" + orderId,
+ Toast.LENGTH_LONG);
+ }
+ }
+ /**
+ * @param orderId 订单号
+ * @param httpCallback 补打小票信息
+ */
+ public void reprintVoucher(String orderId, List orderDetailIds,
+ HttpCallback httpCallback) {
+ ReprintVoucherRequest reprintVoucherRequest = new ReprintVoucherRequest();
+ reprintVoucherRequest.setOrderId(orderId);
+ StringBuffer buffer = new StringBuffer();
+ for (int i = 0; i < orderDetailIds.size(); i++) {
+ if (i != orderDetailIds.size() - 1) {
+ buffer.append(orderDetailIds.get(i) + ",");
+ } else {
+ buffer.append(orderDetailIds.get(i));
+ }
+ }
+ reprintVoucherRequest.setOrderDetailIds(buffer.toString());
+ reprintVoucherRequest.setVer(MyApp.getInstance().getVer());
+ reprintVoucherRequest.setVerType(MyApp.getInstance().getVerType());
+ reprintVoucherRequest.setDevId(DevicTool.getInstance().getDevId());
+ reprintVoucherRequest.setDevType(devType);
+ HashMap map = new HashMap();
+ map.put("method", "reprintVoucher");
+ String requestParam = DataTool.envelopeData(reprintVoucherRequest,
+ MyApp.getInstance().getSignkey(), MyApp.getInstance()
+ .getIdentity());
+ map.put("requestParam", requestParam);
+ LogUtil.i("requestParam" + requestParam);
+ executeHttpPost(
+ "http://" + MyApp.getInstance().getServiceIp() + action, "",
+ map, httpCallback, "data", DataTrans.class);
+ if (testMOdel != null && testMOdel) { // 这个是调试弹框
+ if (type == null) {
+ return;
+ }
+ if (activity == null) {
+ return;
+ }
+ activity.MToast(mContext, "服务地址："
+ + MyApp.getInstance().getServiceIp() + ";" + "机器码："
+ + DevicTool.getInstance().getDevId() + ";" + "补打订单：" + orderId,
+ Toast.LENGTH_LONG);
+ }
+ }
- /**
- * 操作员登录
- * @param username
- * @param password
- * @param httpCallback
+ /**
+ * 在线升级
+ *
+ * @param curVersionName
+ * @param signkey 标识
+ * @param identity 编码
+ * @param url ip或者域名
*/
- public void login (String username, String password, HttpCallback httpCallback) {
- LoginRequest loginRequest = new LoginRequest();
- loginRequest.setAccountName(username);
- loginRequest.setPassword(password);
- loginRequest.setVer(MyApp.getInstance().getVer());
- loginRequest.setVerType(MyApp.getInstance().getVerType());
- loginRequest.setDevId(DevicTool.getInstance().getDevId());
- loginRequest.setDevType(devType);
+ public void versionUpdate(String curVersionName, String signkey,
+ String identity, String url, HttpCallback httpCallback) {
+ DetectVersionRequest detectVersionRequest = new DetectVersionRequest();
+ detectVersionRequest.setDevId(DevicTool.getInstance().getDevId());
+ detectVersionRequest.setDevType("MDEV");
+ detectVersionRequest.setVer(curVersionName);
+ if (constant.logoMark == LogoType.CYT.getValue() || constant.logoMark == LogoType.EMC.getValue()) {
+ detectVersionRequest.setVerType("CT");
+ } else if (constant.logoMark == LogoType.QNE.getValue()) {
+ detectVersionRequest.setVerType("QT");
+ }
+ HashMap map = new HashMap();
+ map.put("method", "detectVersion");
+ String requestParam = DataTool.envelopeData(detectVersionRequest,
+ signkey, identity);
+ map.put("requestParam", requestParam);
+ LogUtil.i("requestParam" + requestParam);
+ executeHttpPost("http://" + url + action, "", map, httpCallback,
+ "data", DataTrans.class);
+ }
- HashMap map = new HashMap();
- map.put("method", "login");
- String requestParam = DataTool.envelopeData(loginRequest,
- MyApp.getInstance().getSignkey(), MyApp.getInstance()
- .getIdentity());
- map.put("requestParam", requestParam);
- LogUtil.i("requestParam" + requestParam);
- executeHttpPost(
- "http://" + MyApp.getInstance().getServiceIp() + action, "",
- map, httpCallback, "data", DataTrans.class);
+ /**
+ * 操作员登录
+ *
+ * @param username
+ * @param password
+ * @param httpCallback
+ */
+ public void login(String username, String password, HttpCallback httpCallback) {
+ LoginRequest loginRequest = new LoginRequest();
+ loginRequest.setAccountName(username);
+ loginRequest.setPassword(password);
+ loginRequest.setVer(MyApp.getInstance().getVer());
+ loginRequest.setVerType(MyApp.getInstance().getVerType());
+ loginRequest.setDevId(DevicTool.getInstance().getDevId());
+ loginRequest.setDevType(devType);
+
+ HashMap map = new HashMap();
+ map.put("method", "login");
+ String requestParam = DataTool.envelopeData(loginRequest,
+ MyApp.getInstance().getSignkey(), MyApp.getInstance()
+ .getIdentity());
+ map.put("requestParam", requestParam);
+ LogUtil.i("requestParam" + requestParam);
+ executeHttpPost(
+ "http://" + MyApp.getInstance().getServiceIp() + action, "",
+ map, httpCallback, "data", DataTrans.class);
- }
+ }
}