单拍优化

python/mcu/RemoteControlV2.py

@@ -7,7 +7,7 @@ import settings
 from .SerialIns import SerialIns
 from .BaseClass import BaseClass
 from sockets.connect_manager import ConnectionManager
-from databases import SqlQuery, PhotoRecord, CRUD, insert_photo_records
+from databases import SqlQuery, PhotoRecord,DeviceConfig, CRUD, insert_photo_records
 from .capture.module_digicam import DigiCam
 from .capture.module_watch_dog import FileEventHandler
 
@@ -264,11 +264,26 @@ class RemoteControlV2(BaseClass):
                 return
             image_index = record.image_index + 1
             self.photo_take_state = 1
-            _,record_id_single = insert_photo_records(
+            deviceConfig = CRUD(DeviceConfig)
+            deviceConfigData = deviceConfig.read(
+                session=session, conditions={"id": record.action_id}
+            )
+            select_tab_id = deviceConfigData.tab_id
+            AllTabConfig = deviceConfig.read_all(
+                session=session, conditions={"tab_id": select_tab_id}
+            )
+            action_id = 0
+            if AllTabConfig[len(AllTabConfig) - 1].take_picture == True:
+                action_id = AllTabConfig[0].id
+            else:
+                action_id = AllTabConfig[len(AllTabConfig) - 1].id
+            image_index = record.image_index + 1
+            self.photo_take_state = 1
+            state, record_id = insert_photo_records(
                 record.image_deal_mode,
                 record.goods_art_no,
                 image_index,
-                record.action_id,
+                action_id,
             )
             print("开始单拍1-插入数据")
             try:
@@ -289,7 +304,7 @@ class RemoteControlV2(BaseClass):
                         smart_shooter.CameraShooter(
                             msg_type="handler_take_picture",
                             goods_art_no=record.goods_art_no,
-                            id=record_id_single,
+                            id=record_id,
                         ),
                         name="CameraShooter",
                     )
@@ -302,7 +317,7 @@ class RemoteControlV2(BaseClass):
                         if record.image_deal_mode == 1
                         else "执行左脚程序"
                     ),
-                    data={"goods_art_no": record.goods_art_no, "id": record_id_single},
+                    data={"goods_art_no": record.goods_art_no, "id": record_id},
                     device_status=2,
                 )
                 self.msg_type = "blue_tooth"