alexhoang
/
pcut_uwp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add log cut

This commit is contained in:
kwan.nguyen 2024-10-29 22:25:32 +07:00
parent 1e425a3e7e
commit d11ec2a31d
3 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PCUT/Http.Core/Constants/HttpConstants.cs
View File

@ -33,6 +33,7 @@
public const string Upload = "api/files/upload"; public const string Upload = "api/files/upload";
public const string Download = "api/files/{0}"; public const string Download = "api/files/{0}";
public const string Cut = "api/files/{0}/cut";
public const string CdrFiles = "api/cdr-files"; public const string CdrFiles = "api/cdr-files";
public const string CdrFileById = "api/cdr-files/{0}"; public const string CdrFileById = "api/cdr-files/{0}";

21
PCUT/PCUT/Pages/DesignCenter/CutFilesDialog.xaml.cs
View File

@ -46,7 +46,7 @@ namespace PCUT.Pages
_portName = portName; _portName = portName;
_portSettings = portSetting; _portSettings = portSetting;
_designCenterViewModel = designCenterViewModel; _designCenterViewModel = designCenterViewModel;
//StartButton.IsEnabled = !(portName is null); StartButton.IsEnabled = !(portName is null);
ViewModels = DataContext as CutDialogViewModel; ViewModels = DataContext as CutDialogViewModel;
} }
@ -84,12 +84,13 @@ namespace PCUT.Pages
_cancellationTokenSource = new CancellationTokenSource(); _cancellationTokenSource = new CancellationTokenSource();
ViewModels.PrintCommand = string.Empty; ViewModels.PrintCommand = string.Empty;
//using (var serialPort = new SerialPort(_portName, _portSettings.BaudRate) _ = ViewModels.CutFileAsync(_designCenterViewModel.FileId);
//{ using (var serialPort = new SerialPort(_portName, _portSettings.BaudRate)
// DataBits = _portSettings.Databits, {
// Parity = _portSettings.ParityList[_portSettings.SelectedParity], DataBits = _portSettings.Databits,
// StopBits = _portSettings.StopbitsList[_portSettings.SelectedStopbits] Parity = _portSettings.ParityList[_portSettings.SelectedParity],
//}) StopBits = _portSettings.StopbitsList[_portSettings.SelectedStopbits]
})
{ {
var errorMessage = string.Empty; var errorMessage = string.Empty;
try try
@ -100,7 +101,7 @@ namespace PCUT.Pages
(_svgData.OriginWidth.Value, _svgData.OriginHeight.Value), (_svgData.OriginWidth.Value, _svgData.OriginHeight.Value),
(_designCenterViewModel.Width, _designCenterViewModel.Height), (_designCenterViewModel.Width, _designCenterViewModel.Height),
_portSettings.Speed); _portSettings.Speed);
//serialPort.Open(); serialPort.Open();
Task waitTask = Task.CompletedTask; Task waitTask = Task.CompletedTask;
foreach (var (path, waitTime) in data) foreach (var (path, waitTime) in data)
{ {
@ -112,7 +113,7 @@ namespace PCUT.Pages
waitTask.Wait(); waitTask.Wait();
try try
{ {
//serialPort.Write(path); serialPort.Write(path);
} }
catch catch
{ {
@ -150,7 +151,7 @@ namespace PCUT.Pages
{ {
try try
{ {
//serialPort.Close(); serialPort.Close();
Task.Delay(1000).Wait(); Task.Delay(1000).Wait();
} }
catch catch

17
PCUT/PCUT/ViewModels/CutDialogViewModel.cs
View File

@ -4,6 +4,9 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Http.Core;
using Http.Core.Extensions;
using static Http.Core.Constants.HttpConstants;
namespace PCUT.ViewModels namespace PCUT.ViewModels
{ {
@ -18,5 +21,19 @@ namespace PCUT.ViewModels
SetProperty(ref _printCommand, value); SetProperty(ref _printCommand, value);
} }
} }
public async Task CutFileAsync(string fileId)
{
using (var httpClient = HttpClientFactory.CreateClient(ClientNames.ApiClient))
{
try
{
_ = await httpClient.GetAsync(Api.Cut.FormatRoute(fileId));
}
catch
{
}
}
}
} }
} }