1:新增上线 6版

liugl

2020-12-18 661a9d7a654c5e017e3ca7333cf8fe30e1f5931a

1:新增上线 6版

 app/src/main/java/com/okgoincar/bean/websocket/HeartBean.java

@@ -3,8 +3,11 @@

import android.view.View;

import com.okgoincar.base.MyApplication;
import com.okgoincar.netUtls.NetKitKt;
import com.okgoincar.utils.Cache.CacheKey;

import cn.sinata.xldutils.utils.Utils;

public class HeartBean {
    private int code = 200;
@@ -49,11 +52,13 @@
        private int userId = NetKitKt.getUserId();
        private String device = "carDevice";
        private String token;
        private String version;

        public DataBean() {
            type = 2;
            userId =  NetKitKt.getUserId();
            device = "carDevice";
            version = Utils.getAppVersion(MyApplication.Companion.getAppContext());
            token = CacheKey.INSTANCE.getToken();
        }
    }

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

@@ -176,11 +176,21 @@
        MyApplication.addOrderView(object : MyApplication.OrderStatueView {
            override fun orderInfo(data: OrderSimpleData?) {
                data?.let {
                    if (it.status == 10 || it.status == 12) {
                    if (it.status == 10 || it.status == 11) {
                        Handler(Looper.getMainLooper()).post {
                            toast("用户已取消订单")
                            MyApplication.getTTsManager().setVideoText("用户已取消订单")
                            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()
                        }
                    }
                }
@@ -300,6 +310,8 @@
            }
        }
    }



    private fun callNumberCargo(num: String, click: () -> Unit) {
        var map = getMapByAny()
@@ -726,7 +738,11 @@
            callNumberCargo(num){
                dialog.dismiss()
                callStartOrder(this,6){
                    onBackPressed()
                    startActivity<SlabCargoOverActivity>(
                        "orderId" to orderId,
                        "orderType" to orderType
                    )
                    finish()
                }
            }
        }