添加多处校验

app/src/main/java/com/arpa/hndahesudintocctmsdriver/adapter/WaybillListAdapter.kt

@@ -39,9 +39,15 @@ class WaybillListAdapter(var isCap: Boolean) :
                 } else {
                     if (it.orderStatus == "102040" || it.orderStatus == "102050") {
                         setGone(R.id.btnOk, false)
-                    } else if (it.driverEvaluationStatus != "1" && (it.orderStatus == "102060" || it.orderStatus == "102070" || it.orderStatus == "102090")) {
+                    } else if (it.orderStatus == "102060" || it.orderStatus == "102070" || it.orderStatus == "102090") {
                         //三种状态下 并且未评论为 true显示
-                        setGone(R.id.btnOk, false)
+                        if (it.driverEvaluationStatus=="1"){
+                            setGone(R.id.btnOk, true)
+                        }else{
+                            setGone(R.id.btnOk, false)
+                        }
+
+
                     }else if (it.orderStatus == "103000"){
                         setGone(R.id.btnOk, true)
                         setTextColorRes(R.id.tvStatu,R.color.color_9)

app/src/main/java/com/arpa/hndahesudintocctmsdriver/base/AppConfig.kt

@@ -11,6 +11,7 @@ object AppConfig {
     const val BUGLY_APP_ID = "0fa55ffad8"
     const val TIME = "DA_HE_TIME"
     const val ID = "DA_HE_ID"
+    const val USER_CARID = "DA_HE_USER_CARID"
     const val DATA = "DA_HE_DATA"
     const val PHONE = "DA_HE_PHONE"
     const val ORDER_ID = "DA_HE_ORDER_ID"

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/OrderDetailBean.kt

@@ -25,6 +25,7 @@ data class OrderDetailBean(
     val receiverBusinessCode: String,
     val receiverBusinessName: String,
     val receiverDeadline: String,
+    val driverEvaluationStatus: String,
     val requirement: String,
     val shipperContactName: String,
     val shipperContactPhone: String,
@@ -109,6 +110,8 @@ data class WaybillInfo(
     val unloadTime: String,
     var vehicleNum: String,
     val carLong: String,
+    val isEvaluation : String,
+    val isShipperEvaluation : String,
     val approvedLoad: String,
     val vehicleType: String,
     val waybillId: String

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDriverActivity.kt

@@ -2,6 +2,7 @@ package com.arpa.hndahesudintocctmsdriver.ui.account.authperson
 
 import android.os.Bundle
 import com.arpa.hndahesudintocctmsdriver.R
+import com.arpa.hndahesudintocctmsdriver.base.AppConfig
 import com.arpa.hndahesudintocctmsdriver.bean.UpDriverInfoBean
 import com.arpa.hndahesudintocctmsdriver.databinding.ActivityAuthDriverBinding
 import com.arpa.hndahesudintocctmsdriver.net.BaseObserver
@@ -13,6 +14,7 @@ import com.arpa.mylibrary.utils.PickerUtils
 import com.arpa.mylibrary.base.BaseActivity
 import com.arpa.mylibrary.net.CommonResponseBean
 import com.arpa.mylibrary.utils.ActivityUtils
+import com.arpa.mylibrary.utils.BaseSPUtils
 import com.arpa.mylibrary.utils.ImageLoader
 import com.arpa.mylibrary.utils.ToastUtils
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
@@ -95,6 +97,12 @@ class AuthDriverActivity : BaseActivity<ActivityAuthDriverBinding>() {
             return
         }
 
+        val userCarId = BaseSPUtils.get(mContext, AppConfig.USER_CARID, "").toString()
+        if (!userCarId.isNullOrEmpty()&&userCarId!=driverInfoBean.licenseNo){
+            showToast("驾驶证件号码与身份证号码不一致,请重新上传")
+            return
+        }
+
         if (driverInfoBean.licenseName != backLicName) {
             CommonPopUtils.getInstance().showCommCenterPop(mContext, content = "检测到主副页识别姓名不一致,是否继续上传？") {
                 upApi()

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt

@@ -276,6 +276,11 @@ class AuthDrivingActivity : BaseActivity<ActivityAuthDrivingBinding>() {
             owner = binding.etOwner.text.trim().toString()
             useNature = binding.etUseNature.text.trim().toString()
         }
+
+        if(upDrivingInfoBean.vehicleNum.contains("挂")){
+            showToast("车牌号码不合规")
+            return
+        }
         if (upDrivingInfoBean.licenseBackUrl.isNullOrEmpty()) {
             showToast("请完善车辆信息")
             return@subMit

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthPersonActivity.kt

@@ -3,6 +3,7 @@ package com.arpa.hndahesudintocctmsdriver.ui.account.authperson
 import android.os.Bundle
 import com.alibaba.idst.nui.DateUtil.DEFAULT_FORMAT_DATE
 import com.arpa.hndahesudintocctmsdriver.R
+import com.arpa.hndahesudintocctmsdriver.base.AppConfig
 import com.arpa.hndahesudintocctmsdriver.bean.UpPersonInfoBean
 import com.arpa.hndahesudintocctmsdriver.databinding.ActivityAuthPersonBinding
 import com.arpa.hndahesudintocctmsdriver.net.BaseObserver
@@ -10,9 +11,11 @@ import com.arpa.hndahesudintocctmsdriver.net.DataManager
 import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack
 import com.arpa.hndahesudintocctmsdriver.ui.HomeActivity
 import com.arpa.hndahesudintocctmsdriver.utils.OcrUtils
+import com.arpa.hndahesudintocctmsdriver.utils.SPUtils
 import com.arpa.mylibrary.base.BaseActivity
 import com.arpa.mylibrary.net.CommonResponseBean
 import com.arpa.mylibrary.utils.ActivityUtils
+import com.arpa.mylibrary.utils.BaseSPUtils
 import com.arpa.mylibrary.utils.ImageLoader
 import com.arpa.mylibrary.utils.PickerUtils
 import com.arpa.mylibrary.utils.TimeUtil
@@ -75,6 +78,7 @@ class AuthPersonActivity : BaseActivity<ActivityAuthPersonBinding>() {
                     .subscribe(BaseObserver(mContext, object : RxHttpCallBack<Any>() {
                         override fun onSuccess(t: CommonResponseBean<Any>) {
                             super.onSuccess(t)
+                            BaseSPUtils.put(mContext,AppConfig.USER_CARID,perInfoBean.idcardNo)
                             ActivityUtils.startActivity(mContext, AuthDriverActivity::class.java)
 //                            finish()
                         }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditDriverActivity.kt

@@ -16,6 +16,7 @@ import com.arpa.mylibrary.utils.PickerUtils
 import com.arpa.mylibrary.base.BaseActivity
 import com.arpa.mylibrary.net.CommonResponseBean
 import com.arpa.mylibrary.utils.ActivityUtils
+import com.arpa.mylibrary.utils.BaseSPUtils
 import com.arpa.mylibrary.utils.ImageLoader
 import com.arpa.mylibrary.utils.ToastUtils
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
@@ -144,6 +145,13 @@ class EditDriverActivity : BaseActivity<ActivityAuthDriverBinding>() {
             ToastUtils.showToast(mContext, "请完善信息")
             return
         }
+
+        val userCarId = BaseSPUtils.get(mContext, AppConfig.USER_CARID, "").toString()
+        if (!userCarId.isNullOrEmpty()&&userCarId!=driverInfoBean.licenseNo){
+            showToast("驾驶证件号码与身份证号码不一致,请重新上传")
+            return
+        }
+
         if (driverInfoBean.licenseName != backLicName) {
             CommonPopUtils.getInstance()
                 .showCommCenterPop(mContext, content = "检测到主副页识别姓名不一致,是否继续上传？") {

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditDrivingActivity.kt

@@ -319,7 +319,10 @@ class EditDrivingActivity : BaseActivity<ActivityAuthDrivingBinding>() {
             owner = binding.etOwner.text.trim().toString()
             useNature = binding.etUseNature.text.trim().toString()
         }
-
+        if(upDrivingInfoBean.vehicleNum.contains("挂")){
+            showToast("车牌号码不合规")
+            return
+        }
         if (upDrivingInfoBean.vehicleNum != backLicCarNum) {
             CommonPopUtils.getInstance().showCommCenterPop(
                 mContext,

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditPersonActivity.kt

@@ -14,6 +14,7 @@ import com.arpa.hndahesudintocctmsdriver.utils.UserUtils
 import com.arpa.mylibrary.base.BaseActivity
 import com.arpa.mylibrary.net.CommonResponseBean
 import com.arpa.mylibrary.utils.ActivityUtils
+import com.arpa.mylibrary.utils.BaseSPUtils
 import com.arpa.mylibrary.utils.ImageLoader
 import com.arpa.mylibrary.utils.PickerUtils
 import com.arpa.mylibrary.utils.TimeUtil
@@ -78,6 +79,7 @@ class EditPersonActivity : BaseActivity<ActivityAuthPersonBinding>() {
                     .subscribe(BaseObserver(mContext, object : RxHttpCallBack<Any>() {
                         override fun onSuccess(t: CommonResponseBean<Any>) {
                             super.onSuccess(t)
+                            BaseSPUtils.put(mContext,AppConfig.USER_CARID,perInfoBean.idcardNo)
                             showToast("修改成功")
                             val goNextPersonInfo = UserUtils.instance.goNextPersonInfo(perInfoBean)
                             if (goNextPersonInfo != null) {

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillAppraiseActivity.kt

@@ -63,7 +63,7 @@ class WaybillAppraiseActivity : BaseActivity<ActivityWaybillUnloadBinding>() {
                 SeeDocActivity::class.java,
                 Bundle().apply { putString(AppConfig.ORDER_ID, orderId) })
         }
-        binding.btnRight.visibility = if (SPUtils.instance.getUserInfo(mContext)?.isCarCaptain=="1") View.GONE else View.VISIBLE
+//        binding.btnRight.visibility = if (SPUtils.instance.getUserInfo(mContext)?.isCarCaptain=="1") View.GONE else View.VISIBLE
         initRecy()
         getLocation()
         binding.run {
@@ -91,9 +91,9 @@ class WaybillAppraiseActivity : BaseActivity<ActivityWaybillUnloadBinding>() {
                     .getRoute(mContext, loadPos, unLoadPos, loadAddress, unLoadAddress)
             }
 
-            if (isRating){
+//            if (isRating){
-                btnRight.visibility = View.GONE
+//                btnRight.visibility = View.GONE
-            }
+//            }
 
             btnRight.setOnClickListener {
                 //去评价
@@ -141,7 +141,8 @@ class WaybillAppraiseActivity : BaseActivity<ActivityWaybillUnloadBinding>() {
                         tvWaybillNum.text = """运单号:${orderBean.orderNum}"""
                         tvWaybillStatu.text =
                             OrderUtils.getInstance().getOrderStatu(orderBean.orderStatus)
-                        btnRight.visibility = if (orderBean.orderStatus=="103000") View.GONE else View.VISIBLE
+//                        btnRight.visibility = if (orderBean.orderStatus=="103000") View.GONE else View.VISIBLE
+                        btnRight.visibility = if (orderBean.driverEvaluationStatus=="1"||SPUtils.instance.getUserInfo(mContext)?.isCarCaptain=="1") View.GONE else View.VISIBLE
                         tvTime.text = orderBean.receiverDeadline
                         tvComName.text = orderBean.realCompanyName//货主
 

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillDetailActivity.kt

@@ -62,6 +62,9 @@ class WaybillDetailActivity : BaseActivity<ActivityWaybillDetailBinding>() {
             BaseUtils.callPhone(this@WaybillDetailActivity, "15838201105")
         }
 
+        binding.ivBack.setOnClickListener {
+            finish()
+        }
         binding.btnReceiving.setOnClickListener {
             if (!::orderDetailInfo.isInitialized) {
                 ToastUtils.showToast(mContext, "请稍等,暂未获取订单信息")

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/fragment/AllWaybillFragment.kt

@@ -86,7 +86,7 @@ class AllWaybillFragment : BaseFragment<FragmentWaybillListBinding>(), RefreshCa
                             }
                         )
 
-                        "102070", "102090" -> ActivityUtils.startActivity(mContext,
+                        "102060","102070", "102090" -> ActivityUtils.startActivity(mContext,
                             WaybillAppraiseActivity::class.java,
                             Bundle().apply {
                                 putString(AppConfig.ORDER_ID, orderBean.orderId)
@@ -132,7 +132,7 @@ class AllWaybillFragment : BaseFragment<FragmentWaybillListBinding>(), RefreshCa
                                 putString(AppConfig.WAYBILL_ID, orderBean.waybillId)
                             })
 
-                        "102070", "102090" -> ActivityUtils.startActivity(
+                        "102060","102070", "102090" -> ActivityUtils.startActivity(
                             mContext,
                             WaybillRateActivity::class.java,
                             Bundle().apply {

app/src/main/res/layout/activity_waybill_detail.xml

@@ -24,6 +24,7 @@
             android:textSize="@dimen/sp_17" />
 
         <ImageView
+            android:id="@+id/ivBack"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_16"