Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
HTAnticollision
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
马乐
HTAnticollision
Commits
e1af7ba8
Commit
e1af7ba8
authored
Apr 12, 2023
by
马乐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.修改tcp通信相关时间参数
parent
a2a5b73b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
10 deletions
+6
-10
Session.kt
app/src/main/java/com/waytous/anticollision/tcp/Session.kt
+6
-6
MainActivity.kt
...rc/main/java/com/waytous/anticollision/ui/MainActivity.kt
+0
-4
No files found.
app/src/main/java/com/waytous/anticollision/tcp/Session.kt
View file @
e1af7ba8
...
...
@@ -66,10 +66,10 @@ internal enum class DeviceStatus {
internal
class
Schedule
{
companion
object
{
const
val
tcpReadIntervalSecs
:
Long
=
2
// 2 seconds
const
val
tcpConnectTimeoutSecs
=
40
// 40 seconds
const
val
signInTimeoutSecs
:
Long
=
60
// 60 seconds
const
val
heartbeatInterval
=
120
// 120 seconds
const
val
tcpReadIntervalSecs
:
Long
=
2
*
60
*
1000
// 2 seconds
const
val
tcpConnectTimeoutSecs
=
40
*
1000
// 40 seconds
const
val
signInTimeoutSecs
:
Long
=
60
*
1000
// 60 seconds
const
val
heartbeatInterval
=
2
*
60
*
1000
// 120 seconds
}
}
...
...
@@ -180,7 +180,7 @@ class Session : ConnectListener, SyncMessageListener<AbstractToStringJoiner> {
try
{
deviceStatus
.
set
(
DeviceStatus
.
Registering
)
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
.
MILLI
SECONDS
))
{
when
(
deviceStatus
.
get
())
{
DeviceStatus
.
Authenticated
->
{
SignInStatus
.
SignIn
...
...
@@ -295,7 +295,7 @@ class Session : ConnectListener, SyncMessageListener<AbstractToStringJoiner> {
::
sendPing
,
0
,
Schedule
.
tcpReadIntervalSecs
,
TimeUnit
.
MI
NUTE
S
TimeUnit
.
MI
LLISECOND
S
)
}
...
...
app/src/main/java/com/waytous/anticollision/ui/MainActivity.kt
View file @
e1af7ba8
...
...
@@ -2,11 +2,7 @@ package com.waytous.anticollision.ui
import
android.os.Bundle
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.waytous.anticollision.R
import
com.waytous.anticollision.config.DeviceConfig
import
com.waytous.anticollision.databinding.ActivityMainBinding
import
com.waytous.anticollision.tcp.Session
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment