From 85d03e03902cf99782084a686c6aa273eb5ebd2c Mon Sep 17 00:00:00 2001
From: shenzuqiang <zuqiangshen@163.com>
Date: Tue, 10 Mar 2026 15:38:29 +0800
Subject: [PATCH] =?UTF-8?q?Dev=EF=BC=9A=201=E3=80=81=E9=A1=B9=E7=9B=AEtoas?=
 =?UTF-8?q?t=E6=9B=BF=E6=8D=A2=202=E3=80=81=E6=B7=BB=E5=8A=A0=E6=B3=A8?=
 =?UTF-8?q?=E9=94=80=E8=B4=A6=E5=8F=B7=E5=8A=9F=E8=83=BD=203=E3=80=81?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |   4 +-
 app/build.gradle.kts                          |   2 +-
 .../java/com/img/rabbit/BaseApplication.kt    |  13 +-
 .../main/java/com/img/rabbit/MainActivity.kt  |  10 +-
 .../com/img/rabbit/bean/local/ErrorBean.kt    |   1 +
 .../java/com/img/rabbit/pages/LoginPage.kt    |  40 +-
 .../java/com/img/rabbit/pages/MainPage.kt     |  21 +-
 .../img/rabbit/pages/dialog/UpdateDialog.kt   |   2 -
 .../com/img/rabbit/pages/screen/HomeScreen.kt |   5 +-
 .../com/img/rabbit/pages/screen/MineScreen.kt |  10 +-
 .../rabbit/pages/screen/make/CutoutScreen.kt  |  62 ++-
 .../rabbit/pages/screen/make/FormatScreen.kt  |  12 +-
 .../pages/screen/make/LongImageScreen.kt      |  11 +-
 .../rabbit/pages/screen/make/ResizeScreen.kt  |  13 +-
 .../pages/screen/mine/FeedbackScreen.kt       |  14 +-
 .../pages/screen/mine/OnlineServiceScreen.kt  |   3 +-
 .../rabbit/pages/screen/mine/SettingScreen.kt |  45 +-
 .../pages/screen/mine/setting/AboutScreen.kt  |   5 +-
 .../screen/mine/setting/AccountBindScreen.kt  |   8 +-
 .../mine/setting/AccountManagerScreen.kt      |   8 +-
 .../pages/screen/mine/setting/BindScreen.kt   |  26 +-
 .../mine/setting/DeleteAccountScreen.kt       | 446 ++++++++++++++++++
 .../pages/screen/other/CameraGuideScreen.kt   |   3 +-
 .../com/img/rabbit/pages/toolbar/TitleBar.kt  |   2 +-
 .../java/com/img/rabbit/route/ScreenRoute.kt  |   1 +
 .../java/com/img/rabbit/utils/UniAppUtils.kt  |   7 -
 .../com/img/rabbit/viewmodel/BindViewModel.kt |   5 +-
 .../viewmodel/DeleteAccountViewModel.kt       |  32 ++
 .../img/rabbit/viewmodel/LoginViewModel.kt    |  14 +-
 app/src/main/res/mipmap-xxhdpi/ic_warning.png | Bin 0 -> 9267 bytes
 gradle/libs.versions.toml                     |   4 +-
 31 files changed, 682 insertions(+), 147 deletions(-)
 create mode 100644 app/src/main/java/com/img/rabbit/pages/screen/mine/setting/DeleteAccountScreen.kt
 create mode 100644 app/src/main/java/com/img/rabbit/viewmodel/DeleteAccountViewModel.kt
 create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_warning.png

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 1179ff1..a1f4e15 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-03-09T06:18:00.411600700Z">
+        <DropdownSelection timestamp="2026-03-10T06:53:45.140671700Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=JRBI89BIE6AI5TG6" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=d927cac5" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 555a0ce..cd756e7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -129,7 +129,7 @@ dependencies {
     implementation(libs.androidx.activity)
     implementation(libs.androidx.constraintlayout)
     implementation(libs.androidx.core.splashscreen)
-    implementation(libs.multidex)
+//    implementation(libs.multidex)
     
     // Compose 依赖
     implementation(platform(libs.androidx.compose.bom))
diff --git a/app/src/main/java/com/img/rabbit/BaseApplication.kt b/app/src/main/java/com/img/rabbit/BaseApplication.kt
index c861c44..a5656a5 100644
--- a/app/src/main/java/com/img/rabbit/BaseApplication.kt
+++ b/app/src/main/java/com/img/rabbit/BaseApplication.kt
@@ -1,18 +1,7 @@
 package com.img.rabbit
 
-import android.app.Activity
-import android.app.ActivityManager
 import android.app.Application
-import android.content.Intent
-import android.graphics.BitmapFactory
-import android.os.Build
-import android.os.Bundle
 import android.util.Log
-import android.view.KeyEvent
-import android.webkit.WebView
-import androidx.activity.ComponentActivity
-import androidx.activity.OnBackPressedCallback
-import androidx.multidex.MultiDex
 import com.bumptech.glide.Glide
 import com.img.rabbit.utils.NetworkMonitor
 import com.g.gysdk.GYManager
@@ -61,7 +50,7 @@ class BaseApplication : Application() {
     }
 
     override fun attachBaseContext(base: android.content.Context?) {
-        MultiDex.install(base)
+//        MultiDex.install(base)
         super.attachBaseContext(base)
     }
 
diff --git a/app/src/main/java/com/img/rabbit/MainActivity.kt b/app/src/main/java/com/img/rabbit/MainActivity.kt
index e8cd16a..509a547 100644
--- a/app/src/main/java/com/img/rabbit/MainActivity.kt
+++ b/app/src/main/java/com/img/rabbit/MainActivity.kt
@@ -196,13 +196,7 @@ class MainActivity : ComponentActivity(), LoadingCallback {
                         showSplash = true
                     }
 
-                    if(showSplash){ //|| globalLogout.value == true){
-                        // 全局注销，重新登录
-//                        if(globalLogout.value == true){
-//                            loginViewModel = viewModel()
-//                            loginViewModel.requestUserConfig()
-//                        }
-
+                    if(showSplash){
                         val token = PreferenceUtil.getAccessToken()
                         // 未登录，显示登录页
                         if (token.isNullOrEmpty() && loginViewModel.userConfigResult.value == null) {
@@ -368,7 +362,7 @@ class MainActivity : ComponentActivity(), LoadingCallback {
                 }
             }
 
-            // 模拟加载过程，2秒后关闭启动页
+            // 模拟加载过程，500毫秒后关闭启动页
             LaunchedEffect(Unit) {
                 delay(500L)
                 splashViewModel.setLoading(false)
diff --git a/app/src/main/java/com/img/rabbit/bean/local/ErrorBean.kt b/app/src/main/java/com/img/rabbit/bean/local/ErrorBean.kt
index d935ab3..3aabf57 100644
--- a/app/src/main/java/com/img/rabbit/bean/local/ErrorBean.kt
+++ b/app/src/main/java/com/img/rabbit/bean/local/ErrorBean.kt
@@ -1,3 +1,4 @@
 package com.img.rabbit.bean.local
 
+data class NotifyBean(var code: String,var message: String)
 data class ErrorBean(var code: String,var message: String)
diff --git a/app/src/main/java/com/img/rabbit/pages/LoginPage.kt b/app/src/main/java/com/img/rabbit/pages/LoginPage.kt
index 6c8f2a5..900c58d 100644
--- a/app/src/main/java/com/img/rabbit/pages/LoginPage.kt
+++ b/app/src/main/java/com/img/rabbit/pages/LoginPage.kt
@@ -23,6 +23,7 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -71,6 +72,7 @@ import com.g.gysdk.EloginActivityParam
 import com.g.gysdk.GYManager
 import com.g.gysdk.GYResponse
 import com.g.gysdk.GyCallBack
+import com.img.rabbit.components.CenterToast
 import com.img.rabbit.config.Constants.agreementUrl
 import com.img.rabbit.config.Constants.privacyUrl
 import com.img.rabbit.pages.toolbar.TitleBar
@@ -87,18 +89,6 @@ import org.json.JSONObject
 @Composable
 fun LoginScreen(navController: NavHostController? = null, generalViewModel: GeneralViewModel, loginViewModel: LoginViewModel, isVisibilityBreak: Boolean) {
     val context = LocalContext.current
-//    val networkStatus by generalViewModel.networkStatus.observeAsState(initial = true)
-//    var showNetworkDisconnected by remember { mutableStateOf(false) }
-//
-//    // 网络状态监听
-//    LaunchedEffect(networkStatus) {
-//        if (!networkStatus) {
-//            // 网络断开时的处理
-//            Log.w("NetworkStatus","网络断开")
-//        }else{
-//            Log.w("NetworkStatus","网络已连接")
-//        }
-//    }
 
     //关于登录的事件监听
     LaunchedEffect(Unit) {
@@ -120,20 +110,20 @@ fun LoginScreen(navController: NavHostController? = null, generalViewModel: Gene
         if (loginViewModel.loginResult.value?.data?.token?.isNotEmpty() == true) {
             val loginInfo = loginViewModel.loginResult.value?.data
             AppEventBus.post( LoginBindEvent.Login(userId = loginInfo?.user_id?:"", loginType = PreferenceUtil.getLoginType(), isLogin = true, data = loginInfo) )
-            Toast.makeText(context, "登录成功", Toast.LENGTH_SHORT).show()          //提示登录成功
+            CenterToast.show("登录成功")
             if(isVisibilityBreak){
                 navController?.popBackStack()                                      // 当允许返回上一页时，登录成功后，返回上一页
             }
             loginViewModel.loginResult.value = null                                //清理loginState
         }else if(loginViewModel.loginResult.value != null && loginViewModel.loginResult.value?.data?.token == null){
             Log.w("LoginScreen","登录失败,无有效的Token")
-            Toast.makeText(context, "登录失败，请重新登录", Toast.LENGTH_SHORT).show()//提示登录成功
+            CenterToast.show("登录失败，请重新登录")
         }
     }
 
     Scaffold{
         Box(
-            modifier = Modifier.fillMaxSize()
+            modifier = Modifier.fillMaxSize().navigationBarsPadding()
         ) {
             Image(
                 painter = painterResource(id = R.mipmap.ic_main_previous_mask),
@@ -758,11 +748,7 @@ private fun WxLoginScreen(
                         //打开微信登录
                         viewModel.authorWechat(context, generalViewModel.api)
                     } else {
-                        Toast.makeText(
-                            context,
-                            "请先同意用户协议和隐私政策",
-                            Toast.LENGTH_SHORT
-                        ).show()
+                        CenterToast.show("请先同意用户协议和隐私政策")
                     }
                 }
         ) {
@@ -934,11 +920,7 @@ private fun AliPayLoginScreen(
                         // 打开支付宝登录
                         viewModel.requestAliPayAuthParam(context)
                     } else {
-                        Toast.makeText(
-                            context,
-                            "请先同意用户协议和隐私政策",
-                            Toast.LENGTH_SHORT
-                        ).show()
+                        CenterToast.show("请先同意用户协议和隐私政策")
                     }
                 }
         ) {
@@ -1164,7 +1146,7 @@ private fun OtherLoginBar(viewModel: LoginViewModel) {
  */
 private fun validatePhoneEmpty(context: Context, viewModel: LoginViewModel, showToast: Boolean = false): Boolean {
     if (showToast && viewModel.userName.value.isEmpty()) {
-        Toast.makeText(context, "请输入手机号", Toast.LENGTH_SHORT).show()
+        CenterToast.show("请输入手机号")
     }
     return viewModel.userName.value.isNotEmpty()
 }
@@ -1175,11 +1157,11 @@ private fun validatePhoneEmpty(context: Context, viewModel: LoginViewModel, show
 private fun validateCaptchaLoginEmpty(context: Context, viewModel: LoginViewModel, showToast: Boolean = false): Boolean {
     if (showToast) {
         if(viewModel.userName.value.isEmpty()){
-            Toast.makeText(context, "请输入手机号", Toast.LENGTH_SHORT).show()
+            CenterToast.show("请输入手机号")
         }else if(viewModel.captcha.value.isEmpty()){
-            Toast.makeText(context, "请输入验证码", Toast.LENGTH_SHORT).show()
+            CenterToast.show("请输入验证码")
         }else if(!viewModel.isPolicyAgreement.value){
-            Toast.makeText(context, "请同意用户协议和隐私政策", Toast.LENGTH_SHORT).show()
+            CenterToast.show("请同意用户协议和隐私政策")
         }
     }
     return viewModel.userName.value.isNotEmpty() && viewModel.captcha.value.isNotEmpty() && viewModel.isPolicyAgreement.value
diff --git a/app/src/main/java/com/img/rabbit/pages/MainPage.kt b/app/src/main/java/com/img/rabbit/pages/MainPage.kt
index 171de93..8530aa7 100644
--- a/app/src/main/java/com/img/rabbit/pages/MainPage.kt
+++ b/app/src/main/java/com/img/rabbit/pages/MainPage.kt
@@ -2,9 +2,9 @@ package com.img.rabbit.pages
 
 import android.annotation.SuppressLint
 import android.util.Log
-import android.view.Gravity
-import android.widget.Toast
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -50,6 +50,7 @@ import com.img.rabbit.pages.screen.mine.setting.AboutScreen
 import com.img.rabbit.pages.screen.mine.setting.AccountBindScreen
 import com.img.rabbit.pages.screen.mine.setting.AccountManagerScreen
 import com.img.rabbit.pages.screen.mine.setting.BindScreen
+import com.img.rabbit.pages.screen.mine.setting.DeleteAccountScreen
 import com.img.rabbit.pages.screen.other.CameraGuideScreen
 import com.img.rabbit.route.ScreenRoute
 import com.img.rabbit.viewmodel.BindViewModel
@@ -133,14 +134,23 @@ fun MainScreen(generalViewModel: GeneralViewModel, loginViewModel: LoginViewMode
                                         Icon(
                                             painter = painterResource(id = iconRes),
                                             contentDescription = item.title,
-                                            tint = Color.Unspecified
+                                            tint = Color.Unspecified,
+                                            modifier = Modifier.clickable(
+                                                interactionSource = remember { MutableInteractionSource() },
+                                                indication = null
+                                            ){
+                                                selectedTab = tabItems[index]
+                                            }
                                         )
                                     },
                                     label = { Text(item.title, color = if (selectedTab == tabItems[index]) item.selectedColor else item.normalColor) },
                                     selected = selectedTab == tabItems[index],
                                     onClick = { selectedTab = tabItems[index] },
+                                    interactionSource = remember { MutableInteractionSource() },
                                     colors = NavigationBarItemDefaults.colors(
-                                        indicatorColor = Color.Transparent
+                                        indicatorColor = Color.Transparent, // 去掉选中时的椭圆背景
+                                        selectedIconColor = Color.Unspecified,
+                                        unselectedIconColor = Color.Unspecified
                                     )
                                 )
                             }
@@ -222,6 +232,9 @@ fun MainScreen(generalViewModel: GeneralViewModel, loginViewModel: LoginViewMode
                 composable(ScreenRoute.AboutMine.route) {
                     AboutScreen(navController = navController)
                 }
+                composable(ScreenRoute.DeleteAccount.route) {
+                    DeleteAccountScreen(navController = navController)
+                }
 
                 // 登录页面（Login）
                 composable(ScreenRoute.Login.route) {
diff --git a/app/src/main/java/com/img/rabbit/pages/dialog/UpdateDialog.kt b/app/src/main/java/com/img/rabbit/pages/dialog/UpdateDialog.kt
index 7e402ee..16ee8bd 100644
--- a/app/src/main/java/com/img/rabbit/pages/dialog/UpdateDialog.kt
+++ b/app/src/main/java/com/img/rabbit/pages/dialog/UpdateDialog.kt
@@ -222,13 +222,11 @@ fun UpdateDialog(
                                 ) {
                                     // 执行下载更新
                                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-//                                        isStartDown.value = true
                                         onStatusChange(false, false, url)
                                     }else{
                                         when {
                                             // 情况 A：已获得权限
                                             storagePermissionState.status.isGranted -> {
-//                                                isStartDown.value = true
                                                 onStatusChange(false, false, url)
                                             }
                                             // 情况 B：需要向用户解释（之前拒绝过，但未勾选“不再询问”）
diff --git a/app/src/main/java/com/img/rabbit/pages/screen/HomeScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/HomeScreen.kt
index 447c55f..6d68182 100644
--- a/app/src/main/java/com/img/rabbit/pages/screen/HomeScreen.kt
+++ b/app/src/main/java/com/img/rabbit/pages/screen/HomeScreen.kt
@@ -54,6 +54,7 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import coil3.compose.AsyncImage
 import com.img.rabbit.R
+import com.img.rabbit.components.CenterToast
 import com.img.rabbit.pages.LoadingCallback
 import com.img.rabbit.provider.storage.GlobalStateManager
 import com.img.rabbit.provider.storage.PreferenceUtil
@@ -90,7 +91,7 @@ fun HomeScreen(
     BackHandler(enabled = (currentRoute == ScreenRoute.Home.route)) {
         val currentTime = System.currentTimeMillis()
         if (currentTime - lastClickTime > 2000) {
-            Toast.makeText(context, "再按一次退出应用", Toast.LENGTH_SHORT).show()
+            CenterToast.show("再按一次退出应用")
             lastClickTime = currentTime
         } else {
             (context as? Activity)?.finish()
@@ -470,7 +471,7 @@ fun HomeScreen(
                                     val uniVersion =
                                         PreferenceUtil.getUserConfig()?.config?.uniVersionEntity?.firstOrNull { it.unimp_type == item.type }
                                     if(uniVersion == null){
-                                        Toast.makeText(context, "无可用资源...", Toast.LENGTH_SHORT).show()
+                                        CenterToast.show("无可用资源...")
                                         return@clickable
                                     }
                                     val uniMpId =  uniVersion.unimp_id
diff --git a/app/src/main/java/com/img/rabbit/pages/screen/MineScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/MineScreen.kt
index a17392c..5685df5 100644
--- a/app/src/main/java/com/img/rabbit/pages/screen/MineScreen.kt
+++ b/app/src/main/java/com/img/rabbit/pages/screen/MineScreen.kt
@@ -48,6 +48,7 @@ import androidx.navigation.compose.rememberNavController
 import coil3.compose.AsyncImage
 import com.img.rabbit.BuildConfig
 import com.img.rabbit.R
+import com.img.rabbit.components.CenterToast
 import com.img.rabbit.provider.storage.GlobalStateManager
 import com.img.rabbit.provider.storage.PreferenceUtil
 import com.img.rabbit.route.ScreenRoute
@@ -81,7 +82,7 @@ fun MineScreen(
     BackHandler(enabled = (currentRoute == ScreenRoute.Mine.route)) {
         val currentTime = System.currentTimeMillis()
         if (currentTime - lastClickTime > 2000) {
-            Toast.makeText(context, "再按一次退出应用", Toast.LENGTH_SHORT).show()
+            CenterToast.show("再按一次退出应用")
             lastClickTime = currentTime
         } else {
             (context as? Activity)?.finish()
@@ -194,8 +195,7 @@ fun MineScreen(
                                         userInfo?.user_id
                                     )
                                     clipboard.setPrimaryClip(clip)
-                                    Toast.makeText(context, "已复制到剪贴板", Toast.LENGTH_SHORT)
-                                        .show()
+                                    CenterToast.show("已复制到剪贴板")
                                 }
                             }
                     ){
@@ -388,7 +388,7 @@ fun MineScreen(
                                 interactionSource = remember { MutableInteractionSource() }
                             ) {
                                 if (!generalViewModel.api.isWXAppInstalled) {
-                                    Toast.makeText(context, "未安装微信客户端", Toast.LENGTH_SHORT).show()
+                                    CenterToast.show("未安装微信客户端")
                                 }else if(userInfo != null){
                                     viewModel.requestServiceLink(context, generalViewModel.api)
                                 }
@@ -455,7 +455,7 @@ fun MineScreen(
                                             GlobalStateManager(context).storeGlobalUpdateNotify(true)
                                         }
                                     } else {
-                                        Toast.makeText(context, tips, Toast.LENGTH_SHORT).show()
+                                        CenterToast.show(tips)
                                     }
                                 }
                             },
diff --git a/app/src/main/java/com/img/rabbit/pages/screen/make/CutoutScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/make/CutoutScreen.kt
index 63263c6..0432fa4 100644
--- a/app/src/main/java/com/img/rabbit/pages/screen/make/CutoutScreen.kt
+++ b/app/src/main/java/com/img/rabbit/pages/screen/make/CutoutScreen.kt
@@ -1,12 +1,14 @@
+@file:OptIn(ExperimentalPermissionsApi::class)
+
 package com.img.rabbit.pages.screen.make
 
+import android.Manifest
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.net.Uri
 import android.os.Build
 import android.util.Log
-import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.Canvas
@@ -24,6 +26,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentHeight
@@ -63,10 +66,15 @@ import androidx.compose.ui.unit.toSize
 import androidx.navigation.NavController
 import androidx.navigation.compose.rememberNavController
 import coil3.compose.AsyncImage
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.isGranted
+import com.google.accompanist.permissions.rememberPermissionState
+import com.google.accompanist.permissions.shouldShowRationale
 import com.img.rabbit.R
 import com.img.rabbit.bean.local.ClothingBean
 import com.img.rabbit.bean.local.HairstyleBean
 import com.img.rabbit.components.AppearanceType
+import com.img.rabbit.components.CenterToast
 import com.img.rabbit.components.DrawingBoardPicker
 import com.img.rabbit.config.CommonData.clothingForFemales
 import com.img.rabbit.config.CommonData.clothingForMans
@@ -170,6 +178,14 @@ fun CutoutScreen(navController: NavController) {
     val selectedSize = remember { mutableStateOf(resizes.first { it.width == widthParam && it.height == heightParam }) }
 
 
+    val storagePermissionState = rememberPermissionState(
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            Manifest.permission.READ_MEDIA_IMAGES // Android 13+ 使用具体媒体权限
+        } else {
+            Manifest.permission.WRITE_EXTERNAL_STORAGE // 旧版本使用常规存储权限
+        }
+    )
+
     // 图片选择启动器
     val imagePickerLauncher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.GetContent()
@@ -200,7 +216,7 @@ fun CutoutScreen(navController: NavController) {
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                         context.mainExecutor.execute {
                             isLoading.value = false
-                            Toast.makeText(context, "抠图失败，请重试", Toast.LENGTH_SHORT).show()
+                            CenterToast.show("抠图失败，请重试")
                         }
                     }
                 }
@@ -245,21 +261,18 @@ fun CutoutScreen(navController: NavController) {
             imagePickerLauncher.launch("image/*")
         }
         Column(
-            modifier = Modifier.fillMaxSize().background(Color(0xFFF4F4F4))
+            modifier = Modifier.fillMaxSize().background(Color(0xFFF4F4F4)).navigationBarsPadding()
         ) {
             TitleBar(navController = navController, paddingValues = it, title = "", showSave = true){
                 // 保存图片
                 coroutineScope.launch {
                     // 从 Layer 捕获 Bitmap
                     val bitmap = graphicsLayer.toImageBitmap().asAndroidBitmap()
-                    // 保存图片到系统相册(图片已按比例裁剪)
-                    saveCanvasToGallery(context, bitmap, ExportFormat.JPG){fileName, isSuccess ->
-                        if(isSuccess){
-                            Toast.makeText(context, "已保存为: $fileName", Toast.LENGTH_SHORT).show()
-                        }else{
-                            Toast.makeText(context, "保存失败", Toast.LENGTH_SHORT).show()
-                        }
-                    }
+//                    // 保存图片到系统相册(图片已按比例裁剪)
+//                    saveCanvasToGallery(context, bitmap, ExportFormat.JPG){fileName, isSuccess ->
+//                        val tips = if(isSuccess){ "已保存为: $fileName" }else{ "保存失败" }
+//                        CenterToast.show(tips)
+//                    }
 
                     /*
                     // 保存图片到系统相册(指定尺寸，如果targetWidth与targetHeight比原始值小太多会导致图片模糊)
@@ -271,6 +284,33 @@ fun CutoutScreen(navController: NavController) {
                         }
                     }
                      */
+
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                        // 保存图片到系统相册(图片已按比例裁剪)
+                        saveCanvasToGallery(context, bitmap, ExportFormat.JPG){fileName, isSuccess ->
+                            val tips = if(isSuccess){ "已保存为: $fileName" }else{ "保存失败" }
+                            CenterToast.show(tips)
+                        }
+                    }else{
+                        when {
+                            // 情况 A：已获得权限
+                            storagePermissionState.status.isGranted -> {
+                                // 保存图片到系统相册(图片已按比例裁剪)
+                                saveCanvasToGallery(context, bitmap, ExportFormat.JPG){fileName, isSuccess ->
+                                    val tips = if(isSuccess){ "已保存为: $fileName" }else{ "保存失败" }
+                                    CenterToast.show(tips)
+                                }
+                            }
+                            // 情况 B：需要向用户解释（之前拒绝过，但未勾选“不再询问”）
+                            storagePermissionState.status.shouldShowRationale -> {
+                                storagePermissionState.launchPermissionRequest()
+                            }
+                            // 情况 C：从未请求过权限或已被彻底拒绝
+                            else -> {
+                                storagePermissionState.launchPermissionRequest()
+                            }
+                        }
+                    }
                 }
             }
 
diff --git a/app/src/main/java/com/img/rabbit/pages/screen/make/FormatScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/make/FormatScreen.kt
index c0414d0..54be923 100644
--- a/app/src/main/java/com/img/rabbit/pages/screen/make/FormatScreen.kt
+++ b/app/src/main/java/com/img/rabbit/pages/screen/make/FormatScreen.kt
@@ -1,7 +1,6 @@
 package com.img.rabbit.pages.screen.make
 
 import android.net.Uri
-import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.Image
@@ -13,6 +12,7 @@ import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Scaffold
@@ -33,6 +33,7 @@ import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import coil3.compose.AsyncImage
 import com.img.rabbit.R
+import com.img.rabbit.components.CenterToast
 import com.img.rabbit.components.DrawingBoardFormatPicker
 import com.img.rabbit.config.CommonData.formats
 import com.img.rabbit.pages.toolbar.TitleBar
@@ -66,7 +67,7 @@ fun FormatScreen(navController: NavController) {
             imagePickerLauncher.launch("image/*")
         }
         Column(
-            modifier = Modifier.fillMaxSize().background(Color(0xFFF4F4F4))
+            modifier = Modifier.fillMaxSize().background(Color(0xFFF4F4F4)).navigationBarsPadding()
         ) {
             TitleBar(navController = navController, paddingValues = it, title = "", showSave = true) {
                 val bitmap = selectedImageUri.value?.let {uri->
@@ -87,11 +88,8 @@ fun FormatScreen(navController: NavController) {
                             sourceBitmap = bitmap,
                             format = format,
                             onSubmitResult = { fileName, isSuccess ->
-                                if (isSuccess) {
-                                    Toast.makeText(context, "已保存至 $fileName", Toast.LENGTH_SHORT).show()
-                                } else {
-                                    Toast.makeText(context, "保存失败", Toast.LENGTH_SHORT).show()
-                                }
+                                val tips = if (isSuccess) { "已保存至 $fileName" } else { "保存失败" }
+                                CenterToast.show(tips)
                             }
                         )
                     }
diff --git a/app/src/main/java/com/img/rabbit/pages/screen/make/LongImageScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/make/LongImageScreen.kt
index 03e517b..ff249ec 100644
--- a/app/src/main/java/com/img/rabbit/pages/screen/make/LongImageScreen.kt
+++ b/app/src/main/java/com/img/rabbit/pages/screen/make/LongImageScreen.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.lazy.LazyColumn
@@ -56,6 +57,7 @@ import kotlinx.coroutines.withContext
 
 
 import androidx.compose.ui.graphics.asAndroidBitmap
+import com.img.rabbit.components.CenterToast
 import io.moyuru.cropify.Cropify
 import io.moyuru.cropify.CropifyOption
 import io.moyuru.cropify.rememberCropifyState
@@ -97,7 +99,7 @@ fun LongImageScreen(navController: NavController) {
             mediaPickerLauncher.launch(matisse)
         }
         Column (
-            modifier = Modifier.fillMaxSize().background(Color(0xFFF4F4F4))
+            modifier = Modifier.fillMaxSize().background(Color(0xFFF4F4F4)).navigationBarsPadding()
         ) {
             TitleBar(
                 navController = navController,
@@ -107,11 +109,8 @@ fun LongImageScreen(navController: NavController) {
             ){
                 coroutineScope.launch {
                     saveLongToGallery(context = context, items = imageItems, format = ExportFormat.JPG){ fileName, isSuccess ->
-                        if (isSuccess) {
-                            Toast.makeText(context, "已保存至 $fileName", Toast.LENGTH_SHORT).show()
-                        } else {
-                            Toast.makeText(context, "保存失败", Toast.LENGTH_SHORT).show()
-                        }
+                        val tips = if (isSuccess) { "已保存至 $fileName" } else { "保存失败" }
+                        CenterToast.show(tips)
                     }
                 }
             }
diff --git a/app/src/main/java/com/img/rabbit/pages/screen/make/ResizeScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/make/ResizeScreen.kt
index fbc14c6..50b71cf 100644
--- a/app/src/main/java/com/img/rabbit/pages/screen/make/ResizeScreen.kt
+++ b/app/src/main/java/com/img/rabbit/pages/screen/make/ResizeScreen.kt
@@ -20,6 +20,7 @@ import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -53,6 +54,7 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.unit.toSize
 import androidx.navigation.NavController
 import com.img.rabbit.R
+import com.img.rabbit.components.CenterToast
 import com.img.rabbit.components.DrawingBoardCertificatePicker
 import com.img.rabbit.config.CommonData.resizes
 import com.img.rabbit.pages.toolbar.TitleBar
@@ -117,7 +119,7 @@ fun ResizeScreen(navController: NavController) {
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                         context.mainExecutor.execute {
                             isLoading.value = false
-                            Toast.makeText(context, "加载失败，请重试", Toast.LENGTH_SHORT).show()
+                            CenterToast.show("加载失败，请重试")
                         }
                     }
                 }
@@ -141,7 +143,7 @@ fun ResizeScreen(navController: NavController) {
         }
 
         Column(
-            modifier = Modifier.fillMaxSize().background(Color(0xFFF4F4F4))
+            modifier = Modifier.fillMaxSize().background(Color(0xFFF4F4F4)).navigationBarsPadding()
         ) {
             TitleBar(navController = navController, paddingValues = it, title = "", showSave = true){
                 // 保存图片
@@ -150,11 +152,8 @@ fun ResizeScreen(navController: NavController) {
                     val bitmap = graphicsLayer.toImageBitmap().asAndroidBitmap()
                     // 保存图片到系统相册(图片已按比例裁剪)
                     saveCanvasToGallery(context, bitmap, ExportFormat.JPG){fileName, isSuccess ->
-                        if(isSuccess){
-                            Toast.makeText(context, "已保存为: $fileName", Toast.LENGTH_SHORT).show()
-                        }else{
-                            Toast.makeText(context, "保存失败", Toast.LENGTH_SHORT).show()
-                        }
+                        val tips = if(isSuccess){ "已保存为: $fileName" }else{ "保存失败" }
+                        CenterToast.show(tips)
                     }
 
                     /*
diff --git a/app/src/main/java/com/img/rabbit/pages/screen/mine/FeedbackScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/mine/FeedbackScreen.kt
index 9b42656..3aaee57 100644
--- a/app/src/main/java/com/img/rabbit/pages/screen/mine/FeedbackScreen.kt
+++ b/app/src/main/java/com/img/rabbit/pages/screen/mine/FeedbackScreen.kt
@@ -13,13 +13,16 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -38,6 +41,7 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
+import com.img.rabbit.components.CenterToast
 import com.img.rabbit.components.ImagePicker
 import com.img.rabbit.pages.toolbar.TitleBar
 import com.img.rabbit.viewmodel.FeedbackViewModel
@@ -46,17 +50,18 @@ import okhttp3.RequestBody.Companion.toRequestBody
 @Composable
 fun FeedbackScreen(navController: NavHostController, viewModel: FeedbackViewModel = viewModel()) {
     val context = LocalContext.current
+    val scrollState = rememberScrollState()
 
     LaunchedEffect(viewModel.errorState.value) {
         if(viewModel.errorState.value != null){
-            Toast.makeText(context, viewModel.errorState.value?.message, Toast.LENGTH_SHORT).show()
+            viewModel.errorState.value?.message?.let { CenterToast.show(it) }
         }
         viewModel.errorState.value = null
     }
 
     Scaffold{
         Column(
-            modifier = Modifier.fillMaxSize()
+            modifier = Modifier.fillMaxSize().navigationBarsPadding()
         ) {
             TitleBar(navController = navController, paddingValues = it, title = "意见反馈")
             Box(
@@ -67,7 +72,7 @@ fun FeedbackScreen(navController: NavHostController, viewModel: FeedbackViewMode
             ){
                 // 意见反馈内容
                 Column(
-                    modifier = Modifier.fillMaxSize()
+                    modifier = Modifier.fillMaxSize().verticalScroll(scrollState)
                 ) {
                     // 意见反馈类型
                     Row(
@@ -421,6 +426,7 @@ fun FeedbackScreen(navController: NavHostController, viewModel: FeedbackViewMode
                             )
                         }
                     }
+                    Box(modifier = Modifier.fillMaxWidth().height(98.dp))
                 }
 
 
@@ -439,7 +445,7 @@ fun FeedbackScreen(navController: NavHostController, viewModel: FeedbackViewMode
                             interactionSource = remember { MutableInteractionSource() }
                         ) {
                             if (viewModel.feedbackMore.isEmpty()) {
-                                Toast.makeText(context, "请填写详细问题或意见...", Toast.LENGTH_SHORT).show()
+                                CenterToast.show("请填写详细问题或意见...")
                                 return@clickable
                             }
                             // 提交反馈
diff --git a/app/src/main/java/com/img/rabbit/pages/screen/mine/OnlineServiceScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/mine/OnlineServiceScreen.kt
index 6d66a1d..84af171 100644
--- a/app/src/main/java/com/img/rabbit/pages/screen/mine/OnlineServiceScreen.kt
+++ b/app/src/main/java/com/img/rabbit/pages/screen/mine/OnlineServiceScreen.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Scaffold
@@ -29,7 +30,7 @@ import com.img.rabbit.R
 fun OnlineServiceScreen(navController: NavHostController) {
     Scaffold{
         Column(
-            modifier = Modifier.fillMaxSize().padding(it)
+            modifier = Modifier.fillMaxSize().padding(it).navigationBarsPadding()
         ) {
             // 顶部栏
             Row(
diff --git a/app/src/main/java/com/img/rabbit/pages/screen/mine/SettingScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/mine/SettingScreen.kt
index e6b8b76..0989673 100644
--- a/app/src/main/java/com/img/rabbit/pages/screen/mine/SettingScreen.kt
+++ b/app/src/main/java/com/img/rabbit/pages/screen/mine/SettingScreen.kt
@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentSize
@@ -66,7 +67,7 @@ fun SettingScreen(navController: NavHostController, loginViewModel: LoginViewMod
 
     Scaffold{
         Column(
-            modifier = Modifier.fillMaxSize()
+            modifier = Modifier.fillMaxSize().navigationBarsPadding()
         ) {
             TitleBar(navController = navController, paddingValues = it, title = "设置")
 
@@ -257,6 +258,48 @@ fun SettingScreen(navController: NavHostController, loginViewModel: LoginViewMod
                             )
                         }
 
+                        Image(
+                            painter = painterResource(id = R.mipmap.ic_arrow_right),
+                            contentDescription = null,
+                            contentScale = ContentScale.FillWidth,
+                            modifier = Modifier
+                                .wrapContentSize()
+                                .padding(end = 12.dp)
+                                .align(Alignment.CenterVertically)
+                        )
+                    }
+                    Box(
+                        modifier = Modifier.fillMaxWidth().height(0.5.dp).padding(horizontal = 12.dp).background(
+                            Color(0x4DBBBBBB)
+                        )
+                    )
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(52.dp)
+                            .clickable(
+                                indication = null,
+                                interactionSource = remember { MutableInteractionSource() }
+                            ) {
+                                // 跳转注销账号页面
+                                navController.navigate("deleteAccount")
+                            },
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        Box(
+                            modifier = Modifier.weight(1f)
+                        ){
+                            Text(
+                                text = "注销账号",
+                                fontSize = 14.sp,
+                                fontWeight = FontWeight.Bold,
+                                color = Color(0xFF1A1A1A),
+                                modifier = Modifier
+                                    .wrapContentSize()
+                                    .padding(start = 8.dp)
+                            )
+                        }
+
                         Image(
                             painter = painterResource(id = R.mipmap.ic_arrow_right),
                             contentDescription = null,
diff --git a/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/AboutScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/AboutScreen.kt
index fa11b97..3814aed 100644
--- a/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/AboutScreen.kt
+++ b/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/AboutScreen.kt
@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentSize
@@ -43,14 +44,14 @@ fun AboutScreen(navController: NavHostController) {
     Scaffold{
         val context = LocalContext.current
         Column(
-            modifier = Modifier.fillMaxSize()
+            modifier = Modifier.fillMaxSize().navigationBarsPadding()
         ) {
             TitleBar(navController = navController, paddingValues = it, title = "关于我们")
 
             Box(
                 modifier = Modifier.fillMaxSize().padding(start = 17.dp, end = 17.dp)
             ){
-                //TODO 设置内容
+                // 设置内容
                 Column(
                     modifier = Modifier
                         .fillMaxSize()
diff --git a/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/AccountBindScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/AccountBindScreen.kt
index 4d42a2b..95da5a4 100644
--- a/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/AccountBindScreen.kt
+++ b/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/AccountBindScreen.kt
@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentHeight
@@ -45,6 +46,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import com.img.rabbit.R
+import com.img.rabbit.components.CenterToast
 import com.img.rabbit.pages.toolbar.TitleBar
 import com.img.rabbit.provider.storage.PreferenceUtil
 import com.img.rabbit.utils.AppEventBus
@@ -66,7 +68,7 @@ fun AccountBindScreen(navController: NavHostController, viewModel: AccountBindVi
     LaunchedEffect(viewModel.unBindState.value) {
         if(viewModel.unBindState.value != null){
             val loginInfo = viewModel.unBindState.value?.data
-            Toast.makeText(context, "解绑成功!", Toast.LENGTH_SHORT).show()
+            CenterToast.show("解绑成功!")
             AppEventBus.post( LoginBindEvent.Bind(userId = loginInfo?.user_id?:"", loginType = null, isBind = false, data = loginInfo) )
 
             val popped = navController.popBackStack(route = "home", inclusive = true)
@@ -80,14 +82,14 @@ fun AccountBindScreen(navController: NavHostController, viewModel: AccountBindVi
     }
     LaunchedEffect(viewModel.errorState.value) {
         if(viewModel.errorState.value != null){
-            Toast.makeText(context, "解绑失败...", Toast.LENGTH_SHORT).show()
+            CenterToast.show("解绑失败...")
             viewModel.errorState.value = null
         }
     }
 
     Scaffold{
         Box(
-            modifier = Modifier.fillMaxSize()
+            modifier = Modifier.fillMaxSize().navigationBarsPadding()
         ){
             Column(
                 modifier = Modifier.fillMaxSize()
diff --git a/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/AccountManagerScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/AccountManagerScreen.kt
index fee074a..f2f76f9 100644
--- a/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/AccountManagerScreen.kt
+++ b/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/AccountManagerScreen.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentHeight
@@ -47,6 +48,7 @@ import androidx.navigation.compose.rememberNavController
 import coil3.compose.AsyncImage
 import com.img.rabbit.R
 import com.img.rabbit.bean.response.UserInfoEntity
+import com.img.rabbit.components.CenterToast
 import com.img.rabbit.pages.dialog.TipsDialog
 import com.img.rabbit.pages.toolbar.TitleBar
 import com.img.rabbit.provider.storage.PreferenceUtil
@@ -76,7 +78,7 @@ fun AccountManagerScreen(navController: NavHostController, viewModel: AccountMan
             loginInfo?.let { PreferenceUtil.saveLoginInfo(it) }
             PreferenceUtil.saveAccessToken(viewModel.switchState.value?.data?.token)
             AppEventBus.post( LoginBindEvent.Login(userId = loginInfo?.user_id?:"", loginType = null, isLogin = true, data = loginInfo) )
-            Toast.makeText(context, "切换账号成功！", Toast.LENGTH_SHORT).show()
+            CenterToast.show("切换账号成功！")
 
             //延迟执行，确保返回时，接口已经拿到最新的用户信息
             delay(500)
@@ -86,14 +88,14 @@ fun AccountManagerScreen(navController: NavHostController, viewModel: AccountMan
     }
     LaunchedEffect(viewModel.errorState.value) {
         if(viewModel.errorState.value != null){
-            Toast.makeText(context, "切换账号失败...", Toast.LENGTH_SHORT).show()
+            CenterToast.show("切换账号失败...")
             viewModel.errorState.value = null
         }
     }
 
     Scaffold{
         Box(
-            modifier = Modifier.fillMaxSize()
+            modifier = Modifier.fillMaxSize().navigationBarsPadding()
         ){
             Image(
                 painter = painterResource(id = R.mipmap.ic_account_switch_top_mask),
diff --git a/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/BindScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/BindScreen.kt
index baae5bf..a1e0a21 100644
--- a/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/BindScreen.kt
+++ b/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/BindScreen.kt
@@ -21,6 +21,7 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -65,6 +66,7 @@ import com.g.gysdk.GYManager
 import com.g.gysdk.GYResponse
 import com.g.gysdk.GyCallBack
 import com.img.rabbit.R
+import com.img.rabbit.components.CenterToast
 import com.img.rabbit.config.Constants.agreementUrl
 import com.img.rabbit.config.Constants.privacyUrl
 import com.img.rabbit.pages.toolbar.TitleBar
@@ -102,12 +104,12 @@ fun BindScreen(navController: NavHostController, viewModel: BindViewModel = view
     LaunchedEffect(viewModel.bindState.value) {
         if (viewModel.bindState.value != null && viewModel.bindState.value?.data?.token != null) {
             val loginInfo = viewModel.bindState.value?.data
-            Toast.makeText(context, "绑定成功！", Toast.LENGTH_SHORT).show()
+            CenterToast.show("绑定成功！")
             AppEventBus.post( LoginBindEvent.Bind(userId = loginInfo?.user_id?:"", loginType = null, isBind = true, data = loginInfo) )
 
             navController.popBackStack()
         }else if (viewModel.bindState.value != null){
-            Toast.makeText(context, "绑定失败！", Toast.LENGTH_SHORT).show()
+            CenterToast.show("绑定失败...")
         }
         viewModel.bindState.value = null
     }
@@ -116,9 +118,9 @@ fun BindScreen(navController: NavHostController, viewModel: BindViewModel = view
     // 登录成功后，保存 token
     LaunchedEffect(viewModel.errorState.value) {
         if (viewModel.errorState.value != null) {
-            Toast.makeText(context, viewModel.errorState.value?.message?: "绑定失败！", Toast.LENGTH_SHORT).show()
+            CenterToast.show(viewModel.errorState.value?.message?: "绑定失败...")
         }else if (viewModel.bindState.value != null){
-            Toast.makeText(context, "绑定失败！", Toast.LENGTH_SHORT).show()
+            CenterToast.show("绑定失败...")
         }
         viewModel.errorState.value = null
     }
@@ -141,7 +143,7 @@ fun BindScreen(navController: NavHostController, viewModel: BindViewModel = view
 
     Scaffold{
         Box(
-            modifier = Modifier.fillMaxSize()
+            modifier = Modifier.fillMaxSize().navigationBarsPadding()
         ) {
             Image(
                 painter = painterResource(id = R.mipmap.ic_main_previous_mask),
@@ -742,7 +744,7 @@ private fun CaptchaBindScreen(context: Context, viewModel: BindViewModel) {
  */
 private fun validatePhoneEmpty(context: Context, viewModel: BindViewModel, showToast: Boolean = false): Boolean {
     if (showToast && viewModel.userName.value.isEmpty()) {
-        Toast.makeText(context, "请输入手机号", Toast.LENGTH_SHORT).show()
+        CenterToast.show("请输入手机号")
     }
     return viewModel.userName.value.isNotEmpty()
 }
@@ -753,11 +755,11 @@ private fun validatePhoneEmpty(context: Context, viewModel: BindViewModel, showT
 private fun validateCaptchaLoginEmpty(context: Context, viewModel: BindViewModel, showToast: Boolean = false): Boolean {
     if (showToast) {
         if(viewModel.userName.value.isEmpty()){
-            Toast.makeText(context, "请输入手机号", Toast.LENGTH_SHORT).show()
+            CenterToast.show("请输入手机号")
         }else if(viewModel.captcha.value.isEmpty()){
-            Toast.makeText(context, "请输入验证码", Toast.LENGTH_SHORT).show()
+            CenterToast.show("请输入验证码")
         }else if(!viewModel.isPolicyAgreement.value){
-            Toast.makeText(context, "请同意用户协议和隐私政策", Toast.LENGTH_SHORT).show()
+            CenterToast.show("请同意用户协议和隐私政策")
         }
     }
     return viewModel.userName.value.isNotEmpty() && viewModel.captcha.value.isNotEmpty() && viewModel.isPolicyAgreement.value
@@ -819,11 +821,7 @@ private fun WxBindScreen(
                         // 打开微信登录
                         viewModel.requestWithWechatAuth(context, generalViewModel.api)
                     } else {
-                        Toast.makeText(
-                            context,
-                            "请先同意用户协议和隐私政策",
-                            Toast.LENGTH_SHORT
-                        ).show()
+                        CenterToast.show("请先同意用户协议和隐私政策")
                     }
                 }
         ) {
diff --git a/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/DeleteAccountScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/DeleteAccountScreen.kt
new file mode 100644
index 0000000..9274ead
--- /dev/null
+++ b/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/DeleteAccountScreen.kt
@@ -0,0 +1,446 @@
+package com.img.rabbit.pages.screen.mine.setting
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.Scaffold
+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.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.rememberNavController
+import com.img.rabbit.R
+import com.img.rabbit.components.CenterToast
+import com.img.rabbit.pages.toolbar.TitleBar
+import com.img.rabbit.viewmodel.DeleteAccountViewModel
+
+@Composable
+fun DeleteAccountScreen(navController: NavHostController,viewModel: DeleteAccountViewModel = viewModel()) {
+    val inputTextValue = "我自愿注销本账号"
+    var isRights by remember { mutableStateOf(false) }//权益
+    var isDispute by remember { mutableStateOf(false) }//纠纷
+    var isDuty by remember { mutableStateOf(false) }//责任
+    var isIrrecoverable by remember { mutableStateOf(false) }//不可恢复
+    var inputText by remember { mutableStateOf("") }//文字
+
+    LaunchedEffect(viewModel.resultState.value) {
+        if (viewModel.resultState.value != null) {
+            CenterToast.show("注销成功！")
+
+            navController.popBackStack()
+        }
+    }
+    LaunchedEffect(viewModel.errorState.value) {
+        if (viewModel.errorState.value != null) {
+            CenterToast.show("注销失败...")
+        }
+    }
+
+    Scaffold{
+        Column(
+            modifier = Modifier.fillMaxSize().navigationBarsPadding().background(Color(0xFFF9F9F9))
+        ) {
+            TitleBar(navController = navController, paddingValues = it, title = "注销账号")
+
+            Box(
+                modifier = Modifier.fillMaxSize().padding(start = 17.dp, end = 17.dp)
+            ){
+                // 设置内容
+                Column(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .padding(top = 16.dp)
+                        .verticalScroll(rememberScrollState())
+                ){
+
+                    Image(
+                        painter = painterResource(id = R.mipmap.ic_warning),
+                        contentDescription = null,
+                        contentScale = ContentScale.FillWidth,
+                        modifier = Modifier.size(86.dp).align(Alignment.CenterHorizontally)
+                    )
+
+                    Text(
+                        text = "为保证你的账号安全，在你提交的注销申请生效前，需要同时满足以下条件：",
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.Bold,
+                        modifier = Modifier
+                            .align(Alignment.CenterHorizontally),
+                        color = Color(0xFF3D3D3D)
+
+                    )
+
+                    Column(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .wrapContentHeight()
+                            .padding(top = 16.dp, bottom = 16.dp)
+                            .align(Alignment.CenterHorizontally)
+                            .background(Color(0xFFFFFFFF), shape = RoundedCornerShape(12.dp))
+                    ) {
+                        //权益
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(start = 16.dp, end = 16.dp, top = 16.dp)
+                        ) {
+                            Text(
+                                text = "1.放弃当前的VIP权益",
+                                fontSize = 15.sp,
+                                fontWeight = FontWeight.Bold,
+                                modifier = Modifier
+                                    .weight(1f),
+                                color = Color(0xFF1A1A1A)
+                            )
+
+                            Checkbox(
+                                checked = isRights,
+                                onCheckedChange = { isChecked ->
+                                    isRights = isChecked
+                                },
+                                modifier = Modifier
+                                    .align(Alignment.CenterVertically)
+                                    .size(16.dp)
+                                    .scale(0.35f)
+                                    .padding(start = 6.dp)
+                                    .background(
+                                        if (isRights) Color(0xFF252525)
+                                        else Color.Transparent,
+                                        shape = RoundedCornerShape(36.dp)
+                                    )
+                                    .border(
+                                        width = 1.dp,
+                                        color = if (isRights) Color(0xFF252525)
+                                        else Color(0xFFCCCCCC),
+                                        shape = RoundedCornerShape(36.dp)
+                                    )
+                                    .align(Alignment.CenterVertically),
+                                colors = androidx.compose.material3.CheckboxDefaults.colors(
+                                    checkedColor = Color.Transparent,    // 隐藏默认背景
+                                    uncheckedColor = Color.Transparent,  // 隐藏默认背景
+                                    checkmarkColor = Color.White
+                                )
+
+
+                            )
+                        }
+                        Text(
+                            text = "当前充值的VIP我们不会退款，请解除你的自动续费（如果有），同意请打勾",
+                            fontSize = 13.sp,
+                            fontWeight = FontWeight.Normal,
+                            modifier = Modifier
+                                .padding(top = 4.dp, start = 30.dp, end = 57.dp),
+                            color = Color(0xFF767676)
+                        )
+                        //纠纷
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(start = 16.dp, end = 16.dp, top = 16.dp)
+                        ) {
+                            Text(
+                                text = "2.当前账号没有违规及其他的法律纠纷",
+                                fontSize = 15.sp,
+                                fontWeight = FontWeight.Bold,
+                                modifier = Modifier
+                                    .weight(1f),
+                                color = Color(0xFF1A1A1A)
+                            )
+
+                            Checkbox(
+                                checked = isDispute,
+                                onCheckedChange = { isChecked ->
+                                    isDispute = isChecked
+                                },
+                                modifier = Modifier
+                                    .align(Alignment.CenterVertically)
+                                    .size(16.dp)
+                                    .scale(0.35f)
+                                    .padding(start = 6.dp)
+                                    .background(
+                                        if (isDispute) Color(0xFF252525)
+                                        else Color.Transparent,
+                                        shape = RoundedCornerShape(36.dp)
+                                    )
+                                    .border(
+                                        width = 1.dp,
+                                        color = if (isDispute) Color(0xFF252525)
+                                        else Color(0xFFCCCCCC),
+                                        shape = RoundedCornerShape(36.dp)
+                                    )
+                                    .align(Alignment.CenterVertically),
+                                colors = androidx.compose.material3.CheckboxDefaults.colors(
+                                    checkedColor = Color.Transparent,    // 隐藏默认背景
+                                    uncheckedColor = Color.Transparent,  // 隐藏默认背景
+                                    checkmarkColor = Color.White
+                                )
+
+
+                            )
+                        }
+                        Text(
+                            text = "同意请打勾",
+                            fontSize = 13.sp,
+                            fontWeight = FontWeight.Normal,
+                            modifier = Modifier
+                                .padding(top = 4.dp, start = 30.dp, end = 57.dp),
+                            color = Color(0xFF767676)
+                        )
+                        //责任
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(start = 16.dp, end = 16.dp, top = 16.dp)
+                        ) {
+                            Text(
+                                text = "3.确认是账号本人进行注销操作，自愿承担后果",
+                                fontSize = 15.sp,
+                                fontWeight = FontWeight.Bold,
+                                modifier = Modifier
+                                    .weight(1f),
+                                color = Color(0xFF1A1A1A)
+                            )
+
+                            Checkbox(
+                                checked = isDuty,
+                                onCheckedChange = { isChecked ->
+                                    isDuty = isChecked
+                                },
+                                modifier = Modifier
+                                    .align(Alignment.CenterVertically)
+                                    .size(16.dp)
+                                    .scale(0.35f)
+                                    .padding(start = 6.dp)
+                                    .background(
+                                        if (isDuty) Color(0xFF252525)
+                                        else Color.Transparent,
+                                        shape = RoundedCornerShape(36.dp)
+                                    )
+                                    .border(
+                                        width = 1.dp,
+                                        color = if (isDuty) Color(0xFF252525)
+                                        else Color(0xFFCCCCCC),
+                                        shape = RoundedCornerShape(36.dp)
+                                    )
+                                    .align(Alignment.CenterVertically),
+                                colors = androidx.compose.material3.CheckboxDefaults.colors(
+                                    checkedColor = Color.Transparent,    // 隐藏默认背景
+                                    uncheckedColor = Color.Transparent,  // 隐藏默认背景
+                                    checkmarkColor = Color.White
+                                )
+                            )
+                        }
+                        Text(
+                            text = "同意请打勾",
+                            fontSize = 13.sp,
+                            fontWeight = FontWeight.Normal,
+                            modifier = Modifier
+                                .padding(top = 4.dp, start = 30.dp, end = 57.dp),
+                            color = Color(0xFF767676)
+                        )
+                        //不可恢复
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(start = 16.dp, end = 16.dp, top = 16.dp)
+                        ) {
+                            Text(
+                                text = "4.账号注销后账号不可登录，不可恢复",
+                                fontSize = 15.sp,
+                                fontWeight = FontWeight.Bold,
+                                modifier = Modifier
+                                    .weight(1f),
+                                color = Color(0xFF1A1A1A)
+                            )
+
+                            Checkbox(
+                                checked = isIrrecoverable,
+                                onCheckedChange = { isChecked ->
+                                    isIrrecoverable = isChecked
+                                },
+                                modifier = Modifier
+                                    .align(Alignment.CenterVertically)
+                                    .size(16.dp)
+                                    .scale(0.35f)
+                                    .padding(start = 6.dp)
+                                    .background(
+                                        if (isIrrecoverable) Color(0xFF252525)
+                                        else Color.Transparent,
+                                        shape = RoundedCornerShape(36.dp)
+                                    )
+                                    .border(
+                                        width = 1.dp,
+                                        color = if (isIrrecoverable) Color(0xFF252525)
+                                        else Color(0xFFCCCCCC),
+                                        shape = RoundedCornerShape(36.dp)
+                                    )
+                                    .align(Alignment.CenterVertically),
+                                colors = androidx.compose.material3.CheckboxDefaults.colors(
+                                    checkedColor = Color.Transparent,    // 隐藏默认背景
+                                    uncheckedColor = Color.Transparent,  // 隐藏默认背景
+                                    checkmarkColor = Color.White
+                                )
+                            )
+                        }
+                        Text(
+                            text = "同意请打勾",
+                            fontSize = 13.sp,
+                            fontWeight = FontWeight.Normal,
+                            modifier = Modifier
+                                .padding(top = 4.dp, start = 30.dp, end = 57.dp),
+                            color = Color(0xFF767676)
+                        )
+                        //文字前面意愿
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(start = 16.dp, end = 16.dp, top = 16.dp)
+                        ) {
+                            Text(
+                                text = "5.请在输入框中输入以下文字",
+                                fontSize = 15.sp,
+                                fontWeight = FontWeight.Bold,
+                                modifier = Modifier
+                                    .weight(1f),
+                                color = Color(0xFF1A1A1A)
+                            )
+
+                            Box(modifier = Modifier.size(16.dp))
+                        }
+                        Text(
+                            text = inputTextValue,
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.Normal,
+                            modifier = Modifier
+                                .padding(top = 4.dp, start = 30.dp, end = 57.dp),
+                            color = Color(0xFFF64545)
+                        )
+
+                        Box(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .height(56.dp)
+                                .padding(start = 16.dp, end = 16.dp, top = 16.dp)
+                                .background(Color(0xFFF6F6F6), RoundedCornerShape(8.dp)).border(
+                                    width = 1.dp,
+                                    color = Color(0xFFDEDEDE),
+                                    shape = RoundedCornerShape(8.dp)
+                                )
+
+
+
+                        ){
+                            CustomTextField(value = inputText, onValueChange = {input-> inputText = input })
+                        }
+
+                        Box(modifier = Modifier.height(14.dp))
+                    }
+
+                    Box(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(56.dp)
+                            .background(Color(0xFFFF4F4F).copy(
+                                alpha = if(isValid(isRights, isDispute, isDuty, isIrrecoverable, inputText, inputTextValue))1f else 0.5f
+                            ), shape = RoundedCornerShape(197.dp))
+                            .clickable(indication = null, interactionSource = remember { MutableInteractionSource() }) {
+                                if(isValid(isRights, isDispute, isDuty, isIrrecoverable, inputText, inputTextValue)){
+                                    // 处理确认注销逻辑
+                                    viewModel.deleteAccount()
+                                }
+                            }
+                    ){
+                        Text(
+                            text = "确认注销",
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.Bold,
+                            color = Color(0xFFFFFFFF),
+                            modifier = Modifier
+                                .align(Alignment.Center)
+                        )
+                    }
+
+                    Box(modifier = Modifier.height(56.dp))
+
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun CustomTextField(
+    value: String,
+    onValueChange: (String) -> Unit,
+    placeholder: String = ""
+) {
+    BasicTextField(
+        value = value,
+        onValueChange = onValueChange,
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(56.dp)
+            .background(Color(0xFFF6F6F6), RoundedCornerShape(8.dp))
+            .padding(horizontal = 16.dp),
+        // 核心：处理占位符和对齐
+        decorationBox = { innerTextField ->
+            Box(
+                contentAlignment = Alignment.CenterStart, // 垂直居中
+                modifier = Modifier.fillMaxSize()
+            ) {
+                if (value.isEmpty()) {
+                    Text(text = placeholder, color = Color.Gray, fontSize = 14.sp)
+                }
+                innerTextField() // 实际的文本输入区域
+            }
+        },
+        cursorBrush = SolidColor(Color.Blue), // 自定义光标颜色
+        textStyle = TextStyle(color = Color.Black, fontSize = 16.sp)
+    )
+}
+
+private fun isValid(isRights: Boolean, isDispute: Boolean, isDuty: Boolean, isIrrecoverable: Boolean, input: String, @Suppress(
+    "SameParameterValue"
+) inputValue: String): Boolean {
+    return isRights && isDispute && isDuty && isIrrecoverable && input == inputValue
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun PreviewDeleteAccountScreen(){
+    DeleteAccountScreen(navController = rememberNavController())
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/img/rabbit/pages/screen/other/CameraGuideScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/other/CameraGuideScreen.kt
index 80a0ec0..dfc1fb9 100644
--- a/app/src/main/java/com/img/rabbit/pages/screen/other/CameraGuideScreen.kt
+++ b/app/src/main/java/com/img/rabbit/pages/screen/other/CameraGuideScreen.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentHeight
@@ -34,7 +35,7 @@ import com.img.rabbit.pages.toolbar.TitleBar
 fun CameraGuideScreen(navController: NavController) {
     Scaffold {
         Box(
-            modifier = Modifier.fillMaxSize().background(Color(0xFFF4F4F4))
+            modifier = Modifier.fillMaxSize().background(Color(0xFFF4F4F4)).navigationBarsPadding()
         ) {
             Column(
                 modifier = Modifier.fillMaxSize(),
diff --git a/app/src/main/java/com/img/rabbit/pages/toolbar/TitleBar.kt b/app/src/main/java/com/img/rabbit/pages/toolbar/TitleBar.kt
index 4448257..f9a8d16 100644
--- a/app/src/main/java/com/img/rabbit/pages/toolbar/TitleBar.kt
+++ b/app/src/main/java/com/img/rabbit/pages/toolbar/TitleBar.kt
@@ -34,7 +34,7 @@ import com.img.rabbit.route.ScreenRoute
 @Composable
 fun TitleBar(navController: NavController?, paddingValues: PaddingValues, title: String? = "", showSave: Boolean = false, showBreak: Boolean = true, onSubmit: (() -> Unit)? = null) {
     Box(
-        modifier = Modifier.fillMaxWidth().padding(paddingValues)
+        modifier = Modifier.fillMaxWidth().padding(top = paddingValues.calculateTopPadding())
     ){
         Row(
             modifier = Modifier
diff --git a/app/src/main/java/com/img/rabbit/route/ScreenRoute.kt b/app/src/main/java/com/img/rabbit/route/ScreenRoute.kt
index 693adee..91d50f6 100644
--- a/app/src/main/java/com/img/rabbit/route/ScreenRoute.kt
+++ b/app/src/main/java/com/img/rabbit/route/ScreenRoute.kt
@@ -28,5 +28,6 @@ sealed class ScreenRoute(val route: String) {
     object BindAccount : ScreenRoute("bindAccount")
     object ManagerAccount : ScreenRoute("managerAccount")
     object AboutMine : ScreenRoute("aboutMine")
+    object DeleteAccount : ScreenRoute("deleteAccount")
     object NetError : ScreenRoute("netError")
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/img/rabbit/utils/UniAppUtils.kt b/app/src/main/java/com/img/rabbit/utils/UniAppUtils.kt
index 648b11e..f7f36ad 100644
--- a/app/src/main/java/com/img/rabbit/utils/UniAppUtils.kt
+++ b/app/src/main/java/com/img/rabbit/utils/UniAppUtils.kt
@@ -1,15 +1,8 @@
 package com.img.rabbit.utils
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.util.Log
-import android.widget.Toast
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
-import com.dcloud.android.downloader.domain.DownloadInfo
 import com.github.gzuliyujiang.oaid.DeviceIdentifier
-import com.google.gson.Gson
 import com.img.rabbit.BuildConfig
 import com.img.rabbit.bean.response.UniVersionEntity
 import com.img.rabbit.components.CenterToast
diff --git a/app/src/main/java/com/img/rabbit/viewmodel/BindViewModel.kt b/app/src/main/java/com/img/rabbit/viewmodel/BindViewModel.kt
index b8115eb..714b4b9 100644
--- a/app/src/main/java/com/img/rabbit/viewmodel/BindViewModel.kt
+++ b/app/src/main/java/com/img/rabbit/viewmodel/BindViewModel.kt
@@ -14,6 +14,7 @@ import com.google.gson.JsonObject
 import com.img.rabbit.bean.local.ErrorBean
 import com.img.rabbit.bean.local.OnekeyPreLogin
 import com.img.rabbit.bean.response.LoginInfoEntity
+import com.img.rabbit.components.CenterToast
 import com.img.rabbit.pages.screen.mine.setting.BindScreenType
 import com.img.rabbit.provider.api.ApiManager
 import com.img.rabbit.provider.api.ResultVo
@@ -207,14 +208,14 @@ class BindViewModel : BaseViewModel() {
         if (isPolicyAgreement.value) {
             doWechatAuth(context, wxApi)
         }else{
-            Toast.makeText(context, "请先同意用户协议和隐私政策", Toast.LENGTH_SHORT).show()
+            CenterToast.show("请先同意用户协议和隐私政策")
         }
     }
 
     //获取微信授权
     private fun doWechatAuth(context: Context, wxApi: IWXAPI) {
         if (!wxApi.isWXAppInstalled) {
-            Toast.makeText(context, "您没有安装微信客户端,请先下载安装", Toast.LENGTH_SHORT).show()
+            CenterToast.show("您没有安装微信客户端,请先下载安装")
             return
         }
         isBindWxAuthor = true
diff --git a/app/src/main/java/com/img/rabbit/viewmodel/DeleteAccountViewModel.kt b/app/src/main/java/com/img/rabbit/viewmodel/DeleteAccountViewModel.kt
new file mode 100644
index 0000000..fc3373c
--- /dev/null
+++ b/app/src/main/java/com/img/rabbit/viewmodel/DeleteAccountViewModel.kt
@@ -0,0 +1,32 @@
+package com.img.rabbit.viewmodel
+
+import androidx.compose.runtime.mutableStateOf
+import com.img.rabbit.bean.local.ErrorBean
+import com.img.rabbit.bean.local.NotifyBean
+import com.img.rabbit.provider.api.ApiManager
+import com.img.rabbit.provider.storage.PreferenceUtil
+import com.img.rabbit.utils.AppEventBus
+import com.img.rabbit.utils.LoginBindEvent
+
+class DeleteAccountViewModel : BaseViewModel() {
+    // 结果状态
+    val resultState = mutableStateOf<NotifyBean?>(null)
+    // 错误状态
+    val errorState = mutableStateOf<ErrorBean?>(null)
+
+    fun deleteAccount() {
+        isLoading.value = true // 开始加载
+        mLaunch {
+            val response = ApiManager.serviceVo.userDestroy()
+            if (response.status) {
+                resultState.value = NotifyBean(response.code.toString(), response.message.ifEmpty { "已注销！" })
+
+                PreferenceUtil.clearLogin()
+                AppEventBus.post( LoginBindEvent.Login(userId = null, loginType = PreferenceUtil.getLoginType(), isLogin = false, data = null) )
+            }else{
+                errorState.value = ErrorBean(response.code.toString(), response.message.ifEmpty { "注销失败..." })
+            }
+            isLoading.value = false // 开始加载
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/img/rabbit/viewmodel/LoginViewModel.kt b/app/src/main/java/com/img/rabbit/viewmodel/LoginViewModel.kt
index 229abb0..012f9d5 100644
--- a/app/src/main/java/com/img/rabbit/viewmodel/LoginViewModel.kt
+++ b/app/src/main/java/com/img/rabbit/viewmodel/LoginViewModel.kt
@@ -4,7 +4,6 @@ import android.app.Activity
 import android.content.Context
 import android.os.Build
 import android.util.Log
-import android.widget.Toast
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.State
@@ -21,6 +20,7 @@ import com.img.rabbit.bean.local.OnekeyPreLogin
 import com.img.rabbit.bean.local.toAlipayResult
 import com.img.rabbit.bean.response.LoginInfoEntity
 import com.img.rabbit.bean.response.UserConfigEntity
+import com.img.rabbit.components.CenterToast
 import com.img.rabbit.provider.api.ApiManager
 import com.img.rabbit.provider.api.ResultVo
 import com.img.rabbit.provider.storage.GlobalStateManager
@@ -270,7 +270,7 @@ class LoginViewModel : BaseViewModel() {
     fun authorWechat(context: Context, wxApi:IWXAPI) {
         if (isPolicyAgreement.value) {
             if (!wxApi.isWXAppInstalled) {
-                Toast.makeText(context, "您没有安装微信客户端,请先下载安装", Toast.LENGTH_SHORT).show()
+                CenterToast.show("您没有安装微信客户端,请先下载安装")
                 return
             }
             isLoginWxAuthor = true
@@ -279,7 +279,7 @@ class LoginViewModel : BaseViewModel() {
             req.state = context.packageName + Math.random() * 1000 + "_phone"
             wxApi.sendReq(req)
         }else{
-            Toast.makeText(context, "请先同意用户协议和隐私政策", Toast.LENGTH_SHORT).show()
+            CenterToast.show("请先同意用户协议和隐私政策")
         }
     }
 
@@ -331,7 +331,7 @@ class LoginViewModel : BaseViewModel() {
 
     private fun authorAlipay(context: Context,  authParam: String){
         if(authParam.isEmpty()){
-            Toast.makeText(context, "请先获取支付宝登录授权码", Toast.LENGTH_SHORT).show()
+            CenterToast.show("请先获取支付宝登录授权码")
             return
         }
         // 发送请求获取支付宝登录授权码
@@ -436,13 +436,7 @@ class LoginViewModel : BaseViewModel() {
         mLaunch {
             val response = ApiManager.serviceVo.logout()
             if (response.status) {
-                //logoutState.value = response
                 PreferenceUtil.clearLogin()
-//                setLogin(false)
-                // 跳转登录页面
-//                GlobalScope.launch {
-//                    GlobalStateManager(context).storeGlobalLogoutNotify(true)
-//                }
                 AppEventBus.post( LoginBindEvent.Login(userId = null, loginType = PreferenceUtil.getLoginType(), isLogin = false, data = null) )
             } else {
                 errorState.value = ErrorBean(response.code.toString(), response.message.ifEmpty { "退出登录失败" })
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_warning.png b/app/src/main/res/mipmap-xxhdpi/ic_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d4103813c098d3027430fb9378569183f5c9a9d
GIT binary patch
literal 9267
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
Y&2-O1GCmxBfq+2kfj+VVVITf~07cT%lmGw#

literal 0
HcmV?d00001

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d849ca5..9e303ac 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ constraintlayout = "2.1.4"
 splashscreen = "1.0.1"
 datastoreCore = "1.2.0"
 datastorePreferences = "1.1.1"
-multidex = "2.0.1"
+#multidex = "2.0.1"
 
 # Compose Version
 composeBom = "2024.05.00"
@@ -80,7 +80,7 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serializa
 androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }
 androidx-datastore-core = { group = "androidx.datastore", name = "datastore-core", version.ref = "datastoreCore" }
 androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" }
-multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" }
+#multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" }
 
 # Compose dependencies
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }