增加userId的判断，如果为'0'的时候，随机生成userId

@@ -32,7 +32,7 @@
   "wbp": {
   "wbp": {
     "project": "umd",
     "project": "umd",
     "entries": {
     "entries": {
-      "McuClient": "./src/McuClientEngine.js"
+      "McuClient": "./McuClientEngine.js"
     },
     },
     "source": "src/",
     "source": "src/",
     "build": "dist/"
     "build": "dist/"

@@ -35,7 +35,7 @@ import QuestionApe from 'apes/QuestionApe';
 import UTF8 from 'utf-8';
 import UTF8 from 'utf-8';
 
 
 let loger = Loger.getLoger('McuClient');
 let loger = Loger.getLoger('McuClient');
-let _sdkInfo = { "version": "v1.45.1.20170717", "author": "www.3mang.com" };
+let _sdkInfo = { "version": "v1.46.1.20170722", "author": "www.3mang.com" };
 
 
 //APE
 //APE
 let _sass;
 let _sass;
@@ -431,9 +431,14 @@ export default class MessageEntrance extends Emiter {
     GlobalConfig.isRecordPlayBack = false; //设置为非录制回放状态
     GlobalConfig.isRecordPlayBack = false; //设置为非录制回放状态
     GlobalConfig.classId = parseInt(_param.classId);
     GlobalConfig.classId = parseInt(_param.classId);
     GlobalConfig.portal = _param.portal;
     GlobalConfig.portal = _param.portal;
-    GlobalConfig.userId = _param.userId || "0";
-    GlobalConfig.userName = _param.userName || "";
+    //GlobalConfig.userId = _param.userId || "0";
+    //如果没有名字，随机起一个名字
+    GlobalConfig.userName = _param.userName || "user_" + (new Date().getTime() % 1000000);
 
 
+    //如果没有userId或者为"0",随机生成
+    if(!GlobalConfig.userId||GlobalConfig.userId=="0"){
+      GlobalConfig.userId="user_" + (new Date().getTime() % 1000000);
+    }
     //设置角色身份
     //设置角色身份
     GlobalConfig.userRole = _param.userRole || ApeConsts.normal;
     GlobalConfig.userRole = _param.userRole || ApeConsts.normal;
     if (GlobalConfig.userRole != ApeConsts.host &&
     if (GlobalConfig.userRole != ApeConsts.host &&
@@ -1828,8 +1833,8 @@ export default class MessageEntrance extends Emiter {
 
 
   //音乐共享模块加入频道成功，同步到MCU服务器上的数据
   //音乐共享模块加入频道成功，同步到MCU服务器上的数据
   musicShareApeJoinChannelSuccess() {
   musicShareApeJoinChannelSuccess() {
-    loger.log("媒体共享模块加入频道成功->isHost=", GlobalConfig.isHost, "length=", GlobalConfig.sharedMusicList.length);
-    console.log("媒体共享模数据->", GlobalConfig.sharedMusicList);
+    loger.log("伴音MUSIC模块加入频道成功->isHost=", GlobalConfig.isHost, "length=", GlobalConfig.sharedMusicList.length);
+    console.log("伴音MUSIC模块共享模数据->", GlobalConfig.sharedMusicList);
     //如果是主持人，那么需要判断一下文档模块同步的数据和从sass获取的文档数据是否相同，如果mcu服务器不存在的，需要上传
     //如果是主持人，那么需要判断一下文档模块同步的数据和从sass获取的文档数据是否相同，如果mcu服务器不存在的，需要上传
     if (GlobalConfig.isHost && GlobalConfig.sharedMusicList.length > 0) {
     if (GlobalConfig.isHost && GlobalConfig.sharedMusicList.length > 0) {
       for (let i = 0; i < GlobalConfig.sharedMusicList.length; i++) {
       for (let i = 0; i < GlobalConfig.sharedMusicList.length; i++) {

@@ -16,16 +16,16 @@ class SystemConfig {
       GlobalConfig.isMobile = mdetect.isMobileUA();
       GlobalConfig.isMobile = mdetect.isMobileUA();
       if (GlobalConfig.isMobile) {
       if (GlobalConfig.isMobile) {
         loger.warn("当前设备是移动设备");
         loger.warn("当前设备是移动设备");
+        GlobalConfig.platform = 3;//移动设备，不是ios和安卓就当H5处理
       } else {
       } else {
         loger.warn("当前设备是PC");
         loger.warn("当前设备是PC");
+        GlobalConfig.platform = 0
       }
       }
       if (mdetect.isIOS()) {
       if (mdetect.isIOS()) {
         GlobalConfig.deviceType = 1; //"ios";
         GlobalConfig.deviceType = 1; //"ios";
       }
       }
       if (mdetect.isAndroid()) {
       if (mdetect.isAndroid()) {
         GlobalConfig.platform = 2; //"android";
         GlobalConfig.platform = 2; //"android";
-      } else {
-        GlobalConfig.platform = 0; //"pc";
       }
       }
 
 
       //语言
       //语言

@@ -429,11 +429,11 @@ class MusicSharedApe extends Ape {
     loger.log(this._session_name + ' 媒体共享加入频道成功');
     loger.log(this._session_name + ' 媒体共享加入频道成功');
     if (this._apeDelayed) {
     if (this._apeDelayed) {
       setTimeout(() => {
       setTimeout(() => {
-        this._emit(MusicSharedApe.MEDIASHARED_JOIN_CHANNEL_SUCCESS);
+        this._emit(MusicSharedApe.MUSICSHARED_JOIN_CHANNEL_SUCCESS);
       }, (GlobalConfig.mcuDelay + GlobalConfig.docDelay) || 12000 + GlobalConfig.docDelay);
       }, (GlobalConfig.mcuDelay + GlobalConfig.docDelay) || 12000 + GlobalConfig.docDelay);
     } else {
     } else {
       setTimeout(() => {
       setTimeout(() => {
-        this._emit(MusicSharedApe.MEDIASHARED_JOIN_CHANNEL_SUCCESS);
+        this._emit(MusicSharedApe.MUSICSHARED_JOIN_CHANNEL_SUCCESS);
       }, GlobalConfig.docDelay);
       }, GlobalConfig.docDelay);
     }
     }
   }
   }
@@ -511,6 +511,6 @@ class MusicSharedApe extends Ape {
   }
   }
 
 
 }
 }
-MusicSharedApe.prototype.MEDIASHARED_JOIN_CHANNEL_SUCCESS = MusicSharedApe.MEDIASHARED_JOIN_CHANNEL_SUCCESS = 'musicShared_join_channel_success';
+MusicSharedApe.prototype.MUSICSHARED_JOIN_CHANNEL_SUCCESS = MusicSharedApe.MUSICSHARED_JOIN_CHANNEL_SUCCESS = 'musicShared_join_channel_success';
 export default MusicSharedApe;
 export default MusicSharedApe;