diff --git a/server/src/Controllers/VideoStreamController.cs b/server/src/Controllers/VideoStreamController.cs index 879d5b7..e133c78 100644 --- a/server/src/Controllers/VideoStreamController.cs +++ b/server/src/Controllers/VideoStreamController.cs @@ -162,13 +162,7 @@ public class VideoStreamController : ControllerBase logger.Info("获取摄像头配置"); var cameraStatus = _videoStreamService.GetCameraStatus(); - return TypedResults.Ok(new - { - address = _videoStreamService.CameraAddress, - port = _videoStreamService.CameraPort, - isConfigured = cameraStatus.GetType().GetProperty("IsConfigured")?.GetValue(cameraStatus), - connectionString = $"{_videoStreamService.CameraAddress}:{_videoStreamService.CameraPort}" - }); + return TypedResults.Ok(cameraStatus); } catch (Exception ex) { diff --git a/server/src/Peripherals/CameraClient.cs b/server/src/Peripherals/CameraClient.cs index b06f903..ccb2e85 100644 --- a/server/src/Peripherals/CameraClient.cs +++ b/server/src/Peripherals/CameraClient.cs @@ -7,9 +7,9 @@ static class CameraAddr { public const UInt32 BASE = 0x7000_0000; - public const UInt32 STORE_ADDR = BASE + 12; - public const UInt32 STORE_NUM = BASE + 13; - public const UInt32 CAPTURE_ON = BASE + 14; + public const UInt32 STORE_ADDR = BASE + 0x12; + public const UInt32 STORE_NUM = BASE + 0x13; + public const UInt32 CAPTURE_ON = BASE + 0x14; } class Camera diff --git a/src/views/VideoStreamView.vue b/src/views/VideoStreamView.vue index 5f7e9cf..f3f609e 100644 --- a/src/views/VideoStreamView.vue +++ b/src/views/VideoStreamView.vue @@ -90,6 +90,15 @@
+