From da545be86bda070ce82067c8f7ce090a069f4df4 Mon Sep 17 00:00:00 2001 From: 杜方 Date: Thu, 25 Jul 2024 06:55:32 +0800 Subject: [PATCH] 畅游通核销app:1.新增检前缀为OCP票流程 --- AndroidManifest.xml | 11 +++++++++-- res/values/colors.xml | 2 +- res/values/dimens.xml | 3 +++ res/values/strings.xml | 3 ++- src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java | 16 ++++++++++++---- src/com/ectrip/cyt/ui/QRCodeOrderListActivity.java | 14 ++++++++++++-- src/com/ectrip/trips/net/HttpHelper.java | 51 +++++++++++++++++++++++++++++++++++++++++++-------- 7 files changed, 82 insertions(+), 18 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 06eea97..b77df4f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,8 +2,8 @@ @@ -260,6 +260,13 @@ android:screenOrientation="portrait" android:theme="@style/Theme" android:windowSoftInputMode="adjustPan|stateHidden" /> + #8c8c8c #7F000000 - + #000000 #fff5f7f9 #ffffffff diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 9fe15f9..3fbf883 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -51,8 +51,11 @@ 48dp 25sp 20dp + 18dp 68dp 18sp 15dp 0dp + 5dp + 10dp diff --git a/res/values/strings.xml b/res/values/strings.xml index 16a9b91..3fca4cd 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2,7 +2,7 @@ - 畅游通O2O移动终端 + 智能移动验证系统 请输入身份证号码 正在加载 @@ -86,6 +86,7 @@ 系统设置 补打小票 检票操作 + 检票 订单查询 请输入密码 确定 diff --git a/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java b/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java index 1dca1bd..d345aa4 100644 --- a/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java +++ b/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java @@ -171,6 +171,9 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback { } else if ((resultString.startsWith("TY_") || (resultString.startsWith("PMS_")))) { typeScan = 1; resultString = resultString; + } else if (resultString.startsWith("OCP_")) { + typeScan = 0; + resultString = resultString; } else { typeScan = 1; resultString = resultString; @@ -178,9 +181,14 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback { } catch (Exception e) { e.printStackTrace(); } - - Intent intent = new Intent(PhomeScanerOrderActivity.this, - QRCodeOrderListActivity.class); + Intent intent; + if (resultString.startsWith("OCP_")) { + intent = new Intent(PhomeScanerOrderActivity.this, + PhoneCodeListActivity.class); + } else { + intent = new Intent(PhomeScanerOrderActivity.this, + QRCodeOrderListActivity.class); + } intent.putExtra("mode", 1); intent.putExtra("input_orid", resultString); LogUtil.i(TAG, getString(R.string.scan_result) + resultString); @@ -231,7 +239,7 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback { bean.setEc_signkey(identity); if (1 == beans.get(0).getEc_isPrint()) { bean.setEc_isPrint(beans.get(0).getEc_isPrint()); - }else { + } else { bean.setEc_isPrint(0); } DbManager.ClearConfig(); diff --git a/src/com/ectrip/cyt/ui/QRCodeOrderListActivity.java b/src/com/ectrip/cyt/ui/QRCodeOrderListActivity.java index 1719312..7af04f0 100644 --- a/src/com/ectrip/cyt/ui/QRCodeOrderListActivity.java +++ b/src/com/ectrip/cyt/ui/QRCodeOrderListActivity.java @@ -1,5 +1,6 @@ package com.ectrip.cyt.ui; +import java.util.ArrayList; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -28,6 +29,7 @@ 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.request.ProductOfConsumeOrder; import com.ectrip.cyt.response.PassengerInfosBean; import com.ectrip.cyt.response.ProductInfoQuery; import com.ectrip.cyt.response.QueryOrderResponse; @@ -53,6 +55,7 @@ public class QRCodeOrderListActivity extends BaseActivity implements ListOnclick private TextView errorInfo; private Integer Select; private int typeScan; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -98,8 +101,14 @@ public class QRCodeOrderListActivity extends BaseActivity implements ListOnclick .setName("MachineType").getObject("type", Integer.class); orid = getIntent().getStringExtra("input_orid"); LogUtil.d(TAG, "orid = " + orid); - typeScan = getIntent().getIntExtra("typeScan",0); + typeScan = getIntent().getIntExtra("typeScan", 0); LogUtil.d(TAG, "typeScan = " + typeScan); + if (orid.startsWith("OCP_")) { + ArrayList productOfConsumeOrders = new ArrayList<>(); + ProductOfConsumeOrder productOfConsumeOrder = new ProductOfConsumeOrder(); + HttpHelper.getInstance(QRCodeOrderListActivity.this).codeConsume(orid, null, null, null, null, productOfConsumeOrders, new MyHttpCallback()); + return; + } HttpHelper.getInstance(QRCodeOrderListActivity.this).queryOrder( "QRCODE", null, null, null, orid, null, null, "15", "1", new MyHttpCallback()); @@ -174,6 +183,7 @@ public class QRCodeOrderListActivity extends BaseActivity implements ListOnclick data = result.getData(); parse2(result.getData(), QueryOrderResponse.class, QRCodeOrderListActivity.this); + LogUtil.d("QRCodeOrderListActivity", "data = " + data); } else { if (dialog != null && dialog.isShowing()) { try { @@ -282,7 +292,7 @@ public class QRCodeOrderListActivity extends BaseActivity implements ListOnclick List products = orderInfos.get(position).getProducts(); for (int i = 0; i < products.size(); i++) { List passengerInfosBeans = products.get(i).getPassengerInfos(); - for (PassengerInfosBean bean : passengerInfosBeans){ + for (PassengerInfosBean bean : passengerInfosBeans) { if (orid.equals(bean.getVoucher())) { LogUtil.d(TAG, "getVoucher = " + bean.getVoucher()); centerHandle.partTicket(position, "", "TRUE", bean.getVoucher(), false); diff --git a/src/com/ectrip/trips/net/HttpHelper.java b/src/com/ectrip/trips/net/HttpHelper.java index 74c7f67..a48a90e 100644 --- a/src/com/ectrip/trips/net/HttpHelper.java +++ b/src/com/ectrip/trips/net/HttpHelper.java @@ -16,6 +16,7 @@ import com.ectrip.cyt.config.MyApp; import com.ectrip.cyt.constant.LogoType; import com.ectrip.cyt.constant.constant; import com.ectrip.cyt.db.DbManager; +import com.ectrip.cyt.request.ConsumeCodeRequest; import com.ectrip.cyt.request.ConsumeOrderRequest; import com.ectrip.cyt.request.DetectVersionRequest; import com.ectrip.cyt.request.LoginRequest; @@ -90,7 +91,7 @@ public class HttpHelper extends HttpHelperCore { map.put("requestParam", requestParam); LogUtil.i(TAG,requestParam + "requestParam"); executeHttpPost( - "http://" + MyApp.getInstance().getServiceIp() + action, "", + "https://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); LogUtil.i(TAG,"url = " + "http://" + MyApp.getInstance().getServiceIp() + action); if (testMOdel != null && testMOdel) { // 这个是调试弹框 @@ -132,7 +133,7 @@ public class HttpHelper extends HttpHelperCore { map.put("requestParam", requestParam); LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( - "http://" + MyApp.getInstance().getServiceIp() + action, "", + "https://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); if (testMOdel != null && testMOdel) { // 这个是调试弹框 @@ -172,7 +173,7 @@ public class HttpHelper extends HttpHelperCore { map.put("requestParam", requestParam); LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( - "http://" + MyApp.getInstance().getServiceIp() + action, "", + "https://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); if (testMOdel != null && testMOdel) { // 这个是调试弹框 @@ -188,7 +189,41 @@ public class HttpHelper extends HttpHelperCore { + ";", Toast.LENGTH_LONG); } } + public void codeConsume(String orderId, String count, String password, + String verifyPassword, String consumedSeq, List products, HttpCallback httpCallback) { + Long accountId = MyApp.getInstance().getAccountId(); + ConsumeCodeRequest consumeCode = new ConsumeCodeRequest(orderId, + count, password, verifyPassword, consumedSeq, products); + consumeCode.setVer(MyApp.getInstance().getVer()); + consumeCode.setVerType(MyApp.getInstance().getVerType()); + consumeCode.setDevId(configBeans.get(0).getEc_mac()); + consumeCode.setAccountId(accountId); + consumeCode.setDevType(devType); + + HashMap map = new HashMap(); + map.put("method", "onePassCodeConsumed"); + String requestParam = DataTool.envelopeData(consumeCode, MyApp + .getInstance().getSignkey(), MyApp.getInstance().getIdentity()); + map.put("requestParam", requestParam); + LogUtil.i(TAG,"requestParam" + requestParam); + LogUtil.i(TAG,"服务器地址：" + MyApp.getInstance().getServiceIp()); + executeHttpPost( + "https://" + 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() + ";" + "机器码：" + + configBeans.get(0).getEc_mac() + ";" + "订单号：" + orderId + + ";", Toast.LENGTH_LONG); + } + } /** * @param startdate * @param enddate @@ -212,7 +247,7 @@ public class HttpHelper extends HttpHelperCore { map.put("requestParam", requestParam); LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( - "http://" + MyApp.getInstance().getServiceIp() + action, "", + "https://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); if (testMOdel != null && testMOdel) { // 这个是调试弹框 if (type == null) { @@ -255,7 +290,7 @@ public class HttpHelper extends HttpHelperCore { map.put("requestParam", requestParam); LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( - "http://" + MyApp.getInstance().getServiceIp() + action, "", + "https://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); if (testMOdel != null && testMOdel) { // 这个是调试弹框 if (type == null) { @@ -305,7 +340,7 @@ public class HttpHelper extends HttpHelperCore { map.put("requestParam", requestParam); LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( - "http://" + MyApp.getInstance().getServiceIp() + action, "", + "https://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); if (testMOdel != null && testMOdel) { // 这个是调试弹框 if (type == null) { @@ -351,7 +386,7 @@ public class HttpHelper extends HttpHelperCore { signkey, identity); map.put("requestParam", requestParam); LogUtil.i(TAG,"requestParam" + requestParam); - executeHttpPost("http://" + url + action, "", map, httpCallback, + executeHttpPost("https://" + url + action, "", map, httpCallback, "data", DataTrans.class); } @@ -382,7 +417,7 @@ public class HttpHelper extends HttpHelperCore { map.put("requestParam", requestParam); LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( - "http://" + MyApp.getInstance().getServiceIp() + action, "", + "https://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); -- libgit2 0.21.4