FabInfra-Mirror/borepin
1
0
Fork 0
mirror of https://gitlab.com/fabinfra/fabaccess/borepin.git synced 2025-03-12 23:01:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

BackUp

Browse Source
This commit is contained in:
TheJoKlLa 2022-04-20 17:13:06 +02:00
parent d6ac268516
commit d9af7a3730
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Borepin/Borepin/PageModel/MachineListPageModel.cs
View File

@ -160,6 +160,8 @@ namespace Borepin.PageModel
} }
IMachineSystem machineInterface = (await _BFFHService.GetSession().ConfigureAwait(false)).MachineSystem; IMachineSystem machineInterface = (await _BFFHService.GetSession().ConfigureAwait(false)).MachineSystem;
MachineSystem.IInfoInterface infoInterface = await machineInterface.Info().ConfigureAwait(false); MachineSystem.IInfoInterface infoInterface = await machineInterface.Info().ConfigureAwait(false);
Machine machine = await infoInterface.GetMachineURN(value).ConfigureAwait(false); Machine machine = await infoInterface.GetMachineURN(value).ConfigureAwait(false);
@ -213,6 +215,15 @@ namespace Borepin.PageModel
{ {
string urn = (string)parameters["value"]; string urn = (string)parameters["value"];
ScanCode_Result(urn); ScanCode_Result(urn);
NavigationParameters parameters2 = new NavigationParameters
{
{ "id", _NextMachine.Id},
};
_NextMachine = null;
await _NavigationService.NavigateAsync("MachinePage", parameters2).ConfigureAwait(false);
} }
} }

20
Borepin/Borepin/PageModel/ScanPageModel.cs
View File

@ -1,8 +1,10 @@
using Borepin.Base; using Borepin.Base;
using Prism.Commands; using Prism.Commands;
using Prism.Navigation; using Prism.Navigation;
using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Input; using System.Windows.Input;
using Xamarin.Forms;
using ZXing; using ZXing;
namespace Borepin.PageModel namespace Borepin.PageModel
@ -20,7 +22,7 @@ namespace Borepin.PageModel
_NavigationService = navigationService; _NavigationService = navigationService;
AbortCommand = new DelegateCommand(async () => await AbortCommandExecute().ConfigureAwait(true)); AbortCommand = new DelegateCommand(async () => await AbortCommandExecute().ConfigureAwait(true));
ScannedCommand = new DelegateCommand(async () => await ScannedCommandExecute().ConfigureAwait(true)); ScannedCommand = new DelegateCommand(ScannedCommandExecute);
IsVisible = true; IsVisible = true;
IsScanning = true; IsScanning = true;
@ -30,9 +32,7 @@ namespace Borepin.PageModel
#region Data #region Data
public override async Task LoadData() public override async Task LoadData()
{ {
IsBusy = true;
IsBusy = false;
} }
#endregion #endregion
@ -67,7 +67,7 @@ namespace Borepin.PageModel
get => _ScannedCommand; get => _ScannedCommand;
set => SetProperty(ref _ScannedCommand, value); set => SetProperty(ref _ScannedCommand, value);
} }
public async Task ScannedCommandExecute() public void ScannedCommandExecute()
{ {
IsScanning = false; IsScanning = false;
IsVisible = false; IsVisible = false;
@ -79,7 +79,10 @@ namespace Borepin.PageModel
{ "instance", _Instance } { "instance", _Instance }
}; };
await _NavigationService.NavigateAsync("..", parameters).ConfigureAwait(false); Device.BeginInvokeOnMainThread(async () =>
{
INavigationResult result = await _NavigationService.GoBackAsync(parameters).ConfigureAwait(false);
});
} }
private ICommand _AbortCommand; private ICommand _AbortCommand;
@ -98,7 +101,7 @@ namespace Borepin.PageModel
{ "result", "abort" }, { "result", "abort" },
{ "instance", _Instance } { "instance", _Instance }
}; };
await _NavigationService.NavigateAsync("..", parameters).ConfigureAwait(false); await _NavigationService.GoBackAsync(parameters).ConfigureAwait(false);
} }
#endregion #endregion
@ -108,10 +111,9 @@ namespace Borepin.PageModel
} }
public override async void OnNavigatedTo(INavigationParameters parameters) public override void OnNavigatedTo(INavigationParameters parameters)
{ {
_Instance = parameters.GetValue<object>("instance"); _Instance = parameters.GetValue<object>("instance");
await LoadData().ConfigureAwait(false);
} }
#endregion #endregion
} }