From 5278050b1cb9efe8ba7e120cf64ead2bacbf5774 Mon Sep 17 00:00:00 2001 From: shenzuqiang Date: Tue, 10 Mar 2026 11:02:00 +0800 Subject: [PATCH] =?UTF-8?q?Dev=EF=BC=9A=201=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AF=86=E5=88=AB=E4=B8=8B=E8=BD=BD=E8=B5=84=E6=BA=90=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98=202=E3=80=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=85=A8=E5=B1=80Toast=E4=B8=AD=E5=BF=83=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=203=E3=80=81=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/img/rabbit/MainActivity.kt | 4 + .../com/img/rabbit/components/CenterToast.kt | 96 + .../java/com/img/rabbit/pages/MainPage.kt | 72 +- .../com/img/rabbit/pages/screen/HomeScreen.kt | 1683 +++++++++-------- .../provider/utils/ResponseInterceptor.kt | 2 +- .../java/com/img/rabbit/utils/UniAppUtils.kt | 176 +- 6 files changed, 1119 insertions(+), 914 deletions(-) create mode 100644 app/src/main/java/com/img/rabbit/components/CenterToast.kt diff --git a/app/src/main/java/com/img/rabbit/MainActivity.kt b/app/src/main/java/com/img/rabbit/MainActivity.kt index 7b66dde..e8cd16a 100644 --- a/app/src/main/java/com/img/rabbit/MainActivity.kt +++ b/app/src/main/java/com/img/rabbit/MainActivity.kt @@ -56,6 +56,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.lifecycle.viewmodel.compose.viewModel import com.google.accompanist.permissions.ExperimentalPermissionsApi +import com.img.rabbit.components.GlobalToast import com.img.rabbit.config.Constants import com.img.rabbit.config.Constants.agreementUrl import com.img.rabbit.config.Constants.privacyUrl @@ -406,7 +407,10 @@ class MainActivity : ComponentActivity(), LoadingCallback { fun AppTheme(content: @Composable () -> Unit) { // 使用Material3主题 MaterialTheme { + // 界面内容 content() + // 全局居中Toast + GlobalToast() } } diff --git a/app/src/main/java/com/img/rabbit/components/CenterToast.kt b/app/src/main/java/com/img/rabbit/components/CenterToast.kt new file mode 100644 index 0000000..4dd3dde --- /dev/null +++ b/app/src/main/java/com/img/rabbit/components/CenterToast.kt @@ -0,0 +1,96 @@ +package com.img.rabbit.components + +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.tween +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.mutableStateOf +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp +import kotlinx.coroutines.delay +import androidx.compose.runtime.State +import androidx.compose.runtime.getValue +import androidx.compose.runtime.snapshots.Snapshot +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.zIndex +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.launch + +object CenterToast { + private var _message = mutableStateOf("") + private var _isVisible = mutableStateOf(false) + + val message: State = _message + val isVisible: State = _isVisible + + private val scope = CoroutineScope(Dispatchers.Main + SupervisorJob()) + private var job: Job? = null + + fun show(msg: String) { + job?.cancel() + + _message.value = msg + _isVisible.value = true + + job = scope.launch { + delay(2000) + hide() + } + } + + fun hide() { + CoroutineScope(Dispatchers.Main).launch { + _isVisible.value = false + Snapshot.sendApplyNotifications() + } + job?.cancel() + } + +} + +@Composable +fun GlobalToast() { + val isVisible = CenterToast.isVisible.value + val message = CenterToast.message.value + + val alpha by animateFloatAsState( + targetValue = if (isVisible) 1f else 0f, + animationSpec = tween(durationMillis = 300), + label = "toastAlpha" + ) + + if (alpha > 0f) { + Box( + modifier = Modifier + .fillMaxSize() + .graphicsLayer(alpha = alpha) + .zIndex(999f), + contentAlignment = Alignment.Center + ) { + Surface( + color = Color.Black.copy(alpha = 0.8f), + shape = RoundedCornerShape(8.dp) + ) { + Text( + text = message, + color = Color.White, + modifier = Modifier.padding(16.dp) + ) + } + } + } +} + + + + 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 abc74c9..171de93 100644 --- a/app/src/main/java/com/img/rabbit/pages/MainPage.kt +++ b/app/src/main/java/com/img/rabbit/pages/MainPage.kt @@ -2,12 +2,15 @@ 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.layout.Box +import androidx.compose.foundation.layout.Column 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.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController @@ -36,6 +39,7 @@ import androidx.navigation.NavType import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.navArgument import com.img.rabbit.R +import com.img.rabbit.components.CenterToast import com.img.rabbit.pages.screen.HomeScreen import com.img.rabbit.pages.screen.MineScreen import com.img.rabbit.pages.screen.make.CutoutScreen @@ -92,7 +96,7 @@ fun MainScreen(generalViewModel: GeneralViewModel, loginViewModel: LoginViewMode //延迟500ms，确保页面初始化完成后，再跳转网络错误页面 delay(500) - Toast.makeText(context, "网络已断开,请检查网络设置!", Toast.LENGTH_SHORT).show() + CenterToast.show("网络已断开,请检查网络设置!") /* navController.navigate("netError") generalViewModel.setNavigationBarVisible(false) @@ -110,41 +114,45 @@ fun MainScreen(generalViewModel: GeneralViewModel, loginViewModel: LoginViewMode Scaffold( bottomBar = { if (isNavigationBarVisible) { - Box(modifier = Modifier.height(52.dp)) { - NavigationBar( - containerColor = Color.White, - contentColor = Color.Transparent - ) { - tabItems.forEachIndexed { index, item -> - val iconRes = if (selectedTab == tabItems[index]) { - item.selectedIconRes - } else { - item.normalIconRes - } - NavigationBarItem( - icon = { - Icon( - painter = painterResource(id = iconRes), - contentDescription = item.title, - tint = Color.Unspecified + Column( + modifier = Modifier.navigationBarsPadding() + ) { + Box(modifier = Modifier.height(52.dp)) { + NavigationBar( + containerColor = Color.White, + contentColor = Color.Transparent + ) { + tabItems.forEachIndexed { index, item -> + val iconRes = if (selectedTab == tabItems[index]) { + item.selectedIconRes + } else { + item.normalIconRes + } + NavigationBarItem( + icon = { + Icon( + painter = painterResource(id = iconRes), + contentDescription = item.title, + tint = Color.Unspecified + ) + }, + label = { Text(item.title, color = if (selectedTab == tabItems[index]) item.selectedColor else item.normalColor) }, + selected = selectedTab == tabItems[index], + onClick = { selectedTab = tabItems[index] }, + colors = NavigationBarItemDefaults.colors( + indicatorColor = Color.Transparent ) - }, - label = { Text(item.title, color = if (selectedTab == tabItems[index]) item.selectedColor else item.normalColor) }, - selected = selectedTab == tabItems[index], - onClick = { selectedTab = tabItems[index] }, - colors = NavigationBarItemDefaults.colors( - indicatorColor = Color.Transparent ) - ) + } } + // 顶部横线 + Box( + modifier = Modifier + .fillMaxWidth() + .height(1.dp) + .background(Color(0x1AD0D0D0)) + ) } - // 顶部横线 - Box( - modifier = Modifier - .fillMaxWidth() - .height(1.dp) - .background(Color(0x1AD0D0D0)) - ) } } } 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 2ac5c85..447c55f 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 @@ -140,20 +140,33 @@ fun HomeScreen( //大于9时，每排展示3个，否则每排展示4个 val columnsCount = if((homeIconConfig?.size?:0) >= 9){ 3 }else{ 4 } val rows = homeIconConfig?.chunked(columnsCount)?:emptyList() + item { + Image( + painter = painterResource(id = R.mipmap.ic_home_top_mask), + contentDescription = null, + contentScale = ContentScale.FillWidth, + modifier = Modifier.fillMaxWidth() + ) + Column( + modifier = Modifier + .fillMaxWidth() + .offset(y = (-18).dp) + .background( + color = Color.White, + shape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp) + ) + ) { + Box(modifier = Modifier.fillMaxWidth().height(18.dp)) + } + } item { Column( ) { - Image( - painter = painterResource(id = R.mipmap.ic_home_top_mask), - contentDescription = null, - contentScale = ContentScale.FillWidth, - modifier = Modifier.fillMaxWidth() - ) Column( modifier = Modifier .fillMaxWidth() - .offset(y = (-17).dp) + .offset(y = (-36).dp) .background( color = Color.White, shape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp) @@ -440,7 +453,11 @@ fun HomeScreen( } items(rows) {rowItems -> //通过配置展示-AD2 - Row(Modifier.fillMaxWidth()) { + Row( + Modifier + .fillMaxWidth() + .offset(y = (-36).dp) + ) { for (item in rowItems) { Box( modifier = Modifier @@ -504,942 +521,960 @@ fun HomeScreen( } } item { - //选尺寸制作 - 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( + Column( modifier = Modifier .fillMaxWidth() - .padding(start = 16.dp, end = 16.dp, top = 12.dp) + .offset(y = (-36).dp) ) { - Box( + //选尺寸制作 + Image( + painter = painterResource(id = R.mipmap.ic_home_title_1_size), + 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) - } - } - ){ - 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) + .padding(start = 16.dp, end = 16.dp, top = 12.dp) ) - Box( + Row( 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) + .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( + ){ + Image( + painter = painterResource(id = R.mipmap.ic_home_size_bg), modifier = Modifier .fillMaxWidth() - .weight(0.25f) + .aspectRatio(166 / 68f), + contentDescription = null, ) - Column( + + Row( modifier = Modifier - .wrapContentSize() - .weight(0.75f) + .fillMaxWidth() + .align(Alignment.Center) ) { - Text( - text = "小一寸", - fontSize = 14.sp, - fontWeight = FontWeight.Bold, - color = Color(0xFF1A1A1A), - modifier = Modifier.wrapContentSize() + Box( + modifier = Modifier + .fillMaxWidth() + .weight(0.25f) ) - Text( - text = "22x32mm", - fontSize = 10.sp, - fontWeight = FontWeight.Normal, - color = Color(0xFF767676), - modifier = Modifier.wrapContentSize() + 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( + Row( 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) + .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( + ){ + Image( + painter = painterResource(id = R.mipmap.ic_home_size_bg), modifier = Modifier .fillMaxWidth() - .weight(0.25f) + .aspectRatio(166 / 68f), + contentDescription = null, ) - 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() - ) - } + 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), + Box( modifier = Modifier - .fillMaxWidth() - .aspectRatio(166 / 68f), - contentDescription = null, + .width(10.dp) ) - - Row( + Box( modifier = Modifier - .fillMaxWidth() - .align(Alignment.Center) - ) { - Box( + .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() - .weight(0.25f) + .aspectRatio(166 / 68f), + contentDescription = null, ) - 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() - ) - } + 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( + Column( modifier = Modifier .fillMaxWidth() - .padding(start = 16.dp, end = 16.dp, top = 12.dp) - ){ - Box( + .offset(y = (-36).dp) + ) { + Image( + painter = painterResource(id = R.mipmap.ic_home_title_2_certificate), + 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", 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, - 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(8.dp) + .padding(start = 16.dp, end = 16.dp, top = 18.dp) ) - Box( + Row( 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) + .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), + Image( + painter = painterResource(id = R.mipmap.ic_home_certificate_bg), modifier = Modifier - .wrapContentSize() - .align(Alignment.CenterHorizontally) + .fillMaxWidth() + .aspectRatio(80f / 50f), + contentDescription = null, ) - Text( - text = "33x48mm", - fontSize = 10.sp, - fontWeight = FontWeight.Normal, - lineHeight = 10.sp, - color = Color(0xFFAAAAAA), + + Column( modifier = Modifier - .wrapContentSize() - .align(Alignment.CenterHorizontally) - ) + .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(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), + Box( modifier = Modifier - .fillMaxWidth() - .aspectRatio(80f / 50f), - contentDescription = null, + .width(8.dp) ) - - Column( + Box( modifier = Modifier - .fillMaxWidth() - .align(Alignment.Center) + .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) + } + } ) { - Text( - text = "驾驶证", - fontSize = 12.sp, - fontWeight = FontWeight.Bold, - lineHeight = 12.sp, - color = Color(0xFF1A1A1A), + Image( + painter = painterResource(id = R.mipmap.ic_home_certificate_bg), modifier = Modifier - .wrapContentSize() - .align(Alignment.CenterHorizontally) + .fillMaxWidth() + .aspectRatio(80f / 50f), + contentDescription = null, ) - Text( - text = "22x32mm", - fontSize = 10.sp, - fontWeight = FontWeight.Normal, - lineHeight = 10.sp, - color = Color(0xFFAAAAAA), + + Column( modifier = Modifier - .wrapContentSize() - .align(Alignment.CenterHorizontally) - ) + .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", 26f) - currentBackStackEntry?.savedStateHandle?.set("height", 32f) - navigate(ScreenRoute.Cutout.route) - } - } - ) { - Image( - painter = painterResource(id = R.mipmap.ic_home_certificate_bg), + Box( modifier = Modifier - .fillMaxWidth() - .aspectRatio(80f / 50f), - contentDescription = null, + .width(8.dp) ) - - Column( + Box( modifier = Modifier - .fillMaxWidth() - .align(Alignment.Center) + .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) + } + } ) { - Text( - text = "社保卡", - fontSize = 12.sp, - fontWeight = FontWeight.Bold, - lineHeight = 12.sp, - color = Color(0xFF1A1A1A), + Image( + painter = painterResource(id = R.mipmap.ic_home_certificate_bg), modifier = Modifier - .wrapContentSize() - .align(Alignment.CenterHorizontally) + .fillMaxWidth() + .aspectRatio(80f / 50f), + contentDescription = null, ) - Text( - text = "26x32mm", - fontSize = 10.sp, - fontWeight = FontWeight.Normal, - lineHeight = 10.sp, - color = Color(0xFFAAAAAA), + + Column( modifier = Modifier - .wrapContentSize() - .align(Alignment.CenterHorizontally) - ) + .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) + ) + } } - } - - } - 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), + Box( modifier = Modifier - .fillMaxWidth() - .aspectRatio(80f / 50f), - contentDescription = null, + .width(8.dp) ) - - Column( + Box( modifier = Modifier - .fillMaxWidth() - .align(Alignment.Center) + .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) + } + } ) { - Text( - text = "四六级", - fontSize = 12.sp, - fontWeight = FontWeight.Bold, - lineHeight = 12.sp, - color = Color(0xFF1A1A1A), + Image( + painter = painterResource(id = R.mipmap.ic_home_certificate_bg), modifier = Modifier - .wrapContentSize() - .align(Alignment.CenterHorizontally) + .fillMaxWidth() + .aspectRatio(80f / 50f), + contentDescription = null, ) - Text( - text = "26x32mm", - fontSize = 10.sp, - fontWeight = FontWeight.Normal, - lineHeight = 10.sp, - color = Color(0xFFAAAAAA), + + Column( modifier = Modifier - .wrapContentSize() - .align(Alignment.CenterHorizontally) - ) + .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( + } + Row( + modifier = Modifier + .fillMaxWidth() + .padding(start = 16.dp, end = 16.dp, top = 12.dp) + ){ + Box( modifier = Modifier - .fillMaxWidth() - .align(Alignment.Center) + .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) + } + } ) { - Text( - text = "司法考试", - fontSize = 12.sp, - fontWeight = FontWeight.Bold, - lineHeight = 12.sp, - color = Color(0xFF1A1A1A), + Image( + painter = painterResource(id = R.mipmap.ic_home_certificate_bg), modifier = Modifier - .wrapContentSize() - .align(Alignment.CenterHorizontally) + .fillMaxWidth() + .aspectRatio(80f / 50f), + contentDescription = null, ) - Text( - text = "33x48mm", - fontSize = 10.sp, - fontWeight = FontWeight.Normal, - lineHeight = 10.sp, - color = Color(0xFFAAAAAA), + + Column( modifier = Modifier - .wrapContentSize() - .align(Alignment.CenterHorizontally) - ) + .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", 40f) - currentBackStackEntry?.savedStateHandle?.set("height", 60f) - navigate(ScreenRoute.Cutout.route) - } - } - ) { - Image( - painter = painterResource(id = R.mipmap.ic_home_certificate_bg), + Box( modifier = Modifier - .fillMaxWidth() - .aspectRatio(80f / 50f), - contentDescription = null, + .width(8.dp) ) - - Column( + Box( modifier = Modifier - .fillMaxWidth() - .align(Alignment.Center) + .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) + } + } ) { - Text( - text = "结婚证", - fontSize = 12.sp, - fontWeight = FontWeight.Bold, - lineHeight = 12.sp, - color = Color(0xFF1A1A1A), + Image( + painter = painterResource(id = R.mipmap.ic_home_certificate_bg), modifier = Modifier - .wrapContentSize() - .align(Alignment.CenterHorizontally) + .fillMaxWidth() + .aspectRatio(80f / 50f), + contentDescription = null, ) - Text( - text = "40x60mm", - fontSize = 10.sp, - fontWeight = FontWeight.Normal, - lineHeight = 10.sp, - color = Color(0xFFAAAAAA), + + Column( modifier = Modifier - .wrapContentSize() - .align(Alignment.CenterHorizontally) - ) + .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", 35f) - currentBackStackEntry?.savedStateHandle?.set("height", 45f) - navigate(ScreenRoute.Cutout.route) - } - } - ) { - Image( - painter = painterResource(id = R.mipmap.ic_home_certificate_bg), + Box( modifier = Modifier - .fillMaxWidth() - .aspectRatio(80f / 50f), - contentDescription = null, + .width(8.dp) ) - - Column( + Box( modifier = Modifier - .fillMaxWidth() - .align(Alignment.Center) + .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) + } + } ) { - Text( - text = "中国签证", - fontSize = 12.sp, - fontWeight = FontWeight.Bold, - lineHeight = 12.sp, - color = Color(0xFF1A1A1A), + Image( + painter = painterResource(id = R.mipmap.ic_home_certificate_bg), modifier = Modifier - .wrapContentSize() - .align(Alignment.CenterHorizontally) + .fillMaxWidth() + .aspectRatio(80f / 50f), + contentDescription = null, ) - Text( - text = "35x45mm", - fontSize = 10.sp, - fontWeight = FontWeight.Normal, - lineHeight = 10.sp, - color = Color(0xFFAAAAAA), + + Column( modifier = Modifier - .wrapContentSize() - .align(Alignment.CenterHorizontally) + .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) + ) + } } } } } item { //其他 - 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( + Column( modifier = Modifier .fillMaxWidth() - .padding(start = 16.dp, end = 16.dp, top = 12.dp) - ){ - Box( + .offset(y = (-36).dp) + ) { + 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.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), - 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) + .padding(start = 16.dp, end = 16.dp, top = 18.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( + Row( 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) + .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_3_size), - modifier = Modifier - .wrapContentSize() - .align(Alignment.CenterHorizontally), - contentDescription = null, - ) - Text( - text = "改尺寸", - fontSize = 12.sp, - fontWeight = FontWeight.Bold, - color = Color(0xFF1A1A1A), + Column( 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() } + .padding(start = 8.dp) + .align(Alignment.Center) ) { - // 隐藏TabBar - generalViewModel.setNavigationBarVisible(false) - // 跳转拍照指南页面 - navController.navigate(ScreenRoute.CameraGuide.route) + 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) + ) } - ) { - 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 + .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) + ) } - Box( - modifier = Modifier - .fillMaxWidth() - .height(56.dp) - ) } } } diff --git a/app/src/main/java/com/img/rabbit/provider/utils/ResponseInterceptor.kt b/app/src/main/java/com/img/rabbit/provider/utils/ResponseInterceptor.kt index 5f656c5..674ab15 100644 --- a/app/src/main/java/com/img/rabbit/provider/utils/ResponseInterceptor.kt +++ b/app/src/main/java/com/img/rabbit/provider/utils/ResponseInterceptor.kt @@ -68,7 +68,7 @@ class ResponseInterceptor : Interceptor { var decryString: String? try { decryString = AESpkcs7paddingUtil.decryptNormal(decrybody, Constants.AESDecrypt) - Log.e("ResponseInterceptor", "解密后返回的字符串为---->$decryString") + Log.w("ResponseInterceptor", "解密后返回的字符串为---->$decryString") //这里可以通过code处理token过去过期的情况 //val decCode = JSONObject(decryString).optInt("code") 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 27dcc24..648b11e 100644 --- a/app/src/main/java/com/img/rabbit/utils/UniAppUtils.kt +++ b/app/src/main/java/com/img/rabbit/utils/UniAppUtils.kt @@ -1,11 +1,18 @@ 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 import com.img.rabbit.config.Constants import com.img.rabbit.provider.storage.PreferenceUtil import com.img.rabbit.provider.storage.PreferenceUtil.getBDVID @@ -20,14 +27,22 @@ import io.dcloud.feature.sdk.Interface.IUniMP import io.dcloud.feature.unimp.config.UniMPOpenConfiguration import io.dcloud.feature.unimp.config.UniMPReleaseConfiguration import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import okhttp3.OkHttpClient +import okhttp3.Request import java.io.File +import java.net.HttpURLConnection +import java.net.URL +import java.util.concurrent.TimeUnit import kotlin.jvm.java object UniAppUtils { + private const val TAG = "UniAppUtils" /** * 所有运行的UniMp小程序实体 */ @@ -139,10 +154,10 @@ object UniAppUtils { private fun startUniMp(context: Context, uniVersion: UniVersionEntity, onResult:(loading: Boolean) -> Unit){ val uniMp = _uniMpFlow.value[uniVersion.unimp_id]//uniMpPair[uniVersion.unimp_id] if(uniMp?.isRuning == true){ - Log.i("UniAppUtils", "startUniMp: 运行中...") + Log.i(TAG, "startUniMp: 运行中...") uniMp.showUniMP() }else{ - Log.i("UniAppUtils", "startUniMp: 重新加载...") + Log.i(TAG, "startUniMp: 重新加载...") val configuration = getUniMPOpenConfiguration() if(uniVersion.unimp_type == "wx"){ configuration.splashClass = UniMPWxSplashView::class.java @@ -200,22 +215,27 @@ object UniAppUtils { //释放资源 private fun releaseWgt(uniMpId: String, onReleaseWgt: (isSuccess: Boolean) -> Unit) { - val wgtName = String.format("%s.wgt", uniMpId) - val wgtFile = File(FileUtils.getInstance().cacheUniAppDir.absolutePath, wgtName) - val uniMPReleaseConfiguration = UniMPReleaseConfiguration().apply { - wgtPath = wgtFile.path - password = "6462"////没有密码可以不写 - } - DCUniMPSDK.getInstance().releaseWgtToRunPath(uniMpId, uniMPReleaseConfiguration - ) { code, _ -> - if (code == 1) { - //释放wgt完成 - onReleaseWgt(true) - } else { - //释放wgt失败 - Toast.makeText(applicationContext, "小程序加载失败，请清除缓存后重试！", Toast.LENGTH_SHORT).show() - onReleaseWgt(false) + val appBasePath = DCUniMPSDK.getInstance().getAppBasePath(applicationContext) + val deleteSuccess = File(appBasePath, uniMpId).deleteRecursively() + if(deleteSuccess){ + val wgtName = String.format("%s.wgt", uniMpId) + val wgtFile = File(FileUtils.getInstance().cacheUniAppDir.absolutePath, wgtName) + val uniMPReleaseConfiguration = UniMPReleaseConfiguration().apply { + wgtPath = wgtFile.path + password = "6462"////没有密码可以不写 } + DCUniMPSDK.getInstance().releaseWgtToRunPath(uniMpId, uniMPReleaseConfiguration) { code, _ -> + if (code == 1) { + //释放wgt完成 + onReleaseWgt(true) + } else { + //释放wgt失败 + CenterToast.show("小程序加载失败，请清除缓存后重试！") + onReleaseWgt(false) + } + } + }else{ + CenterToast.show("资源释放失败，请手动删除小程序运行文件！") } } @@ -242,36 +262,22 @@ object UniAppUtils { * 下载并释放资源（但不会启动） */ fun downloadReleaseWgt(scope: CoroutineScope, uniVersion: UniVersionEntity, onProgress:(state: UniMpUpdate, progress: Float?) -> Unit,onRelease:(isSuccess: Boolean) -> Unit){ - val uniMpID = uniVersion.unimp_id - val wgtName = String.format("%s.wgt", uniMpID) - val wgtFile = File(FileUtils.getInstance().cacheUniAppDir.absolutePath, wgtName) - + val uniMpId = uniVersion.unimp_id onProgress(UniMpUpdate.DOWNLOAD_START, 0f) downloadUniMp(scope, uniVersion){uniState, _, progress -> onProgress(UniMpUpdate.DOWNLOAD_LOADING, progress) if(uniState == UniMpUpdate.DOWNLOAD_FINISH){ - PreferenceUtil.saveWgtVersion(uniVersion.unimp_id, uniVersion.version) + PreferenceUtil.saveWgtVersion(uniMpId, uniVersion.version) onProgress(UniMpUpdate.DOWNLOAD_FINISH, 1f) - scope.launch { - val uniMPReleaseConfiguration = UniMPReleaseConfiguration().apply { - wgtPath = wgtFile.path - password = "6462"////没有密码可以不写 - } - DCUniMPSDK.getInstance().releaseWgtToRunPath(uniMpID, uniMPReleaseConfiguration - ) { code, _ -> - if (code == 1) { - //释放wgt完成 - Log.i("UniAppUtils", "下载并释放wgt完成!") - onRelease(true) - } else { - //释放wgt失败 - Log.i("UniAppUtils", "释放wgt失败...") - onRelease(false) - } + releaseWgt(uniMpId){ isSuccess -> + if(isSuccess){ + onRelease(true) + }else{ + onRelease(false) } } }else if(uniState == UniMpUpdate.DOWNLOAD_FAIL){ - Log.i("UniAppUtils", "下载wgt失败...") + Log.i(TAG, "下载wgt失败...") onProgress(UniMpUpdate.DOWNLOAD_FAIL, -1f) } } @@ -287,25 +293,51 @@ object UniAppUtils { val uniMpID = uniVersion.unimp_id val wgtName = String.format("%s.wgt", uniMpID) val path = FileUtils.getInstance().cacheUniAppDir.absolutePath - Log.i("UniAppUtils", "下载wgt---->downloadUniMp: $path/$wgtName ------>${uniVersion.url}") - UpdateUtils.download( - scope = scope, - url = uniVersion.url, - filePath = path, - fileName = wgtName, - onProgress = {progress-> - onProgress(UniMpUpdate.DOWNLOAD_LOADING, null, progress.toFloat()/100f) - }, - onFinish = {isSuccess, filePath -> - if(isSuccess){ - Log.i("UniAppUtils", "下载完成---->updateUniMp: $filePath") - onProgress(UniMpUpdate.DOWNLOAD_FINISH, filePath, 1f) - }else{ - Log.i("UniAppUtils", "下载失败---->updateUniMp: $filePath") - onProgress(UniMpUpdate.DOWNLOAD_FAIL, filePath, -1f) - } + //先删除旧文件 + val oldFile = File(path, wgtName) + if(oldFile.exists()){ + oldFile.delete() + } + onProgress(UniMpUpdate.DOWNLOAD_LOADING, null, 0.01f) + + scope.launch { + val isAvailable = isFileDownloadable(uniVersion.url) + if(!isAvailable){ + Log.i(TAG, "下载失败，无效地址") + onProgress(UniMpUpdate.DOWNLOAD_FAIL, null, -1f) + CenterToast.show("下载失败...") + }else{ + Log.i(TAG, "下载wgt---->downloadUniMp: $path/$wgtName ------>${uniVersion.url}") + UpdateUtils.download( + scope = scope, + url = uniVersion.url, + filePath = path, + fileName = wgtName, + onProgress = {progress-> + if(progress.toFloat()/100f>0.1f) { + onProgress( + UniMpUpdate.DOWNLOAD_LOADING, + null, + progress.toFloat() / 100f + ) + } + }, + onFinish = {isSuccess, filePath -> + if(isSuccess){ + Log.i(TAG, "下载完成---->updateUniMp: $filePath") + onProgress(UniMpUpdate.DOWNLOAD_FINISH, filePath, 1f) + }else{ + Log.i(TAG, "下载失败---->updateUniMp: $filePath") + onProgress(UniMpUpdate.DOWNLOAD_FAIL, filePath, -1f) + + CenterToast.show("下载失败...") + } + } + ) } - ) + } + + } private fun getUniMPOpenConfiguration(): UniMPOpenConfiguration{ @@ -354,6 +386,36 @@ object UniAppUtils { req.miniprogramType = WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE// 可选打开 开发版，体验版和正式版 api.sendReq(req) } + + suspend fun isFileDownloadable(url: String): Boolean = withContext(Dispatchers.IO) { + val client = OkHttpClient() + val request = Request.Builder().url(url).build() + try { + val response = client.newCall(request).execute() + val fileSize = response.body.contentLength() + //下载文件小于1KB，需要判断Url是否可靠 + if(fileSize < 1024){ + if (!response.isSuccessful) { + val errorBody = response.body.string() + if (response.header("Content-Type")?.contains("application/json") == true) { + Log.i(TAG, "下载失败...$errorBody") + }else{ + Log.i(TAG, "服务器错误...$errorBody") + } + return@withContext false + }else{ + Log.i(TAG, "文件正常，可以下载！${response.body.string()}") + return@withContext true + } + }else{ + return@withContext true + } + }catch (e: Exception) { + Log.i(TAG, "异常：${e.message}") + } + return@withContext false + } + } enum class UniMpUpdate{