Merge branch 'Bin_Local_User' into dev

# Conflicts:
#	Controller/UidSetController.py

Controller/UidSetController.py

@@ -436,6 +436,7 @@ class UidSetView(View):
                 return response.json(444, 'channel')
             try:
                 ucs = {}
+                info = ''
                 if enter_voice:
                     ucs['voice_prompt_enter'] = enter_voice
 
@@ -449,15 +450,19 @@ class UidSetView(View):
                     ucs['voice_prompt_intelligent_mute'] = intelligent_mute
 
                 if start_x:
+                    info = info + 'start_x=' + str(start_x) + ' '
                     ucs['voice_start_x'] = start_x
 
                 if start_y:
+                    info = info + 'start_x=' + str(start_x) + ' '
                     ucs['voice_start_y'] = start_y
 
                 if end_x:
+                    info = info + 'start_x=' + str(start_x) + ' '
                     ucs['voice_end_x'] = end_x
 
                 if end_y:
+                    info = info + 'start_x=' + str(start_x) + ' '
                     ucs['voice_end_y'] = end_y
 
                 if start_time:
@@ -472,6 +477,7 @@ class UidSetView(View):
                 if direction:
                     ucs['voice_direction'] = direction
 
+                ModelService.add_ip_log('', info)
                 uid_channel_set_qs = UidChannelSetModel.objects.filter(uid__uid=uid, channel=channel)
                 if not uid_channel_set_qs.exists():
                     uidObject = UidSetModel.objects.filter(uid=uid)