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
李勇
2017-04-26 10:22:22 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
957619e5e3196d5d437087fb68ee8b1860234af5
957619e5
1 parent
9b3c9d6e
修改自动选点中的变量类型,安卓低版本中不支持new Set 数据
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
17 行增加
和
7 行删除
dist/McuClient.js
src/EngineEntrance.js
src/IpManager.js
dist/McuClient.js
查看文件 @
957619e
此 diff 太大无法显示。
src/EngineEntrance.js
查看文件 @
957619e
...
...
@@ -27,7 +27,7 @@ import Server from "config/Server";
import
UTF8
from
'utf-8'
;
let
loger
=
Loger
.
getLoger
(
'McuClient'
);
let
_sdkInfo
=
{
"version"
:
"v1.9.
19.20170425
"
,
"author"
:
"www.3mang.com"
};
let
_sdkInfo
=
{
"version"
:
"v1.9.
20.20170426
"
,
"author"
:
"www.3mang.com"
};
//APE
let
_sass
;
...
...
src/IpManager.js
查看文件 @
957619e
...
...
@@ -77,17 +77,23 @@ class IpManager extends Emiter {
return
;
}
//对传入的ip数组进行组织
let
newList
=
new
Se
t
();
let
newList
=
new
Objec
t
();
let
listLen
=
_ipList
.
length
;
for
(
let
i
=
0
;
i
<
listLen
;
i
++
)
{
let
msItem
=
_ipList
[
i
];
if
(
msItem
&&
msItem
.
ip
)
{
//测速的时候,ip地址要拼接成带端口的完整地址,测速的端口是固定的
newList
.
add
((
msItem
.
ip
+
':'
+
SPEED_TEST_PORT
));
//newList.add((msItem.ip + ':' + SPEED_TEST_PORT));
newList
[
msItem
.
ip
+
':'
+
SPEED_TEST_PORT
]
=
msItem
.
ip
+
':'
+
SPEED_TEST_PORT
;
}
}
//过滤完重复ip
let
ipListArr
=
Array
.
from
(
newList
);
//let ipListArr = Array.from(newList);
let
ipListArr
=
new
Array
();
for
(
let
k
in
newList
){
ipListArr
.
push
(
k
);
}
loger
.
log
(
'MCU选点->列表'
,
ipListArr
);
if
(
ipListArr
==
null
||
ipListArr
.
length
<
1
)
{
if
(
_callback
)
{
...
...
@@ -142,17 +148,21 @@ class IpManager extends Emiter {
return
;
}
//对传入的ip数组进行组织
let
newList
=
new
Se
t
();
let
newList
=
new
Objec
t
();
let
listLen
=
_ipList
.
length
;
for
(
let
i
=
0
;
i
<
listLen
;
i
++
)
{
let
msItem
=
_ipList
[
i
];
if
(
msItem
&&
msItem
.
ip
)
{
//测速的时候,ip地址要拼接成带端口的完整地址,测速的端口是固定的
newList
.
add
((
msItem
.
ip
+
':'
+
SPEED_TEST_PORT
))
;
newList
[
msItem
.
ip
+
':'
+
SPEED_TEST_PORT
]
=
msItem
.
ip
+
':'
+
SPEED_TEST_PORT
;
}
}
//过滤完重复ip
let
ipListArr
=
Array
.
from
(
newList
);
let
ipListArr
=
new
Array
();
for
(
let
k
in
newList
){
ipListArr
.
push
(
k
);
}
if
(
ipListArr
==
null
||
ipListArr
.
length
<
1
)
{
if
(
_callback
)
{
_callback
(
callbackData
);
...
...
请
注册
或
登录
后发表评论