Merge branch 'all-v4-lhf' into 'all-v4'

fix: 对接接口支持中台看视频

See merge request skyeye/skyeye_frontend/skyeye-admin!257

src/views/cameras/preview/CameraPreview.vue

@@ -39,11 +39,11 @@
       fenceStore.clear();
       if (cameraId) {
         // FIXME： 缺 后端v4 api 
-        const presetList = await presetListStore.getPresetList(cameraId);
-        getCameraDeatilById(cameraId).then((res) => {
+        getCameraDeatilById(cameraId).then(async(res) => {
           cameraDetailStore.setDetail(res);
           // 如果isPtz为null，或者为0，都按照枪击相机
           if (res.isPtz === IsPtz.disabled || !res.isPtz) {
+            const presetList = await presetListStore.getPresetList(cameraId);
             presetListStore.currentPresetToken = presetList?.[0].token;
           }
         });

src/views/cameras/preview/components/CameraLiveVideo/CameraLiveVideo.vue

@@ -15,14 +15,15 @@
   const videoUrl = computed(() => {
     if (detail.value?.render) {
       if (skyeyeVideoPath === 'abs') {
-        return detail.value?.pushstreamRenderUrlAbs;
+        return detail.value?.pushStreamDTO?.videoUrls?.pushstreamRenderUrlAbs;
+        // return detail.value?.pushstreamRenderUrlAbs;
       }
-      return detail.value?.pushstreamRenderUrl;
+      return detail.value?.pushStreamDTO?.videoUrls?.pushstreamRenderUrl;
     } else {
       if (skyeyeVideoPath === 'abs') {
-        return detail?.value?.pushstreamIpAbs;
+        return detail?.value?.pushStreamDTO?.videoUrls?.pushstreamIpAbs;
       }
-      return detail?.value?.pushstreamIp;
+      return detail?.value?.pushStreamDTO?.videoUrls?.pushstreamIp;
     }
   });
 </script>

src/views/cameras/preview/components/FenceAppSetting/FenceAppSetting.vue

@@ -56,7 +56,7 @@
       });
 
       // FIXME: 该 api 还没有提供
-      getAppCameraAlgoPreset(newCode).then((res) => {
+      getAppCameraAlgoPreset(newId).then((res) => {
         appFenceCameraDetail.value = res;
         valuePreset.value = [res.algoCode, res.presetToken];
       });