|
@@ -366,13 +366,18 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
None,
|
|
None,
|
|
|
)
|
|
)
|
|
|
temp_A_point = camera_configs.get("A", None)
|
|
temp_A_point = camera_configs.get("A", None)
|
|
|
- points = {"A": {}, "B": {}, "C": {}}
|
|
|
|
|
if temp_A_point is not None:
|
|
if temp_A_point is not None:
|
|
|
print("已配置无需更新")
|
|
print("已配置无需更新")
|
|
|
|
|
+ itemSettings = CameraLists[0]
|
|
|
|
|
+ OldCameraKey = temp_A_point.get("CameraKey", None)
|
|
|
|
|
+ if OldCameraKey == itemSettings.get("CameraKey", None):
|
|
|
|
|
+ print("相机无变动。无需自动更改配置")
|
|
|
|
|
+ return None
|
|
|
basic_iso = temp_A_point.get("iso", {"low": 100, "high": 6400})
|
|
basic_iso = temp_A_point.get("iso", {"low": 100, "high": 6400})
|
|
|
if isMultCameraMode == False:
|
|
if isMultCameraMode == False:
|
|
|
|
|
+ points = {"A": {}}
|
|
|
|
|
+ print("相机发生变动。需要更改配置")
|
|
|
# 如果客户是单相机版本用户,需要每次同步camera信息
|
|
# 如果客户是单相机版本用户,需要每次同步camera信息
|
|
|
- itemSettings = CameraLists[0]
|
|
|
|
|
points["A"] = {
|
|
points["A"] = {
|
|
|
**itemSettings,
|
|
**itemSettings,
|
|
|
"iso": basic_iso,
|
|
"iso": basic_iso,
|
|
@@ -384,6 +389,7 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
# 同步本地到线上
|
|
# 同步本地到线上
|
|
|
settings.sync_sys_configs2Online()
|
|
settings.sync_sys_configs2Online()
|
|
|
return None
|
|
return None
|
|
|
|
|
+ points = {"A": {}, "B": {}, "C": {}}
|
|
|
for idx,item in enumerate(points):
|
|
for idx,item in enumerate(points):
|
|
|
low_iso = camera_configs.get("low", 100)
|
|
low_iso = camera_configs.get("low", 100)
|
|
|
high_iso = camera_configs.get("high", 6400)
|
|
high_iso = camera_configs.get("high", 6400)
|