roko.li/sharee.bike-App
5
0
Fork 0
mirror of https://dev.azure.com/TeilRad/sharee.bike%20App/_git/Code synced 2025-06-22 05:47:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

Version 3.0.337

Browse source
This commit is contained in:
Anja Müller-Meißner 2022-08-30 15:42:25 +02:00
parent fd0e63cf10
commit 573fe77e12
2336 changed files with 33688 additions and 86082 deletions
Download patch file Download diff file Expand all files Collapse all files

14
TINKLib/ViewModel/MyBikes/MyBikeViewModel.cs
View file

@ -36,10 +36,10 @@ namespace TINK.ViewModel
}
return string.Format(AppResources.StatusTextReservationExpiredCodeLocationMaxReservationTime, code, stationId, StateRequestedInfo.MaximumReserveTime.Minutes);
}
}
if (!string.IsNullOrEmpty(stationId))
{
{
if (!string.IsNullOrEmpty(code))
{
return string.Format(
@ -56,7 +56,7 @@ namespace TINK.ViewModel
}
return string.Format(
AppResources.StatusTextReservationExpiredRemaining,
AppResources.StatusTextReservationExpiredRemaining,
remainingTime.Value.Minutes);
}
@ -76,11 +76,11 @@ namespace TINK.ViewModel
}
if (!string.IsNullOrEmpty(code))
{
if(!string.IsNullOrEmpty(stationId))
{
if (!string.IsNullOrEmpty(stationId))
{
return string.Format(
AppResources.StatusTextBookedCodeLocationSince,
AppResources.StatusTextBookedCodeLocationSince,
code,
ViewModelHelper.GetStationName(stationId),
from.Value.ToString(BikeViewModelBase.TIMEFORMAT));

42
TINKLib/ViewModel/MyBikes/MyBikesPageViewModel.cs
View file

@ -1,28 +1,28 @@
using Serilog;
using System;
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using TINK.Model.Bike;
using TINK.Model.Connector;
using TINK.Model.User;
using TINK.View;
using TINK.Settings;
using TINK.Model.Bike.BluetoothLock;
using System.Collections.Generic;
using TINK.Services.BluetoothLock;
using TINK.Services.Geolocation;
using System.Linq;
using TINK.Model;
using Xamarin.Forms;
using TINK.ViewModel.Bikes;
using TINK.Services.BluetoothLock.Tdo;
using TINK.Services.Permissions;
using Plugin.BLE.Abstractions.Contracts;
using TINK.MultilingualResources;
using Serilog;
using TINK.Model;
using TINK.Model.Bikes;
using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
using TINK.Model.Connector;
using TINK.Model.Device;
using TINK.Model.Station;
using TINK.Model.User;
using TINK.MultilingualResources;
using TINK.Services.BluetoothLock;
using TINK.Services.BluetoothLock.Tdo;
using TINK.Services.Geolocation;
using TINK.Services.Permissions;
using TINK.Settings;
using TINK.View;
using TINK.ViewModel.Bikes;
using Xamarin.Forms;
namespace TINK.ViewModel.MyBikes
{
@ -112,7 +112,7 @@ namespace TINK.ViewModel.MyBikes
var lockIdList = bikesOccupied.Response
.GetLockIt()
.Cast<BikeInfo>()
.Cast<Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo>()
.Select(x => x.LockInfo)
.ToList();
@ -124,7 +124,7 @@ namespace TINK.ViewModel.MyBikes
// Check bluetooth and location permission and states
ActionText = AppResources.ActivityTextCheckBluetoothState;
if (bikesOccupied.Response.FirstOrDefault(x => x is BikeInfo btBike) != null
if (bikesOccupied.Response.FirstOrDefault(x => x is Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo btBike) != null
&& RuntimePlatform == Device.Android)
{
// Check location permission
@ -162,7 +162,7 @@ namespace TINK.ViewModel.MyBikes
if (Geolocation.IsGeolcationEnabled == false)
{
await ViewService.DisplayAlert(
AppResources.MessageTitleHint,
AppResources.MessageTitleHint,
AppResources.MessageBikesManagementLocationActivation,
AppResources.MessageAnswerOk);