|
|
@@ -178,8 +178,8 @@ class VoicePromptView(View):
|
|
|
'voice_end_x', 'voice_end_y', 'voice_start_time', 'voice_end_time',
|
|
|
'voice_repeat_day', 'voice_direction')
|
|
|
print(channel_qs)
|
|
|
- res['enter_voice'] = channel_qs[0]['voice_prompt_enter']
|
|
|
- res['leave_voice'] = channel_qs[0]['voice_prompt_leave']
|
|
|
+ res['enter_voice'] = int(channel_qs[0]['voice_prompt_enter'])
|
|
|
+ res['leave_voice'] = int(channel_qs[0]['voice_prompt_leave'])
|
|
|
res['voice_status'] = channel_qs[0]['voice_prompt_status']
|
|
|
res['voice_mute'] = channel_qs[0]['voice_prompt_intelligent_mute']
|
|
|
res['start_x'] = channel_qs[0]['voice_start_x']
|
|
|
@@ -236,6 +236,11 @@ class VoicePromptView(View):
|
|
|
if res['leave_voice'] == voice['id']:
|
|
|
res['leave_voice'] = voice
|
|
|
|
|
|
+ if res['leave_voice'] == 0:
|
|
|
+ res['leave_voice'] = ''
|
|
|
+ if res['enter_voice'] == 0:
|
|
|
+ res['enter_voice'] = ''
|
|
|
+
|
|
|
res['system']['enter'] = enter_systems
|
|
|
res['system']['leave'] = leave_systems
|
|
|
res['custom']['enter'] = enter_customs
|
tanghongbin