From b06db40dc676c6b1d464d7c92f5b4f56a83c4d3b Mon Sep 17 00:00:00 2001 From: shenzuqiang Date: Thu, 21 May 2026 10:00:08 +0800 Subject: [PATCH] =?UTF-8?q?Dev=EF=BC=9A=201=E3=80=81=E8=A7=A3=E5=86=B3vivo?= =?UTF-8?q?=E5=B8=82=E5=9C=BA=E5=8F=8D=E9=A6=88=EF=BC=8C=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?17=E4=B8=8B=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98=EF=BC=88?= =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=88=A4=E6=96=AD=E5=8A=A0=E5=AF=86=E5=BC=95?= =?UTF-8?q?=E8=B5=B7=EF=BC=8C=E4=BD=86=E9=9C=80=E8=A6=81=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=87=8D=E6=96=B0=E5=8A=A0=E5=AF=86=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=EF=BC=89=202=E3=80=81=E6=B7=BB=E5=8A=A0=E5=AE=A2?= =?UTF-8?q?=E6=9C=8D=E9=85=8D=E7=BD=AE=E5=8A=A0=E8=BD=BD=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 5 +- .../rabbit/bean/response/UserInfoEntity.kt | 1 + .../com/img/rabbit/pages/screen/MineScreen.kt | 98 ++++++++++--------- 3 files changed, 53 insertions(+), 51 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 00c9b32..bf30562 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -31,7 +31,6 @@ android { } composeOptions { - // 注意：Kotlin 1.8.x 以后建议检查与 Compose 编译器的版本兼容性 kotlinCompilerExtensionVersion = "1.4.8" } @@ -39,8 +38,8 @@ android { applicationId = "com.img.rabbit" minSdk = 24 targetSdk = 36 - versionCode = 1 - versionName = "1.0.0" + versionCode = 2 + versionName = "1.0.1" multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/img/rabbit/bean/response/UserInfoEntity.kt b/app/src/main/java/com/img/rabbit/bean/response/UserInfoEntity.kt index 87114c6..a3c5a05 100644 --- a/app/src/main/java/com/img/rabbit/bean/response/UserInfoEntity.kt +++ b/app/src/main/java/com/img/rabbit/bean/response/UserInfoEntity.kt @@ -18,6 +18,7 @@ class UserInfoEntity( val name: String = "", val phone: String = "", val role: String = "", + val show_contact_menu: Boolean = false, val temp: Boolean = true, val unionid: String = "", val user_id: String = "", diff --git a/app/src/main/java/com/img/rabbit/pages/screen/MineScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/MineScreen.kt index 2265f26..70467be 100644 --- a/app/src/main/java/com/img/rabbit/pages/screen/MineScreen.kt +++ b/app/src/main/java/com/img/rabbit/pages/screen/MineScreen.kt @@ -402,62 +402,64 @@ fun MineScreen( Color(0x4DBBBBBB) ) ) - Row( - modifier = Modifier - .fillMaxWidth() - .height(52.dp) - .clickable( - indication = null, - interactionSource = remember { MutableInteractionSource() } - ) { - if (!generalViewModel.api.isWXAppInstalled) { - CenterToast.show("未安装微信客户端") - }else if(userInfo != null){ - viewModel.requestServiceLink(generalViewModel.api) - } - }, - verticalAlignment = Alignment.CenterVertically - ) { - Image( - painter = painterResource(id = R.mipmap.ic_mine_service), - contentDescription = null, - contentScale = ContentScale.FillWidth, + if(userInfo?.show_contact_menu == true){ + Row( modifier = Modifier - .wrapContentSize() - .padding(start = 12.dp) - ) - Box( - modifier = Modifier.weight(1f) - ){ - Text( - text = "在线客服", - fontSize = 14.sp, - fontWeight = FontWeight.Bold, - color = Color(0xFF1A1A1A), + .fillMaxWidth() + .height(52.dp) + .clickable( + indication = null, + interactionSource = remember { MutableInteractionSource() } + ) { + if (!generalViewModel.api.isWXAppInstalled) { + CenterToast.show("未安装微信客户端") + }else if(userInfo != null){ + viewModel.requestServiceLink(generalViewModel.api) + } + }, + verticalAlignment = Alignment.CenterVertically + ) { + Image( + painter = painterResource(id = R.mipmap.ic_mine_service), + contentDescription = null, + contentScale = ContentScale.FillWidth, modifier = Modifier .wrapContentSize() - .padding(start = 8.dp) + .padding(start = 12.dp) + ) + Box( + modifier = Modifier.weight(1f) + ){ + Text( + text = "在线客服", + fontSize = 14.sp, + fontWeight = FontWeight.Bold, + color = Color(0xFF1A1A1A), + modifier = Modifier + .wrapContentSize() + .padding(start = 8.dp) + ) + } + + Image( + painter = painterResource(id = R.mipmap.ic_arrow_right), + contentDescription = null, + contentScale = ContentScale.FillWidth, + modifier = Modifier + .wrapContentSize() + .padding(end = 12.dp) // 改为end padding ) } - - Image( - painter = painterResource(id = R.mipmap.ic_arrow_right), - contentDescription = null, - contentScale = ContentScale.FillWidth, + Box( modifier = Modifier - .wrapContentSize() - .padding(end = 12.dp) // 改为end padding + .fillMaxWidth() + .height(0.5.dp) + .padding(horizontal = 12.dp) + .background( + Color(0x4DBBBBBB) + ) ) } - Box( - modifier = Modifier - .fillMaxWidth() - .height(0.5.dp) - .padding(horizontal = 12.dp) - .background( - Color(0x4DBBBBBB) - ) - ) Row( modifier = Modifier .fillMaxWidth()