diff --git a/servicing/build.gradle b/servicing/build.gradle index ceef4fc..cd5cbfe 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.63" + version = "1.0.1.9.9.68" pom { packaging = "aar" diff --git a/servicing/src/main/java/com/za/base/BaseActivity.kt b/servicing/src/main/java/com/za/base/BaseActivity.kt index 0b0b834..6613e27 100644 --- a/servicing/src/main/java/com/za/base/BaseActivity.kt +++ b/servicing/src/main/java/com/za/base/BaseActivity.kt @@ -58,4 +58,3 @@ abstract class BaseActivity : PushMessageActivity() { } - diff --git a/servicing/src/main/java/com/za/bean/db/order/PhotoTemplateInfo.kt b/servicing/src/main/java/com/za/bean/db/order/PhotoTemplateInfo.kt index 6c88214..29afe59 100644 --- a/servicing/src/main/java/com/za/bean/db/order/PhotoTemplateInfo.kt +++ b/servicing/src/main/java/com/za/bean/db/order/PhotoTemplateInfo.kt @@ -17,6 +17,7 @@ data class PhotoTemplateInfo( val photoUrl : String? = null, //封面地址 val photoName : String? = null, // 图片名称 val photoType : Int? = null, // 1 照片 2 电子工单 + val sort : Int? = null, //照片在后台的位置 val createTime : String? = null, //创建时间 val numbering : String? = null, // 图片编号 val recognizeType : Int? = null, //orc 识别类型 0 无 1 车牌号 2 车架号 @@ -40,7 +41,7 @@ data class PhotoTemplateInfo( val lat : Float? = null, val lng : Float? = null, val address : String? = null, - val showPingAnGiveUpPhoto: Int?=null,//值==1的时候并且符合到达现场取消就展示，其他不展示 + val showPingAnGiveUpPhoto : Int? = null, //值==1的时候并且符合到达现场取消就展示，其他不展示 ) { fun convertPhotoStatusStr(status : Int) : String { return when (status) { diff --git a/servicing/src/main/java/com/za/offline/OfflineUpdateTaskBean.kt b/servicing/src/main/java/com/za/offline/OfflineUpdateTaskBean.kt index fdd0fc3..5b3684a 100644 --- a/servicing/src/main/java/com/za/offline/OfflineUpdateTaskBean.kt +++ b/servicing/src/main/java/com/za/offline/OfflineUpdateTaskBean.kt @@ -39,6 +39,7 @@ data class OfflineUpdateTaskBean( val imageLocalPath: String? = null, val imageUploadPath: String? = null, val advanceTime: Long? = null, + val sort: Int?=null, val needWater:Boolean?=null, val needPhoneBrand:Boolean?=null, val photoLocalWaterMarkerPath: String? = null, diff --git a/servicing/src/main/java/com/za/room/RoomHelper.kt b/servicing/src/main/java/com/za/room/RoomHelper.kt index 72e41b5..192e3c8 100644 --- a/servicing/src/main/java/com/za/room/RoomHelper.kt +++ b/servicing/src/main/java/com/za/room/RoomHelper.kt @@ -11,7 +11,7 @@ import com.za.room.db.GlobalRoom @SuppressLint("StaticFieldLeak") object RoomHelper { - const val VERSION: Int = 39 + const val VERSION: Int = 40 private lateinit var mContext: Context var db: GlobalRoom? = null diff --git a/servicing/src/main/java/com/za/service/ZdPushServiceReceive.kt b/servicing/src/main/java/com/za/service/ZdPushServiceReceive.kt index fa80b55..919f9aa 100644 --- a/servicing/src/main/java/com/za/service/ZdPushServiceReceive.kt +++ b/servicing/src/main/java/com/za/service/ZdPushServiceReceive.kt @@ -118,6 +118,7 @@ class ZdPushServiceReceive : BroadcastReceiver() { confirm = { OrderGiveUpActivity.Companion.goOrderGiveUpActivity(activity, giveUpType = GIVE_UP_TYPE_NORMAL, + userOrderId = jpushBean.userOrderId, taskId = jpushBean.taskId) }).show(activity.supportFragmentManager, DIALOG_TAG_GIVE_UP) } else { diff --git a/servicing/src/main/java/com/za/ui/servicing/check_vehicle/CheckVehicleVm.kt b/servicing/src/main/java/com/za/ui/servicing/check_vehicle/CheckVehicleVm.kt index 5a91533..2e5f276 100644 --- a/servicing/src/main/java/com/za/ui/servicing/check_vehicle/CheckVehicleVm.kt +++ b/servicing/src/main/java/com/za/ui/servicing/check_vehicle/CheckVehicleVm.kt @@ -51,6 +51,7 @@ class CheckVehicleVm : IServicingVm( jsonObject["photoSource"] = item.photoSource jsonObject["path"] = item.photoUploadPath jsonObject["time"] = item.time + jsonObject["sort"] = item.sort jsonObject["lat"] = item.lat jsonObject["lng"] = item.lng jsonObject["address"] = item.address @@ -189,6 +190,7 @@ class InOperationVm : IServicingVm( jsonObject["realTakePhotoTime"] = item.realTakePhotoTime ?: "" jsonObject["photoSource"] = item.photoSource jsonObject["time"] = item.time + jsonObject["sort"] = item.sort jsonObject["lat"] = item.lat jsonObject["path"] = item.photoUploadPath jsonObject["lng"] = item.lng diff --git a/servicing/src/main/java/com/za/ui/servicing/order_confirm/real_order_confirm/OrderConfirmVm.kt b/servicing/src/main/java/com/za/ui/servicing/order_confirm/real_order_confirm/OrderConfirmVm.kt index 32c80c1..a27ced3 100644 --- a/servicing/src/main/java/com/za/ui/servicing/order_confirm/real_order_confirm/OrderConfirmVm.kt +++ b/servicing/src/main/java/com/za/ui/servicing/order_confirm/real_order_confirm/OrderConfirmVm.kt @@ -106,6 +106,7 @@ class OrderConfirmVm : IServicingVm Unit) { val uiState = vm.uiState.collectAsStateWithLifecycle() val context = LocalContext.current @@ -92,6 +94,7 @@ fun OrderGiveUpScreen(vm : OrderGiveUpVm = viewModel(), if (uiState.value.orderGiveUpSuccess == true) { context.finish() + onBack() } if (uiState.value.isGoNextPageDialog == true) { diff --git a/servicing/src/main/java/com/za/ui/servicing/order_give_up/OrderGiveUpVm.kt b/servicing/src/main/java/com/za/ui/servicing/order_give_up/OrderGiveUpVm.kt index 43b1bbe..88520a4 100644 --- a/servicing/src/main/java/com/za/ui/servicing/order_give_up/OrderGiveUpVm.kt +++ b/servicing/src/main/java/com/za/ui/servicing/order_give_up/OrderGiveUpVm.kt @@ -102,6 +102,7 @@ class OrderGiveUpVm : BaseVm() { jsonObject["realTakePhotoTime"] = item.realTakePhotoTime ?: "" jsonObject["photoSource"] = item.photoSource jsonObject["time"] = item.time + jsonObject["sort"] = item.sort jsonObject["lat"] = item.lat jsonObject["path"] = item.photoUploadPath jsonObject["lng"] = item.lng @@ -154,6 +155,7 @@ class OrderGiveUpVm : BaseVm() { jsonObject["realTakePhotoTime"] = item.realTakePhotoTime ?: "" jsonObject["photoSource"] = item.photoSource jsonObject["time"] = item.time + jsonObject["sort"] = item.sort jsonObject["lat"] = item.lat jsonObject["path"] = item.photoUploadPath jsonObject["lng"] = item.lng @@ -204,6 +206,7 @@ class OrderGiveUpVm : BaseVm() { jsonObject["realTakePhotoTime"] = item.realTakePhotoTime ?: "" jsonObject["photoSource"] = item.photoSource jsonObject["time"] = item.time + jsonObject["sort"] = item.sort jsonObject["lat"] = item.lat jsonObject["path"] = item.photoUploadPath jsonObject["lng"] = item.lng @@ -311,6 +314,10 @@ class OrderGiveUpVm : BaseVm() { return } + if (GlobalData.currentOrder?.taskId == uiState.value.taskId) { + updateState(uiState.value.copy(orderInfo = GlobalData.currentOrder)) + } + val eleWorkOrderBean = RoomHelper.db?.eleWorkOrderDao()?.getEleWorkOrder(uiState.value.orderInfo?.taskId ?: 0) val photoTemplateList = RoomHelper.db?.photoTemplateDao() @@ -334,16 +341,21 @@ class OrderGiveUpVm : BaseVm() { } + //0不展示 1 判断是否到达现场 是展示 不是不展示 其他都是展示 private fun handlerData(originDta : List?) : List { val list = arrayListOf() originDta?.forEach { + if (it.showPingAnGiveUpPhoto == 0) { + return@forEach + } if (it.showPingAnGiveUpPhoto == 1) { if (uiState.value.orderInfo?.taskState == "VERIFY" || uiState.value.orderInfo?.taskState == "EXAMINE") { list.add(it) + return@forEach } - } else { - list.add(it) + return@forEach } + list.add(it) } return list }