From 846e956b244ef1b0cb2caf7e98a095c8e9b91aa6 Mon Sep 17 00:00:00 2001
From: xiajiid <xiajiid@example.com>
Date: Mon, 9 Feb 2026 23:38:29 +0800
Subject: [PATCH] fix: correct ImageCapture error constants to valid values

---
 app/src/main/java/com/example/app/CameraActivity.kt  | 12 +++---------
 .../java/com/example/app/SimpleCameraActivity.kt     | 12 +++---------
 .../java/com/example/app/WatermarkCameraActivity.kt  | 12 +++---------
 3 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/example/app/CameraActivity.kt b/app/src/main/java/com/example/app/CameraActivity.kt
index 4c9c8f1..f78fa53 100644
--- a/app/src/main/java/com/example/app/CameraActivity.kt
+++ b/app/src/main/java/com/example/app/CameraActivity.kt
@@ -259,16 +259,10 @@ class CameraActivity : AppCompatActivity() {
                                 }
                             }
                         }
-                        ImageCapture.ERROR_SURFACE_PREPARATION_FAILED -> {
-                            Log.e(TAG, "表面准备失败")
+                        else -> {
+                            Log.e(TAG, "其他错误: ${exception.imageCaptureError}")
                             runOnUiThread {
-                                Toast.makeText(baseContext, "相机准备失败", Toast.LENGTH_LONG).show()
-                            }
-                        }
-                        ImageCapture.ERROR_IMAGE_CAPTURE_FAILED -> {
-                            Log.e(TAG, "图片捕获失败")
-                            runOnUiThread {
-                                Toast.makeText(baseContext, "图片捕获失败", Toast.LENGTH_LONG).show()
+                                Toast.makeText(baseContext, "拍照失败: ${exception.message}", Toast.LENGTH_LONG).show()
                             }
                         }
                         ImageCapture.ERROR_UNKNOWN -> {
diff --git a/app/src/main/java/com/example/app/SimpleCameraActivity.kt b/app/src/main/java/com/example/app/SimpleCameraActivity.kt
index fa3753d..faff6d6 100644
--- a/app/src/main/java/com/example/app/SimpleCameraActivity.kt
+++ b/app/src/main/java/com/example/app/SimpleCameraActivity.kt
@@ -241,16 +241,10 @@ class SimpleCameraActivity : AppCompatActivity() {
                                 }
                             }
                         }
-                        ImageCapture.ERROR_SURFACE_PREPARATION_FAILED -> {
-                            Log.e(TAG, "表面准备失败")
+                        else -> {
+                            Log.e(TAG, "其他错误: ${exception.imageCaptureError}")
                             runOnUiThread {
-                                Toast.makeText(baseContext, "相机准备失败", Toast.LENGTH_LONG).show()
-                            }
-                        }
-                        ImageCapture.ERROR_IMAGE_CAPTURE_FAILED -> {
-                            Log.e(TAG, "图片捕获失败")
-                            runOnUiThread {
-                                Toast.makeText(baseContext, "图片捕获失败", Toast.LENGTH_LONG).show()
+                                Toast.makeText(baseContext, "拍照失败: ${exception.message}", Toast.LENGTH_LONG).show()
                             }
                         }
                         ImageCapture.ERROR_UNKNOWN -> {
diff --git a/app/src/main/java/com/example/app/WatermarkCameraActivity.kt b/app/src/main/java/com/example/app/WatermarkCameraActivity.kt
index 78e4f7e..98c5fdd 100644
--- a/app/src/main/java/com/example/app/WatermarkCameraActivity.kt
+++ b/app/src/main/java/com/example/app/WatermarkCameraActivity.kt
@@ -245,16 +245,10 @@ class WatermarkCameraActivity : AppCompatActivity() {
                                 }
                             }
                         }
-                        ImageCapture.ERROR_SURFACE_PREPARATION_FAILED -> {
-                            Log.e(TAG, "表面准备失败")
+                        else -> {
+                            Log.e(TAG, "其他错误: ${exception.imageCaptureError}")
                             runOnUiThread {
-                                Toast.makeText(baseContext, "相机准备失败", Toast.LENGTH_LONG).show()
-                            }
-                        }
-                        ImageCapture.ERROR_IMAGE_CAPTURE_FAILED -> {
-                            Log.e(TAG, "图片捕获失败")
-                            runOnUiThread {
-                                Toast.makeText(baseContext, "图片捕获失败", Toast.LENGTH_LONG).show()
+                                Toast.makeText(baseContext, "拍照失败: ${exception.message}", Toast.LENGTH_LONG).show()
                             }
                         }
                         ImageCapture.ERROR_UNKNOWN -> {