commit

唐浩

2020-07-20 6521ab0f203b66b589e9990f090f04c16ea36320

commit

 app/build.gradle

@@ -25,8 +25,8 @@
        applicationId "com.okgoincar"
        minSdkVersion 19
        targetSdkVersion 29
        versionCode 14
        versionName "14.0"
        versionCode 13
        versionName "13.0"
        multiDexEnabled true
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        ndk {

 app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt

@@ -5,33 +5,78 @@
import android.content.Intent
import android.os.Handler
import android.os.Looper
import cn.sinata.rxnetty.netStatus.NetUtils
import cn.sinata.xldutils.utils.toast
import com.google.gson.Gson
import com.okgoincar.bean.LoginBean
import com.okgoincar.netUtls.Api
import com.okgoincar.netUtls.callNet
import com.okgoincar.netUtls.getMapByAny
import com.okgoincar.netUtls.getToken
import com.okgoincar.slab.SlabLoginActivity
import com.okgoincar.slab.SlabMainActivity
import com.okgoincar.utils.Cache.CacheKey
import com.okgoincar.utils.Cache.CacheUtil
import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.startActivity
import java.lang.Exception

class MainBroadCastReceiver : BroadcastReceiver() {
    override fun onReceive(context: Context?, intent: Intent?) {
        toast("收到广播1")
        Handler(Looper.getMainLooper()).post {
            val b = intent!!.getBooleanExtra("isLogin",false)
            val driverName = intent!!.getStringExtra("driverName")
            toast("司机名字=$driverName")
            if (!b){
                toast("LED退出登录")
                CacheUtil.get().clear()
                EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
//                context?.startActivity<SlabLoginActivity>()
            }else{
                toast("开始登录")
    override fun onReceive(contexts: Context?, intent: Intent?) {
        if (intent == null){
            toast("内容获取为空，广播接收消息错误")
            return
        }
        try {
            Handler(Looper.getMainLooper()).post {
                val b = intent.getBooleanExtra("isLogin",true)
                toast("isLogin=$b")
                if (!b){
                    CacheUtil.get().clear()
                    EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
                }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)
                            }
                        }

                    }
                }
            }
            var heay = intent.getBooleanExtra("isHeavy",false)
            toast("获取的网约=$heay") //顶灯
            var price = intent.getDoubleExtra("price",0.0)
            toast("收到的显示价格$price")
            var mileage = intent.getDoubleExtra("mileage",0.0)
            toast("收到的显示价格$mileage")
        }catch (e:Exception){

        }

    }

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

@@ -32,7 +32,7 @@
    public static String loginByJobNumber = "base/driver/loginByJobNumber"; //base/driver/loginByJobNumber 工号登录
    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 司机身份证登录


    /***

 app/src/main/java/com/okgoincar/netUtls/NetKit.kt

@@ -89,7 +89,7 @@
    return user.toInt()
}

fun getToken(): String {
fun getToken(): String? {
    return CacheKey.getKeyStr("token")
}


 app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt

@@ -1,8 +1,12 @@
package com.okgoincar.slab

import android.content.Context
import android.os.Handler
import android.os.Looper
import android.widget.Toast
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.getContent
import com.google.gson.Gson
import com.okgoincar.netUtls.callNet
import com.okgoincar.netUtls.getMapByAny
import com.okgoincar.utils.Cache.CacheKey
@@ -25,23 +29,25 @@

    override fun setOnclick() {
        tv_login.clickDelay {
            if (et_number.getContent().isNullOrEmpty()) {
                toast("请输入工号")
                return@clickDelay
            }
            var map = getMapByAny()
            map["jobNum"] = et_number.getContent().trim()
            callNet(true, Api.loginByJobNumber, map) {
                toast("登录成功")
                var bean = gson.fromJson<LoginBean>(it, LoginBean::class.java)
                CacheKey.putKeyStr("appid", bean.data.appid)
                CacheKey.putKeyStr("token", bean.data.token)
                CacheKey.putKeyStr("userId", bean.data.id.toString())
                CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
                CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
                finish()
                startActivity<SlabMainActivity>()
            }
//            if (et_number.getContent().isNullOrEmpty()) {
//                toast("请输入工号")
//                return@clickDelay
//            }
//            var map = getMapByAny()
//            map["jobNum"] = et_number.getContent().trim()
//            callNet(true, Api.loginByJobNumber, map) {
//                toast("登录成功")
//                var bean = gson.fromJson<LoginBean>(it, LoginBean::class.java)
//                CacheKey.putKeyStr("appid", bean.data.appid)
//                CacheKey.putKeyStr("token", bean.data.token)
//                CacheKey.putKeyStr("userId", bean.data.id.toString())
//                CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
//                CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
//                finish()
//                startActivity<SlabMainActivity>()
//            }
            toLoginActivity(this,"452229198204010012")

        }
    }

@@ -71,4 +77,21 @@
        }
    }

    private fun toLoginActivity(context: Context?, driverCertificate: String?) {
        var map = getMapByAny()
        map["identification"] = driverCertificate
        callNet(context!!,Api.loginByIdentification,map){
            cn.sinata.xldutils.utils.toast("登录成功")
            var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
            CacheKey.putKeyStr("appid", bean.data.appid)
            CacheKey.putKeyStr("token", bean.data.token)
            CacheKey.putKeyStr("userId", bean.data.id.toString())
            CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
            CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
            Handler(Looper.getMainLooper()).post {
                context.startActivity<SlabMainActivity>()
            }
        }
    }

}

 app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt

@@ -149,7 +149,7 @@
        }

        tv_name.clickDelay {

            toast("点亮网约")
        }

        tv_car_num.clickDelay {
@@ -188,7 +188,6 @@

    private
    var mBackAppTime: Long = 0


    override fun onBackPressed() {
        if (System.currentTimeMillis() - mBackAppTime > 2000) {

 app/src/main/java/com/okgoincar/slab/SlabStartActivity.kt

@@ -61,6 +61,7 @@
        EventBus.getDefault().unregister(this)
    }


    @Subscribe(threadMode = ThreadMode.MAIN)
    fun onEventMainThread(event: BaseEvent) {
        when (event.code) {

 app/src/main/java/com/okgoincar/utils/UtilKt.kt

@@ -305,8 +305,9 @@

fun getNowTimeBlack():Boolean{
    var hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY)
    if (hour < 7 || hour >= 18){
        return true
//    if (hour < 7 || hour >= 18){
        if (hour < 7 || hour >= 12){
            return true
    }
    return false
}

 app/src/main/res/layout/activity_trip_slab.xml

@@ -351,8 +351,8 @@

    <com.okgoincar.utils.view.SlidingButton
        android:id="@+id/slide_btn"
        android:layout_width="match_parent"
        android:layout_height="64dp"
        android:layout_width="384dp"
        android:layout_height="94dp"
        android:layout_alignParentBottom="true"
        android:layout_marginStart="26dp"
        android:layout_marginEnd="26dp"