Browse Source

Merge branch 'dev-python'

rambo 8 months ago
parent
commit
2d18dc79ad
2 changed files with 2 additions and 1 deletions
  1. 1 0
      python/mcu/DeviceControl.py
  2. 1 1
      python/service/run_main.py

+ 1 - 0
python/mcu/DeviceControl.py

@@ -677,6 +677,7 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
             # if self.state_camera_motor
             if all(value == 2 for value in [self.state_camera_motor, self.state_camera_steering, self.state_turntable_steering, self.state_overturn_steering]):
                 self.init_state = True
+                self.sendSocketMessage(msg="设备初始化完成", device_status=2)
             self.sendSocketMessage(msg="获取mcu设备运行状态信息", data=message)
         # 检查是否成功初始化
         if self.is_just_init_time is False:

+ 1 - 1
python/service/run_main.py

@@ -366,7 +366,7 @@ class RunMain():
         goods_art_no = config_data["goods_art_no"]
         is_check_color_is_all = config_data["is_check_color_is_all"]
         detail_is_pass = config_data["detail_is_pass"]
-
+        print("image_dir====>", image_dir)
         error_folder_list = []
         # 遍历货号获取所有货号--可能为编号
         folder_name_list = get_all_dir_info(