From d77aad46eae1e111d0869d3c7ff4bdb84a058c73 Mon Sep 17 00:00:00 2001
From: 杜方 <fang.du@ectrip.com>
Date: Mon, 13 Nov 2023 09:48:44 +0800
Subject: [PATCH] 畅游通核销app:  1.适配5501H读身份证  2.适配5501H扫码头显示方向

---
 .gitignore                                                      |  36 ++++++++++++++++++------------------
 AndroidManifest.xml                                             |   7 +++++++
 CYTAndroid4.0.iml                                               |   1 +
 build.gradle                                                    |   7 ++++++-
 res/layout/app_settings.xml                                     |   9 ++++-----
 src/com/ectrip/cyt/config/DevicTool.java                        |  16 +++++++++++++++-
 src/com/ectrip/cyt/config/MyApp.java                            |  27 ++++++++++++++++++++++++++-
 src/com/ectrip/cyt/constant/DeviceType.java                     |   3 ++-
 src/com/ectrip/cyt/ui/MainActivity.java                         |  21 ++++++++++++++++++---
 src/com/ectrip/cyt/ui/SelectActionActivity.java                 | 683 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/com/ectrip/cyt/zxing/camera/CameraConfigurationManager.java |   3 ++-
 11 files changed, 494 insertions(+), 319 deletions(-)

diff --git a/.gitignore b/.gitignore
index b05ec35..648a7ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,18 @@
-#/CYTAndroid4.0.iml
-#build.gradle
-#local.properties
-#license.dat
-#proguard-project.txt
-#local.properties
-#gradle
-#.gradle
-#.idea
-#*.iml
-#.project
-#gradlew
-#gradlew.bat
-#.gitignore
-#build
-#.settings
-#project.properties
-#/release/
+/CYTAndroid4.0.iml
+build.gradle
+local.properties
+license.dat
+proguard-project.txt
+local.properties
+gradle
+.gradle
+.idea
+*.iml
+.project
+gradlew
+gradlew.bat
+.gitignore
+build
+.settings
+project.properties
+/release/
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dca9a07..bd897d1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -239,6 +239,13 @@
             android:screenOrientation="portrait"
             android:theme="@style/Theme"
             android:windowSoftInputMode="adjustPan|stateHidden" />
+        <activity
+            android:name="com.ectrip.cyt.ui.BlackIdCardActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme"
+            android:windowSoftInputMode="adjustPan|stateHidden" />
         <!-- 身份证显示列表页面 -->
         <activity
             android:name="com.ectrip.cyt.ui.IDOrderListActivity"
diff --git a/CYTAndroid4.0.iml b/CYTAndroid4.0.iml
index 7698dff..bc32f9a 100644
--- a/CYTAndroid4.0.iml
+++ b/CYTAndroid4.0.iml
@@ -97,6 +97,7 @@
     <orderEntry type="library" name="Gradle: ./libs/zbar.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./libs/zxing.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./libs/gson-2.6.2.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./libs/zypos1.8.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./libs/bw_pos_sdk2.0.18.jar" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 91c224e..593438a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,6 +30,7 @@ dependencies {
     implementation files('libs/zbar.jar')
     implementation files('libs/zxing.jar')
     implementation files('libs/gson-2.6.2.jar')
+    implementation files('libs\\zypos1.8.jar')
     compileOnly files('external_libs/classes_2.1.11_20160907.jar')
     compileOnly files('external_libs/bw_odm_20160526.jar')
     implementation files('libs/bw_pos_sdk2.0.18.jar')
@@ -37,7 +38,11 @@ dependencies {
 
 android {
     compileSdkVersion 24
-
+    defaultConfig {
+        ndk {
+            abiFilters "armeabi-v7a"//可以适当补填其他
+        }
+    }
 
     buildTypes {
         release {
diff --git a/res/layout/app_settings.xml b/res/layout/app_settings.xml
index 031a06e..e3ddf18 100644
--- a/res/layout/app_settings.xml
+++ b/res/layout/app_settings.xml
@@ -355,18 +355,17 @@
 
             <TextView
                 android:id="@+id/version"
-                android:layout_toRightOf="@id/version_number"
-                android:layout_centerVertical="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
                 android:layout_marginTop="10dp"
+                android:layout_toRightOf="@id/version_number"
                 android:gravity="center|left"
                 android:padding="10dp"
                 android:singleLine="true"
-                android:textSize="18sp"
-                android:textColor="#333333"
                 android:text=""
-                />
+                android:textColor="#333333"
+                android:textSize="18sp" />
 
 
             <Button
diff --git a/src/com/ectrip/cyt/config/DevicTool.java b/src/com/ectrip/cyt/config/DevicTool.java
index 01f72bc..1269f19 100644
--- a/src/com/ectrip/cyt/config/DevicTool.java
+++ b/src/com/ectrip/cyt/config/DevicTool.java
@@ -29,6 +29,7 @@ import android.os.Message;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.view.Display;
 import android.view.WindowManager;
 
@@ -480,5 +481,18 @@ public class DevicTool {
             return false;
         }
     }
-
+    public static boolean isHiboryPos() {
+        try {
+            String sn = android.os.Build.MODEL;
+            Log.d("SN", sn);
+            if (TextUtils.equals(sn, "5501H")) {
+                return true;
+            } else {
+                return false;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
 }
diff --git a/src/com/ectrip/cyt/config/MyApp.java b/src/com/ectrip/cyt/config/MyApp.java
index 4d787e1..c00cac8 100644
--- a/src/com/ectrip/cyt/config/MyApp.java
+++ b/src/com/ectrip/cyt/config/MyApp.java
@@ -629,8 +629,33 @@ public class MyApp extends BaseApplication {
 		}
 		System.exit(0);
 	}
+	private SerialPort mSerialPort = null;
+
+	public SerialPort getSerialPort() throws SecurityException, IOException, InvalidParameterException {
+		if (mSerialPort == null) {
+			/* Read serial port parameters */
+			SharedPreferences sp = getSharedPreferences("android_serialport_api.sample_preferences", MODE_PRIVATE);
+			String path = sp.getString("DEVICE", "/dev/ttyMT2");
+			int baudrate = Integer.decode(sp.getString("BAUDRATE", "115200"));
+
+			/* Check parameters */
+			if ( (path.length() == 0) || (baudrate == -1)) {
+				throw new InvalidParameterException();
+			}
 
-
+			/* Open the serial port */
+			//	mSerialPort = new SerialPort(new File("/dev/ttySAC1"), 9600, 0);
+			mSerialPort = new SerialPort(new File("/dev/ttyMT3"), 115200, 0);
+//			mSerialPort = new SerialPort(new File("/dev/ttyS1"), baudrate, 0);
+		}
+		return mSerialPort;
+	}
+	public void closeSerialPort() {
+		if (mSerialPort != null) {
+			mSerialPort.close();
+			mSerialPort = null;
+		}
+	}
 
 
 }
diff --git a/src/com/ectrip/cyt/constant/DeviceType.java b/src/com/ectrip/cyt/constant/DeviceType.java
index 0cdaba2..a925b04 100644
--- a/src/com/ectrip/cyt/constant/DeviceType.java
+++ b/src/com/ectrip/cyt/constant/DeviceType.java
@@ -14,8 +14,9 @@ public enum DeviceType {
 	//New_IDPOS:新的身份证pos机
 	//New_HANDSET_POS:新版小的pos(手持pos)机
 	//BASEWIN_REB_POS:盛本的红色pos机
+	//BLACK_ID_POS:5501H手持机
 	ID_POS(5),GENERAL_POS(6),SMALL_POS(7),HANDSET(8),MOBILE(9),New_POS(10),
-	New_IDPOS(11),New_HANDSET_POS(12),BASEWIN_REB_POS(13);
+	New_IDPOS(11),New_HANDSET_POS(12),BASEWIN_REB_POS(13),BLACK_ID_POS(14);
 	private int value;
 
 	private DeviceType(int value) {
diff --git a/src/com/ectrip/cyt/ui/MainActivity.java b/src/com/ectrip/cyt/ui/MainActivity.java
index 2ce0c33..4d69e45 100644
--- a/src/com/ectrip/cyt/ui/MainActivity.java
+++ b/src/com/ectrip/cyt/ui/MainActivity.java
@@ -37,6 +37,7 @@ import com.ectrip.cyt.base.DataTrans;
 import com.ectrip.cyt.bean.ConfigBean;
 import com.ectrip.cyt.bean.ImageInfo;
 import com.ectrip.cyt.callback.HttpCallback;
+import com.ectrip.cyt.center.PosApiHandle;
 import com.ectrip.cyt.config.BindService;
 import com.ectrip.cyt.config.DevicTool;
 import com.ectrip.cyt.config.MyApp;
@@ -91,8 +92,14 @@ public class MainActivity extends BaseActivity implements OnItemClickListener, V
         initView();
         regularDelecte();
         typeJudgment();
+//        initPOsSdk(); //初始化硬件
+    }
+    private void initPOsSdk() {
+        if (DevicTool.isHiboryPos()) {
+            PosApiHandle.getInstance().initSdk(this).openScan();
+            PosApiHandle.getInstance().initIDread();
+        }
     }
-
     /**
      * 删除配置文件
      */
@@ -137,6 +144,7 @@ public class MainActivity extends BaseActivity implements OnItemClickListener, V
         // 得到存储的类型
         Integer type = SharedPreferences2Obj.getInstance(MainActivity.this)
                 .setName("MachineType").getObject("type", Integer.class);
+        LogUtil.d(TAG, "type = " + type);
         //如果未存储类型
         if (type == null || type == 0) {
             DisplayMetrics metrics = new DisplayMetrics();
@@ -153,6 +161,13 @@ public class MainActivity extends BaseActivity implements OnItemClickListener, V
                 SharedPreferences2Obj.getInstance(MainActivity.this)
                         .setName("MachineType")
                         .setObject("type", DeviceType.New_POS.getValue());
+            } else if (DevicTool.getInstance().isHiboryPos()) {
+                LogUtil.d(TAG, "5501H手持机");
+                // 5501H手持机
+                LogUtil.i(getString(R.string.handset));
+                SharedPreferences2Obj.getInstance(MainActivity.this)
+                        .setName("MachineType")
+                        .setObject("type", DeviceType.BLACK_ID_POS.getValue());
             } else if ((getSerialNumber() != null
                     && getSerialNumber().contains("LY") && getSerialNumber()
                     .substring(0, 2).equals("LY"))) {
@@ -268,12 +283,12 @@ public class MainActivity extends BaseActivity implements OnItemClickListener, V
                 String ec_signkey = AESEncryptor.decrypt(constant.decrypt,
                         listConfig.get(0).getEc_signkey());
                 MyApp.getInstance().setSignkey(ec_signkey);
-                LogUtil.i("MainActivity","ec_signkey = "+ ec_signkey);
+                LogUtil.i("MainActivity", "ec_signkey = " + ec_signkey);
             } catch (Exception e) {
                 e.printStackTrace();
             }
             MyApp.getInstance().setIdentity(listConfig.get(0).getEc_identity());
-            LogUtil.i("MainActivity", "getEc_identity = "+listConfig.get(0).getEc_identity());
+            LogUtil.i("MainActivity", "getEc_identity = " + listConfig.get(0).getEc_identity());
             LogUtil.d(TAG, getString(R.string.current_ip)
                     + MyApp.getInstance().getServiceIp());
             return true;
diff --git a/src/com/ectrip/cyt/ui/SelectActionActivity.java b/src/com/ectrip/cyt/ui/SelectActionActivity.java
index 64712b4..9e4de31 100644
--- a/src/com/ectrip/cyt/ui/SelectActionActivity.java
+++ b/src/com/ectrip/cyt/ui/SelectActionActivity.java
@@ -1,9 +1,15 @@
 package com.ectrip.cyt.ui;
 
 import java.util.ArrayList;
+import java.util.Date;
 
 import android.content.Intent;
+import android.media.MediaPlayer;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.posapi.PosApi;
+import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -11,333 +17,434 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.GridView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.ectrip.cyt.adapter.GridDataAdapter;
 import com.ectrip.cyt.bean.ImageInfo;
+import com.ectrip.cyt.center.PosApiHandle;
+import com.ectrip.cyt.config.DevicTool;
 import com.ectrip.cyt.config.MyApp;
 import com.ectrip.cyt.constant.DeviceType;
 import com.ectrip.cyt.constant.Module;
 import com.ectrip.cyt.constant.SelectAction;
 import com.ectrip.cyt.utils.ActivitiesManager;
 import com.ectrip.cyt.utils.CommetryUtils;
+import com.ectrip.cyt.utils.CountDownTimer;
 import com.ectrip.cyt.utils.LogUtil;
 import com.ectrip.cyt.utils.SharedPreferences2Obj;
 import com.ectrip.trips.check.R;
 import com.fri.idcread.idcread;
 
 /**
- *
  * 检票操作 选择页面，包含扫二维码 身份证 串码
  *
  * @author jigo
  */
 public class SelectActionActivity extends BaseActivity implements
-		OnItemClickListener {
-	public final String TAG = "MainActivity";
-	private GridView gridView1;
-	private GridDataAdapter adapter;
-	private String titleName;
+        OnItemClickListener {
+    public final String TAG = "MainActivity";
+    private GridView gridView1;
+    private GridDataAdapter adapter;
+    private String titleName;
+
+    private Integer Select; // 选择模式 检票 补票 查票
+    private Integer type; // 类型
+    private PosApi mPosSDK = null;
+    private byte mGpioTrig = 0x29;// PC9
+    MediaPlayer player;
+
+    /**
+     * 执行扫描，扫描后的结果会通过action为PosApi.ACTION_POS_COMM_STATUS的广播发回
+     */
+    Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+
+            switch (msg.what) {
+
+                case 3:
+                    try {
+                        Bundle bundle = msg.getData();
+                        String id = bundle.getString("id");
+                        if (TextUtils.isEmpty(id)) return;
+                        player.start();
+//                        Toast.makeText(SelectActionActivity.this, "身份号码：" + id, Toast.LENGTH_SHORT).show();
+                        Intent intent = new Intent(SelectActionActivity.this,
+                                IDOrderListActivity.class);
+                        CountDownTimer.firstTime = new Date().getTime();// 不必要的可以删除
+                        intent.putExtra("mode", 0);
+                        intent.putExtra("idcardNumber", id);
+                        intent.putExtra("titleName", getString(R.string.order_list));
+                        startActivity(intent);
+                    } catch (IllegalStateException e) {
+                        e.printStackTrace();
+                    }
+                    break;
+            }
+
+
+        }
+    };
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.app_selection_action);
+        ActivitiesManager.getInstance().pushActivity(this);
+        initView();
+        init();
+//        if (DevicTool.isHiboryPos()) {
+//            initScan();
+//        }
+    }
+
+    private void initView() {
+        if (Select == null) {
+            Select = SharedPreferences2Obj
+                    .getInstance(SelectActionActivity.this)
+                    .setName("SelectAction").getObject("Select", Integer.class);
+            titleName = SharedPreferences2Obj
+                    .getInstance(SelectActionActivity.this)
+                    .setName("SelectAction")
+                    .getObject("titleName", String.class);
+        }
 
-	private Integer Select; // 选择模式 检票 补票 查票
-	private Integer type; // 类型
+        if (titleName != null) {
+            ((TextView) findViewById(R.id.title)).setText(titleName);
+        } else {
+            ((TextView) findViewById(R.id.title)).setText(R.string.operational);
+        }
 
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
+        ((TextView) findViewById(R.id.title)).setVisibility(View.VISIBLE);
 
-		setContentView(R.layout.app_selection_action);
-		ActivitiesManager.getInstance().pushActivity(this);
-		initView();
-		init();
-	}
+        gridView1 = (GridView) findViewById(R.id.gridView1);
+        LogUtil.i(TAG, "==data==" + initData().size());
+        gridView1.setNumColumns(2);
+        adapter = new GridDataAdapter(SelectActionActivity.this, initData());
+        gridView1.setAdapter(adapter);
+        gridView1.setOnItemClickListener(this);
 
-	private void initView() {
-		if (Select == null) {
-			Select = SharedPreferences2Obj
-					.getInstance(SelectActionActivity.this)
-					.setName("SelectAction").getObject("Select", Integer.class);
-			titleName = SharedPreferences2Obj
-					.getInstance(SelectActionActivity.this)
-					.setName("SelectAction")
-					.getObject("titleName", String.class);
-		}
+        findViewById(R.id.topBack).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+    }
 
-		if (titleName != null) {
-			((TextView) findViewById(R.id.title)).setText(titleName);
-		} else {
-			((TextView) findViewById(R.id.title)).setText(R.string.operational);
-		}
+    private void init() {
+        type = SharedPreferences2Obj.getInstance(SelectActionActivity.this)
+                .setName("MachineType").getObject("type", Integer.class);
+        // 扫描提示音
+        player = MediaPlayer.create(getApplicationContext(),
+                R.raw.beep);
+    }
 
-		((TextView) findViewById(R.id.title)).setVisibility(View.VISIBLE);
+    private void initScan() {
+        // 获取PosApi实例
+        mPosSDK = PosApiHandle.getInstance().getPosApi();
+    }
 
-		gridView1 = (GridView) findViewById(R.id.gridView1);
-		LogUtil.i(TAG, "==data==" + initData().size());
-		gridView1.setNumColumns(2);
-		adapter = new GridDataAdapter(SelectActionActivity.this, initData());
-		gridView1.setAdapter(adapter);
-		gridView1.setOnItemClickListener(this);
+    private ArrayList<ImageInfo> initData() {
+        ArrayList<ImageInfo> data = new ArrayList<ImageInfo>();
+        data.add(new ImageInfo(getString(R.string.select_action_phone),
+                R.drawable.phone_selector, R.drawable.icon_bg02, Module.PHONE));
+        data.add(new ImageInfo(getString(R.string.scan_qr_code),
+                R.drawable.scan_selector, R.drawable.icon_bg02, Module.SCAN_QR));
+        data.add(new ImageInfo(getString(R.string.id_card), R.drawable.id_selector,
+                R.drawable.icon_bg02, Module.IDCARD));
+        data.add(new ImageInfo(getString(R.string.select_action_order_id),
+                R.drawable.order_selector, R.drawable.icon_bg02, Module.OREDR));
+        return data;
+    }
 
-		findViewById(R.id.topBack).setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				finish();
-			}
-		});
-	}
 
-	private void init() {
-		type = SharedPreferences2Obj.getInstance(SelectActionActivity.this)
-				.setName("MachineType").getObject("type", Integer.class);
-	}
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            try {
+                CommetryUtils.releaseCommery(this);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            finish();
+        }
+        return false;
+    }
 
-	private ArrayList<ImageInfo> initData() {
-		ArrayList<ImageInfo> data = new ArrayList<ImageInfo>();
-		data.add(new ImageInfo(getString(R.string.select_action_phone),
-				R.drawable.phone_selector, R.drawable.icon_bg02, Module.PHONE));
-		data.add(new ImageInfo(getString(R.string.scan_qr_code),
-				R.drawable.scan_selector, R.drawable.icon_bg02, Module.SCAN_QR));
-		data.add(new ImageInfo(getString(R.string.id_card), R.drawable.id_selector,
-				R.drawable.icon_bg02, Module.IDCARD));
-		data.add(new ImageInfo(getString(R.string.select_action_order_id),
-				R.drawable.order_selector, R.drawable.icon_bg02, Module.OREDR));
-		return data;
-	}
+    Runnable run = new Runnable() {
+        @Override
+        public void run() {
+            // TODO Auto-generated method stub
+            // 强制关闭扫描头
+            mPosSDK.gpioControl(mGpioTrig, 0, 1);
+            isScan = false;
+        }
+    };
 
+    boolean isScan = false;
 
-	@Override
-	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		if (keyCode == KeyEvent.KEYCODE_BACK) {
-			try {
-				CommetryUtils.releaseCommery(this);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			finish();
-		}
-		return false;
-	}
+    public void ScanDomn() {
+        if (!isScan) {
+            mPosSDK.gpioControl(mGpioTrig, 0, 0);
+            isScan = true;
+            handler.removeCallbacks(run);
+            // 3秒后还没有扫描到信息则强制关闭扫描头
+            handler.postDelayed(run, 3000);
+        } else {
+            mPosSDK.gpioControl(mGpioTrig, 0, 1);
+            mPosSDK.gpioControl(mGpioTrig, 0, 0);
+            isScan = true;
+            handler.removeCallbacks(run);
+            // 3秒后还没有扫描到信息则强制关闭扫描头
+            handler.postDelayed(run, 3000);
+        }
+    }
 
-	@Override
-	public void onItemClick(AdapterView<?> parent, View view, int position,long id) {
-		MyApp.getInstance().setCheckType(-1);
-		Intent intent = null;
-		ImageInfo obj = (ImageInfo) view.getTag(R.id.imageView1);
-		switch (obj.getTag()) {
-			case SCAN_QR:// 扫二维码
-				MyApp.getInstance().setCheckType(0);
-				if (type == DeviceType.GENERAL_POS.getValue()
-						|| type == DeviceType.ID_POS.getValue()
-						|| type == DeviceType.SMALL_POS.getValue()) {
-					intent = new Intent(SelectActionActivity.this,
-							ScanerOrderActivity.class);
-					if (Select != null) {
-						if (Select == SelectAction.Check.getValue()) {
-							intent.putExtra("titleName",
-									getString(R.string.check_scan_code));
-						} else if (Select == SelectAction.Reprint.getValue()) {
-							intent.putExtra("titleName",
-									getString(R.string.repriint_scan_code));
-						} else if (Select == SelectAction.Query.getValue()) {
-							intent.putExtra("titleName",
-									getString(R.string.query_scan_code));
-						}
-					} else {
-						intent.putExtra("titleName",
-								getString(R.string.scan_qr_code));
-					}
-					startActivity(intent);
-				} else if (type == DeviceType.BASEWIN_REB_POS.getValue()) {
-					//盛本的红色pos机
-					Intent intent3 = new Intent(SelectActionActivity.this,
-							PhomeScanerOrderActivity.class);
-					if (Select != null) {
-						if (Select == SelectAction.Check.getValue()) {
-							intent3.putExtra("titleName",
-									getString(R.string.check_scan_code));
-						} else if (Select == SelectAction.Reprint.getValue()) {
-							intent3.putExtra("titleName",
-									getString(R.string.repriint_scan_code));
-						} else if (Select == SelectAction.Query.getValue()) {
-							intent3.putExtra("titleName",
-									getString(R.string.query_scan_code));
-						}
-					} else {
-						intent3.putExtra("titleName",
-								getString(R.string.scan_qr_code));
-					}
-					startActivity(intent3);
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        MyApp.getInstance().setCheckType(-1);
+        Intent intent = null;
+        ImageInfo obj = (ImageInfo) view.getTag(R.id.imageView1);
+        switch (obj.getTag()) {
+            case SCAN_QR:// 扫二维码
+                MyApp.getInstance().setCheckType(0);
+                if (type == DeviceType.GENERAL_POS.getValue()
+                        || type == DeviceType.ID_POS.getValue()
+                        || type == DeviceType.SMALL_POS.getValue()) {
+                    intent = new Intent(SelectActionActivity.this,
+                            ScanerOrderActivity.class);
+                    if (Select != null) {
+                        if (Select == SelectAction.Check.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.check_scan_code));
+                        } else if (Select == SelectAction.Reprint.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.repriint_scan_code));
+                        } else if (Select == SelectAction.Query.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.query_scan_code));
+                        }
+                    } else {
+                        intent.putExtra("titleName",
+                                getString(R.string.scan_qr_code));
+                    }
+                    startActivity(intent);
+                } else if (type == DeviceType.BASEWIN_REB_POS.getValue()) {
+                    //盛本的红色pos机
+                    Intent intent3 = new Intent(SelectActionActivity.this,
+                            PhomeScanerOrderActivity.class);
+                    if (Select != null) {
+                        if (Select == SelectAction.Check.getValue()) {
+                            intent3.putExtra("titleName",
+                                    getString(R.string.check_scan_code));
+                        } else if (Select == SelectAction.Reprint.getValue()) {
+                            intent3.putExtra("titleName",
+                                    getString(R.string.repriint_scan_code));
+                        } else if (Select == SelectAction.Query.getValue()) {
+                            intent3.putExtra("titleName",
+                                    getString(R.string.query_scan_code));
+                        }
+                    } else {
+                        intent3.putExtra("titleName",
+                                getString(R.string.scan_qr_code));
+                    }
+                    startActivity(intent3);
 
-				}else if (type == DeviceType.HANDSET.getValue()) { // 手持机 二维码功能
-					// idcread.setpower("/sys/class/gpio/gpio28/value", false);
-					// idcread.setpower("/sys/class/gpio/gpio114/value",
-					// true);//
-					// 给二代证下电
-					// MToast(SelectActionActivity.this,
-					// "使用其他功能!",MToast.LENGTH_SHORT);
-					Intent intent2 = new Intent(SelectActionActivity.this,
-							NewHandleScanerActivity.class);
-					if (Select != null) {
-						if (Select == SelectAction.Check.getValue()) {
-							intent2.putExtra("titleName",
-									getString(R.string.check_scan_code));
-						} else if (Select == SelectAction.Reprint.getValue()) {
-							intent2.putExtra("titleName",
-									getString(R.string.repriint_scan_code));
-						} else if (Select == SelectAction.Query.getValue()) {
-							intent2.putExtra("titleName",
-									getString(R.string.query_scan_code));
-						}
-					} else {
-						intent2.putExtra("titleName",
-								getString(R.string.scan_qr_code));
-					}
-					startActivity(intent2);
-				} else {
-					intent = new Intent(SelectActionActivity.this,
-							PhomeScanerOrderActivity.class);
-					if (Select != null) {
-						if (Select == SelectAction.Check.getValue()) {
-							intent.putExtra("titleName",
-									getString(R.string.check_scan_code));
-						} else if (Select == SelectAction.Reprint.getValue()) {
-							intent.putExtra("titleName",
-									getString(R.string.repriint_scan_code));
-						} else if (Select == SelectAction.Query.getValue()) {
-							intent.putExtra("titleName",
-									getString(R.string.query_scan_code));
-						}
-					} else {
-						intent.putExtra("titleName",
-								getString(R.string.scan_qr_code));
-					}
-					startActivity(intent);
-				}
-				break;
-			case CODE:// 验证码
-				intent = new Intent(SelectActionActivity.this,
-						InputCodeActivity.class);
-				if (Select != null) {
-					if (Select == SelectAction.Check.getValue()) {
-						intent.putExtra("titleName",
-								getString(R.string.check_captcha));
-					} else if (Select == SelectAction.Reprint.getValue()) {
-						intent.putExtra("titleName",
-								getString(R.string.reprint_captcha));
-					} else if (Select == SelectAction.Query.getValue()) {
-						intent.putExtra("titleName",
-								getString(R.string.query_captcha));
-					}
-				} else {
-					intent.putExtra("titleName", getString(R.string.captcha));
-				}
-				startActivity(intent);
-				break;
-			case IDCARD:// 身份证
-				// 判断是不是039b移动POS机
-				if (type == DeviceType.ID_POS.getValue()
-						|| type == DeviceType.New_IDPOS.getValue()) {
-					intent = new Intent(SelectActionActivity.this,
-							SerialIdCardPortActivity.class);
-					if (Select != null) {
-						if (Select == SelectAction.Check.getValue()) {
-							intent.putExtra("titleName",
-									getString(R.string.check_idcard));
-						} else if (Select == SelectAction.Reprint.getValue()) {
-							intent.putExtra("titleName",
-									getString(R.string.reprint_idcard));
-						} else if (Select == SelectAction.Query.getValue()) {
-							intent.putExtra("titleName",
-									getString(R.string.query_idcard));
-						}
-					} else {
-						intent.putExtra("titleName", getString(R.string.idcard));
-					}
-					startActivity(intent);
-				} else if (idcread.isIdcard("/dev/ttySAC1")) {
-					// xxx = "打开手持机串口成功!";
-					intent = new Intent(SelectActionActivity.this,
-							ScanerIdCardActivity.class);
-					if (Select != null) {
-						if (Select == SelectAction.Check.getValue()) {
-							intent.putExtra("titleName",
-									getString(R.string.check_idcard));
-						} else if (Select == SelectAction.Reprint.getValue()) {
-							intent.putExtra("titleName",
-									getString(R.string.reprint_idcard));
-						} else if (Select == SelectAction.Query.getValue()) {
-							intent.putExtra("titleName",
-									getString(R.string.query_idcard));
-						}
-					} else {
-						intent.putExtra("titleName", getString(R.string.idcard));
-					}
-					startActivity(intent);
-				} else {
-					// xxx = "打开手持机串口失败!";
-					intent = new Intent(SelectActionActivity.this,
-							InputIdCardActivity.class);
-					if (Select != null) {
-						if (Select == SelectAction.Check.getValue()) {
-							intent.putExtra("titleName",
-									getString(R.string.check_idcard));
-						} else if (Select == SelectAction.Reprint.getValue()) {
-							intent.putExtra("titleName",
-									getString(R.string.reprint_idcard));
-						} else if (Select == SelectAction.Query.getValue()) {
-							intent.putExtra("titleName",
-									getString(R.string.query_idcard));
-						}
-					} else {
-						intent.putExtra("titleName", getString(R.string.idcard));
-					}
-					startActivity(intent);
-				}
-				break;
-			case PHONE:// 手机号
-				intent = new Intent(SelectActionActivity.this,
-						InputPhoneActivity.class);
-				if (Select != null) {
-					if (Select == SelectAction.Check.getValue()) {
-						intent.putExtra("titleName",
-								getString(R.string.check_phone));
-					} else if (Select == SelectAction.Reprint.getValue()) {
-						intent.putExtra("titleName",
-								getString(R.string.reprint_phone));
-					} else if (Select == SelectAction.Query.getValue()) {
-						intent.putExtra("titleName",
-								getString(R.string.query_phone));
-					}
-				} else {
-					intent.putExtra("titleName", getString(R.string.phone));
-				}
-				startActivity(intent);
-				break;
-			case OREDR:// 订单号
-				intent = new Intent(SelectActionActivity.this,
-						InputOridActivity.class);
-				if (Select != null) {
-					if (Select == SelectAction.Check.getValue()) {
-						intent.putExtra("titleName",
-								getString(R.string.check_order_id));
-					} else if (Select == SelectAction.Reprint.getValue()) {
-						intent.putExtra("titleName",
-								getString(R.string.reprint_order_id));
-					} else if (Select == SelectAction.Query.getValue()) {
-						intent.putExtra("titleName",
-								getString(R.string.query_order_id));
-					}
-				} else {
-					intent.putExtra("titleName", getString(R.string.orderid));
-				}
-				startActivity(intent);
-				break;
+                } else if (type == DeviceType.HANDSET.getValue()) { // 手持机 二维码功能
+                    // idcread.setpower("/sys/class/gpio/gpio28/value", false);
+                    // idcread.setpower("/sys/class/gpio/gpio114/value",
+                    // true);//
+                    // 给二代证下电
+                    // MToast(SelectActionActivity.this,
+                    // "使用其他功能!",MToast.LENGTH_SHORT);
+                    Intent intent2 = new Intent(SelectActionActivity.this,
+                            NewHandleScanerActivity.class);
+                    if (Select != null) {
+                        if (Select == SelectAction.Check.getValue()) {
+                            intent2.putExtra("titleName",
+                                    getString(R.string.check_scan_code));
+                        } else if (Select == SelectAction.Reprint.getValue()) {
+                            intent2.putExtra("titleName",
+                                    getString(R.string.repriint_scan_code));
+                        } else if (Select == SelectAction.Query.getValue()) {
+                            intent2.putExtra("titleName",
+                                    getString(R.string.query_scan_code));
+                        }
+                    } else {
+                        intent2.putExtra("titleName",
+                                getString(R.string.scan_qr_code));
+                    }
+                    startActivity(intent2);
+                }
+//                else if (type == DeviceType.BLACK_ID_POS.getValue()) {
+//                    ScanDomn();
+//                }
+                else {
+                    intent = new Intent(SelectActionActivity.this,
+                            PhomeScanerOrderActivity.class);
+                    if (Select != null) {
+                        if (Select == SelectAction.Check.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.check_scan_code));
+                        } else if (Select == SelectAction.Reprint.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.repriint_scan_code));
+                        } else if (Select == SelectAction.Query.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.query_scan_code));
+                        }
+                    } else {
+                        intent.putExtra("titleName",
+                                getString(R.string.scan_qr_code));
+                    }
+                    startActivity(intent);
+                }
+                break;
+            case CODE:// 验证码
+                intent = new Intent(SelectActionActivity.this,
+                        InputCodeActivity.class);
+                if (Select != null) {
+                    if (Select == SelectAction.Check.getValue()) {
+                        intent.putExtra("titleName",
+                                getString(R.string.check_captcha));
+                    } else if (Select == SelectAction.Reprint.getValue()) {
+                        intent.putExtra("titleName",
+                                getString(R.string.reprint_captcha));
+                    } else if (Select == SelectAction.Query.getValue()) {
+                        intent.putExtra("titleName",
+                                getString(R.string.query_captcha));
+                    }
+                } else {
+                    intent.putExtra("titleName", getString(R.string.captcha));
+                }
+                startActivity(intent);
+                break;
+            case IDCARD:// 身份证
+                // 判断是不是039b移动POS机
+                if (type == DeviceType.ID_POS.getValue()
+                        || type == DeviceType.New_IDPOS.getValue()) {
+                    intent = new Intent(SelectActionActivity.this,
+                            SerialIdCardPortActivity.class);
+                    if (Select != null) {
+                        if (Select == SelectAction.Check.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.check_idcard));
+                        } else if (Select == SelectAction.Reprint.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.reprint_idcard));
+                        } else if (Select == SelectAction.Query.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.query_idcard));
+                        }
+                    } else {
+                        intent.putExtra("titleName", getString(R.string.idcard));
+                    }
+                    startActivity(intent);
+                } else if (type == DeviceType.BLACK_ID_POS.getValue()) {
+                    intent = new Intent(SelectActionActivity.this,
+                            BlackIdCardActivity.class);
+                    if (Select != null) {
+                        if (Select == SelectAction.Check.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.check_idcard));
+                        } else if (Select == SelectAction.Reprint.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.reprint_idcard));
+                        } else if (Select == SelectAction.Query.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.query_idcard));
+                        }
+                    } else {
+                        intent.putExtra("titleName", getString(R.string.idcard));
+                    }
+                    startActivity(intent);
+                } else if (idcread.isIdcard("/dev/ttySAC1")) {
+                    // xxx = "打开手持机串口成功!";
+                    intent = new Intent(SelectActionActivity.this,
+                            ScanerIdCardActivity.class);
+                    if (Select != null) {
+                        if (Select == SelectAction.Check.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.check_idcard));
+                        } else if (Select == SelectAction.Reprint.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.reprint_idcard));
+                        } else if (Select == SelectAction.Query.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.query_idcard));
+                        }
+                    } else {
+                        intent.putExtra("titleName", getString(R.string.idcard));
+                    }
+                    startActivity(intent);
+                } else {
+                    // xxx = "打开手持机串口失败!";
+                    intent = new Intent(SelectActionActivity.this,
+                            InputIdCardActivity.class);
+                    if (Select != null) {
+                        if (Select == SelectAction.Check.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.check_idcard));
+                        } else if (Select == SelectAction.Reprint.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.reprint_idcard));
+                        } else if (Select == SelectAction.Query.getValue()) {
+                            intent.putExtra("titleName",
+                                    getString(R.string.query_idcard));
+                        }
+                    } else {
+                        intent.putExtra("titleName", getString(R.string.idcard));
+                    }
+                    startActivity(intent);
+                }
+                break;
+            case PHONE:// 手机号
+                intent = new Intent(SelectActionActivity.this,
+                        InputPhoneActivity.class);
+                if (Select != null) {
+                    if (Select == SelectAction.Check.getValue()) {
+                        intent.putExtra("titleName",
+                                getString(R.string.check_phone));
+                    } else if (Select == SelectAction.Reprint.getValue()) {
+                        intent.putExtra("titleName",
+                                getString(R.string.reprint_phone));
+                    } else if (Select == SelectAction.Query.getValue()) {
+                        intent.putExtra("titleName",
+                                getString(R.string.query_phone));
+                    }
+                } else {
+                    intent.putExtra("titleName", getString(R.string.phone));
+                }
+                startActivity(intent);
+                break;
+            case OREDR:// 订单号
+                intent = new Intent(SelectActionActivity.this,
+                        InputOridActivity.class);
+                if (Select != null) {
+                    if (Select == SelectAction.Check.getValue()) {
+                        intent.putExtra("titleName",
+                                getString(R.string.check_order_id));
+                    } else if (Select == SelectAction.Reprint.getValue()) {
+                        intent.putExtra("titleName",
+                                getString(R.string.reprint_order_id));
+                    } else if (Select == SelectAction.Query.getValue()) {
+                        intent.putExtra("titleName",
+                                getString(R.string.query_order_id));
+                    }
+                } else {
+                    intent.putExtra("titleName", getString(R.string.orderid));
+                }
+                startActivity(intent);
+                break;
 //		case STATISTIC:
 //			intent = new Intent(SelectActionActivity.this,
 //					StatisticsActivity.class);
 //			intent.putExtra("titleName", getString(R.string.statistic));
 //			startActivity(intent);
 //			break;
-		}
-	}
+        }
+    }
 
 }
diff --git a/src/com/ectrip/cyt/zxing/camera/CameraConfigurationManager.java b/src/com/ectrip/cyt/zxing/camera/CameraConfigurationManager.java
index 96cd81d..93acabf 100644
--- a/src/com/ectrip/cyt/zxing/camera/CameraConfigurationManager.java
+++ b/src/com/ectrip/cyt/zxing/camera/CameraConfigurationManager.java
@@ -84,7 +84,8 @@ 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.BLACK_ID_POS.getValue()) {
 			setDisplayOrientation(camera, 90);
 		}
 		camera.setParameters(parameters);
--
libgit2 0.21.4