NewLife
/
Stardust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

命名MMF仅适用于windows，在A2工控机上报错，Named maps are not supported

This commit is contained in:
大石头 2022-02-13 23:12:35 +08:00
parent 958cbfe139
commit 027355397b
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Stardust/LocalStarClient.cs
View File

@ -13,12 +13,8 @@ using NewLife.Http;
using NewLife.Log;
using NewLife.Messaging;
using NewLife.Net;
using NewLife.Reflection;
using NewLife.Remoting;
using Stardust.Models;
#if !NET40
using TaskEx = System.Threading.Tasks.Task;
#endif
namespace Stardust
{
@ -331,7 +327,7 @@ namespace Stardust
/// <param name="target">目标目录</param>
public static Task ProbeAsync(String url = null, String version = null, String target = null)
{
return TaskEx.Run(() =>
return Task.Run(() =>
{
var client = new LocalStarClient();
client.ProbeAndInstall(url, version, target);

12
Stardust/StarClient.cs
View File

@ -10,22 +10,18 @@ using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using NewLife;
using NewLife.Http;
using NewLife.Log;
using NewLife.Net;
using NewLife.Reflection;
using NewLife.Remoting;
using NewLife.Security;
using NewLife.Serialization;
using NewLife.Threading;
using Stardust.Models;
using Stardust.Services;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;
#if !NET40
using System.Net.WebSockets;
using WebSocket = System.Net.WebSockets.WebSocket;
#endif
namespace Stardust
{
@ -514,11 +510,7 @@ namespace Stardust
{
if (_timer == null)
{
#if !NET40
_timer = new TimerX(DoPing, null, 1_000, 60_000, "Device") { Async = true };
#else
_timer = new TimerX(s => Ping().Wait(), null, 1_000, 60_000, "Device") { Async = true };
#endif
}
}
}
@ -529,16 +521,13 @@ namespace Stardust
_timer.TryDispose();
_timer = null;
#if !NET40
if (_websocket != null && _websocket.State == WebSocketState.Open) _websocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "finish", default).Wait();
_source?.Cancel();
//_websocket.TryDispose();
_websocket = null;
#endif
}
#if !NET40
private WebSocket _websocket;
private CancellationTokenSource _source;
private async Task DoPing(Object state)
@ -601,7 +590,6 @@ namespace Stardust
if (socket.State == WebSocketState.Open) await socket.CloseAsync(WebSocketCloseStatus.NormalClosure, "finish", default);
}
#endif
#endregion
#region 更新