Merge branches 'cargo_small' and 'master' of http://sinata.cn:10101/gitblit...

liugl

2021-01-07 75ba68eb8d65a32251704c604b3e27f3121808ce

 app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java

@@ -173,6 +173,7 @@
     * @param type
     */
    public void showOrder(String orderId, String orderType, int time, int type) {

//        UtilKtKt.calldetailOrderIsYy(this, orderId, orderType, b -> {
//            if (b) {
                MyApplication.Companion.getTTsManager().setVideoText("OK出行，有一条新的订单");