杜方 / CYTAndroid4.0

Commit 7d3f774c4f3f4efb5b9eca8d0ca58292e29962ab

Authored by 杜方
1 parent f2d67e51

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

Inline Side-by-side
Showing 3 changed files with 20 additions and 18 deletions
src/com/ectrip/cyt/ui/NewHandleScanerActivity.java
  View file @7d3f774
... ... @@ -32,6 +32,7 @@ import com.ectrip.cyt.shield_home.LockLayer.MToast;
32 32 import com.ectrip.cyt.utils.AESEncryptor;
33 33 import com.ectrip.cyt.utils.Base64;
34 34 import com.ectrip.cyt.utils.DesUtil;
  35 +import com.ectrip.cyt.utils.LogUtil;
35 36 import com.ectrip.trips.check.R;
36 37  
37 38 /**
... ... @@ -158,8 +159,10 @@ public class NewHandleScanerActivity extends BaseActivity {
158 159 } else {
159 160 try {
160 161 if (result.startsWith("CYT_")) {
161   - result = result.substring(result.indexOf("_") + 1,
162   - result.indexOf(","));
  162 + LogUtil.i("result = " + result);
  163 +// result = result.substring(result.indexOf("_") + 1,result.indexOf(","));
  164 + result = result.substring(result.indexOf("_") + 1, result.length());
  165 + LogUtil.i("result1 = " + result);
163 166 ArrayList<ConfigBean> beans = DbManager.GetConfigs();
164 167 // 畅游通生成的订单ID：
165 168 String ec_name = beans.get(0).getEc_signkey();
... ...
src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java
  View file @7d3f774
... ... @@ -133,27 +133,27 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback {
133 133 getString(R.string.scan_fail), MToast.LENGTH_SHORT);
134 134 } else {
135 135 try {
136   - if(resultString.startsWith("CYT_")) {
137   - resultString = resultString.substring(
138   - resultString.indexOf("_") + 1,
139   - resultString.indexOf(","));
  136 + if (resultString.startsWith("CYT_")) {
  137 +// resultString = resultString.substring(resultString.indexOf("_") + 1,resultString.indexOf(","));
  138 + resultString = resultString.substring(resultString.indexOf("_") + 1, resultString.length());
  139 + LogUtil.i("resultString = " + resultString);
140 140 ArrayList<ConfigBean> beans = DbManager.GetConfigs();
141 141 // 畅游通生成的订单ID：
142 142 String ec_name = beans.get(0).getEc_signkey();
143 143 LogUtil.i("ec_name = " + ec_name);
144 144 ec_name = AESEncryptor.decrypt(constant.decrypt, ec_name);
145 145 LogUtil.i("ec_name1 = " + ec_name);
146   - LogUtil.i("resultString = " + resultString);
  146 + LogUtil.i("resultString1 = " + resultString);
147 147 resultString = DesUtil.decrypt(resultString, ec_name);
148 148  
149   - }else if(resultString.startsWith("TDOS_")){
  149 + } else if (resultString.startsWith("TDOS_")) {
150 150 resultString = resultString.substring(
151 151 resultString.indexOf("_") + 1,
152 152 resultString.indexOf(","));
153 153 resultString = new String(Base64.decode(resultString), "utf-8");
154   - }else if((resultString.startsWith("TY_") || (resultString.startsWith("PMS_")))){
  154 + } else if ((resultString.startsWith("TY_") || (resultString.startsWith("PMS_")))) {
155 155 resultString = resultString;
156   - }else{
  156 + } else {
157 157 resultString = resultString;
158 158 }
159 159 } catch (Exception e) {
... ... @@ -168,13 +168,13 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback {
168 168 intent.putExtra("titleName", getString(R.string.show_result));
169 169 startActivity(intent);
170 170 }
171   - Boolean scanBack = SharedPreferences2Obj.getInstance(this).setName("config").getObject("scanBack", Boolean.class);
172   - if (scanBack != null && scanBack) {
  171 + Boolean scanBack = SharedPreferences2Obj.getInstance(this).setName("config").getObject("scanBack", Boolean.class);
  172 + if (scanBack != null && scanBack) {
173 173  
174   - } else {
  174 + } else {
175 175  
176   - PhomeScanerOrderActivity.this.finish();
177   - }
  176 + PhomeScanerOrderActivity.this.finish();
  177 + }
178 178  
179 179 }
180 180  
... ...
src/com/ectrip/cyt/ui/ScanerOrderActivity.java
  View file @7d3f774
... ... @@ -213,9 +213,8 @@ public class ScanerOrderActivity extends BaseActivity {
213 213 LogUtil.i(TAG, getString(R.string.scan_result)
214 214 + " = " + scannerResult);
215 215 if (scannerResult.startsWith("CYT_")) {
216   - scannerResult = scannerResult.substring(
217   - scannerResult.indexOf("_") + 1,
218   - scannerResult.indexOf(","));
  216 +// scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1,scannerResult.indexOf(","));
  217 + scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1, scannerResult.length());
219 218 ArrayList<ConfigBean> beans = DbManager.GetConfigs();
220 219 // 畅游通生成的订单ID：
221 220 String ec_name = beans.get(0).getEc_signkey();
... ...