Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
张桐
/
xdykt-build
转到一个项目
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
张桐
2017-03-03 10:15:53 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
eca277efeb697c9f3b95be93f484cfca82da6a13
eca277ef
1 parent
f85c896a
20170303 演示版本
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
19 行增加
和
8 行删除
index.html
js/McuClient.js
src/main.js
src/videoWithFlash.js
index.html
查看文件 @
eca277e
...
...
@@ -16,8 +16,8 @@
<script
type=
"text/javascript"
src=
"js/xdyEvent.js"
></script>
<script
type=
"text/javascript"
src=
"js/drag.js"
></script>
<script
type=
"text/javascript"
src=
"js/McuClient.js?v=1.0.0302.19"
></script>
<!--<script type="text/javascript" src="http://192.168.1.140/McuClient/McuClient.js?722990836"></script>-->
<script
type=
"text/javascript"
src=
"js/McuClient.js?v=1.0.0303.10"
></script>
<!--<script type="text/javascript" src="http://192.168.1.140/McuClient/McuClient.js?722836"></script>-->
<script
type=
"text/javascript"
src=
"js/jquery-1.11.3.min.js"
></script>
<script
type=
"text/javascript"
src=
"src/main.js"
></script>
...
...
js/McuClient.js
查看文件 @
eca277e
此 diff 太大无法显示。
src/main.js
查看文件 @
eca277e
...
...
@@ -211,7 +211,7 @@ function showFile(_data){
}
$
(
".spinner"
).
css
(
"display"
,
"none"
);
$
(
".doc-headline-a"
).
trigger
(
"click"
);
//
$(".doc-headline-a").trigger("click");
// var strHTML = format(tplDoc, {
// name: _data.fileName,
...
...
@@ -485,10 +485,22 @@ function docDelete(callbackData){
console
.
log
(
callbackData
);
updateDocList
(
callbackData
,
1
);
//操作页面
$
(
"li"
).
remove
(
".xin"
);
$
(
".spinner"
).
css
(
"display"
,
"none"
);
$
(
".doc-headline-a"
).
trigger
(
"click"
);
if
(
fileFromArr
.
length
==
0
){
$
(
"#docImage"
).
attr
(
"src"
,
""
);
$
(
".next-page "
).
css
(
"display"
,
"none"
);
$
(
".total-page"
).
css
(
"display"
,
"none"
);
$
(
".bias"
).
css
(
"display"
,
"none"
);
$
(
".cur-page"
).
css
(
"display"
,
"none"
);
$
(
".prev"
).
css
(
"display"
,
"none"
);
}
}
...
...
@@ -980,7 +992,7 @@ function whiteboardUpdate(callbackData) {
draw
.
drawCanvas
(
callbackData
);
$
(
".spinner"
).
css
(
"display"
,
"none"
);
$
(
".spinner1"
).
css
(
"display"
,
"none"
);
$
(
".doc-headline-a"
).
trigger
(
"click"
);
//
$(".doc-headline-a").trigger("click");
}
...
...
src/videoWithFlash.js
查看文件 @
eca277e
...
...
@@ -151,7 +151,7 @@ $(function () {
$
(
"#teacherVideo-voice"
).
addClass
(
"teacherVideo-voice"
);
$
(
"#teacherVideo-voice"
).
removeClass
(
"teacherVideo-voiceBg"
);
$
(
".teacherVideoBg"
).
css
(
"display"
,
"none"
);
$
(
".teacherVideo"
).
css
(
"background"
,
"#CCCCCC"
);
//
$(".teacherVideo").css("background", "#CCCCCC");
$
(
".teacherVideo-voice"
).
css
(
"bottom"
,
"4px"
);
$
(
".teacherVoicing"
).
css
(
"display"
,
"none"
);
...
...
@@ -356,7 +356,6 @@ function _videoUpdate(callbackDate){
console
.
log
(
"videoUpdate==============>"
,
callbackDate
);
if
(
callbackDate
.
fromNodeId
==
classAllInfo
.
nodeId
)
return
;
if
((
classAllInfo
.
userRole
==
"host"
)
&&
(
callbackDate
.
status
==
1
)
&&
(
callbackDate
.
fromNodeId
==
stuNodeId
)){
//获取学生播流地址
...
...
@@ -686,7 +685,7 @@ function achieveStuPlayAudioStream(_pubResultObj){
console
.
log
(
"result是=============>"
,
streamInfo
);
$
(
".stuPlay"
).
css
({
"width"
:
"240px"
,
"height"
:
"180px"
});
$
(
".teacherVideoBg"
).
css
(
"display"
,
"none"
);
$
(
".teacherVideo"
).
css
(
"background"
,
"#CCCCCC"
);
//
$(".teacherVideo").css("background", "#CCCCCC");
$
(
".teacherVideo-voice"
).
css
(
"bottom"
,
"4px"
);
if
(
!
window
.
playflashStuAudio
)
{
...
...
@@ -888,7 +887,7 @@ function achievePlayAudioStream(_pubResultObj){
console
.
log
(
"result是=============>"
,
streamInfo
);
$
(
".play"
).
css
({
"width"
:
"240px"
,
"height"
:
"180px"
});
$
(
".teacherVideoBg"
).
css
(
"display"
,
"none"
);
$
(
".teacherVideo"
).
css
(
"background"
,
"#CCCCCC"
);
//
$(".teacherVideo").css("background", "#CCCCCC");
$
(
".teacherVideo-voice"
).
css
(
"bottom"
,
"4px"
);
if
(
!
window
.
playflashAudio
)
{
...
...
请
注册
或
登录
后发表评论