Commit 9e9f1eb7710bf4a5d209fdc9321404809711a027

Authored by 杜方
1 parent 2707d233

1、畅游通核销app:新增主界面关于按钮的背景图片

src/com/ectrip/cyt/ui/MainActivity.java
@@ -366,7 +366,7 @@ public class MainActivity extends BaseActivity implements OnItemClickListener, V @@ -366,7 +366,7 @@ public class MainActivity extends BaseActivity implements OnItemClickListener, V
366 R.drawable.statistic_selector, R.drawable.icon_bg02, 366 R.drawable.statistic_selector, R.drawable.icon_bg02,
367 Module.STATISTIC)); 367 Module.STATISTIC));
368 data.add(new ImageInfo(getString(R.string.about), 368 data.add(new ImageInfo(getString(R.string.about),
369 - R.drawable.about_icon, R.drawable.icon_bg02, 369 + R.drawable.about, R.drawable.icon_bg02,
370 Module.ABOUT)); 370 Module.ABOUT));
371 return data; 371 return data;
372 } 372 }
src/com/ectrip/cyt/ui/NewHandleScanerActivity.java
@@ -134,7 +134,7 @@ public class NewHandleScanerActivity extends BaseActivity { @@ -134,7 +134,7 @@ public class NewHandleScanerActivity extends BaseActivity {
134 134
135 try { 135 try {
136 String tempstr = new String(buffer, 0, size); 136 String tempstr = new String(buffer, 0, size);
137 - handleDecode(new String(tempstr.getBytes("GBK"), "GBK")); 137 + handleDecode(new String(tempstr.getBytes("GBK"), "GBK").trim());
138 } catch (UnsupportedEncodingException e) { 138 } catch (UnsupportedEncodingException e) {
139 e.printStackTrace(); 139 e.printStackTrace();
140 } catch (Exception e) { 140 } catch (Exception e) {
src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java
@@ -126,7 +126,7 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback { @@ -126,7 +126,7 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback {
126 public void handleDecode(Result result) { 126 public void handleDecode(Result result) {
127 inactivityTimer.onActivity(); 127 inactivityTimer.onActivity();
128 playBeepSoundAndVibrate(); 128 playBeepSoundAndVibrate();
129 - String resultString = result.getText(); 129 + String resultString = result.getText().trim();
130 LogUtil.i("扫码数据 = " + resultString); 130 LogUtil.i("扫码数据 = " + resultString);
131 if (resultString.equals("")) { 131 if (resultString.equals("")) {
132 MToast(PhomeScanerOrderActivity.this, 132 MToast(PhomeScanerOrderActivity.this,
src/com/ectrip/cyt/ui/ScanerOrderActivity.java
@@ -209,7 +209,7 @@ public class ScanerOrderActivity extends BaseActivity { @@ -209,7 +209,7 @@ public class ScanerOrderActivity extends BaseActivity {
209 209
210 try { 210 try {
211 211
212 - scannerResult = sym.getData(); 212 + scannerResult = sym.getData().trim();
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_")) {