9.14

liugl

2020-09-14 aceb6d9a4d844427ae974b639be14d6058abfaf9

9.14

 app/build.gradle

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

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

@@ -3,7 +3,6 @@
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.net.ConnectivityManager
import android.os.Handler
import android.os.Looper
import cn.sinata.xldutils.netstatus.NetUtils
@@ -124,11 +123,13 @@
                if (bean.startTime <= 0L) {
                    if (NetUtils.isNetworkConnected(MyApplication.getInstance())){
                        CacheKey.saveLocalOrderBeanNull()
                        MyApplication.currentOrderId = ""
                        callEndOrder(contexts,bean.money)
                    }
                }else{
                    if (NetUtils.isNetworkConnected(MyApplication.getInstance())){
                        CacheKey.saveLocalOrderBeanNull()
                        MyApplication.currentOrderId = ""
                        val map = getMapByAny()
                        map["orderId"] = bean.orderId
                        map["orderType"] = bean.orderType

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

@@ -92,7 +92,7 @@


    private fun callOrder() {
        MyApplication.currentOrderId = orderId
//        MyApplication.currentOrderId = orderId
        MyApplication.currentOrderType = orderType
        var map = getMapByAny()
        map["orderId"] = orderId

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

@@ -46,10 +46,10 @@

    override fun setOnclick() {
        tv_login.clickDelay {
//            if (et_number.getContent().isNullOrEmpty()) {
//                toast("请输入工号")
//                return@clickDelay
//            }
            if (et_number.getContent().isNullOrEmpty()) {
                toast("请输入工号")
                return@clickDelay
            }
//            var map = getMapByAny()
//            map["jobNum"] = et_number.getContent().trim()
//            callNet(true, Api.loginByJobNumber, map) {
@@ -65,8 +65,7 @@
//                startActivity<SlabMainActivity>()
//            }
//            51168119911111447X  15928265276 11111q
//            toLoginActivity(this,"51168119911111447X")

            toLoginActivity(this,et_number.getContent())
        }
    }

@@ -96,43 +95,43 @@
        }
    }

//    private fun toLoginActivity(context: Context?, driverCertificate: String?) {
//        var map = getMapByAny()
//        map["taxiAptitudeCard"] = driverCertificate
//        callNet(context!!,Api.loginByTaxiAptitudeCard,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>()
//            }
//        }
//    }


    private fun toLoginActivity(context: Context?, driverCertificate: String?) {
        var map = getMapByAny()
        map["identification"] = driverCertificate
        callNet(context!!, Api.loginByIdentification, map) {
            toast("登录成功")
        map["taxiAptitudeCard"] = driverCertificate
        callNet(context!!,Api.loginByTaxiAptitudeCard,map){
            cn.sinata.xldutils.utils.toast("登录成功")
            var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
            CacheKey.putKeyStr("identification", driverCertificate!!)
            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)
                context.startActivity<SlabMainActivity>()
            }
        }
    }


//    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("identification", driverCertificate!!)
//            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/slab/SlabMainActivity.kt

@@ -403,8 +403,6 @@
            var map = getMapByAny()
            map["taxiAptitudeCard"] = identification
            callNet(this, Api.loginByTaxiAptitudeCard, map,{
                ok()
            }) {
                var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
                CacheKey.putKeyStr("identification", identification)
                CacheKey.putKeyStr("appid", bean.data.appid)
@@ -412,12 +410,14 @@
                CacheKey.putKeyStr("userId", bean.data.id.toString())
                CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
                CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
                ok()
            }) {
                ok()
            }
        } else if (identification.isNotEmpty()) {
            var map = getMapByAny()
            map["taxiAptitudeCard"] = identification
            callNet(true, Api.loginByTaxiAptitudeCard, map) {
            callNet(this, Api.loginByTaxiAptitudeCard, map,{
                var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
                CacheKey.putKeyStr("identification", identification)
                CacheKey.putKeyStr("appid", bean.data.appid)
@@ -426,6 +426,8 @@
                CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
                CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
                ok()
            }) {
                ok()
            }
        } else {
            ok()

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

@@ -9,7 +9,7 @@
import com.okgoincar.netUtls.Api
import java.util.HashMap

class SlabMainFragment:BaseRecyclerFragment<OrderListBean.DataBean>(SlabMainAdapter()) {
class SlabMainFragment : BaseRecyclerFragment<OrderListBean.DataBean>(SlabMainAdapter()) {

    var state = 1

@@ -28,8 +28,8 @@
    }

    override fun getDatas(t: String?): List<OrderListBean.DataBean> {
        var data = gson.fromJson<OrderListBean>(t,OrderListBean::class.java)
        if (state == 1 && data.data.size >= 1){
        var data = gson.fromJson<OrderListBean>(t, OrderListBean::class.java)
        if ((data.data[0].state == 2 || data.data[0].state == 3 || data.data[0].state == 4 || data.data[0].state == 5 || data.data[0].state == 6) && data.data.size >= 1) {
            MyApplication.currentOrderId = data.data[0].id.toString()
            MyApplication.currentOrderId = data.data[0].type.toString()
        }

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

@@ -664,11 +664,11 @@
    override fun onEventMainThread(event: BaseEvent?) {
        super.onEventMainThread(event)
        when (event!!.code) {
            BaseEvent.REAGASSIGN_SUCCESS -> {
                MyApplication.currentOrderId = ""
                MyApplication.currentOrderType = ""
                finish()
            }
//            BaseEvent.REAGASSIGN_SUCCESS -> {
//                MyApplication.currentOrderId = ""
//                MyApplication.currentOrderType = ""
//                finish()
//            }
            BaseEvent.UP_TRIP -> {
                callOrder()
            }

 app/src/main/java/com/okgoincar/slab/adapter/SlabMainAdapter.kt

@@ -28,10 +28,6 @@
            it.itemView.tv_start.text = item.startAddress
            it.itemView.tv_end.text = item.endAddress
            it.itemView.tv_qian.text = item.redMoney.toString()+"元小费"
            if (item.state == 2 ||item.state == 3||item.state == 4||item.state == 5){
                MyApplication.currentOrderId = item.id.toString()
                MyApplication.currentOrderType = "2"
            }
            it.itemView.clickDelay {
                when(item.state){
                    2,3,4,5 -> {