Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
ww_question2
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
ww_question2
Commits
1f535d89
Commit
1f535d89
authored
5 years ago
by
limingzhe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add hotZone
parent
a4d93283
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
1933 additions
and
63 deletions
+1933
-63
app.module.ts
src/app/app.module.ts
+2
-0
Unit.ts
src/app/common/custom-hot-zone/Unit.ts
+765
-0
custom-hot-zone.component.html
...app/common/custom-hot-zone/custom-hot-zone.component.html
+89
-0
custom-hot-zone.component.scss
...app/common/custom-hot-zone/custom-hot-zone.component.scss
+203
-0
custom-hot-zone.component.ts
src/app/common/custom-hot-zone/custom-hot-zone.component.ts
+811
-0
arrow.png
src/assets/common/arrow.png
+0
-0
arrow_right.png
src/assets/common/arrow_right.png
+0
-0
arrow_top.png
src/assets/common/arrow_top.png
+0
-0
video.js
src/assets/libs/video-js-7.0.0/video.js
+62
-62
video.min.js
src/assets/libs/video-js-7.0.0/video.min.js
+1
-1
No files found.
src/app/app.module.ts
View file @
1f535d89
...
...
@@ -24,6 +24,7 @@ import {BackgroundImagePipe} from "./pipes/background-image.pipe";
import
{
UploadVideoComponent
}
from
"
./common/upload-video/upload-video.component
"
;
import
{
ResourcePipe
}
from
"
./pipes/resource.pipe
"
;
import
{
TimePipe
}
from
"
./pipes/time.pipe
"
;
import
{
CustomHotZoneComponent
}
from
"
./common/custom-hot-zone/custom-hot-zone.component
"
;
registerLocaleData
(
zh
);
@
NgModule
({
...
...
@@ -38,6 +39,7 @@ registerLocaleData(zh);
ResourcePipe
,
TimePipe
,
UploadVideoComponent
,
CustomHotZoneComponent
,
PlayerContentWrapperComponent
],
...
...
This diff is collapsed.
Click to expand it.
src/app/common/custom-hot-zone/Unit.ts
0 → 100644
View file @
1f535d89
This diff is collapsed.
Click to expand it.
src/app/common/custom-hot-zone/custom-hot-zone.component.html
0 → 100644
View file @
1f535d89
<div
class=
"p-image-children-editor"
>
<h5
style=
"margin-left: 2.5%;"
>
preview:
</h5>
<div
class=
"preview-box"
#
wrap
>
<canvas
id=
"canvas"
#
canvas
></canvas>
</div>
<div
nz-row
nzType=
"flex"
nzAlign=
"middle"
>
<div
nz-col
nzSpan=
"5"
nzOffset=
"1"
>
<h5>
add background:
</h5>
<div
class=
"bg-box"
>
<app-upload-image-with-preview
[
picUrl
]="
bgItem
.
url
"
(
imageUploaded
)="
onBackgroundUploadSuccess
($
event
)"
>
</app-upload-image-with-preview>
</div>
</div>
<div
nz-col
nzSpan=
"5"
nzOffset=
"1"
class=
"img-box"
*
ngFor=
"let it of hotZoneArr; let i = index"
>
<div
style=
" height: 40px;"
>
<h5>
item-{{i+1}}
<i
style=
"margin-left: 20px; margin-top: 2px; float: right; cursor:pointer"
(
click
)="
deleteItem
($
event
,
i
)"
nz-icon
[
nzTheme
]="'
twotone
'"
[
nzType
]="'
close-circle
'"
[
nzTwotoneColor
]="'#
ff0000
'"
></i>
</h5>
</div>
<!--<div class="img-box-upload">-->
<!--<app-upload-image-with-preview-->
<!--[picUrl]="it.pic_url"-->
<!--(imageUploaded)="onImgUploadSuccessByImg($event, it)">-->
<!--</app-upload-image-with-preview>-->
<!--</div>-->
<!--<app-audio-recorder-->
<!--[audioUrl]="it.audio_url ? it.audio_url : null "-->
<!--(audioUploaded)="onAudioUploadSuccessByImg($event, it)"-->
<!--></app-audio-recorder>-->
</div>
<div
nz-col
nzSpan=
"5"
nzOffset=
"1"
>
<div
class=
"bg-box"
>
<button
nz-button
nzType=
"dashed"
(
click
)="
addBtnClick
()"
class=
"add-btn"
>
<i
nz-icon
nzType=
"plus-circle"
nzTheme=
"outline"
></i>
<!--Add Image-->
Add hot zone
</button>
</div>
</div>
</div>
<nz-divider></nz-divider>
<div
class=
"save-box"
>
<button
class=
"save-btn"
nz-button
nzType=
"primary"
[
nzSize
]="'
large
'"
nzShape=
"round"
(
click
)="
saveClick
()"
>
<i
nz-icon
type=
"save"
></i>
Save
</button>
</div>
</div>
This diff is collapsed.
Click to expand it.
src/app/common/custom-hot-zone/custom-hot-zone.component.scss
0 → 100644
View file @
1f535d89
.p-image-children-editor
{
width
:
100%
;
height
:
100%
;
border-radius
:
0
.5rem
;
border
:
2px
solid
#ddd
;
.preview-box
{
margin
:
auto
;
width
:
95%
;
height
:
35vw
;
border
:
2px
dashed
#ddd
;
border-radius
:
0
.5rem
;
background-color
:
#fafafa
;
text-align
:
center
;
color
:
#aaa
;
.preview-img
{
height
:
100%
;
width
:
auto
;
}
}
.bg-box
{
//width: 100%;
margin-bottom
:
1rem
;
}
.img-box
{
margin-bottom
:
1rem
;
display
:
flex
;
flex-direction
:
column
;
align-items
:
center
;
justify-content
:
center
;
}
.img-box-upload
{
width
:
80%
;
}
.add-btn
{
margin-top
:
1rem
;
width
:
200px
;
height
:
90px
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
}
}
.save-box
{
width
:
100%
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
.save-btn
{
width
:
160px
;
height
:
40px
;
//margin-top: 20px;
margin-bottom
:
20px
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
}
}
h5
{
margin-top
:
1rem
;
}
//@import '../../../style/common_mixin';
//
//.p-image-uploader {
// position: relative;
// display: block;
// width: 100%;
// height: 0;
// padding-bottom: 56.25%;
// .p-box {
// position: absolute;
// left: 0;
// top: 0;
// right: 0;
// bottom: 0;
// border: 2px dashed #ddd;
// border-radius: 0.5rem;
// background-color: #fafafa;
// text-align: center;
// color: #aaa;
// .p-upload-icon {
// text-align: center;
// margin: auto;
// .anticon-upload {
// color: #888;
// font-size: 5rem;
// }
// .p-progress-bar {
// position: relative;
// width: 20rem;
// height: 1.5rem;
// border: 1px solid #ccc;
// border-radius: 1rem;
// .p-progress-bg {
// background-color: #1890ff;
// border-radius: 1rem;
// height: 100%;
// }
// .p-progress-value {
// position: absolute;
// top: 0;
// left: 0;
// width: 100%;
// height: 100%;
// text-shadow: 0 0 4px #000;
// color: white;
// text-align: center;
// font-size: 0.9rem;
// line-height: 1.5rem;
// }
// }
// }
// .p-preview {
// width: 100%;
// height: 100%;
// //background-image: url("https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png");
// @include k-img-bg();
// }
// }
//}
//
//.p-btn-delete {
// position: absolute;
// right: -0.5rem;
// top: -0.5rem;
// width: 2rem;
// height: 2rem;
// border: 0.2rem solid white;
// border-radius: 50%;
// font-size: 1.2rem;
// background-color: #fb781a;
// color: white;
// text-align: center;
//}
//
//.p-upload-progress-bg {
// position: absolute;
// width: 100%;
// height: 100%;
// display: flex;
// align-items: center;
// justify-content: center;
// & .i-text {
// position: absolute;
// text-align: center;
// color: white;
// text-shadow: 0 0 2px rgba(0, 0, 0, .85);
// }
// & .i-bg {
// position: absolute;
// left: 0;
// top: 0;
// height: 100%;
// background-color: #27b43f;
// border-radius: 0.5rem;
// }
//}
//
//
//:host ::ng-deep .ant-upload {
// display: block;
//}
This diff is collapsed.
Click to expand it.
src/app/common/custom-hot-zone/custom-hot-zone.component.ts
0 → 100644
View file @
1f535d89
This diff is collapsed.
Click to expand it.
src/assets/common/arrow.png
0 → 100644
View file @
1f535d89
18.5 KB
This diff is collapsed.
Click to expand it.
src/assets/common/arrow_right.png
0 → 100644
View file @
1f535d89
15.7 KB
This diff is collapsed.
Click to expand it.
src/assets/common/arrow_top.png
0 → 100644
View file @
1f535d89
15.6 KB
This diff is collapsed.
Click to expand it.
src/assets/libs/video-js-7.0.0/video.js
View file @
1f535d89
This diff is collapsed.
Click to expand it.
src/assets/libs/video-js-7.0.0/video.min.js
View file @
1f535d89
This diff is collapsed.
Click to expand it.
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