Compare commits

...
Author SHA1 Message Date
livio f27e47d83a Improve Google Play subscription offer handling 2026-10-01 08:35:12 +02:00
livio bcc9e01179 Fix mobile map overlays and GPS recentering 2026-09-30 21:17:15 +02:00
6 changed files with 63 additions and 14 deletions

No files matched your search

+2 -2
View File
@@ -28,8 +28,8 @@
<ApplicationId>it.liviomerola.lmemappecatastali.pro</ApplicationId> <ApplicationId>it.liviomerola.lmemappecatastali.pro</ApplicationId>
<!-- Versions --> <!-- Versions -->
<ApplicationDisplayVersion>1.0.6</ApplicationDisplayVersion> <ApplicationDisplayVersion>1.0.8</ApplicationDisplayVersion>
<ApplicationVersion>106</ApplicationVersion> <ApplicationVersion>108</ApplicationVersion>
<Version>$(ApplicationDisplayVersion)</Version> <Version>$(ApplicationDisplayVersion)</Version>
<!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged --> <!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
+1 -1
View File
@@ -4,7 +4,7 @@
- Nome: LME Mappe Catastali Pro. - Nome: LME Mappe Catastali Pro.
- Package name Android: `it.liviomerola.lmemappecatastali.pro`. - Package name Android: `it.liviomerola.lmemappecatastali.pro`.
- Versione corrente da pubblicare: `1.0.6` / version code `106`. - Versione corrente da pubblicare: `1.0.8` / version code `108`.
- Formato Release Android: Android App Bundle (`.aab`). - Formato Release Android: Android App Bundle (`.aab`).
- Target SDK Release: Android 16 / API 36. - Target SDK Release: Android 16 / API 36.
+37 -8
View File
@@ -9,6 +9,7 @@ public sealed class AndroidPlayBillingService : Java.Lang.Object, IPlayBillingSe
private readonly SemaphoreSlim _connectionLock = new(1, 1); private readonly SemaphoreSlim _connectionLock = new(1, 1);
private readonly BillingClient _client; private readonly BillingClient _client;
private TaskCompletionSource<PlayBillingResult>? _purchaseCompletion; private TaskCompletionSource<PlayBillingResult>? _purchaseCompletion;
private string? _lastCatalogFailure;
public AndroidPlayBillingService() public AndroidPlayBillingService()
{ {
@@ -31,7 +32,12 @@ public sealed class AndroidPlayBillingService : Java.Lang.Object, IPlayBillingSe
{ {
var details = await GetProductDetailsAsync(cancellationToken); var details = await GetProductDetailsAsync(cancellationToken);
return details?.GetSubscriptionOfferDetails()? return details?.GetSubscriptionOfferDetails()?
.Where(item => string.IsNullOrEmpty(item.OfferId)) .Where(item => !string.IsNullOrWhiteSpace(item.BasePlanId)
&& !string.IsNullOrWhiteSpace(item.OfferToken))
.GroupBy(item => item.BasePlanId, StringComparer.Ordinal)
.Select(group => group
.OrderBy(item => string.IsNullOrEmpty(item.OfferId) ? 0 : 1)
.First())
.Select(item => .Select(item =>
{ {
var phase = item.PricingPhases.PricingPhaseList.LastOrDefault(); var phase = item.PricingPhases.PricingPhaseList.LastOrDefault();
@@ -99,13 +105,25 @@ public sealed class AndroidPlayBillingService : Java.Lang.Object, IPlayBillingSe
var details = await GetProductDetailsAsync(cancellationToken); var details = await GetProductDetailsAsync(cancellationToken);
var offer = details?.GetSubscriptionOfferDetails()? var offer = details?.GetSubscriptionOfferDetails()?
.FirstOrDefault(item => item.BasePlanId == basePlanId .Where(item => item.BasePlanId == basePlanId
&& string.IsNullOrEmpty(item.OfferId) && !string.IsNullOrWhiteSpace(item.OfferToken))
&& !string.IsNullOrWhiteSpace(item.OfferToken)); .OrderBy(item => string.IsNullOrEmpty(item.OfferId) ? 0 : 1)
if (details is null || offer is null) .FirstOrDefault();
if (details is null)
{ {
return PlayBillingResult.Failed( return PlayBillingResult.Failed(_lastCatalogFailure
$"Piano {basePlanId} non disponibile su Google Play. Verifica che l'abbonamento lme_pro e il piano siano attivi per il tuo Paese."); ?? "Google Play non ha restituito l'abbonamento lme_pro.");
}
if (offer is null)
{
var availablePlans = string.Join(", ", details.GetSubscriptionOfferDetails()?
.Select(item => item.BasePlanId)
.Where(item => !string.IsNullOrWhiteSpace(item))
.Distinct(StringComparer.Ordinal) ?? []);
return PlayBillingResult.Failed(string.IsNullOrWhiteSpace(availablePlans)
? $"Google Play ha restituito lme_pro senza offerte acquistabili per il piano {basePlanId}."
: $"Piano {basePlanId} non restituito da Google Play. Piani ricevuti: {availablePlans}.");
} }
var productParams = BillingFlowParams.ProductDetailsParams.NewBuilder() var productParams = BillingFlowParams.ProductDetailsParams.NewBuilder()
@@ -191,7 +209,18 @@ public sealed class AndroidPlayBillingService : Java.Lang.Object, IPlayBillingSe
throw new InvalidOperationException(ToMessage(result.Result)); throw new InvalidOperationException(ToMessage(result.Result));
} }
return result.ProductDetailsList?.FirstOrDefault(); var details = result.ProductDetailsList?.FirstOrDefault();
if (details is not null)
{
_lastCatalogFailure = null;
return details;
}
var unfetched = result.UnfetchedProductList?.FirstOrDefault();
_lastCatalogFailure = unfetched is null
? "Google Play ha restituito un catalogo vuoto per lme_pro. Verifica account Play Store, adesione al test e origine dell'installazione."
: $"Google Play non ha caricato lme_pro (codice catalogo {unfetched.StatusCodeValue}).";
return null;
} }
private async Task EnsureConnectedAsync(CancellationToken cancellationToken) private async Task EnsureConnectedAsync(CancellationToken cancellationToken)
+10
View File
@@ -4,6 +4,16 @@ App .NET MAUI Blazor Hybrid per Android, iOS, Mac Catalyst e Windows, pensata pe
Informativa privacy: [PRIVACY_POLICY.md](PRIVACY_POLICY.md). Informativa privacy: [PRIVACY_POLICY.md](PRIVACY_POLICY.md).
## Versione Pro 1.0.8 test
- Google Play Billing accetta tutte le offerte idonee restituite per i piani `monthly` e `yearly`, preferendo il piano base quando disponibile.
- In caso di catalogo vuoto o prodotto non caricato, il messaggio mostra una diagnostica specifica restituita da Google Play.
## Versione Pro 1.0.7 test
- I messaggi informativi su telefono vengono mostrati sopra i controlli zoom e possono occupare fino a tre righe senza sovrapporsi.
- Durante il rilevamento GPS la mappa si ricentra automaticamente quando la nuova posizione esce dall'area visibile, mantenendo lo zoom corrente.
## Versione Pro 1.0.6 test ## Versione Pro 1.0.6 test
- Il pannello Layer usa tutta la larghezza disponibile sui telefoni e le righe si adattano ai testi su piu linee senza sovrapporsi. - Il pannello Layer usa tutta la larghezza disponibile sui telefoni e le righe si adattano ai testi su piu linee senza sovrapporsi.
+7 -3
View File
@@ -1833,12 +1833,16 @@ footer {
.map-info { .map-info {
right: 8px; right: 8px;
bottom: 72px; bottom: calc(var(--nav-height) + 116px);
left: 8px; left: 8px;
display: -webkit-box;
max-width: none; max-width: none;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; line-height: 1.35;
white-space: nowrap; overflow-wrap: anywhere;
white-space: normal;
-webkit-box-orient: vertical;
-webkit-line-clamp: 3;
} }
.bottom-tabs button { .bottom-tabs button {
+6
View File
@@ -5637,6 +5637,12 @@ function onGpsPosition(position) {
updateGpsPositionLayers(latlng, lmeState.lastAccuracy); updateGpsPositionLayers(latlng, lmeState.lastAccuracy);
if (firstLiveFix) { if (firstLiveFix) {
lmeState.map.setView(latlng, 19); lmeState.map.setView(latlng, 19);
} else if (!lmeState.map.getBounds().contains(latlng)) {
lmeState.map.panTo(latlng, {
animate: true,
duration: 0.5,
easeLinearity: 0.25
});
} }
if (lmeState.gpsTrailEnabled) { if (lmeState.gpsTrailEnabled) {