From fe4b14176e3c8581ce8fd6c4dfa57633e1022e0b Mon Sep 17 00:00:00 2001 From: lijia Date: Thu, 25 Apr 2024 17:07:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E6=B3=A8=E5=86=8C=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E4=BC=98=E5=8C=96,=E5=9B=BE=E7=89=87=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/dahe/gldriver/bean/UpPicBean.kt | 1 + .../gldriver/ui/account/authperson/AuthBankCardActivity.kt | 6 ++---- .../gldriver/ui/account/authperson/AuthDriverActivity.kt | 5 +---- .../gldriver/ui/account/authperson/AuthPersonActivity.kt | 7 +++++-- .../ui/account/authperson/AuthQualificationActivity.kt | 6 ++---- .../ui/waybill/activity/WaybillAppraiseActivity.kt | 5 +++-- .../gldriver/ui/waybill/activity/WaybillLoadActivity.kt | 5 +++-- .../gldriver/ui/waybill/activity/WaybillUnlLoadActivity.kt | 5 +++-- .../gldriver/ui/waybill/activity/WaybillUpPicActivity.kt | 7 +++++++ 9 files changed, 27 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/dahe/gldriver/bean/UpPicBean.kt b/app/src/main/java/com/dahe/gldriver/bean/UpPicBean.kt index e51012b..c683404 100644 --- a/app/src/main/java/com/dahe/gldriver/bean/UpPicBean.kt +++ b/app/src/main/java/com/dahe/gldriver/bean/UpPicBean.kt @@ -14,6 +14,7 @@ data class UpPicBean( var cityCode: String= "", var latitude: String= "", var longitude: String= "", + var location: String= "", var orderChildreId: String= "", var orderId: String= "", var province: String= "", diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthBankCardActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthBankCardActivity.kt index 235b1f0..907c0a4 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthBankCardActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthBankCardActivity.kt @@ -32,9 +32,7 @@ class AuthBankCardActivity : BaseActivity() { override fun initView(savedInstanceState: Bundle?) { setStatusBarColor(R.color.white) - setTitleBar("实名认证"){ - ActivityUtils.startActivity(mContext, HomeActivity::class.java) - } + setTitleBar("实名认证",true) binding.run { btnOk.setOnClickListener { @@ -105,7 +103,7 @@ class AuthBankCardActivity : BaseActivity() { override fun onSuccess(t: CommonResponseBean) { super.onSuccess(t) ActivityUtils.startActivity(mContext, AuthFaceActivity::class.java) - finish() +// finish() } })) } diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDriverActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDriverActivity.kt index 22dd23c..ed9e8f0 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDriverActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDriverActivity.kt @@ -38,9 +38,7 @@ class AuthDriverActivity : BaseActivity() { override fun initView(savedInstanceState: Bundle?) { setStatusBarColor(R.color.white) - setTitleBar("实名认证") { - ActivityUtils.startActivity(mContext, HomeActivity::class.java) - } + setTitleBar("实名认证",true) binding.run { btnOk.setOnClickListener { @@ -132,7 +130,6 @@ class AuthDriverActivity : BaseActivity() { ) } - finish() } })) } diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthPersonActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthPersonActivity.kt index 154e3e9..ae28228 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthPersonActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthPersonActivity.kt @@ -78,7 +78,7 @@ class AuthPersonActivity : BaseActivity() { override fun onSuccess(t: CommonResponseBean) { super.onSuccess(t) ActivityUtils.startActivity(mContext, AuthDriverActivity::class.java) - finish() +// finish() } })) @@ -167,8 +167,11 @@ class AuthPersonActivity : BaseActivity() { } } } + } - + override fun onBackPressed() { + super.onBackPressed() + ActivityUtils.startActivity(mContext,HomeActivity::class.java) } override fun initDate() { diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthQualificationActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthQualificationActivity.kt index 36303a0..9cf7d65 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthQualificationActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthQualificationActivity.kt @@ -31,9 +31,7 @@ class AuthQualificationActivity : BaseActivity var upQuaInfo = UpQualiInfoBean() override fun initView(savedInstanceState: Bundle?) { setStatusBarColor(R.color.white) - setTitleBar("实名认证"){ - ActivityUtils.startActivity(mContext, HomeActivity::class.java) - } + setTitleBar("实名认证",true) binding.run { // etId.setText(SPUtils.instance.getUserInfo(mContext).idcard) @@ -89,7 +87,7 @@ class AuthQualificationActivity : BaseActivity override fun onSuccess(t: CommonResponseBean) { super.onSuccess(t) ActivityUtils.startActivity(mContext, AuthBankCardActivity::class.java) - finish() +// finish() } })) } diff --git a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillAppraiseActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillAppraiseActivity.kt index d5bac3d..47fa7dc 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillAppraiseActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillAppraiseActivity.kt @@ -169,7 +169,8 @@ class WaybillAppraiseActivity : BaseActivity() { if (!t.data.requirement.isNullOrEmpty()) tvRemark.text = t.data.requirement btnLeft.setOnClickListener { - if (orderBean.phone.isNullOrEmpty()) { + var phone = orderBean.orderChildList.findLast { it.type=="2" }?.phone + if (phone.isNullOrEmpty()) { ToastUtils.showToast(mContext, "未获取到手机号码") return@setOnClickListener } @@ -179,7 +180,7 @@ class WaybillAppraiseActivity : BaseActivity() { if (allGranted) { BaseUtils.callPhone( this@WaybillAppraiseActivity, - orderBean.phone + phone ) } else { Toast.makeText( 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 80cf1f4..8ea7cb5 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 @@ -174,7 +174,8 @@ class WaybillLoadActivity : BaseActivity() { if (!t.data.requirement.isNullOrEmpty()) tvRemark.text = t.data.requirement btnLeft.setOnClickListener { - if (orderBean.phone.isNullOrEmpty()){ + val phone = orderBean.orderChildList.first { it.type == "1" }.phone + if (phone.isNullOrEmpty()){ ToastUtils.showToast(mContext,"未获取到手机号码") return@setOnClickListener } @@ -184,7 +185,7 @@ class WaybillLoadActivity : BaseActivity() { if (allGranted) { BaseUtils.callPhone( this@WaybillLoadActivity, - orderBean.phone + phone ) } else { Toast.makeText( diff --git a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUnlLoadActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUnlLoadActivity.kt index 81d1e32..f2ebdbf 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUnlLoadActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUnlLoadActivity.kt @@ -172,7 +172,8 @@ class WaybillUnlLoadActivity : BaseActivity() { if (!t.data.requirement.isNullOrEmpty()) tvRemark.text = t.data.requirement btnLeft.setOnClickListener { - if (orderBean.phone.isNullOrEmpty()){ + var phone = orderBean.orderChildList.findLast { it.type=="2" }?.phone + if (phone.isNullOrEmpty()){ ToastUtils.showToast(mContext,"未获取到手机号码") return@setOnClickListener } @@ -182,7 +183,7 @@ class WaybillUnlLoadActivity : BaseActivity() { if (allGranted) { BaseUtils.callPhone( this@WaybillUnlLoadActivity, - orderBean.phone + phone ) } else { Toast.makeText( diff --git a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt index fea0ef7..4b5a978 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt @@ -134,6 +134,7 @@ class WaybillUpPicActivity : BaseActivity() { picBean.run { localPhotoUrl = it[0].availablePath photoUrl = oldPath + location = binding.tvLoca.text.toString() receiptType = if (type == 1) "4" else if (type == 2) "5" else "6" this.type = "3" @@ -163,6 +164,7 @@ class WaybillUpPicActivity : BaseActivity() { picBean.run { localPhotoUrl = it[0].availablePath photoUrl = oldPath + location = binding.tvLoca.text.toString() receiptType = if (type == 1) "4" else if (type == 2) "5" else "6" this.type = "3" @@ -207,6 +209,10 @@ class WaybillUpPicActivity : BaseActivity() { } private fun subMit(orderType: Int?) { + if (!::latLng.isInitialized){ + ToastUtils.showToast(mContext,"未获取到定位,请重新获取位置") + return + } upBean.run { orderId = this@WaybillUpPicActivity.orderId waybillId = this@WaybillUpPicActivity.waybillId @@ -570,6 +576,7 @@ class WaybillUpPicActivity : BaseActivity() { picBean.run { localPhotoUrl = it[0].availablePath photoUrl = oldPath + location = binding.tvLoca.text.toString() this.type = if (goodType == 1) "1" else "2" } if (upBean.waybillPhotoList.find { it.type == if (goodType == 1) "1" else "2" } == null) {