Commit e1af7ba8 authored by 马乐's avatar 马乐

1.修改tcp通信相关时间参数

parent a2a5b73b
...@@ -66,10 +66,10 @@ internal enum class DeviceStatus { ...@@ -66,10 +66,10 @@ internal enum class DeviceStatus {
internal class Schedule { internal class Schedule {
companion object { companion object {
const val tcpReadIntervalSecs: Long = 2 // 2 seconds const val tcpReadIntervalSecs: Long = 2 * 60 * 1000 // 2 seconds
const val tcpConnectTimeoutSecs = 40 // 40 seconds const val tcpConnectTimeoutSecs = 40 * 1000 // 40 seconds
const val signInTimeoutSecs: Long = 60 // 60 seconds const val signInTimeoutSecs: Long = 60 * 1000 // 60 seconds
const val heartbeatInterval = 120 // 120 seconds const val heartbeatInterval = 2 * 60 * 1000 // 120 seconds
} }
} }
...@@ -180,7 +180,7 @@ class Session : ConnectListener, SyncMessageListener<AbstractToStringJoiner> { ...@@ -180,7 +180,7 @@ class Session : ConnectListener, SyncMessageListener<AbstractToStringJoiner> {
try { try {
deviceStatus.set(DeviceStatus.Registering) deviceStatus.set(DeviceStatus.Registering)
tcpManager.connect(DeviceConfig.HostConfig.host, DeviceConfig.HostConfig.port, Schedule.tcpConnectTimeoutSecs) tcpManager.connect(DeviceConfig.HostConfig.host, DeviceConfig.HostConfig.port, Schedule.tcpConnectTimeoutSecs)
return if (mOperateCondition.await(Schedule.signInTimeoutSecs, TimeUnit.SECONDS)) { return if (mOperateCondition.await(Schedule.signInTimeoutSecs, TimeUnit.MILLISECONDS)) {
when (deviceStatus.get()) { when (deviceStatus.get()) {
DeviceStatus.Authenticated -> { DeviceStatus.Authenticated -> {
SignInStatus.SignIn SignInStatus.SignIn
...@@ -295,7 +295,7 @@ class Session : ConnectListener, SyncMessageListener<AbstractToStringJoiner> { ...@@ -295,7 +295,7 @@ class Session : ConnectListener, SyncMessageListener<AbstractToStringJoiner> {
::sendPing, ::sendPing,
0, 0,
Schedule.tcpReadIntervalSecs, Schedule.tcpReadIntervalSecs,
TimeUnit.MINUTES TimeUnit.MILLISECONDS
) )
} }
......
...@@ -2,11 +2,7 @@ package com.waytous.anticollision.ui ...@@ -2,11 +2,7 @@ package com.waytous.anticollision.ui
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.setupWithNavController
import com.google.android.material.bottomnavigation.BottomNavigationView
import com.gyf.immersionbar.ImmersionBar import com.gyf.immersionbar.ImmersionBar
import com.waytous.anticollision.R
import com.waytous.anticollision.config.DeviceConfig import com.waytous.anticollision.config.DeviceConfig
import com.waytous.anticollision.databinding.ActivityMainBinding import com.waytous.anticollision.databinding.ActivityMainBinding
import com.waytous.anticollision.tcp.Session import com.waytous.anticollision.tcp.Session
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment