Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationTerminal
This commit is contained in:
commit
0a1f94e644
8 files changed
+50
-48
No files matched your search
+6
-3
@@ -40,7 +40,7 @@ namespace SunlightAggregationTerminal.Models
|
||||
App.GlobalData.DarkMode = Convert.ToBoolean(dat.Field<object>("DarkMode"));
|
||||
App.GlobalData.MessageNotificationMode = Convert.ToBoolean(dat.Field<object>("MessageNotificationMode"));
|
||||
|
||||
TcpServer.Configuration(App.GlobalData.ServerID, App.GlobalData.User, App.GlobalData.UserPassword, dat.Field<string>("GUID") ?? "Not");
|
||||
// TcpServer.Configuration(App.GlobalData.ServerID, App.GlobalData.User, App.GlobalData.UserPassword, dat.Field<string>("GUID") ?? "Not");
|
||||
}
|
||||
//启动tcp
|
||||
// TcpServer.CreateCustomService();
|
||||
@@ -76,7 +76,10 @@ namespace SunlightAggregationTerminal.Models
|
||||
{
|
||||
App.GlobalData.LogNo = false;
|
||||
|
||||
//发生登录请求
|
||||
//发送登录请求
|
||||
TcpServer.Configuration(App.GlobalData.ServerID,
|
||||
App.GlobalData.User, App.GlobalData.UserPassword,
|
||||
Models.AppModels.GetAppUniqueId());
|
||||
|
||||
// 创建一个 15 秒的延时任务
|
||||
Task delayTask = Task.Delay(15000);
|
||||
@@ -86,7 +89,7 @@ namespace SunlightAggregationTerminal.Models
|
||||
while (!App.GlobalData.LogNo)
|
||||
{
|
||||
// 每隔 100 毫秒检查一次,避免 CPU 占用过高
|
||||
await Task.Delay(100);
|
||||
await Task.Delay(1000);
|
||||
}
|
||||
});
|
||||
// 使用 Task.WhenAny 等待任意一个任务完成
|
||||
|
||||
Reference in new issue
Block a user