From 5e6555721588af17f56a3277005ace4f5caaff84 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期一, 03 八月 2020 18:26:03 +0800
Subject: [PATCH] 8.3
---
app/src/main/java/com/okgoincar/base/MyApplication.kt | 49 +++++++++++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/base/MyApplication.kt b/app/src/main/java/com/okgoincar/base/MyApplication.kt
index 1524573..b5f64c1 100644
--- a/app/src/main/java/com/okgoincar/base/MyApplication.kt
+++ b/app/src/main/java/com/okgoincar/base/MyApplication.kt
@@ -3,13 +3,11 @@
import android.app.Activity
import android.app.Application
import android.content.Context
-import android.location.Location
-import android.os.Build
+import android.content.Intent
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.util.Log
-import androidx.annotation.RequiresApi
import androidx.multidex.MultiDex
import cn.sinata.rxnetty.NettyClient
import cn.sinata.xldutils.BaseApplication
@@ -17,11 +15,10 @@
import com.amap.api.location.AMapLocation
import com.amap.api.track.AMapTrackClient
import com.amap.api.track.ErrorCode
-import com.amap.api.track.OnTrackLifecycleListener
import com.amap.api.track.TrackParam
-import com.amap.api.track.query.model.*
-import com.okgoincar.netUtls.getUserId
-import com.okgoincar.utils.Cache.CacheKey
+import com.amap.api.track.query.model.AddTerminalRequest
+import com.amap.api.track.query.model.QueryTerminalRequest
+import com.amap.api.track.query.model.QueryTerminalResponse
import com.google.gson.Gson
import com.okgoincar.base.gpsnav.util.TTSController
import com.okgoincar.bean.CarLocationBean
@@ -29,11 +26,9 @@
import com.okgoincar.bean.OrderSimpleData
import com.okgoincar.bean.websocket.HeartBean
import com.okgoincar.netUtls.Api
+import com.okgoincar.netUtls.getUserId
import com.okgoincar.slab.MySlabBaseActivity
-import com.okgoincar.slab.SlabLoginActivity
-import com.okgoincar.utils.Cache.CacheUtil
-import org.greenrobot.eventbus.EventBus
-import org.jetbrains.anko.startActivity
+import com.okgoincar.utils.Cache.CacheKey
import org.jetbrains.anko.toast
import org.json.JSONObject
import java.security.SecureRandom
@@ -100,10 +95,15 @@
testReceiveNum++
}
Const.SOCKET_METHOD.OFFLINE -> {
- CacheUtil.get().clear()
- NettyClient.getInstance().stopService()
- EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
- toast("您的账号已在其他平台登录")
+// CacheUtil.get().clear()
+// NettyClient.getInstance().stopService()
+// var intent = Intent()
+// intent.setClass(this, SlabLoginActivity::class.java)
+// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+// startActivity(intent)
+// Handler(Looper.getMainLooper()).post {
+// toast("您的账号已在其他平台登录")
+// }
}
Const.SOCKET_METHOD.ORDER_STATUS -> {
val orderSimpleData =
@@ -306,8 +306,8 @@
return appContext
}
- fun getTTsManager():TTSController{
- if (mTtsManager == null){
+ fun getTTsManager(): TTSController {
+ if (mTtsManager == null) {
mTtsManager = TTSController.getInstance(getInstance())
mTtsManager?.init()
}
@@ -399,14 +399,23 @@
override fun onActivityStopped(activity: Activity?) {
showNum--
Handler(Looper.getMainLooper()).postDelayed({
- if (showNum == 0){
- getTTsManager().setVideoText("OK出行司机已置于后台，可能会导致听单异常，里程计费差异，请勿切换。")
+ if (showNum == 0) {
+ setVideoText("OK出行司机已置于后台，可能会导致听单异常，里程计费差异，请勿切换。")
+// getTTsManager().setVideoText("OK出行司机已置于后台，可能会导致听单异常，里程计费差异，请勿切换。")
}
- },600)
+ }, 600)
}
override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) {
activities.add(activity)
}
+
+ fun setVideoText(s: String?) {
+ val intent = Intent()
+ intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+ intent.action = "com.wisdom.gps.action.tts"
+ intent.putExtra("msg", s)
+ sendBroadcast(intent)
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1