From 7b00bda629ba96346ec119cdf3618ac0309840e6 Mon Sep 17 00:00:00 2001
From: shenzuqiang <zuqiangshen@163.com>
Date: Mon, 2 Mar 2026 11:41:46 +0800
Subject: [PATCH] =?UTF-8?q?Dev=EF=BC=9A=201=E3=80=81=E6=B7=BB=E5=8A=A0unia?=
 =?UTF-8?q?pp=E5=85=A5=E5=8F=A3=E9=85=8D=E7=BD=AE=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=B9=B6=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |    4 +-
 app/build.gradle.kts                          |    1 +
 .../img/rabbit/bean/response/ConfigEntity.kt  |    4 +
 .../img/rabbit/bean/response/UniIconEntity.kt |   22 +
 .../com/img/rabbit/pages/screen/HomeScreen.kt | 1732 +++++++++--------
 gradle.properties                             |    2 +
 gradle/libs.versions.toml                     |    2 +
 7 files changed, 941 insertions(+), 826 deletions(-)
 create mode 100644 app/src/main/java/com/img/rabbit/bean/response/UniIconEntity.kt

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 1f7be9c..7cfb2c9 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-02-28T10:08:53.722874Z">
+        <DropdownSelection timestamp="2026-03-02T03:06:17.024211200Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=JRBI89BIE6AI5TG6" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=VSJNQ4NFBYJB5PZD" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7ac9a28..af0dac7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -129,6 +129,7 @@ dependencies {
     implementation(libs.androidx.datastore.core)
     implementation(libs.androidx.datastore.preferences)
     implementation(libs.androidx.foundation)
+    implementation(libs.foundation)
 
     // 测试依赖
     testImplementation(libs.junit)
diff --git a/app/src/main/java/com/img/rabbit/bean/response/ConfigEntity.kt b/app/src/main/java/com/img/rabbit/bean/response/ConfigEntity.kt
index 7f7af9a..0f39159 100644
--- a/app/src/main/java/com/img/rabbit/bean/response/ConfigEntity.kt
+++ b/app/src/main/java/com/img/rabbit/bean/response/ConfigEntity.kt
@@ -11,6 +11,10 @@ class ConfigEntity {
     @SerializedName("client.uni.version.upgrade") //小程序模拟器
     var uniVersionEntity: List<UniVersionEntity>? = emptyList()
 
+    @SerializedName("client.icon.uni.home") //uni首页icon
+    var homeIconEntity: List<UniIconEntity>? = emptyList()
+
+
     @SerializedName("client.popup.display") //显示开关控制
     var popupConfig: PopupConfigEntity? = null
 
diff --git a/app/src/main/java/com/img/rabbit/bean/response/UniIconEntity.kt b/app/src/main/java/com/img/rabbit/bean/response/UniIconEntity.kt
new file mode 100644
index 0000000..ab4bd74
--- /dev/null
+++ b/app/src/main/java/com/img/rabbit/bean/response/UniIconEntity.kt
@@ -0,0 +1,22 @@
+package com.img.rabbit.bean.response
+
+import kotlinx.serialization.Serializable
+
+/**
+ * {
+ *       "icon": "https://cdn.batiao8.com/flaunt/uni_mp/icon/other/ticket.png",
+ *       "text": "机票",
+ *       "url": "pages/other/tickets-app/index",
+ *       "type": "alipay",
+ *       "enable": true
+ *     }
+ */
+
+@Serializable
+class UniIconEntity(
+    var icon: String = "",
+    var text: String = "",
+    var url: String = "",
+    var type: String = "",
+    var enable: Boolean = false
+)
\ No newline at end of file
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 4ad61cf..e731e44 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
@@ -10,20 +10,19 @@ 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.Spacer
 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.offset
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 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.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -33,7 +32,6 @@ 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.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
@@ -55,7 +53,6 @@ import com.img.rabbit.viewmodel.GeneralViewModel
 @Composable
 fun HomeScreen(navController: NavHostController,generalViewModel: GeneralViewModel) {
     val context = LocalContext.current
-    val scrollState = rememberScrollState()
 
     // 获取当前路由状态
     val navBackStackEntry by navController.currentBackStackEntryAsState()
@@ -92,30 +89,376 @@ fun HomeScreen(navController: NavHostController,generalViewModel: GeneralViewMod
             contentScale = ContentScale.FillWidth,
             modifier = Modifier.fillMaxWidth()
         )
-        Column (
+        LazyColumn (
             modifier = Modifier
                 .fillMaxWidth()
-                .wrapContentHeight()
+                .weight(1f)
                 .offset(y = (-17).dp)
                 .padding(bottom = 56.dp)
                 .background(
                     color = Color.White,
                     shape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
                 )
-                .verticalScroll(scrollState)
         ){
-            val uniVersionConfig = PreferenceUtil.getUserConfig()?.config?.uniVersionEntity
-            if(uniVersionConfig?.isNotEmpty() == true){
-                val uniVersionSize = uniVersionConfig.size
-                //模拟器
+            val homeIconConfig = PreferenceUtil.getUserConfig()?.config?.homeIconEntity
+            //大于9时，每排展示3个，否则每排展示4个
+            val columnsCount = if((homeIconConfig?.size?:0) >= 9){ 3 }else{ 4 }
+            val rows = homeIconConfig?.chunked(columnsCount)?:emptyList()
+
+            item {
+                //通过配置展示-AD1(模拟器)
+                val uniVersionConfig = PreferenceUtil.getUserConfig()?.config?.uniVersionEntity
+                if(uniVersionConfig?.isNotEmpty() == true){
+                    val uniVersionSize = uniVersionConfig.size
+                    //模拟器
+                    Image(
+                        painter = painterResource(id = R.mipmap.ic_home_title_0_mock),
+                        contentDescription = null,
+                        contentScale = ContentScale.Crop,
+                        modifier = Modifier
+                            .wrapContentWidth()
+                            .padding(start = 16.dp, end = 16.dp, top = 12.dp)
+                    )
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(start = 16.dp, end = 16.dp, top = 12.dp)
+                    ){
+                        Box(
+                            modifier = Modifier
+                                .wrapContentWidth()
+                                .weight(1f)
+                                .clickable(
+                                    indication = null,
+                                    interactionSource = remember { MutableInteractionSource() }
+                                ) {
+                                    // 处理点击事件
+                                    Toast.makeText(context, "微信模拟器", Toast.LENGTH_SHORT).show()
+                                }
+                        ) {
+                            AsyncImage(
+                                model = uniVersionConfig[0].icon,
+                                contentDescription = "微信模拟器图标",
+                                contentScale = ContentScale.FillWidth,
+                                modifier = Modifier.fillMaxWidth().aspectRatio(168/96f),
+                                fallback = painterResource(id = R.mipmap.ic_wx_mock),
+                                error = painterResource(id = R.mipmap.ic_wx_mock)
+                            )
+
+                        }
+                        Box(modifier = Modifier.width(7.dp))
+                        Box(
+                            modifier = Modifier
+                                .wrapContentWidth()
+                                .weight(1f)
+                                .clickable(
+                                    indication = null,
+                                    interactionSource = remember { MutableInteractionSource() }
+                                ) {
+                                    // 处理点击事件
+                                    Toast.makeText(context, "支付宝模拟器", Toast.LENGTH_SHORT).show()
+                                }
+                        ) {
+                            if(uniVersionSize>1){
+                                AsyncImage(
+                                    model = uniVersionConfig[1].icon,
+                                    contentDescription = "支付宝模拟器",
+                                    contentScale = ContentScale.FillWidth,
+                                    modifier = Modifier.fillMaxWidth().aspectRatio(168/96f),
+                                    fallback = painterResource(id = R.mipmap.ic_alipay_mock),
+                                    error = painterResource(id = R.mipmap.ic_alipay_mock)
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+            items(rows) {rowItems ->
+                //通过配置展示-AD2
+                Row(Modifier.fillMaxWidth()) {
+                    for (item in rowItems) {
+                        Box(Modifier.weight(1f)) {
+                            Column {
+                                Box(modifier = Modifier.fillMaxWidth().height(8.dp))
+                                AsyncImage(
+                                    model = item.icon,
+                                    contentDescription = item.text,
+                                    contentScale = ContentScale.FillWidth,
+                                    modifier = Modifier.width(48.dp).aspectRatio(48/48f).align(Alignment.CenterHorizontally),
+                                    fallback = painterResource(id = R.mipmap.ic_alipay_mock),
+                                    error = painterResource(id = R.mipmap.ic_alipay_mock)
+                                )
+                                Text(
+                                    text = item.text,
+                                    fontSize = 12.sp,
+                                    fontWeight = FontWeight.Normal,
+                                    color = Color(0xFF1A1A1A),
+                                    modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally)
+                                )
+                            }
+                        }
+                    }
+                    // 如果最后一行不满，填充空白占位
+                    if (rowItems.size < columnsCount) {
+                        Spacer(Modifier.weight((columnsCount - rowItems.size).toFloat()))
+                    }
+                }
+            }
+            item {
+                //选尺寸制作
                 Image(
-                    painter = painterResource(id = R.mipmap.ic_home_title_0_mock),
+                    painter = painterResource(id = R.mipmap.ic_home_title_1_size),
                     contentDescription = null,
                     contentScale = ContentScale.Crop,
                     modifier = Modifier
                         .wrapContentWidth()
                         .padding(start = 16.dp, end = 16.dp, top = 12.dp)
                 )
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(start = 16.dp, end = 16.dp, top = 12.dp)
+                ) {
+                    Box(
+                        modifier = Modifier
+                            .wrapContentWidth()
+                            .weight(1f)
+                            .clickable(
+                                indication = null,
+                                interactionSource = remember { MutableInteractionSource() }
+                            ) {
+                                // 隐藏TabBar
+                                generalViewModel.setNavigationBarVisible(false)
+                                // 跳转抠图页面
+                                navController.apply {
+                                    currentBackStackEntry?.savedStateHandle?.set("width", 25f)
+                                    currentBackStackEntry?.savedStateHandle?.set("height", 35f)
+                                    navigate(ScreenRoute.Cutout.route)
+                                }
+                            }
+                    ){
+                        Image(
+                            painter = painterResource(id = R.mipmap.ic_home_size_bg),
+                            modifier = Modifier.fillMaxWidth().aspectRatio(166/68f),
+                            contentDescription = null,
+                        )
+
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .align(Alignment.Center)
+                        ) {
+                            Box(
+                                modifier = Modifier
+                                    .fillMaxWidth().weight(0.25f)
+                            )
+                            Column(
+                                modifier = Modifier.wrapContentSize().weight(0.75f)
+                            ) {
+                                Text(
+                                    text = "标准一寸",
+                                    fontSize = 14.sp,
+                                    fontWeight = FontWeight.Bold,
+                                    color = Color(0xFF1A1A1A),
+                                    modifier = Modifier.wrapContentSize()
+                                )
+                                Text(
+                                    text = "25x35mm",
+                                    fontSize = 10.sp,
+                                    fontWeight = FontWeight.Normal,
+                                    color = Color(0xFF767676),
+                                    modifier = Modifier.wrapContentSize()
+                                )
+                            }
+                        }
+                    }
+                    Box(
+                        modifier = Modifier
+                            .width(10.dp)
+                    )
+                    Box(
+                        modifier = Modifier
+                            .wrapContentWidth()
+                            .weight(1f)
+                            .clickable(
+                                indication = null,
+                                interactionSource = remember { MutableInteractionSource() }
+                            ) {
+                                // 隐藏TabBar
+                                generalViewModel.setNavigationBarVisible(false)
+                                // 跳转抠图页面
+                                navController.apply {
+                                    currentBackStackEntry?.savedStateHandle?.set("width", 22f)
+                                    currentBackStackEntry?.savedStateHandle?.set("height", 32f)
+                                    navigate(ScreenRoute.Cutout.route)
+                                }
+                            }
+                    ){
+                        Image(
+                            painter = painterResource(id = R.mipmap.ic_home_size_bg),
+                            modifier = Modifier.fillMaxWidth().aspectRatio(166/68f),
+                            contentDescription = null,
+                        )
+
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .align(Alignment.Center)
+                        ) {
+                            Box(
+                                modifier = Modifier
+                                    .fillMaxWidth().weight(0.25f)
+                            )
+                            Column(
+                                modifier = Modifier.wrapContentSize().weight(0.75f)
+                            ) {
+                                Text(
+                                    text = "小一寸",
+                                    fontSize = 14.sp,
+                                    fontWeight = FontWeight.Bold,
+                                    color = Color(0xFF1A1A1A),
+                                    modifier = Modifier.wrapContentSize()
+                                )
+                                Text(
+                                    text = "22x32mm",
+                                    fontSize = 10.sp,
+                                    fontWeight = FontWeight.Normal,
+                                    color = Color(0xFF767676),
+                                    modifier = Modifier.wrapContentSize()
+                                )
+                            }
+                        }
+                    }
+                }
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(start = 16.dp, end = 16.dp, top = 12.dp)
+                ) {
+                    Box(
+                        modifier = Modifier
+                            .wrapContentWidth()
+                            .weight(1f)
+                            .clickable(
+                                indication = null,
+                                interactionSource = remember { MutableInteractionSource() }
+                            ) {
+                                // 隐藏TabBar
+                                generalViewModel.setNavigationBarVisible(false)
+                                // 跳转抠图页面
+                                navController.apply {
+                                    currentBackStackEntry?.savedStateHandle?.set("width", 35f)
+                                    currentBackStackEntry?.savedStateHandle?.set("height", 53f)
+                                    navigate(ScreenRoute.Cutout.route)
+                                }
+                            }
+                    ){
+                        Image(
+                            painter = painterResource(id = R.mipmap.ic_home_size_bg),
+                            modifier = Modifier.fillMaxWidth().aspectRatio(166/68f),
+                            contentDescription = null,
+                        )
+
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .align(Alignment.Center)
+                        ) {
+                            Box(
+                                modifier = Modifier
+                                    .fillMaxWidth().weight(0.25f)
+                            )
+                            Column(
+                                modifier = Modifier.wrapContentSize().weight(0.75f)
+                            ) {
+                                Text(
+                                    text = "标准二寸",
+                                    fontSize = 14.sp,
+                                    fontWeight = FontWeight.Bold,
+                                    color = Color(0xFF1A1A1A),
+                                    modifier = Modifier.wrapContentSize()
+                                )
+                                Text(
+                                    text = "35x53mm",
+                                    fontSize = 10.sp,
+                                    fontWeight = FontWeight.Normal,
+                                    color = Color(0xFF767676),
+                                    modifier = Modifier.wrapContentSize()
+                                )
+                            }
+
+                        }
+                    }
+                    Box(
+                        modifier = Modifier
+                            .width(10.dp)
+                    )
+                    Box(
+                        modifier = Modifier
+                            .wrapContentWidth()
+                            .weight(1f)
+                            .clickable(
+                                indication = null,
+                                interactionSource = remember { MutableInteractionSource() }
+                            ) {
+                                // 隐藏TabBar
+                                generalViewModel.setNavigationBarVisible(false)
+                                // 跳转抠图页面
+                                navController.apply {
+                                    currentBackStackEntry?.savedStateHandle?.set("width", 33f)
+                                    currentBackStackEntry?.savedStateHandle?.set("height", 48f)
+                                    navigate(ScreenRoute.Cutout.route)
+                                }
+                            }
+                    ){
+                        Image(
+                            painter = painterResource(id = R.mipmap.ic_home_size_bg),
+                            modifier = Modifier.fillMaxWidth().aspectRatio(166/68f),
+                            contentDescription = null,
+                        )
+
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .align(Alignment.Center)
+                        ) {
+                            Box(
+                                modifier = Modifier
+                                    .fillMaxWidth().weight(0.25f)
+                            )
+                            Column(
+                                modifier = Modifier.wrapContentSize().weight(0.75f)
+                            ) {
+                                Text(
+                                    text = "小二寸",
+                                    fontSize = 14.sp,
+                                    fontWeight = FontWeight.Bold,
+                                    color = Color(0xFF1A1A1A),
+                                    modifier = Modifier.wrapContentSize()
+                                )
+                                Text(
+                                    text = "33x48mm",
+                                    fontSize = 10.sp,
+                                    fontWeight = FontWeight.Normal,
+                                    color = Color(0xFF767676),
+                                    modifier = Modifier.wrapContentSize()
+                                )
+                            }
+
+                        }
+                    }
+                }
+            }
+            item {
+                //选证件制作
+                Image(
+                    painter = painterResource(id = R.mipmap.ic_home_title_2_certificate),
+                    contentDescription = null,
+                    contentScale = ContentScale.Crop,
+                    modifier = Modifier
+                        .wrapContentWidth()
+                        .padding(start = 16.dp, end = 16.dp, top = 18.dp)
+                )
                 Row(
                     modifier = Modifier
                         .fillMaxWidth()
@@ -129,21 +472,49 @@ fun HomeScreen(navController: NavHostController,generalViewModel: GeneralViewMod
                                 indication = null,
                                 interactionSource = remember { MutableInteractionSource() }
                             ) {
-                                // 处理点击事件
-                                Toast.makeText(context, "微信模拟器", Toast.LENGTH_SHORT).show()
+                                // 隐藏TabBar
+                                generalViewModel.setNavigationBarVisible(false)
+                                // 跳转抠图页面
+                                navController.apply {
+                                    currentBackStackEntry?.savedStateHandle?.set("width", 26f)
+                                    currentBackStackEntry?.savedStateHandle?.set("height", 32f)
+                                    navigate(ScreenRoute.Cutout.route)
+                                }
                             }
                     ) {
-                        AsyncImage(
-                            model = uniVersionConfig[0].icon,
-                            contentDescription = "微信模拟器图标",
-                            contentScale = ContentScale.FillWidth,
-                            modifier = Modifier.fillMaxWidth().aspectRatio(168/96f),
-                            fallback = painterResource(id = R.mipmap.ic_wx_mock),
-                            error = painterResource(id = R.mipmap.ic_wx_mock)
+                        Image(
+                            painter = painterResource(id = R.mipmap.ic_home_certificate_bg),
+                            modifier = Modifier.fillMaxWidth().aspectRatio(80f/50f),
+                            contentDescription = null,
                         )
 
+                        Column(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .align(Alignment.Center)
+                        ) {
+                            Text(
+                                text = "身份证",
+                                fontSize = 12.sp,
+                                fontWeight = FontWeight.Bold,
+                                color = Color(0xFF1A1A1A),
+                                lineHeight = 12.sp,
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally)
+                            )
+                            Text(
+                                text = "26x32mm",
+                                fontSize = 10.sp,
+                                fontWeight = FontWeight.Normal,
+                                lineHeight = 10.sp,
+                                color = Color(0xFFAAAAAA),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally)
+                            )
+                        }
                     }
-                    Box(modifier = Modifier.width(7.dp))
+                    Box(
+                        modifier = Modifier
+                            .width(8.dp)
+                    )
                     Box(
                         modifier = Modifier
                             .wrapContentWidth()
@@ -152,823 +523,536 @@ fun HomeScreen(navController: NavHostController,generalViewModel: GeneralViewMod
                                 indication = null,
                                 interactionSource = remember { MutableInteractionSource() }
                             ) {
-                                // 处理点击事件
-                                Toast.makeText(context, "支付宝模拟器", Toast.LENGTH_SHORT).show()
+                                // 隐藏TabBar
+                                generalViewModel.setNavigationBarVisible(false)
+                                // 跳转抠图页面
+                                navController.apply {
+                                    currentBackStackEntry?.savedStateHandle?.set("width", 33f)
+                                    currentBackStackEntry?.savedStateHandle?.set("height", 48f)
+                                    navigate(ScreenRoute.Cutout.route)
+                                }
                             }
                     ) {
-                        if(uniVersionSize>1){
-                            AsyncImage(
-                                model = uniVersionConfig[1].icon,
-                                contentDescription = "支付宝模拟器",
-                                contentScale = ContentScale.FillWidth,
-                                modifier = Modifier.fillMaxWidth().aspectRatio(168/96f),
-                                fallback = painterResource(id = R.mipmap.ic_alipay_mock),
-                                error = painterResource(id = R.mipmap.ic_alipay_mock)
+                        Image(
+                            painter = painterResource(id = R.mipmap.ic_home_certificate_bg),
+                            modifier = Modifier.fillMaxWidth().aspectRatio(80f/50f),
+                            contentDescription = null,
+                        )
+
+                        Column(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .align(Alignment.Center)
+                        ) {
+                            Text(
+                                text = "护照",
+                                fontSize = 12.sp,
+                                fontWeight = FontWeight.Bold,
+                                lineHeight = 12.sp,
+                                color = Color(0xFF1A1A1A),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally)
+                            )
+                            Text(
+                                text = "33x48mm",
+                                fontSize = 10.sp,
+                                fontWeight = FontWeight.Normal,
+                                lineHeight = 10.sp,
+                                color = Color(0xFFAAAAAA),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally)
+                            )
+                        }
+                    }
+                    Box(
+                        modifier = Modifier
+                            .width(8.dp)
+                    )
+                    Box(
+                        modifier = Modifier
+                            .wrapContentWidth()
+                            .weight(1f)
+                            .clickable(
+                                indication = null,
+                                interactionSource = remember { MutableInteractionSource() }
+                            ) {
+                                // 隐藏TabBar
+                                generalViewModel.setNavigationBarVisible(false)
+                                // 跳转抠图页面
+                                navController.apply {
+                                    currentBackStackEntry?.savedStateHandle?.set("width", 22f)
+                                    currentBackStackEntry?.savedStateHandle?.set("height", 32f)
+                                    navigate(ScreenRoute.Cutout.route)
+                                }
+                            }
+                    ) {
+                        Image(
+                            painter = painterResource(id = R.mipmap.ic_home_certificate_bg),
+                            modifier = Modifier.fillMaxWidth().aspectRatio(80f/50f),
+                            contentDescription = null,
+                        )
+
+                        Column(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .align(Alignment.Center)
+                        ) {
+                            Text(
+                                text = "驾驶证",
+                                fontSize = 12.sp,
+                                fontWeight = FontWeight.Bold,
+                                lineHeight = 12.sp,
+                                color = Color(0xFF1A1A1A),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally)
+                            )
+                            Text(
+                                text = "22x32mm",
+                                fontSize = 10.sp,
+                                fontWeight = FontWeight.Normal,
+                                lineHeight = 10.sp,
+                                color = Color(0xFFAAAAAA),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally)
+                            )
+                        }
+                    }
+                    Box(
+                        modifier = Modifier
+                            .width(8.dp)
+                    )
+                    Box(
+                        modifier = Modifier
+                            .wrapContentWidth()
+                            .weight(1f)
+                            .clickable(
+                                indication = null,
+                                interactionSource = remember { MutableInteractionSource() }
+                            ) {
+                                // 隐藏TabBar
+                                generalViewModel.setNavigationBarVisible(false)
+                                // 跳转抠图页面
+                                navController.apply {
+                                    currentBackStackEntry?.savedStateHandle?.set("width", 26f)
+                                    currentBackStackEntry?.savedStateHandle?.set("height", 32f)
+                                    navigate(ScreenRoute.Cutout.route)
+                                }
+                            }
+                    ) {
+                        Image(
+                            painter = painterResource(id = R.mipmap.ic_home_certificate_bg),
+                            modifier = Modifier.fillMaxWidth().aspectRatio(80f/50f),
+                            contentDescription = null,
+                        )
+
+                        Column(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .align(Alignment.Center)
+                        ) {
+                            Text(
+                                text = "社保卡",
+                                fontSize = 12.sp,
+                                fontWeight = FontWeight.Bold,
+                                lineHeight = 12.sp,
+                                color = Color(0xFF1A1A1A),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally)
+                            )
+                            Text(
+                                text = "26x32mm",
+                                fontSize = 10.sp,
+                                fontWeight = FontWeight.Normal,
+                                lineHeight = 10.sp,
+                                color = Color(0xFFAAAAAA),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally)
+                            )
+                        }
+                    }
+
+                }
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(start = 16.dp, end = 16.dp, top = 12.dp)
+                ){
+                    Box(
+                        modifier = Modifier
+                            .wrapContentWidth()
+                            .weight(1f)
+                            .clickable(
+                                indication = null,
+                                interactionSource = remember { MutableInteractionSource() }
+                            ) {
+                                // 隐藏TabBar
+                                generalViewModel.setNavigationBarVisible(false)
+                                // 跳转抠图页面
+                                navController.apply {
+                                    currentBackStackEntry?.savedStateHandle?.set("width", 26f)
+                                    currentBackStackEntry?.savedStateHandle?.set("height", 32f)
+                                    navigate(ScreenRoute.Cutout.route)
+                                }
+                            }
+                    ) {
+                        Image(
+                            painter = painterResource(id = R.mipmap.ic_home_certificate_bg),
+                            modifier = Modifier.fillMaxWidth().aspectRatio(80f/50f),
+                            contentDescription = null,
+                        )
+
+                        Column(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .align(Alignment.Center)
+                        ) {
+                            Text(
+                                text = "四六级",
+                                fontSize = 12.sp,
+                                fontWeight = FontWeight.Bold,
+                                lineHeight = 12.sp,
+                                color = Color(0xFF1A1A1A),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally)
+                            )
+                            Text(
+                                text = "26x32mm",
+                                fontSize = 10.sp,
+                                fontWeight = FontWeight.Normal,
+                                lineHeight = 10.sp,
+                                color = Color(0xFFAAAAAA),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally)
+                            )
+                        }
+                    }
+                    Box(
+                        modifier = Modifier
+                            .width(8.dp)
+                    )
+                    Box(
+                        modifier = Modifier
+                            .wrapContentWidth()
+                            .weight(1f)
+                            .clickable(
+                                indication = null,
+                                interactionSource = remember { MutableInteractionSource() }
+                            ) {
+                                // 隐藏TabBar
+                                generalViewModel.setNavigationBarVisible(false)
+                                // 跳转抠图页面
+                                navController.apply {
+                                    currentBackStackEntry?.savedStateHandle?.set("width", 33f)
+                                    currentBackStackEntry?.savedStateHandle?.set("height", 48f)
+                                    navigate(ScreenRoute.Cutout.route)
+                                }
+                            }
+                    ) {
+                        Image(
+                            painter = painterResource(id = R.mipmap.ic_home_certificate_bg),
+                            modifier = Modifier.fillMaxWidth().aspectRatio(80f/50f),
+                            contentDescription = null,
+                        )
+
+                        Column(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .align(Alignment.Center)
+                        ) {
+                            Text(
+                                text = "司法考试",
+                                fontSize = 12.sp,
+                                fontWeight = FontWeight.Bold,
+                                lineHeight = 12.sp,
+                                color = Color(0xFF1A1A1A),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally)
+                            )
+                            Text(
+                                text = "33x48mm",
+                                fontSize = 10.sp,
+                                fontWeight = FontWeight.Normal,
+                                lineHeight = 10.sp,
+                                color = Color(0xFFAAAAAA),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally)
+                            )
+                        }
+                    }
+                    Box(
+                        modifier = Modifier
+                            .width(8.dp)
+                    )
+                    Box(
+                        modifier = Modifier
+                            .wrapContentWidth()
+                            .weight(1f)
+                            .clickable(
+                                indication = null,
+                                interactionSource = remember { MutableInteractionSource() }
+                            ) {
+                                // 隐藏TabBar
+                                generalViewModel.setNavigationBarVisible(false)
+                                // 跳转抠图页面
+                                navController.apply {
+                                    currentBackStackEntry?.savedStateHandle?.set("width", 40f)
+                                    currentBackStackEntry?.savedStateHandle?.set("height", 60f)
+                                    navigate(ScreenRoute.Cutout.route)
+                                }
+                            }
+                    ) {
+                        Image(
+                            painter = painterResource(id = R.mipmap.ic_home_certificate_bg),
+                            modifier = Modifier.fillMaxWidth().aspectRatio(80f/50f),
+                            contentDescription = null,
+                        )
+
+                        Column(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .align(Alignment.Center)
+                        ) {
+                            Text(
+                                text = "结婚证",
+                                fontSize = 12.sp,
+                                fontWeight = FontWeight.Bold,
+                                lineHeight = 12.sp,
+                                color = Color(0xFF1A1A1A),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally)
+                            )
+                            Text(
+                                text = "40x60mm",
+                                fontSize = 10.sp,
+                                fontWeight = FontWeight.Normal,
+                                lineHeight = 10.sp,
+                                color = Color(0xFFAAAAAA),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally)
+                            )
+                        }
+                    }
+                    Box(
+                        modifier = Modifier
+                            .width(8.dp)
+                    )
+                    Box(
+                        modifier = Modifier
+                            .wrapContentWidth()
+                            .weight(1f)
+                            .clickable(
+                                indication = null,
+                                interactionSource = remember { MutableInteractionSource() }
+                            ) {
+                                // 隐藏TabBar
+                                generalViewModel.setNavigationBarVisible(false)
+                                // 跳转抠图页面
+                                navController.apply {
+                                    currentBackStackEntry?.savedStateHandle?.set("width", 35f)
+                                    currentBackStackEntry?.savedStateHandle?.set("height", 45f)
+                                    navigate(ScreenRoute.Cutout.route)
+                                }
+                            }
+                    ) {
+                        Image(
+                            painter = painterResource(id = R.mipmap.ic_home_certificate_bg),
+                            modifier = Modifier.fillMaxWidth().aspectRatio(80f/50f),
+                            contentDescription = null,
+                        )
+
+                        Column(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .align(Alignment.Center)
+                        ) {
+                            Text(
+                                text = "中国签证",
+                                fontSize = 12.sp,
+                                fontWeight = FontWeight.Bold,
+                                lineHeight = 12.sp,
+                                color = Color(0xFF1A1A1A),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally)
+                            )
+                            Text(
+                                text = "35x45mm",
+                                fontSize = 10.sp,
+                                fontWeight = FontWeight.Normal,
+                                lineHeight = 10.sp,
+                                color = Color(0xFFAAAAAA),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally)
                             )
                         }
                     }
                 }
             }
-
-            //选尺寸制作
-            Image(
-                painter = painterResource(id = R.mipmap.ic_home_title_1_size),
-                contentDescription = null,
-                contentScale = ContentScale.Crop,
-                modifier = Modifier
-                    .wrapContentWidth()
-                    .padding(start = 16.dp, end = 16.dp, top = 12.dp)
-            )
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(start = 16.dp, end = 16.dp, top = 12.dp)
-            ) {
-                Box(
+            item {
+                //其他
+                Image(
+                    painter = painterResource(id = R.mipmap.ic_home_title_3_other),
+                    contentDescription = null,
+                    contentScale = ContentScale.Crop,
                     modifier = Modifier
                         .wrapContentWidth()
-                        .weight(1f)
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() }
-                        ) {
-                            // 隐藏TabBar
-                            generalViewModel.setNavigationBarVisible(false)
-                            // 跳转抠图页面
-                            navController.apply {
-                                currentBackStackEntry?.savedStateHandle?.set("width", 25f)
-                                currentBackStackEntry?.savedStateHandle?.set("height", 35f)
-                                navigate(ScreenRoute.Cutout.route)
-                            }
-                        }
+                        .padding(start = 16.dp, end = 16.dp, top = 18.dp)
+                )
+
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(start = 16.dp, end = 16.dp, top = 12.dp)
                 ){
-                    Image(
-                        painter = painterResource(id = R.mipmap.ic_home_size_bg),
-                        modifier = Modifier.fillMaxWidth().aspectRatio(166/68f),
-                        contentDescription = null,
-                    )
-
-                    Column(
+                    Box(
                         modifier = Modifier
-                            .wrapContentSize()
-                            .padding(start = 8.dp)
-                            .align(Alignment.Center)
-                    ) {
-                        Text(
-                            text = "标准一寸",
-                            fontSize = 14.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = Color(0xFF1A1A1A),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                        Text(
-                            text = "25x35mm",
-                            fontSize = 10.sp,
-                            fontWeight = FontWeight.Normal,
-                            color = Color(0xFF767676),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                    }
-                }
-                Box(
-                    modifier = Modifier
-                        .width(10.dp)
-                )
-                Box(
-                    modifier = Modifier
-                        .wrapContentWidth()
-                        .weight(1f)
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() }
-                        ) {
-                            // 隐藏TabBar
-                            generalViewModel.setNavigationBarVisible(false)
-                            // 跳转抠图页面
-                            navController.apply {
-                                currentBackStackEntry?.savedStateHandle?.set("width", 22f)
-                                currentBackStackEntry?.savedStateHandle?.set("height", 32f)
-                                navigate(ScreenRoute.Cutout.route)
+                            .wrapContentWidth()
+                            .weight(1f)
+                            .clickable(
+                                indication = null,
+                                interactionSource = remember { MutableInteractionSource() }
+                            ) {
+                                // 隐藏TabBar
+                                generalViewModel.setNavigationBarVisible(false)
+                                // 跳转格式页面
+                                navController.navigate(ScreenRoute.LongImage.route)
                             }
-                        }
-                ){
-                    Image(
-                        painter = painterResource(id = R.mipmap.ic_home_size_bg),
-                        modifier = Modifier.fillMaxWidth().aspectRatio(166/68f),
-                        contentDescription = null,
-                    )
-
-                    Column(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .padding(start = 8.dp)
-                            .align(Alignment.Center)
                     ) {
-                        Text(
-                            text = "小一寸",
-                            fontSize = 14.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = Color(0xFF1A1A1A),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                        Text(
-                            text = "22x32mm",
-                            fontSize = 10.sp,
-                            fontWeight = FontWeight.Normal,
-                            color = Color(0xFF767676),
-                            modifier = Modifier.wrapContentSize()
-                        )
+
+                        Column(
+                            modifier = Modifier
+                                .wrapContentSize()
+                                .padding(start = 8.dp)
+                                .align(Alignment.Center)
+                        ) {
+                            Image(
+                                painter = painterResource(id = R.mipmap.ic_home_other_1_puzzle),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally),
+                                contentDescription = null,
+                            )
+
+                            Text(
+                                text = "拼长图",
+                                fontSize = 12.sp,
+                                fontWeight = FontWeight.Bold,
+                                color = Color(0xFF1A1A1A),
+                                modifier = Modifier.wrapContentSize().padding(top = 12.dp).align(Alignment.CenterHorizontally)
+                            )
+                        }
                     }
+                    Box(
+                        modifier = Modifier
+                            .width(8.dp)
+                    )
+                    Box(
+                        modifier = Modifier
+                            .wrapContentWidth()
+                            .weight(1f)
+                            .clickable(
+                                indication = null,
+                                interactionSource = remember { MutableInteractionSource() }
+                            ) {
+                                // 隐藏TabBar
+                                generalViewModel.setNavigationBarVisible(false)
+                                // 跳转格式页面
+                                navController.navigate(ScreenRoute.Format.route)
+                            }
+                    ) {
+                        Column(
+                            modifier = Modifier
+                                .wrapContentSize()
+                                .padding(start = 8.dp)
+                                .align(Alignment.Center)
+                        ) {
+                            Image(
+                                painter = painterResource(id = R.mipmap.ic_home_other_2_format),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally),
+                                contentDescription = null,
+                            )
+
+                            Text(
+                                text = "格式转换",
+                                fontSize = 12.sp,
+                                fontWeight = FontWeight.Bold,
+                                color = Color(0xFF1A1A1A),
+                                modifier = Modifier.wrapContentSize().padding(top = 12.dp).align(Alignment.CenterHorizontally)
+                            )
+                        }
+                    }
+                    Box(
+                        modifier = Modifier
+                            .width(8.dp)
+                    )
+                    Box(
+                        modifier = Modifier
+                            .wrapContentWidth()
+                            .weight(1f)
+                            .clickable(
+                                indication = null,
+                                interactionSource = remember { MutableInteractionSource() }
+                            ) {
+                                // 隐藏TabBar
+                                generalViewModel.setNavigationBarVisible(false)
+                                // 跳转证件页面
+                                navController.apply {
+                                    currentBackStackEntry?.savedStateHandle?.set("width", 25f)
+                                    currentBackStackEntry?.savedStateHandle?.set("height", 35f)
+                                    navigate(ScreenRoute.Resize.route)
+                                }
+                            }
+                    ) {
+                        Column(
+                            modifier = Modifier
+                                .wrapContentSize()
+                                .padding(start = 8.dp)
+                                .align(Alignment.Center)
+                        ) {
+                            Image(
+                                painter = painterResource(id = R.mipmap.ic_home_other_3_size),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally),
+                                contentDescription = null,
+                            )
+
+                            Text(
+                                text = "改尺寸",
+                                fontSize = 12.sp,
+                                fontWeight = FontWeight.Bold,
+                                color = Color(0xFF1A1A1A),
+                                modifier = Modifier.wrapContentSize().padding(top = 12.dp).align(Alignment.CenterHorizontally)
+                            )
+                        }
+                    }
+                    Box(
+                        modifier = Modifier
+                            .width(8.dp)
+                    )
+                    Box(
+                        modifier = Modifier
+                            .wrapContentWidth()
+                            .weight(1f)
+                            .clickable(
+                                indication = null,
+                                interactionSource = remember { MutableInteractionSource() }
+                            ) {
+                                // 隐藏TabBar
+                                generalViewModel.setNavigationBarVisible(false)
+                                // 跳转拍照指南页面
+                                navController.navigate(ScreenRoute.CameraGuide.route)
+                            }
+                    ) {
+                        Column(
+                            modifier = Modifier
+                                .wrapContentSize()
+                                .padding(start = 8.dp)
+                                .align(Alignment.Center)
+                        ) {
+                            Image(
+                                painter = painterResource(id = R.mipmap.ic_home_other_4_camera),
+                                modifier = Modifier.wrapContentSize().align(Alignment.CenterHorizontally),
+                                contentDescription = null,
+                            )
+
+                            Text(
+                                text = "拍照指南",
+                                fontSize = 12.sp,
+                                fontWeight = FontWeight.Bold,
+                                color = Color(0xFF1A1A1A),
+                                modifier = Modifier.wrapContentSize().padding(top = 12.dp).align(Alignment.CenterHorizontally)
+                            )
+                        }
+                    }
+
                 }
+                Box(
+                    modifier = Modifier.fillMaxWidth().height(56.dp)
+                )
             }
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(start = 16.dp, end = 16.dp, top = 12.dp)
-            ) {
-                Box(
-                    modifier = Modifier
-                        .wrapContentWidth()
-                        .weight(1f)
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() }
-                        ) {
-                            // 隐藏TabBar
-                            generalViewModel.setNavigationBarVisible(false)
-                            // 跳转抠图页面
-                            navController.apply {
-                                currentBackStackEntry?.savedStateHandle?.set("width", 35f)
-                                currentBackStackEntry?.savedStateHandle?.set("height", 53f)
-                                navigate(ScreenRoute.Cutout.route)
-                            }
-                        }
-                ){
-                    Image(
-                        painter = painterResource(id = R.mipmap.ic_home_size_bg),
-                        modifier = Modifier.fillMaxWidth().aspectRatio(166/68f),
-                        contentDescription = null,
-                    )
-
-                    Column(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .padding(start = 8.dp)
-                            .align(Alignment.Center)
-                    ) {
-                        Text(
-                            text = "标准二寸",
-                            fontSize = 14.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = Color(0xFF1A1A1A),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                        Text(
-                            text = "35x53mm",
-                            fontSize = 10.sp,
-                            fontWeight = FontWeight.Normal,
-                            color = Color(0xFF767676),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                    }
-                }
-                Box(
-                    modifier = Modifier
-                        .width(10.dp)
-                )
-                Box(
-                    modifier = Modifier
-                        .wrapContentWidth()
-                        .weight(1f)
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() }
-                        ) {
-                            // 隐藏TabBar
-                            generalViewModel.setNavigationBarVisible(false)
-                            // 跳转抠图页面
-                            navController.apply {
-                                currentBackStackEntry?.savedStateHandle?.set("width", 33f)
-                                currentBackStackEntry?.savedStateHandle?.set("height", 48f)
-                                navigate(ScreenRoute.Cutout.route)
-                            }
-                        }
-                ){
-                    Image(
-                        painter = painterResource(id = R.mipmap.ic_home_size_bg),
-                        modifier = Modifier.fillMaxWidth().aspectRatio(166/68f),
-                        contentDescription = null,
-                    )
-
-                    Column(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .padding(start = 8.dp)
-                            .align(Alignment.Center)
-                    ) {
-                        Text(
-                            text = "小二寸",
-                            fontSize = 14.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = Color(0xFF1A1A1A),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                        Text(
-                            text = "33x48mm",
-                            fontSize = 10.sp,
-                            fontWeight = FontWeight.Normal,
-                            color = Color(0xFF767676),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                    }
-                }
-            }
-
-
-            //证据制作
-            Image(
-                painter = painterResource(id = R.mipmap.ic_home_title_2_certificate),
-                contentDescription = null,
-                contentScale = ContentScale.Crop,
-                modifier = Modifier
-                    .wrapContentWidth()
-                    .padding(start = 16.dp, end = 16.dp, top = 18.dp)
-            )
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(start = 16.dp, end = 16.dp, top = 12.dp)
-            ){
-                Box(
-                    modifier = Modifier
-                        .wrapContentWidth()
-                        .weight(1f)
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() }
-                        ) {
-                            // 隐藏TabBar
-                            generalViewModel.setNavigationBarVisible(false)
-                            // 跳转抠图页面
-                            navController.apply {
-                                currentBackStackEntry?.savedStateHandle?.set("width", 26f)
-                                currentBackStackEntry?.savedStateHandle?.set("height", 32f)
-                                navigate(ScreenRoute.Cutout.route)
-                            }
-                        }
-                ) {
-                    Image(
-                        painter = painterResource(id = R.mipmap.ic_home_certificate_bg),
-                        contentDescription = null,
-                    )
-
-                    Column(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .padding(start = 8.dp)
-                            .align(Alignment.Center)
-                    ) {
-                        Text(
-                            text = "身份证",
-                            fontSize = 12.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = Color(0xFF1A1A1A),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                        Text(
-                            text = "26x32mm",
-                            fontSize = 10.sp,
-                            fontWeight = FontWeight.Normal,
-                            color = Color(0xFFAAAAAA),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                    }
-                }
-                Box(
-                    modifier = Modifier
-                        .width(8.dp)
-                )
-                Box(
-                    modifier = Modifier
-                        .wrapContentWidth()
-                        .weight(1f)
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() }
-                        ) {
-                            // 隐藏TabBar
-                            generalViewModel.setNavigationBarVisible(false)
-                            // 跳转抠图页面
-                            navController.apply {
-                                currentBackStackEntry?.savedStateHandle?.set("width", 33f)
-                                currentBackStackEntry?.savedStateHandle?.set("height", 48f)
-                                navigate(ScreenRoute.Cutout.route)
-                            }
-                        }
-                ) {
-                    Image(
-                        painter = painterResource(id = R.mipmap.ic_home_certificate_bg),
-                        contentDescription = null,
-                    )
-
-                    Column(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .padding(start = 8.dp)
-                            .align(Alignment.Center)
-                    ) {
-                        Text(
-                            text = "护照",
-                            fontSize = 12.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = Color(0xFF1A1A1A),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                        Text(
-                            text = "33x48mm",
-                            fontSize = 10.sp,
-                            fontWeight = FontWeight.Normal,
-                            color = Color(0xFFAAAAAA),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                    }
-                }
-                Box(
-                    modifier = Modifier
-                        .width(8.dp)
-                )
-                Box(
-                    modifier = Modifier
-                        .wrapContentWidth()
-                        .weight(1f)
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() }
-                        ) {
-                            // 隐藏TabBar
-                            generalViewModel.setNavigationBarVisible(false)
-                            // 跳转抠图页面
-                            navController.apply {
-                                currentBackStackEntry?.savedStateHandle?.set("width", 22f)
-                                currentBackStackEntry?.savedStateHandle?.set("height", 32f)
-                                navigate(ScreenRoute.Cutout.route)
-                            }
-                        }
-                ) {
-                    Image(
-                        painter = painterResource(id = R.mipmap.ic_home_certificate_bg),
-                        contentDescription = null,
-                    )
-
-                    Column(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .padding(start = 8.dp)
-                            .align(Alignment.Center)
-                    ) {
-                        Text(
-                            text = "驾驶证",
-                            fontSize = 12.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = Color(0xFF1A1A1A),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                        Text(
-                            text = "22x32mm",
-                            fontSize = 10.sp,
-                            fontWeight = FontWeight.Normal,
-                            color = Color(0xFFAAAAAA),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                    }
-                }
-                Box(
-                    modifier = Modifier
-                        .width(8.dp)
-                )
-                Box(
-                    modifier = Modifier
-                        .wrapContentWidth()
-                        .weight(1f)
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() }
-                        ) {
-                            // 隐藏TabBar
-                            generalViewModel.setNavigationBarVisible(false)
-                            // 跳转抠图页面
-                            navController.apply {
-                                currentBackStackEntry?.savedStateHandle?.set("width", 26f)
-                                currentBackStackEntry?.savedStateHandle?.set("height", 32f)
-                                navigate(ScreenRoute.Cutout.route)
-                            }
-                        }
-                ) {
-                    Image(
-                        painter = painterResource(id = R.mipmap.ic_home_certificate_bg),
-                        contentDescription = null,
-                    )
-
-                    Column(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .padding(start = 8.dp)
-                            .align(Alignment.Center)
-                    ) {
-                        Text(
-                            text = "社保卡",
-                            fontSize = 12.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = Color(0xFF1A1A1A),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                        Text(
-                            text = "26x32mm",
-                            fontSize = 10.sp,
-                            fontWeight = FontWeight.Normal,
-                            color = Color(0xFFAAAAAA),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                    }
-                }
-
-            }
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(start = 16.dp, end = 16.dp, top = 12.dp)
-            ){
-                Box(
-                    modifier = Modifier
-                        .wrapContentWidth()
-                        .weight(1f)
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() }
-                        ) {
-                            // 隐藏TabBar
-                            generalViewModel.setNavigationBarVisible(false)
-                            // 跳转抠图页面
-                            navController.apply {
-                                currentBackStackEntry?.savedStateHandle?.set("width", 26f)
-                                currentBackStackEntry?.savedStateHandle?.set("height", 32f)
-                                navigate(ScreenRoute.Cutout.route)
-                            }
-                        }
-                ) {
-                    Image(
-                        painter = painterResource(id = R.mipmap.ic_home_certificate_bg),
-                        contentDescription = null,
-                    )
-
-                    Column(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .padding(start = 8.dp)
-                            .align(Alignment.Center)
-                    ) {
-                        Text(
-                            text = "四六级",
-                            fontSize = 12.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = Color(0xFF1A1A1A),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                        Text(
-                            text = "26x32mm",
-                            fontSize = 10.sp,
-                            fontWeight = FontWeight.Normal,
-                            color = Color(0xFFAAAAAA),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                    }
-                }
-                Box(
-                    modifier = Modifier
-                        .width(8.dp)
-                )
-                Box(
-                    modifier = Modifier
-                        .wrapContentWidth()
-                        .weight(1f)
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() }
-                        ) {
-                            // 隐藏TabBar
-                            generalViewModel.setNavigationBarVisible(false)
-                            // 跳转抠图页面
-                            navController.apply {
-                                currentBackStackEntry?.savedStateHandle?.set("width", 33f)
-                                currentBackStackEntry?.savedStateHandle?.set("height", 48f)
-                                navigate(ScreenRoute.Cutout.route)
-                            }
-                        }
-                ) {
-                    Image(
-                        painter = painterResource(id = R.mipmap.ic_home_certificate_bg),
-                        contentDescription = null,
-                    )
-
-                    Column(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .padding(start = 8.dp)
-                            .align(Alignment.Center)
-                    ) {
-                        Text(
-                            text = "司法考试",
-                            fontSize = 12.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = Color(0xFF1A1A1A),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                        Text(
-                            text = "33x48mm",
-                            fontSize = 10.sp,
-                            fontWeight = FontWeight.Normal,
-                            color = Color(0xFFAAAAAA),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                    }
-                }
-                Box(
-                    modifier = Modifier
-                        .width(8.dp)
-                )
-                Box(
-                    modifier = Modifier
-                        .wrapContentWidth()
-                        .weight(1f)
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() }
-                        ) {
-                            // 隐藏TabBar
-                            generalViewModel.setNavigationBarVisible(false)
-                            // 跳转抠图页面
-                            navController.apply {
-                                currentBackStackEntry?.savedStateHandle?.set("width", 40f)
-                                currentBackStackEntry?.savedStateHandle?.set("height", 60f)
-                                navigate(ScreenRoute.Cutout.route)
-                            }
-                        }
-                ) {
-                    Image(
-                        painter = painterResource(id = R.mipmap.ic_home_certificate_bg),
-                        contentDescription = null,
-                    )
-
-                    Column(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .padding(start = 8.dp)
-                            .align(Alignment.Center)
-                    ) {
-                        Text(
-                            text = "结婚证",
-                            fontSize = 12.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = Color(0xFF1A1A1A),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                        Text(
-                            text = "40x60mm",
-                            fontSize = 10.sp,
-                            fontWeight = FontWeight.Normal,
-                            color = Color(0xFFAAAAAA),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                    }
-                }
-                Box(
-                    modifier = Modifier
-                        .width(8.dp)
-                )
-                Box(
-                    modifier = Modifier
-                        .wrapContentWidth()
-                        .weight(1f)
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() }
-                        ) {
-                            // 隐藏TabBar
-                            generalViewModel.setNavigationBarVisible(false)
-                            // 跳转抠图页面
-                            navController.apply {
-                                currentBackStackEntry?.savedStateHandle?.set("width", 35f)
-                                currentBackStackEntry?.savedStateHandle?.set("height", 45f)
-                                navigate(ScreenRoute.Cutout.route)
-                            }
-                        }
-                ) {
-                    Image(
-                        painter = painterResource(id = R.mipmap.ic_home_certificate_bg),
-                        contentDescription = null,
-                    )
-
-                    Column(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .padding(start = 8.dp)
-                            .align(Alignment.Center)
-                    ) {
-                        Text(
-                            text = "中国签证",
-                            fontSize = 12.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = Color(0xFF1A1A1A),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                        Text(
-                            text = "35x45mm",
-                            fontSize = 10.sp,
-                            fontWeight = FontWeight.Normal,
-                            color = Color(0xFFAAAAAA),
-                            modifier = Modifier.wrapContentSize()
-                        )
-                    }
-                }
-            }
-
-
-            //其他
-            Image(
-                painter = painterResource(id = R.mipmap.ic_home_title_3_other),
-                contentDescription = null,
-                contentScale = ContentScale.Crop,
-                modifier = Modifier
-                    .wrapContentWidth()
-                    .padding(start = 16.dp, end = 16.dp, top = 18.dp)
-            )
-
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(start = 16.dp, end = 16.dp, top = 12.dp)
-            ){
-                Box(
-                    modifier = Modifier
-                        .wrapContentWidth()
-                        .weight(1f)
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() }
-                        ) {
-                            // 隐藏TabBar
-                            generalViewModel.setNavigationBarVisible(false)
-                            // 跳转格式页面
-                            navController.navigate(ScreenRoute.LongImage.route)
-                        }
-                ) {
-
-                    Column(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .padding(start = 8.dp)
-                            .align(Alignment.Center)
-                    ) {
-                        Image(
-                            painter = painterResource(id = R.mipmap.ic_home_other_1_puzzle),
-                            contentDescription = null,
-                        )
-
-                        Text(
-                            text = "拼长图",
-                            fontSize = 12.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = Color(0xFF1A1A1A),
-                            modifier = Modifier.wrapContentSize().padding(top = 12.dp)
-                        )
-                    }
-                }
-                Box(
-                    modifier = Modifier
-                        .width(8.dp)
-                )
-                Box(
-                    modifier = Modifier
-                        .wrapContentWidth()
-                        .weight(1f)
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() }
-                        ) {
-                            // 隐藏TabBar
-                            generalViewModel.setNavigationBarVisible(false)
-                            // 跳转格式页面
-                            navController.navigate(ScreenRoute.Format.route)
-                        }
-                ) {
-                    Column(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .padding(start = 8.dp)
-                            .align(Alignment.Center)
-                    ) {
-                        Image(
-                            painter = painterResource(id = R.mipmap.ic_home_other_2_format),
-                            contentDescription = null,
-                        )
-
-                        Text(
-                            text = "格式转换",
-                            fontSize = 12.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = Color(0xFF1A1A1A),
-                            modifier = Modifier.wrapContentSize().padding(top = 12.dp)
-                        )
-                    }
-                }
-                Box(
-                    modifier = Modifier
-                        .width(8.dp)
-                )
-                Box(
-                    modifier = Modifier
-                        .wrapContentWidth()
-                        .weight(1f)
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() }
-                        ) {
-                            // 隐藏TabBar
-                            generalViewModel.setNavigationBarVisible(false)
-                            // 跳转证件页面
-                            navController.apply {
-                                currentBackStackEntry?.savedStateHandle?.set("width", 25f)
-                                currentBackStackEntry?.savedStateHandle?.set("height", 35f)
-                                navigate(ScreenRoute.Resize.route)
-                            }
-                        }
-                ) {
-                    Column(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .padding(start = 8.dp)
-                            .align(Alignment.Center)
-                    ) {
-                        Image(
-                            painter = painterResource(id = R.mipmap.ic_home_other_3_size),
-                            contentDescription = null,
-                        )
-
-                        Text(
-                            text = "改尺寸",
-                            fontSize = 12.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = Color(0xFF1A1A1A),
-                            modifier = Modifier.wrapContentSize().padding(top = 12.dp)
-                        )
-                    }
-                }
-                Box(
-                    modifier = Modifier
-                        .width(8.dp)
-                )
-                Box(
-                    modifier = Modifier
-                        .wrapContentWidth()
-                        .weight(1f)
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() }
-                        ) {
-                            // 隐藏TabBar
-                            generalViewModel.setNavigationBarVisible(false)
-                            // 跳转拍照指南页面
-                            navController.navigate(ScreenRoute.CameraGuide.route)
-                        }
-                ) {
-                    Column(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .padding(start = 8.dp)
-                            .align(Alignment.Center)
-                    ) {
-                        Image(
-                            painter = painterResource(id = R.mipmap.ic_home_other_4_camera),
-                            contentDescription = null,
-                        )
-
-                        Text(
-                            text = "拍照指南",
-                            fontSize = 12.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = Color(0xFF1A1A1A),
-                            modifier = Modifier.wrapContentSize().padding(top = 12.dp)
-                        )
-                    }
-                }
-
-            }
-            Box(
-                modifier = Modifier.fillMaxWidth().height(56.dp)
-            )
         }
-
-
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index b5f5bc4..f40ffd8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,6 +22,8 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 
+android.injected.testOnly=false
+
 # ????
 GETUI_APPID=40qbPjPkYs7TnVAYCX0Ig6
 GT_INSTALL_CHANNEL=general
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5a14f64..a10a753 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -55,6 +55,7 @@ tencentHelper = "3.0.6"
 #oaid
 android_cn_oaid = "4.2.12"
 fastaes = "1.1.5"
+foundationVersion = "1.10.3"
 
 
 [libraries]
@@ -123,6 +124,7 @@ tencent-helper = { module = "com.tencent.vasdolly:helper", version.ref = "tencen
 android_cn_oaid = { module = "com.github.gzu-liyujiang:Android_CN_OAID", version.ref = "android_cn_oaid" }
 #Decrypt
 fastaes = { module = "io.github.billywei01:fastaes", version.ref = "fastaes" }
+foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "foundationVersion" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }