From 81d91378a2a726dcfffec74ce7cda43486806b77 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期五, 14 三月 2025 10:54:28 +0800
Subject: [PATCH] fix bug
---
app/src/main/java/com/xianning/driver/ui/main/TripActivity.kt | 54 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/app/src/main/java/com/xianning/driver/ui/main/TripActivity.kt b/app/src/main/java/com/xianning/driver/ui/main/TripActivity.kt
index 5a5a43b..20b7cbb 100644
--- a/app/src/main/java/com/xianning/driver/ui/main/TripActivity.kt
+++ b/app/src/main/java/com/xianning/driver/ui/main/TripActivity.kt
@@ -39,6 +39,8 @@
import com.xianning.driver.base.gaode.AMapKit.moveCamera3
import com.xianning.driver.base.gaode.BaiduUtils
import com.xianning.driver.base.gaode.gpsnav.BaiduNaviActivity
+import com.xianning.driver.bean.MajorMoneyBean
+import com.xianning.driver.ui.main.major.MajorSureMoneyOfflineActivity
import com.ypx.imagepicker.utils.PBitmapUtils
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
@@ -270,23 +272,10 @@
}
}
5, 6 -> {
- it.data.orderState = 6
- when(orderType){
- "2" -> {
- showMoneyTypeDialog()
- }
- "1" -> {
- callStatue(6,{
- startActivity<MajorSureMoneyActivity>(
- "orderId" to orderId,
- "orderType" to orderType
- )
- finish()
- }) {
-
- }
- }
- }
+ if (it.data.payManner == 3){
+ showMoneyTypeDialog()
+ }else
+ callorderMoney()
}
}
}
@@ -295,6 +284,33 @@
iv_phone.clickDelay {
orderBean.let {
Utils.callPhone(this, it.data.phone)
+ }
+ }
+ }
+
+ /**
+ * 陈昆：结束订单前(state==5)需要计算费用
+ */
+ private fun callorderMoney() {
+ var map = getMapByAny()
+ map["orderId"] = orderId
+ map["orderType"] = orderType
+ callNet(false, Api.queryMoneyInfo, map) {
+ orderBean.data.orderState = 6
+ callStatue(6,{
+ if (orderBean.data.payManner == 2){
+ startActivity<MajorSureMoneyOfflineActivity>(
+ "orderId" to orderId,
+ "orderType" to orderType
+ )
+ }else
+ startActivity<MajorSureMoneyActivity>(
+ "orderId" to orderId,
+ "orderType" to orderType
+ )
+ finish()
+ }) {
+
}
}
}
@@ -354,7 +370,7 @@
val map = getMapByAny()
map["orderId"] = orderId
map["orderType"] = orderType
- map["type"] = 2
+ map["type"] = 3
callStatue(6,{
callNet(Api.confirmFees, map) {
finish()
@@ -481,7 +497,7 @@
startMarker = addMarker(aMap, it.data.startLat, it.data.startLon, view, "") as Marker
}
startMarker!!.isVisible = false
- if (endMarker == null) {
+ if (endMarker == null&&it.data.endLat!=0.0) {
val view = createView(R.layout.item_map_market, this)
view.iv_img.setImageResource(R.mipmap.end_point)
endMarker = addMarker(aMap, it.data.endLat, it.data.endLon, view, "") as Marker
--
Gitblit v1.7.1