1.MCU修复切换ip地址接口的参数；2. 断线重连修改异常提示次数，如果一直是断开状态，只提示一次

@@ -27,7 +27,7 @@ import Server from "config/Server";
 import UTF8 from 'utf-8';
 import UTF8 from 'utf-8';
 
 
 let loger = Loger.getLoger('McuClient');
 let loger = Loger.getLoger('McuClient');
-let _sdkInfo = {"version": "v1.9.15.20170420", "author": "www.3mang.com"};
+let _sdkInfo = {"version": "v1.9.16.20170420", "author": "www.3mang.com"};
 
 
 //APE
 //APE
 let _sass;
 let _sass;

@@ -39,7 +39,11 @@ class EverSocket extends Emiter {
         this._clear();
         this._clear();
     }
     }
     switchSocketIp(ip,port) {
     switchSocketIp(ip,port) {
+        if(port){
             this.wsURL = 'ws://' + ip + ':' + port;
             this.wsURL = 'ws://' + ip + ':' + port;
+        }else {
+            this.wsURL = 'ws://' + ip;
+        }
     }
     }
     get connected() {
     get connected() {
         return this._connected;
         return this._connected;
@@ -81,13 +85,13 @@ class EverSocket extends Emiter {
         window.clearTimeout(this.reConnectionTimeout);
         window.clearTimeout(this.reConnectionTimeout);
         this.reConnectionCounter++;
         this.reConnectionCounter++;
         if (this.reConnectionCounter > MCU_MAX_RECONNECTION) {
         if (this.reConnectionCounter > MCU_MAX_RECONNECTION) {
-            loger.warn('已经达到最大重连次数!');
+            loger.warn('MCU断线重连->已经达到最大重连次数!');
             this._emit(EverSocket.ERROR, EverSocket.ERR_SOCKET_RECONNECT_FAILED);
             this._emit(EverSocket.ERROR, EverSocket.ERR_SOCKET_RECONNECT_FAILED);
             this.reConnectionCounter=0;
             this.reConnectionCounter=0;
         }
         }
 
 
         this.reConnectionTimeout = window.setTimeout(() => {
         this.reConnectionTimeout = window.setTimeout(() => {
-            loger.log('WebSocket重新建立->', this.reConnectionCounter);
+            loger.log('MCU断线重连->', this.reConnectionCounter);
             window.clearTimeout(this.reConnectionTimeout);
             window.clearTimeout(this.reConnectionTimeout);
             this._newConnection();
             this._newConnection();
         }, EverSocket.RECONN_INTERVAL);
         }, EverSocket.RECONN_INTERVAL);

@@ -39,13 +39,18 @@ class MCU extends Emiter {
 
 
     // EverSocket连接断开
     // EverSocket连接断开
     _everSocketCloseHandler() {
     _everSocketCloseHandler() {
+        //如果已经是断开状态，不需要多次发送异常消息
+        if (GlobalConfig.getCurrentStatus().code == GlobalConfig.statusCode_3.code) {
+            loger.warn('已经断开连接->');
+            return;
+        }
         GlobalConfig.setCurrentStatus(GlobalConfig.statusCode_3);
         GlobalConfig.setCurrentStatus(GlobalConfig.statusCode_3);
         this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_SOCKET_DISCONNECT);
         this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_SOCKET_DISCONNECT);
     }
     }
 
 
     //EverSocket错误异常
     //EverSocket错误异常
     _everSocketErrorHandler(_errorCode) {
     _everSocketErrorHandler(_errorCode) {
-        this._emit(MessageTypes.MCU_ERROR, _errorCode);
+        //this._emit(MessageTypes.MCU_ERROR, _errorCode);
         //如果自动重连次数已经达到最大值，重新选点
         //如果自动重连次数已经达到最大值，重新选点
         if (_errorCode == everSocket.ERR_SOCKET_RECONNECT_FAILED) {
         if (_errorCode == everSocket.ERR_SOCKET_RECONNECT_FAILED) {
             this._emit(MessageTypes.SWITCH_MCU_IP);
             this._emit(MessageTypes.SWITCH_MCU_IP);
@@ -224,7 +229,7 @@ class MCU extends Emiter {
     switchMCUIp(_classInfo) {
     switchMCUIp(_classInfo) {
         if (_classInfo && _classInfo.MCUServerIP) {
         if (_classInfo && _classInfo.MCUServerIP) {
             this.classInfo.MCUServerIP = _classInfo.MCUServerIP;
             this.classInfo.MCUServerIP = _classInfo.MCUServerIP;
-            this.classInfo.MCUServerPort = _classInfo.MCUServerIP;
+            this.classInfo.MCUServerPort = _classInfo.MCUServerPort;
             if (this._everSocket) {
             if (this._everSocket) {
                 this._everSocket.switchSocketIp(this.classInfo.MCUServerIP, this.classInfo.MCUServerPort);
                 this._everSocket.switchSocketIp(this.classInfo.MCUServerIP, this.classInfo.MCUServerPort);
             }
             }