Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationTerminal

AppShell.xaml.cs

@@ -22,17 +22,22 @@ namespace SunlightAggregationTerminal
                 await Navigation.PushModalAsync(new NavigationPage(logpage));
             }
             else
-            {
-                //发送登录请求
-                TcpServer.Configuration(App.GlobalData.ServerID, 
-                    App.GlobalData.User, App.GlobalData.UserPassword,            
-                    Models.AppModels.GetAppUniqueId());
+            {              
+                var loading = new View.Loading();
+                await Navigation.PushModalAsync(loading);
 
                 if (await AppModels.LogIn())
                 {//拒绝登陆时打开登录页面
+                    await loading.Navigation.PopModalAsync();
+                }
+                else 
+                {
+                    await loading.Navigation.PopModalAsync();
+
                     var logpage = new View.LogPage();
                     await Navigation.PushModalAsync(logpage);
                 }
+
             }
         }
     }