Browse Source

优化

master
胡超1 1 year ago
parent
commit
cff562c0f2
  1. 15
      CPF_Cef/Common/WebSocketClientWithHeartbeat.cs
  2. 6
      CPF_Cef/MainModel.cs
  3. 1
      CPF_Cef/Parame.cs

15
CPF_Cef/Common/WebSocketClientWithHeartbeat.cs

@ -28,7 +28,7 @@ namespace AksWebBrowser.Common
{ {
_serverUri = Parame.smWebsocket; _serverUri = Parame.smWebsocket;
_webSocket.ConnectAsync(new Uri(_serverUri), CancellationToken.None); _webSocket.ConnectAsync(new Uri(_serverUri), CancellationToken.None);
Task.WhenAll(ReceiveMessages(), SendHeartbeats()); ReceiveMessages(); SendHeartbeats();
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -42,7 +42,9 @@ namespace AksWebBrowser.Common
/// <returns></returns> /// <returns></returns>
private async Task ReceiveMessages() private async Task ReceiveMessages()
{ {
while (_webSocket.State == WebSocketState.Open) while (true)
{
if (_webSocket.State == WebSocketState.Open)
{ {
try try
{ {
@ -84,7 +86,7 @@ namespace AksWebBrowser.Common
string ImageBase64 = jo1["ImageBase64"].ToString(); string ImageBase64 = jo1["ImageBase64"].ToString();
//var faceA = "/data/home/aks/aks/wwwroot/TmpFile/faceA.jpg"; //var faceA = "/data/home/aks/aks/wwwroot/TmpFile/faceA.jpg";
//var faceB = "/data/home/aks/aks/wwwroot/TmpFile/faceB.jpg"; //var faceB = "/data/home/aks/aks/wwwroot/TmpFile/faceB.jpg";
string faceA = Utils.Base64ByImagesPath(ImageBase64.Replace("data:image/jpg;base64,", ""), ""); string faceA = Utils.Base64ByImagesPath(ImageBase64.Replace("data:image/jpg;base64,", ""), "faceA");
string faceB = Utils.Base64ByImagesPath(jo["ImgBase64"].ToString(), "faceB"); string faceB = Utils.Base64ByImagesPath(jo["ImgBase64"].ToString(), "faceB");
var mode2 = new var mode2 = new
{ {
@ -108,6 +110,7 @@ namespace AksWebBrowser.Common
} }
else if (functionName == "CF_FaceCompare") else if (functionName == "CF_FaceCompare")
{ {
//停止活检 //停止活检
Send("{\"function\":\"CF_StopLiveDetect\"}", "CF_StopLiveDetect"); Send("{\"function\":\"CF_StopLiveDetect\"}", "CF_StopLiveDetect");
//关闭摄像头 //关闭摄像头
@ -134,6 +137,7 @@ namespace AksWebBrowser.Common
} }
} }
} }
}
/// <summary> /// <summary>
/// 发送心跳 /// 发送心跳
@ -141,7 +145,9 @@ namespace AksWebBrowser.Common
/// <returns></returns> /// <returns></returns>
private async Task SendHeartbeats() private async Task SendHeartbeats()
{ {
while (_webSocket.State == WebSocketState.Open) while (true)
{
if (_webSocket.State == WebSocketState.Open)
{ {
try try
{ {
@ -157,6 +163,7 @@ namespace AksWebBrowser.Common
} }
} }
} }
}
/// <summary> /// <summary>
/// 推送消息到双目websockt /// 推送消息到双目websockt

6
CPF_Cef/MainModel.cs

@ -1622,14 +1622,14 @@ namespace AKS.EnterpriseLibrary.WebBrowser
{ {
try try
{ {
Parame.ImgBase64 = ImageBase64;
WebSocketClientWithHeartbeat webSocket = new WebSocketClientWithHeartbeat(); WebSocketClientWithHeartbeat webSocket = new WebSocketClientWithHeartbeat();
Task.Delay(800).Wait();
Parame.ImgBase64 = ImageBase64;
var mode = new var mode = new
{ {
function = "CF_OpenCamera", function = "CF_OpenCamera",
show = 1, show = 1,
fx = 100, fx = 150,
fy = 800, fy = 800,
fw = 800, fw = 800,
fh = 600 fh = 600

1
CPF_Cef/Parame.cs

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Net.Sockets; using System.Net.Sockets;
using System.Net.WebSockets;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;

Loading…
Cancel
Save