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

View/Loading.xaml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="SunlightAggregationTerminal.View.Loading"
+             Title="Loading">
+    <Grid x:Name="LoadingIndicator" BackgroundColor="Gray" 
+      IsVisible="True" Opacity="0.9">
+        <VerticalStackLayout Padding="30" Spacing="10"       
+                         VerticalOptions="Center"       
+                         HorizontalOptions="Center">
+            <ActivityIndicator IsRunning="True"                                 
+                           Color="#512BD4"                              
+                           HorizontalOptions="Center"                                 
+                           VerticalOptions="Center" />
+            <Label Text="等待中..."                  
+               FontAttributes="Bold"                  
+               FontSize="24"                   
+               TextColor="Black"/>
+        </VerticalStackLayout>
+    </Grid>
+</ContentPage>

View/Loading.xaml.cs

@@ -0,0 +1,9 @@
+namespace SunlightAggregationTerminal.View;
+
+public partial class Loading : ContentPage
+{
+	public Loading()
+	{
+		InitializeComponent();
+	}
+}

View/LogPage.xaml.cs

@@ -74,8 +74,8 @@ public partial class LogPage : ContentPage
 
     private async void Log_Clicked(object sender, EventArgs e)//登录
     {
-        TcpServer.Configuration(SERVERIP.Text, UsernameEntry.Text, PasswordEntry.Text,
-            Models.AppModels.GetAppUniqueId());
+        //TcpServer.Configuration(SERVERIP.Text, UsernameEntry.Text, PasswordEntry.Text,
+        //    Models.AppModels.GetAppUniqueId());
 
         LoadingIndicator.IsVisible = true;
 

View/LogWindow.xaml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Window xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="SunlightAggregationTerminal.View.LogWindow"
-             Title="LogWindow">
-    <ContentPage>
-
-        <!-- 登录按钮 -->
-        <Button Text="登 录"                      
-             BackgroundColor="#512BD4"                    
-             TextColor="White"                   
-             HeightRequest="50"
-             WidthRequest="100"                
-             CornerRadius="10"                 
-             Margin="0,10,0,0"/>
-    </ContentPage>
-</Window>

View/LogWindow.xaml.cs

@@ -1,19 +0,0 @@
-namespace SunlightAggregationTerminal.View;
-
-public partial class LogWindow : Window
-{
-	public LogWindow()
-	{
-		InitializeComponent();
-		Page = new ContentPage()
-		{
-			Content = new VerticalStackLayout
-			{
-				Children = {
-					new Label { HorizontalOptions = LayoutOptions.Center, VerticalOptions = LayoutOptions.Center, Text = "Welcome to .NET MAUI!"
-					}
-				}
-			}
-		};
-	}
-}