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
李勇
8 years ago
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
fa3e4a79c5fe247a438d0907af1a61c451a7197b
fa3e4a79
1 parent
2501e753
增加userId的判断,如果为'0'的时候,随机生成userId
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
16 行增加
和
11 行删除
dist/McuClient.js
package.json
src/EngineEntrance.js
src/SystemConfig.js
src/apes/MusicSharedApe.js
dist/McuClient.js
查看文件 @
fa3e4a7
此 diff 太大无法显示。
package.json
查看文件 @
fa3e4a7
...
...
@@ -32,7 +32,7 @@
"wbp"
:
{
"project"
:
"umd"
,
"entries"
:
{
"McuClient"
:
"./
src/
McuClientEngine.js"
"McuClient"
:
"./McuClientEngine.js"
},
"source"
:
"src/"
,
"build"
:
"dist/"
...
...
src/EngineEntrance.js
查看文件 @
fa3e4a7
...
...
@@ -35,7 +35,7 @@ import QuestionApe from 'apes/QuestionApe';
import
UTF8
from
'utf-8'
;
let
loger
=
Loger
.
getLoger
(
'McuClient'
);
let
_sdkInfo
=
{
"version"
:
"v1.4
5.1.20170717
"
,
"author"
:
"www.3mang.com"
};
let
_sdkInfo
=
{
"version"
:
"v1.4
6.1.20170722
"
,
"author"
:
"www.3mang.com"
};
//APE
let
_sass
;
...
...
@@ -431,9 +431,14 @@ export default class MessageEntrance extends Emiter {
GlobalConfig
.
isRecordPlayBack
=
false
;
//设置为非录制回放状态
GlobalConfig
.
classId
=
parseInt
(
_param
.
classId
);
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
;
if
(
GlobalConfig
.
userRole
!=
ApeConsts
.
host
&&
...
...
@@ -1828,8 +1833,8 @@ export default class MessageEntrance extends Emiter {
//音乐共享模块加入频道成功,同步到MCU服务器上的数据
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服务器不存在的,需要上传
if
(
GlobalConfig
.
isHost
&&
GlobalConfig
.
sharedMusicList
.
length
>
0
)
{
for
(
let
i
=
0
;
i
<
GlobalConfig
.
sharedMusicList
.
length
;
i
++
)
{
...
...
src/SystemConfig.js
查看文件 @
fa3e4a7
...
...
@@ -16,16 +16,16 @@ class SystemConfig {
GlobalConfig
.
isMobile
=
mdetect
.
isMobileUA
();
if
(
GlobalConfig
.
isMobile
)
{
loger
.
warn
(
"当前设备是移动设备"
);
GlobalConfig
.
platform
=
3
;
//移动设备,不是ios和安卓就当H5处理
}
else
{
loger
.
warn
(
"当前设备是PC"
);
GlobalConfig
.
platform
=
0
}
if
(
mdetect
.
isIOS
())
{
GlobalConfig
.
deviceType
=
1
;
//"ios";
}
if
(
mdetect
.
isAndroid
())
{
GlobalConfig
.
platform
=
2
;
//"android";
}
else
{
GlobalConfig
.
platform
=
0
;
//"pc";
}
//语言
...
...
src/apes/MusicSharedApe.js
查看文件 @
fa3e4a7
...
...
@@ -429,11 +429,11 @@ class MusicSharedApe extends Ape {
loger
.
log
(
this
.
_session_name
+
' 媒体共享加入频道成功'
);
if
(
this
.
_apeDelayed
)
{
setTimeout
(()
=>
{
this
.
_emit
(
MusicSharedApe
.
M
EDIA
SHARED_JOIN_CHANNEL_SUCCESS
);
this
.
_emit
(
MusicSharedApe
.
M
USIC
SHARED_JOIN_CHANNEL_SUCCESS
);
},
(
GlobalConfig
.
mcuDelay
+
GlobalConfig
.
docDelay
)
||
12000
+
GlobalConfig
.
docDelay
);
}
else
{
setTimeout
(()
=>
{
this
.
_emit
(
MusicSharedApe
.
M
EDIA
SHARED_JOIN_CHANNEL_SUCCESS
);
this
.
_emit
(
MusicSharedApe
.
M
USIC
SHARED_JOIN_CHANNEL_SUCCESS
);
},
GlobalConfig
.
docDelay
);
}
}
...
...
@@ -511,6 +511,6 @@ class MusicSharedApe extends Ape {
}
}
MusicSharedApe
.
prototype
.
M
EDIASHARED_JOIN_CHANNEL_SUCCESS
=
MusicSharedApe
.
MEDIA
SHARED_JOIN_CHANNEL_SUCCESS
=
'musicShared_join_channel_success'
;
MusicSharedApe
.
prototype
.
M
USICSHARED_JOIN_CHANNEL_SUCCESS
=
MusicSharedApe
.
MUSIC
SHARED_JOIN_CHANNEL_SUCCESS
=
'musicShared_join_channel_success'
;
export
default
MusicSharedApe
;
...
...
请
注册
或
登录
后发表评论