From 3033ff47f2c95c11a0354cceb4b39ce07fa26abe Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期二, 15 十二月 2020 11:08:48 +0800
Subject: [PATCH] 1:新增小件物流
---
app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt b/app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt
index 4ebcd96..af9d752 100644
--- a/app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt
@@ -62,7 +62,11 @@
class CargoActivity : MySlabBaseActivity() {
private fun callOver(contexts: Context, travelFee: Double) {
- MoneyBroadCastReceiver.callOver(contexts, travelFee)
+ callEnd(contexts, travelFee)
+ }
+
+ private fun callEnd(contexts: Context, travelFee: Double) {
+ showChangeCargoDialog()
}
private fun callStatue(contexts: Context, i: Int) {
@@ -303,7 +307,7 @@
var map = getMapByAny()
map["orderId"] = orderId
map["pickUpCode"] = num
- callNet(true,Api.fillInPickUpCode, map) {
+ callNet(true,Api. fillInPickUpCode, map) {
click()
}
}
@@ -473,9 +477,6 @@
callNet(this, Api.queryOrderInfo, map) {
orderBean = gson.fromJson(it, OrderBean::class.java)
showUi(orderBean)
-// Handler(Looper.getMainLooper()).postDelayed({
-// startActivity<SlabOrderOverActivity>("orderId" to orderBean.data.orderId.toString() , "orderType" to orderBean.data.type.toString())
-// },1000)
}
callPersion()
}
@@ -721,14 +722,26 @@
}
callNumberCargo(num){
dialog.dismiss()
- startActivity<SlabOrderOverActivity>(
- "orderId" to orderId,
- "orderType" to orderType
- )
+ callStartOrder(this,6){
+ onBackPressed()
+ }
}
}
}
+ fun callStartOrder(contexts: Context, i: Int,func:() -> Unit) {
+ var map = getMapByAny()
+ map["orderId"] = MyApplication.currentOrderId
+ map["orderType"] = MyApplication.currentOrderType
+ map["state"] = i
+ map["lat"] = MyApplication.getLocation().latitude
+ map["lon"] = MyApplication.getLocation().longitude
+ callNet(contexts, Api.process, map) {
+ EventBus.getDefault().post(BaseEvent(BaseEvent.UP_TRIP))
+ func()
+ }
+ }
+
private fun showGaoMoneyDialog() {
--
Gitblit v1.7.1