diff --git a/ECMonitor/ECMonitor.csproj b/ECMonitor/ECMonitor.csproj
index 9651365..cdee0e5 100644
--- a/ECMonitor/ECMonitor.csproj
+++ b/ECMonitor/ECMonitor.csproj
@@ -152,7 +152,7 @@
-
+
diff --git a/ECMonitor/Manager/WebSocketManager.cs b/ECMonitor/Manager/WebSocketManager.cs
index 3214c32..75cf1fa 100644
--- a/ECMonitor/Manager/WebSocketManager.cs
+++ b/ECMonitor/Manager/WebSocketManager.cs
@@ -1,41 +1,33 @@
-
+using EC.Utils;
using EC.Utils.ZMQ;
-
+using Fleck;
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-
-using EC.Utils;
-using Fleck;
-
namespace ECMonitor.Manager
{
public class WebSocketManager
{
- WebSocketServer _webSocketServer = null;
- List allSockets = new List();
- public event EventHandler OnDataReceived; //定义一个委托类型的事件
- public WebSocketManager( )
+ private WebSocketServer _webSocketServer = null;
+ private List allSockets = new List();
+
+ public event EventHandler OnDataReceived; //定义一个委托类型的事件
+
+ public WebSocketManager()
{
FleckLog.Level = LogLevel.Debug;
-
- _webSocketServer = new WebSocketServer("ws://0.0.0.0:"+ ConfigHelper.WebSocketSvrPort());
-
-
+
+ _webSocketServer = new WebSocketServer("ws://0.0.0.0:" + ConfigHelper.WebSocketSvrPort());
}
public void Start()
{
-
_webSocketServer.Start(socket =>
{
socket.OnOpen = () =>
{
- // Console.WriteLine("Open!");
+ // Console.WriteLine("Open!");
allSockets.Add(socket);
};
socket.OnClose = () =>
@@ -47,16 +39,17 @@ namespace ECMonitor.Manager
{
//Console.WriteLine(message);
// allSockets.ToList().ForEach(s => s.Send("Echo: " + message));
- WebSocketDataReceived(socket,message);
+ WebSocketDataReceived(socket, message);
};
});
-
}
+
public void Stop()
{
allSockets.ToList().ForEach(s => s.Close());
- _webSocketServer.Dispose();
+ _webSocketServer.Dispose();
}
+
private void WebSocketDataReceived(object sender, string message)
{
try
@@ -70,12 +63,10 @@ namespace ECMonitor.Manager
}
}
}
- catch(Exception ex) {
+ catch (Exception ex)
+ {
LogFactory.GetLogger().Error(ex);
}
-
-
}
-
}
-}
+}
\ No newline at end of file
diff --git a/ECMonitor/Manager/ZMQManager.cs b/ECMonitor/Manager/ZMQManager.cs
index 077d1b7..cd3a034 100644
--- a/ECMonitor/Manager/ZMQManager.cs
+++ b/ECMonitor/Manager/ZMQManager.cs
@@ -1,14 +1,8 @@
-using EC.Utils.ZMQ;
-using EC.UsingEventAggregator;
-using EC.Utils.Config;
-
-using Prism.Events;
+using EC.UsingEventAggregator;
+using EC.Utils;
+using EC.Utils.ZMQ;
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using EC.Utils;
namespace ECMonitor.Code
{
@@ -17,11 +11,10 @@ namespace ECMonitor.Code
///
/// 通用zmq
///
- static ZMQHelper _zmqHelper;
-
+ private static ZMQHelper _zmqHelper;
+
+ public event EventHandler OnDataReceived; //定义一个委托类型的事件
- public event EventHandler OnDataReceived; //定义一个委托类型的事件
-
public void Start()
{
try
@@ -33,14 +26,11 @@ namespace ECMonitor.Code
_zmqHelper = new ZMQHelper(pubserver, subserver, topics);
_zmqHelper.OnSubData += SubDataReceived;
_zmqHelper.Start();
- }catch(Exception ex)
+ }
+ catch (Exception ex)
{
FLogger.Error(ex);
}
-
-
-
-
}
internal static List SUBTopicList()
@@ -52,15 +42,15 @@ namespace ECMonitor.Code
topicList.Add(ZMQTopic.MainFrom_Show_Video);
-
topicList.Add(ZMQTopic.AI_Detect_Warning_Data);
return topicList;
}
public void Stop()
{
- _zmqHelper?.Stop();
+ _zmqHelper?.Stop();
}
+
private void SubDataReceived(object sender, PubSubModel msgModel)
{
try
@@ -71,12 +61,11 @@ namespace ECMonitor.Code
{
LogFactory.GetLogger().Error(ex);
}
-
}
+
public void Send(string topic, string msg)
{
- _zmqHelper.Send( topic, msg);
+ _zmqHelper.Send(topic, msg);
}
-
}
-}
+}
\ No newline at end of file
diff --git a/ECMonitor/appsettings.json b/ECMonitor/appsettings.json
index 0228878..04fbadd 100644
--- a/ECMonitor/appsettings.json
+++ b/ECMonitor/appsettings.json
@@ -1,29 +1,29 @@
{
"EC_App": {
- //================== ϵͳÖ÷Òª²ÎÊýÅäÖà ====================================== -->
- //¿Í»§¶Ë±àºÅ ΨһÉí·Ý±êʶ
+ //================== ϵͳ��Ҫ�������� ====================================== -->
+ //�ͻ��˱�� Ψһ��ݱ�ʶ
"AppId": "Video001",
- //Èí¼þÃû³Æ
+ //�������
"SoftName": "YDFK",
- //Èí¼þÈ«³Æ
- "SoftFullName": "ÒªµØ·À¿Øϵͳ-ÊÓƵ¼à¿Ø",
- //Èí¼þ°æ±¾
+ //���ȫ��
+ "SoftFullName": "Ҫ�ط���ϵͳ-��Ƶ���",
+ //����汾
"SoftVersion": "V1.0.0",
- //×Ô¶¯¹Ø±ÕÔ¤¾¯´°Ìå
- "AutoWarningClose": 1,//Ô¤¾¯´°¿Ú×Ô¶¯¹Ø±Õ
- "VideoAIDetection": 0, //ÊÓƵAI·ÖÎö
+ //�Զ��ر�Ԥ������
+ "AutoWarningClose": 1,//Ԥ�������Զ��ر�
+ "VideoAIDetection": 0, //��ƵAI����
"WebSocketSvrPort": 5003,
"APIServer": "http://192.168.1.200:8080/military/videoRecorder/qryCameraList",
- "MainBarButtonSelectedIndex": 1, // Ö÷´°Ìå¿ÉÑ¡³õʼ´°Ìåͼ±ê 0£º£¨1¸ö´°Ì壩,1£º4¸ö´°Ìå, 2£º9¸ö´°Ìå
+ "MainBarButtonSelectedIndex": 1, // �������ѡ��ʼ����ͼ�� 0����1�����壩,1��4������, 2��9������
"AIInputPath": "F:/TestImage/imgs/",
"AIOutPath": "F:/TestImage/outs/"
},
"ZMQ": {
- "SUBServer": "tcp://192.168.1.182:5000", //ͨÓÃZMQ SUBÏûÏ¢¶©ÔĵØÖ·
- "PUBServer": "tcp://192.168.1.182:5001", //ͨÓÃZMQ PUB ÏûÏ¢·¢²¼µØÖ·
- "AISvrServer": "tcp://127.0.0.1:5002", // ÐèÒªAI ·ÖÎöͼƬ·¢ËÍbyte[] ZMQ REQ-> REP ·þÎñµØÖ·
- "SUBImageServer": "tcp://192.168.1.182:5000", //SUB ͼƬÊý¾Ý byte[] ¶©ÔĵØÖ· ·Ö¿ªÔÒò ͼƬÊý¾ÝÁ¿´ó
- "DBSvrServer": "tcp://127.0.0.1:5010", // Êý¾Ý¿â·þÎñ½Ó¿Ú ZMQ REQ-> REP ·þÎñµØÖ·
+ "SUBServer": "tcp://192.168.1.182:5000", //ͨ��ZMQ SUB��Ϣ���ĵ�ַ
+ "PUBServer": "tcp://192.168.1.182:5001", //ͨ��ZMQ PUB ��Ϣ������ַ
+ "AISvrServer": "tcp://127.0.0.1:5002", // ��ҪAI ����ͼƬ����byte[] ZMQ REQ-> REP �����ַ
+ "SUBImageServer": "tcp://192.168.1.182:5000", //SUB ͼƬ���� byte[] ���ĵ�ַ �ֿ�Ô�� ͼƬ��������
+ "DBSvrServer": "tcp://127.0.0.1:5010", // ���ݿ����ӿ� ZMQ REQ-> REP �����ַ
"SUBTopic": "Topic,A",
"Top": "Topic,A"
},