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?) {