From feaf0a9778879ef211c5587a513ba4cbdabb52d0 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 23 六月 2022 17:42:58 +0800
Subject: [PATCH] bug修复
---
src/components/player/index.vue | 165 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 108 insertions(+), 57 deletions(-)
diff --git a/src/components/player/index.vue b/src/components/player/index.vue
index a1757a3..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,50 +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()
- }
+ // 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,
@@ -75,21 +89,23 @@
ctx: null,
canvasWidth: 0,
canvasHeight: 0,
- algoDataSocket: null
+ algoDataSocket: null,
};
},
watch: {
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.algoDataSocket && this.algoDataSocket.close();
}
this.$nextTick(() => {
this.clickStart();
+ this.poster = "/images/player/player_poster.gif?t=" + Math.random();
});
}
- }
+ },
},
mounted() {
this.clickStart();
@@ -98,34 +114,33 @@
this.ctx = this.canvas.getContext("2d");
this.ctx.lineWidth = 1;
this.initArea();
-
- })
+ });
},
beforeDestroy() {
this.wfs.destroy();
this.wfsId = "";
- !!this.algoDataSocket && this.algoDataSocket.close()
+ !!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 == "") {
@@ -142,7 +157,7 @@
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,22 +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.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.canvas.style.cursor = "default";
-
});
_this.canvasData.arrow.forEach(function (v, i) {
_this.ctx.strokeStyle = "yellow";
@@ -208,7 +243,6 @@
"yellow"
);
_this.canvas.style.cursor = "default";
-
});
_this.canvasData.polygon.forEach(function (v, i) {
if (v.location.length === 0) {
@@ -216,19 +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.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锛屽彧涓嶈繃瀹冩槸涓�涓暟缁�)
@@ -281,7 +330,7 @@
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();
});
@@ -289,35 +338,37 @@
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 });
+ 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)
+ console.log(this.canvasData);
this.clickSelect(this.canvasData);
},
initAlgoDataWebScoket() {
- if (typeof (WebSocket) === "undefined") {
- console.log("error,鎮ㄧ殑娴忚鍣ㄤ笉鏀寔socket")
+ if (typeof WebSocket === "undefined") {
+ console.log("error,鎮ㄧ殑娴忚鍣ㄤ笉鏀寔socket");
} else {
- this.algoDataSocket = new WebSocket()
+ this.algoDataSocket = new WebSocket();
this.algoDataSocket.onopen = () => {
- console.log("socket杩炴帴鎴愬姛")
- }
+ console.log("socket杩炴帴鎴愬姛");
+ };
this.algoDataSocket.onerror = () => {
- console.log("杩炴帴閿欒")
- }
- this.algoDataSocket.onmessage = msg => {
- console.log(msg)
- }
+ console.log("杩炴帴閿欒");
+ };
+ this.algoDataSocket.onmessage = (msg) => {
+ console.log(msg);
+ };
}
- }
- }
+ },
+ },
};
</script>
--
Gitblit v1.8.0