Merge remote-tracking branch 'origin/master'

liugl

2020-11-02 c2877e03172d68af0a0eacd56ac0f5d4c67c6f26

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

@@ -105,6 +105,7 @@
    protected void onNetworkConnected(NetUtils.NetType type) {
        super.onNetworkConnected(type);
        if (NetUtils.isNetworkConnected(MyApplication.Companion.getInstance())) {
            toast("网络重新通畅");
            MoneyBroadCastReceiver.Companion.callErrorOrder(this);
        }
    }
@@ -228,7 +229,6 @@
        } else {
            startActivity(tClass);
        }

    }

    public void startActivityResult(Class tClass, int code) {