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
e868a567984c6d49fb984237a6cf9339bec76570
e868a567
1 parent
05b6ed7b
1.修复userID随机的问题;2.修复答题卡反复刷新题目的问题
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
22 行增加
和
7 行删除
src/EngineEntrance.js
src/SystemConfig.js
src/apes/MediaSharedApe.js
src/apes/QuestionApe.js
src/EngineEntrance.js
查看文件 @
e868a56
...
...
@@ -35,7 +35,7 @@ import QuestionApe from 'apes/QuestionApe';
import
UTF8
from
'utf-8'
;
let
loger
=
Loger
.
getLoger
(
'McuClient'
);
let
_sdkInfo
=
{
"version"
:
"v1.5
5.6
.20170727"
,
"author"
:
"www.3mang.com"
};
let
_sdkInfo
=
{
"version"
:
"v1.5
6.0
.20170727"
,
"author"
:
"www.3mang.com"
};
//APE
let
_sass
;
...
...
@@ -437,7 +437,7 @@ export default class MessageEntrance extends Emiter {
GlobalConfig
.
isRecordPlayBack
=
false
;
//设置为非录制回放状态
GlobalConfig
.
classId
=
parseInt
(
_param
.
classId
);
GlobalConfig
.
portal
=
_param
.
portal
;
GlobalConfig
.
userId
=
_param
.
userId
||
"0"
;
//H5处理
GlobalConfig
.
isH5
=
_param
.
isH5
||
false
;
//外部传入的参数,是否是H5
if
(
GlobalConfig
.
isH5
==
true
)
{
...
...
@@ -456,7 +456,7 @@ export default class MessageEntrance extends Emiter {
GlobalConfig
.
userName
=
_param
.
userName
||
"user_"
+
(
new
Date
().
getTime
()
%
1000000
);
//如果没有userId或者为"0",随机生成
if
(
!
GlobalConfig
.
userId
||
GlobalConfig
.
userId
==
"0"
)
{
if
(
GlobalConfig
.
userId
==
"0"
)
{
GlobalConfig
.
userId
=
"user_"
+
(
new
Date
().
getTime
()
%
1000000
);
}
//设置角色身份
...
...
src/SystemConfig.js
查看文件 @
e868a56
...
...
@@ -17,15 +17,18 @@ class SystemConfig {
if
(
GlobalConfig
.
isMobile
)
{
loger
.
warn
(
"当前设备是移动设备"
);
GlobalConfig
.
platform
=
3
;
//移动设备,不是ios和安卓就当H5处理
GlobalConfig
.
deviceType
=
3
;
}
else
{
loger
.
warn
(
"当前设备是PC"
);
GlobalConfig
.
platform
=
0
GlobalConfig
.
deviceType
=
0
;
}
if
(
mdetect
.
isIOS
())
{
GlobalConfig
.
deviceType
=
1
;
//"ios";
}
if
(
mdetect
.
isAndroid
())
{
GlobalConfig
.
platform
=
2
;
//"android";
GlobalConfig
.
deviceType
=
2
;
//"ios";
}
//语言
...
...
src/apes/MediaSharedApe.js
查看文件 @
e868a56
...
...
@@ -410,7 +410,7 @@ class MediaSharedApe extends Ape {
loger
.
warn
(
"timeDistance:"
+
timeDistance
+
" seek2seek:"
+
seek2seek
+
" seekDistance:"
+
seekDistance
);
if
(
seekDistance
<=
5
){
//记录最后一次的数据
loger
.
warn
(
"媒体共享更新数据->数据只有SEEK发生改变,低于5秒不需要再更新
->timeDistance:"
+
timeDistance
+
"->seekDistance"
+
seekDistance
);
loger
.
warn
(
"媒体共享更新数据->数据只有SEEK发生改变,低于5秒不需要再更新
"
);
//记录最后一次激活的数据
this
.
lastActiveData
=
getMediaPackFullInfo
;
this
.
lastActiveData
.
time
=
new
Date
().
getTime
();
...
...
src/apes/QuestionApe.js
查看文件 @
e868a56
...
...
@@ -23,7 +23,7 @@ class QuestionApe extends Ape {
ApeConsts
.
QUESTION_SESSION_NAME
,
ApeConsts
.
QUESTION_SESSION_TAG
);
this
.
isShow
=
{};
//已经显示过的题目
this
.
questionList
=
{};
//MCU同步的题目数据
this
.
questionTimer
=
new
TimerCounter
();
//答题卡计时器
this
.
questionTimer
.
addTimerCallBack
(
this
.
questionTimerCounterUptate
.
bind
(
this
),
1
);
//计时器监听
...
...
@@ -179,7 +179,13 @@ class QuestionApe extends Ape {
//delete this.questionList[itemIdx];
}
else
{
//显示答题卡数据
this
.
_emit
(
MessageTypes
.
START_ANSWER_QUESTION
,
model
);
if
(
!
this
.
isShow
[
itemIdx
]){
this
.
_emit
(
MessageTypes
.
START_ANSWER_QUESTION
,
model
);
this
.
isShow
[
itemIdx
]
=
itemIdx
;
}
else
{
loger
.
warn
(
"已经显现答题卡数据"
);
}
}
}
if
(
this
.
questionTimer
){
...
...
@@ -224,7 +230,13 @@ class QuestionApe extends Ape {
break
;
}
}
delete
this
.
questionList
[
itemIdxs
[
i
]];
try
{
delete
this
.
questionList
[
itemIdxs
[
i
]];
delete
this
.
isShow
[
itemIdxs
[
i
]];
}
catch
(
err
){
}
}
}
}
...
...
请
注册
或
登录
后发表评论