From 71d635f1b18455628c54a679c34e087353fea6ca Mon Sep 17 00:00:00 2001 From: Morten Nielsen Date: Fri, 28 Aug 2020 16:33:20 -0700 Subject: [PATCH] Improve android sample app --- src/SampleApp.Droid/MainActivity.cs | 20 +++--- .../Resources/Resource.Designer.cs | 72 ++++++++----------- 2 files changed, 39 insertions(+), 53 deletions(-) diff --git a/src/SampleApp.Droid/MainActivity.cs b/src/SampleApp.Droid/MainActivity.cs index dd27ea4..49ec478 100644 --- a/src/SampleApp.Droid/MainActivity.cs +++ b/src/SampleApp.Droid/MainActivity.cs @@ -54,6 +54,7 @@ namespace SampleApp.Droid private void Stop() { listener.MessageReceived -= Listener_MessageReceived; + monitor.LocationChanged -= Monitor_LocationChanged; socket?.Close(); socket?.Dispose(); socket = null; @@ -71,6 +72,7 @@ namespace SampleApp.Droid } private NmeaParser.NmeaDevice listener; + private NmeaParser.Gnss.GnssMonitor monitor; private TextView status; private bool launched; private Android.Bluetooth.BluetoothSocket socket; @@ -134,6 +136,8 @@ namespace SampleApp.Droid await listener.OpenAsync(); status.Text += "\nConnected!"; startButton.Enabled = !(stopButton.Enabled = true); + monitor = new NmeaParser.Gnss.GnssMonitor(listener); + monitor.LocationChanged += Monitor_LocationChanged; } else { @@ -163,17 +167,15 @@ namespace SampleApp.Droid if (messages.Count == 100) messages.Dequeue(); messages.Enqueue(message); status.Text = string.Join("\n", messages.Reverse().Select(n=>n.ToString())); - if(message is Rmc rmc) - { - FindViewById(Resource.Id.latitude).Text = "Latitude = " + rmc.Latitude.ToString("0.0000000"); - FindViewById(Resource.Id.longitude).Text = "Longitude = " + rmc.Longitude.ToString("0.0000000"); - } - else if (message is Gga gga) - { - FindViewById(Resource.Id.altitude).Text = "Altitude = " + gga.Altitude.ToString() + " " + gga.AltitudeUnits.ToString(); - } }); } + + private void Monitor_LocationChanged(object sender, EventArgs e) + { + FindViewById(Resource.Id.latitude).Text = "Latitude = " + monitor.Latitude.ToString("0.0000000"); + FindViewById(Resource.Id.longitude).Text = "Longitude = " + monitor.Longitude.ToString("0.0000000"); + FindViewById(Resource.Id.altitude).Text = "Altitude = " + monitor.Altitude.ToString(); + } } } diff --git a/src/SampleApp.Droid/Resources/Resource.Designer.cs b/src/SampleApp.Droid/Resources/Resource.Designer.cs index ef252d2..6cbbba5 100644 --- a/src/SampleApp.Droid/Resources/Resource.Designer.cs +++ b/src/SampleApp.Droid/Resources/Resource.Designer.cs @@ -449,30 +449,14 @@ namespace SampleApp.Droid } } - public partial class Mipmap - { - - // aapt resource value: 0x7F090000 - public const int icon = 2131296256; - - static Mipmap() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Mipmap() - { - } - } - public partial class String { - // aapt resource value: 0x7F0A0000 - public const int app_name = 2131361792; + // aapt resource value: 0x7F090000 + public const int app_name = 2131296256; - // aapt resource value: 0x7F0A0001 - public const int status_bar_notification_info_overflow = 2131361793; + // aapt resource value: 0x7F090001 + public const int status_bar_notification_info_overflow = 2131296257; static String() { @@ -487,41 +471,41 @@ namespace SampleApp.Droid public partial class Style { - // aapt resource value: 0x7F0B0000 - public const int TextAppearance_Compat_Notification = 2131427328; + // aapt resource value: 0x7F0A0000 + public const int TextAppearance_Compat_Notification = 2131361792; - // aapt resource value: 0x7F0B0001 - public const int TextAppearance_Compat_Notification_Info = 2131427329; + // aapt resource value: 0x7F0A0001 + public const int TextAppearance_Compat_Notification_Info = 2131361793; - // aapt resource value: 0x7F0B0002 - public const int TextAppearance_Compat_Notification_Info_Media = 2131427330; + // aapt resource value: 0x7F0A0002 + public const int TextAppearance_Compat_Notification_Info_Media = 2131361794; - // aapt resource value: 0x7F0B0003 - public const int TextAppearance_Compat_Notification_Line2 = 2131427331; + // aapt resource value: 0x7F0A0003 + public const int TextAppearance_Compat_Notification_Line2 = 2131361795; - // aapt resource value: 0x7F0B0004 - public const int TextAppearance_Compat_Notification_Line2_Media = 2131427332; + // aapt resource value: 0x7F0A0004 + public const int TextAppearance_Compat_Notification_Line2_Media = 2131361796; - // aapt resource value: 0x7F0B0005 - public const int TextAppearance_Compat_Notification_Media = 2131427333; + // aapt resource value: 0x7F0A0005 + public const int TextAppearance_Compat_Notification_Media = 2131361797; - // aapt resource value: 0x7F0B0006 - public const int TextAppearance_Compat_Notification_Time = 2131427334; + // aapt resource value: 0x7F0A0006 + public const int TextAppearance_Compat_Notification_Time = 2131361798; - // aapt resource value: 0x7F0B0007 - public const int TextAppearance_Compat_Notification_Time_Media = 2131427335; + // aapt resource value: 0x7F0A0007 + public const int TextAppearance_Compat_Notification_Time_Media = 2131361799; - // aapt resource value: 0x7F0B0008 - public const int TextAppearance_Compat_Notification_Title = 2131427336; + // aapt resource value: 0x7F0A0008 + public const int TextAppearance_Compat_Notification_Title = 2131361800; - // aapt resource value: 0x7F0B0009 - public const int TextAppearance_Compat_Notification_Title_Media = 2131427337; + // aapt resource value: 0x7F0A0009 + public const int TextAppearance_Compat_Notification_Title_Media = 2131361801; - // aapt resource value: 0x7F0B000A - public const int Widget_Compat_NotificationActionContainer = 2131427338; + // aapt resource value: 0x7F0A000A + public const int Widget_Compat_NotificationActionContainer = 2131361802; - // aapt resource value: 0x7F0B000B - public const int Widget_Compat_NotificationActionText = 2131427339; + // aapt resource value: 0x7F0A000B + public const int Widget_Compat_NotificationActionText = 2131361803; static Style() {