增加ip地址获取的接口，如果获取ip成功就不使用saas返回的userIp

@@ -58,7 +58,7 @@ export default class MessageEntrance extends Emiter {
   constructor() {
     super();
     //sdk 信息
-    GlobalConfig.sdkVersion = "v1.77.4.20170819";
+    GlobalConfig.sdkVersion = "v1.78.4.20170820";
     loger.warn("sdkVersion:" + GlobalConfig.sdkVersion);
 
     //设置
@@ -72,11 +72,13 @@ export default class MessageEntrance extends Emiter {
       GlobalConfig.locationProtocol="http://";
       GlobalConfig.websocketProtocol="ws://";
     }
-
     loger.warn("protocol:" + GlobalConfig.locationProtocol);
     //获取设备和系统信息
     SystemConfig.getSystemInfo();
 
+    //获取用户的ip
+    IpManager.getUserIp();
+
     this.classRecordStatusUpdateTimer = 0; //课堂录制状态发生改变后同步当前所有模块数据的计时器
     //初始化状态
     this.isGetUserIpCallback = false; //是否获取IP信息返回
@@ -1530,7 +1532,15 @@ export default class MessageEntrance extends Emiter {
       GlobalConfig.className = _data.meetingName || "";
       GlobalConfig.classBeginTime = _data.beginTime || "";
       GlobalConfig.classEndTime = _data.endTime || "";
-      GlobalConfig.userIp = _data.userIp || "";
+
+      //sdk获取ip失败就使用saas返回的
+      if(!GlobalConfig.userIp){
+        GlobalConfig.userIp = _data.userIp || "";
+        loger.warn("使用从Sass返回的userIp",GlobalConfig.userIp);
+      }else {
+        loger.warn("使用SDK获取的userIp",GlobalConfig.userIp);
+      }
+
 
       GlobalConfig.maxVideoChannels = _data.maxVideoChannels;
       GlobalConfig.maxAudioChannels = _data.maxAudioChannels;

@@ -457,6 +457,7 @@ GlobalConfig.maxMediaChannels = 0; //最大音视频路数，以音视频路数
 GlobalConfig.hasCamera = false; //摄像头是否可用
 GlobalConfig.hasMicrophone = false; //麦克风是否可用
 
+GlobalConfig.returnCitySN=null;//获取的ip数据  {"cip":"60.253.214.122","cid":"110000","cname":"北京市"}
 GlobalConfig.deviceType = 0; //设备类型  0:电脑  1:ios  2:安卓
 GlobalConfig.userIp = ""; //用户当前IP
 GlobalConfig.userId = 0;

@@ -331,7 +331,26 @@ class IpManager extends Emiter {
         }
 
     }
+    static getUserIp(){
+      try{
+        let head= document.getElementsByTagName('head')[0];
+        let script= document.createElement('script');
+        script.type= 'text/javascript';
+        script.src= 'https://pv.sohu.com/cityjson?ie=utf-8';
+        head.appendChild(script);
+        window.onload=function(){
+          loger.warn('获取本机IP->',window.returnCitySN);
+          GlobalConfig.returnCitySN=window.returnCitySN;
+          //用户IP，优先使用从
+          if(GlobalConfig.returnCitySN){
+            GlobalConfig.userIp=GlobalConfig.returnCitySN["cip"]||"";
+          }
+        }
+      }catch (err){
+        loger.warn('获取IP失败 ', err.message);
+      }
 
+    }
     //根据user信息从server配置文件中获取服务列表信息
     // _type()
     /* "MS":{},