diff --git a/servicing/build.gradle b/servicing/build.gradle index 3e910b4..bae20b8 100644 --- a/servicing/build.gradle +++ b/servicing/build.gradle @@ -73,7 +73,7 @@ publishing { release(MavenPublication) { groupId = 'io.github.szl9' artifactId = 'zd_servicing' - version = "1.0.1.9.9.33" + version = "1.0.1.9.9.37" pom { packaging = "aar" diff --git a/servicing/src/main/java/com/za/common/GlobalData.kt b/servicing/src/main/java/com/za/common/GlobalData.kt index fe5ed19..8333d7f 100644 --- a/servicing/src/main/java/com/za/common/GlobalData.kt +++ b/servicing/src/main/java/com/za/common/GlobalData.kt @@ -17,10 +17,10 @@ object GlobalData : GlobalLocalData() { var token : String? = null get() { - return mmkv.decodeString("ZD_TOKEN", null) + return mmkv.decodeString("TOKEN", null) } set(value) { - mmkv.encode("ZD_TOKEN", value) + mmkv.encode("TOKEN", value) field = value } @@ -73,10 +73,10 @@ object GlobalData : GlobalLocalData() { //是否已经完成登录后的人脸识别 var isLoginRecognition : Boolean? = null get() { - return mmkv.decodeBool("isLoginRecognition", true) + return mmkv.decodeBool("isLoginRecognition", false) } set(value) { - mmkv.encode("isLoginRecognition", value ?: true) + mmkv.encode("isLoginRecognition", value == true) field = value } @@ -98,7 +98,7 @@ object GlobalData : GlobalLocalData() { return mmkv.decodeParcelable("currentLocation", AMapLocation::class.java) } set(value) { - value?.time= System.currentTimeMillis() + value?.time = System.currentTimeMillis() mmkv.encode("currentLocation", value) field = value } diff --git a/servicing/src/main/java/com/za/ui/servicing/in_servicing_setting/OrderDetailScreen.kt b/servicing/src/main/java/com/za/ui/servicing/in_servicing_setting/OrderDetailScreen.kt index f2ee8ee..2be907f 100644 --- a/servicing/src/main/java/com/za/ui/servicing/in_servicing_setting/OrderDetailScreen.kt +++ b/servicing/src/main/java/com/za/ui/servicing/in_servicing_setting/OrderDetailScreen.kt @@ -1,42 +1,26 @@ 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.Row 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.width import androidx.compose.foundation.pager.HorizontalPager 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.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext 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.bean.db.order.OrderInfo import com.za.ext.finish -import kotlinx.coroutines.launch @Composable fun OrderDetailScreen(orderInfo: OrderInfo?) { val context = LocalContext.current - val titleList = listOf("订单详情", "案件照片") +// val titleList = listOf("订单详情", "案件照片") + val titleList = listOf("订单详情") val pagerState = rememberPagerState(initialPage = 0, pageCount = { titleList.size }) val scope = rememberCoroutineScope() Scaffold(topBar = { @@ -46,37 +30,37 @@ fun OrderDetailScreen(orderInfo: OrderInfo?) { .fillMaxSize() .padding(it)) { - Row(modifier = Modifier - .fillMaxWidth() - .horizontalScroll(state = rememberScrollState()) - .height(30.dp) - .background(color = headBgColor), verticalAlignment = Alignment.CenterVertically) { - for (i in 0 until pagerState.pageCount) { - if (pagerState.currentPage == i) { - Column(modifier = Modifier - .weight(1f), - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally) { - Text(text = titleList[i], color = Color.White) - HorizontalDivider(thickness = 0.dp, - modifier = Modifier - .width(25.dp) - .height(3.dp) - .background(color = Color.White, shape = RoundedCornerShape(8.dp))) - } - } else { - Box(modifier = Modifier - .weight(1f) - .clickable { - scope.launch { - pagerState.animateScrollToPage(page = i) - } - }, contentAlignment = Alignment.Center) { - Text(text = titleList[i], color = white80) - } - } - } - } +// Row(modifier = Modifier +// .fillMaxWidth() +// .horizontalScroll(state = rememberScrollState()) +// .height(30.dp) +// .background(color = headBgColor), verticalAlignment = Alignment.CenterVertically) { +// for (i in 0 until pagerState.pageCount) { +// if (pagerState.currentPage == i) { +// Column(modifier = Modifier +// .weight(1f), +// verticalArrangement = Arrangement.Center, +// horizontalAlignment = Alignment.CenterHorizontally) { +// Text(text = titleList[i], color = Color.White) +// HorizontalDivider(thickness = 0.dp, +// modifier = Modifier +// .width(25.dp) +// .height(3.dp) +// .background(color = Color.White, shape = RoundedCornerShape(8.dp))) +// } +// } else { +// Box(modifier = Modifier +// .weight(1f) +// .clickable { +// scope.launch { +// pagerState.animateScrollToPage(page = i) +// } +// }, contentAlignment = Alignment.Center) { +// Text(text = titleList[i], color = white80) +// } +// } +// } +// } HorizontalPager(state = pagerState, modifier = Modifier .fillMaxSize() diff --git a/servicing/src/main/java/com/za/ui/servicing/order_confirm/ConfirmEleVm.kt b/servicing/src/main/java/com/za/ui/servicing/order_confirm/ConfirmEleVm.kt index 44922ef..321ec14 100644 --- a/servicing/src/main/java/com/za/ui/servicing/order_confirm/ConfirmEleVm.kt +++ b/servicing/src/main/java/com/za/ui/servicing/order_confirm/ConfirmEleVm.kt @@ -212,12 +212,7 @@ class ConfirmEleVm : IServicingVm() { showTipDialog("请先上传签名!") return } - - if (eleWorkOrderBean.serverAcceptCarSignPath.isNullOrBlank() || eleWorkOrderBean.serverServicePeopleSignPath.isNullOrBlank()) { - updateState(uiState.value.copy(showOfflineDialog = true)) - return - } - + if (! getCurrentOrderOfflineTask().isNullOrEmpty()) { uploadOffline() return