From c2877e03172d68af0a0eacd56ac0f5d4c67c6f26 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期一, 02 十一月 2020 15:57:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt b/app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt
index 0122c62..0e8f391 100644
--- a/app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt
+++ b/app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt
@@ -76,6 +76,7 @@
if (NetUtils.isNetworkConnected(MyApplication.getInstance())) { //有网络直接处理
callStartOrder(contexts, i)
} else { //无网络 存本地
+ toast("当前没有网络，订单将保存在本地")
var bean = LocalOrderBean()
bean.orderId = MyApplication.currentOrderId
bean.startTime = System.currentTimeMillis()
@@ -83,7 +84,8 @@
}
} else { //有数据存着，并且有网络上传异常订单 如果没有网络就不处理，这个肯定是线下的单
if (NetUtils.isNetworkConnected(MyApplication.getInstance())) {
- callErrorOrder(contexts)
+ toast("有网络，有异常数据，此次数据不受理")
+// callErrorOrder(contexts)
}
}
}
@@ -97,6 +99,7 @@
if (NetUtils.isNetworkConnected(MyApplication.getInstance())) { //有网络直接处理
callEndOrder(contexts, travelFee)
} else { //无网络 存本地
+ toast("当前没有网络，订单将保存在本地")
var bean = LocalOrderBean()
bean.orderId = MyApplication.currentOrderId
bean.endTime = System.currentTimeMillis()
@@ -143,21 +146,24 @@
if (bean.startTime <= 0L) {
if (NetUtils.isNetworkConnected(MyApplication.getInstance())){
CacheKey.saveLocalOrderBeanNull()
- MyApplication.currentOrderId = ""
+ toast("调用正常结束，在异常订单中")
callEndOrder(contexts,bean.money)
}
}else{
if (NetUtils.isNetworkConnected(MyApplication.getInstance())){
- CacheKey.saveLocalOrderBeanNull()
- MyApplication.currentOrderId = ""
val map = getMapByAny()
map["orderId"] = bean.orderId
map["orderType"] = bean.orderType
map["type"] = "1"
map["travelFee"] = bean.money
- callNet(contexts, "api/order/confirmFees$", map) {
+ CacheKey.saveLocalOrderBeanNull()
+ toast("调用异常结束，在异常订单中 id==="+bean.orderId)
+ callNet(contexts, "api/order/confirmFees$", map,{
toast("上传异常订单成功")
EventBus.getDefault().post(BaseEvent(BaseEvent.ERROR_INFO))
+ }) {
+ toast("上传异常订单失败")
+ CacheKey.saveLocalOrderBean(bean)
}
}
}
@@ -178,6 +184,12 @@
}
private fun callEndOrder(contexts: Context, travelFee: Double) {
+ if (MyApplication.getLocation().latitude == 0.0){
+ Handler(Looper.getMainLooper()).post {
+ toast("结束时的位置为空，停止结束")
+ }
+ return
+ }
var map = getMapByAny()
map["orderId"] = MyApplication.currentOrderId
map["orderType"] = MyApplication.currentOrderType
--
Gitblit v1.7.1