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

Class/DataReceived.cs

@@ -175,6 +175,7 @@ namespace SunlightAggregationTerminal.Class
                                     && value_Notification_id != null)
                                 {
                                     _id = (int)value_Notification_id;
+                                    App.GlobalData.NotificationID = _id.ToString();
                                 }
                                 if (dataNotificationrow!.TryGetValue("Title", out var value_Notification_Title)
                                     && value_Notification_Title != null)
@@ -213,6 +214,10 @@ namespace SunlightAggregationTerminal.Class
                                     }
                                 }
                             }
+
+                            string sql = "UPDATE Users SET NotificationID = '" + App.GlobalData.NotificationID + 
+                                "'WHERE User='" + App.GlobalData.User + "';";
+                            AppModels.Updata(sql);
                         }
                         if (data.TryGetValue("SETUSER", out val) && val != null)//信息通知接受
                         {

Class/HttpServer.cs

@@ -105,7 +105,6 @@ namespace SunlightAggregationTerminal.Class
             {
                 await httpclient.ConnectAsync();
             }
-            Dispose();
 
             var dat = new DataReceived.Person()
             {
@@ -147,40 +146,13 @@ namespace SunlightAggregationTerminal.Class
             {
                 MainThread.BeginInvokeOnMainThread(() =>
                 {
-                    Application.Current!.Windows[0].Page!.DisplayAlertAsync("网络错误", ex.Message.ToString(), "是");
+                    Application.Current!.Windows[0].Page!.DisplayAlertAsync("访问错误", ex.Message.ToString(), "是");
                 });
             }
             finally
             {
-                //Start();
             }
         }
 
-        //倒计时5秒关闭http客户端
-        private static Timer? _timer;
-        private static bool _isDisposed = false;
-        private static void Start()
-        {
-            // 延迟30秒后执行一次，不自动循环
-            _timer = new Timer(Httpout, null, TimeSpan.FromSeconds(60), Timeout.InfiniteTimeSpan);
-        }
-        private static async void Dispose()
-        {
-            if (!_isDisposed)
-            {
-                _isDisposed = true;
-                _timer?.Dispose(); // 释放定时器资源
-                _timer = null;                
-            }
-        }
-        private static async void Httpout(object? state)
-        {
-            if (httpclient.Online)
-            {
-                await httpclient.CloseAsync();
-            }
-            Dispose();
-        }
-
     }
 }

Class/SQLiteConfig.cs

@@ -160,6 +160,12 @@ namespace SunlightAggregationTerminal.Class
                     string sql = "ALTER TABLE Users ADD COLUMN MessageNotificationMode BOOL DEFAULT (0);";
                     SQLitedata.ExecuteNonQuery(sql, null);
                 }
+                // 检查 NotificationID
+                if (!existingColumns.Contains("NotificationID"))
+                {
+                    string sql = "ALTER TABLE Users ADD COLUMN NotificationID TEXT;";
+                    SQLitedata.ExecuteNonQuery(sql, null);
+                }
                 // 检查 GUID
                 if (!existingColumns.Contains("GUID"))
                 {
@@ -290,6 +296,7 @@ namespace SunlightAggregationTerminal.Class
                 LocalAreaNetworkMode BOOL DEFAULT (0),
                 DarkMode BOOL DEFAULT (0),
                 MessageNotificationMode BOOL DEFAULT (0),
+                NotificationID TEXT,
                 GUID TEXT
             );";