diff --git a/azure_m/azure_m/azure_m.Android/Properties/AndroidManifest.xml b/azure_m/azure_m/azure_m.Android/Properties/AndroidManifest.xml index 74d76205e5b34668b18f4725a37e60f9e776e17d..8580b48541565a230b7160d8bbfbce56fddc81fd 100644 --- a/azure_m/azure_m/azure_m.Android/Properties/AndroidManifest.xml +++ b/azure_m/azure_m/azure_m.Android/Properties/AndroidManifest.xml @@ -3,4 +3,5 @@ + diff --git a/azure_m/azure_m/azure_m.Android/Properties/AssemblyInfo.cs b/azure_m/azure_m/azure_m.Android/Properties/AssemblyInfo.cs index a8f3e97ec98640863e0b9887e02ab2179f469b19..496313a5348efd08dd4a5e3b06d80c4715905c41 100644 --- a/azure_m/azure_m/azure_m.Android/Properties/AssemblyInfo.cs +++ b/azure_m/azure_m/azure_m.Android/Properties/AssemblyInfo.cs @@ -28,3 +28,4 @@ using Android.App; // Add some common permissions, these can be removed if not needed [assembly: UsesPermission(Android.Manifest.Permission.Internet)] [assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)] +[assembly: UsesPermission(Android.Manifest.Permission.Vibrate)] \ No newline at end of file diff --git a/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs b/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs index 0b8d56b62eb118603da4ee2f5a44074c1ba01914..f881d6d6f3dc1c41bc255db31f3c1f35ad8bbe8e 100644 --- a/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs +++ b/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs @@ -14,7 +14,7 @@ namespace azure_m.Droid { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.4.160")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.3.0.26")] public partial class Resource { diff --git a/azure_m/azure_m/azure_m/App.xaml.cs b/azure_m/azure_m/azure_m/App.xaml.cs index d6ad8b9d07806e8e2bee066d612154afbce58ed1..ebcd6c97cd61251fdc067eb7896ecdff8f5fe5e4 100644 --- a/azure_m/azure_m/azure_m/App.xaml.cs +++ b/azure_m/azure_m/azure_m/App.xaml.cs @@ -1,6 +1,9 @@ -using azure_m.Services; +#define DEBUG + +using azure_m.Services; using azure_m.Views; using System; +using System.Threading; using Xamarin.Forms; using Xamarin.Forms.Xaml; using Microsoft.Identity.Client; @@ -16,18 +19,19 @@ namespace azure_m DependencyService.Register(); DependencyService.Register(); + QueryInfo.initEnv(); +#if DEBUG + MainPage = new AppShell(); +#else MainPage = new LoginPage(); ((LoginPage)MainPage).LoginCompleted += h; +#endif startBack(); - //LoginPage loginPage = new LoginPage(); - ////VirtualNetworkPage = new AppShell - //loginPage.LoginCompleted += h; } public void h(object sender, string e) { - Console.WriteLine(e); MainPage=new AppShell(); } diff --git a/azure_m/azure_m/azure_m/AppShell.xaml b/azure_m/azure_m/azure_m/AppShell.xaml index 342767d988c50296c44aa51996489ba620719305..7a8c2dd0b38b0b046c1194b32ff6dc1a50c62842 100644 --- a/azure_m/azure_m/azure_m/AppShell.xaml +++ b/azure_m/azure_m/azure_m/AppShell.xaml @@ -4,7 +4,7 @@ xmlns:local="clr-namespace:azure_m.Views" xmlns:azure_m="clr-namespace:azure_m" x:DataType="azure_m:AppShell" Title="Azure" Shell.NavBarHasShadow="True" - + Shell.TabBarIsVisible="False" x:Class="azure_m.AppShell" > @@ -183,8 +183,8 @@ - - + + diff --git a/azure_m/azure_m/azure_m/AppShell.xaml.cs b/azure_m/azure_m/azure_m/AppShell.xaml.cs index 313e6e29475ee14f35222ed7bfa33a790ecabcb0..87c62265ac7a0d30af87cd426991a7fd6478a2a7 100644 --- a/azure_m/azure_m/azure_m/AppShell.xaml.cs +++ b/azure_m/azure_m/azure_m/AppShell.xaml.cs @@ -18,6 +18,9 @@ namespace azure_m Routing.RegisterRoute(nameof(MonitorPage), typeof(MonitorPage)); Routing.RegisterRoute(nameof(AllResourcesPage), typeof(AllResourcesPage)); Routing.RegisterRoute(nameof(AllServicePage), typeof(AllServicePage)); + Routing.RegisterRoute(nameof(AddPage), typeof(AddPage)); + Routing.RegisterRoute(nameof(VirtualMachinePage), typeof(VirtualMachinePage)); + Routing.RegisterRoute(nameof(ResourceGroupPage), typeof(ResourceGroupPage)); this.CurrentItem = Home; } diff --git a/azure_m/azure_m/azure_m/Views/AddPage.xaml b/azure_m/azure_m/azure_m/Views/AddPage.xaml new file mode 100644 index 0000000000000000000000000000000000000000..e65deb0a5016dd5076059e6702a20234ad1dd1f8 --- /dev/null +++ b/azure_m/azure_m/azure_m/Views/AddPage.xaml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/azure_m/azure_m/azure_m/Views/AddPage.xaml.cs b/azure_m/azure_m/azure_m/Views/AddPage.xaml.cs new file mode 100644 index 0000000000000000000000000000000000000000..7abd070b8c776aa3e9e29b2234ea5e5b8f683b71 --- /dev/null +++ b/azure_m/azure_m/azure_m/Views/AddPage.xaml.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using Xamarin.Forms; +using Xamarin.Forms.Xaml; + +namespace azure_m.Views +{ + [XamlCompilation(XamlCompilationOptions.Compile)] + public partial class AddPage : ContentPage + { + public AddPage() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/azure_m/azure_m/azure_m/Views/MainPage.xaml b/azure_m/azure_m/azure_m/Views/MainPage.xaml index d6944bfd2a7deeecb600cbfd338e187d01209795..7112b1e0f90c5f5c44c2f71aafd1eabe7784033f 100644 --- a/azure_m/azure_m/azure_m/Views/MainPage.xaml +++ b/azure_m/azure_m/azure_m/Views/MainPage.xaml @@ -50,7 +50,13 @@ -