From 4a800a8fc83c6bd1f86a8e847b079a51a7532c09 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 20 七月 2022 15:05:58 +0800
Subject: [PATCH] 修复国标配置的bug
---
src/components/player/index.vue | 249 ++++++++++++++++++++++++++-----------------------
1 files changed, 133 insertions(+), 116 deletions(-)
diff --git a/src/components/player/index.vue b/src/components/player/index.vue
index 7cffb92..93e9342 100644
--- a/src/components/player/index.vue
+++ b/src/components/player/index.vue
@@ -1,6 +1,12 @@
<template>
<div class="video-player">
- <canvas v-show="showArea" id="area-canvas" ref="areaCanvas" width="960" height="540"></canvas>
+ <canvas
+ v-show="showArea"
+ id="area-canvas"
+ ref="areaCanvas"
+ width="960"
+ height="540"
+ ></canvas>
<video ref="videoPlayer" :poster="poster" preload="auto" muted></video>
<div class="controls">
<!-- 鍏ㄥ睆 -->
@@ -20,51 +26,58 @@
wsAddr: {
type: String,
// default: "ws://192.168.1.182:10101/ws"
- default: `${location.protocol === "https" ? "wss" : "ws"}://${location.host}/ws`
+ default: `${location.protocol === "https" ? "wss" : "ws"}://${
+ location.host
+ }/ws`,
},
cameraName: {
type: String,
- default: ""
+ default: "",
},
cameraID: {
type: String,
- default: "C4668FD0-3CAE-C31F-C21E-28B7001243C4"
+ default: "C4668FD0-3CAE-C31F-C21E-28B7001243C4",
},
rtspUrl: {
type: String,
- default: "rtsp://admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream"
+ default:
+ "rtsp://admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream",
},
isRunning: {
type: Boolean,
- default: false
+ default: false,
},
isGb: {
type: Boolean,
- default: false
+ default: false,
},
showArea: {
type: Boolean,
- default: false
- }
+ default: false,
+ },
+ hasPoster: {
+ type: Boolean,
+ default: true,
+ },
},
-
- computed: {
- poster() {
- return "/images/player/player_poster.gif?t=" + Math.random()
- }
+ computed: {
+ // poster() {
+ // return "/images/player/player_poster.gif?t=" + Math.random()
+ // }
},
data() {
return {
wfs: {},
+ poster: "/images/player/player_poster.gif?t=" + Math.random(),
wfsId: 0,
- Camera: new VideoRuleData(),
+ Camera: new VideoRuleData(this.isGb),
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: []
+ polygon: [],
},
//showProportion: 3.2,
//showProportionY: 3.58,
@@ -76,55 +89,58 @@
ctx: null,
canvasWidth: 0,
canvasHeight: 0,
+ algoDataSocket: null,
};
},
watch: {
- // "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) {
+ console.log("new rstp: ", newVal);
if (newVal !== oldVal) {
if (this.wfs.config) {
this.wfs.destroy();
+ !!this.algoDataSocket && this.algoDataSocket.close();
}
this.$nextTick(() => {
this.clickStart();
+ this.poster = "/images/player/player_poster.gif?t=" + Math.random();
});
}
- }
+ },
+ },
+ mounted() {
+ this.clickStart();
+ this.$nextTick(() => {
+ this.canvas = this.$refs.areaCanvas;
+ this.ctx = this.canvas.getContext("2d");
+ this.ctx.lineWidth = 1;
+ this.initArea();
+ });
+ },
+ beforeDestroy() {
+ this.wfs.destroy();
+ this.wfsId = "";
+
+ !!this.algoDataSocket && this.algoDataSocket.close();
},
methods: {
checkConnect(id) {
// console.log(this.wfs)
if (id !== this.wfsId) {
- return
+ return;
}
if (this.wfs.websocketLoader && this.wfs.websocketLoader.client) {
if (this.wfs.websocketLoader.client.disconnected) {
this.clickStart();
- console.log("瀹炴椂瑙嗛宸叉柇寮�锛屾鍦ㄩ噸杩�")
- return
+ console.log("瀹炴椂瑙嗛宸叉柇寮�锛屾鍦ㄩ噸杩�");
+ return;
}
}
let _this = this;
setTimeout(() => {
- _this.checkConnect(id)
- }, 10000)
+ _this.checkConnect(id);
+ }, 10000);
},
clickStart() {
if (this.rtspUrl == "") {
@@ -135,14 +151,13 @@
if (cameraId == "") {
cameraId = this.getUuid();
}
-
if (Wfs.isSupported()) {
let wsAddr = this.wsAddr;
let cameraInfo = {
cameraID: cameraId,
rtspUrl: this.rtspUrl,
isRunning: this.isRunning,
- isGb28181: this.isGb
+ isGb28181: this.isGb,
};
// let camera = document.getElementById(this.cameraID);
@@ -152,7 +167,7 @@
this.wfsId = randomId;
this.wfs.attachMedia(camera, "chX", "H264Raw", wsAddr, cameraInfo);
- this.checkConnect(randomId)
+ this.checkConnect(randomId);
}
},
getUuid() {
@@ -178,32 +193,42 @@
_this.canvasData.line.forEach(function (v, i) {
_this.ctx.strokeStyle = "yellow";
_this.ctx.beginPath();
- _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.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.canvas.style.cursor = "default";
});
_this.canvasData.rect.forEach(function (v, i) {
_this.ctx.strokeStyle = "yellow";
_this.ctx.beginPath();
- _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.lineTo(v.location[2].x / _this.showProportion, v.location[2].y / _this.showProportion);
- _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.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.lineTo(
+ v.location[2].x / _this.showProportion,
+ v.location[2].y / _this.showProportion
+ );
+ _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.canvas.style.cursor = "default";
-
});
_this.canvasData.arrow.forEach(function (v, i) {
_this.ctx.strokeStyle = "yellow";
@@ -216,15 +241,8 @@
20,
30,
"yellow"
- );
- // 缁樺埗鏂规硶
- // _this.showRemarks(
- // v.location[0].x / _this.showProportion,
- // v.location[0].y / _this.showProportion,
- // v.name
- // );
+ );
_this.canvas.style.cursor = "default";
-
});
_this.canvasData.polygon.forEach(function (v, i) {
if (v.location.length === 0) {
@@ -232,24 +250,34 @@
}
_this.ctx.strokeStyle = "yellow";
_this.ctx.beginPath();
- _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportionY);
+ _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.showProportionY);
+ _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.showProportionY,
- // v.name
- // );
_this.canvas.style.cursor = "default";
-
});
},
-
+
// 绠ご缁樺埗鍑芥暟
- drawArrow(ctx, fromX, fromY, toX, toY, theta=30, headlen=10, width=1, color="yellow") {
+ drawArrow(
+ ctx,
+ fromX,
+ fromY,
+ toX,
+ toY,
+ theta = 30,
+ headlen = 10,
+ width = 1,
+ color = "yellow"
+ ) {
// ctx锛欳anvas缁樺浘鐜
// fromX, fromY锛氳捣鐐瑰潗鏍囷紙涔熷彲浠ユ崲鎴恜1锛屽彧涓嶈繃瀹冩槸涓�涓暟缁勶級
// toX, toY锛氱粓鐐瑰潗鏍� (涔熷彲浠ユ崲鎴恜2锛屽彧涓嶈繃瀹冩槸涓�涓暟缁�)
@@ -289,7 +317,7 @@
ctx.stroke();
ctx.restore();
},
-
+
// 鍥炴樉鍥惧舰澶囨敞
showRemarks(x, y, remarks) {
this.ctx.moveTo(x, y - 10); // 鍥犱负鏀惧ぇ涔嬪悗鏄痽-20锛屾墍浠ョ缉灏忕増鐨勪负y-10
@@ -302,61 +330,50 @@
getCanvasData(data) {
let polyon = { ...data };
polyon.camera_id = this.Camera.cameraId;
- savePolygon(polyon).then(rsp => {
+ savePolygon(polyon).then((rsp) => {
this.Camera.getPolygon();
this.Camera.getCameraTask();
});
},
- setWidthHeight(){
+ setWidthHeight() {
this.canvasWidth = this.$refs.videoPlayer.offsetWidth;
this.canvasHeight = this.$refs.videoPlayer.offsetHeight;
- console.log(this.canvasWidth,this.canvasHeight)
+ console.log(this.canvasWidth, this.canvasHeight);
},
- async initArea(){
- console.log('init')
- const res = await getAllPolygon({cameraId: this.TreeDataPool.selectedNode.id});
+ 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: []
- // };
+ console.log(this.canvasData);
this.clickSelect(this.canvasData);
- }
+ },
+ initAlgoDataWebScoket() {
+ if (typeof WebSocket === "undefined") {
+ console.log("error,鎮ㄧ殑娴忚鍣ㄤ笉鏀寔socket");
+ } else {
+ this.algoDataSocket = new WebSocket();
+ this.algoDataSocket.onopen = () => {
+ console.log("socket杩炴帴鎴愬姛");
+ };
+ this.algoDataSocket.onerror = () => {
+ console.log("杩炴帴閿欒");
+ };
+ this.algoDataSocket.onmessage = (msg) => {
+ console.log(msg);
+ };
+ }
+ },
},
- mounted() {
- //鑾峰彇video瀹介珮骞剁粰鍖哄煙canvas璧嬪��
- //this.setWidthHeight();
- this.clickStart();
-
- 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();
- this.wfsId = "";
- }
};
</script>
<style lang="scss">
-#area-canvas{
+#area-canvas {
background: transparent;
position: absolute;
top: 0;
--
Gitblit v1.8.0