yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.2.0] remove impl of real time and tanlu service , update socket of heart beat func

Browse Source
This commit is contained in:
zhongchao
2023-11-06 11:32:23 +08:00
parent 112f43e829
commit 5cfcf840ff
10 changed files with 37 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
View File

@@ -129,7 +129,9 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
clientConfig.passportUrl = FunctionBuildConfig.urlJson.passportUrl
clientConfig.socketBaseUrl = FunctionBuildConfig.urlJson.socketBaseUrl
clientConfig.socketTechUrl = FunctionBuildConfig.urlJson.socketTechUrl
if (FunctionBuildConfig.urlJson.heartBeatInterval.toLong() != 0L) {
clientConfig.heartBeatInterval = FunctionBuildConfig.urlJson.heartBeatInterval.toLong()
}
// 设置是否是直播推流的主播
clientConfig.isAnchor = true
when (DebugConfig.getCarMachineType()) {
@@ -253,7 +255,8 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
if (FunctionBuildConfig.isSecure) {
context?.let {
val authStatus =
SharedPrefsMgr.getInstance(it).getBoolean("securityKey-${DebugConfig.getNetMode()}", false)
SharedPrefsMgr.getInstance(it)
.getBoolean("securityKey-${DebugConfig.getNetMode()}", false)
if (authStatus) {
// clientConfig设置auth值，并带入header
clientConfig.authPubKey = SharedPrefsMgr.getInstance(it)
@@ -278,8 +281,12 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
)
clientConfig.securityKey = securityKey
SharedPrefsMgr.getInstance(it)
.putString("securityKey-${DebugConfig.getNetMode()}", securityKey)
SharedPrefsMgr.getInstance(it).putBoolean("securityKey-${DebugConfig.getNetMode()}", true)
.putString(
"securityKey-${DebugConfig.getNetMode()}",
securityKey
)
SharedPrefsMgr.getInstance(it)
.putBoolean("securityKey-${DebugConfig.getNetMode()}", true)
}
@ChainLog(
@@ -367,12 +374,12 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
nodeAliasCode = CHAIN_CODE_HTTP_DNS_ERROR_REASON,
paramIndexes = [0]
)
private fun logError(pr: Map<String,Any>) {
private fun logError(pr: Map<String, Any>) {
CallerLogger.e("$M_MAIN$TAG", "pr:$pr")
}
// 归一处理
private fun getPrReason(msg: String): Map<String,Any> {
private fun getPrReason(msg: String): Map<String, Any> {
val map = hashMapOf<String, Any>()
map["lat"] =
if (CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().latitude != 0.0)