liugl
2020-08-31 46613d62ce9d77b5e996606ae9123a833c2a0d7f
8.31
4个文件已修改
18 ■■■■ 已修改文件
app/build.gradle 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/netUtls/Api.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/build.gradle
@@ -25,8 +25,8 @@
        applicationId "com.okgoincar"
        minSdkVersion 19
        targetSdkVersion 29
        versionCode 22
        versionName "22"
        versionCode 1
        versionName "1"
        multiDexEnabled true
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        ndk {
app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt
@@ -31,6 +31,7 @@
            Handler(Looper.getMainLooper()).post {
                val b = intent.getBooleanExtra("isLogin",true)
                if (!b){
                    loginOut(contexts)
                    CacheUtil.get().clear()
                    EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
                }else{
@@ -40,10 +41,10 @@
                        }
                        var driverCertificate = intent.getStringExtra("driverCertificate")
                        if (driverCertificate == null){
                            toast("身份证获取失败")
//                            toast("身份证获取失败")
                        }else{
                            if (contexts == null){
                                toast("上下文为空,使用全局跳转")
//                                toast("上下文为空,使用全局跳转")
                                toLoginActivity(MyApplication.getInstance(),driverCertificate)
                            }else{
                                toLoginActivity(MyApplication.getInstance(),driverCertificate)
@@ -59,6 +60,13 @@
    }
    private fun loginOut(context: Context?) {
        var map = getMapByAny()
        callNet(context!!, Api.loginOut, map) {
        }
    }
    private fun toLoginActivity(context: Context?,driverCertificate: String?) {
        var map = getMapByAny()
        map["identification"] = driverCertificate
app/src/main/java/com/okgoincar/netUtls/Api.java
@@ -33,6 +33,7 @@
    public static String queryHomeNum = "api/driver/queryHomeNum"; //api/driver/queryHomeNum  获取首页统计数据
    public static String work2 = "api/driver/work2"; //api/driver/work2 司机上下班操作
    public static String loginByIdentification = "base/driver/loginByIdentification"; //api/driver/work2 司机身份证登录
    public static String loginOut = "api/driver/loginOut"; ///api/driver/loginOut 司机退出登录
    /***
app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
@@ -212,6 +212,7 @@
        }
        tv_name.clickDelay {
        }
        tv_car_num.clickDelay {