|
|
@@ -324,7 +324,7 @@ class EquipmentManagerV3(View):
|
|
|
'TimeZone', 'TimeStatus', 'SpaceUsable',
|
|
|
'SpaceSum', 'MirrorType', 'RecordType',
|
|
|
'OutdoorModel', 'WIFIName', 'isDetector',
|
|
|
- 'DetectorRank')
|
|
|
+ 'DetectorRank', 'is_human', 'is_custom_voice')
|
|
|
uv_dict = {}
|
|
|
for us in us_qs:
|
|
|
uv_dict[us['uid']] = {
|
|
|
@@ -346,7 +346,9 @@ class EquipmentManagerV3(View):
|
|
|
'OutdoorModel': us['OutdoorModel'],
|
|
|
'WIFIName': us['WIFIName'],
|
|
|
'isDetector': us['isDetector'],
|
|
|
- 'DetectorRank': us['DetectorRank']
|
|
|
+ 'DetectorRank': us['DetectorRank'],
|
|
|
+ 'is_human': us['is_human'],
|
|
|
+ 'is_custom_voice': us['is_custom_voice']
|
|
|
}
|
|
|
# 从uid_channel里面取出通道配置信息
|
|
|
ucs_qs = UidChannelSetModel.objects.filter(uid__id=us['id']).values('channel', 'pir_audio', 'mic_audio',
|
|
|
@@ -412,6 +414,8 @@ class EquipmentManagerV3(View):
|
|
|
p['WIFIName'] = uv_dict[p_uid]['WIFIName']
|
|
|
p['isDetector'] = uv_dict[p_uid]['isDetector']
|
|
|
p['DetectorRank'] = uv_dict[p_uid]['DetectorRank']
|
|
|
+ p['is_human'] = uv_dict[p_uid]['is_human']
|
|
|
+ p['is_custom_voice'] = uv_dict[p_uid]['is_custom_voice']
|
|
|
p['channels'] = uv_dict[p_uid]['channels']
|
|
|
# 设备昵称 调用影子信息昵称，先阶段不可
|
|
|
if uv_dict[p_uid]['nickname']:
|
tanghongbin