diff --git a/app/src/main/java/com/ouxuan/oxface/MainActivity.java b/app/src/main/java/com/ouxuan/oxface/MainActivity.java
index aa3c227..6306b91 100644
--- a/app/src/main/java/com/ouxuan/oxface/MainActivity.java
+++ b/app/src/main/java/com/ouxuan/oxface/MainActivity.java
@@ -251,6 +251,16 @@ public class MainActivity extends AppCompatActivity {
      * 检查是否可以自动登录
      */
     private void checkAutoLogin() {
+        // 检查是否是从解锁离开人脸识别界面返回的，如果是则不执行自动登录
+        Intent intent = getIntent();
+        boolean fromUnlockLeave = intent != null && intent.getBooleanExtra("from_unlock_leave", false);
+        if (fromUnlockLeave) {
+            android.util.Log.d("MainActivity", "从解锁离开返回，跳过自动登录逻辑");
+            // 清除标志，防止重复处理
+            intent.removeExtra("from_unlock_leave");
+            return;
+        }
+        
         if (loginDataManager.canAutoLogin()) {
             android.util.Log.d("MainActivity", "检测到有效的本地登录数据，尝试自动登录, isAutoStart: " + isAutoStart);
             
diff --git a/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java b/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java
index aa908b5..c7d3249 100644
--- a/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java
+++ b/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java
@@ -2552,9 +2552,10 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
 //            }
             finish();
             
-            // 返回登录界面
+            // 返回登录界面，添加标志表示是从解锁离开返回的
             Intent intent = new Intent(this, MainActivity.class);
             intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("from_unlock_leave", true); // 添加标志
             startActivity(intent);
             
             // 关闭当前界面