PLUS改为G2

Common/util/SMF.cs

@@ -10,7 +10,7 @@ namespace OnlineStore.Common
 {
     public class SMF
     {
-        public static string DeviceType = "MIMO_PLUS";
+        public static string DeviceType = "MIMO_G2";
         static string _server = ConfigHelper.Config.Get("http_server");
         static string server
         {

DeviceLibrary/DeviceLibrary/Camera.cs

@@ -33,6 +33,7 @@ public class HIKCamera
     public string Name = "";
     public event EventHandler<Bitmap> camera_event;
     public string DeviceName = "monitor1";
+    public PictureBox picture = new PictureBox();
     public bool LoadCameraConfig(string CameraID, out string msg)
     {
         Name = CameraID;
@@ -63,13 +64,13 @@ public class HIKCamera
             LogUtil.error(Name + "加载监控相机配置文件失败:" + e.ToString());
             return false;
         }
-        PictureBox p1 = new PictureBox();
-        camera.PreviewImage(DeviceName, p1.Handle);
+        //PictureBox p1 = new PictureBox();
         camera.Open(DeviceName);
+        camera.PreviewImage(DeviceName, picture.Handle);
         Bitmap bmp = camera.GetImage(DeviceName);
         if (bmp == null)
         {
-            msg = Name + crc.GetString(L.monitor_open_fail,"监控相机打开失败");
+            msg = Name + crc.GetString(L.monitor_open_fail, "监控相机打开失败");
             LogUtil.error(Name + $"监控相机打开失败");
             return false;
         }
@@ -97,6 +98,7 @@ public class HIKCamera
                 {
                     errortimes = 0;
                     errorsleeptime = 5000;
+                    //saveTest(bmp);
                     camera_event?.Invoke(this, bmp);
                 }
                 else if (bmp == null && errortimes < 5)
@@ -133,6 +135,14 @@ public class HIKCamera
         catch { }
         camera.Dispose();
     }
+    void saveTest(Bitmap bitmap)
+    {
+        if(!Directory.Exists(".\\TestImg"))
+        {
+            Directory.CreateDirectory(".\\TestImg");
+        }
+        bitmap.Save(Path.Combine(".\\TestImg\\",$"{DateTime.Now.ToString("yyyyMMddhhmmssfff")}.bmp"));
+    }
     public void CameraGrabOne(string filename)
     {
         try

DeviceLibrary/theMachine/MainMachine.cs

@@ -13,7 +13,7 @@ namespace DeviceLibrary
 {
     public partial class MainMachine : IRobot
     {
-        public string Name { get; set; } = "MIMO_PLUS";
+        public string Name { get; set; } = "MIMO_G2";
         private bool _canRunning = true;
         public bool canRunning
         {

TheMachine/App.config

@@ -39,6 +39,16 @@
 				<conversionPattern value="%m%n"/>
 			</layout>
 		</appender>
+		<appender name="HIK.IPCamera" type="log4net.Appender.RollingFileAppender">
+			<file value="logs/HIKIPCamera.log"/>
+			<param name="Encoding" value="UTF-8"/>
+			<appendToFile value="true"/>
+			<rollingStyle value="Date"/>
+			<datePattern value="yyyy-MM-dd"/>
+			<layout type="log4net.Layout.PatternLayout">
+				<conversionPattern value="[%date][%t][%C:%L]%-5p %m%n"/>
+			</layout>
+		</appender>
 		<logger name="RollingLogFileAppender">
 			<level value="ALL"/>
 			<appender-ref ref="RollingLogFileAppender"/>
@@ -51,6 +61,10 @@
 			<level value="ALL"/>
 			<appender-ref ref="LngResource"/>
 		</logger>
+		<logger name="HIK.IPCamera" additivity="false">
+			<level value="ALL"/>
+			<appender-ref ref="HIK.IPCamera"/>
+		</logger>
 		<!--<root>
       <level value="Info" />
       <appender-ref ref="RollingLogFileAppender" />

TheMachine/Form1.cs

@@ -134,7 +134,6 @@ namespace TheMachine
             {
                 RobotManage.Init();
             });
-
             ListViewItem lvi = new ListViewItem(new string[] { "", DateTime.Now.ToString(), crc.GetString(L.device_initializing, "设备加载中,请稍后...") });
             lvi.ForeColor = Color.DarkGreen;
             listView1.Items.Add(lvi);
@@ -149,7 +148,7 @@ namespace TheMachine
             this.Invoke((EventHandler<Bitmap>)delegate
             {
                 pictureBox1.Visible = true;
-                pictureBox1.Image = e;
+               // pictureBox1.Image = e;
             }, sender, e);
         }
         private void CameraB_camera_event(object sender, Bitmap e)

TheMachine/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // 有关程序集的一般信息由以下
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("MIMO_PLUS")]
+[assembly: AssemblyTitle("MIMO_G2")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("上海挚锦科技有限公司")]
-[assembly: AssemblyProduct("MIMO_PLUS")]
+[assembly: AssemblyProduct("MIMO_G2")]
 [assembly: AssemblyCopyright("Copyright ©  2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

TheMachine/TheMachine.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{61FDFF14-8BB7-439A-85A0-592E3011F4C4}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>TheMachine</RootNamespace>
-    <AssemblyName>MIMO_PLUS</AssemblyName>
+    <AssemblyName>MIMO_G2</AssemblyName>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>