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

Merge branch 'fix/machinelist' into 'main'

Browse Source 
Fixed MachineList Crash if not connected to server

See merge request fabinfra/fabaccess/borepin!36
This commit is contained in:
TheJoKlLa 2022-01-05 00:03:00 +00:00
commit fe4326b75e
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Borepin/Borepin/Base/ConnectionModelBase.cs
View File

@ -51,6 +51,10 @@ namespace Borepin.Base
{ {
await _BFFHService.Reconnect().ConfigureAwait(false); await _BFFHService.Reconnect().ConfigureAwait(false);
} }
else if(_BFFHService.CurrentConnection == null)
{
return false;
}
return true; return true;
} }

42
Borepin/Borepin/Page/MachineListPage.xaml
View File

@ -16,26 +16,30 @@
<ActivityIndicator IsRunning="{Binding IsBusy}"></ActivityIndicator> <ActivityIndicator IsRunning="{Binding IsBusy}"></ActivityIndicator>
</StackLayout> </StackLayout>
<StackLayout IsVisible="{Binding IsBusy, Converter={StaticResource InvertBoolConverter}}"> <StackLayout IsVisible="{Binding IsBusy, Converter={StaticResource InvertBoolConverter}}">
<Button Text="Scan QR-Code" Command="{Binding ScanCodeCommand}" Style="{StaticResource Style_Button_Primary}"> <StackLayout IsVisible="{Binding IsConnected}">
<Button.IsVisible> <Button Text="Scan QR-Code" Command="{Binding ScanCodeCommand}" Style="{StaticResource Style_Button_Primary}">
<OnPlatform x:TypeArguments="x:Boolean" <Button.IsVisible>
iOS="false" <OnPlatform x:TypeArguments="x:Boolean"
Android="true"/> iOS="false"
</Button.IsVisible> Android="true"/>
</Button> </Button.IsVisible>
<RefreshView Command="{Binding RefreshCommand}" IsRefreshing="{Binding IsRefreshing}"> </Button>
<ListView ItemsSource="{Binding MachineListItemViewModel_List}" IsVisible="{Binding IsConnected}" SelectionMode="None"> <RefreshView Command="{Binding RefreshCommand}" IsRefreshing="{Binding IsRefreshing}">
<ListView.ItemTemplate> <ListView ItemsSource="{Binding MachineListItemViewModel_List}" IsVisible="{Binding IsConnected}" SelectionMode="None">
<DataTemplate> <ListView.ItemTemplate>
<ViewCell> <DataTemplate>
<views:MachineListItemView /> <ViewCell>
</ViewCell> <views:MachineListItemView />
</DataTemplate> </ViewCell>
</ListView.ItemTemplate> </DataTemplate>
</ListView> </ListView.ItemTemplate>
</RefreshView> </ListView>
</RefreshView>
</StackLayout>
<StackLayout IsVisible="{Binding IsConnected, Converter={StaticResource InvertBoolConverter}}">
<Label Text="Please connect to Server" ></Label>
</StackLayout>
</StackLayout> </StackLayout>
<Label Text="Please connect to Server" IsVisible="{Binding IsConnected, Converter={StaticResource InvertBoolConverter}}"></Label>
</StackLayout> </StackLayout>
</ContentPage.Content> </ContentPage.Content>
</ContentPage> </ContentPage>