1:新增上线 6版

liugl

2020-12-15 b0f715433a54c4bc897dd2bc86fa8ab70727b008

 app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt

@@ -62,7 +62,11 @@
class CargoActivity : MySlabBaseActivity() {

    private fun callOver(contexts: Context, travelFee: Double) {
        MoneyBroadCastReceiver.callOver(contexts, travelFee)
        callEnd(contexts, travelFee)
    }

    private fun callEnd(contexts: Context, travelFee: Double) {
        showChangeCargoDialog()
    }

    private fun callStatue(contexts: Context, i: Int) {
@@ -176,8 +180,6 @@
                        Handler(Looper.getMainLooper()).post {
                            toast("用户已取消订单")
                            MyApplication.getTTsManager().setVideoText("用户已取消订单")
                            MyApplication.currentOrderType = ""
                            MyApplication.currentOrderId = ""
                            finish()
                        }
                    }
@@ -303,7 +305,7 @@
        var map = getMapByAny()
        map["orderId"] = orderId
        map["pickUpCode"] = num
        callNet(true,Api.fillInPickUpCode, map) {
        callNet(true,Api.                                                                                                                                                            fillInPickUpCode, map) {
            click()
        }
    }
@@ -465,17 +467,12 @@


    private fun callOrder() {
        MyApplication.currentOrderId = orderId
        MyApplication.currentOrderType = orderType
        var map = getMapByAny()
        map["orderId"] = orderId
        map["orderType"] = orderType
        callNet(this, Api.queryOrderInfo, map) {
            orderBean = gson.fromJson(it, OrderBean::class.java)
            showUi(orderBean)
//            Handler(Looper.getMainLooper()).postDelayed({
//                startActivity<SlabOrderOverActivity>("orderId" to orderBean.data.orderId.toString() , "orderType" to orderBean.data.type.toString())
//            },1000)
        }
        callPersion()
    }
@@ -523,13 +520,16 @@
    private fun showUi(orderBean: OrderBean?) {
        orderBean?.let {
            tv_name.text = orderBean.data.nickName
            tv_car_num.text = it.data.historyNum.toString() + "次乘车"
            tv_car_num.text = it.data.historyNum.toString() + "次寄物"
            tv_time.text = it.data.travelTime
            tv_start_address.text = it.data.startAddress
            tv_end_address.text = it.data.endAddress
            tv_name_phone.text = orderBean.data.nickName + "-" + orderBean.data.phone
            tv_type_cargo.text = "普通小件X" + orderBean.data.peopleNumber
            tv_red_money.text = doubleTwo(orderBean.data.tipMoney) + "元加急费"
            if (orderBean.data.tipMoney == null || orderBean.data.tipMoney <= 0.0){
                tv_red_money.gone()
            }
            tv_phone.text = orderBean.data.phone
            showStatueMapUI(it)
        }
@@ -585,6 +585,10 @@
    //    流程操作状态（3=开始出发预约点，4=到达预约点，5=开始服务，6=服务结束）
    private fun showStatueMapUI(it: OrderBean) {
        getAllMark(it)
        tv_gap_money.gone()
        if (it.data.orderState == 4 || it.data.orderState == 8 || it.data.orderState == 12){
            tv_gap_money.visible()
        }
        when (it.data.orderState) {
            2, 3 -> {
                clickBroad()
@@ -601,7 +605,7 @@
                    setTitleText("去取货物")
                }
            }
            4,8-> {
            4,8,12-> {
                clickBroad()
                iv_to_gd.gone()
                closeLine()
@@ -721,14 +725,26 @@
            }
            callNumberCargo(num){
                dialog.dismiss()
                startActivity<SlabOrderOverActivity>(
                    "orderId" to orderId,
                    "orderType" to orderType
                )
                callStartOrder(this,6){
                    onBackPressed()
                }
            }
        }
    }

    fun callStartOrder(contexts: Context, i: Int,func:() -> Unit) {
        var map = getMapByAny()
        map["orderId"] = orderId
        map["orderType"] = orderType
        map["state"] = i
        map["lat"] = MyApplication.getLocation().latitude
        map["lon"] = MyApplication.getLocation().longitude
        callNet(contexts, Api.process, map) {
            EventBus.getDefault().post(BaseEvent(BaseEvent.UP_TRIP))
            func()
        }
    }



    private fun showGaoMoneyDialog() {