|
@@ -196,7 +196,7 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
return False, msg_send
|
|
return False, msg_send
|
|
|
self.connect_status = True
|
|
self.connect_status = True
|
|
|
msg_send = "相机已连接"
|
|
msg_send = "相机已连接"
|
|
|
- print("CameraLists", CameraLists)
|
|
|
|
|
|
|
+ # print("CameraLists", CameraLists)
|
|
|
if is_send:
|
|
if is_send:
|
|
|
message = {
|
|
message = {
|
|
|
"code": 0,
|
|
"code": 0,
|
|
@@ -355,6 +355,7 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
async def EnableCameraPreview(
|
|
async def EnableCameraPreview(
|
|
|
self, enable_status=True, msg_type="", CameraKey=None
|
|
self, enable_status=True, msg_type="", CameraKey=None
|
|
|
):
|
|
):
|
|
|
|
|
+ print("收到得msg_type====>>>", msg_type)
|
|
|
self.msg_type = msg_type
|
|
self.msg_type = msg_type
|
|
|
await self.SetCameraFPS(5, CameraKey=CameraKey)
|
|
await self.SetCameraFPS(5, CameraKey=CameraKey)
|
|
|
"""
|
|
"""
|
|
@@ -362,6 +363,16 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
"""
|
|
"""
|
|
|
camera_states, _ = await self.GetCameraInfo(is_send=False, CameraKey=CameraKey)
|
|
camera_states, _ = await self.GetCameraInfo(is_send=False, CameraKey=CameraKey)
|
|
|
if not camera_states:
|
|
if not camera_states:
|
|
|
|
|
+ msg_send = "预览启用失败"
|
|
|
|
|
+ message = {
|
|
|
|
|
+ "code": 0,
|
|
|
|
|
+ "msg": msg_send,
|
|
|
|
|
+ "data": None,
|
|
|
|
|
+ "msg_type": msg_type,
|
|
|
|
|
+ "device_status": -1,
|
|
|
|
|
+ }
|
|
|
|
|
+ logger.error(message)
|
|
|
|
|
+ await self.sendMessageSocket(message)
|
|
|
return False, "请先连接相机"
|
|
return False, "请先连接相机"
|
|
|
try:
|
|
try:
|
|
|
low_iso, high_iso = self.getConfigIso(CameraKey=CameraKey)
|
|
low_iso, high_iso = self.getConfigIso(CameraKey=CameraKey)
|
|
@@ -398,20 +409,25 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
if not msg_result:
|
|
if not msg_result:
|
|
|
self.perview_state = False
|
|
self.perview_state = False
|
|
|
msg_send = "预览启用失败"
|
|
msg_send = "预览启用失败"
|
|
|
- # self.sendSocketMessage(
|
|
|
|
|
- # code=0,
|
|
|
|
|
- # msg=msg_send,
|
|
|
|
|
- # device_status=2,
|
|
|
|
|
- # )
|
|
|
|
|
|
|
+ message = {
|
|
|
|
|
+ "code": 0,
|
|
|
|
|
+ "msg": msg_send,
|
|
|
|
|
+ "data": None,
|
|
|
|
|
+ "msg_type": msg_type,
|
|
|
|
|
+ "device_status": -1,
|
|
|
|
|
+ }
|
|
|
|
|
+ logger.error(message)
|
|
|
|
|
+ await self.sendMessageSocket(message)
|
|
|
return False, "预览启用失败"
|
|
return False, "预览启用失败"
|
|
|
msg_send = "预览启用成功" if enable_status else "预览关闭成功"
|
|
msg_send = "预览启用成功" if enable_status else "预览关闭成功"
|
|
|
message = {
|
|
message = {
|
|
|
"code": 0,
|
|
"code": 0,
|
|
|
"msg": msg_send,
|
|
"msg": msg_send,
|
|
|
"data": None,
|
|
"data": None,
|
|
|
- "msg_type": self.msg_type,
|
|
|
|
|
|
|
+ "msg_type": msg_type,
|
|
|
"device_status": 2,
|
|
"device_status": 2,
|
|
|
}
|
|
}
|
|
|
|
|
+ logger.error(message)
|
|
|
await self.sendMessageSocket(message)
|
|
await self.sendMessageSocket(message)
|
|
|
return True, "预览启用成功" if enable_status else "预览关闭成功"
|
|
return True, "预览启用成功" if enable_status else "预览关闭成功"
|
|
|
except zmq.Again:
|
|
except zmq.Again:
|
|
@@ -425,9 +441,10 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
"code": 1,
|
|
"code": 1,
|
|
|
"msg": msg_send,
|
|
"msg": msg_send,
|
|
|
"data": None,
|
|
"data": None,
|
|
|
- "msg_type": self.msg_type,
|
|
|
|
|
|
|
+ "msg_type": msg_type,
|
|
|
"device_status": -1,
|
|
"device_status": -1,
|
|
|
}
|
|
}
|
|
|
|
|
+ logger.error(message)
|
|
|
await self.sendMessageSocket(message)
|
|
await self.sendMessageSocket(message)
|
|
|
return False, "相机未连接或软件未打开"
|
|
return False, "相机未连接或软件未打开"
|
|
|
|
|
|
|
@@ -472,17 +489,19 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
await asyncio.sleep(delay)
|
|
await asyncio.sleep(delay)
|
|
|
# 对焦混用
|
|
# 对焦混用
|
|
|
if is_af:
|
|
if is_af:
|
|
|
- await self.EnableCameraPreview(
|
|
|
|
|
- enable_status=True, msg_type=msg_type, CameraKey=CameraKey
|
|
|
|
|
- )
|
|
|
|
|
- start_time = time.time()
|
|
|
|
|
|
|
+ # await self.EnableCameraPreview(
|
|
|
|
|
+ # enable_status=True,
|
|
|
|
|
+ # msg_type="smart_shooter_enable_preview_status",
|
|
|
|
|
+ # CameraKey=CameraKey,
|
|
|
|
|
+ # )
|
|
|
|
|
+ # start_time = time.time()
|
|
|
await self.CameraAutofocus(CameraKey=CameraKey)
|
|
await self.CameraAutofocus(CameraKey=CameraKey)
|
|
|
- end_time = time.time()
|
|
|
|
|
- elapsed_time = end_time - start_time
|
|
|
|
|
- logger.info(f"自动对焦耗时 {elapsed_time:.4f} 秒")
|
|
|
|
|
- await self.EnableCameraPreview(
|
|
|
|
|
- enable_status=False, msg_type=msg_type, CameraKey=CameraKey
|
|
|
|
|
- )
|
|
|
|
|
|
|
+ # end_time = time.time()
|
|
|
|
|
+ # elapsed_time = end_time - start_time
|
|
|
|
|
+ # logger.info(f"自动对焦耗时 {elapsed_time:.4f} 秒")
|
|
|
|
|
+ # await self.EnableCameraPreview(
|
|
|
|
|
+ # enable_status=False, msg_type="smart_shooter_enable_preview_status", CameraKey=CameraKey
|
|
|
|
|
+ # )
|
|
|
self.msg_type = msg_type
|
|
self.msg_type = msg_type
|
|
|
print("camera_states", msg_type)
|
|
print("camera_states", msg_type)
|
|
|
"""
|
|
"""
|