diff --git a/res/layout/activity_black_idcard.xml b/res/layout/activity_black_idcard.xml
index f65aa9b..583f336 100644
--- a/res/layout/activity_black_idcard.xml
+++ b/res/layout/activity_black_idcard.xml
@@ -14,7 +14,14 @@
android:layout_weight="1"
android:orientation="vertical"
android:weightSum="5">
-
+
+ android:id="@+id/tv_no_id"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_68"
+ android:background="@color/showBlue"
+ android:gravity="center"
+ android:text=" -点击手输身份证- "
+ android:textSize="@dimen/sp_25" />
\ No newline at end of file
diff --git a/src/com/ectrip/cyt/ui/BlackIdCardActivity.java b/src/com/ectrip/cyt/ui/BlackIdCardActivity.java
index 642ff76..9009ad1 100644
--- a/src/com/ectrip/cyt/ui/BlackIdCardActivity.java
+++ b/src/com/ectrip/cyt/ui/BlackIdCardActivity.java
@@ -1,11 +1,14 @@
package com.ectrip.cyt.ui;
+import android.content.Context;
import android.content.Intent;
import android.media.MediaPlayer;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.text.TextUtils;
+import android.view.View;
+import android.widget.TextView;
import android.widget.Toast;
import com.ectrip.cyt.config.DevicTool;
@@ -27,7 +30,11 @@ import android_serialport_api.sample.SerialPortActivity;
public class BlackIdCardActivity extends SerialPortActivity {
private Integer type; // 类型
MediaPlayer player;
-
+ private TextView noId;
+ private TextView topBack;
+ private Context mContext;
+ private String titleName;
+ private TextView title;
/**
* 执行扫描,扫描后的结果会通过action为PosApi.ACTION_POS_COMM_STATUS的广播发回
*/
@@ -101,10 +108,30 @@ public class BlackIdCardActivity extends SerialPortActivity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_black_idcard);
+ mContext = this;
+ initView();
+ initData();
initIDRead();
+ ininlistener();
init();
}
+ private void initView() {
+ title = (TextView) findViewById(R.id.title);
+ title.setVisibility(View.VISIBLE);
+ noId = (TextView) findViewById(R.id.tv_no_id);
+ topBack = (TextView) findViewById(R.id.topBack);
+ }
+
+ private void initData() {
+ titleName = getIntent().getStringExtra("titleName");
+ if (titleName != null) {
+ title.setText(titleName);
+ } else {
+ title.setText(R.string.scan_id);
+ }
+ }
+
@Override
protected void onDataReceived(byte[] buffer, int size) {
@@ -118,6 +145,24 @@ public class BlackIdCardActivity extends SerialPortActivity {
R.raw.beep);
}
+ private void ininlistener() {
+ //点击头部返回键,关闭当前activity
+ topBack.setOnClickListener(new View.OnClickListener() {
+
+ public void onClick(View v) {
+ finish();
+ }
+ });
+ noId.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent phone = new Intent(mContext, InputIdCardActivity.class);
+// phone.putExtra("type", type);
+ startActivity(phone);
+ }
+ });
+ }
+
private void initIDRead() {
new Thread(new ThreadRun()).start();
}
@@ -156,7 +201,7 @@ public class BlackIdCardActivity extends SerialPortActivity {
private void ReadCard() {
try {
- LogUtil.d(TAG,"mInputStream"+mInputStream+"\n"+"mOutputStream"+mOutputStream);
+ LogUtil.d(TAG, "mInputStream" + mInputStream + "\n" + "mOutputStream" + mOutputStream);
if ((mInputStream == null) || (mOutputStream == null)) {
Readflage = -2;// 连接异常
return;