From dc94caf7a111ba748fd87c756af689bcac9350b5 Mon Sep 17 00:00:00 2001
From: 黄灿宏 <canhong.huang@ectrip.com>
Date: Tue, 14 Nov 2023 15:48:57 +0800
Subject: [PATCH] 畅游通核销app: 1.增加RSK设备的摄像头适配

---
 src/com/ectrip/cyt/ui/SettingsActivity.java                     | 60 ++++++++++++++++++++++++++++++------------------------------
 src/com/ectrip/cyt/zxing/camera/CameraConfigurationManager.java |  2 +-
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/com/ectrip/cyt/ui/SettingsActivity.java b/src/com/ectrip/cyt/ui/SettingsActivity.java
index 0ed0354..0903439 100644
--- a/src/com/ectrip/cyt/ui/SettingsActivity.java
+++ b/src/com/ectrip/cyt/ui/SettingsActivity.java
@@ -98,7 +98,7 @@ public class SettingsActivity extends BaseActivity implements OnClickListener,
     private Boolean scanBack;
     private LinearLayout lv_printNum;
     private ArrayList<ConfigBean> beans;
-    private Spinner select_dev;
+//    private Spinner select_dev;
     private List<String> devlist = new ArrayList<String>();
     private ArrayAdapter<String> adapter;
 
@@ -165,7 +165,7 @@ public class SettingsActivity extends BaseActivity implements OnClickListener,
         reprntEncrypt = (ImageView) findViewById(R.id.iv_reprintEncrypt);
         scanEncrypt = (ImageView) findViewById(R.id.iv_scanEncrypt);
 
-        select_dev = (Spinner) findViewById(R.id.set_select_dev);
+//        select_dev = (Spinner) findViewById(R.id.set_select_dev);
 
         // 显示版本号
         String versionName = MyApp.getInstance().getVersionName();
@@ -200,17 +200,17 @@ public class SettingsActivity extends BaseActivity implements OnClickListener,
         testGroup.setOnClickListener(this);
         scanGroup.setOnClickListener(this);
         confirmBtn.setOnClickListener(this);
-        select_dev.setOnItemSelectedListener(new Spinner.OnItemSelectedListener() {
-            public void onItemSelected(AdapterView<?> arg0, View view, int position, long id) {
-                SharedPreferences2Obj.getInstance(SettingsActivity.this)
-                        .setName("MachineType").setObject("type", position);
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-                parent.setVisibility(View.VISIBLE);
-            }
-        });
+//        select_dev.setOnItemSelectedListener(new Spinner.OnItemSelectedListener() {
+//            public void onItemSelected(AdapterView<?> arg0, View view, int position, long id) {
+//                SharedPreferences2Obj.getInstance(SettingsActivity.this)
+//                        .setName("MachineType").setObject("type", position);
+//            }
+
+//            @Override
+//            public void onNothingSelected(AdapterView<?> parent) {
+//                parent.setVisibility(View.VISIBLE);
+//            }
+//        });
     }
 
     /*************************************** 退出应用****************************/
@@ -376,23 +376,23 @@ public class SettingsActivity extends BaseActivity implements OnClickListener,
 
         int type = SharedPreferences2Obj.getInstance(SettingsActivity.this)
                 .setName("MachineType").getObject("type", Integer.class);
-        select_dev.setSelection(type, true);
-        devlist.add("0、鼎游小型手持机");
-        devlist.add("1、鼎游指纹手持机");
-        devlist.add("2、安卓手机");
-        devlist.add("3、鼎游POS机");
-        devlist.add("4、鼎游手持POS机");
-        devlist.add("5、鼎游身份证手持机");
-        devlist.add("6、鼎游大POS机");
-        devlist.add("7、鼎游测温手持机");
-        devlist.add("8、鼎游身份证手持机");
-        devlist.add("9、鼎游NFC手持机");
-        devlist.add("10、鼎游新身份证手持机");
-        devlist.add("11、其他");
-        adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, devlist);
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        select_dev.setAdapter(adapter);
-        select_dev.setSelection(type, true);
+//        select_dev.setSelection(type, true);
+//        devlist.add("0、鼎游小型手持机");
+//        devlist.add("1、鼎游指纹手持机");
+//        devlist.add("2、安卓手机");
+//        devlist.add("3、鼎游POS机");
+//        devlist.add("4、鼎游手持POS机");
+//        devlist.add("5、鼎游身份证手持机");
+//        devlist.add("6、鼎游大POS机");
+//        devlist.add("7、鼎游测温手持机");
+//        devlist.add("8、鼎游身份证手持机");
+//        devlist.add("9、鼎游NFC手持机");
+//        devlist.add("10、鼎游新身份证手持机");
+//        devlist.add("11、其他");
+//        adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, devlist);
+//        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+//        select_dev.setAdapter(adapter);
+//        select_dev.setSelection(type, true);
     }
 
 
diff --git a/src/com/ectrip/cyt/zxing/camera/CameraConfigurationManager.java b/src/com/ectrip/cyt/zxing/camera/CameraConfigurationManager.java
index 96cd81d..4b9941a 100644
--- a/src/com/ectrip/cyt/zxing/camera/CameraConfigurationManager.java
+++ b/src/com/ectrip/cyt/zxing/camera/CameraConfigurationManager.java
@@ -84,7 +84,7 @@ final class CameraConfigurationManager {
 		Integer type = SharedPreferences2Obj.getInstance(context)
 				.setName("MachineType").getObject("type", Integer.class);
 		if (type == DeviceType.HANDSET.getValue()
-				|| type == DeviceType.MOBILE.getValue()||type == DeviceType.BASEWIN_REB_POS.getValue()) {
+				|| type == DeviceType.MOBILE.getValue()||type == DeviceType.BASEWIN_REB_POS.getValue()||type == DeviceType.ID_CARD_POS_RSK.getValue()) {
 			setDisplayOrientation(camera, 90);
 		}
 		camera.setParameters(parameters);
--
libgit2 0.21.4