From 9f90f790c672413580725cfb5c0359f555b91bd6 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期三, 09 九月 2020 15:42:22 +0800
Subject: [PATCH] fix: example app
---
src/components/player/index.vue | 146 ++++++++++++++++++++++++++++++++----------------
1 files changed, 96 insertions(+), 50 deletions(-)
diff --git a/src/components/player/index.vue b/src/components/player/index.vue
index 8a13ecd..e73f92b 100644
--- a/src/components/player/index.vue
+++ b/src/components/player/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="video-player">
- <canvas id="area-canvas" ></canvas>
+ <canvas v-show="showArea" id="area-canvas" ref="areaCanvas" :width="canvasWidth" :height="canvasHeight"></canvas>
<video ref="videoPlayer" :poster="poster" preload="auto" muted></video>
<div class="controls">
<!-- 鍏ㄥ睆 -->
@@ -13,6 +13,7 @@
import VideoRuleData from "@/Pool/VideoRuleData";
import TreeDataPool from "@/Pool/TreeData";
import { getAllPolygon } from "@/api/polygon";
+import polygonCanvas from "@/components/canvas";
export default {
name: "CameraPlayer",
props: {
@@ -40,9 +41,15 @@
isGb: {
type: Boolean,
default: false
+ },
+ showArea: {
+ type: Boolean,
+ default: true
}
},
+
computed: {
+
poster() {
return "/images/player/player_poster.gif?t=" + Math.random()
}
@@ -52,23 +59,40 @@
wfs: {},
wfsId: 0,
Camera: new VideoRuleData(),
+ showCanvas: true,
canvasData: {
line: [],
rect: [], // {id:'uuid', name: '鐭╁舰1', location: [{ x: 20, y: 30 }, { x: 20, y: 60 }, { x: 100, y: 60 }, { x: 100, y: 30 }] }
arrow: [],
polygon: []
},
- showProportion: 1.71,
+ //showProportion: 3.2,
+ //showProportionY: 3.58,
+ showProportion: 1.036,
+ showProportionY: 1.039,
canvas: null,
- ctx: null
+ ctx: null,
+ canvasWidth: 0,
+ canvasHeight: 0,
};
},
watch: {
- "TreeDataPool.selectedNode": function(node){
- debugger;
- this.initCanvas(node);
-
- },
+ // "TreeDataPool.selectedNode": async function(node){
+ // if(node){
+ // console.log('TreeDataPool.selectedNode')
+ // console.log(node)
+ // //this.Camera.cameraId = node.id;
+ // const res = await getAllPolygon({cameraId: node.id});
+
+ // this.canvasData.line = res.data.line;
+ // this.canvasData.rect = res.data.rect;
+ // this.canvasData.arrow = res.data.arrow;
+ // this.canvasData.polygon = res.data.polygon;
+ // console.log(this.canvasData)
+ // this.clickSelect(this.canvasData);
+ // }
+ // },
+
rtspUrl: function (newVal, oldVal) {
if (newVal !== oldVal) {
if (this.wfs.config) {
@@ -155,11 +179,11 @@
_this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportion);
_this.ctx.lineTo(v.location[1].x / _this.showProportion, v.location[1].y / _this.showProportion);
_this.ctx.stroke();
- _this.showRemarks(
- v.location[0].x / _this.showProportion,
- v.location[0].y / _this.showProportion,
- v.name
- );
+ // _this.showRemarks(
+ // v.location[0].x / _this.showProportion,
+ // v.location[0].y / _this.showProportion,
+ // v.name
+ // );
_this.canvas.style.cursor = "default";
if (e && _this.ctx.isPointInStroke(e.offsetX, e.offsetY)) {
// 濡傛灉浼犲叆浜嗕簨浠跺潗鏍囷紝灏辩敤isPointInStroke鍒ゆ柇涓�涓�
@@ -191,11 +215,11 @@
_this.ctx.lineTo(v.location[3].x / _this.showProportion, v.location[3].y / _this.showProportion);
_this.ctx.lineTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportion);
_this.ctx.stroke();
- _this.showRemarks(
- v.location[0].x / _this.showProportion,
- v.location[0].y / _this.showProportion,
- v.name
- );
+ // _this.showRemarks(
+ // v.location[0].x / _this.showProportion,
+ // v.location[0].y / _this.showProportion,
+ // v.name
+ // );
_this.canvas.style.cursor = "default";
if (e && _this.ctx.isPointInPath(e.offsetX, e.offsetY)) {
// 濡傛灉浼犲叆浜嗕簨浠跺潗鏍囷紝灏辩敤isPointInStroke鍒ゆ柇涓�涓�
@@ -279,17 +303,17 @@
}
_this.ctx.strokeStyle = "yellow";
_this.ctx.beginPath();
- _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportion);
+ _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportionY);
for (let i = 1; i < v.location.length; i++) {
- _this.ctx.lineTo(v.location[i].x / _this.showProportion, v.location[i].y / _this.showProportion);
+ _this.ctx.lineTo(v.location[i].x / _this.showProportion, v.location[i].y / _this.showProportionY);
}
_this.ctx.closePath();
_this.ctx.stroke();
- _this.showRemarks(
- v.location[v.location.length - 1].x / _this.showProportion,
- v.location[v.location.length - 1].y / _this.showProportion,
- v.name
- );
+ // _this.showRemarks(
+ // v.location[v.location.length - 1].x / _this.showProportion,
+ // v.location[v.location.length - 1].y / _this.showProportionY,
+ // v.name
+ // );
_this.canvas.style.cursor = "default";
if (e && _this.ctx.isPointInPath(e.offsetX, e.offsetY)) {
// 濡傛灉浼犲叆浜嗕簨浠跺潗鏍囷紝灏辩敤isPointInStroke鍒ゆ柇涓�涓�
@@ -301,15 +325,15 @@
// 灏嗗綋鍓嶅厓绱犳爣绾�
_this.ctx.strokeStyle = "red";
_this.ctx.beginPath();
- _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportion);
+ _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportionY);
for (let i = 1; i < v.location.length; i++) {
- _this.ctx.lineTo(v.location[i].x / _this.showProportion, v.location[i].y / _this.showProportion);
+ _this.ctx.lineTo(v.location[i].x / _this.showProportion, v.location[i].y / _this.showProportionY);
}
_this.ctx.closePath();
_this.ctx.stroke();
_this.showRemarks(
v.location[v.location.length - 1].x / _this.showProportion,
- v.location[v.location.length - 1].y / _this.showProportion,
+ v.location[v.location.length - 1].y / _this.showProportionY,
v.name
);
_this.canvas.style.cursor = "pointer";
@@ -325,32 +349,52 @@
this.ctx.textAlign = "left"; // 璁剧疆瀛椾綋瀵归綈鐨勬柟寮�
this.ctx.fillText(remarks, x, y - 10); // 濉厖鏂囧瓧
},
-
- async initCanvas(id){
-
- this.canvas = document.querySelector("#area-canvas");
- this.ctx = this.canvas.getContext("2d");
-
- // this.Camera.getPolygon();
- // console.log(this.Camera.canvasData);
- const rsp = await getAllPolygon({ cameraId: id });
- debugger
- if (rsp && rsp.success) {
- this.canvasData = {
- line: rsp.data.line,
- arrow: rsp.data.arrow,
- polygon: rsp.data.polygon,
- //rect: rsp.data.rect
- rect: [{id:'uuid', name: '鐭╁舰1', location: [{ x: 20, y: 30 }, { x: 20, y: 60 }, { x: 100, y: 60 }, { x: 100, y: 30 }] }]
- };
- }
- debugger
+ getCanvasData(data) {
+ let polyon = { ...data };
+ polyon.camera_id = this.Camera.cameraId;
+ savePolygon(polyon).then(rsp => {
+ this.Camera.getPolygon();
+ this.Camera.getCameraTask();
+ });
+ },
+ setWidthHeight(){
+ this.canvasWidth = this.$refs.videoPlayer.offsetWidth;
+ this.canvasHeight = this.$refs.videoPlayer.offsetHeight;
+ },
+ async initArea(){
+ console.log('init')
+ const res = await getAllPolygon({cameraId: this.TreeDataPool.selectedNode.id});
+ this.canvasData.line = res.data.line;
+ this.canvasData.rect = res.data.rect;
+ this.canvasData.arrow = res.data.arrow;
+ this.canvasData.polygon = res.data.polygon;
+ console.log(this.canvasData)
+ // this.canvasData = {
+ // line: [],
+ // arrow: [],
+ // polygon: [{id:'uuid', name: '澶氳竟褰�1', location: [{ x: 735, y: 155 }, { x: 830, y: 156 }, { x: 809, y: 351 }, { x: 809, y: 364 }, { x: 753, y: 396 }, { x: 755, y: 520 },{ x: 706, y: 524 },{ x: 722, y: 392 },{x:758,y:280},{ x: 735, y: 155 }] }],
+ // //rect: rsp.data.rect
+ // rect: []
+ // };
this.clickSelect(this.canvasData);
}
},
mounted() {
this.clickStart();
+ //鑾峰彇video瀹介珮骞剁粰鍖哄煙canvas璧嬪��
+ this.setWidthHeight();
+ window.addEventListener('resize',()=>{
+ //this.setWidthHeight();
+ //this.initArea();
+ });
+ this.$nextTick(()=>{
+ this.canvas = this.$refs.areaCanvas;
+ this.ctx = this.canvas.getContext("2d");
+ this.ctx.lineWidth = 1;
+ this.initArea();
+
+ })
},
beforeDestroy() {
this.wfs.destroy();
@@ -361,13 +405,15 @@
<style lang="scss">
#area-canvas{
- width: 100%;
- height: 100%;
background: transparent;
position: absolute;
top: 0;
left: 0;
+ padding: 0;
+ width: 100%;
+ height: 100%;
}
+
video {
object-fit: fill;
width: 100%;
--
Gitblit v1.8.0