|
@@ -3225,9 +3225,11 @@ class alexaUidView(TemplateView):
|
|
|
|
|
|
if sid != 'admin' or sst != 'admin':
|
|
if sid != 'admin' or sst != 'admin':
|
|
return response.json(107)
|
|
return response.json(107)
|
|
- uid_qs = Device_Info.objects.filter(userID_id=userID, isExist=1).values('UID', 'NickName', 'View_Password')
|
|
|
|
|
|
+ uid_qs = Device_Info.objects.filter(userID_id=userID, isExist=1).values('UID', 'NickName', 'View_Password',
|
|
|
|
+ 'userID__region_country')
|
|
if not uid_qs.exists():
|
|
if not uid_qs.exists():
|
|
return response.json(107)
|
|
return response.json(107)
|
|
|
|
+ country_qs = CountryModel.objects.filter(id=uid_qs[0]['userID__region_country']).values('region__continent_code')
|
|
|
|
|
|
try:
|
|
try:
|
|
uid_dict = {}
|
|
uid_dict = {}
|
|
@@ -3248,9 +3250,7 @@ class alexaUidView(TemplateView):
|
|
uid = us['uid']
|
|
uid = us['uid']
|
|
channel = us['channel']
|
|
channel = us['channel']
|
|
# 设备alexa区域
|
|
# 设备alexa区域
|
|
- region_alexa = us['region_alexa']
|
|
|
|
- if region_alexa == '':
|
|
|
|
- region_alexa = 'EN'
|
|
|
|
|
|
+ region_alexa = country_qs[0]['region__continent_code'] if country_qs.exists() else 'EN'
|
|
|
|
|
|
# 多通道设备获取通道名
|
|
# 多通道设备获取通道名
|
|
if channel > 1:
|
|
if channel > 1:
|