From 664834b83a4c50cac039bbfa49f5164ca9bf8e3c Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期五, 07 八月 2020 17:05:17 +0800
Subject: [PATCH] 8.7
---
app/src/main/java/com/okgoincar/base/MyApplication.kt | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/base/MyApplication.kt b/app/src/main/java/com/okgoincar/base/MyApplication.kt
index 4429c8e..920f2b2 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,7 +26,10 @@
import com.okgoincar.bean.OrderSimpleData
import com.okgoincar.bean.websocket.HeartBean
import com.okgoincar.netUtls.Api
+import com.okgoincar.netUtls.getUserId
+import com.okgoincar.netUtls.sendAudio
import com.okgoincar.slab.MySlabBaseActivity
+import com.okgoincar.utils.Cache.CacheKey
import org.jetbrains.anko.toast
import org.json.JSONObject
import java.security.SecureRandom
@@ -94,6 +94,17 @@
when (method) {
Const.SOCKET_METHOD.OK -> {
testReceiveNum++
+ }
+ Const.SOCKET_METHOD.OFFLINE -> {
+// 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 =
@@ -248,9 +259,9 @@
bean.data = dataBean
NettyClient.getInstance()
.sendMessage(Gson().toJson(bean))
- Handler(Looper.getMainLooper()).post {
- toast("发送location --> $dataBean")
- }
+// Handler(Looper.getMainLooper()).post {
+// toast("发送location --> $dataBean")
+// }
sysErr(dataBean.toString())
}
}
@@ -296,8 +307,8 @@
return appContext
}
- fun getTTsManager():TTSController{
- if (mTtsManager == null){
+ fun getTTsManager(): TTSController {
+ if (mTtsManager == null) {
mTtsManager = TTSController.getInstance(getInstance())
mTtsManager?.init()
}
@@ -311,8 +322,8 @@
return Gson().fromJson(locationStr, AMapLocation::class.java)
} else {
val amap = AMapLocation("")
- amap.latitude = -1.0
- amap.longitude = -1.0
+ amap.latitude = 0.0
+ amap.longitude = 0.0
return amap
}
} else {
@@ -389,14 +400,16 @@
override fun onActivityStopped(activity: Activity?) {
showNum--
Handler(Looper.getMainLooper()).postDelayed({
- if (showNum == 0){
+ if (showNum == 0) {
getTTsManager().setVideoText("OK出行司机已置于后台，可能会导致听单异常，里程计费差异，请勿切换。")
}
- },600)
+ }, 600)
}
override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) {
activities.add(activity)
}
+
+
}
\ No newline at end of file
--
Gitblit v1.7.1