diamond-cut
/
SparkClient
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: images

Browse Source
master
Tongg 8 months ago
parent e5e02dc6df
commit bbdd362372
1 changed files with 37 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 74
      Model/Services/SOCClientService.cs

74
Model/Services/SOCClientService.cs
Unescape View File

@ -375,46 +375,46 @@ namespace SparkClient.Model.Services
// 启动任务接口
// SocResultEntity entity = await CollectImagesAsync();
SocResultEntity entity = await CollectImagesAsync();
// 成功
// Logger.Debug($"entity :{entity.Status} {entity.ToString()} ");
// if (entity.Status != StatusCodes.Success)
// {
// // 启动任务失败
// return new SocResultEntity { Status = entity.Status, Images = new List<string>() };
// }
// 读取图片接口
// List<string> imageNames = await RetrieveImageAsync(savePath);
var cts = new CancellationTokenSource();
Task<HttpSendResult> startImage = CollectImagesAsyncNotAwait();
Task<List<string>> downloadImage = RetrieveImageAsync(savePath, cts.Token);
await startImage;
var entity = startImage.Result;
if (entity.StatusCode != 200)
{
//downloadImage怎么取消并终止
cts.Cancel();
return new SocResultEntity { Status = StatusCodes.DeviceNotFound, Images = new List<string>() };
}
if (entity.Content == null)
{
//downloadImage怎么取消并终止
cts.Cancel();
return new SocResultEntity { Status = StatusCodes.DeviceNotFound, Images = new List<string>() };
}
List<string> imageNames = new List<string>();
try
Logger.Debug($"entity :{entity.Status} {entity.ToString()} ");
if (entity.Status != StatusCodes.Success)
{
await downloadImage;
imageNames = downloadImage.Result;
}
catch (Exception e)
{
Logger.Error($"Error in Await downloadImage: {e.Message}");
// 启动任务失败
return new SocResultEntity { Status = entity.Status, Images = new List<string>() };
}
// 读取图片接口
List<string> imageNames = await RetrieveImageAsync(savePath);
// var cts = new CancellationTokenSource();
// Task<HttpSendResult> startImage = CollectImagesAsyncNotAwait();
// Task<List<string>> downloadImage = RetrieveImageAsync(savePath, cts.Token);
// await startImage;
// var entity = startImage.Result;
// if (entity.StatusCode != 200)
// {
// //downloadImage怎么取消并终止
// cts.Cancel();
// return new SocResultEntity { Status = StatusCodes.DeviceNotFound, Images = new List<string>() };
// }
// if (entity.Content == null)
// {
// //downloadImage怎么取消并终止
// cts.Cancel();
// return new SocResultEntity { Status = StatusCodes.DeviceNotFound, Images = new List<string>() };
// }
//
// List<string> imageNames = new List<string>();
// try
// {
// await downloadImage;
// imageNames = downloadImage.Result;
// }
// catch (Exception e)
// {
// Logger.Error($"Error in Await downloadImage: {e.Message}");
// }
// 采集状态接口
string acquisitionStatus = await CollectStatusAsync();
// 成功
@ -430,7 +430,7 @@ namespace SparkClient.Model.Services
// 图片文件读取失败
return new SocResultEntity { Status = StatusCodes.ImageFileReadFailure, Images = new List<string>() };
}
return new SocResultEntity { Status = "S000", Images = imageNames, DeviceId = entity.Content.device_id};
return new SocResultEntity { Status = "S000", Images = imageNames, DeviceId = entity.DeviceId};
}
catch (Exception e)
{

Write Preview
Loading…
Cancel
Save