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 |   22 ++++++++--------------
 1 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/okgoincar/base/MyApplication.kt b/app/src/main/java/com/okgoincar/base/MyApplication.kt
index b5f64c1..920f2b2 100644
--- a/app/src/main/java/com/okgoincar/base/MyApplication.kt
+++ b/app/src/main/java/com/okgoincar/base/MyApplication.kt
@@ -27,6 +27,7 @@
 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
@@ -258,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())
         }
     }
@@ -321,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 {
@@ -400,8 +401,7 @@
         showNum--
         Handler(Looper.getMainLooper()).postDelayed({
             if (showNum == 0) {
-                setVideoText("OK出行司机已置于后台,可能会导致听单异常,里程计费差异,请勿切换。")
-//                getTTsManager().setVideoText("OK出行司机已置于后台,可能会导致听单异常,里程计费差异,请勿切换。")
+                getTTsManager().setVideoText("OK出行司机已置于后台,可能会导致听单异常,里程计费差异,请勿切换。")
             }
         }, 600)
 
@@ -411,11 +411,5 @@
         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