From a988e7c15f5ce63785b77e01c89bec2565668982 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期日, 25 六月 2023 14:59:39 +0800
Subject: [PATCH] 修改bug
---
app/src/main/java/com/kuanzhai/driver/ui/main/add_order/AddCityOrderActivity.kt | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/app/src/main/java/com/kuanzhai/driver/ui/main/add_order/AddCityOrderActivity.kt b/app/src/main/java/com/kuanzhai/driver/ui/main/add_order/AddCityOrderActivity.kt
index e462fab..150b07d 100644
--- a/app/src/main/java/com/kuanzhai/driver/ui/main/add_order/AddCityOrderActivity.kt
+++ b/app/src/main/java/com/kuanzhai/driver/ui/main/add_order/AddCityOrderActivity.kt
@@ -176,6 +176,7 @@
map["startLon"] = startLon
map["totalSeat"] = totalSeat
map["travelMode"] = travelMode
+ map["type"] = orderType
map["travelTime"] = DateUtil.getTime(DateUtil.TYPE0, System.currentTimeMillis())
if (majorSureMoneyAdapter.data.isNotEmpty()){
map["additionalFee"] = gson.toJson(majorSureMoneyAdapter.data)
@@ -218,6 +219,7 @@
): Boolean {
tv_order_type.text = list[options1]
orderType = if (options1 == 0) 3 else if (options1 == 1) 8 else 9
+ clearByType(0)
return false
}
})
@@ -229,12 +231,16 @@
toast("请先选择起点")
return@clickDelay
}
- startActivity<SelectCityStartActivity>("startCityId" to startCityId)
+ startActivity<SelectCityStartActivity>("startCityId" to startCityId,"orderType" to orderType)
}
ll_select_city_start.clickDelay {
- selectCityLocation = 1
- startActivity<SelectCityStartActivity>()
+ if (orderType == 0){
+ toast("请选择订单类型")
+ }else{
+ selectCityLocation = 1
+ startActivity<SelectCityStartActivity>("orderType" to orderType)
+ }
}
ll_select_car_num.clickDelay {
@@ -405,7 +411,7 @@
private fun downOrder(paytype: String, orderId: String,function: () -> Unit) {
var map = getMapByAny()
map["orderId"] = orderId
- map["orderType"] = "3"
+ map["orderType"] = orderType
map["payType"] = paytype
map["type"] = "2"
callNet(Api.payTaxiOrder, map) {
@@ -430,7 +436,6 @@
}
}
-
private fun callMoney(function: (QueryOrderMoneyBean.DataBean) -> Unit) {
var map = getMapByAny()
map["endLonLat"] = "$endLon,$endLat"
@@ -447,19 +452,6 @@
}
}
-
-// /***
-// * 根据排班id获取最大出行人数
-// */
-// private fun callPeopleNum() {
-// var map = getMapByAny()
-// map["id"] = lineShiftDriverId
-// callNet(Api.querySeat,map){
-// var bean = gson.fromJson<PeopleNumBean>(it,PeopleNumBean::class.java)
-// }
-//
-// }
-
override fun onEventMainThread(event: BaseEvent?) {
super.onEventMainThread(event)
@@ -590,8 +582,11 @@
startLon = ""
tv_up_point.text = ""
}
+ if(i < 1){
+ startCityName = ""
+ startCityId = ""
+ tv_start_point.text = ""
+ }
}
-
-
}
\ No newline at end of file
--
Gitblit v1.7.1