save

lmw

2025-04-14 0361f47762f9958f2ec91fdb62bfc98de4e162a6

 app/src/main/java/com/xianning/driver/ui/main/TripActivity.kt

@@ -27,7 +27,6 @@
import com.xianning.driver.base.gaode.AMapKit.getTimeType
import com.xianning.driver.base.gaode.AMapKit.initMap
import com.xianning.driver.base.gaode.AMapKit.moveCamera
import com.xianning.driver.base.gaode.gpsnav.GPSNaviActivity
import com.xianning.driver.bean.OrderBean
import com.xianning.driver.bean.OrderSimpleData
import com.xianning.driver.netUtls.*
@@ -40,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
@@ -226,12 +227,7 @@
            orderBean.let {
                when (it.data.orderState) {
                    2, 3 -> {
//                        startAMapNavi(makeMarker!!)
//                        startNavi(carMarker!!.position,makeMarker!!.position)
                        startActivity<GPSNaviActivity>(
                            "start" to com.amap.api.maps.model.LatLng(carMarker!!.position.latitude,carMarker!!.position.longitude),
                            "end" to com.amap.api.maps.model.LatLng(makeMarker!!.position.latitude,makeMarker!!.position.longitude)
                        )
                        startNavi(carMarker!!.position,makeMarker!!.position)
                    }

                    4 -> {
@@ -276,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()
                    }
                }
            }
@@ -301,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()
            }) {

            }
        }
    }
@@ -360,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()
@@ -487,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