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
b972dd915a67114911c102674b517d8087aeab08
b972dd91
1 parent
8b4c84b3
1.处理伴音和媒体文件外部接口上传之后返回地址不正确导致404的问题
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
20 行增加
和
2 行删除
src/EngineEntrance.js
src/apes/MediaSharedApe.js
src/apes/MusicSharedApe.js
src/EngineEntrance.js
查看文件 @
b972dd9
...
...
@@ -63,7 +63,7 @@ export default class MessageEntrance extends Emiter {
super
();
this
.
lastClassActiveTime
=
0
;
//最后一次课堂激活的时间戳
//sdk 信息
GlobalConfig
.
sdkVersion
=
"v2.2
3.0
.20171030"
;
GlobalConfig
.
sdkVersion
=
"v2.2
4.2
.20171030"
;
loger
.
warn
(
"sdkVersion:"
+
GlobalConfig
.
sdkVersion
);
console
.
log
(
"sdkVersion:"
+
GlobalConfig
.
sdkVersion
);
//设置
...
...
@@ -2729,6 +2729,11 @@ export default class MessageEntrance extends Emiter {
"seek"
:
0
,
"duration"
:
parseInt
(
value
.
duration
)
||
0
};
//外部接口上传的伴音文件返回的地址有的不正确,需要特殊处理,检测是否有DocSharing目录
if
(
paramInfo
.
url
&&
paramInfo
.
url
.
indexOf
(
"/DocSharing/"
)
<
0
){
loger
.
log
(
"替换MP3路径地址"
,
paramInfo
.
url
);
paramInfo
.
url
=
paramInfo
.
url
.
replace
(
"/data/"
,
"/DocSharing/data/"
);
}
this
.
_sendMusicSharedUpload
(
paramInfo
);
}
}
...
...
@@ -2755,6 +2760,11 @@ export default class MessageEntrance extends Emiter {
"seek"
:
0
,
"duration"
:
parseInt
(
value
.
duration
)
||
0
};
//外部接口上传的伴音文件返回的地址有的不正确,需要特殊处理,检测是否有DocSharing目录
if
(
paramInfo
.
url
&&
paramInfo
.
url
.
indexOf
(
"/DocSharing/"
)
<
0
){
loger
.
log
(
"替换MP4路径地址"
,
paramInfo
.
url
);
paramInfo
.
url
=
paramInfo
.
url
.
replace
(
"/data/"
,
"/DocSharing/data/"
);
}
this
.
_sendMediaSharedUpload
(
paramInfo
);
}
}
...
...
src/apes/MediaSharedApe.js
查看文件 @
b972dd9
...
...
@@ -545,6 +545,10 @@ class MediaSharedApe extends Ape {
try
{
let
pduDataModel
=
pdu
[
'RCMediaSharedSendDataModelPdu'
].
decode
(
itemData
);
// loger.log("媒体文件===>unPackPdu");
if
(
pduDataModel
.
url
&&
pduDataModel
.
url
.
indexOf
(
"/DocSharing/"
)
<
0
){
loger
.
log
(
"替换文件路径地址"
,
pduDataModel
.
url
);
pduDataModel
.
url
=
pduDataModel
.
url
.
replace
(
"/data/"
,
"/DocSharing/data/"
);
}
return
pduDataModel
;
}
catch
(
err
)
{
loger
.
log
(
"媒体文件===>unPackPdu->Pdu解析错误->itemIdx="
+
itemIdx
+
"->err:"
+
err
.
message
);
...
...
src/apes/MusicSharedApe.js
查看文件 @
b972dd9
...
...
@@ -523,7 +523,7 @@ class MusicSharedApe extends Ape {
pduDataModel
.
from
=
GlobalConfig
.
nodeId
;
pduDataModel
.
fileType
=
_param
.
fileType
||
""
;
pduDataModel
.
creatUserId
=
_param
.
creatUserId
||
"0"
;
pduDataModel
.
url
=
_param
.
url
||
""
;
//这个地址没用到,数据太长占用资源 暂停使用//"http://101.200.150.192/DocSharing/data/h5test/20170206-171100025/7e9c4178cac1133e0dd9d5b583439122.jpg";
pduDataModel
.
url
=
_param
.
url
||
""
;
pduDataModel
.
status
=
_param
.
status
||
0
;
pduDataModel
.
fileId
=
_param
.
fileId
||
""
;
//伴音文件在服务器数据库中的唯一id,必须有
pduDataModel
.
fileName
=
_param
.
fileName
||
"music_"
+
_itemIdx
;
//伴音文件的名字
...
...
@@ -541,6 +541,10 @@ class MusicSharedApe extends Ape {
try
{
let
pduDataModel
=
pdu
[
'RCMusicSharedSendDataModelPdu'
].
decode
(
itemData
);
// loger.log("伴音文件===>unPackPdu");
if
(
pduDataModel
.
url
&&
pduDataModel
.
url
.
indexOf
(
"/DocSharing/"
)
<
0
){
loger
.
log
(
"替换文件路径地址"
,
pduDataModel
.
url
);
pduDataModel
.
url
=
pduDataModel
.
url
.
replace
(
"/data/"
,
"/DocSharing/data/"
);
}
return
pduDataModel
;
}
catch
(
err
)
{
loger
.
log
(
"伴音文件===>unPackPdu->Pdu解析错误->itemIdx="
+
itemIdx
+
"->err:"
+
err
.
message
);
...
...
请
注册
或
登录
后发表评论