|
@ -102,7 +102,7 @@ namespace X1.DynamicClientCore.Features.Service |
|
|
/// <param name="cancellationToken">取消令牌</param>
|
|
|
/// <param name="cancellationToken">取消令牌</param>
|
|
|
/// <returns>异步任务</returns>
|
|
|
/// <returns>异步任务</returns>
|
|
|
/// <exception cref="ArgumentException">当instrumentNumber为空或null时抛出</exception>
|
|
|
/// <exception cref="ArgumentException">当instrumentNumber为空或null时抛出</exception>
|
|
|
public async Task StartNetworkAsync( |
|
|
public async Task<bool> StartNetworkAsync( |
|
|
CellularNetworkConfiguration cellular, |
|
|
CellularNetworkConfiguration cellular, |
|
|
RequestOptions? options = null, |
|
|
RequestOptions? options = null, |
|
|
CancellationToken cancellationToken = default) |
|
|
CancellationToken cancellationToken = default) |
|
@ -114,20 +114,37 @@ namespace X1.DynamicClientCore.Features.Service |
|
|
try |
|
|
try |
|
|
{ |
|
|
{ |
|
|
_logger.LogInformation("开始启动网络连接,设备编号:{InstrumentNumber}", instrumentNumber); |
|
|
_logger.LogInformation("开始启动网络连接,设备编号:{InstrumentNumber}", instrumentNumber); |
|
|
var response = await _dynamicHttpClient.PostAsync<ApiActionResult<DeviceInfoResponse>>( |
|
|
var response = await _dynamicHttpClient.PostAsync<ApiActionResult<NetworkStatus>>( |
|
|
instrumentNumber, |
|
|
instrumentNumber, |
|
|
"CellularNetwork/generalStart", |
|
|
"CellularNetwork/generalStart", |
|
|
cellular, |
|
|
cellular, |
|
|
options, |
|
|
options, |
|
|
cancellationToken); |
|
|
cancellationToken); |
|
|
await Task.CompletedTask.ConfigureAwait(false); |
|
|
if (response == null) |
|
|
|
|
|
{ |
|
|
|
|
|
_logger.LogWarning("获取启动网络连接失败:响应为空,端点:{EndpointName}", instrumentNumber); |
|
|
|
|
|
return false; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (!response.IsSuccess) |
|
|
|
|
|
{ |
|
|
|
|
|
_logger.LogWarning("获取启动网络连接失败:请求未成功,端点:{EndpointName},错误:{ErrorMessage}", |
|
|
|
|
|
instrumentNumber, response.Message ?? "未知错误"); |
|
|
|
|
|
return false; |
|
|
|
|
|
} |
|
|
|
|
|
if (response.Data != NetworkStatus.Connected) |
|
|
|
|
|
{ |
|
|
|
|
|
_logger.LogWarning("获取启动网络连接:请求未成功,端点:{EndpointName},错误:{ErrorMessage}", |
|
|
|
|
|
instrumentNumber, response.Message ?? "未知错误"); |
|
|
|
|
|
return false; |
|
|
|
|
|
} |
|
|
_logger.LogInformation("网络连接启动完成,设备编号:{InstrumentNumber}", instrumentNumber); |
|
|
_logger.LogInformation("网络连接启动完成,设备编号:{InstrumentNumber}", instrumentNumber); |
|
|
|
|
|
return true; |
|
|
} |
|
|
} |
|
|
catch (Exception ex) |
|
|
catch (Exception ex) |
|
|
{ |
|
|
{ |
|
|
_logger.LogError(ex, "启动网络连接时发生异常,设备编号:{InstrumentNumber}", instrumentNumber); |
|
|
_logger.LogError(ex, "启动网络连接时发生异常,设备编号:{InstrumentNumber}", instrumentNumber); |
|
|
throw; |
|
|
return false; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|