IHotSpot Provider & IRemoteAssistance Provider.

5 files changed, 88 insertions, 59 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Connectivity/DefaultConnectivityProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Connectivity/DefaultConnectivityProvider.cs
index fbc619e12..a05e66f10 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Connectivity/DefaultConnectivityProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Connectivity/DefaultConnectivityProvider.cs
@@ -138,18 +138,6 @@ namespace Tango.PPC.UI.Connectivity
                 {
                     await Connect(auto_connect_network);
                 }
-
-                if (settings.EnableHotSpot)
-                {
-                    try
-                    {
-                        await EnableHotSpot(settings.HotSpotPassword);
-                    }
-                    catch (Exception ex)
-                    {
-                        LogManager.Log(ex, "Error starting on application startup.");
-                    }
-                }
             });
         }
 
@@ -289,50 +277,5 @@ namespace Tango.PPC.UI.Connectivity
             IsConnected = connected;
             ConnectionStateChanged?.Invoke(this, new ConnectionStateEventArgs() { IsConnected = connected });
         }
-
-        /// <summary>
-        /// Enables the hot spot.
-        /// </summary>
-        /// <param name="password">The password.</param>
-        /// <returns></returns>
-        public async Task EnableHotSpot(string password)
-        {
-            if (!IsHotspotActive)
-            {
-                try
-                {
-                    CmdCommand command = new CmdCommand("netsh", $"wlan set hostednetwork mode=allow ssid='{"Tango_" + _machineProvider.Machine.SerialNumber}' key='{password}'");
-                    await command.Run();
-                    IsHotspotActive = true;
-                }
-                catch (Exception ex)
-                {
-                    LogManager.Log(ex, "Error activating hot spot.");
-                    throw;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Disables the hot spot.
-        /// </summary>
-        /// <returns></returns>
-        public async Task DisableHotSpot()
-        {
-            if (IsHotspotActive)
-            {
-                try
-                {
-                    CmdCommand command = new CmdCommand("netsh", "wlan stop hosted network");
-                    await command.Run();
-                    IsHotspotActive = false;
-                }
-                catch (Exception ex)
-                {
-                    LogManager.Log(ex, "Error deactivating hot spot.");
-                    throw;
-                }
-            }
-        }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index c21f513ae..740b0d203 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("2.0.13.1608")]
+[assembly: AssemblyVersion("2.0.15.1608")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index 786eca0c9..406568f71 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -50,6 +50,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
@@ -253,6 +256,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.manifest" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -468,7 +472,7 @@ del "$(TargetDir)firmware_package.tfp"</PostBuildEvent>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
index 11751d822..645456216 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
@@ -10,12 +10,14 @@ using Tango.PPC.Common.Connectivity;
 using Tango.PPC.Common.Diagnostics;
 using Tango.PPC.Common.EventLogging;
 using Tango.PPC.Common.ExternalBridge;
+using Tango.PPC.Common.HotSpot;
 using Tango.PPC.Common.MachineSetup;
 using Tango.PPC.Common.MachineUpdate;
 using Tango.PPC.Common.Modules;
 using Tango.PPC.Common.Navigation;
 using Tango.PPC.Common.Notifications;
 using Tango.PPC.Common.Printing;
+using Tango.PPC.Common.RemoteAssistance;
 using Tango.PPC.Common.Storage;
 using Tango.PPC.Common.Threading;
 using Tango.PPC.UI.Authentication;
@@ -60,6 +62,8 @@ namespace Tango.PPC.UI
             TangoIOC.Default.Unregister<IMachineUpdateManager>();
             TangoIOC.Default.Unregister<IPrintingManager>();
             TangoIOC.Default.Unregister<IConnectivityProvider>();
+            TangoIOC.Default.Unregister<IHotSpotProvider>();
+            TangoIOC.Default.Unregister<IRemoteAssistanceProvider>();
             TangoIOC.Default.Unregister<IStorageProvider>();
 
             TangoIOC.Default.Register<IDispatcherProvider, DefaultDispatcherProvider>(new DefaultDispatcherProvider(Application.Current.Dispatcher));
@@ -77,6 +81,8 @@ namespace Tango.PPC.UI
             TangoIOC.Default.Register<IMachineUpdateManager, MachineUpdateManager>();
             TangoIOC.Default.Register<IPrintingManager, DefaultPrintingManager>();
             TangoIOC.Default.Register<IConnectivityProvider, DefaultConnectivityProvider>();
+            TangoIOC.Default.Register<IHotSpotProvider, DefaultHotSpotProvider>();
+            TangoIOC.Default.Register<IRemoteAssistanceProvider, DefaultRemoteAssistanceProvider>();
             TangoIOC.Default.Register<IStorageProvider, DefaultStorageProvider>();
 
             //TangoIOC.Default.Register<TeamFoundationServiceExtendedClient>(new TeamFoundationServiceExtendedClient("https://twinetfs.visualstudio.com", String.Empty, "szzfokrceo4rhd4eqi5qpmxn3pa5iwl3q7tlqd36l2m7smz2ynoa"));
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
new file mode 100644
index 000000000..d72e75011
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+             If you want to change the Windows User Account Control level replace the 
+             requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
+            Remove this element if your application requires this virtualization for backwards
+            compatibility.
+        -->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on
+           and is designed to work with. Uncomment the appropriate elements
+           and Windows will automatically select the most compatible environment. -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+
+    </application>
+  </compatibility>
+
+  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
+       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
+       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
+       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+  -->
+
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+</assembly>