修改默认为辅码流

pull/21/head
刘鑫 2 months ago
parent 58ef537b3f
commit c7d5f24fe9
  1. 2
      WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/Common.Shared.Application.csproj
  2. 4
      WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/RequestDto/DahuaVideoQueryDto.cs
  3. 6
      WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs

@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<PackageId>Common.Shared.Application</PackageId> <PackageId>Common.Shared.Application</PackageId>
<Version>1.0.2</Version> <Version>2.0.0</Version>
<Authors>zrh-lx</Authors> <Authors>zrh-lx</Authors>
<Company>zrh-lx</Company> <!-- 可选 --> <Company>zrh-lx</Company> <!-- 可选 -->
<Description>包含所有公共使用的 DTO、契约、接口模型等,供微服务之间共享使用</Description> <Description>包含所有公共使用的 DTO、契约、接口模型等,供微服务之间共享使用</Description>

@ -232,7 +232,7 @@ namespace Common.Shared.Application.DaHua
/// 码流类型:1-主码流,2-子码流 /// 码流类型:1-主码流,2-子码流
/// </summary> /// </summary>
[JsonPropertyName("streamType")] [JsonPropertyName("streamType")]
public string StreamType { get; set; } public string StreamType { get; set; } = "2";
/// <summary> /// <summary>
/// 协议类型:hls,hlss,flv,flvs,ws_flv,wss_flv,rtmp /// 协议类型:hls,hlss,flv,flvs,ws_flv,wss_flv,rtmp
@ -292,7 +292,7 @@ namespace Common.Shared.Application.DaHua
/// 码流类型:1-主码流,2-子码流 /// 码流类型:1-主码流,2-子码流
/// </summary> /// </summary>
[JsonPropertyName("streamType")] [JsonPropertyName("streamType")]
public string StreamType { get; set; } public string StreamType { get; set; } = "2";
/// <summary> /// <summary>
/// rtsp专用,有datatype没有type,有type没有datatype /// rtsp专用,有datatype没有type,有type没有datatype

@ -247,7 +247,7 @@ namespace Video.DomainService
{ {
url = $"https://{ipaddress}/evo-apigw/admin/API/video/stream/realtime"; url = $"https://{ipaddress}/evo-apigw/admin/API/video/stream/realtime";
} }
dto.Data.StreamType = "2";
// 3) 用 HttpRequestMessage 发送,才能带上自定义头 // 3) 用 HttpRequestMessage 发送,才能带上自定义头
using var req = new HttpRequestMessage(HttpMethod.Post, url) using var req = new HttpRequestMessage(HttpMethod.Post, url)
{ {
@ -360,7 +360,7 @@ namespace Video.DomainService
_logger.LogWarning("rtsp录像回放:token无效"); _logger.LogWarning("rtsp录像回放:token无效");
return new DaHApiResult<UrlDataDto> { Success = false, Code = "1009", Msg = "token无效" }; return new DaHApiResult<UrlDataDto> { Success = false, Code = "1009", Msg = "token无效" };
} }
dto.Data.StreamType = "2";
var url = $"https://{_configuration["DahuaAuth:Host"]}/evo-apigw/admin/API/SS/Playback/StartPlaybackByTime"; var url = $"https://{_configuration["DahuaAuth:Host"]}/evo-apigw/admin/API/SS/Playback/StartPlaybackByTime";
if (ipaddress != null) if (ipaddress != null)
{ {
@ -428,7 +428,7 @@ namespace Video.DomainService
_logger.LogWarning("rtsp实时预览接口方式:token无效"); _logger.LogWarning("rtsp实时预览接口方式:token无效");
return new DaHApiResult<UrlDataDto> { Success = false, Code = "1009", Msg = "token无效" }; return new DaHApiResult<UrlDataDto> { Success = false, Code = "1009", Msg = "token无效" };
} }
dto.Data.StreamType = "2";
var url = $"https://{_configuration["DahuaAuth:Host"]}/evo-apigw/admin/API/MTS/Video/StartVideo"; var url = $"https://{_configuration["DahuaAuth:Host"]}/evo-apigw/admin/API/MTS/Video/StartVideo";
if (ipaddress != null) if (ipaddress != null)
{ {

Loading…
Cancel
Save