李勇

修改自动选点中的变量类型,安卓低版本中不支持new Set 数据

此 diff 太大无法显示。
... ... @@ -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;
... ...
... ... @@ -77,17 +77,23 @@ class IpManager extends Emiter {
return;
}
//对传入的ip数组进行组织
let newList = new Set();
let newList = new Object();
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 Set();
let newList = new Object();
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);
... ...