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

liugl

2021-01-07 75ba68eb8d65a32251704c604b3e27f3121808ce

Merge branches 'cargo_small' and 'master' of http://sinata.cn:10101/gitblit/r/android/OkGoinCar into cargo_small

 app/build.gradle

@@ -25,8 +25,8 @@
        applicationId "com.okgoincar"
        minSdkVersion 19
        targetSdkVersion 29
        versionCode 7
        versionName "7"
        versionCode 8
        versionName "8"
//        versionCode 22
//        versionName "22"
        multiDexEnabled true

 app/release/output.json

@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":7,"versionName":"7","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":8,"versionName":"8","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]

 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出行，有一条新的订单");