优化

CPF_Cef/Common/WebSocketClientWithHeartbeat.cs

@@ -28,7 +28,7 @@ namespace AksWebBrowser.Common
             {
                 _serverUri = Parame.smWebsocket;
                 _webSocket.ConnectAsync(new Uri(_serverUri), CancellationToken.None);
-                Task.WhenAll(ReceiveMessages(), SendHeartbeats());
+                ReceiveMessages(); SendHeartbeats();
             }
             catch (Exception ex)
             {
@@ -42,7 +42,9 @@ namespace AksWebBrowser.Common
         /// <returns></returns>
         private async Task ReceiveMessages()
         {
-            while (_webSocket.State == WebSocketState.Open)
+            while (true)
+            {
+                if (_webSocket.State == WebSocketState.Open)
                 {
                     try
                     {
@@ -84,7 +86,7 @@ namespace AksWebBrowser.Common
                                                 string ImageBase64 = jo1["ImageBase64"].ToString();
                                                 //var faceA = "/data/home/aks/aks/wwwroot/TmpFile/faceA.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");
                                                 var mode2 = new
                                                 {
@@ -108,6 +110,7 @@ namespace AksWebBrowser.Common
                                 }
                                 else if (functionName == "CF_FaceCompare")
                                 {
+
                                     //停止活检
                                     Send("{\"function\":\"CF_StopLiveDetect\"}", "CF_StopLiveDetect");
                                     //关闭摄像头
@@ -134,6 +137,7 @@ namespace AksWebBrowser.Common
                     }
                 }
             }
+        }
 
         /// <summary>
         /// 发送心跳
@@ -141,7 +145,9 @@ namespace AksWebBrowser.Common
         /// <returns></returns>
         private async Task SendHeartbeats()
         {
-            while (_webSocket.State == WebSocketState.Open)
+            while (true)
+            {
+                if (_webSocket.State == WebSocketState.Open)
                 {
                     try
                     {
@@ -157,6 +163,7 @@ namespace AksWebBrowser.Common
                     }
                 }
             }
+        }
 
         /// <summary>
         /// 推送消息到双目websockt
@@ -175,7 +182,7 @@ namespace AksWebBrowser.Common
                     var buffer = System.Text.Encoding.UTF8.GetBytes(message);
                     await _webSocket.SendAsync(new ArraySegment<byte>(buffer), WebSocketMessageType.Text, true, CancellationToken.None);
                 }
-                if (_funName== "CF_StartLiveDetect")
+                if (_funName == "CF_StartLiveDetect")
                 {
                     timer.Elapsed += OnTimedEvent;
                     timer.Enabled = true;//启动定时器

CPF_Cef/MainModel.cs

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

CPF_Cef/Parame.cs

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