畅游通核销app:1.新增检前缀为OCP票流程

杜方
1 parent fe95a7d1
Showing 7 changed files with 82 additions and 18 deletions
AndroidManifest.xml
res/values/colors.xml
res/values/dimens.xml
res/values/strings.xml
src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java
src/com/ectrip/cyt/ui/QRCodeOrderListActivity.java
src/com/ectrip/trips/net/HttpHelper.java
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tool="http://schemas.android.com/tools"
     package="com.ectrip.trips.check"
-    android:versionCode="26"
-    android:versionName="4.23"
+    android:versionCode="27"
+    android:versionName="4.24"
     tool:ignore="LockedOrientationActivity">
     <!-- 各个类型的大小布局声明 -->
@@ -260,6 +260,13 @@
             android:screenOrientation="portrait"
             android:theme="@style/Theme"
             android:windowSoftInputMode="adjustPan|stateHidden" />
+        <activity
+            android:name="com.ectrip.cyt.ui.PhoneCodeListActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme"
+            android:windowSoftInputMode="adjustPan|stateHidden" />
         <!-- 身份证列表页面 -->
         <activity
             android:name="com.ectrip.cyt.ui.InputOrderListActivity"
@@ -39,7 +39,7 @@
     <color name="numbers_text_color">#8c8c8c</color>
     <color name="transparent_black">#7F000000</color>
-    
+    <color name="black">#000000</color>
     <!-- 下面的是名邦良本的日期选择器 -->
     <color name="calendar_active_month_bg">#fff5f7f9</color>
     <color name="calendar_bg">#ffffffff</color>
@@ -51,8 +51,11 @@
     <dimen name="dp_48">48dp</dimen>
     <dimen name="sp_25">25sp</dimen>
     <dimen name="dp_20">20dp</dimen>
+    <dimen name="dp_18">18dp</dimen>
     <dimen name="dp_68">68dp</dimen>
     <dimen name="sp_18">18sp</dimen>
     <dimen name="dp_15">15dp</dimen>
     <dimen name="dp_0">0dp</dimen>
+    <dimen name="dp_5">5dp</dimen>
+    <dimen name="dp_10">10dp</dimen>
 </resources>
@@ -2,7 +2,7 @@
 <resources>
     <!-- app_name 为"畅游通O2O移动终端"和 "去哪儿O2O移动终端" 或 "O2O移动终端"  或 "路路通O2O移动终端"-->
-    <string name="app_name">畅游通O2O移动终端</string>
+    <string name="app_name">智能移动验证系统</string>
     <string name="input_idcard_hit">请输入身份证号码</string>
     <!-- list -->
     <string name="loading">正在加载</string>
@@ -86,6 +86,7 @@
     <string name="system_setting">系统设置</string>
     <string name="reprint">补打小票</string>
     <string name="check">检票操作</string>
+    <string name="check_ticket">检票</string>
     <string name="query">订单查询</string>
     <string name="input_pwd">请输入密码</string>
     <string name="btn_ok">确定</string>
@@ -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();
 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<ProductOfConsumeOrder> 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<ProductInfoQuery> products = orderInfos.get(position).getProducts();
                 for (int i = 0; i < products.size(); i++) {
                     List<PassengerInfosBean> passengerInfosBeans = products.get(i).getPassengerInfos();
-                    for (PassengerInfosBean bean : passengerInfosBeans){
+                    for (PassengerInfosBean bean : passengerInfosBeans) {
                         if (orid.equals(bean.getVoucher())) {
                             LogUtil.d(TAG, "getVoucher = " + bean.getVoucher());
                             centerHandle.partTicket(position, "", "TRUE", bean.getVoucher(), false);
@@ -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<ProductOfConsumeOrder> products, HttpCallback<DataTrans> 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<String, String> map = new HashMap<String, String>();
+        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);