From 35b9d7c24e07205eb8d59f47beb437503f429a6b Mon Sep 17 00:00:00 2001 From: lijia Date: Tue, 16 Apr 2024 10:28:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E8=BD=A6=E9=97=AE=E9=A2=98=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dahe/gldriver/bean/OcrBean.kt | 1 + .../java/com/dahe/gldriver/bean/UpInfoBean.kt | 5 +- .../account/authperson/AuthDrivingActivity.kt | 32 +++++++- .../account/authperson/AuthTrailerActivity.kt | 30 ++++++++ .../account/authperson/EditDrivingActivity.kt | 32 +++++++- .../account/authperson/EditTrailerActivity.kt | 77 ++++++++++++++++--- .../waybill/activity/WaybillLoadActivity.kt | 2 + 7 files changed, 160 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/dahe/gldriver/bean/OcrBean.kt b/app/src/main/java/com/dahe/gldriver/bean/OcrBean.kt index a828ed6..98913db 100644 --- a/app/src/main/java/com/dahe/gldriver/bean/OcrBean.kt +++ b/app/src/main/java/com/dahe/gldriver/bean/OcrBean.kt @@ -64,6 +64,7 @@ data class DataX( val birthDate: String = "", val ethnicity: String = "", val idNumber: String = "", + val engineNumber: String = "", val name: String = "", val sex: String = "", val issueAuthority: String = "",//哈尔滨市公安局呼兰分局 diff --git a/app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt b/app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt index b50c619..f2d86eb 100644 --- a/app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt +++ b/app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt @@ -13,7 +13,7 @@ data class UpPersonInfoBean( var idcardEthnicity: String = "", var idcardEffectiveStart: String = "", var idcardEffectiveEnd: String = "", - var idcardIsEndless: String = "", + var idcardIsEndless: String = "0", var idcardFrontUrl: String = "", var idcardBackUrl: String = "", var idcardAddress: String = "" @@ -45,6 +45,9 @@ data class UpDrivingInfoBean( var barcodeNumber: String = "", var carHeight: String = "", var carLong: String = "", + var trailerHeight: String = "", + var trailerWidth: String = "", + var trailerLong: String = "", var carUrl: String = "", var carId: String = "", var trailerId: String = "", diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt index 498282a..547acca 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt @@ -33,6 +33,8 @@ class AuthDrivingActivity : BaseActivity() { var upDrivingInfoBean = UpDrivingInfoBean() + + var backLicCarNum = "" override fun initView(savedInstanceState: Bundle?) { setStatusBarColor(R.color.white) setTitleBar("实名认证") { @@ -138,6 +140,14 @@ class AuthDrivingActivity : BaseActivity() { var isHasFow = it.vehicleType.contains("牵引车") upDrivingInfoBean.isTrailer = if (isHasFow) "1" else "0"//是否有挂车(0否 1是) + upDrivingInfoBean.run { + engineNo = it.engineNumber + vinCode = it.vinCode + model = it.model + licenseRegisterDate = it.registrationDate + licenseIssueDate = it.issueDate + address = it.address + } //识别车辆类型后，调用接口匹配code值！！！？？？ DicUtils.getInstance() @@ -175,6 +185,17 @@ class AuthDrivingActivity : BaseActivity() { upDrivingInfoBean.licenseBackUrl = picPath.picPath//行驶证照片（反面） result?.data?.back?.data?.let { + backLicCarNum = it.licensePlateNumber + + upDrivingInfoBean.run { + inspectionRecord = it.inspectionRecord + recordNumber = it.recordNumber + barcodeNumber = it.barcodeNumber + passengerCapacity = it.passengerCapacity + totalWeight = if (it.totalWeight.contains("kg")) it.totalWeight.split("kg")[0] else "" + curbWeight = if (it.curbWeight.contains("kg")) it.curbWeight.split("kg")[0] else "" + } + if (it.inspectionRecord.length > 13) { val changeDateNoneFormat = TimeUtil.changeDateNoneFormat( it.inspectionRecord.substring(6, 14), @@ -208,9 +229,9 @@ class AuthDrivingActivity : BaseActivity() { var overall = it.overallDimension.replace("mm", "") var splits = overall.split("×") if (splits.size == 3) { - upDrivingInfoBean.carLong = splits[0] - upDrivingInfoBean.carWidth = splits[1] - upDrivingInfoBean.carHeight = splits[2] + upDrivingInfoBean.carLong = if (splits[0].toIntOrNull()!=null) splits[0] else "" + upDrivingInfoBean.carWidth = if (splits[1].toIntOrNull()!=null) splits[1] else "" + upDrivingInfoBean.carHeight = if (splits[2].toIntOrNull()!=null) splits[2] else "" } } @@ -248,6 +269,11 @@ class AuthDrivingActivity : BaseActivity() { useNature = binding.etUseNature.text.trim().toString() } + if (upDrivingInfoBean.vehicleNum!=backLicCarNum){ + ToastUtils.showToast(mContext,"主副页车牌号码不一致,请重新上传") + return + } + DataManager.getInstance().addCar(upDrivingInfoBean) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthTrailerActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthTrailerActivity.kt index 7acdb9c..adc3901 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthTrailerActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthTrailerActivity.kt @@ -104,6 +104,16 @@ class AuthTrailerActivity : BaseActivity() { result?.data?.face?.data?.let { + upDrivingInfoBean.run { + engineNo = it.engineNumber + vinCode = it.vinCode + model = it.model + licenseRegisterDate = it.registrationDate + licenseIssueDate = it.issueDate + address = it.address + owner = it.owner + } + //识别车辆类型后，调用接口匹配code值！！！？？？ DicUtils.getInstance() .getCarTypeByValue(mContext, it.vehicleType) { position, item -> @@ -137,6 +147,25 @@ class AuthTrailerActivity : BaseActivity() { upDrivingInfoBean.licenseBackUrl = picPath.picPath//行驶证照片（反面） result?.data?.back?.data?.let { + upDrivingInfoBean.run { + inspectionRecord = it.inspectionRecord + recordNumber = it.recordNumber + barcodeNumber = it.barcodeNumber + passengerCapacity = it.passengerCapacity + totalWeight = if (it.totalWeight.contains("kg")) it.totalWeight.split("kg")[0] else "" + curbWeight = if (it.curbWeight.contains("kg")) it.curbWeight.split("kg")[0] else "" + } + + //车长 + if (it.overallDimension.contains("mm")) { + var overall = it.overallDimension.replace("mm", "") + var splits = overall.split("×") + if (splits.size == 3) { + upDrivingInfoBean.carLong = if (splits[0].toIntOrNull()!=null) splits[0] else "" + upDrivingInfoBean.carWidth = if (splits[1].toIntOrNull()!=null) splits[1] else "" + upDrivingInfoBean.carHeight = if (splits[2].toIntOrNull()!=null) splits[2] else "" + } + } if (it.inspectionRecord.length > 19) { //行驶证到期时间 // val changeDateNoneFormat = TimeUtil.changeDateNoneFormat( @@ -169,6 +198,7 @@ class AuthTrailerActivity : BaseActivity() { vehicleNum = binding.etCarNum.text.trim().toString() vehicleType = binding.tvCarType.text.trim().toString()//车辆类型 trailerPlateColor = binding.tvCarColor.text.trim().toString() + useNature = binding.etUseNature.text.trim().toString() carId = this@AuthTrailerActivity.carId } diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditDrivingActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditDrivingActivity.kt index 8d09710..7d2f9ea 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditDrivingActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditDrivingActivity.kt @@ -34,6 +34,8 @@ class EditDrivingActivity : BaseActivity() { var upDrivingInfoBean = UpDrivingInfoBean() + + var backLicCarNum = "" override fun initView(savedInstanceState: Bundle?) { setStatusBarColor(R.color.white) setTitleBar("实名认证", true) @@ -187,6 +189,15 @@ class EditDrivingActivity : BaseActivity() { var isHasFow = it.vehicleType.contains("牵引车") upDrivingInfoBean.isTrailer = if (isHasFow) "1" else "0"//是否有挂车(0否 1是) + upDrivingInfoBean.run { + engineNo = it.engineNumber + vinCode = it.vinCode + model = it.model + licenseRegisterDate = it.registrationDate + licenseIssueDate = it.issueDate + address = it.address + } + //识别车辆类型后，调用接口匹配code值！！！？？？ DicUtils.getInstance() @@ -224,6 +235,16 @@ class EditDrivingActivity : BaseActivity() { upDrivingInfoBean.licenseBackUrl = picPath.picPath//行驶证照片（反面） result?.data?.back?.data?.let { + backLicCarNum = it.licensePlateNumber + upDrivingInfoBean.run { + inspectionRecord = it.inspectionRecord + recordNumber = it.recordNumber + barcodeNumber = it.barcodeNumber + passengerCapacity = it.passengerCapacity + totalWeight = if (it.totalWeight.contains("kg")) it.totalWeight.split("kg")[0] else "" + curbWeight = if (it.curbWeight.contains("kg")) it.curbWeight.split("kg")[0] else "" + } + if (it.inspectionRecord.length > 13) { val changeDateNoneFormat = TimeUtil.changeDateNoneFormat( it.inspectionRecord.substring(6, 14), @@ -248,9 +269,9 @@ class EditDrivingActivity : BaseActivity() { var overall = it.overallDimension.replace("mm", "") var splits = overall.split("×") if (splits.size == 3) { - upDrivingInfoBean.carLong = splits[0] - upDrivingInfoBean.carWidth = splits[1] - upDrivingInfoBean.carHeight = splits[2] + upDrivingInfoBean.carLong = if (splits[0].toIntOrNull()!=null) splits[0] else "" + upDrivingInfoBean.carWidth = if (splits[1].toIntOrNull()!=null) splits[1] else "" + upDrivingInfoBean.carHeight = if (splits[2].toIntOrNull()!=null) splits[2] else "" } } upDrivingInfoBean.run { @@ -293,6 +314,11 @@ class EditDrivingActivity : BaseActivity() { useNature = binding.etUseNature.text.trim().toString() } + if (upDrivingInfoBean.vehicleNum!=backLicCarNum){ + ToastUtils.showToast(mContext,"主副页车牌号码不一致,请重新上传") + return + } + DataManager.getInstance().editCar(upDrivingInfoBean) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditTrailerActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditTrailerActivity.kt index 844a528..6245366 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditTrailerActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditTrailerActivity.kt @@ -155,6 +155,16 @@ class EditTrailerActivity : BaseActivity() { result?.data?.face?.data?.let { + upDrivingInfoBean.run { + engineNo = it.engineNumber + vinCode = it.vinCode + model = it.model + licenseRegisterDate = it.registrationDate + licenseIssueDate = it.issueDate + address = it.address + owner = it.owner + } + //识别车辆类型后，调用接口匹配code值！！！？？？ DicUtils.getInstance() .getCarTypeByValue(mContext, it.vehicleType) { position, item -> @@ -188,6 +198,32 @@ class EditTrailerActivity : BaseActivity() { upDrivingInfoBean.licenseBackUrl = picPath.picPath//行驶证照片（反面） result?.data?.back?.data?.let { + + upDrivingInfoBean.run { + inspectionRecord = it.inspectionRecord + recordNumber = it.recordNumber + barcodeNumber = it.barcodeNumber + passengerCapacity = it.passengerCapacity + totalWeight = + if (it.totalWeight.contains("kg")) it.totalWeight.split("kg")[0] else "" + curbWeight = + if (it.curbWeight.contains("kg")) it.curbWeight.split("kg")[0] else "" + } + + //车长 + if (it.overallDimension.contains("mm")) { + var overall = it.overallDimension.replace("mm", "") + var splits = overall.split("×") + if (splits.size == 3) { + upDrivingInfoBean.trailerLong = + if (splits[0].toIntOrNull() != null) splits[0] else "" + upDrivingInfoBean.trailerWidth = + if (splits[1].toIntOrNull() != null) splits[1] else "" + upDrivingInfoBean.trailerHeight = + if (splits[2].toIntOrNull() != null) splits[2] else "" + } + } + if (it.inspectionRecord.length > 19) { //行驶证到期时间 // val changeDateNoneFormat = TimeUtil.changeDateNoneFormat( @@ -222,19 +258,36 @@ class EditTrailerActivity : BaseActivity() { vehicleNum = binding.etCarNum.text.trim().toString() vehicleType = binding.tvCarType.text.trim().toString()//车辆类型 trailerPlateColor = binding.tvCarColor.text.trim().toString() - carId = if (this@EditTrailerActivity.carId.toIntOrNull() != null) this@EditTrailerActivity.carId else "" + useNature = binding.etUseNature.text.trim().toString() + carId = + if (this@EditTrailerActivity.carId.toIntOrNull() != null) this@EditTrailerActivity.carId else "" + } + + if (this@EditTrailerActivity.carId.toIntOrNull() != null) { + DataManager.getInstance().addTrailer(upDrivingInfoBean) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { + override fun onSuccess(t: CommonResponseBean) { + super.onSuccess(t) + showToast("修改成功") + setResult(RESULT_OK) + finish() + } + })) + } else { + DataManager.getInstance().editTrailer(upDrivingInfoBean) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { + override fun onSuccess(t: CommonResponseBean) { + super.onSuccess(t) + showToast("修改成功") + setResult(RESULT_OK) + finish() + } + })) } - DataManager.getInstance().editTrailer(upDrivingInfoBean) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { - override fun onSuccess(t: CommonResponseBean) { - super.onSuccess(t) - showToast("修改成功") - setResult(RESULT_OK) - finish() - } - })) } } \ No newline at end of file diff --git a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillLoadActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillLoadActivity.kt index 92f71fe..9c1ef1e 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillLoadActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillLoadActivity.kt @@ -33,6 +33,7 @@ import com.dahe.mylibrary.recycleviewswipe.RecycleViewDivider import com.dahe.mylibrary.utils.ActivityUtils import com.dahe.mylibrary.utils.BaseUtils import com.dahe.mylibrary.utils.ConvertUtils +import com.dahe.mylibrary.utils.ImageLoader import com.dahe.mylibrary.utils.LoadingUtils import com.dahe.mylibrary.utils.ToastUtils import com.permissionx.guolindev.PermissionX @@ -150,6 +151,7 @@ class WaybillLoadActivity : BaseActivity() { OrderUtils.getInstance().getOrderStatu(orderBean.orderStatus) tvTime.text = orderBean.receiverDeadline tvComName.text = orderBean.realCompanyName//货主 + ImageLoader.getInstance().loadRoundImage(mContext,orderBean.avatar,8,ivHead) tvCarNum.text = orderBean.waybillInfo.vehicleNum tvCarLen.text =