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

fix: images scan bug

Browse Source
master
Tongg 8 months ago
parent bbdd362372
commit 6003cfb342
2 changed files with 29 additions and 22 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. 33
      Model/Services/SOCClientService.cs
  2. 14
      ViewModel/Grading/GradingLoadingVM.cs

33
Model/Services/SOCClientService.cs
Unescape View File

@ -266,7 +266,7 @@ namespace SparkClient.Model.Services
{
var response = await SendGetRequestImageAsync(url,sendCode);
int status = (int)response.StatusCode;
if(token.IsCancellationRequested)
token.ThrowIfCancellationRequested();
switch (status)
{
@ -383,21 +383,16 @@ namespace SparkClient.Model.Services
// 启动任务失败
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)
// if (entity.StatusCode != 200 || entity.Content == null)
// {
// //downloadImage怎么取消并终止
// cts.Cancel();
@ -410,20 +405,20 @@ namespace SparkClient.Model.Services
// await downloadImage;
// imageNames = downloadImage.Result;
// }
// catch (Exception e)
// catch (OperationCanceledException e)
// {
// Logger.Error($"Error in Await downloadImage: {e.Message}");
// }
// 采集状态接口
string acquisitionStatus = await CollectStatusAsync();
// 成功
if (acquisitionStatus != StatusCodes.Success)
{
Logger.Debug($"acquisitionStatus != StatusCodes.Success : {acquisitionStatus}");
// 采集状态失败
return new SocResultEntity { Status = acquisitionStatus, Images = new List<string>() };
}
// // 采集状态接口
// string acquisitionStatus = await CollectStatusAsync();
// // 成功
// if (acquisitionStatus != StatusCodes.Success)
// {
// Logger.Debug($"acquisitionStatus != StatusCodes.Success : {acquisitionStatus}");
// // 采集状态失败
// return new SocResultEntity { Status = acquisitionStatus, Images = new List<string>() };
// }
if (imageNames.Count == 0)
{
Logger.Debug("imageNames.Count == 0");

14
ViewModel/Grading/GradingLoadingVM.cs
Unescape View File

@ -197,6 +197,18 @@ public class GradingLoadingVM : BaseViewModel,IDisposable
//通知页面可以播放图片
LoadDefaultImages();
await processImage;
await Task.Delay(1000);
// // 采集状态接口
// string acquisitionStatus = await SOCClientService.Service.CollectStatusAsync();
// // 成功
// if (acquisitionStatus != StatusCodes.Success)
// {
// Logger.Debug($"acquisitionStatus != StatusCodes.Success : {acquisitionStatus}");
// _progressCts.Cancel();
// new MessageBox().Show(
// MultilingualHelper.getString(StatusCodes.GetConstantNameByValue(acquisitionStatus)));
// return -1;
// }
if (!("ok".Equals(processImage.Result.Status) || "S000".Equals(processImage.Result.Status)))
{
@ -422,7 +434,7 @@ public class GradingLoadingVM : BaseViewModel,IDisposable
finally
{
string strSafeSpace = ConfigurationHelper.ReadConfigValue("SafeSpaceReservation");
if (hasErr || "0".Equals(strSafeSpace))
if (hasErr || "0".Equals(strSafeSpace) || Parameter.Status == StatusCodes.Recheck)
{
DiamondSelectVM.HandleAlgorithmFailure(ImagePaths, _diamondCode, _diamnondType);
}

Write Preview
Loading…
Cancel
Save