|
@@ -125,7 +125,7 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
|
|
|
|
|
async def GetCameraInfo(self, is_send=True, msg_type="", CameraKey=None):
|
|
async def GetCameraInfo(self, is_send=True, msg_type="", CameraKey=None):
|
|
|
await asyncio.sleep(0.001)
|
|
await asyncio.sleep(0.001)
|
|
|
- self.msg_type = msg_type
|
|
|
|
|
|
|
+ # self.msg_type = msg_type
|
|
|
"""
|
|
"""
|
|
|
实时获取相机信息,是否连接、软件是否被打开
|
|
实时获取相机信息,是否连接、软件是否被打开
|
|
|
"""
|
|
"""
|
|
@@ -143,13 +143,14 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
msg_result = json_msg.get("msg_result")
|
|
msg_result = json_msg.get("msg_result")
|
|
|
if not msg_result:
|
|
if not msg_result:
|
|
|
self.connect_status = False
|
|
self.connect_status = False
|
|
|
- msg_send = "相机未连接或软件未打开"
|
|
|
|
|
|
|
+ msg_send = f"请检查{CameraKey},相机是否连接" if CameraKey else f"请检查相机是否连接"
|
|
|
if is_send:
|
|
if is_send:
|
|
|
message = {
|
|
message = {
|
|
|
"code": 1,
|
|
"code": 1,
|
|
|
"msg": msg_send,
|
|
"msg": msg_send,
|
|
|
"data": msg_result,
|
|
"data": msg_result,
|
|
|
- "msg_type": self.msg_type,
|
|
|
|
|
|
|
+ "CameraKey":CameraKey,
|
|
|
|
|
+ "msg_type": msg_type,
|
|
|
"device_status": -1,
|
|
"device_status": -1,
|
|
|
}
|
|
}
|
|
|
await self.sendMessageSocket(message)
|
|
await self.sendMessageSocket(message)
|
|
@@ -157,13 +158,17 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
cameraInfo = json_msg.get("CameraInfo")
|
|
cameraInfo = json_msg.get("CameraInfo")
|
|
|
if cameraInfo == None or len(cameraInfo) == 0:
|
|
if cameraInfo == None or len(cameraInfo) == 0:
|
|
|
self.connect_status = False
|
|
self.connect_status = False
|
|
|
- msg_send = "相机未连接"
|
|
|
|
|
|
|
+ msg_send = (
|
|
|
|
|
+ f"请检查{CameraKey},相机是否连接"
|
|
|
|
|
+ if CameraKey
|
|
|
|
|
+ else f"请检查相机是否连接"
|
|
|
|
|
+ )
|
|
|
if is_send:
|
|
if is_send:
|
|
|
message = {
|
|
message = {
|
|
|
"code": 1,
|
|
"code": 1,
|
|
|
"msg": msg_send,
|
|
"msg": msg_send,
|
|
|
"data": msg_result,
|
|
"data": msg_result,
|
|
|
- "msg_type": self.msg_type,
|
|
|
|
|
|
|
+ "msg_type": msg_type,
|
|
|
"device_status": -1,
|
|
"device_status": -1,
|
|
|
}
|
|
}
|
|
|
await self.sendMessageSocket(message)
|
|
await self.sendMessageSocket(message)
|
|
@@ -183,19 +188,24 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
]
|
|
]
|
|
|
if not CameraStatus:
|
|
if not CameraStatus:
|
|
|
self.connect_status = False
|
|
self.connect_status = False
|
|
|
- msg_send = "相机未连接"
|
|
|
|
|
|
|
+ msg_send = (
|
|
|
|
|
+ f"请检查{CameraKey},相机是否连接"
|
|
|
|
|
+ if CameraKey
|
|
|
|
|
+ else f"请检查相机是否连接"
|
|
|
|
|
+ )
|
|
|
if is_send:
|
|
if is_send:
|
|
|
message = {
|
|
message = {
|
|
|
"code": 1,
|
|
"code": 1,
|
|
|
"msg": msg_send,
|
|
"msg": msg_send,
|
|
|
"data": msg_result,
|
|
"data": msg_result,
|
|
|
- "msg_type": self.msg_type,
|
|
|
|
|
|
|
+ "CameraKey":CameraKey,
|
|
|
|
|
+ "msg_type": msg_type,
|
|
|
"device_status": -1,
|
|
"device_status": -1,
|
|
|
}
|
|
}
|
|
|
await self.sendMessageSocket(message)
|
|
await self.sendMessageSocket(message)
|
|
|
return False, msg_send
|
|
return False, msg_send
|
|
|
self.connect_status = True
|
|
self.connect_status = True
|
|
|
- msg_send = "相机已连接"
|
|
|
|
|
|
|
+ msg_send = f"相机{CameraKey}已连接"
|
|
|
# print("CameraLists", CameraLists)
|
|
# print("CameraLists", CameraLists)
|
|
|
if is_send:
|
|
if is_send:
|
|
|
message = {
|
|
message = {
|
|
@@ -203,7 +213,7 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
"msg": msg_send,
|
|
"msg": msg_send,
|
|
|
"data": msg_result,
|
|
"data": msg_result,
|
|
|
"CameraLists":CameraLists,
|
|
"CameraLists":CameraLists,
|
|
|
- "msg_type": self.msg_type,
|
|
|
|
|
|
|
+ "msg_type": msg_type,
|
|
|
"device_status": 2,
|
|
"device_status": 2,
|
|
|
}
|
|
}
|
|
|
await self.sendMessageSocket(message)
|
|
await self.sendMessageSocket(message)
|
|
@@ -212,13 +222,14 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
return True, "相机已连接"
|
|
return True, "相机已连接"
|
|
|
except zmq.Again:
|
|
except zmq.Again:
|
|
|
print("获取相机信息超时,继续监听...")
|
|
print("获取相机信息超时,继续监听...")
|
|
|
- msg_send = "相机未连接或软件未打开"
|
|
|
|
|
|
|
+ msg_send = f"请检查{CameraKey},相机是否连接" if CameraKey else f"请检查相机是否连接"
|
|
|
if is_send:
|
|
if is_send:
|
|
|
message = {
|
|
message = {
|
|
|
"code": 1,
|
|
"code": 1,
|
|
|
"msg": msg_send,
|
|
"msg": msg_send,
|
|
|
"data": None,
|
|
"data": None,
|
|
|
- "msg_type": self.msg_type,
|
|
|
|
|
|
|
+ "CameraKey":CameraKey,
|
|
|
|
|
+ "msg_type": msg_type,
|
|
|
"device_status": 2,
|
|
"device_status": 2,
|
|
|
}
|
|
}
|
|
|
await self.sendMessageSocket(message)
|
|
await self.sendMessageSocket(message)
|
|
@@ -228,13 +239,17 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
self.connect_status = False
|
|
self.connect_status = False
|
|
|
socket.close()
|
|
socket.close()
|
|
|
context.term()
|
|
context.term()
|
|
|
- msg_send = "相机未连接或软件未打开"
|
|
|
|
|
|
|
+ msg_send = (
|
|
|
|
|
+ f"请检查{CameraKey},相机是否连接"
|
|
|
|
|
+ if CameraKey
|
|
|
|
|
+ else f"请检查相机是否连接"
|
|
|
|
|
+ )
|
|
|
if is_send:
|
|
if is_send:
|
|
|
message = {
|
|
message = {
|
|
|
"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,
|
|
|
}
|
|
}
|
|
|
await self.sendMessageSocket(message)
|
|
await self.sendMessageSocket(message)
|