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

AppShell.xaml

@@ -31,6 +31,12 @@
             Title="查询"
             Icon="search.png"
             ContentTemplate="{DataTemplate local:QueryPage}"/>
+        <!-- 操作页面 -->
+       <!--
+        <ShellContent
+            Title="操作"
+            Icon="IcOutlinePsychologyAlt.png"
+            ContentTemplate="{DataTemplate local:QueryPage}"/>-->
         <!-- 3 通知页面 -->
         <ShellContent
             Title="通知"

Class/HttpServer.cs

@@ -95,6 +95,8 @@ namespace SunlightAggregationTerminal.Class
                 {
                     Application.Current!.Windows[0].Page!.DisplayAlertAsync("网络错误", ex.Message.ToString(), "是");
                 });
+                await httpclient.CloseAsync();
+                httpclient.Dispose();
             }
         }
 
@@ -145,6 +147,8 @@ namespace SunlightAggregationTerminal.Class
                     {
                         Application.Current!.Windows[0].Page!.DisplayAlertAsync("网络错误", "网络请求超时，请检查网络网络连接", "是");
                     });
+                    await httpclient.CloseAsync();
+                    httpclient.Dispose();
                 }
                 else
                 {
@@ -161,6 +165,8 @@ namespace SunlightAggregationTerminal.Class
                     {                    
                         Application.Current!.Windows[0].Page!.DisplayAlertAsync("访问错误", ex.Message.ToString(), "是");             
                     });
+                    await httpclient.CloseAsync();
+                    httpclient.Dispose();
                 }
                 else
                 {

Images/IcOutlinePsychologyAlt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 24 24"><path fill="currentColor" d="M19.94 9.06C19.5 5.73 16.57 3 13 3C9.47 3 6.57 5.61 6.08 9l-1.93 3.48c-.41.66.07 1.52.85 1.52h1v2c0 1.1.9 2 2 2h1v3h7v-4.68a7.02 7.02 0 0 0 3.94-7.26m-5.05 5.57l-.89.42V19h-3v-3H8v-4H6.7l1.33-2.33C8.21 7.06 10.35 5 13 5c2.76 0 5 2.24 5 5c0 2.09-1.29 3.88-3.11 4.63"/><path fill="currentColor" d="M12.5 12.54c-.41 0-.74.31-.74.73c0 .41.33.74.74.74c.42 0 .73-.33.73-.74a.71.71 0 0 0-.73-.73m0-5.54c-1.03 0-1.74.67-2 1.45l.96.4c.13-.39.43-.86 1.05-.86c.95 0 1.13.89.8 1.36c-.32.45-.86.75-1.14 1.26c-.23.4-.18.87-.18 1.16h1.06c0-.55.04-.65.13-.82c.23-.42.65-.62 1.09-1.27c.4-.59.25-1.38-.01-1.8c-.31-.49-.9-.88-1.76-.88"/></svg>

QueryPage.xaml

@@ -25,12 +25,14 @@
                         <FileImageSource File="lucidescanline.png" />
                     </Button.ImageSource>
                 </Button>
-                <HorizontalStackLayout Grid.Row="1" Grid.Column="0">
+                <HorizontalStackLayout Grid.Row="1" Grid.Column="0" Margin="5,0,0,0" >
-                    <DatePicker x:Name="StartTime" Format="yyyy年MM月dd日" FontSize="16"/>
+                    <DatePicker x:Name="StartTime" Format="yyyy年MM月dd日" FontSize="16" 
+                                MaximumWidthRequest="150" MinimumWidthRequest="130" WidthRequest="145"/>
                     <Label Text="~" FontSize="28"/>
-                    <DatePicker x:Name="EndTime" Format="yyyy年MM月dd日" FontSize="16"/>
+                    <DatePicker x:Name="EndTime" Format="yyyy年MM月dd日" FontSize="16"
+                                MaximumWidthRequest="150" MinimumWidthRequest="130" WidthRequest="145"/>
                 </HorizontalStackLayout>
-                <Button Grid.Row="1" Grid.Column="1" Text="搜索" Clicked="Button_Clicked" Padding="30,0,30,0" Margin="5" />
+                <Button Grid.Row="1" Grid.Column="1" Text="搜索" Clicked="Button_Clicked" Padding="30,0,30,0" Margin="0,0,10,5" />
             </Grid>
 
             <Grid Grid.Row="1" Grid.Column="0">