设备端上报设备画面尺寸信息接口调整

Service/DeviceService.cs

@@ -1026,10 +1026,17 @@ namespace WingDeviceService.Service
             var deviceDTO = await _deviceInfoDBServiceProxy.FindDeviceInfoByCodeAsync(deviceCode);
 
             var screenAndCamera = request.VideoDeviceInfos.Any(x => x.VideoDeviceSourceType == VideoDeviceSourceTypeEnum.Camera);
+            var outputWidth = deviceDTO.MergedVideoOutputWidth;
+            var outputHeight = deviceDTO.MergedVideoOutputHeight;
+            if (outputWidth <= 0 || outputHeight <= 0)
+            {
+                outputWidth = 1280;
+                outputHeight = 720;
+            }
             var videoDeviceInfos = new List<VideoDeviceDTO>();
             foreach (var video in request.VideoDeviceInfos)
             {
-                var videoDeviceInfo = InitOutputInfo(video, deviceDTO.MergedChannel, screenAndCamera, deviceDTO.MergedVideoOutputWidth, deviceDTO.MergedVideoOutputHeight);
+                var videoDeviceInfo = InitOutputInfo(video, deviceDTO.MergedChannel, screenAndCamera, outputWidth, outputHeight);
                 videoDeviceInfos.Add(videoDeviceInfo);
             }
             deviceDTO.VideoDeviceInfos = videoDeviceInfos;