Merge branch 'feat/device-new-protocol' of http://git.yunteng.com/yunteng/things…

…kit-front into feat/device-new-protocol

@@ -119,3 +119,8 @@ export const closeFlvPlay = (url: string, browserId: string) => {
     url: `/rtsp/closeFlv?url=${encodeURIComponent(url)}&browserId=${browserId}`,
     url: `/rtsp/closeFlv?url=${encodeURIComponent(url)}&browserId=${browserId}`,
   });
   });
 };
 };
+
+//云台控制
+export const controlling = (params: any) => {
+  return `/api/yt/video/controlling?=${{ ...params }}`;
+};

@@ -18,6 +18,7 @@
   } from '@ant-design/icons-vue';
   } from '@ant-design/icons-vue';
   import { Button } from 'ant-design-vue';
   import { Button } from 'ant-design-vue';
   import { nextTick } from 'vue';
   import { nextTick } from 'vue';
+  import { controlling } from '/@/api/camera/cameraManager';
 
 
   const { prefixCls } = useDesign('basic-video-play');
   const { prefixCls } = useDesign('basic-video-play');
 
 
@@ -37,6 +38,7 @@
 
 
   const getOptions = computed(() => {
   const getOptions = computed(() => {
     const { options, withToken } = props;
     const { options, withToken } = props;
+    console.log(props, 'props');
 
 
     const defaultOptions: VideoJsPlayerOptions & Recordable = {
     const defaultOptions: VideoJsPlayerOptions & Recordable = {
       language: 'zh',
       language: 'zh',
@@ -89,10 +91,10 @@
 
 
   const handleTopClick = async () => {
   const handleTopClick = async () => {
     console.log('上');
     console.log('上');
-    handleControl('up');
+    handleControl(0, 'up');
     setTimeout(() => {
     setTimeout(() => {
-      handleControl('stop');
-    }, 500);
+      handleControl(1, 'up');
+    }, 2000);
   };
   };
 
 
   const handleRightClick = () => {
   const handleRightClick = () => {
@@ -110,10 +112,20 @@
   // type 1:放大    2:缩小
   // type 1:放大    2:缩小
   const handleScale = (type: number) => {
   const handleScale = (type: number) => {
     console.log(type);
     console.log(type);
+    console.log(props);
   };
   };
 
 
-  const handleControl = (direction: string) => {
+  const getSn = () => {
+    const { options } = props || {};
+    const { sources } = options || {};
+    return sources?.[0]?.sn;
+  };
+
+  const handleControl = (action: number, direction: string) => {
     console.log(direction);
     console.log(direction);
+
+    const organizationId = getSn();
+    controlling({ organizationId, action, direction });
   };
   };
 
 
   const isPlay = ref<Boolean | null | undefined>(true);
   const isPlay = ref<Boolean | null | undefined>(true);

@@ -49,12 +49,13 @@
     autoplay: true,
     autoplay: true,
   });
   });
 
 
-  const setSources = (url: string, fingerprintResult: GetResult) => {
+  const setSources = (url: string, fingerprintResult: GetResult, sn) => {
     const flag = isRtspProtocol(url);
     const flag = isRtspProtocol(url);
     options.sources = [
     options.sources = [
       {
       {
         src: flag ? getFlvPlayUrl(url, fingerprintResult.visitorId) : url,
         src: flag ? getFlvPlayUrl(url, fingerprintResult.visitorId) : url,
         type: getVideoTypeByUrl(url),
         type: getVideoTypeByUrl(url),
+        sn,
       },
       },
     ];
     ];
 
 
@@ -65,6 +66,7 @@
   const [register] = useModalInner(
   const [register] = useModalInner(
     async (data: { record: CameraModel | StreamingManageRecord }) => {
     async (data: { record: CameraModel | StreamingManageRecord }) => {
       const { record } = data;
       const { record } = data;
+      console.log(record, 'record');
       const result = await getResult();
       const result = await getResult();
       fingerprintResult.value = result;
       fingerprintResult.value = result;
       if (record.accessMode === AccessMode.ManuallyEnter) {
       if (record.accessMode === AccessMode.ManuallyEnter) {
@@ -74,12 +76,12 @@
             closeFlvPlay(unref(playUrl), result.visitorId);
             closeFlvPlay(unref(playUrl), result.visitorId);
             withToken.value = true;
             withToken.value = true;
           }
           }
-          setSources((record as CameraModel).videoUrl, result);
+          setSources((record as CameraModel).videoUrl, result, record.sn);
         }
         }
       } else {
       } else {
         try {
         try {
           const { data: { url } = { url: '' } } = await getStreamingPlayUrl(record.id!);
           const { data: { url } = { url: '' } } = await getStreamingPlayUrl(record.id!);
-          setSources(url, result);
+          setSources(url, result, record.sn);
         } catch (error) {}
         } catch (error) {}
       }
       }
       showVideo.value = true;
       showVideo.value = true;