畅游通核销app: 1.优化扫CYT码不同类型数据的判断

杜方
1 parent 7d3f774c
Showing 4 changed files with 55 additions and 26 deletions
src/com/ectrip/cyt/ui/NewHandleScanerActivity.java
src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java
src/com/ectrip/cyt/ui/QRCodeOrderListActivity.java
src/com/ectrip/cyt/ui/ScanerOrderActivity.java
@@ -50,7 +50,7 @@ public class NewHandleScanerActivity extends BaseActivity {
     private Button scanerBtn;
     private View topBack;
     private TextView title;
-
+    private int typeScan;
     private AtomicBoolean isStop = new AtomicBoolean(false);
     @Override
@@ -160,22 +160,29 @@ public class NewHandleScanerActivity extends BaseActivity {
             try {
                 if (result.startsWith("CYT_")) {
                     LogUtil.i("result = " + result);
-//                  result = result.substring(result.indexOf("_") + 1,result.indexOf(","));
-                    result = result.substring(result.indexOf("_") + 1, result.length());
-                    LogUtil.i("result1 = " + result);
+                    typeScan = 0;
+                    if (result.contains(",")) {
+                        result = result.substring(result.indexOf("_") + 1, result.indexOf(","));
+                        LogUtil.i(TAG, "resultString = " + result);
+                    } else {
+                        result = result.substring(result.indexOf("_") + 1, result.length());
+                        LogUtil.i(TAG, "resultString1 = " + result);
+                    }
                     ArrayList<ConfigBean> 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(","));
+                    typeScan = 0;
+//                    result = result.substring(result.indexOf("_") + 1,result.indexOf(","));
+                    result = result.substring(result.indexOf("_") + 1, result.length());
                     result = new String(Base64.decode(result), "utf-8");
                 } else if ((result.startsWith("TY_") || (result.startsWith("PMS_")))) {
+                    typeScan = 1;
                     result = result;
                 } else {
+                    typeScan = 1;
                     result = result;
                 }
             } catch (Exception e) {
@@ -193,6 +200,7 @@ public class NewHandleScanerActivity extends BaseActivity {
                 MToast(NewHandleScanerActivity.this, result, Toast.LENGTH_SHORT);
             }
             intent.putExtra("titleName", getString(R.string.show_result));
+            intent.putExtra("typeScan", typeScan);
             startActivity(intent);
             finish();
         }
 package com.ectrip.cyt.ui;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Vector;
@@ -41,7 +42,7 @@ import com.google.zxing.Result;
  * 手机版扫描二维码
  */
 public class PhomeScanerOrderActivity extends BaseActivity implements Callback {
-
+    public final String TAG = "PhomeScanerOrderActivity";
     private CaptureActivityHandler handler;
     private ViewfinderView viewfinderView;
     private boolean hasSurface;
@@ -53,6 +54,7 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback {
     private final float BEEP_VOLUME = 0.10f;
     private boolean vibrate;
     private String titleName;
+    private int typeScan;
     /**
      * Called when the activity is first created.
@@ -127,33 +129,40 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback {
         inactivityTimer.onActivity();
         playBeepSoundAndVibrate();
         String resultString = result.getText().trim();
-        LogUtil.i("扫码数据 = " + resultString);
+        LogUtil.i(TAG, "扫码数据 = " + resultString);
         if (resultString.equals("")) {
             MToast(PhomeScanerOrderActivity.this,
                     getString(R.string.scan_fail), MToast.LENGTH_SHORT);
         } else {
             try {
                 if (resultString.startsWith("CYT_")) {
-//                  resultString = resultString.substring(resultString.indexOf("_") + 1,resultString.indexOf(","));
-                    resultString = resultString.substring(resultString.indexOf("_") + 1, resultString.length());
-                    LogUtil.i("resultString = " + resultString);
+                    typeScan = 0;
+                    if (resultString.contains(",")) {
+                        resultString = resultString.substring(resultString.indexOf("_") + 1, resultString.indexOf(","));
+                        LogUtil.i(TAG, "resultString = " + resultString);
+                    } else {
+                        resultString = resultString.substring(resultString.indexOf("_") + 1, resultString.length());
+                        LogUtil.i(TAG, "resultString1 = " + resultString);
+                    }
                     ArrayList<ConfigBean> beans = DbManager.GetConfigs();
                     // 畅游通生成的订单ID：
                     String ec_name = beans.get(0).getEc_signkey();
-                    LogUtil.i("ec_name = " + ec_name);
+                    LogUtil.i(TAG, "ec_name = " + ec_name);
                     ec_name = AESEncryptor.decrypt(constant.decrypt, ec_name);
-                    LogUtil.i("ec_name1 = " + ec_name);
-                    LogUtil.i("resultString1 = " + resultString);
+                    LogUtil.i(TAG, "ec_name1 = " + ec_name);
                     resultString = DesUtil.decrypt(resultString, ec_name);
                 } else if (resultString.startsWith("TDOS_")) {
-                    resultString = resultString.substring(
-                            resultString.indexOf("_") + 1,
-                            resultString.indexOf(","));
+                    typeScan = 0;
+//                    resultString = resultString.substring(resultString.indexOf("_") + 1, resultString.indexOf(","));
+                    resultString = resultString.substring(resultString.indexOf("_") + 1, resultString.length());
+                    LogUtil.i(TAG, "resultString = " + resultString);
                     resultString = new String(Base64.decode(resultString), "utf-8");
                 } else if ((resultString.startsWith("TY_") || (resultString.startsWith("PMS_")))) {
+                    typeScan = 1;
                     resultString = resultString;
                 } else {
+                    typeScan = 1;
                     resultString = resultString;
                 }
             } catch (Exception e) {
@@ -166,6 +175,7 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback {
             intent.putExtra("input_orid", resultString);
             LogUtil.i(getString(R.string.scan_result) + resultString);
             intent.putExtra("titleName", getString(R.string.show_result));
+            intent.putExtra("typeScan", typeScan);
             startActivity(intent);
         }
         Boolean scanBack = SharedPreferences2Obj.getInstance(this).setName("config").getObject("scanBack", Boolean.class);
@@ -52,7 +52,7 @@ public class QRCodeOrderListActivity extends BaseActivity implements ListOnclick
     private View errorLayout;
     private TextView errorInfo;
     private Integer Select;
-
+    private int typeScan;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -98,6 +98,8 @@ 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);
+        LogUtil.d(TAG, "typeScan = " + typeScan);
         HttpHelper.getInstance(QRCodeOrderListActivity.this).queryOrder(
                 "QRCODE", null, null, null, orid, null, null, "15", "1",
                 new MyHttpCallback());
@@ -211,7 +213,7 @@ public class QRCodeOrderListActivity extends BaseActivity implements ListOnclick
                         if (orderInfos != null) {
                             adapter = new ReportExpandableListAdapter(
                                     QRCodeOrderListActivity.this,
-                                    QRCodeOrderListActivity.this, orderInfos, 1);
+                                    QRCodeOrderListActivity.this, orderInfos, typeScan);
                             orderList.setAdapter(adapter);
                             //取消分割线
@@ -85,7 +85,7 @@ public class ScanerOrderActivity extends BaseActivity {
     private WifiManager wifi;
     private boolean isConnected;
-
+    private int typeScan;
     private MyHandler handler;
     @Override
@@ -213,8 +213,14 @@ public class ScanerOrderActivity extends BaseActivity {
                         LogUtil.i(TAG, getString(R.string.scan_result)
                                 + " = " + scannerResult);
                         if (scannerResult.startsWith("CYT_")) {
-//                          scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1,scannerResult.indexOf(","));
-                            scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1, scannerResult.length());
+                            typeScan = 0;
+                            if (scannerResult.contains(",")) {
+                                scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1, scannerResult.indexOf(","));
+                                LogUtil.i(TAG, "resultString = " + scannerResult);
+                            } else {
+                                scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1, scannerResult.length());
+                                LogUtil.i(TAG, "resultString1 = " + scannerResult);
+                            }
                             ArrayList<ConfigBean> beans = DbManager.GetConfigs();
                             // 畅游通生成的订单ID：
                             String ec_name = beans.get(0).getEc_signkey();
@@ -222,13 +228,15 @@ public class ScanerOrderActivity extends BaseActivity {
                                     ec_name);
                             scannerResult = DesUtil.decrypt(scannerResult, ec_name);
                         } else if (scannerResult.startsWith("TDOS_")) {
-                            scannerResult = scannerResult.substring(
-                                    scannerResult.indexOf("_") + 1,
-                                    scannerResult.indexOf(","));
+                            typeScan = 0;
+//                            scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1,scannerResult.indexOf(","));
+                            scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1, scannerResult.length());
                             scannerResult = new String(Base64.decode(scannerResult), "utf-8");
                         } else if ((scannerResult.startsWith("TY_") || (scannerResult.startsWith("PMS_")))) {
+                            typeScan = 1;
                             scannerResult = scannerResult;
                         } else {
+                            typeScan = 1;
                             scannerResult = scannerResult;
                         }
                         Message msg = new Message();
@@ -383,6 +391,7 @@ public class ScanerOrderActivity extends BaseActivity {
                     intent.putExtra("mode", 1);
                     intent.putExtra("input_orid", msg.obj.toString());
                     intent.putExtra("titleName", getString(R.string.show_result));
+                    intent.putExtra("typeScan", typeScan);
                     startActivity(intent);
                     finish();
                     break;