|
|
@@ -9,7 +9,6 @@ from mcu.capture.smart_shooter_class import SmartShooter
|
|
|
from models import RecordUpdate
|
|
|
|
|
|
|
|
|
-
|
|
|
# socket消息发送逻辑处理方法
|
|
|
async def handlerSend(
|
|
|
manager: ConnectionManager,
|
|
|
@@ -147,6 +146,10 @@ async def handlerSend(
|
|
|
name="run_mcu_single",
|
|
|
)
|
|
|
case "handler_take_picture":
|
|
|
+ device_ctrl = DeviceControl(
|
|
|
+ websocket_manager=manager, smart_shooter=smart_shooter
|
|
|
+ )
|
|
|
+ await device_ctrl.controlDevice("laser_position", 0)
|
|
|
blue_tooth = BlueToothMode(
|
|
|
websocket_manager=manager, smart_shooter=smart_shooter
|
|
|
)
|
|
|
@@ -154,6 +157,8 @@ async def handlerSend(
|
|
|
blue_tooth.remote_control_v2.handlerTakePhoto(smart_shooter),
|
|
|
name="run_mcu_config",
|
|
|
)
|
|
|
+ await asyncio.sleep(2.5)
|
|
|
+ await device_ctrl.controlDevice("laser_position", 1)
|
|
|
case "re_take_picture": # 重拍
|
|
|
msg_type = "re_take_picture"
|
|
|
record_id = data.get("record_id")
|
|
|
@@ -273,6 +278,10 @@ async def handlerSend(
|
|
|
"""
|
|
|
获取相机信息,是否连接
|
|
|
"""
|
|
|
+ device_ctrl = DeviceControl(
|
|
|
+ websocket_manager=manager, smart_shooter=smart_shooter
|
|
|
+ )
|
|
|
+ await device_ctrl.controlDevice("laser_position", 0)
|
|
|
# 兼容主图测试
|
|
|
id = data.get("id", 0)
|
|
|
goods_art_no = data.get("goods_art_no", "")
|
|
|
@@ -285,6 +294,8 @@ async def handlerSend(
|
|
|
is_af=is_af,
|
|
|
),
|
|
|
name="smart_shooter_photo_take",)
|
|
|
+ await asyncio.sleep(2.5)
|
|
|
+ await device_ctrl.controlDevice("laser_position", 1)
|
|
|
case "digicam_take_picture":
|
|
|
msg_type = "re_take_picture"
|
|
|
id = data.get("id", 0)
|