diff --git a/src/com/ectrip/cyt/ui/NewHandleScanerActivity.java b/src/com/ectrip/cyt/ui/NewHandleScanerActivity.java index c6e72ed..81b4694 100644 --- a/src/com/ectrip/cyt/ui/NewHandleScanerActivity.java +++ b/src/com/ectrip/cyt/ui/NewHandleScanerActivity.java @@ -32,6 +32,7 @@ import com.ectrip.cyt.shield_home.LockLayer.MToast; import com.ectrip.cyt.utils.AESEncryptor; import com.ectrip.cyt.utils.Base64; import com.ectrip.cyt.utils.DesUtil; +import com.ectrip.cyt.utils.LogUtil; import com.ectrip.trips.check.R; /** @@ -158,8 +159,10 @@ public class NewHandleScanerActivity extends BaseActivity { } else { try { if (result.startsWith("CYT_")) { - result = result.substring(result.indexOf("_") + 1, - result.indexOf(",")); + LogUtil.i("result = " + result); +// result = result.substring(result.indexOf("_") + 1,result.indexOf(",")); + result = result.substring(result.indexOf("_") + 1, result.length()); + LogUtil.i("result1 = " + result); ArrayList beans = DbManager.GetConfigs(); // 畅游通生成的订单ID: String ec_name = beans.get(0).getEc_signkey(); diff --git a/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java b/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java index f93961f..144b957 100644 --- a/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java +++ b/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java @@ -133,27 +133,27 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback { getString(R.string.scan_fail), MToast.LENGTH_SHORT); } else { try { - if(resultString.startsWith("CYT_")) { - resultString = resultString.substring( - resultString.indexOf("_") + 1, - resultString.indexOf(",")); + if (resultString.startsWith("CYT_")) { +// resultString = resultString.substring(resultString.indexOf("_") + 1,resultString.indexOf(",")); + resultString = resultString.substring(resultString.indexOf("_") + 1, resultString.length()); + LogUtil.i("resultString = " + resultString); ArrayList beans = DbManager.GetConfigs(); // 畅游通生成的订单ID: String ec_name = beans.get(0).getEc_signkey(); LogUtil.i("ec_name = " + ec_name); ec_name = AESEncryptor.decrypt(constant.decrypt, ec_name); LogUtil.i("ec_name1 = " + ec_name); - LogUtil.i("resultString = " + resultString); + LogUtil.i("resultString1 = " + resultString); resultString = DesUtil.decrypt(resultString, ec_name); - }else if(resultString.startsWith("TDOS_")){ + } else if (resultString.startsWith("TDOS_")) { resultString = resultString.substring( resultString.indexOf("_") + 1, resultString.indexOf(",")); resultString = new String(Base64.decode(resultString), "utf-8"); - }else if((resultString.startsWith("TY_") || (resultString.startsWith("PMS_")))){ + } else if ((resultString.startsWith("TY_") || (resultString.startsWith("PMS_")))) { resultString = resultString; - }else{ + } else { resultString = resultString; } } catch (Exception e) { @@ -168,13 +168,13 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback { intent.putExtra("titleName", getString(R.string.show_result)); startActivity(intent); } - Boolean scanBack = SharedPreferences2Obj.getInstance(this).setName("config").getObject("scanBack", Boolean.class); - if (scanBack != null && scanBack) { + Boolean scanBack = SharedPreferences2Obj.getInstance(this).setName("config").getObject("scanBack", Boolean.class); + if (scanBack != null && scanBack) { - } else { + } else { - PhomeScanerOrderActivity.this.finish(); - } + PhomeScanerOrderActivity.this.finish(); + } } diff --git a/src/com/ectrip/cyt/ui/ScanerOrderActivity.java b/src/com/ectrip/cyt/ui/ScanerOrderActivity.java index b4f1f6c..aabc227 100644 --- a/src/com/ectrip/cyt/ui/ScanerOrderActivity.java +++ b/src/com/ectrip/cyt/ui/ScanerOrderActivity.java @@ -213,9 +213,8 @@ 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.indexOf(",")); + scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1, scannerResult.length()); ArrayList beans = DbManager.GetConfigs(); // 畅游通生成的订单ID: String ec_name = beans.get(0).getEc_signkey();