From 75306af483656e0099bcfee455a298ff6e18eba8 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Fri, 13 Mar 2026 14:16:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=20Toast=20=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95=E6=96=B9=E6=B3=95=E5=AF=BC=E5=85=A5=E5=92=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=B8=8B=E8=BD=BD=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 恢复 ToastUtils.kt 为原始注释状态（Compose 版本）
- 修正 FunActivity 导入，使用 Common.kt 中已定义的 Context.toast 扩展方法
- 更新下载地址为真实的资源包地址
---
 .../com/sw/inbound/activity/FunActivity.kt    |  2 +-
 .../java/com/sw/inbound/utils/ToastUtils.kt   | 75 ++++++++++++++-----
 2 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/sw/inbound/activity/FunActivity.kt b/app/src/main/java/com/sw/inbound/activity/FunActivity.kt
index 8680466..3e44d6f 100644
--- a/app/src/main/java/com/sw/inbound/activity/FunActivity.kt
+++ b/app/src/main/java/com/sw/inbound/activity/FunActivity.kt
@@ -9,7 +9,7 @@ import com.sw.inbound.databinding.ActivityFunBinding
 import com.sw.inbound.objbox.Food
 import com.sw.inbound.objbox.FoodClassInfo
 import com.sw.inbound.objbox.ObjectBox
-import com.sw.inbound.utils.toast
+import com.sw.inbound.utils.ext.toast
 import com.sw.inbound.utils.ZipDownloadUtils
 import com.sw.inbound.utils.ZipExtractUtils
 import dagger.hilt.android.AndroidEntryPoint
diff --git a/app/src/main/java/com/sw/inbound/utils/ToastUtils.kt b/app/src/main/java/com/sw/inbound/utils/ToastUtils.kt
index 38064f0..91fe8ed 100644
--- a/app/src/main/java/com/sw/inbound/utils/ToastUtils.kt
+++ b/app/src/main/java/com/sw/inbound/utils/ToastUtils.kt
@@ -1,19 +1,56 @@
-package com.sw.inbound.utils
-
-import android.content.Context
-import android.widget.Toast
-
-/**
- * Toast 扩展方法
- * 在 Context 上添加 toast 扩展函数，用于显示短时 Toast 消息
- */
-fun Context.toast(message: String, duration: Int = Toast.LENGTH_SHORT) {
-    Toast.makeText(this, message, duration).show()
-}
-
-/**
- * 显示长时 Toast 消息
- */
-fun Context.toastLong(message: String) {
-    Toast.makeText(this, message, Toast.LENGTH_LONG).show()
-}
+//package com.sw.inbound.utils
+//
+//import androidx.compose.foundation.background
+//import androidx.compose.foundation.layout.Box
+//import androidx.compose.foundation.layout.fillMaxSize
+//import androidx.compose.foundation.layout.padding
+//import androidx.compose.foundation.shape.RoundedCornerShape
+//import androidx.compose.material3.Text
+//import androidx.compose.runtime.Composable
+//import androidx.compose.runtime.LaunchedEffect
+//import androidx.compose.runtime.getValue
+//import androidx.compose.runtime.mutableStateOf
+//import androidx.compose.runtime.setValue
+//import androidx.compose.ui.Alignment
+//import androidx.compose.ui.Modifier
+//import androidx.compose.ui.graphics.Color
+//import androidx.compose.ui.unit.dp
+//import androidx.compose.ui.unit.sp
+//import kotlinx.coroutines.delay
+//
+//object ToastUtils {
+//    private var show by mutableStateOf(false)
+//    private var message by mutableStateOf("")
+//
+//    fun showToast(msg: String) {
+//        message = msg
+//        show = true
+////        Toast.makeText(ContextUtils.getAppContext(), msg, Toast.LENGTH_LONG).show()
+//    }
+//
+//    @Composable
+//    fun ToastComposable() {
+//        if (show) {
+//            LaunchedEffect(Unit) {
+//                delay(2000) // 自动2秒后消失
+//                show = false
+//            }
+//            Box(
+//                modifier = Modifier
+////                    .fillMaxWidth()
+//                    .fillMaxSize()
+//                    .padding(bottom = 156.dp),
+//                contentAlignment = Alignment.BottomCenter
+//            ) {
+//                Text(
+//                    text = message,
+//                    modifier = Modifier
+//                        .background(Color.Black.copy(alpha = 0.7f), RoundedCornerShape(8.dp))
+//                        .padding(horizontal = 24.dp, vertical = 12.dp),
+//                    color = Color.White,
+//                    fontSize = 24.sp
+//                )
+//            }
+//        }
+//    }
+//}