From 17299b071355fac3d47e0fc1ac9f07d62c7902de Mon Sep 17 00:00:00 2001
From: xiajiid <xiajiid@example.com>
Date: Wed, 11 Feb 2026 20:35:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=9A1.=20=E5=B0=86addPhotoToPreview=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAshowPhotoPreview=202.=20=E7=A7=BB=E9=99=A4=E6=9C=AA?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84preference=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/example/app/CameraActivity.kt   | 2 +-
 app/src/main/java/com/example/app/SettingsActivity.kt | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/com/example/app/CameraActivity.kt b/app/src/main/java/com/example/app/CameraActivity.kt
index 9fcde51..e9cde44 100644
--- a/app/src/main/java/com/example/app/CameraActivity.kt
+++ b/app/src/main/java/com/example/app/CameraActivity.kt
@@ -397,7 +397,7 @@ class CameraActivity : AppCompatActivity() {
                     
                     runOnUiThread {
                         Toast.makeText(baseContext, "图片已保存并添加水印", Toast.LENGTH_LONG).show()
-                        addPhotoToPreview(uri)
+                        showPhotoPreview(uri)
                     }
                 } else {
                     Log.e(TAG, "无法打开输出流: $uri")
diff --git a/app/src/main/java/com/example/app/SettingsActivity.kt b/app/src/main/java/com/example/app/SettingsActivity.kt
index 62da5a6..0a7ae90 100644
--- a/app/src/main/java/com/example/app/SettingsActivity.kt
+++ b/app/src/main/java/com/example/app/SettingsActivity.kt
@@ -2,7 +2,6 @@ package com.example.app
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import androidx.preference.PreferenceFragmentCompat
 
 class SettingsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {