From 1434c7c9337ec10372a566594d58bf92ee1113fb Mon Sep 17 00:00:00 2001
From: xiajiid <xiajiid@example.com>
Date: Mon, 9 Feb 2026 23:53:20 +0800
Subject: [PATCH] fix: correct Kotlin when-expression syntax to ensure else is
 last branch

---
 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, 18 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/example/app/CameraActivity.kt b/app/src/main/java/com/example/app/CameraActivity.kt
index f78fa53..e150e9a 100644
--- a/app/src/main/java/com/example/app/CameraActivity.kt
+++ b/app/src/main/java/com/example/app/CameraActivity.kt
@@ -259,12 +259,6 @@ class CameraActivity : AppCompatActivity() {
                                 }
                             }
                         }
-                        else -> {
-                            Log.e(TAG, "其他错误: ${exception.imageCaptureError}")
-                            runOnUiThread {
-                                Toast.makeText(baseContext, "拍照失败: ${exception.message}", Toast.LENGTH_LONG).show()
-                            }
-                        }
                         ImageCapture.ERROR_UNKNOWN -> {
                             Log.e(TAG, "未知错误")
                             // 特殊处理：如果错误消息包含"processing"，可能是内部处理问题
@@ -332,6 +326,12 @@ class CameraActivity : AppCompatActivity() {
                                 Toast.makeText(baseContext, "拍照失败: ${exception.message}", Toast.LENGTH_LONG).show()
                             }
                         }
+                        else -> {
+                            Log.e(TAG, "其他错误: ${exception.imageCaptureError}")
+                            runOnUiThread {
+                                Toast.makeText(baseContext, "拍照失败: ${exception.message}", Toast.LENGTH_LONG).show()
+                            }
+                        }
                     }
                 }
             }
diff --git a/app/src/main/java/com/example/app/SimpleCameraActivity.kt b/app/src/main/java/com/example/app/SimpleCameraActivity.kt
index faff6d6..ad1fc72 100644
--- a/app/src/main/java/com/example/app/SimpleCameraActivity.kt
+++ b/app/src/main/java/com/example/app/SimpleCameraActivity.kt
@@ -241,12 +241,6 @@ class SimpleCameraActivity : AppCompatActivity() {
                                 }
                             }
                         }
-                        else -> {
-                            Log.e(TAG, "其他错误: ${exception.imageCaptureError}")
-                            runOnUiThread {
-                                Toast.makeText(baseContext, "拍照失败: ${exception.message}", Toast.LENGTH_LONG).show()
-                            }
-                        }
                         ImageCapture.ERROR_UNKNOWN -> {
                             Log.e(TAG, "未知错误")
                             // 特殊处理：如果错误消息包含"processing"，可能是内部处理问题
@@ -302,6 +296,12 @@ class SimpleCameraActivity : AppCompatActivity() {
                                 Toast.makeText(baseContext, "拍照失败: ${exception.message}", Toast.LENGTH_LONG).show()
                             }
                         }
+                        else -> {
+                            Log.e(TAG, "其他错误: ${exception.imageCaptureError}")
+                            runOnUiThread {
+                                Toast.makeText(baseContext, "拍照失败: ${exception.message}", Toast.LENGTH_LONG).show()
+                            }
+                        }
                     }
                 }
             }
diff --git a/app/src/main/java/com/example/app/WatermarkCameraActivity.kt b/app/src/main/java/com/example/app/WatermarkCameraActivity.kt
index 98c5fdd..fb6349c 100644
--- a/app/src/main/java/com/example/app/WatermarkCameraActivity.kt
+++ b/app/src/main/java/com/example/app/WatermarkCameraActivity.kt
@@ -245,12 +245,6 @@ class WatermarkCameraActivity : AppCompatActivity() {
                                 }
                             }
                         }
-                        else -> {
-                            Log.e(TAG, "其他错误: ${exception.imageCaptureError}")
-                            runOnUiThread {
-                                Toast.makeText(baseContext, "拍照失败: ${exception.message}", Toast.LENGTH_LONG).show()
-                            }
-                        }
                         ImageCapture.ERROR_UNKNOWN -> {
                             Log.e(TAG, "未知错误")
                             // 特殊处理：如果错误消息包含"processing"，可能是内部处理问题
@@ -310,6 +304,12 @@ class WatermarkCameraActivity : AppCompatActivity() {
                                 Toast.makeText(baseContext, "拍照失败: ${exception.message}", Toast.LENGTH_LONG).show()
                             }
                         }
+                        else -> {
+                            Log.e(TAG, "其他错误: ${exception.imageCaptureError}")
+                            runOnUiThread {
+                                Toast.makeText(baseContext, "拍照失败: ${exception.message}", Toast.LENGTH_LONG).show()
+                            }
+                        }
                     }
                 }
             }