修改device_info和uid_set表，添加ios端需要的字段

Controller/EquipmentManagerV3.py

@@ -167,6 +167,7 @@ class EquipmentManagerV3(View):
                 redisObj = RedisObject(db=8)
                 redisObj.del_data(key='uid_qs_' + userID)
             return response.json(0, res)
+
     # 新查询设备字段
     def do_query(self, userID, request_dict, response):
         token = request_dict.get('token', None)
@@ -193,7 +194,9 @@ class EquipmentManagerV3(View):
                            'View_Password', 'ChannelIndex', 'Type', 'isShare',
                            'primaryUserID', 'primaryMaster', 'data_joined',
                            'version',
-                           'isVod', 'isExist', 'NotificationMode')
+                           'isVod', 'isExist', 'NotificationMode', 'OutdoorModel',
+                           'WIFIName', 'isDetector', 'DetectorRank', 'MirrorType',
+                           'RecordType', 'TimeZone', 'SpaceUsable', 'SpaceSum')
                 dvls = CommonService.qs_to_list(dvql)
                 uid_list = []
                 for dvl in dvls:
@@ -206,10 +209,26 @@ class EquipmentManagerV3(View):
                 nowTime = int(time.time())
                 data = []
                 # 设备拓展信息表
-                us_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid', 'version', 'nickname','ucode')
+                us_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid', 'version', 'nickname', 'ucode', 'detect_status', 'detect_group', 'detect_interval', 'region_alexa', 'is_alexa', 'light_alarm_type',
+                   'light_alarm_level', 'light_alarm_man_en', 'light_alarm_vol', 'light_long_light', 'light_night_model')
                 uv_dict = {}
                 for us in us_qs:
-                    uv_dict[us['uid']] = {'version': us['version'], 'nickname': us['nickname'],'ucode':us['ucode']}
+                    uv_dict[us['uid']] = {
+                        'version': us['version'],
+                        'nickname': us['nickname'],
+                        'ucode': us['ucode'],
+                        'detect_interval': us['detect_interval'],
+                        'detect_group': us['detect_group'],
+                        'detect_status': us['detect_status'],
+                        'region_alexa': us['region_alexa'],
+                        'is_alexa': us['is_alexa'],
+                        'light_alarm_type': us['light_alarm_type'],
+                        'light_alarm_level': us['light_alarm_level'],
+                        'light_alarm_man_en': us['light_alarm_man_en'],
+                        'light_alarm_vol': us['light_alarm_vol'],
+                        'light_long_light': us['light_long_light'],
+                        'light_night_model': us['light_night_model']
+                    }
                 for p in dvls:
                     p['vod'] = []
                     for dm in ubqs:
@@ -227,6 +246,17 @@ class EquipmentManagerV3(View):
                         # 设备版本号
                         p['uid_version'] = uv_dict[p_uid]['version']
                         p['ucode'] = uv_dict[p_uid]['ucode']
+                        p['detect_interval'] = uv_dict[p_uid]['detect_interval']
+                        p['detect_status'] = uv_dict[p_uid]['detect_status']
+                        p['detect_group'] = uv_dict[p_uid]['detect_group']
+                        p['region_alexa'] = uv_dict[p_uid]['region_alexa']
+                        p['is_alexa'] = uv_dict[p_uid]['is_alexa']
+                        p['light_alarm_type'] = uv_dict[p_uid]['light_alarm_type']
+                        p['light_alarm_level'] = uv_dict[p_uid]['light_alarm_level']
+                        p['light_alarm_man_en'] = uv_dict[p_uid]['light_alarm_man_en']
+                        p['light_alarm_vol'] = uv_dict[p_uid]['light_alarm_vol']
+                        p['light_long_light'] = uv_dict[p_uid]['light_long_light']
+                        p['light_night_model'] = uv_dict[p_uid]['light_night_model']
                         # 设备昵称 调用影子信息昵称，先阶段不可
                         if uv_dict[p_uid]['nickname']:
                             p['NickName'] = uv_dict[p_uid]['nickname']
@@ -282,7 +312,6 @@ class EquipmentManagerV3(View):
         else:
             return response.json(tko.code)
 
-
     # 加密
     def encrypt_pwd(self,userPwd):
         for i in range(1, 4):

Model/models.py

@@ -240,6 +240,7 @@ class Device_Info(models.Model):
     iSNotification = models.BooleanField(blank=True, verbose_name=u'报警通知 0:关闭,1:开启)', default=False)
     MirrorType = models.IntegerField(blank=True, default=0, verbose_name=u'镜像类型 0:关闭镜像,1：上下镜像，2:左右镜像，3：上下左右镜像')
     RecordType = models.IntegerField(blank=True, default=0, verbose_name=u'录像模式(0:关闭,1:全是录像,3:报警录像)')
+    OutdoorModel = models.IntegerField(blank=True, default=0, verbose_name=u'室外模式 0：关闭，1：开启')
     TimeZone = models.CharField(blank=True, max_length=50, default='', verbose_name=u'时区')
     isVod = models.SmallIntegerField(blank=True, default=0, verbose_name='是否支持云存')  # 是否支持云存设备
     isExist = models.SmallIntegerField(blank=True, default=1, verbose_name='是否被删除')  # 是否被删除了(需主用户交互) 1存在，0不存在，2设备被重置
@@ -680,6 +681,13 @@ class UidSetModel(models.Model):
     pwd = models.CharField(max_length=32, default='', verbose_name=u'设备密码') # 暂时是预留字段
     resetTime = models.IntegerField(default=0, verbose_name='设备重置时间')
     region_alexa = models.CharField(max_length=8, verbose_name='设备alexa区域', default='ALL')  # ALL CN EU US
+    light_night_model = models.IntegerField(default='0', verbose_name='夜视模式')  # 0：全彩模式，1：黑白模式，2：智能夜视模式
+    light_alarm_type = models.IntegerField(default=0, verbose_name='警报人形类型')  # 0为人形，1为移动，3是人形和移动侦测0x0f
+    light_alarm_level = models.IntegerField(default=0,
+                                            verbose_name='声光报警级别')  # 0: 关闭，1：强烈声光告警，2：轻微声光告警，3: 强烈声告警，4:轻微声告警，5:强烈光告警
+    light_alarm_man_en = models.IntegerField(default=0, verbose_name='人为告警状态')  # 0：关，1：开
+    light_alarm_vol = models.IntegerField(default=0, verbose_name='报警音量')  # 音量值0-100
+    light_long_light = models.IntegerField(default=0, verbose_name='长亮')
 
     class Meta:
         db_table = 'uid_set'