畅游通核销app: 1.修复CYT获取票数据错误的问题

杜方
1 parent f2d67e51
Showing 3 changed files with 20 additions and 18 deletions
src/com/ectrip/cyt/ui/NewHandleScanerActivity.java
src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java
src/com/ectrip/cyt/ui/ScanerOrderActivity.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<ConfigBean> beans = DbManager.GetConfigs();
                     // 畅游通生成的订单ID：
                     String ec_name = beans.get(0).getEc_signkey();
@@ -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<ConfigBean> 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();
+        }
     }
@@ -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<ConfigBean> beans = DbManager.GetConfigs();
                             // 畅游通生成的订单ID：
                             String ec_name = beans.get(0).getEc_signkey();