Improved navigation view model caching, fixed handling the device con…

…nection in DirectMethodView
kgalic · Sep 30, 2019 · 7e3de7b · 7e3de7b
1 parent a23297c
commit 7e3de7b
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 28 deletions.
diff --git a/DeviceSimulator.Core/Services/BackendServices/Implementations/DeviceService.cs b/DeviceSimulator.Core/Services/BackendServices/Implementations/DeviceService.cs
@@ -174,9 +174,17 @@ private void SendDeviceConnectionUpdatedMessage()
 
         private async Task ReceiveCloudMessages(CancellationToken cancellationToken)
         {
-            while(!cancellationToken.IsCancellationRequested)
+            while(true)
             {
                 var cloudToDeviceMessage = await _deviceClient.ReceiveAsync(_cancellationToken);
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    break;
+                }
+                if (cloudToDeviceMessage == null)
+                {
+                    continue;
+                }
                 if (cloudToDeviceMessage.BodyStream != null)
                 {
                     var streamReader = new StreamReader(cloudToDeviceMessage.BodyStream);
@@ -185,6 +193,8 @@ private async Task ReceiveCloudMessages(CancellationToken cancellationToken)
                     _consoleLoggerService.Log(value: message,
                                               logType: ConsoleLogTypes.C2DCommunication);
                 }
+
+                await _deviceClient.CompleteAsync(cloudToDeviceMessage);
             }
         }
 

diff --git a/DeviceSimulator.Core/ViewModels/CloudToDeviceCommunicationViewModel.cs b/DeviceSimulator.Core/ViewModels/CloudToDeviceCommunicationViewModel.cs
@@ -10,7 +10,7 @@ public class CloudToDeviceCommunicationViewModel : MvxViewModel
     {
         #region Fields
 
-        private MvxSubscriptionToken _deviceStatusChangedMessageToken;
+        private MvxSubscriptionToken _outputChangedMessageToken;
 
         private string _messageOutput = string.Empty;
 
@@ -20,7 +20,7 @@ public class CloudToDeviceCommunicationViewModel : MvxViewModel
 
         public CloudToDeviceCommunicationViewModel(IMvxMessenger messageService)
         {
-            messageService.Subscribe<CloudMessageReceivedMessage>(HandleCloudToDeviceMessage);
+            _outputChangedMessageToken = messageService.Subscribe<CloudMessageReceivedMessage>(HandleCloudToDeviceMessage);
         }
 
         #endregion

diff --git a/DeviceSimulator.Core/ViewModels/DirectMethodCommunicationViewModel.cs b/DeviceSimulator.Core/ViewModels/DirectMethodCommunicationViewModel.cs
@@ -23,6 +23,7 @@ public class DirectMethodCommunicationViewModel : MvxViewModel
 
         private ObservableCollection<DirectMethodSettingViewItem> _directMethodSettingViewItems;
 
+        private MvxSubscriptionToken _deviceConnectionStatusChangedMessageToken;
         private MvxSubscriptionToken _directMethodStatusChangedMessageToken;
 
         private string _directMethodEntry;
@@ -42,6 +43,7 @@ public DirectMethodCommunicationViewModel(IDeviceService deviceService,
             _deviceSettingDataService = deviceSettingDataService;
 
             _directMethodStatusChangedMessageToken = messageService.Subscribe<DirectMethodStatusUpdatedMessage>(HandleDirectMethodStatusChanged);
+            _deviceConnectionStatusChangedMessageToken = messageService.Subscribe<DeviceConnectionChangedMessage>(HandleDeviceConnectionStatus);
         }
 
         public override Task Initialize()
@@ -184,8 +186,9 @@ private DirectMethodSettingViewItem CreateDirectMethodViewItem(DirectMethodSetti
                     await _deviceService.UnregisterDirectMethodAsync(directMethodViewItem.DirectMethodSetting.DirectMethodName);
                 }
             });
-            var removeCommand = new MvxCommand<DirectMethodSettingViewItem>((item) =>
+            var removeCommand = new MvxCommand<DirectMethodSettingViewItem>(async (item) =>
             {
+                await _deviceService.UnregisterDirectMethodAsync(item.DirectMethodSetting.DirectMethodName);
                 _directMethodSettingViewItems.Remove(item);
             });
             directMethodViewItem.RemoveCommand = removeCommand;
@@ -194,6 +197,24 @@ private DirectMethodSettingViewItem CreateDirectMethodViewItem(DirectMethodSetti
             return directMethodViewItem;
         }
 
+        private void HandleDeviceConnectionStatus(DeviceConnectionChangedMessage message)
+        {
+            if (message.IsConnected)
+            {
+                Status = string.Empty;
+            }
+            else
+            {
+                foreach(var viewItem in ViewItems)
+                {
+                    if (!viewItem.IsEnabled)
+                    {
+                        viewItem.RegisterCommand.Execute();
+                    }
+                }
+            }
+        }
+
         #endregion
     }
 }
diff --git a/DeviceSimulator/Views/Device/CloudToDeviceCommunicationView.xaml.cs b/DeviceSimulator/Views/Device/CloudToDeviceCommunicationView.xaml.cs
@@ -35,10 +35,9 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
             // if cache mode is 'Required' then View Model 
             // should be retrieved instead of creating a new one
             var cachedViewModel = ViewModel;
-            base.OnNavigatedTo(e);
-            if (cachedViewModel != null)
+            if (cachedViewModel == null)
             {
-                ViewModel = cachedViewModel;
+                base.OnNavigatedTo(e);
             }
         }
 

diff --git a/DeviceSimulator/Views/Device/DirectMethodCommunicationView.xaml.cs b/DeviceSimulator/Views/Device/DirectMethodCommunicationView.xaml.cs
@@ -36,11 +36,9 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
             // if cache mode is 'Required' then View Model 
             // should be retrieved instead of creating a new one
             var cachedViewModel = ViewModel as DirectMethodCommunicationViewModel;
-            base.OnNavigatedTo(e);
-            if (cachedViewModel != null)
+            if (cachedViewModel == null)
             {
-                cachedViewModel.Initialize(); //forcing 
-                ViewModel = cachedViewModel;
+                base.OnNavigatedTo(e);
             }
         }
     }

diff --git a/DeviceSimulator/Views/Device/HomeView.xaml.cs b/DeviceSimulator/Views/Device/HomeView.xaml.cs
@@ -36,10 +36,9 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
             // if cache mode is 'Required' then View Model 
             // should be retrieved instead of creating a new one
             var cachedViewModel = ViewModel;
-            base.OnNavigatedTo(e);
-            if (cachedViewModel != null)
+            if (cachedViewModel == null)
             {
-                ViewModel = cachedViewModel;
+                base.OnNavigatedTo(e);
             }
         }
 

diff --git a/DeviceSimulator/Views/EventGrid/EventGridView.xaml.cs b/DeviceSimulator/Views/EventGrid/EventGridView.xaml.cs
@@ -1,4 +1,5 @@
-using MvvmCross.Platforms.Uap.Views;
+using MessagePublisher.Core;
+using MvvmCross.Platforms.Uap.Views;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -32,11 +33,10 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             // if cache mode is 'Required' then View Model 
             // should be retrieved instead of creating a new one
-            var cachedViewModel = ViewModel;
-            base.OnNavigatedTo(e);
-            if (cachedViewModel != null)
+            var cachedViewModel = ViewModel as EventGridViewModel;
+            if (cachedViewModel == null)
             {
-                ViewModel = cachedViewModel;
+                base.OnNavigatedTo(e);
             }
         }
 

diff --git a/DeviceSimulator/Views/ServiceBus/ServiceBusView.xaml.cs b/DeviceSimulator/Views/ServiceBus/ServiceBusView.xaml.cs
@@ -34,16 +34,9 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
             // if cache mode is 'Required' then View Model 
             // should be retrieved instead of creating a new one
             var cachedViewModel = ViewModel as ServiceBusViewModel;
-            var selectedIndex = 0;
-            if (cachedViewModel != null)
+            if (cachedViewModel == null)
             {
-                selectedIndex = cachedViewModel.ServiceBusEntityOptionsSelectedIndexId;
-            }
-            base.OnNavigatedTo(e);
-            if (cachedViewModel != null)
-            {
-                cachedViewModel.ServiceBusEntityOptionsSelectedIndexId = selectedIndex;
-                ViewModel = cachedViewModel;
+                base.OnNavigatedTo(e);
             }
         }