1

DeviceLibrary/DeviceLibrary/CodeManager.cs

@@ -261,9 +261,10 @@ namespace DeviceLibrary
                 if (bmp == null)
                 if (bmp == null)
                 {
                 {
                     if (retrytime > 2)
                     if (retrytime > 2)
-                        return false;
+                        return true;
                     retrytime++;
                     retrytime++;
-                    CloseCamera(cameraName);
+                    LoadCamera(true);
+
                     LogUtil.info($"bitmap为空重试第{retrytime}次");
                     LogUtil.info($"bitmap为空重试第{retrytime}次");
                     Thread.Sleep(500);
                     Thread.Sleep(500);
                     goto retry;
                     goto retry;

DeviceLibrary/theMachine/RobotManage.cs

@@ -102,17 +102,25 @@ namespace DeviceLibrary
             LoadFinishEvent?.Invoke(true, crc.GetString(L.open_debug_mode,"打开调试模式"));
             LoadFinishEvent?.Invoke(true, crc.GetString(L.open_debug_mode,"打开调试模式"));
         }
         }
         public static void Start() {
         public static void Start() {
-            //Init();
+
             if (!IsLoadOk)
             if (!IsLoadOk)
             {
             {
                 LogUtil.info("系统还未加载完毕,无法启动");
                 LogUtil.info("系统还未加载完毕,无法启动");
                 if (!IsConfigMode)
                 if (!IsConfigMode)
                     return;
                     return;
             }
             }
+            lock (mainMachine)
+            {
+                if (isRunning)
+                {
+                    LogUtil.info("系统已经在运行");
+                    return;
+                }
+                isRunning = true;
                 mainThread = new Thread(new ThreadStart(mainMachine.Start));
                 mainThread = new Thread(new ThreadStart(mainMachine.Start));
                 mainThread.Start();
                 mainThread.Start();
+            }
 
 
-            isRunning = true;
             GC.KeepAlive(mainThread);
             GC.KeepAlive(mainThread);
             Task.Run(()=> {
             Task.Run(()=> {
                 AxisBean.List.ForEach((x) => { AxisManager.AlarmClear(x.Config.DeviceName, x.Config.GetAxisValue()); });
                 AxisBean.List.ForEach((x) => { AxisManager.AlarmClear(x.Config.DeviceName, x.Config.GetAxisValue()); });