Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
李勇
/
McuClient
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
李勇
8 years ago
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
04077798e5bd7546093719e303a7dcd76a08753e
04077798
1 parent
d378f64f
1.MCU修复切换ip地址接口的参数;2. 断线重连修改异常提示次数,如果一直是断开状态,只提示一次
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
15 行增加
和
6 行删除
dist/McuClient.js
src/EngineEntrance.js
src/EverSocket.js
src/mcu.js
dist/McuClient.js
查看文件 @
0407779
此 diff 太大无法显示。
src/EngineEntrance.js
查看文件 @
0407779
...
...
@@ -27,7 +27,7 @@ import Server from "config/Server";
import
UTF8
from
'utf-8'
;
let
loger
=
Loger
.
getLoger
(
'McuClient'
);
let
_sdkInfo
=
{
"version"
:
"v1.9.1
5
.20170420"
,
"author"
:
"www.3mang.com"
};
let
_sdkInfo
=
{
"version"
:
"v1.9.1
6
.20170420"
,
"author"
:
"www.3mang.com"
};
//APE
let
_sass
;
...
...
src/EverSocket.js
查看文件 @
0407779
...
...
@@ -39,7 +39,11 @@ class EverSocket extends Emiter {
this
.
_clear
();
}
switchSocketIp
(
ip
,
port
)
{
this
.
wsURL
=
'ws://'
+
ip
+
':'
+
port
;
if
(
port
){
this
.
wsURL
=
'ws://'
+
ip
+
':'
+
port
;
}
else
{
this
.
wsURL
=
'ws://'
+
ip
;
}
}
get
connected
()
{
return
this
.
_connected
;
...
...
@@ -81,13 +85,13 @@ class EverSocket extends Emiter {
window
.
clearTimeout
(
this
.
reConnectionTimeout
);
this
.
reConnectionCounter
++
;
if
(
this
.
reConnectionCounter
>
MCU_MAX_RECONNECTION
)
{
loger
.
warn
(
'已经达到最大重连次数!'
);
loger
.
warn
(
'
MCU断线重连->
已经达到最大重连次数!'
);
this
.
_emit
(
EverSocket
.
ERROR
,
EverSocket
.
ERR_SOCKET_RECONNECT_FAILED
);
this
.
reConnectionCounter
=
0
;
}
this
.
reConnectionTimeout
=
window
.
setTimeout
(()
=>
{
loger
.
log
(
'
WebSocket重新建立
->'
,
this
.
reConnectionCounter
);
loger
.
log
(
'
MCU断线重连
->'
,
this
.
reConnectionCounter
);
window
.
clearTimeout
(
this
.
reConnectionTimeout
);
this
.
_newConnection
();
},
EverSocket
.
RECONN_INTERVAL
);
...
...
src/mcu.js
查看文件 @
0407779
...
...
@@ -39,13 +39,18 @@ class MCU extends Emiter {
// EverSocket连接断开
_everSocketCloseHandler
()
{
//如果已经是断开状态,不需要多次发送异常消息
if
(
GlobalConfig
.
getCurrentStatus
().
code
==
GlobalConfig
.
statusCode_3
.
code
)
{
loger
.
warn
(
'已经断开连接->'
);
return
;
}
GlobalConfig
.
setCurrentStatus
(
GlobalConfig
.
statusCode_3
);
this
.
_emit
(
MessageTypes
.
MCU_ERROR
,
MessageTypes
.
ERR_SOCKET_DISCONNECT
);
}
//EverSocket错误异常
_everSocketErrorHandler
(
_errorCode
)
{
this
.
_emit
(
MessageTypes
.
MCU_ERROR
,
_errorCode
);
//
this._emit(MessageTypes.MCU_ERROR, _errorCode);
//如果自动重连次数已经达到最大值,重新选点
if
(
_errorCode
==
everSocket
.
ERR_SOCKET_RECONNECT_FAILED
)
{
this
.
_emit
(
MessageTypes
.
SWITCH_MCU_IP
);
...
...
@@ -224,7 +229,7 @@ class MCU extends Emiter {
switchMCUIp
(
_classInfo
)
{
if
(
_classInfo
&&
_classInfo
.
MCUServerIP
)
{
this
.
classInfo
.
MCUServerIP
=
_classInfo
.
MCUServerIP
;
this
.
classInfo
.
MCUServerPort
=
_classInfo
.
MCUServer
IP
;
this
.
classInfo
.
MCUServerPort
=
_classInfo
.
MCUServer
Port
;
if
(
this
.
_everSocket
)
{
this
.
_everSocket
.
switchSocketIp
(
this
.
classInfo
.
MCUServerIP
,
this
.
classInfo
.
MCUServerPort
);
}
...
...
请
注册
或
登录
后发表评论