mirror of
https://dev.azure.com/TeilRad/sharee.bike%20App/_git/Code
synced 2025-04-23 21:36:28 +02:00
Version 3.0.341
This commit is contained in:
parent
bad07e1ec9
commit
d852ccef4c
26 changed files with 108 additions and 45 deletions
|
@ -1,4 +1,4 @@
|
|||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Specialized;
|
||||
using System.ComponentModel;
|
||||
|
@ -112,7 +112,7 @@ namespace TINK.ViewModel.BikesAtStation
|
|||
: AppResources.MarkingLoginRequiredToRerserve;
|
||||
|
||||
public string ContactSupportHintText
|
||||
=> string.Format(AppResources.MarkingContactSupport, Station.OperatorData?.Name ?? "Operator");
|
||||
=> string.Format(IsIdle ? AppResources.MarkingContactSupport : AppResources.MarkingContactSupportBusy, Station.OperatorData?.Name ?? "Operator");
|
||||
|
||||
/// <summary>
|
||||
/// Returns if info about the fact that user did not request or book any bikes is visible or not.
|
||||
|
@ -185,6 +185,12 @@ namespace TINK.ViewModel.BikesAtStation
|
|||
{
|
||||
try
|
||||
{
|
||||
if (!IsIdle)
|
||||
{
|
||||
// Prevent navigation when app is not idle because this might lead to aborting return bike workflow.
|
||||
return;
|
||||
}
|
||||
|
||||
// Switch to map page
|
||||
|
||||
#if USEFLYOUT
|
||||
|
@ -211,7 +217,7 @@ namespace TINK.ViewModel.BikesAtStation
|
|||
{
|
||||
Log.ForContext<BikesAtStationPageViewModel>().Information($"Bikes at station {Station.StationName} is appearing, either due to tap on a station or to app being shown again.");
|
||||
|
||||
ActionText = "Einen Moment bitte...";
|
||||
ActionText = AppResources.ActivityTextOneMomentPlease;
|
||||
|
||||
// Stop polling before getting bikes info.
|
||||
await m_oViewUpdateManager.StopUpdatePeridically();
|
||||
|
@ -225,7 +231,7 @@ namespace TINK.ViewModel.BikesAtStation
|
|||
var bikesAtStation = bikesAll.Response.GetAtStation(Station.Id);
|
||||
var lockIdList = bikesAtStation
|
||||
.GetLockIt()
|
||||
.Cast<Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo>()
|
||||
.Cast<BikeInfo>()
|
||||
.Select(x => x.LockInfo)
|
||||
.ToList();
|
||||
|
||||
|
@ -234,7 +240,7 @@ namespace TINK.ViewModel.BikesAtStation
|
|||
serviceFake.UpdateSimulation(bikesAtStation);
|
||||
}
|
||||
|
||||
ActionText = AppResources.ActivityTextSearchBikes;
|
||||
ActionText = AppResources.ActivityTextCheckBluetoothState;
|
||||
|
||||
// Check location permissions.
|
||||
if (bikesAtStation.GetLockIt().Count > 0
|
||||
|
@ -377,7 +383,8 @@ namespace TINK.ViewModel.BikesAtStation
|
|||
base.IsIdle = value;
|
||||
base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsNoBikesAtStationVisible)));
|
||||
base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(NoBikesAtStationText)));
|
||||
base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(ContactSupportHintText)));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue