11.10 添加线上线下标记 ， 修改结束流程

liugl

2020-11-10 59a89da95e7627c87dd01f00226d49104d1a93f3

11.10 添加线上线下标记 ， 修改结束流程

 app/build.gradle

@@ -25,8 +25,8 @@
        applicationId "com.okgoincar"
        minSdkVersion 19
        targetSdkVersion 29
        versionCode 1
        versionName "1"
        versionCode 22
        versionName "22"
        multiDexEnabled true
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        ndk {

 app/src/main/java/com/okgoincar/bean/OrderListBean.java

@@ -59,6 +59,15 @@
        private String time;
        private int type;
        private double orderMoney;
        private Integer payManner;

        public Integer getPayManner() {
            return payManner;
        }

        public void setPayManner(Integer payManner) {
            this.payManner = payManner;
        }

        public double getOrderMoney() {
            return orderMoney;

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

@@ -50,6 +50,9 @@
            view.tv_end.text = it.endAddress
            view.tv_money.text = it.redMoney.toString() + "元红包"
            view. tv_money_num.text = it.orderMoney.toString()+"元"
            if (it.payManner != null){
                view.tv_money_num.text = it.orderMoney.toString() + "元("+if (it.payManner == 1)"线上)" else "线下)"
            }
            setBlack(getNowTimeBlack(),view)
            pop.showCenter(dictorView)
        }

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

@@ -92,7 +92,6 @@
    }

    override fun initView() {

        var map = getMapByAny()
        map["orderId"] = orderId
        map["orderType"] = orderType
@@ -104,8 +103,24 @@
        }
    }



    private fun showUi(orderBean: OrderBean?) {
        orderBean?.let {
            MyApplication.getTTsManager()
                .setVideoText("请确认乘客车内付款后，再点击返回首页")
            time = timeOver(60000 * 6) {
                tv_title_slab.text = "已完成($it)"
                if (it == 0) {
                    if (time != null) {
                        time!!.cancel()
                    }
                    try {
                        finish()
                    } catch (e: Exception) {
                    }
                }
            }
            tv_title_slab.text = "待支付"
            tv_name.text = it.data.nickName
            tv_car_num.text = it.data.historyNum.toString() + "次乘车"
@@ -145,51 +160,14 @@
        }
    }

    private fun addSocketLisener(orderBean: OrderBean?) {
        MyApplication.addOrderView(object : MyApplication.OrderStatueView {
            override fun orderInfo(data: OrderSimpleData?) {
                data?.let {
                    if (it.status == 8 || it.status == 7) {
                        tv_pay_result_money.textColor(
                            this@SlabOrderOverActivity,
                            R.color.slab_green_over
                        )
    fun overOrder(){
        callComplete() {
                        Handler(Looper.getMainLooper()).post {
                            if (isPlay) {
                                return@post
                            }
                            isPlay = true
                            MyApplication.getTTsManager()
                                .setVideoText("乘客已支付" + orderBean?.data?.orderMoney.toString() + "元")
                            time = timeOver(20000) {
                                tv_title_slab.text = "已完成($it)"
                                if (it == 0) {
                                    if (time != null) {
                                        time!!.cancel()
                                    }
                                    try {
                                        onBackPressed()
                                    } catch (e: Exception) {
                time?.cancel()
                time?.onFinish()
                finish()
                                    }
                                }
                            }
                        }

//                        android.os.Handler(Looper.getMainLooper()).post {
//                            orderBean.data.orderState = 8
//                            showUi(orderBean)
//                        }
                    }
                }
            }
        })

//        if (handler == null) {
//            handler = android.os.Handler(mainLooper)
//            handler!!.postDelayed({
//                checkOrderStatue()
//            }, 3000)
//        }
    }

    var handler: Handler? = null
@@ -235,6 +213,7 @@
                        tv_to_main.visible()
                        MyApplication.getTTsManager()
                            .setVideoText("乘客已支付" + orderBean.data?.orderMoney.toString() + "元")
                        time?.cancel()
                        time = timeOver(20000) {
                            tv_title_slab.text = "已完成($it)"
                            if (it == 0) {
@@ -242,7 +221,7 @@
                                    time!!.cancel()
                                }
                                try {
                                    onBackPressed()
                                    finish()
                                } catch (e: Exception) {
                                }
                            }
@@ -287,35 +266,12 @@
        }

        tv_complete.clickDelay {
            callComplete() {
                tv_complete.gone()
                tv_to_main.visible()
                tv_pay_result_money.textColor(
                    this@SlabOrderOverActivity,
                    R.color.slab_green_over
                )
                Handler(Looper.getMainLooper()).post {
                    if (isPlay) {
                        return@post
                    }
                    isPlay = true
                    MyApplication.getTTsManager()
                        .setVideoText("乘客已支付" + orderBean.data?.orderMoney.toString() + "元")
                    time = timeOver(20000) {
                        tv_title_slab.text = "已完成($it)"
                        if (it == 0) {
                            if (time != null) {
                                time!!.cancel()
                            }
                            try {
                                onBackPressed()
                            } catch (e: Exception) {
            overOrder()
                            }
                        }
                    }
                }
            }
        }

    override fun onBackPressed() {
        overOrder()
    }

    private fun callComplete(function: () -> Unit) {
@@ -328,4 +284,55 @@

        }
    }



    private fun addSocketLisener(orderBean: OrderBean?) {
        MyApplication.addOrderView(object : MyApplication.OrderStatueView {
            override fun orderInfo(data: OrderSimpleData?) {
                data?.let {
                    if (it.status == 8 || it.status == 7) {
                        tv_pay_result_money.textColor(
                            this@SlabOrderOverActivity,
                            R.color.slab_green_over
                        )
                        Handler(Looper.getMainLooper()).post {
                            if (isPlay) {
                                return@post
                            }
                            isPlay = true
                            MyApplication.getTTsManager()
                                .setVideoText("乘客已支付" + orderBean?.data?.orderMoney.toString() + "元")
                            time = timeOver(20000) {
                                tv_title_slab.text = "已完成($it)"
                                if (it == 0) {
                                    if (time != null) {
                                        time!!.cancel()
                                    }
                                    try {
                                        finish()
                                    } catch (e: Exception) {
                                    }
                                }
                            }
                        }

//                        android.os.Handler(Looper.getMainLooper()).post {
//                            orderBean.data.orderState = 8
//                            showUi(orderBean)
//                        }
                    }
                }
            }
        })


//        if (handler == null) {
//            handler = android.os.Handler(mainLooper)
//            handler!!.postDelayed({
//                checkOrderStatue()
//            }, 3000)
//        }
    }

}

 app/src/main/java/com/okgoincar/slab/adapter/SlabMainAdapter.kt

@@ -34,6 +34,7 @@
            it.itemView.tv_start.text = item.startAddress
            it.itemView.tv_end.text = item.endAddress
            it.itemView.tv_qian.text = item.redMoney.toString() + "元小费"

            it.itemView.clickDelay {
                when (item.state) {
                    2, 3, 4, 5 -> {
@@ -65,6 +66,9 @@
                        view.tv_end.text = item.endAddress
                        view.tv_money.text = item.redMoney.toString() + "元红包"
                        view.tv_money_num.text = item.orderMoney.toString() + "元"
                        if (item.payManner != null){
                            view.tv_money_num.text = item.orderMoney.toString() + "元("+if (item.payManner == 1)"线上)" else "线下)"
                        }
                        setBlack(getNowTimeBlack(), view)
                        pop.showCenter((context as SlabMainActivity).window.decorView)
                    }

 app/src/main/res/layout/activity_order_over.xml

@@ -286,7 +286,7 @@
            android:layout_marginBottom="10dp"
            android:background="@drawable/bg_event_btn_one"
            android:gravity="center"
            android:text="乘客已付款 >"
            android:text="返回首页"
            android:textColor="#ffffffff"
            android:textSize="30sp" />