1:新增上线

liugl

2020-12-31 4aa19f7eede397f8e0b862a0aab15d9a14e88ce5

1:新增上线

 app/src/main/java/com/okgoincar/netUtls/Api.java

@@ -112,5 +112,6 @@
    public static String queryNewData_ = "api/version/queryNewData_"; ///api/version/queryNewData_ 获取最新版本数据
    public static String fillInPickUpCode = "api/order/fillInPickUpCode"; ///api/order/fillInPickUpCode 设置小件物流取件码
    public static String makeUpTheDifference = "api/order/makeUpTheDifference"; ///api/order/makeUpTheDifference 设置小件物流差价
    public static String sendVerificationCode = "api/order/sendVerificationCode"; ///sendVerificationCode

}

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

@@ -173,29 +173,36 @@
    }

    private fun addSockectCancel() {
        MyApplication.addOrderView(object : MyApplication.OrderStatueView {
            override fun orderInfo(data: OrderSimpleData?) {
                data?.let {
                    if (it.status == 10 || it.status == 11) {
                        Handler(Looper.getMainLooper()).post {
                            if (it.status == 10){
                                toast("用户已取消订单")
                                MyApplication.getTTsManager().setVideoText("用户已取消订单")
                            }else{
                                toast("用户已改派订单")
                                MyApplication.getTTsManager().setVideoText("用户已改派订单")
                            }
                            finish()
        MyApplication.addOrderView(orderView)
    }

    var orderView = object : MyApplication.OrderStatueView {
        override fun orderInfo(data: OrderSimpleData?) {
            data?.let {
                if (it.status == 10 || it.status == 11) {
                    Handler(Looper.getMainLooper()).post {
                        if (it.status == 10){
                            toast("用户已取消订单")
                            MyApplication.getTTsManager().setVideoText("用户已取消订单")
                        }else{
                            toast("用户已改派订单")
                            MyApplication.getTTsManager().setVideoText("用户已改派订单")
                        }
                        finish()
                    }
                    if (it.orderType == 4 || it.orderType == 5 && it.orderId.toString() == orderId) {
                        Handler(Looper.getMainLooper()).post {
                            initView()
                        }
                }
                if (it.orderType == 4 || it.orderType == 5 && it.orderId.toString() == orderId) {
                    Handler(Looper.getMainLooper()).post {
                        initView()
                    }
                }
            }
        })
        }
    }

    override fun finish() {
        MyApplication.removeOrderView(orderView)
        super.finish()
    }

    override fun onBackPressed() {
@@ -285,8 +292,11 @@
                        showStatueMapUI(it)
                    }
                    5, 6 -> {
                        it.data.orderState = 6
                        showChangeCargoDialog()
                        sendCode {
                            it.data.orderState = 6
                            showChangeCargoDialog()
                        }

                    }
                    12 -> {
                        it.data.orderState = 5
@@ -315,6 +325,13 @@
        }
    }

    private fun sendCode(function: () -> Unit) {
        var map = getMapByAny()
        map["orderId"] = orderId
        callNet(true,Api.sendVerificationCode, map) {
            function()
        }
    }


    private fun callNumberCargo(num: String, click: () -> Unit) {

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

@@ -113,7 +113,7 @@

    private fun showUi(orderBean: OrderBean?) {
        orderBean?.let {
            tv_title_slab.text = "待支付"
            tv_title_slab.text = "已完成"
            tv_name.text = it.data.nickName
            tv_car_num.text = it.data.historyNum.toString() + "次寄物"
            tv_phone.text = it.data.phone