refactor(servicing): 优化订单详情页面并更新版本号
- 移除订单详情页面的冗余代码和未使用的导入 - 简化订单详情页面的布局结构 - 更新项目版本号至 1.0.1.9.9.37 - 修复签名上传逻辑 -优化登录 token 存储和人脸识别相关代码
This commit is contained in:
@ -73,7 +73,7 @@ publishing {
|
|||||||
release(MavenPublication) {
|
release(MavenPublication) {
|
||||||
groupId = 'io.github.szl9'
|
groupId = 'io.github.szl9'
|
||||||
artifactId = 'zd_servicing'
|
artifactId = 'zd_servicing'
|
||||||
version = "1.0.1.9.9.33"
|
version = "1.0.1.9.9.37"
|
||||||
|
|
||||||
pom {
|
pom {
|
||||||
packaging = "aar"
|
packaging = "aar"
|
||||||
|
@ -17,10 +17,10 @@ object GlobalData : GlobalLocalData() {
|
|||||||
|
|
||||||
var token : String? = null
|
var token : String? = null
|
||||||
get() {
|
get() {
|
||||||
return mmkv.decodeString("ZD_TOKEN", null)
|
return mmkv.decodeString("TOKEN", null)
|
||||||
}
|
}
|
||||||
set(value) {
|
set(value) {
|
||||||
mmkv.encode("ZD_TOKEN", value)
|
mmkv.encode("TOKEN", value)
|
||||||
field = value
|
field = value
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -73,10 +73,10 @@ object GlobalData : GlobalLocalData() {
|
|||||||
//是否已经完成登录后的人脸识别
|
//是否已经完成登录后的人脸识别
|
||||||
var isLoginRecognition : Boolean? = null
|
var isLoginRecognition : Boolean? = null
|
||||||
get() {
|
get() {
|
||||||
return mmkv.decodeBool("isLoginRecognition", true)
|
return mmkv.decodeBool("isLoginRecognition", false)
|
||||||
}
|
}
|
||||||
set(value) {
|
set(value) {
|
||||||
mmkv.encode("isLoginRecognition", value ?: true)
|
mmkv.encode("isLoginRecognition", value == true)
|
||||||
field = value
|
field = value
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,42 +1,26 @@
|
|||||||
package com.za.ui.servicing.in_servicing_setting
|
package com.za.ui.servicing.in_servicing_setting
|
||||||
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.clickable
|
|
||||||
import androidx.compose.foundation.horizontalScroll
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Box
|
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.height
|
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.width
|
|
||||||
import androidx.compose.foundation.pager.HorizontalPager
|
import androidx.compose.foundation.pager.HorizontalPager
|
||||||
import androidx.compose.foundation.pager.rememberPagerState
|
import androidx.compose.foundation.pager.rememberPagerState
|
||||||
import androidx.compose.foundation.rememberScrollState
|
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
|
||||||
import androidx.compose.material3.HorizontalDivider
|
|
||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.rememberCoroutineScope
|
import androidx.compose.runtime.rememberCoroutineScope
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import com.za.base.theme.headBgColor
|
|
||||||
import com.za.base.theme.white80
|
|
||||||
import com.za.base.view.HeadView
|
import com.za.base.view.HeadView
|
||||||
import com.za.bean.db.order.OrderInfo
|
import com.za.bean.db.order.OrderInfo
|
||||||
import com.za.ext.finish
|
import com.za.ext.finish
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun OrderDetailScreen(orderInfo: OrderInfo?) {
|
fun OrderDetailScreen(orderInfo: OrderInfo?) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
val titleList = listOf("订单详情", "案件照片")
|
// val titleList = listOf("订单详情", "案件照片")
|
||||||
|
val titleList = listOf("订单详情")
|
||||||
val pagerState = rememberPagerState(initialPage = 0, pageCount = { titleList.size })
|
val pagerState = rememberPagerState(initialPage = 0, pageCount = { titleList.size })
|
||||||
val scope = rememberCoroutineScope()
|
val scope = rememberCoroutineScope()
|
||||||
Scaffold(topBar = {
|
Scaffold(topBar = {
|
||||||
@ -46,37 +30,37 @@ fun OrderDetailScreen(orderInfo: OrderInfo?) {
|
|||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.padding(it)) {
|
.padding(it)) {
|
||||||
|
|
||||||
Row(modifier = Modifier
|
// Row(modifier = Modifier
|
||||||
.fillMaxWidth()
|
// .fillMaxWidth()
|
||||||
.horizontalScroll(state = rememberScrollState())
|
// .horizontalScroll(state = rememberScrollState())
|
||||||
.height(30.dp)
|
// .height(30.dp)
|
||||||
.background(color = headBgColor), verticalAlignment = Alignment.CenterVertically) {
|
// .background(color = headBgColor), verticalAlignment = Alignment.CenterVertically) {
|
||||||
for (i in 0 until pagerState.pageCount) {
|
// for (i in 0 until pagerState.pageCount) {
|
||||||
if (pagerState.currentPage == i) {
|
// if (pagerState.currentPage == i) {
|
||||||
Column(modifier = Modifier
|
// Column(modifier = Modifier
|
||||||
.weight(1f),
|
// .weight(1f),
|
||||||
verticalArrangement = Arrangement.Center,
|
// verticalArrangement = Arrangement.Center,
|
||||||
horizontalAlignment = Alignment.CenterHorizontally) {
|
// horizontalAlignment = Alignment.CenterHorizontally) {
|
||||||
Text(text = titleList[i], color = Color.White)
|
// Text(text = titleList[i], color = Color.White)
|
||||||
HorizontalDivider(thickness = 0.dp,
|
// HorizontalDivider(thickness = 0.dp,
|
||||||
modifier = Modifier
|
// modifier = Modifier
|
||||||
.width(25.dp)
|
// .width(25.dp)
|
||||||
.height(3.dp)
|
// .height(3.dp)
|
||||||
.background(color = Color.White, shape = RoundedCornerShape(8.dp)))
|
// .background(color = Color.White, shape = RoundedCornerShape(8.dp)))
|
||||||
}
|
// }
|
||||||
} else {
|
// } else {
|
||||||
Box(modifier = Modifier
|
// Box(modifier = Modifier
|
||||||
.weight(1f)
|
// .weight(1f)
|
||||||
.clickable {
|
// .clickable {
|
||||||
scope.launch {
|
// scope.launch {
|
||||||
pagerState.animateScrollToPage(page = i)
|
// pagerState.animateScrollToPage(page = i)
|
||||||
}
|
// }
|
||||||
}, contentAlignment = Alignment.Center) {
|
// }, contentAlignment = Alignment.Center) {
|
||||||
Text(text = titleList[i], color = white80)
|
// Text(text = titleList[i], color = white80)
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
HorizontalPager(state = pagerState, modifier = Modifier
|
HorizontalPager(state = pagerState, modifier = Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
|
@ -213,11 +213,6 @@ class ConfirmEleVm : IServicingVm<ConfirmEleVm.Action, ConfirmEleVm.UiState>() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if (eleWorkOrderBean.serverAcceptCarSignPath.isNullOrBlank() || eleWorkOrderBean.serverServicePeopleSignPath.isNullOrBlank()) {
|
|
||||||
updateState(uiState.value.copy(showOfflineDialog = true))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! getCurrentOrderOfflineTask().isNullOrEmpty()) {
|
if (! getCurrentOrderOfflineTask().isNullOrEmpty()) {
|
||||||
uploadOffline()
|
uploadOffline()
|
||||||
return
|
return
|
||||||
|
Reference in New Issue
Block a user