修复问题

18034727885

2026-07-31 909cc48c563b8f10609f704332f7ab30311d1e08

 app/src/main/java/com/igo/user/ui/mine/TripOrderFragment.kt

@@ -4,6 +4,7 @@
import android.content.Intent
import androidx.core.os.bundleOf
import androidx.recyclerview.widget.LinearLayoutManager
import cn.sinata.rxnetty.LogHelper
import cn.sinata.xldutils.fragment.BaseFragment
import cn.sinata.xldutils.toBrowser
import cn.sinata.xldutils.view.SwipeRefreshRecyclerLayout
@@ -30,7 +31,7 @@
import org.jetbrains.anko.support.v4.startActivityForResult

class TripOrderFragment :BaseFragment(), PayListener {
    override fun contentViewId() = R.layout.base_recyclerview_layout
    override fun contentViewId() = cn.sinata.xldutils.R.layout.base_recyclerview_layout
    private val type by lazy {
        arguments?.getInt("type", TYPE_TAXI)?: TYPE_TAXI
    }
@@ -55,7 +56,7 @@
                        HttpManager.queryUserInfo().requestByF(this@TripOrderFragment){_,data->
                            data?.let {
                                val payDialog = PayDialog()
                                payDialog.arguments = bundleOf("money" to order.differenceMoney,"isLogistics" to true,
                                payDialog.arguments = bundleOf("money" to order.getDifferenceMoneyValue(),"isLogistics" to true,
                                    "balance" to it.balance)
                                payDialog.setCallback(object :PayDialog.Callback{
                                    override fun onOk(way: Int, couponId: Int,useRed:Boolean) {
@@ -79,7 +80,12 @@
                            }
                        }
                    }else{
                        startActivityForResult<OrderDetailActivity>(1,"id" to order.orderId,"type" to order.orderType,"doPay" to true)
                        startActivityForResult<OrderDetailActivity>(
                            1,
                            "id" to order.orderId,
                            "type" to order.orderType,
                            "doPay" to true
                        )

//                        HttpManager.queryBalance(order.orderId,Const.OrderType.TYPE_SAME_CITY).requestByF(this@TripOrderFragment){ _, data->
//                            data?.let {
@@ -142,7 +148,10 @@
            when (type){
                TYPE_SPECIAL, TYPE_TAXI->{
                    when (order.state) {
                        in (1..5) -> startActivityForResult<TripActivity>(1,"id" to order.orderId,"type" to order.orderType)
                        in (1..5) -> {
                            LogHelper.logRecord("点击订单列表type:${type} state:${order.state} orderId:${order.orderId} orderType:${order.orderType}")
                            startActivityForResult<TripActivity>(1,"id" to order.orderId,"type" to order.orderType)
                        }
                        10 ->{
//                            if (order.driverId == 0)  //刘矩：现在我的订单页面进入已取消的页面不论有无司机都跳取消详情
                                startActivityForResult<OrderCancelDetailActivity>(1,"id" to order.orderId,"type" to order.orderType)
@@ -150,6 +159,7 @@
//                                startActivityForResult<OrderDetailActivity>(1,"id" to order.orderId,"type" to order.orderType)
                        }
                        11->{
                            LogHelper.logRecord("点击订单列表type:${type} state:${order.state} orderId:${order.orderId} orderType:${order.orderType}")
                            startActivityForResult<TripActivity>(1,"id" to order.orderId,"type" to order.orderType)
                        }
                        6,7,12 ->
@@ -160,12 +170,18 @@
                }
                TYPE_LOGISTICS->{
                    when(order.state){
                        in (1..5)-> startActivityForResult<TripActivity>(1,"id" to order.orderId,"type" to order.orderType)
                        in (1..5)-> {
                            LogHelper.logRecord("点击订单列表type:${type} state:${order.state} orderId:${order.orderId} orderType:${order.orderType}")
                            startActivityForResult<TripActivity>(1,"id" to order.orderId,"type" to order.orderType)
                        }
//                        6-> startActivity<LogisticsOrderDetailActivity>("id" to order.orderId)
                        10 ->{
                            startActivityForResult<OrderCancelDetailActivity>(1,"id" to order.orderId,"type" to order.orderType)
                        }
                        13->startActivityForResult<TripActivity>(1,"id" to order.orderId,"type" to order.orderType)
                        13->{
                            LogHelper.logRecord("点击订单列表type:${type} state:${order.state} orderId:${order.orderId} orderType:${order.orderType}")
                            startActivityForResult<TripActivity>(1,"id" to order.orderId,"type" to order.orderType)
                        }
                        6,7,12 ->
                            startActivityForResult<OrderDetailActivity>(1,"id" to order.orderId,"type" to order.orderType)
                        else ->
@@ -175,12 +191,16 @@
                }
                Const.OrderType.TYPE_CROSS_CITY->{
                    when (order.state) {
                        in (1..6) -> startActivityForResult<TripActivity>(1,"id" to order.orderId,"type" to order.orderType)
                        in (1..6) -> {
                            LogHelper.logRecord("点击订单列表type:${type} state:${order.state} orderId:${order.orderId} orderType:${order.orderType}")
                            startActivityForResult<TripActivity>(1,"id" to order.orderId,"type" to order.orderType)
                        }
                        7-> startActivityForResult<PayCrossActivity>(1,"id" to order.orderId)
                        10 ->{
                            startActivityForResult<OrderCancelDetailActivity>(1,"id" to order.orderId,"type" to order.orderType)
                        }
                        11->{
                            LogHelper.logRecord("点击订单列表type:${type} state:${order.state} orderId:${order.orderId} orderType:${order.orderType}")
                            startActivityForResult<TripActivity>(1,"id" to order.orderId,"type" to order.orderType)
                        }else->{
                            startActivityForResult<OrderDetailWithMapActivity>(1,"id" to order.orderId, "type" to order.orderType)