diff --git a/Model/Services/SOCClientService.cs b/Model/Services/SOCClientService.cs index 28f193d..f93ec58 100644 --- a/Model/Services/SOCClientService.cs +++ b/Model/Services/SOCClientService.cs @@ -209,10 +209,8 @@ namespace SparkClient.Model.Services var result = JsonConvert.DeserializeObject(jsonResponse); return result.Status; } - else - { - return "collect_status_Error: " + (int)response.StatusCode; - } + + return StatusCodes.DeviceNotFound; } catch (HttpRequestException ex) { @@ -269,7 +267,6 @@ namespace SparkClient.Model.Services return new SocResultEntity { Status = acquisitionStatus, Images = new List() }; } } - // 按下载时间排序图片名称 return new SocResultEntity { Status = StatusCodes.Success, Images = imageNames, DeviceId = entity.DeviceId}; } catch (Exception e) diff --git a/SparkClient.csproj b/SparkClient.csproj index 1d8246f..e6fd5e4 100644 --- a/SparkClient.csproj +++ b/SparkClient.csproj @@ -212,12 +212,6 @@ Wpf Designer - - - MSBuild:Compile - Wpf - Designer - @@ -226,10 +220,6 @@ Code MsgDialog.xaml - - Code - MsgDialog.xaml - diff --git a/Views/Dialog/MsgDialog.xaml b/Views/Dialog/MsgDialog.xaml deleted file mode 100644 index 5d6883b..0000000 --- a/Views/Dialog/MsgDialog.xaml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -