1、解决vivo市场反馈,系统17下崩溃问题(初步判断加密引起,但需要升级版本重新加密上传)
2、添加客服配置加载显示
This commit is contained in:
shenzuqiang 2026-05-21 10:00:08 +08:00
parent 0b84bdb904
commit b06db40dc6
3 changed files with 53 additions and 51 deletions

View File

@ -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"

View File

@ -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 = "",

View File

@ -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()