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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	Model/Services/SOCClientService.cs
master
Tongg 8 months ago
parent 4f74af3309 eebbe56306
commit e5e02dc6df
1 changed files with 39 additions and 39 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. 78
      Model/Services/SOCClientService.cs

78
Model/Services/SOCClientService.cs
Unescape View File

@ -297,7 +297,7 @@ namespace SparkClient.Model.Services
// 资源未找到，结束循环
Logger.Info($"[SendCode={sendCode}] Image Not Found.");
break;
// return imageNames;
//return imageNames;
default:
// 其他状态码，记录警告并继续
Logger.Warn($"[SendCode={sendCode}]Unexpected status code: {status} for URL: {url}");
@ -375,46 +375,46 @@ namespace SparkClient.Model.Services
// 启动任务接口
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
// {
// await downloadImage;
// imageNames = downloadImage.Result;
// }
// catch (Exception e)
// SocResultEntity entity = await CollectImagesAsync();
// 成功
// Logger.Debug($"entity :{entity.Status} {entity.ToString()} ");
// if (entity.Status != StatusCodes.Success)
// {
// 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.DeviceId};
return new SocResultEntity { Status = "S000", Images = imageNames, DeviceId = entity.Content.device_id};
}
catch (Exception e)
{

Write Preview
Loading…
Cancel
Save