修复问题

18034727885

2026-04-28 bfbae00aabcc2aa83c00f21de1131d845d3e8e6e

修复问题

 app/src/main/java/cn/ptaxi/yuekeduocx/driver/bean/OrderCityBean.java

@@ -48,6 +48,8 @@
        private String emergencyCall;
        //线路司机预约id
        private String lineShiftDriverId;
        //线路id
        private String lineId;

        public String getEmergencyCall() {
            return emergencyCall;
@@ -112,6 +114,21 @@
        public void setLineShiftDriverId(String lineShiftDriverId) {
            this.lineShiftDriverId = lineShiftDriverId;
        }

        public String getLineId() {
            return lineId;
        }

        public void setLineId(String lineId) {
            this.lineId = lineId;
        }

        /**
         * 是否是自主行程
         */
        public boolean isSelfCityRouteLine() {
            return "-1".equalsIgnoreCase(lineId);
        }
    }

    public static class CityDataBean {

 app/src/main/java/cn/ptaxi/yuekeduocx/driver/ui/main/TripActivity.kt

@@ -275,7 +275,7 @@
        slide_btn.onSwipeListener = {
            orderBean.let {
                when (it.data.orderState) {
                    2, 3, 4 -> {
                    2, 3 -> {
                        var timeByLo = (DateUtil.dateToStamp(
                            DateUtil.TYPE0,
                            it.data.travelTime
@@ -296,6 +296,39 @@
                        }
                    }

                    4 -> {
                        var timeByLo = (DateUtil.dateToStamp(
                            DateUtil.TYPE0,
                            it.data.travelTime
                        ) - System.currentTimeMillis()) / 1000L
                        if (it.data.orderState == 2 && it.data.reservation == 2 && timeByLo > 1800L) {//判断预约单时间滑动是否有效
                            toast("只能在预约时间的半小时内出行")
                            return@let
                        }
                        //手机后4位数字
                        val phoneLast4Number =
                            it.data.realPhone.substring(it.data.realPhone.length - 4)
                        DialogUtil.getInputNumberDialog(
                            this,
                            phoneLast4Number.substring(0, 2), 4,
                        ) { value ->
                            if (value != phoneLast4Number) {
                                toast("手机号错误")
                                return@getInputNumberDialog
                            }
                            it.data.orderState++
                            callStatue(it.data.orderState, {
                                if (it.data.orderState == 3)
                                    iv_to_gd.callOnClick()
                                if (it.data.orderState == 5)
                                    iv_to_gd.callOnClick()
                                showStatueMapUI(it)
                            }) {
                                it.data.orderState--
                            }
                        }
                    }

                    5, 6 -> {
                        it.data.orderState = 6
                        when (orderType) {

 app/src/main/java/cn/ptaxi/yuekeduocx/driver/ui/main/add_order/SelectStartPointActivity.kt

@@ -225,7 +225,7 @@
                }
                AMapKit.searchByText(
                    this,
                    "${it}火车站",
                    "${it}中心",
                    it,
                    object : PoiSearch.OnPoiSearchListener {
                        override fun onPoiSearched(p0: PoiResult?, p1: Int) {

 app/src/main/java/cn/ptaxi/yuekeduocx/driver/ui/to_city/AddCityOrderActivity2.kt

@@ -287,7 +287,8 @@
                    toast("无法使用二维码支付")
                    return@callNet
                }
                startActivityForResult<PayQrCodeActivity>(1, "url" to data.data)
                val money = tv_total.text?.toString()?.replace("¥", "")?.toDoubleOrNull() ?: 0.0
                startActivityForResult<PayQrCodeActivity>(1, "url" to data.data, "money" to money)
            }
            if (type == "3") {//线下
                setResult(Activity.RESULT_OK, Intent())

 app/src/main/java/cn/ptaxi/yuekeduocx/driver/ui/to_city/TripCityActivity.kt

@@ -292,7 +292,7 @@
            currentOrderBean.let {
                showChangeStateNoticeDialog {
                    when (it.orderState) {
                        2, 3, 4 -> {
                        2, 3 -> {
                            it.orderState++
                            callStatue(it.orderState, {
                                tripItemAdapter.notifyDataSetChanged()
@@ -304,6 +304,49 @@
                                    iv_to_gd.callOnClick()
                            }) {
                                it.orderState--
                            }
                            return@showChangeStateNoticeDialog
                        }

                        4 -> {
                            if (orderBean.data?.isSelfCityRouteLine != true) {
                                //手机后4位数字
                                val phoneLast4Number =
                                    it.realPhone.substring(it.realPhone.length - 4)
                                DialogUtil.getInputNumberDialog(
                                    this,
                                    phoneLast4Number.substring(0, 2), 4,
                                ) { value ->
                                    if (value != phoneLast4Number) {
                                        toast("手机号错误")
                                        return@getInputNumberDialog
                                    }
                                    it.orderState++
                                    callStatue(it.orderState, {
                                        tripItemAdapter.notifyDataSetChanged()
                                        showStatueMapUI(it)
                                        if (it.orderState == 5) {
                                            changeTopOrder()
                                        }
                                        if (it.orderState == 3 || it.orderState == 5)
                                            iv_to_gd.callOnClick()
                                    }) {
                                        it.orderState--
                                    }
                                }
                            } else {
                                it.orderState++
                                callStatue(it.orderState, {
                                    tripItemAdapter.notifyDataSetChanged()
                                    showStatueMapUI(it)
                                    if (it.orderState == 5) {
                                        changeTopOrder()
                                    }
                                    if (it.orderState == 3 || it.orderState == 5)
                                        iv_to_gd.callOnClick()
                                }) {
                                    it.orderState--
                                }
                            }
                            return@showChangeStateNoticeDialog
                        }
@@ -615,6 +658,8 @@
        callNet(Api.queryCityOrderInfo, map) {
            orderBean = gson.fromJson(it, OrderCityBean::class.java)
//            orderBean.data.orders.sortWith(MyComparator())
            tv_Right.visibility =
                if (orderBean.data?.isSelfCityRouteLine == true) View.GONE else View.VISIBLE
            tv_line.text = orderBean.data.line
            tv_people_num.text = orderBean.data.peopleNumber.toString() + "人"
            tripItemAdapter.data.clear()

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

@@ -60,8 +60,9 @@
            android:id="@+id/iv_move"
            android:layout_width="40dp"
            android:layout_height="40dp"
            android:layout_above="@+id/slide_btn"
            android:layout_alignStart="@+id/slide_btn"
            android:layout_margin="7dp"
            android:layout_above="@+id/ll_operation_bar"
            android:layout_alignStart="@+id/ll_operation_bar"
            android:src="@mipmap/pos" />


@@ -69,8 +70,9 @@
            android:id="@+id/iv_to_gd"
            android:layout_width="40dp"
            android:layout_height="40dp"
            android:layout_above="@+id/slide_btn"
            android:layout_alignEnd="@+id/slide_btn"
            android:layout_margin="7dp"
            android:layout_above="@+id/ll_operation_bar"
            android:layout_alignEnd="@+id/ll_operation_bar"
            android:src="@mipmap/daohang" />

        <include