xiongzhu 5 yıl önce
ebeveyn
işleme
a69e445945
2 değiştirilmiş dosya ile 18 ekleme ve 11 silme
  1. 17 11
      model/CarCamDevice.cs
  2. 1 0
      views/MainWindow.xaml.cs

+ 17 - 11
model/CarCamDevice.cs

@@ -28,19 +28,25 @@ namespace DeviceCenter
             this.type = DeviceType.CAR_CAM;
         }
 
-        public override void Init()
+        public override async void Init()
         {
-            _userId = CarCamSDK.Net_AddCamera(ip);
-            int iRet1 = CarCamSDK.Net_ConnCamera(_userId, 30000, 10);
-            if (iRet1 != 0)
+            status = DeviceStatus.CONNECTING;
+            await Task.Run(() =>
             {
-                CarCamSDK.Net_DelCamera(_userId);
-                MessageBox.Show("连接相机失败!", "提示");
-            }
-            else
-            {
-                CarCamSDK.Net_RegOffLineClient(_userId);
-            }
+                _userId = CarCamSDK.Net_AddCamera(ip);
+                int iRet1 = CarCamSDK.Net_ConnCamera(_userId, 30000, 10);
+                if (iRet1 != 0)
+                {
+                    CarCamSDK.Net_DelCamera(_userId);
+                    status = DeviceStatus.FAIL;
+                    message = "连接相机失败";
+                }
+                else
+                {
+                    CarCamSDK.Net_RegOffLineClient(_userId);
+                    status = DeviceStatus.CONNECTED;
+                }
+            });
         }
 
         public override void dispose()

+ 1 - 0
views/MainWindow.xaml.cs

@@ -97,6 +97,7 @@ namespace DeviceCenter
             if (addDevice.ShowDialog() ?? false)
             {
                 config.devices.Add(addDevice.device);
+                config.save();
                 devices.Add(addDevice.device);
             }
         }