Commit df6821929522261770e02ef15120c92b71225138
1 parent
7d3f774c
畅游通核销app: 1.优化扫CYT码不同类型数据的判断
Showing
4 changed files
with
55 additions
and
26 deletions
src/com/ectrip/cyt/ui/NewHandleScanerActivity.java
@@ -50,7 +50,7 @@ public class NewHandleScanerActivity extends BaseActivity { | @@ -50,7 +50,7 @@ public class NewHandleScanerActivity extends BaseActivity { | ||
50 | private Button scanerBtn; | 50 | private Button scanerBtn; |
51 | private View topBack; | 51 | private View topBack; |
52 | private TextView title; | 52 | private TextView title; |
53 | - | 53 | + private int typeScan; |
54 | private AtomicBoolean isStop = new AtomicBoolean(false); | 54 | private AtomicBoolean isStop = new AtomicBoolean(false); |
55 | 55 | ||
56 | @Override | 56 | @Override |
@@ -160,22 +160,29 @@ public class NewHandleScanerActivity extends BaseActivity { | @@ -160,22 +160,29 @@ public class NewHandleScanerActivity extends BaseActivity { | ||
160 | try { | 160 | try { |
161 | if (result.startsWith("CYT_")) { | 161 | if (result.startsWith("CYT_")) { |
162 | LogUtil.i("result = " + result); | 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 | + typeScan = 0; |
164 | + if (result.contains(",")) { | ||
165 | + result = result.substring(result.indexOf("_") + 1, result.indexOf(",")); | ||
166 | + LogUtil.i(TAG, "resultString = " + result); | ||
167 | + } else { | ||
168 | + result = result.substring(result.indexOf("_") + 1, result.length()); | ||
169 | + LogUtil.i(TAG, "resultString1 = " + result); | ||
170 | + } | ||
166 | ArrayList<ConfigBean> beans = DbManager.GetConfigs(); | 171 | ArrayList<ConfigBean> beans = DbManager.GetConfigs(); |
167 | // 畅游通生成的订单ID: | 172 | // 畅游通生成的订单ID: |
168 | String ec_name = beans.get(0).getEc_signkey(); | 173 | String ec_name = beans.get(0).getEc_signkey(); |
169 | ec_name = AESEncryptor.decrypt(constant.decrypt, ec_name); | 174 | ec_name = AESEncryptor.decrypt(constant.decrypt, ec_name); |
170 | result = DesUtil.decrypt(result, ec_name); | 175 | result = DesUtil.decrypt(result, ec_name); |
171 | } else if (result.startsWith("TDOS_")) { | 176 | } else if (result.startsWith("TDOS_")) { |
172 | - result = result.substring( | ||
173 | - result.indexOf("_") + 1, | ||
174 | - result.indexOf(",")); | 177 | + typeScan = 0; |
178 | +// result = result.substring(result.indexOf("_") + 1,result.indexOf(",")); | ||
179 | + result = result.substring(result.indexOf("_") + 1, result.length()); | ||
175 | result = new String(Base64.decode(result), "utf-8"); | 180 | result = new String(Base64.decode(result), "utf-8"); |
176 | } else if ((result.startsWith("TY_") || (result.startsWith("PMS_")))) { | 181 | } else if ((result.startsWith("TY_") || (result.startsWith("PMS_")))) { |
182 | + typeScan = 1; | ||
177 | result = result; | 183 | result = result; |
178 | } else { | 184 | } else { |
185 | + typeScan = 1; | ||
179 | result = result; | 186 | result = result; |
180 | } | 187 | } |
181 | } catch (Exception e) { | 188 | } catch (Exception e) { |
@@ -193,6 +200,7 @@ public class NewHandleScanerActivity extends BaseActivity { | @@ -193,6 +200,7 @@ public class NewHandleScanerActivity extends BaseActivity { | ||
193 | MToast(NewHandleScanerActivity.this, result, Toast.LENGTH_SHORT); | 200 | MToast(NewHandleScanerActivity.this, result, Toast.LENGTH_SHORT); |
194 | } | 201 | } |
195 | intent.putExtra("titleName", getString(R.string.show_result)); | 202 | intent.putExtra("titleName", getString(R.string.show_result)); |
203 | + intent.putExtra("typeScan", typeScan); | ||
196 | startActivity(intent); | 204 | startActivity(intent); |
197 | finish(); | 205 | finish(); |
198 | } | 206 | } |
src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java
1 | package com.ectrip.cyt.ui; | 1 | package com.ectrip.cyt.ui; |
2 | + | ||
2 | import java.io.IOException; | 3 | import java.io.IOException; |
3 | import java.util.ArrayList; | 4 | import java.util.ArrayList; |
4 | import java.util.Vector; | 5 | import java.util.Vector; |
@@ -41,7 +42,7 @@ import com.google.zxing.Result; | @@ -41,7 +42,7 @@ import com.google.zxing.Result; | ||
41 | * 手机版扫描二维码 | 42 | * 手机版扫描二维码 |
42 | */ | 43 | */ |
43 | public class PhomeScanerOrderActivity extends BaseActivity implements Callback { | 44 | public class PhomeScanerOrderActivity extends BaseActivity implements Callback { |
44 | - | 45 | + public final String TAG = "PhomeScanerOrderActivity"; |
45 | private CaptureActivityHandler handler; | 46 | private CaptureActivityHandler handler; |
46 | private ViewfinderView viewfinderView; | 47 | private ViewfinderView viewfinderView; |
47 | private boolean hasSurface; | 48 | private boolean hasSurface; |
@@ -53,6 +54,7 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback { | @@ -53,6 +54,7 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback { | ||
53 | private final float BEEP_VOLUME = 0.10f; | 54 | private final float BEEP_VOLUME = 0.10f; |
54 | private boolean vibrate; | 55 | private boolean vibrate; |
55 | private String titleName; | 56 | private String titleName; |
57 | + private int typeScan; | ||
56 | 58 | ||
57 | /** | 59 | /** |
58 | * Called when the activity is first created. | 60 | * Called when the activity is first created. |
@@ -127,33 +129,40 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback { | @@ -127,33 +129,40 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback { | ||
127 | inactivityTimer.onActivity(); | 129 | inactivityTimer.onActivity(); |
128 | playBeepSoundAndVibrate(); | 130 | playBeepSoundAndVibrate(); |
129 | String resultString = result.getText().trim(); | 131 | String resultString = result.getText().trim(); |
130 | - LogUtil.i("扫码数据 = " + resultString); | 132 | + LogUtil.i(TAG, "扫码数据 = " + resultString); |
131 | if (resultString.equals("")) { | 133 | if (resultString.equals("")) { |
132 | MToast(PhomeScanerOrderActivity.this, | 134 | MToast(PhomeScanerOrderActivity.this, |
133 | getString(R.string.scan_fail), MToast.LENGTH_SHORT); | 135 | getString(R.string.scan_fail), MToast.LENGTH_SHORT); |
134 | } else { | 136 | } else { |
135 | try { | 137 | try { |
136 | if (resultString.startsWith("CYT_")) { | 138 | 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); | 139 | + typeScan = 0; |
140 | + if (resultString.contains(",")) { | ||
141 | + resultString = resultString.substring(resultString.indexOf("_") + 1, resultString.indexOf(",")); | ||
142 | + LogUtil.i(TAG, "resultString = " + resultString); | ||
143 | + } else { | ||
144 | + resultString = resultString.substring(resultString.indexOf("_") + 1, resultString.length()); | ||
145 | + LogUtil.i(TAG, "resultString1 = " + resultString); | ||
146 | + } | ||
140 | ArrayList<ConfigBean> beans = DbManager.GetConfigs(); | 147 | ArrayList<ConfigBean> beans = DbManager.GetConfigs(); |
141 | // 畅游通生成的订单ID: | 148 | // 畅游通生成的订单ID: |
142 | String ec_name = beans.get(0).getEc_signkey(); | 149 | String ec_name = beans.get(0).getEc_signkey(); |
143 | - LogUtil.i("ec_name = " + ec_name); | 150 | + LogUtil.i(TAG, "ec_name = " + ec_name); |
144 | ec_name = AESEncryptor.decrypt(constant.decrypt, ec_name); | 151 | ec_name = AESEncryptor.decrypt(constant.decrypt, ec_name); |
145 | - LogUtil.i("ec_name1 = " + ec_name); | ||
146 | - LogUtil.i("resultString1 = " + resultString); | 152 | + LogUtil.i(TAG, "ec_name1 = " + ec_name); |
147 | resultString = DesUtil.decrypt(resultString, ec_name); | 153 | resultString = DesUtil.decrypt(resultString, ec_name); |
148 | 154 | ||
149 | } else if (resultString.startsWith("TDOS_")) { | 155 | } else if (resultString.startsWith("TDOS_")) { |
150 | - resultString = resultString.substring( | ||
151 | - resultString.indexOf("_") + 1, | ||
152 | - resultString.indexOf(",")); | 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); | ||
153 | resultString = new String(Base64.decode(resultString), "utf-8"); | 160 | resultString = new String(Base64.decode(resultString), "utf-8"); |
154 | } else if ((resultString.startsWith("TY_") || (resultString.startsWith("PMS_")))) { | 161 | } else if ((resultString.startsWith("TY_") || (resultString.startsWith("PMS_")))) { |
162 | + typeScan = 1; | ||
155 | resultString = resultString; | 163 | resultString = resultString; |
156 | } else { | 164 | } else { |
165 | + typeScan = 1; | ||
157 | resultString = resultString; | 166 | resultString = resultString; |
158 | } | 167 | } |
159 | } catch (Exception e) { | 168 | } catch (Exception e) { |
@@ -166,6 +175,7 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback { | @@ -166,6 +175,7 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback { | ||
166 | intent.putExtra("input_orid", resultString); | 175 | intent.putExtra("input_orid", resultString); |
167 | LogUtil.i(getString(R.string.scan_result) + resultString); | 176 | LogUtil.i(getString(R.string.scan_result) + resultString); |
168 | intent.putExtra("titleName", getString(R.string.show_result)); | 177 | intent.putExtra("titleName", getString(R.string.show_result)); |
178 | + intent.putExtra("typeScan", typeScan); | ||
169 | startActivity(intent); | 179 | startActivity(intent); |
170 | } | 180 | } |
171 | Boolean scanBack = SharedPreferences2Obj.getInstance(this).setName("config").getObject("scanBack", Boolean.class); | 181 | Boolean scanBack = SharedPreferences2Obj.getInstance(this).setName("config").getObject("scanBack", Boolean.class); |
src/com/ectrip/cyt/ui/QRCodeOrderListActivity.java
@@ -52,7 +52,7 @@ public class QRCodeOrderListActivity extends BaseActivity implements ListOnclick | @@ -52,7 +52,7 @@ public class QRCodeOrderListActivity extends BaseActivity implements ListOnclick | ||
52 | private View errorLayout; | 52 | private View errorLayout; |
53 | private TextView errorInfo; | 53 | private TextView errorInfo; |
54 | private Integer Select; | 54 | private Integer Select; |
55 | - | 55 | + private int typeScan; |
56 | @Override | 56 | @Override |
57 | protected void onCreate(Bundle savedInstanceState) { | 57 | protected void onCreate(Bundle savedInstanceState) { |
58 | super.onCreate(savedInstanceState); | 58 | super.onCreate(savedInstanceState); |
@@ -98,6 +98,8 @@ public class QRCodeOrderListActivity extends BaseActivity implements ListOnclick | @@ -98,6 +98,8 @@ public class QRCodeOrderListActivity extends BaseActivity implements ListOnclick | ||
98 | .setName("MachineType").getObject("type", Integer.class); | 98 | .setName("MachineType").getObject("type", Integer.class); |
99 | orid = getIntent().getStringExtra("input_orid"); | 99 | orid = getIntent().getStringExtra("input_orid"); |
100 | LogUtil.d(TAG, "orid = " + orid); | 100 | LogUtil.d(TAG, "orid = " + orid); |
101 | + typeScan = getIntent().getIntExtra("typeScan",0); | ||
102 | + LogUtil.d(TAG, "typeScan = " + typeScan); | ||
101 | HttpHelper.getInstance(QRCodeOrderListActivity.this).queryOrder( | 103 | HttpHelper.getInstance(QRCodeOrderListActivity.this).queryOrder( |
102 | "QRCODE", null, null, null, orid, null, null, "15", "1", | 104 | "QRCODE", null, null, null, orid, null, null, "15", "1", |
103 | new MyHttpCallback()); | 105 | new MyHttpCallback()); |
@@ -211,7 +213,7 @@ public class QRCodeOrderListActivity extends BaseActivity implements ListOnclick | @@ -211,7 +213,7 @@ public class QRCodeOrderListActivity extends BaseActivity implements ListOnclick | ||
211 | if (orderInfos != null) { | 213 | if (orderInfos != null) { |
212 | adapter = new ReportExpandableListAdapter( | 214 | adapter = new ReportExpandableListAdapter( |
213 | QRCodeOrderListActivity.this, | 215 | QRCodeOrderListActivity.this, |
214 | - QRCodeOrderListActivity.this, orderInfos, 1); | 216 | + QRCodeOrderListActivity.this, orderInfos, typeScan); |
215 | orderList.setAdapter(adapter); | 217 | orderList.setAdapter(adapter); |
216 | 218 | ||
217 | //取消分割线 | 219 | //取消分割线 |
src/com/ectrip/cyt/ui/ScanerOrderActivity.java
@@ -85,7 +85,7 @@ public class ScanerOrderActivity extends BaseActivity { | @@ -85,7 +85,7 @@ public class ScanerOrderActivity extends BaseActivity { | ||
85 | 85 | ||
86 | private WifiManager wifi; | 86 | private WifiManager wifi; |
87 | private boolean isConnected; | 87 | private boolean isConnected; |
88 | - | 88 | + private int typeScan; |
89 | private MyHandler handler; | 89 | private MyHandler handler; |
90 | 90 | ||
91 | @Override | 91 | @Override |
@@ -213,8 +213,14 @@ public class ScanerOrderActivity extends BaseActivity { | @@ -213,8 +213,14 @@ public class ScanerOrderActivity extends BaseActivity { | ||
213 | LogUtil.i(TAG, getString(R.string.scan_result) | 213 | LogUtil.i(TAG, getString(R.string.scan_result) |
214 | + " = " + scannerResult); | 214 | + " = " + scannerResult); |
215 | if (scannerResult.startsWith("CYT_")) { | 215 | if (scannerResult.startsWith("CYT_")) { |
216 | -// scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1,scannerResult.indexOf(",")); | ||
217 | - scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1, scannerResult.length()); | 216 | + typeScan = 0; |
217 | + if (scannerResult.contains(",")) { | ||
218 | + scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1, scannerResult.indexOf(",")); | ||
219 | + LogUtil.i(TAG, "resultString = " + scannerResult); | ||
220 | + } else { | ||
221 | + scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1, scannerResult.length()); | ||
222 | + LogUtil.i(TAG, "resultString1 = " + scannerResult); | ||
223 | + } | ||
218 | ArrayList<ConfigBean> beans = DbManager.GetConfigs(); | 224 | ArrayList<ConfigBean> beans = DbManager.GetConfigs(); |
219 | // 畅游通生成的订单ID: | 225 | // 畅游通生成的订单ID: |
220 | String ec_name = beans.get(0).getEc_signkey(); | 226 | String ec_name = beans.get(0).getEc_signkey(); |
@@ -222,13 +228,15 @@ public class ScanerOrderActivity extends BaseActivity { | @@ -222,13 +228,15 @@ public class ScanerOrderActivity extends BaseActivity { | ||
222 | ec_name); | 228 | ec_name); |
223 | scannerResult = DesUtil.decrypt(scannerResult, ec_name); | 229 | scannerResult = DesUtil.decrypt(scannerResult, ec_name); |
224 | } else if (scannerResult.startsWith("TDOS_")) { | 230 | } else if (scannerResult.startsWith("TDOS_")) { |
225 | - scannerResult = scannerResult.substring( | ||
226 | - scannerResult.indexOf("_") + 1, | ||
227 | - scannerResult.indexOf(",")); | 231 | + typeScan = 0; |
232 | +// scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1,scannerResult.indexOf(",")); | ||
233 | + scannerResult = scannerResult.substring(scannerResult.indexOf("_") + 1, scannerResult.length()); | ||
228 | scannerResult = new String(Base64.decode(scannerResult), "utf-8"); | 234 | scannerResult = new String(Base64.decode(scannerResult), "utf-8"); |
229 | } else if ((scannerResult.startsWith("TY_") || (scannerResult.startsWith("PMS_")))) { | 235 | } else if ((scannerResult.startsWith("TY_") || (scannerResult.startsWith("PMS_")))) { |
236 | + typeScan = 1; | ||
230 | scannerResult = scannerResult; | 237 | scannerResult = scannerResult; |
231 | } else { | 238 | } else { |
239 | + typeScan = 1; | ||
232 | scannerResult = scannerResult; | 240 | scannerResult = scannerResult; |
233 | } | 241 | } |
234 | Message msg = new Message(); | 242 | Message msg = new Message(); |
@@ -383,6 +391,7 @@ public class ScanerOrderActivity extends BaseActivity { | @@ -383,6 +391,7 @@ public class ScanerOrderActivity extends BaseActivity { | ||
383 | intent.putExtra("mode", 1); | 391 | intent.putExtra("mode", 1); |
384 | intent.putExtra("input_orid", msg.obj.toString()); | 392 | intent.putExtra("input_orid", msg.obj.toString()); |
385 | intent.putExtra("titleName", getString(R.string.show_result)); | 393 | intent.putExtra("titleName", getString(R.string.show_result)); |
394 | + intent.putExtra("typeScan", typeScan); | ||
386 | startActivity(intent); | 395 | startActivity(intent); |
387 | finish(); | 396 | finish(); |
388 | break; | 397 | break; |