2023年6月18日15:30:49

ECMonitor/ECMonitor.csproj

@@ -152,7 +152,7 @@
    
   </Target>
 
-  <ProjectExtensions><VisualStudio><UserProperties /></VisualStudio></ProjectExtensions>
+  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     <Exec Command="Copy $(ProjectDir)appsettings.json $(OutDir)appsettings.json" />

ECMonitor/Manager/WebSocketManager.cs

@@ -1,36 +1,28 @@
-
+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<IWebSocketConnection> allSockets = new List<IWebSocketConnection>();
+        private WebSocketServer _webSocketServer = null;
+        private List<IWebSocketConnection> allSockets = new List<IWebSocketConnection>();
+
         public event EventHandler<PubSubModel> OnDataReceived; //定义一个委托类型的事件
+
         public WebSocketManager()
         {
             FleckLog.Level = LogLevel.Debug;
 
             _webSocketServer = new WebSocketServer("ws://0.0.0.0:" + ConfigHelper.WebSocketSvrPort());
-            
-            
         }
 
         public void Start()
         {
-          
             _webSocketServer.Start(socket =>
             {
                 socket.OnOpen = () =>
@@ -50,13 +42,14 @@ namespace ECMonitor.Manager
                     WebSocketDataReceived(socket, message);
                 };
             });
-
         }
+
         public void Stop()
         {
             allSockets.ToList().ForEach(s => s.Close());
             _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);
             }
-           
-              
         }
-        
     }
 }

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,8 +11,7 @@ namespace ECMonitor.Code
         /// <summary>
         /// 通用zmq
         /// </summary>
-        static ZMQHelper _zmqHelper;
-         
+        private static ZMQHelper _zmqHelper;
 
         public event EventHandler<PubSubModel> OnDataReceived; //定义一个委托类型的事件
 
@@ -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<string> SUBTopicList()
@@ -52,7 +42,6 @@ namespace ECMonitor.Code
 
             topicList.Add(ZMQTopic.MainFrom_Show_Video);
 
-
             topicList.Add(ZMQTopic.AI_Detect_Warning_Data);
             return topicList;
         }
@@ -61,6 +50,7 @@ namespace ECMonitor.Code
         {
             _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);
         }
- 
     }
 }

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"
   },