司机注册跳转优化,图片位置上传

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= "",

app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthBankCardActivity.kt

@@ -32,9 +32,7 @@ class AuthBankCardActivity : BaseActivity<ActivityAuthBankcardBinding>() {
 
     override fun initView(savedInstanceState: Bundle?) {
         setStatusBarColor(R.color.white)
-        setTitleBar("实名认证"){
+        setTitleBar("实名认证",true)
-            ActivityUtils.startActivity(mContext, HomeActivity::class.java)
-        }
 
         binding.run {
             btnOk.setOnClickListener {
@@ -105,7 +103,7 @@ class AuthBankCardActivity : BaseActivity<ActivityAuthBankcardBinding>() {
                     override fun onSuccess(t: CommonResponseBean<Any>) {
                         super.onSuccess(t)
                         ActivityUtils.startActivity(mContext, AuthFaceActivity::class.java)
-                        finish()
+//                        finish()
                     }
                 }))
         }

app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDriverActivity.kt

@@ -38,9 +38,7 @@ class AuthDriverActivity : BaseActivity<ActivityAuthDriverBinding>() {
 
     override fun initView(savedInstanceState: Bundle?) {
         setStatusBarColor(R.color.white)
-        setTitleBar("实名认证") {
+        setTitleBar("实名认证",true)
-            ActivityUtils.startActivity(mContext, HomeActivity::class.java)
-        }
 
         binding.run {
             btnOk.setOnClickListener {
@@ -132,7 +130,6 @@ class AuthDriverActivity : BaseActivity<ActivityAuthDriverBinding>() {
                         )
                     }
 
-                    finish()
                 }
             }))
     }

app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthPersonActivity.kt

@@ -78,7 +78,7 @@ class AuthPersonActivity : BaseActivity<ActivityAuthPersonBinding>() {
                         override fun onSuccess(t: CommonResponseBean<Any>) {
                             super.onSuccess(t)
                             ActivityUtils.startActivity(mContext, AuthDriverActivity::class.java)
-                            finish()
+//                            finish()
                         }
                     }))
 
@@ -167,8 +167,11 @@ class AuthPersonActivity : BaseActivity<ActivityAuthPersonBinding>() {
                     }
             }
         }
+    }
 
-
+    override fun onBackPressed() {
+        super.onBackPressed()
+        ActivityUtils.startActivity(mContext,HomeActivity::class.java)
     }
 
     override fun initDate() {

app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthQualificationActivity.kt

@@ -31,9 +31,7 @@ class AuthQualificationActivity : BaseActivity<ActivityAuthQualificationBinding>
     var upQuaInfo = UpQualiInfoBean()
     override fun initView(savedInstanceState: Bundle?) {
         setStatusBarColor(R.color.white)
-        setTitleBar("实名认证"){
+        setTitleBar("实名认证",true)
-            ActivityUtils.startActivity(mContext, HomeActivity::class.java)
-        }
 
         binding.run {
 //            etId.setText(SPUtils.instance.getUserInfo(mContext).idcard)
@@ -89,7 +87,7 @@ class AuthQualificationActivity : BaseActivity<ActivityAuthQualificationBinding>
                     override fun onSuccess(t: CommonResponseBean<Any>) {
                         super.onSuccess(t)
                         ActivityUtils.startActivity(mContext, AuthBankCardActivity::class.java)
-                        finish()
+//                        finish()
                     }
                 }))
         }

app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillAppraiseActivity.kt

@@ -169,7 +169,8 @@ class WaybillAppraiseActivity : BaseActivity<ActivityWaybillUnloadBinding>() {
                         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<ActivityWaybillUnloadBinding>() {
                                     if (allGranted) {
                                         BaseUtils.callPhone(
                                             this@WaybillAppraiseActivity,
-                                            orderBean.phone
+                                            phone
                                         )
                                     } else {
                                         Toast.makeText(

app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillLoadActivity.kt

@@ -174,7 +174,8 @@ class WaybillLoadActivity : BaseActivity<ActivityWaybillLoadBinding>() {
                         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<ActivityWaybillLoadBinding>() {
                                     if (allGranted) {
                                         BaseUtils.callPhone(
                                             this@WaybillLoadActivity,
-                                            orderBean.phone
+                                            phone
                                         )
                                     } else {
                                         Toast.makeText(

app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUnlLoadActivity.kt

@@ -172,7 +172,8 @@ class WaybillUnlLoadActivity : BaseActivity<ActivityWaybillUnloadBinding>() {
                         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<ActivityWaybillUnloadBinding>() {
                                     if (allGranted) {
                                         BaseUtils.callPhone(
                                             this@WaybillUnlLoadActivity,
-                                            orderBean.phone
+                                            phone
                                         )
                                     } else {
                                         Toast.makeText(

app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt

@@ -134,6 +134,7 @@ class WaybillUpPicActivity : BaseActivity<ActivityWaybillUppicBinding>() {
                                     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<ActivityWaybillUppicBinding>() {
                                     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<ActivityWaybillUppicBinding>() {
     }
 
     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<ActivityWaybillUppicBinding>() {
                                 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) {