|
|
@@ -231,8 +231,8 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
camera_states, _ = await self.GetCameraInfo(is_send=False)
|
|
|
if not camera_states:
|
|
|
return False, "请先连接相机"
|
|
|
+ socket, context = self.__create_req()
|
|
|
try:
|
|
|
- socket, context = self.__create_req()
|
|
|
req = {}
|
|
|
req["msg_type"] = "Request"
|
|
|
req["msg_id"] = "LiveviewFPS"
|
|
|
@@ -256,8 +256,8 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
camera_states, _ = await self.GetCameraInfo(is_send=False)
|
|
|
if not camera_states:
|
|
|
return False, "请先连接相机"
|
|
|
+ socket, context = self.__create_req()
|
|
|
try:
|
|
|
- socket, context = self.__create_req()
|
|
|
req = {}
|
|
|
req["msg_type"] = "Request"
|
|
|
req["msg_id"] = "SetProperty"
|
|
|
@@ -298,7 +298,7 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
if not camera_states:
|
|
|
return False, "请先连接相机"
|
|
|
try:
|
|
|
- low_iso,high_iso = self.getConfigIso()
|
|
|
+ low_iso,high_iso = await self.getConfigIso()
|
|
|
print("LOW_ISO", low_iso)
|
|
|
print("HIGH_ISO", high_iso)
|
|
|
# 等于auto就不设置
|
|
|
@@ -324,11 +324,11 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
if not msg_result:
|
|
|
self.perview_state = False
|
|
|
msg_send = "预览启用失败"
|
|
|
- self.sendSocketMessage(
|
|
|
- code=0,
|
|
|
- msg=msg_send,
|
|
|
- device_status=2,
|
|
|
- )
|
|
|
+ # self.sendSocketMessage(
|
|
|
+ # code=0,
|
|
|
+ # msg=msg_send,
|
|
|
+ # device_status=2,
|
|
|
+ # )
|
|
|
return False, "预览启用失败"
|
|
|
msg_send = "预览启用成功" if enable_status else "预览关闭成功"
|
|
|
message = {
|
|
|
@@ -365,8 +365,8 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
print("CameraAutofocus 执行对焦")
|
|
|
if not camera_states:
|
|
|
return False, "请先连接相机"
|
|
|
+ socket, context = self.__create_req()
|
|
|
try:
|
|
|
- socket, context = self.__create_req()
|
|
|
req = {}
|
|
|
req["msg_type"] = "Request"
|
|
|
req["msg_id"] = "Autofocus"
|
|
|
@@ -411,15 +411,15 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
print("camera_states CameraShooter", camera_states)
|
|
|
if not camera_states:
|
|
|
return False, "请先连接相机"
|
|
|
+ socket, context = self.__create_req()
|
|
|
try:
|
|
|
- low_iso,high_iso = self.getConfigIso()
|
|
|
+ low_iso,high_iso = await self.getConfigIso()
|
|
|
print("LOW_ISO", low_iso)
|
|
|
print("HIGH_ISO", high_iso)
|
|
|
if str(low_iso).lower() != "auto":
|
|
|
await self.setCameraProperty(property="ISO", value=str(low_iso))
|
|
|
else:
|
|
|
print("low_iso 等于auto就不设置")
|
|
|
- socket, context = self.__create_req()
|
|
|
req = {}
|
|
|
req["msg_type"] = "Request"
|
|
|
req["msg_id"] = "Shoot"
|
rambo