8.31

liugl

2020-08-31 46613d62ce9d77b5e996606ae9123a833c2a0d7f

8.31

 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

@@ -23,49 +23,57 @@

class MainBroadCastReceiver : BroadcastReceiver() {
    override fun onReceive(contexts: Context?, intent: Intent?) {
        if (intent == null){
        if (intent == null) {
            toast("内容获取为空，广播接收消息错误")
            return
        }
        try {
            Handler(Looper.getMainLooper()).post {
                val b = intent.getBooleanExtra("isLogin",true)
                if (!b){
                val b = intent.getBooleanExtra("isLogin", true)
                if (!b) {
                    loginOut(contexts)
                    CacheUtil.get().clear()
                    EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
                }else{
                    if (getToken().isNullOrEmpty()){
                } else {
                    if (getToken().isNullOrEmpty()) {
                        Handler(Looper.getMainLooper()).post {
                            toast("开始登录")
                        }
                        var driverCertificate = intent.getStringExtra("driverCertificate")
                        if (driverCertificate == null){
                            toast("身份证获取失败")
                        }else{
                            if (contexts == null){
                                toast("上下文为空，使用全局跳转")
                                toLoginActivity(MyApplication.getInstance(),driverCertificate)
                            }else{
                                toLoginActivity(MyApplication.getInstance(),driverCertificate)
                        if (driverCertificate == null) {
//                            toast("身份证获取失败")
                        } else {
                            if (contexts == null) {
//                                toast("上下文为空，使用全局跳转")
                                toLoginActivity(MyApplication.getInstance(), driverCertificate)
                            } else {
                                toLoginActivity(MyApplication.getInstance(), driverCertificate)
                            }
                        }

                    }
                }
            }
        }catch (e:Exception){
        } catch (e: Exception) {

        }

    }

    private fun toLoginActivity(context: Context?,driverCertificate: String?) {
    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
        callNet(context!!,Api.loginByIdentification,map){
        callNet(context!!, Api.loginByIdentification, map) {
            toast("登录成功")
            var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
            CacheKey.putKeyStr("identification",driverCertificate!!)
            CacheKey.putKeyStr("identification", driverCertificate!!)
            CacheKey.putKeyStr("appid", bean.data.appid)
            CacheKey.putKeyStr("token", bean.data.token)
            CacheKey.putKeyStr("userId", bean.data.id.toString())
@@ -73,7 +81,7 @@
            CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
            Handler(Looper.getMainLooper()).post {
                var intent = Intent()
                intent.setClass(context,SlabMainActivity::class.java)
                intent.setClass(context, SlabMainActivity::class.java)
                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
                context.startActivity(intent)
            }

 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 {