|
|
@@ -3,6 +3,7 @@
|
|
|
|
|
|
import json
|
|
|
import time, asyncio
|
|
|
+from model import DeviceConfig
|
|
|
import settings
|
|
|
from .SerialIns import SerialIns
|
|
|
from .BaseClass import BaseClass
|
|
|
@@ -262,13 +263,22 @@ class RemoteControlV2(BaseClass):
|
|
|
)
|
|
|
self.msg_type = "blue_tooth"
|
|
|
return
|
|
|
+ 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(
|
|
|
+ state, record_id = insert_photo_records(
|
|
|
record.image_deal_mode,
|
|
|
record.goods_art_no,
|
|
|
image_index,
|
|
|
- record.action_id,
|
|
|
+ action_id,
|
|
|
)
|
|
|
print("开始单拍1-插入数据")
|
|
|
capture_one = DigiCam()
|
rambo