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

liugl

2020-12-31 5af5d1d3134ebd217630c07245dd072942cbf9a4

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


 Conflicts:

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

 app/build.gradle

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

 app/release/output.json

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

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

@@ -37,6 +37,7 @@
import com.okgoincar.slab.util.UiUtil;
import com.okgoincar.utils.ActivityCollector;
import com.okgoincar.utils.EasePopup.EasyPopup;
import com.okgoincar.utils.MyUtils;

import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -84,6 +85,7 @@
    protected void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        initParam();
        MyUtils.getInstans().keepScreenLongLight(this,true);
        EventBus.getDefault().register(this);
        ActivityCollector.addActivity(this, getClass());
        ActivityCollector.getActivityCollector().addActivity(this);
@@ -155,11 +157,11 @@
    }



    public void toDorderAct(String orderId, String orderType){
    public void toDorderAct(String orderId, String orderType) {
        MyApplication.Companion.getTTsManager().setVideoText("OK出行，有一条新的订单");
        Intent intent = new Intent(this, SlabTripActivity.class);
        intent.putExtra("orderId",orderId);
        intent.putExtra("orderType",orderType);
        intent.putExtra("orderId", orderId);
        intent.putExtra("orderType", orderType);
        startActivity(intent);
    }

@@ -170,21 +172,21 @@
     * @param time
     * @param type
     */
    public void showOrder(String orderId, String orderType,int time,int type) {
    public void showOrder(String orderId, String orderType, int time, int type) {
//        UtilKtKt.calldetailOrderIsYy(this, orderId, orderType, b -> {
//            if (b){
                Intent intent = new Intent(MySlabBaseActivity.this,SlabGetOrderFragment.class);
                intent.putExtra("orderId",orderId);
                intent.putExtra("orderType",orderType);
                intent.putExtra("time",time);
                intent.putExtra("type",type);
//            if (b) {
                MyApplication.Companion.getTTsManager().setVideoText("OK出行，有一条新的订单");
                Intent intent = new Intent(MySlabBaseActivity.this, SlabGetOrderFragment.class);
                intent.putExtra("orderId", orderId);
                intent.putExtra("orderType", orderType);
                intent.putExtra("time", time);
                intent.putExtra("type", type);
                startActivity(intent);
//            }else {
//            } else {
//                toast("收到预约单");
//            }
//        });
    }



    @Override