Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
YM4-10
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
template admin
YM4-10
Commits
5e0d681b
Commit
5e0d681b
authored
Oct 23, 2020
by
Chen Jiping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:修复音频显示问题
parent
609c6245
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
31 deletions
+49
-31
Exercises.ts
src/app/play/Exercises.ts
+41
-28
play.component.ts
src/app/play/play.component.ts
+8
-3
No files found.
src/app/play/Exercises.ts
View file @
5e0d681b
...
...
@@ -24,7 +24,7 @@ export class Exercises {
shown
=
false
;
pic
:
MySprite
;
pic
:
MySprite
;
init
(
images
,
data
)
{
...
...
@@ -162,13 +162,13 @@ export class Exercises {
let
letterObj
=
new
Letter
();
letterObj
.
letter
=
label
;
letterObj
.
isFill
=
letter
.
isFill
;
wordObj
.
letterArr
.
push
(
letterObj
);
wordObj
.
letterArr
.
push
(
letterObj
);
}
//重新设置坐标
for
(
let
j
=
0
;
j
<
wordObj
.
letterArr
.
length
;
++
j
)
{
for
(
let
j
=
0
;
j
<
wordObj
.
letterArr
.
length
;
++
j
)
{
let
letterObj
=
wordObj
.
letterArr
[
j
];
...
...
@@ -248,77 +248,90 @@ export class Exercises {
return
false
;
}
showWord
(
index
){
isWordShow
(
index
){
let
word
=
this
.
wordBgArr
[
index
];
if
(
!
word
){
if
(
!
word
)
{
return
false
;
}
return
word
.
shown
;
}
showWord
(
index
)
{
let
word
=
this
.
wordBgArr
[
index
];
if
(
!
word
)
{
return
;
}
if
(
this
.
shown
)
{
if
(
this
.
shown
)
{
return
;
}
for
(
let
i
=
0
;
i
<
word
.
letterArr
.
length
;
++
i
)
{
for
(
let
i
=
0
;
i
<
word
.
letterArr
.
length
;
++
i
)
{
word
.
letterArr
[
i
].
letter
.
alpha
=
1
;
}
//设置已经显示
word
.
shown
=
true
;
let
exsit
=
false
;
for
(
let
i
=
0
;
i
<
this
.
wordBgArr
.
length
;
++
i
)
{
for
(
let
i
=
0
;
i
<
this
.
wordBgArr
.
length
;
++
i
)
{
let
tWord
=
this
.
wordBgArr
[
i
];
for
(
let
j
=
0
;
j
<
tWord
.
letterArr
.
length
;
++
j
)
{
if
(
tWord
.
letterArr
[
j
].
letter
.
alpha
==
0
)
{
for
(
let
j
=
0
;
j
<
tWord
.
letterArr
.
length
;
++
j
)
{
if
(
tWord
.
letterArr
[
j
].
letter
.
alpha
==
0
)
{
exsit
=
true
;
break
;
}
}
//如果存在,则直接跳出
if
(
exsit
)
{
if
(
exsit
)
{
break
;
}
}
if
(
!
exsit
)
{
if
(
!
exsit
)
{
this
.
shown
=
true
;
//处理单词显示
for
(
let
i
=
0
;
i
<
this
.
wordBgArr
.
length
;
++
i
)
{
for
(
let
i
=
0
;
i
<
this
.
wordBgArr
.
length
;
++
i
)
{
let
tWord
=
this
.
wordBgArr
[
i
];
for
(
let
j
=
0
;
j
<
tWord
.
letterArr
.
length
;
++
j
)
{
for
(
let
j
=
0
;
j
<
tWord
.
letterArr
.
length
;
++
j
)
{
let
letter
=
tWord
.
letterArr
[
j
];
//修改字体颜色
if
(
letter
.
isFill
==
'
0
'
)
{
if
(
letter
.
isFill
==
'
0
'
)
{
letter
.
letter
.
fontColor
=
'
#000000
'
;
}
}
}
}
}
}
export
class
Word
{
export
class
Word
{
bg
:
ShapeRect
;
bg
:
ShapeRect
;
letterArr
:
Array
<
Letter
>
=
[];
letterArr
:
Array
<
Letter
>
=
[];
shown
:
Boolean
=
false
;
}
export
class
Letter
{
export
class
Letter
{
letter
:
Label
;
letter
:
Label
;
isFill
:
String
=
'
0
'
;
isFill
:
String
=
'
0
'
;
}
\ No newline at end of file
src/app/play/play.component.ts
View file @
5e0d681b
...
...
@@ -943,9 +943,14 @@ export class PlayComponent implements OnInit, OnDestroy {
if
(
this
.
checkClickTarget
(
wordBg
.
bg
)){
exercises
.
showWord
(
i
);
let
key
=
'
word_
'
+
index
+
'
_
'
+
i
;
this
.
curAudio
=
this
.
audioObj
[
key
];
this
.
playAudio
(
key
,
true
);
//如果单词已经填完,则播放音频
if
(
exercises
.
isWordShow
(
i
)){
let
key
=
'
word_
'
+
index
+
'
_
'
+
i
;
this
.
curAudio
=
this
.
audioObj
[
key
];
this
.
playAudio
(
key
,
true
);
}
break
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment