diff --git a/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java b/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java
index a96896a..ca6e25e 100644
--- a/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java
+++ b/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java
@@ -2228,9 +2228,10 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
         
         try {
             // 停止摄像头预览
-            if (CameraPreviewManager.getInstance() != null) {
-                CameraPreviewManager.getInstance().stopPreview();
-            }
+//            if (CameraPreviewManager.getInstance() != null) {
+//                CameraPreviewManager.getInstance().stopPreview();
+//            }
+            finish();
             
             // 返回登录界面
             Intent intent = new Intent(this, MainActivity.class);
@@ -2238,7 +2239,7 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
             startActivity(intent);
             
             // 关闭当前界面
-            finish();
+
             
             LogManager.logInfo(TAG, "已退出人脸识别界面，返回登录界面");
             
diff --git a/app/src/main/java/com/ouxuan/oxface/device/OxUDP.java b/app/src/main/java/com/ouxuan/oxface/device/OxUDP.java
index 569b65b..015d825 100644
--- a/app/src/main/java/com/ouxuan/oxface/device/OxUDP.java
+++ b/app/src/main/java/com/ouxuan/oxface/device/OxUDP.java
@@ -649,31 +649,51 @@ public class OxUDP {
     // 通知方法
     private void notifyGateStateUpdate(boolean gateAState, boolean gateBState, String rawData) {
         if (stateListener != null) {
-            mainHandler.post(() -> stateListener.onGateStateUpdate(gateAState, gateBState, rawData));
+            mainHandler.post(() -> {
+                if (stateListener != null) {
+                    stateListener.onGateStateUpdate(gateAState, gateBState, rawData);
+                }
+            });
         }
     }
     
     private void notifyGateOpenResult(String gateType, boolean success) {
         if (stateListener != null) {
-            mainHandler.post(() -> stateListener.onGateOpenResult(gateType, success));
+            mainHandler.post(() -> {
+                if (stateListener != null) {
+                    stateListener.onGateOpenResult(gateType, success);
+                }
+            });
         }
     }
     
     private void notifyUDPError(String error) {
         if (stateListener != null) {
-            mainHandler.post(() -> stateListener.onUDPError(error));
+            mainHandler.post(() -> {
+                if (stateListener != null) {
+                    stateListener.onUDPError(error);
+                }
+            });
         }
     }
     
     private void notifyDeviceInfoUpdate(String deviceInfo) {
         if (deviceListener != null) {
-            mainHandler.post(() -> deviceListener.onDeviceInfoUpdate(deviceInfo));
+            mainHandler.post(() -> {
+                if (deviceListener != null) {
+                    deviceListener.onDeviceInfoUpdate(deviceInfo);
+                }
+            });
         }
     }
     
     private void notifyDeviceConnectionChange(boolean connected) {
         if (deviceListener != null) {
-            mainHandler.post(() -> deviceListener.onDeviceConnectionChange(connected));
+            mainHandler.post(() -> {
+                if (deviceListener != null) {
+                    deviceListener.onDeviceConnectionChange(connected);
+                }
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ouxuan/oxface/device/UnlockPasswordDialog.java b/app/src/main/java/com/ouxuan/oxface/device/UnlockPasswordDialog.java
index be28b48..60bf7c3 100644
--- a/app/src/main/java/com/ouxuan/oxface/device/UnlockPasswordDialog.java
+++ b/app/src/main/java/com/ouxuan/oxface/device/UnlockPasswordDialog.java
@@ -15,6 +15,7 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.ouxuan.oxface.R;
 import com.ouxuan.oxface.data.LoginDataManager;
 import com.ouxuan.oxface.utils.LogManager;
 
@@ -174,11 +175,13 @@ public class UnlockPasswordDialog {
         btnConfirm.setText("确认");
         btnConfirm.setTextSize(16);
         btnConfirm.setTextColor(Color.WHITE);
-        btnConfirm.setBackgroundColor(Color.parseColor("#007AFF"));
+//        btnConfirm.setBackgroundColor(Color.parseColor("#007AFF"));
+        btnConfirm.setBackgroundColor(Color.parseColor("#009874"));
+//        btnConfirm.setBackgroundColor(context.getResources().getColor(R.color.primary_color));
         
         // 设置确认按钮圆角
         android.graphics.drawable.GradientDrawable confirmDrawable = new android.graphics.drawable.GradientDrawable();
-        confirmDrawable.setColor(Color.parseColor("#007AFF"));
+        confirmDrawable.setColor(Color.parseColor("#009874"));
         confirmDrawable.setCornerRadius(8);
         btnConfirm.setBackground(confirmDrawable);