Commit dc94caf7a111ba748fd87c756af689bcac9350b5
1 parent
8094643a
畅游通核销app: 1.增加RSK设备的摄像头适配
Showing
2 changed files
with
31 additions
and
31 deletions
src/com/ectrip/cyt/ui/SettingsActivity.java
@@ -98,7 +98,7 @@ public class SettingsActivity extends BaseActivity implements OnClickListener, | @@ -98,7 +98,7 @@ public class SettingsActivity extends BaseActivity implements OnClickListener, | ||
98 | private Boolean scanBack; | 98 | private Boolean scanBack; |
99 | private LinearLayout lv_printNum; | 99 | private LinearLayout lv_printNum; |
100 | private ArrayList<ConfigBean> beans; | 100 | private ArrayList<ConfigBean> beans; |
101 | - private Spinner select_dev; | 101 | +// private Spinner select_dev; |
102 | private List<String> devlist = new ArrayList<String>(); | 102 | private List<String> devlist = new ArrayList<String>(); |
103 | private ArrayAdapter<String> adapter; | 103 | private ArrayAdapter<String> adapter; |
104 | 104 | ||
@@ -165,7 +165,7 @@ public class SettingsActivity extends BaseActivity implements OnClickListener, | @@ -165,7 +165,7 @@ public class SettingsActivity extends BaseActivity implements OnClickListener, | ||
165 | reprntEncrypt = (ImageView) findViewById(R.id.iv_reprintEncrypt); | 165 | reprntEncrypt = (ImageView) findViewById(R.id.iv_reprintEncrypt); |
166 | scanEncrypt = (ImageView) findViewById(R.id.iv_scanEncrypt); | 166 | scanEncrypt = (ImageView) findViewById(R.id.iv_scanEncrypt); |
167 | 167 | ||
168 | - select_dev = (Spinner) findViewById(R.id.set_select_dev); | 168 | +// select_dev = (Spinner) findViewById(R.id.set_select_dev); |
169 | 169 | ||
170 | // 显示版本号 | 170 | // 显示版本号 |
171 | String versionName = MyApp.getInstance().getVersionName(); | 171 | String versionName = MyApp.getInstance().getVersionName(); |
@@ -200,17 +200,17 @@ public class SettingsActivity extends BaseActivity implements OnClickListener, | @@ -200,17 +200,17 @@ public class SettingsActivity extends BaseActivity implements OnClickListener, | ||
200 | testGroup.setOnClickListener(this); | 200 | testGroup.setOnClickListener(this); |
201 | scanGroup.setOnClickListener(this); | 201 | scanGroup.setOnClickListener(this); |
202 | confirmBtn.setOnClickListener(this); | 202 | confirmBtn.setOnClickListener(this); |
203 | - select_dev.setOnItemSelectedListener(new Spinner.OnItemSelectedListener() { | ||
204 | - public void onItemSelected(AdapterView<?> arg0, View view, int position, long id) { | ||
205 | - SharedPreferences2Obj.getInstance(SettingsActivity.this) | ||
206 | - .setName("MachineType").setObject("type", position); | ||
207 | - } | ||
208 | - | ||
209 | - @Override | ||
210 | - public void onNothingSelected(AdapterView<?> parent) { | ||
211 | - parent.setVisibility(View.VISIBLE); | ||
212 | - } | ||
213 | - }); | 203 | +// select_dev.setOnItemSelectedListener(new Spinner.OnItemSelectedListener() { |
204 | +// public void onItemSelected(AdapterView<?> arg0, View view, int position, long id) { | ||
205 | +// SharedPreferences2Obj.getInstance(SettingsActivity.this) | ||
206 | +// .setName("MachineType").setObject("type", position); | ||
207 | +// } | ||
208 | + | ||
209 | +// @Override | ||
210 | +// public void onNothingSelected(AdapterView<?> parent) { | ||
211 | +// parent.setVisibility(View.VISIBLE); | ||
212 | +// } | ||
213 | +// }); | ||
214 | } | 214 | } |
215 | 215 | ||
216 | /*************************************** 退出应用****************************/ | 216 | /*************************************** 退出应用****************************/ |
@@ -376,23 +376,23 @@ public class SettingsActivity extends BaseActivity implements OnClickListener, | @@ -376,23 +376,23 @@ public class SettingsActivity extends BaseActivity implements OnClickListener, | ||
376 | 376 | ||
377 | int type = SharedPreferences2Obj.getInstance(SettingsActivity.this) | 377 | int type = SharedPreferences2Obj.getInstance(SettingsActivity.this) |
378 | .setName("MachineType").getObject("type", Integer.class); | 378 | .setName("MachineType").getObject("type", Integer.class); |
379 | - select_dev.setSelection(type, true); | ||
380 | - devlist.add("0、鼎游小型手持机"); | ||
381 | - devlist.add("1、鼎游指纹手持机"); | ||
382 | - devlist.add("2、安卓手机"); | ||
383 | - devlist.add("3、鼎游POS机"); | ||
384 | - devlist.add("4、鼎游手持POS机"); | ||
385 | - devlist.add("5、鼎游身份证手持机"); | ||
386 | - devlist.add("6、鼎游大POS机"); | ||
387 | - devlist.add("7、鼎游测温手持机"); | ||
388 | - devlist.add("8、鼎游身份证手持机"); | ||
389 | - devlist.add("9、鼎游NFC手持机"); | ||
390 | - devlist.add("10、鼎游新身份证手持机"); | ||
391 | - devlist.add("11、其他"); | ||
392 | - adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, devlist); | ||
393 | - adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); | ||
394 | - select_dev.setAdapter(adapter); | ||
395 | - select_dev.setSelection(type, true); | 379 | +// select_dev.setSelection(type, true); |
380 | +// devlist.add("0、鼎游小型手持机"); | ||
381 | +// devlist.add("1、鼎游指纹手持机"); | ||
382 | +// devlist.add("2、安卓手机"); | ||
383 | +// devlist.add("3、鼎游POS机"); | ||
384 | +// devlist.add("4、鼎游手持POS机"); | ||
385 | +// devlist.add("5、鼎游身份证手持机"); | ||
386 | +// devlist.add("6、鼎游大POS机"); | ||
387 | +// devlist.add("7、鼎游测温手持机"); | ||
388 | +// devlist.add("8、鼎游身份证手持机"); | ||
389 | +// devlist.add("9、鼎游NFC手持机"); | ||
390 | +// devlist.add("10、鼎游新身份证手持机"); | ||
391 | +// devlist.add("11、其他"); | ||
392 | +// adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, devlist); | ||
393 | +// adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); | ||
394 | +// select_dev.setAdapter(adapter); | ||
395 | +// select_dev.setSelection(type, true); | ||
396 | } | 396 | } |
397 | 397 | ||
398 | 398 |
src/com/ectrip/cyt/zxing/camera/CameraConfigurationManager.java
@@ -84,7 +84,7 @@ final class CameraConfigurationManager { | @@ -84,7 +84,7 @@ final class CameraConfigurationManager { | ||
84 | Integer type = SharedPreferences2Obj.getInstance(context) | 84 | Integer type = SharedPreferences2Obj.getInstance(context) |
85 | .setName("MachineType").getObject("type", Integer.class); | 85 | .setName("MachineType").getObject("type", Integer.class); |
86 | if (type == DeviceType.HANDSET.getValue() | 86 | if (type == DeviceType.HANDSET.getValue() |
87 | - || type == DeviceType.MOBILE.getValue()||type == DeviceType.BASEWIN_REB_POS.getValue()) { | 87 | + || type == DeviceType.MOBILE.getValue()||type == DeviceType.BASEWIN_REB_POS.getValue()||type == DeviceType.ID_CARD_POS_RSK.getValue()) { |
88 | setDisplayOrientation(camera, 90); | 88 | setDisplayOrientation(camera, 90); |
89 | } | 89 | } |
90 | camera.setParameters(parameters); | 90 | camera.setParameters(parameters); |