杜方 / CYTAndroid4.0

Commit 9b537f44d6c8af7242dc83f62c1ab049012b6951

Authored by 杜方
1 parent df682192

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

Inline Side-by-side
Showing 3 changed files with 21 additions and 7 deletions
src/com/ectrip/cyt/ui/NewHandleScanerActivity.java
  View file @9b537f4
@@ -175,8 +175,13 @@ public class NewHandleScanerActivity extends BaseActivity { @@ -175,8 +175,13 @@ public class NewHandleScanerActivity extends BaseActivity {
175 result = DesUtil.decrypt(result, ec_name); 175 result = DesUtil.decrypt(result, ec_name);
176 } else if (result.startsWith("TDOS_")) { 176 } else if (result.startsWith("TDOS_")) {
177 typeScan = 0; 177 typeScan = 0;
178 -// result = result.substring(result.indexOf("_") + 1,result.indexOf(","));  
179 - result = result.substring(result.indexOf("_") + 1, result.length()); 178 + if (result.contains(",")) {
  179 + result = result.substring(result.indexOf("_") + 1, result.indexOf(","));
  180 + LogUtil.i(TAG, "resultString = " + result);
  181 + } else {
  182 + result = result.substring(result.indexOf("_") + 1, result.length());
  183 + LogUtil.i(TAG, "resultString1 = " + result);
  184 + }
180 result = new String(Base64.decode(result), "utf-8"); 185 result = new String(Base64.decode(result), "utf-8");
181 } else if ((result.startsWith("TY_") || (result.startsWith("PMS_")))) { 186 } else if ((result.startsWith("TY_") || (result.startsWith("PMS_")))) {
182 typeScan = 1; 187 typeScan = 1;
src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java
  View file @9b537f4
@@ -154,9 +154,13 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback { @@ -154,9 +154,13 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback {
154 154
155 } else if (resultString.startsWith("TDOS_")) { 155 } else if (resultString.startsWith("TDOS_")) {
156 typeScan = 0; 156 typeScan = 0;
157 -// resultString = resultString.substring(resultString.indexOf("_") + 1, resultString.indexOf(","));  
158 - resultString = resultString.substring(resultString.indexOf("_") + 1, resultString.length());  
159 - LogUtil.i(TAG, "resultString = " + resultString); 157 + if (resultString.contains(",")) {
  158 + resultString = resultString.substring(resultString.indexOf("_") + 1, resultString.indexOf(","));
  159 + LogUtil.i(TAG, "resultString = " + resultString);
  160 + } else {
  161 + resultString = resultString.substring(resultString.indexOf("_") + 1, resultString.length());
  162 + LogUtil.i(TAG, "resultString1 = " + resultString);
  163 + }
160 resultString = new String(Base64.decode(resultString), "utf-8"); 164 resultString = new String(Base64.decode(resultString), "utf-8");
161 } else if ((resultString.startsWith("TY_") || (resultString.startsWith("PMS_")))) { 165 } else if ((resultString.startsWith("TY_") || (resultString.startsWith("PMS_")))) {
162 typeScan = 1; 166 typeScan = 1;
src/com/ectrip/cyt/ui/ScanerOrderActivity.java
  View file @9b537f4
@@ -229,8 +229,13 @@ public class ScanerOrderActivity extends BaseActivity { @@ -229,8 +229,13 @@ public class ScanerOrderActivity extends BaseActivity {
229 scannerResult = DesUtil.decrypt(scannerResult, ec_name); 229 scannerResult = DesUtil.decrypt(scannerResult, ec_name);
230 } else if (scannerResult.startsWith("TDOS_")) { 230 } else if (scannerResult.startsWith("TDOS_")) {
231 typeScan = 0; 231 typeScan = 0;
232 -// scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1,scannerResult.indexOf(","));  
233 - scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1, scannerResult.length()); 232 + if (scannerResult.contains(",")) {
  233 + scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1, scannerResult.indexOf(","));
  234 + LogUtil.i(TAG, "resultString = " + scannerResult);
  235 + } else {
  236 + scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1, scannerResult.length());
  237 + LogUtil.i(TAG, "resultString1 = " + scannerResult);
  238 + }
234 scannerResult = new String(Base64.decode(scannerResult), "utf-8"); 239 scannerResult = new String(Base64.decode(scannerResult), "utf-8");
235 } else if ((scannerResult.startsWith("TY_") || (scannerResult.startsWith("PMS_")))) { 240 } else if ((scannerResult.startsWith("TY_") || (scannerResult.startsWith("PMS_")))) {
236 typeScan = 1; 241 typeScan = 1;