From 1128afd3a9e45d09d8c345d2ed901a1e585a4393 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期四, 13 六月 2024 15:44:43 +0800
Subject: [PATCH] 简化代客下单
---
app/src/main/java/com/future/driver/ui/main/add_order/AddCityOrderActivity.kt | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/future/driver/ui/main/add_order/AddCityOrderActivity.kt b/app/src/main/java/com/future/driver/ui/main/add_order/AddCityOrderActivity.kt
index 0a043a9..f739825 100644
--- a/app/src/main/java/com/future/driver/ui/main/add_order/AddCityOrderActivity.kt
+++ b/app/src/main/java/com/future/driver/ui/main/add_order/AddCityOrderActivity.kt
@@ -1,5 +1,6 @@
package com.future.driver.ui.main.add_order
+import android.content.Intent
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import cn.sinata.xldutils.utils.clickDelay
@@ -28,6 +29,7 @@
import kotlinx.android.synthetic.main.pop_select_type_to.view.*
import org.jetbrains.anko.toast
import org.jetbrains.anko.startActivity
+import org.jetbrains.anko.startActivityForResult
/**
@@ -207,11 +209,11 @@
}
ll_select_car_line.clickDelay {
- if (startCityId.isEmpty() || endCityId.isEmpty()) {
- toast("请先选择起点和终点")
- return@clickDelay
- }
- startActivity<SelectLineActivity>("endId" to endCityId, "startId" to startCityId)
+// if (startCityId.isEmpty() || endCityId.isEmpty()) {
+// toast("请先选择起点和终点")
+// return@clickDelay
+// }
+ startActivityForResult<SelectLineActivity>(1,"endId" to endCityId, "startId" to startCityId)
}
ll_start_point.clickDelay {
@@ -447,7 +449,6 @@
classStartTime = data.startTime
carId = data.carId.toString()
driverId = data.driverId.toString()
- tv_select_class.text = data.allTime
laveSeatNumber = data.laveSeatNumber
totalSeat = data.totalSeat
hasPeopleNum = data.laveSeat
@@ -455,6 +456,8 @@
tv_driver.text = data.name
tv_car_num.text = data.carLicensePlate
clearByType(4)
+ tv_select_class.text = data.allTime
+ tv_line.text = lineName
}
BaseEvent.SELECT_POINT_SITE_DETAIL -> {
@@ -546,5 +549,18 @@
}
-
+ override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+ super.onActivityResult(requestCode, resultCode, data)
+ if (data != null){
+ startCityId = data.getStringExtra("startCityId")?:""
+ startCityName = data.getStringExtra("startCity")?:""
+ startSiteName = data.getStringExtra("startSite")?:""
+ endCityId = data.getStringExtra("endCityId")?:""
+ endCityName = data.getStringExtra("endCity")?:""
+ endSiteName = data.getStringExtra("endSite")?:""
+ lineId = data.getStringExtra("id")?:""
+ lineName = data.getStringExtra("name")?:""
+ startActivity<SelectClassActivity>("lineId" to lineId, "startCityName" to startSiteName, "endCityName" to endSiteName)
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1