diff --git a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
index 04b9a76..7caa625 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
@@ -87,6 +87,10 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         permissionHelper.checkAndRequest()
     }
 
+    override fun onLeftDoubleClick() {
+        finish()
+    }
+
     private var isRecognition = false
     private var rgbCameraHelper: DualCameraHelper? = null
     private var rgbFaceRectTransformer: FaceRectTransformer? = null
diff --git a/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt
index 74043a4..ca2e762 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt
@@ -17,9 +17,6 @@ class LoginByPwdActivity : BaseActivity<ActivityLoginByPwdBinding>() {
     }
 
     override fun initialize() {
-        binding.etPhone.setOnFocusChangeListener { v, hasFocus ->
-            if (hasFocus) KeyboardUtils.showKeyboard(v)
-        }
         binding.btnLogin.setOnClickListener {
             val phone = binding.etPhone.text.toString()
             val pwd = binding.etPwd.text.toString()
diff --git a/app/src/main/res/layout/activity_login_by_pwd.xml b/app/src/main/res/layout/activity_login_by_pwd.xml
index 5116f4e..3dbd034 100644
--- a/app/src/main/res/layout/activity_login_by_pwd.xml
+++ b/app/src/main/res/layout/activity_login_by_pwd.xml
@@ -46,6 +46,7 @@
                 android:layout_marginEnd="20dp"
                 android:background="@android:color/transparent"
                 android:hint="输入手机后四位"
+                android:imeOptions="actionNext"
                 android:inputType="number"
                 android:maxLength="4"
                 android:maxLines="1"
@@ -90,6 +91,7 @@
                 android:maxLines="1"
                 android:textColor="#F3D2BD"
                 android:textColorHint="#7B6D6A"
+                android:imeOptions="actionDone"
                 android:textSize="26sp"
                 android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/fragment_bind_plate.xml b/app/src/main/res/layout/fragment_bind_plate.xml
index 6046e71..b166895 100644
--- a/app/src/main/res/layout/fragment_bind_plate.xml
+++ b/app/src/main/res/layout/fragment_bind_plate.xml
@@ -122,7 +122,7 @@
             android:background="@color/transparent"
             android:gravity="center"
             android:hint="请输入会员姓名或手机号"
-            android:imeOptions="actionSearch"
+            android:imeOptions="actionDone"
             android:inputType="text"
             android:maxLines="1"
             android:textColor="#F0C8B4"
diff --git a/lib_face/src/main/java/com/sw/plate/utils/ScanGunKeyEventHelper.java b/lib_face/src/main/java/com/sw/plate/utils/ScanGunKeyEventHelper.java
index f99f0ef..2b64fd0 100644
--- a/lib_face/src/main/java/com/sw/plate/utils/ScanGunKeyEventHelper.java
+++ b/lib_face/src/main/java/com/sw/plate/utils/ScanGunKeyEventHelper.java
@@ -22,6 +22,7 @@ public class ScanGunKeyEventHelper {
 
     //    private String mDeviceName = "TMC HIDKeyBoard";
     private String mDeviceName = "Linux 3.4.35 with ak-hsudc Composite Gadget (ACM + HID)";
+    private String mDeviceName1 = "USBKey Chip USBKey Module";
 
     public ScanGunKeyEventHelper(Context context, OnScanSuccessListener onScanSuccessListener) {
 
@@ -156,9 +157,10 @@ public class ScanGunKeyEventHelper {
      */
     public boolean isScanGunEvent(KeyEvent event) {
         if (event == null || event.getDevice() == null) return false;
-        L.e("event===" + event.getDevice().getName() +
+        String deviceName = event.getDevice().getName();
+        L.e("event===" + deviceName +
                 "===Char===" + event.getCharacters() +
                 "===Action===" + event.getAction());
-        return event.getDevice().getName().equals(mDeviceName);
+        return deviceName.equals(mDeviceName) || deviceName.equals(mDeviceName1);
     }
 }