Merge branch 'master' of http://192.168.0.12:13000/sc/SunlightAggregationTerminal

View/LogPage.xaml.cs

@@ -9,13 +9,13 @@ namespace SunlightAggregationTerminal.View;
 
 public class ItemOption
 {
-    public required string SERVER { get; set; }
+    public required string? SERVER { get; set; }
-    public required string SERVERIP { get; set; }
+    public required string? SERVERIP { get; set; }
 }
 
 public partial class LogPage : ContentPage
 {
-    public ObservableCollection<ItemOption> Items { get; }  
+    public ObservableCollection<ItemOption>? Items { get; }  
 
     public LogPage()
 	{
@@ -30,6 +30,7 @@ public partial class LogPage : ContentPage
         AppModels.sqliteHelper.Open();
         var userdata = AppModels.sqliteHelper.ExecuteDataSet("select * from Server", null);
         AppModels.sqliteHelper.Close();
+
         if (userdata != null)
         {
             foreach (DataRow dataRow in userdata.Tables[0].Rows)
@@ -52,16 +53,16 @@ public partial class LogPage : ContentPage
         }
     }
 
-    private void SERVER_SelectedIndexChanged(object sender, EventArgs e)
+    private void SERVER_SelectedIndexChanged(object sender, EventArgs e)//服务器列表选择
     {
         var dat = SERVER.SelectedItem as ItemOption;
         if (dat != null)
         {
-            SERVERIP.Text = dat.SERVERIP.ToString();
+            SERVERIP.Text = dat.SERVERIP?.ToString();
         } 
     }
 
-    private void OnScanButtonClicked(object sender, EventArgs e)
+    private void OnScanButtonClicked(object sender, EventArgs e)//扫码按钮
     {
         // 跳转到扫码页面
         var scanPage = new ScanPage(3);