change by tanghao

唐浩

昨天 3d631dbadf98f3f77c6e955cb36219217ef73ab5

 app/src/main/java/com/ziang/driver/base/MyApplication.kt

@@ -10,29 +10,30 @@
import cn.sinata.xldutils.BaseApplication
import cn.sinata.xldutils.utils.sysErr
import com.amap.api.location.AMapLocation
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import com.tencent.bugly.crashreport.CrashReport
import com.umeng.commonsdk.UMConfigure
import com.umeng.socialize.PlatformConfig
import com.xuexiang.xui.XUI
import com.ziang.driver.base.gaode.gpsnav.util.TTSController
import com.ziang.driver.bean.CarLocationBean
import com.ziang.driver.bean.OrderResData
import com.ziang.driver.bean.OrderSimpleData
import com.ziang.driver.bean.websocket.HeartBean
import com.ziang.driver.netUtls.Api
import com.ziang.driver.netUtls.getUserId
import com.ziang.driver.ui.pub.LoginActivity
import com.ziang.driver.utils.Cache.CacheKey
import com.ziang.driver.utils.Cache.CacheUtil
import com.ziang.driver.utils.LogUtils
import com.google.gson.Gson
import com.tencent.bugly.crashreport.CrashReport
import com.umeng.commonsdk.UMConfigure
import com.umeng.socialize.PlatformConfig
import com.xuexiang.xui.XUI
import com.ziang.driver.netUtls.callNet
import com.ziang.driver.netUtls.getMapByAny
import com.ziang.driver.netUtls.getUserId
import com.ziang.driver.ui.main.GetOrderFragment
import com.ziang.driver.ui.main.VoiceOrderFragment
import com.ziang.driver.ui.pub.LoginActivity
import com.ziang.driver.utils.Cache.CacheUtil
import com.ziang.driver.utils.LogUtils
import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.toast
import org.json.JSONObject
import java.lang.reflect.Type
import java.security.SecureRandom
import java.security.cert.X509Certificate
import java.util.*
@@ -63,7 +64,7 @@
        XUI.init(this)
        registerActivityLifecycleCallbacks(this)
        initSocket()
        CrashReport.initCrashReport(this, "3685c4860a", true)
        CrashReport.initCrashReport(this, "06c8612c1a", true)
    }

    fun initPersionDate(){
@@ -116,6 +117,10 @@
                            Const.SOCKET_METHOD.EXPIRE_WORK -> {
                                EventBus.getDefault().post(BaseEvent(BaseEvent.CHANGE_CAR_SUCCESS))
                            }
                            Const.SOCKET_METHOD.ORDER_GRAB -> {
                                var dataBean = Gson().fromJson(data,OrderSimpleData::class.java)
                                EventBus.getDefault().post(BaseEvent(BaseEvent.ORDER_GRAB_EVENT,dataBean.orderId.toString()))
                            }
                            Const.SOCKET_METHOD.ORDER_STATUS -> {
                                val orderSimpleData =
                                    Gson().fromJson(
@@ -135,6 +140,7 @@
                                    when (orderSimpleData.orderType) {
                                        1,2 -> {
                                            if (!orderSimpleData.audioLinkUrl.isNullOrEmpty()){
                                                Log.e("走正常声音单","订单id为"+orderSimpleData.orderId)
                                                EventBus.getDefault().post(BaseEvent(BaseEvent.APP_LOG,"当前无订单弹窗，显示此订单:id-${orderSimpleData.orderId},语音路径：${orderSimpleData.audioLinkUrl}"))
                                                voiceOrder = orderSimpleData
                                                (act as MyBaseActivity).showOrder(
@@ -145,19 +151,22 @@
                                                    orderSimpleData.audioLinkUrl
                                                )
                                            } else{
                                                //小程序订单
                                                var map = getMapByAny()
                                                map["orderId"] = orderSimpleData.orderId.toString()
                                                map["orderType"] = orderSimpleData.orderType.toString()
                                                map["lat"] = getLocation().latitude
                                                map["lon"] = getLocation().longitude
                                                callNet(this, Api.queryPushOrder, map) {
                                                    (act as MyBaseActivity).showOrderWithData(
                                                        orderSimpleData.orderId.toString(),
                                                        orderSimpleData.orderType.toString(),
                                                        orderSimpleData.time,
                                                        1,
                                                        it
                                                    )
                                                    EventBus.getDefault().post(BaseEvent(BaseEvent.GET_SMALL_ORDER
                                                        ,orderSimpleData.orderType,orderSimpleData.time,it))
//                                                    (act as MyBaseActivity).showOrderWithData(
//                                                        orderSimpleData.orderId.toString(),
//                                                        orderSimpleData.orderType.toString(),
//                                                        orderSimpleData.time,
//                                                        1,
//                                                        it
//                                                    )
                                                }
                                            }
                                        }
@@ -267,6 +276,10 @@
        fun orderInfo(data: OrderSimpleData?)
    }

    public fun getFirstActivity():Activity{
        return activities[0]!!
    }


    companion object {
        private const val TAG = "MyApplication"