From d2c92897e22b2c1992eceaef585f967a06b6ea84 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期一, 02 十一月 2020 15:59:29 +0800
Subject: [PATCH] 11.30 首页列表添加 其他数据用来展示页面 不空
---
app/src/main/java/com/okgoincar/base/MyApplication.kt | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/base/MyApplication.kt b/app/src/main/java/com/okgoincar/base/MyApplication.kt
index f1a0f7f..88a58f6 100644
--- a/app/src/main/java/com/okgoincar/base/MyApplication.kt
+++ b/app/src/main/java/com/okgoincar/base/MyApplication.kt
@@ -3,12 +3,12 @@
import android.app.Activity
import android.app.Application
import android.content.Context
-import android.content.Intent
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.util.Log
import androidx.multidex.MultiDex
+import cn.sinata.rxnetty.Cache.CacheUtil
import cn.sinata.rxnetty.NettyClient
import cn.sinata.xldutils.BaseApplication
import cn.sinata.xldutils.utils.sysErr
@@ -27,9 +27,9 @@
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 com.tencent.bugly.crashreport.CrashReport
import org.jetbrains.anko.toast
import org.json.JSONObject
import java.security.SecureRandom
@@ -70,14 +70,14 @@
// PlatformConfig.setWeixin("wx65d2c03f04352f90", "7a3a57f9ba78c1f400b75298eec4c7c0")
// PlatformConfig.setQQZone("101877032", "eab94b262bf9789eec770cde42a6e71e") //qq互联
// LogUtils.OpenLog(true)
+ CrashReport.initCrashReport(applicationContext, "666d35fada", false)
initUpPoint()
initSocket()
-
}
private fun initSocket() {
Handler(Looper.getMainLooper()).post {
- toast("websocket初始化")
+// toast("websocket初始化")
}
NettyClient.getInstance().init(this, Api.SOCKET_SERVER, Api.SOCKET_PORT, true)
NettyClient.getInstance()
@@ -89,7 +89,7 @@
val json = JSONObject(message)
val method = json.optString("method")
Handler(Looper.getMainLooper()).post {
- toast("收到websocket=$method")
+// toast("收到websocket=$method")
}
val data = json.optString("data")
val code = json.optInt("code", -1)
@@ -263,9 +263,9 @@
bean.data = dataBean
NettyClient.getInstance()
.sendMessage(Gson().toJson(bean))
-// Handler(Looper.getMainLooper()).post {
+ Handler(Looper.getMainLooper()).post {
// toast("发送location --> $dataBean")
-// }
+ }
sysErr(dataBean.toString())
}
}
@@ -286,8 +286,13 @@
if ((System.currentTimeMillis() - currentTime) / 1000 > 30) {
sysErr("sendHeart_websocket 重新连接")
currentTime = System.currentTimeMillis()
+// var s = CacheUtil.get().getAsString("reConnect")
+// s = "$s###初始化重连"
+// CacheUtil.get().put("reConnect", s)
// NettyClient.getInstance().checkNettyState()
- initSocket()
+ NettyClient.getInstance().checkNettyStateNull() //reconnect
+
+// initSocket()
heartHandler!!.postDelayed({ sendHeart() }, 5000)
} else {
sysErr("sendHeart_websocket 发送心跳")
--
Gitblit v1.7.1