lmw
2024-05-28 524abed53193c67683a363ce0f12fe4aa98323a0
app/src/main/java/com/future/driver/ui/main/TripActivity.kt
@@ -103,7 +103,7 @@
            override fun orderInfo(data: OrderSimpleData?) {
                data?.let {
                    when(it.orderType){
                        1,2,3 -> {
                        1, 2, 3,7 -> {
                            if (it.status == 10 || it.status == 12) {
                                Handler(Looper.getMainLooper()).post {
                                    toast("用户已取消订单")
@@ -259,7 +259,7 @@
                            toast("只能在预约时间的半小时内出行")
                            return@let
                        }
                        if (it.data.orderState == 4&& !rxPermissions.isGranted(Manifest.permission.RECORD_AUDIO)&& !rxPermissions.isGranted(Manifest.permission.WRITE_EXTERNAL_STORAGE)){
                        if (it.data.orderState == 4&& (!rxPermissions.isGranted(Manifest.permission.RECORD_AUDIO) || !rxPermissions.isGranted(Manifest.permission.WRITE_EXTERNAL_STORAGE))){
                            DialogUtil.getDelAndSureDialog(this,"去授权","取消","根据平台规则,为了保证司乘安全,我们将会对行程进行录音,因此需要获取录音和文件存储权限",{
                            }){
                                rxPermissions.request(Manifest.permission.RECORD_AUDIO,Manifest.permission.WRITE_EXTERNAL_STORAGE).subscribe {
@@ -296,7 +296,7 @@
                            "2" -> {
                                showMoneyTypeDialog()
                            }
                            "1" -> {
                            "1","7" -> {
                                callStatue(6,{
                                    startActivity<MajorSureMoneyActivity>(
                                        "orderId" to orderId,
@@ -343,6 +343,7 @@
        onlySureDialog.setOnDismissListener {
            timer.cancel()
        }
        EventBus.getDefault().post(BaseEvent(BaseEvent.START_RECORD))
    }
    private fun callStatue(i: Int, click: () -> Unit, clickFail: () -> Unit) {
@@ -484,6 +485,8 @@
    private fun callOrder() {
        MyApplication.currentOrderId = orderId
        MyApplication.currentOrderType = orderType
        MyApplication.recordOrderId = orderId
        MyApplication.recordOrderType = orderType
        var map = getMapByAny()
        map["orderId"] = orderId
        map["orderType"] = orderType
@@ -506,7 +509,7 @@
                tv_end_address.text = it.data.endAddress
                tv_change_end.gone()
            }
            if (orderType == "1"){
            if (orderType == "1"||orderType == "7"){
                tv_red_money.gone()
            }
            tv_red_money.text = it.data.tipMoney.toString() + "元红包"
@@ -625,6 +628,9 @@
                changeCarFive(true)
                setTitleText("服务中")
                slide_btn.changeButtonText("送达该乘客")
                if (!MyApplication.isRecording){
                    EventBus.getDefault().post(BaseEvent(BaseEvent.START_RECORD))
                }
            }
        }
    }
@@ -726,8 +732,8 @@
                    if (byChangeEnd){
                        orderBean.data.orderState++
                        callStatue(orderBean.data.orderState,{
                            showStatueMapUI(orderBean)
                            showRecordDialog()
                            showStatueMapUI(orderBean)
                        }) {
                            orderBean.data.orderState--
                        }