From 9b537f44d6c8af7242dc83f62c1ab049012b6951 Mon Sep 17 00:00:00 2001 From: 杜方 Date: Wed, 5 Jul 2023 17:57:05 +0800 Subject: [PATCH] 畅游通核销app: 1.优化扫TDOS码不同类型数据的判断 --- src/com/ectrip/cyt/ui/NewHandleScanerActivity.java | 9 +++++++-- src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java | 10 +++++++--- src/com/ectrip/cyt/ui/ScanerOrderActivity.java | 9 +++++++-- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/com/ectrip/cyt/ui/NewHandleScanerActivity.java b/src/com/ectrip/cyt/ui/NewHandleScanerActivity.java index 2eb9b7a..3c68a57 100644 --- a/src/com/ectrip/cyt/ui/NewHandleScanerActivity.java +++ b/src/com/ectrip/cyt/ui/NewHandleScanerActivity.java @@ -175,8 +175,13 @@ public class NewHandleScanerActivity extends BaseActivity { result = DesUtil.decrypt(result, ec_name); } else if (result.startsWith("TDOS_")) { typeScan = 0; -// result = result.substring(result.indexOf("_") + 1,result.indexOf(",")); - result = result.substring(result.indexOf("_") + 1, result.length()); + 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); + } result = new String(Base64.decode(result), "utf-8"); } else if ((result.startsWith("TY_") || (result.startsWith("PMS_")))) { typeScan = 1; diff --git a/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java b/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java index 84e0405..16ea3b1 100644 --- a/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java +++ b/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java @@ -154,9 +154,13 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback { } else if (resultString.startsWith("TDOS_")) { typeScan = 0; -// resultString = resultString.substring(resultString.indexOf("_") + 1, resultString.indexOf(",")); - resultString = resultString.substring(resultString.indexOf("_") + 1, resultString.length()); - LogUtil.i(TAG, "resultString = " + resultString); + 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); + } resultString = new String(Base64.decode(resultString), "utf-8"); } else if ((resultString.startsWith("TY_") || (resultString.startsWith("PMS_")))) { typeScan = 1; diff --git a/src/com/ectrip/cyt/ui/ScanerOrderActivity.java b/src/com/ectrip/cyt/ui/ScanerOrderActivity.java index c0454aa..0a21cef 100644 --- a/src/com/ectrip/cyt/ui/ScanerOrderActivity.java +++ b/src/com/ectrip/cyt/ui/ScanerOrderActivity.java @@ -229,8 +229,13 @@ public class ScanerOrderActivity extends BaseActivity { scannerResult = DesUtil.decrypt(scannerResult, ec_name); } else if (scannerResult.startsWith("TDOS_")) { typeScan = 0; -// scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1,scannerResult.indexOf(",")); - scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1, scannerResult.length()); + 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); + } scannerResult = new String(Base64.decode(scannerResult), "utf-8"); } else if ((scannerResult.startsWith("TY_") || (scannerResult.startsWith("PMS_")))) { typeScan = 1; -- libgit2 0.21.4