From 1b0a5714413364d04e8b98d58b908210924f1632 Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Mon, 8 Aug 2022 10:58:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=8B=BC=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/videoPlayer/videoPlay.jsx  |  6 +--
 .../equipmentWarehouse/containers/camera.jsx  | 50 +++++++++----------
 code/VideoAccess-VCMP/web/package.json        |  2 +-
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
index 9c910e6..376708c 100644
--- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
@@ -56,7 +56,7 @@ const VideoPlay = ({
     //     audio: false,
     //     serialNo: '34020000001310000001', // 设备序列号 必须
     //     topSerialNo: '34020000001110000077', // 设备顶级序列号 必须
-    //     playUrlSd: 'ws://221.230.55.27:8081/jessica/34020000001110000077/34020000001310000001', // 必须
+    //     playUrlSd: 'http://221.230.55.27:8081/jessica/34020000001110000077/34020000001310000001', // 必须
     //     // playUrlHd: 'ezopen://open.ys7.com/G75922040/1.hd.live',
     //     // replayUrl: 'ezopen://open.ys7.com/G75922040/1.rec',
     // },
@@ -291,7 +291,7 @@ const VideoPlay = ({
                 // }, err => {.
                 //    console.log(err);
                 // })
-
+                console.log(videoObj);
                 const inviteRes_ = await request.get(`${iotVideoServer}/api/gb28181/invite?id=${videoObj.topSerialNo}&channel=${videoObj.serialNo}`)
             } catch (error) {
                 console.log(error.response);
@@ -402,7 +402,7 @@ const VideoPlay = ({
                         videoHeight = (containerWidth / 16) * 9
                     }
                 }
-              
+
                 if (videoObj.type == 'yingshi' && player) {
                     player.reSize(videoWidth, videoHeight)
                 }
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
index b1e123c..e0dbdda 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
@@ -13,11 +13,11 @@ import {
     Popconfirm,
     Row,
 } from "@douyinfe/semi-ui";
-import { SimpleFileDownButton, VideoPlayModal,SkeletonScreen } from "$components";
+import { SimpleFileDownButton, VideoPlayModal, SkeletonScreen } from "$components";
 import "../style.less";
 import CameraModal from "../components/cameraModal";
 import RemarksModal from "../components/remarksModal";
-import {Setup} from "$components";
+import { Setup } from "$components";
 import SideSheets from "../components/sideSheet";
 import { skeletonScreen } from "../../../components/skeletonScreen";
 import { accessType } from "./nvr";
@@ -25,7 +25,7 @@ import { accessType } from "./nvr";
 const CameraHeader = (props) => {
     const { dispatch, actions, user, loading, equipmentWarehouseCamera } = props;
     const [cameraModal, setCameraModal] = useState(false);
-    const [remarksModal,setRemarksModal] = useState(false);
+    const [remarksModal, setRemarksModal] = useState(false);
     const [videoPlay, setVideoPlay] = useState(false);
     const [modalName, setModalName] = useState("");
     const [setup, setSetup] = useState(false);
@@ -53,8 +53,8 @@ const CameraHeader = (props) => {
     const CAMERAS = "cameras";
     const tableList = [//表格属性
         {
-            title:'设备信息',
-            list:[
+            title: '设备信息',
+            list: [
                 { name: "设备厂家", value: "manufactor" },
                 { name: "接入类型", value: "type" },
                 { name: "设备状态", value: "state" },
@@ -65,8 +65,8 @@ const CameraHeader = (props) => {
             ]
         },
         {
-            title:'项目信息',
-            list:[
+            title: '项目信息',
+            list: [
                 { name: "项目名称", value: "name" },
                 { name: "pcode", value: "pcode" },
                 { name: "结构物", value: "structure" },
@@ -217,16 +217,16 @@ const CameraHeader = (props) => {
                         <Button
                             theme="borderless"
                             onClick={() => {
-                                let data = row?.cameraRemarks.map((item)=>item.remark)
+                                let data = row?.cameraRemarks.map((item) => item.remark)
                                 if (row.type == "yingshi") {
                                     setVideoObj({
                                         type: row.type,
                                         serialNo: row.serialNo,
                                         yingshiToken: row.secretYingshi?.token,
-                                        playUrlSd: row.gbCamera?.playUrl?.liveUrl?.sd?.ezopen,
-                                        playUrlHd: row.gbCamera?.playUrl?.liveUrl?.hd?.ezopen,
-                                        replayUrl:row.gbCamera?.playUrl?.replayUrl?.cloud,
-                                        content:data,
+                                        playUrlSd: `ezopen://open.ys7.com/${row.serialNo}/${row.channelNo || '1'}.live`,
+                                        playUrlHd:`ezopen://open.ys7.com/${row.serialNo}/${row.channelNo || '1'}.hd.live`,
+                                        replayUrl:`ezopen://open.ys7.com/${row.serialNo}/${row.channelNo || '1'}.hd.local.rec`,
+                                        content: data,
                                     })
                                 } else {
                                     setVideoObj({
@@ -235,7 +235,7 @@ const CameraHeader = (props) => {
                                         serialNo: row.serialNo,
                                         topSerialNo: row.topSerialNo,
                                         playUrlSd: row.gbCamera?.playUrl?.liveUrl?.sd["WS-RAW"],
-                                        content:data,
+                                        content: data,
                                     })
                                 }
                                 setVideoPlay(true)
@@ -308,7 +308,7 @@ const CameraHeader = (props) => {
                         <Button
                             theme="borderless"
                             onClick={() => {
-                                setCameraRemarks(row.cameraRemarks||[])
+                                setCameraRemarks(row.cameraRemarks || [])
                                 setRowId(row.id);
                                 setRemarksModal(true)
                             }}
@@ -858,17 +858,17 @@ const CameraHeader = (props) => {
                 : ""
             }
             {
-                remarksModal?
-                <RemarksModal
-                visible={true}
-                rowId={rowId}
-                cameraRemarks={cameraRemarks}
-                close={() => {
-                    setRemarksModal(false);
-                    setRowId();
-                    equipmentGetCamera();
-                }} >
-                </RemarksModal>:''
+                remarksModal ?
+                    <RemarksModal
+                        visible={true}
+                        rowId={rowId}
+                        cameraRemarks={cameraRemarks}
+                        close={() => {
+                            setRemarksModal(false);
+                            setRowId();
+                            equipmentGetCamera();
+                        }} >
+                    </RemarksModal> : ''
             }
         </>
     );
diff --git a/code/VideoAccess-VCMP/web/package.json b/code/VideoAccess-VCMP/web/package.json
index b11736a..3b213ad 100644
--- a/code/VideoAccess-VCMP/web/package.json
+++ b/code/VideoAccess-VCMP/web/package.json
@@ -7,7 +7,7 @@
       "test": "mocha",
       "start-vite": "cross-env NODE_ENV=developmentVite npm run start-params",
       "start": "cross-env NODE_ENV=development npm run start-params",
-      "start-params": "node server -p 5000 -u http://10.8.30.34:4000 --apiVcmpUrl http://localhost:4000 --apiAuthUrl http://10.8.30.34:4200 --apiAnxinyunUrl http://10.8.30.34:4100  --iotAuthWeb http://localhost:5200 --iotVideoServer ws://221.230.55.27:8081",
+      "start-params": "node server -p 5000 -u http://10.8.30.34:4000 --apiVcmpUrl http://localhost:4000 --apiAuthUrl http://10.8.30.34:4200 --apiAnxinyunUrl http://10.8.30.34:4100  --iotAuthWeb http://localhost:5200 --iotVideoServer http://221.230.55.27:8081",
       "deploy": "export NODE_ENV=production&& npm run build && node server",
       "build-dev": "cross-env NODE_ENV=development&&webpack --config webpack.config.js",
       "build": "export NODE_ENV=production&&webpack --config webpack.config.prod.js"