Merge remote-tracking branch 'origin/master'

liugl

2020-11-02 c2877e03172d68af0a0eacd56ac0f5d4c67c6f26

 app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt

@@ -109,6 +109,7 @@
            tv_title_slab.text = "待支付"
            tv_name.text = it.data.nickName
            tv_car_num.text = it.data.historyNum.toString() + "次乘车"
            tv_phone.text = it.data.phone
            tv_phone.clickDelay {
                MyUtils.getInstans().CallPhone(this, it.data.phone.toString())
            }
@@ -230,6 +231,8 @@
                            return@post
                        }
                        isPlay = true
                        tv_complete.gone()
                        tv_to_main.visible()
                        MyApplication.getTTsManager()
                            .setVideoText("乘客已支付" + orderBean.data?.orderMoney.toString() + "元")
                        time = timeOver(20000) {
@@ -286,6 +289,7 @@
        tv_complete.clickDelay {
            callComplete() {
                tv_complete.gone()
                tv_to_main.visible()
                tv_pay_result_money.textColor(
                    this@SlabOrderOverActivity,
                    R.color.slab_green_over