修复问题

18034727885

2026-05-20 eb98fdac45ce52c592a32c862423ef139faf2bce

修复问题

 app/src/main/java/com/driver/igotrip/bean/OrderBean.java

@@ -229,7 +229,8 @@
            if (orderPositionList == null || orderPositionList.isEmpty()){
                return new ArrayList<>();
            }else {
                return new Gson().fromJson(orderPositionList,new TypeToken<List<OrderPositionListBean>>(){}.getType());
                return new Gson().fromJson(orderPositionList, new TypeToken<List<OrderPositionListBean>>() {
                }.getType());
            }
        }

@@ -529,10 +530,12 @@
                    return driverPay.equals("1") ? context.getString(R.string.列表待支付) : context.getString(R.string.待评价);
                case 9:
                    if (driverPay.equals("1")) {
                        if (cancelMidway == 1) return "【" + context.getString(R.string.途中取消) + "】\n" + context.getString(R.string.列表待支付);
                        if (cancelMidway == 1)
                            return "【" + context.getString(R.string.途中取消) + "】\n" + context.getString(R.string.列表待支付);
                        return context.getString(R.string.列表待支付);
                    } else {
                        if (cancelMidway == 1) return "【" + context.getString(R.string.途中取消) + "】\n" + context.getString(R.string.已完成);
                        if (cancelMidway == 1)
                            return "【" + context.getString(R.string.途中取消) + "】\n" + context.getString(R.string.已完成);
                        else return context.getString(R.string.已完成);
                    }
                case 10:
@@ -560,12 +563,14 @@
                case 6:
                    return context.getString(R.string.已送达);
                case 7:
                    if (cancelMidway == 1) return "【" + context.getString(R.string.途中取消) + "】\n" + context.getString(R.string.列表待支付);
                    if (cancelMidway == 1)
                        return "【" + context.getString(R.string.途中取消) + "】\n" + context.getString(R.string.列表待支付);
                    return context.getString(R.string.列表待支付);
                case 8:
                    return context.getString(R.string.待评价);
                case 9:
                    if (cancelMidway == 1) return "【" + context.getString(R.string.途中取消) + "】\n" + context.getString(R.string.已完成);
                    if (cancelMidway == 1)
                        return "【" + context.getString(R.string.途中取消) + "】\n" + context.getString(R.string.已完成);
                    else return context.getString(R.string.已完成);
                case 10:
                    return context.getString(R.string.cancel_ed);
@@ -635,5 +640,18 @@
        public void setTravelTime(String travelTime) {
            this.travelTime = travelTime;
        }

        /**
         * 获取快件总支付金额
         */
        public double getExpressPayAllMoney() {
            double value = payMoney == null ? 0 : payMoney;
            try {
                return value + Double.parseDouble(differenceMoney);
            } catch (Exception e) {
                e.printStackTrace();
            }
            return value;
        }
    }
}

 app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallCargoActivity.kt

@@ -11,8 +11,6 @@
import android.widget.ImageView
import android.widget.TextView
import cn.sinata.xldutils.utils.*
import com.google.android.gms.maps.model.LatLng
import com.google.android.gms.maps.model.Marker
import com.driver.igotrip.R
import com.driver.igotrip.base.BaseEvent
import com.driver.igotrip.base.Const
@@ -30,12 +28,13 @@
import com.driver.igotrip.ui.DialogUtil
import com.driver.igotrip.ui.UiUtil
import com.driver.igotrip.ui.main.ReassignActivity
import com.driver.igotrip.ui.main.major.MajorSureMoneyActivity
import com.driver.igotrip.utils.DateUtil
import com.driver.igotrip.utils.MyUtils
import com.driver.igotrip.utils.view.SlidingButton
import com.google.android.gms.maps.GoogleMap
import com.google.android.gms.maps.SupportMapFragment
import com.google.android.gms.maps.model.LatLng
import com.google.android.gms.maps.model.Marker
import com.google.android.gms.maps.model.Polyline
import com.google.gson.Gson
import com.trello.rxlifecycle3.android.ActivityEvent
@@ -43,7 +42,6 @@
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers

import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.find
import org.jetbrains.anko.startActivity
@@ -321,13 +319,26 @@
                when (it.data.orderState) {
                    2, 3, 4 -> {
                        if (it.data.orderState == 4) {
//                            showNumDialog { num ->
                            if (orderType == "4") {
                                DialogUtil.getDelAndSureDialog(
                                    this,
                                    getString(R.string.确认现金金额).format(it.data.expressPayAllMoney)
                                        .replace(",", "."),
                                    {},
                                    {
                            it.data.orderState++
                            callStatue("1", it.data.orderState) {
                                iv_to_gd.callOnClick()
                            }
                            showStatueMapUI(it)
//                            }
                                    })
                            } else {
                                it.data.orderState++
                                callStatue("1", it.data.orderState) {
                                    iv_to_gd.callOnClick()
                                }
                                showStatueMapUI(it)
                            }
                        } else {
                            it.data.orderState++
                            callStatue(it.data.orderState, "") {
@@ -359,7 +370,7 @@
                            if (it.data.driverPay == "1") {
                                tv_money.visible()
                                tv_money.text =
                                    getString(R.string.确认现金金额).format(if (it.data.payMoney == 0.0) it.data.orderMoney else it.data.payMoney)
                                    getString(R.string.确认现金金额).format(if (orderType == "4") it.data.expressPayAllMoney else if (it.data.payMoney == 0.0) it.data.orderMoney else it.data.payMoney)
                                        .replace(",", ".")
                            }
                            tv_sure_car_num.setOnClickListener {
@@ -452,7 +463,10 @@
        map["state"] = i
        if (!num.isNullOrEmpty())
            map["pickUpCode"] = num
        Log.e("定位==============》", "${MyApplication.getLocation()?.latitude},${MyApplication.getLocation()?.longitude}")
        Log.e(
            "定位==============》",
            "${MyApplication.getLocation()?.latitude},${MyApplication.getLocation()?.longitude}"
        )
        map["lat"] = MyApplication.getLocation()?.latitude ?: 0.0
        map["lon"] = MyApplication.getLocation()?.longitude ?: 0.0
        callNet(Api.process, map) {
@@ -491,10 +505,12 @@
                    2, 3 -> {
                        changeCarThree(false)
                    }

                    4->{
                        //getTripInfo(4,false)
                        changeCarThree(false)
                    }

                    5, 6 -> {
                        changeCarFive(false)
                    }
@@ -599,7 +615,13 @@
            showUi(orderBean)
            function()
            if (reNavi){
                EventBus.getDefault().post(BaseEvent(BaseEvent.RELOAD_NAVI,orderBean!!.data.endLat.toString(),orderBean!!.data.endLon.toString()))
                EventBus.getDefault().post(
                    BaseEvent(
                        BaseEvent.RELOAD_NAVI,
                        orderBean!!.data.endLat.toString(),
                        orderBean!!.data.endLon.toString()
                    )
                )
            }
        }
    }
@@ -628,7 +650,8 @@
//                tv_money_cargo.gone()
//            }
            if (!it.data.differenceMoney.isNullOrEmpty() && it.data.differenceMoney.toDouble() > 0) {
                btn_gap_money.text = getString(R.string.差价点击修改).format(it.data.differenceMoney.toDouble())
                btn_gap_money.text =
                    getString(R.string.差价点击修改).format(it.data.differenceMoney.toDouble())
                btn_gap_money.setCompoundDrawablesRelativeWithIntrinsicBounds(0,0,0,0)
            }
            var latLngList = mutableListOf<LatLng>()
@@ -921,16 +944,25 @@
                MyApplication.currentOrderType = ""
                finish()
            }

            BaseEvent.BACK_CAR_OVER -> {
                finish()
            }

            BaseEvent.DIFF_PRICE_AGREE -> {
                if (mapInitStatus) initView2()
            }

            BaseEvent.DIFF_PRICE_REFUSE -> {
                btn_gap_money.text = getString(R.string.补差价)
                btn_gap_money.setCompoundDrawablesRelativeWithIntrinsicBounds(R.mipmap.ic_add,0,0,0)
                btn_gap_money.setCompoundDrawablesRelativeWithIntrinsicBounds(
                    R.mipmap.ic_add,
                    0,
                    0,
                    0
                )
            }

            BaseEvent.MODIFY_ADDRESS_SUC -> {
                callOrder(true){}
            }

 app/src/main/res/layout/dialog_sure_and_del.xml

@@ -37,8 +37,7 @@
            android:layout_below="@+id/view_hint_close_base"
            android:layout_centerHorizontal="true"
            android:layout_marginTop="30dp"
            android:paddingStart="10dp"
            android:paddingEnd="10dp"
            android:paddingHorizontal="30dp"
            android:text=""
            android:textColor="#ff666666"
            android:textSize="15sp" />