添加设备确定alexa地区

Controller/EquipmentManagerV3.py

@@ -9,6 +9,7 @@ from Controller.CheckUserData import RandomStr
 import oss2, base64
 from django.db.models import Q
 from django.views.generic.base import View
+from Controller.DeviceConfirmRegion import Device_Region
 from Object.RedisObject import RedisObject
 from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY, BASE_DIR
 from Model.models import Device_Info, UID_Bucket, UID_Preview, UidSetModel, UidPushModel, UidChannelSetModel, \
@@ -162,6 +163,10 @@ class EquipmentManagerV3(View):
                 us_qs.update(nickname=NickName)
                 UidSet_id = us_qs.first().id
             else:
+                ip = CommonService.get_ip_address(request)
+                region_id = Device_Region().get_device_region(ip)
+                if region_id == 1:
+                    region_alexa = 'CN'
                 uid_set_create_dict = {
                     'uid': UID,
                     'addTime': nowTime,
@@ -170,6 +175,7 @@ class EquipmentManagerV3(View):
                     'channel': ChannelIndex,
                     'nickname': NickName,
                     'version': version,
+                    'region_alexa': region_alexa,
                 }
                 UidSet = UidSetModel.objects.create(**uid_set_create_dict)
                 UidSet_id = UidSet.id
@@ -727,7 +733,8 @@ class EquipmentManagerV3(View):
         dvq = dvq.filter(~Q(vodPrimaryUserID='')).values('vodPrimaryUserID')
         qs = {}
         if dvq.exists():
-            qs = Device_User.objects.filter(userID=dvq[0]['vodPrimaryUserID']).values('userID', 'NickName', 'username', 'userEmail', 'phone')
+            qs = Device_User.objects.filter(userID=dvq[0]['vodPrimaryUserID']).values('userID', 'NickName', 'username',
+                                                                                      'userEmail', 'phone')
             NickName = qs[0]['username']
             userEmail = qs[0]['userEmail']
             phone = qs[0]['phone']