增加双目设备类型

Ansjer/config.py

@@ -458,6 +458,8 @@ APP_TYPE = {
 }
 
 ALGORITHM_COMBO_TYPES = [51, 57, 58, 60, 59, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70]
+# 双目设备类型
+BINOCULAR_DEVICE_TYPE = [34, 37, 43]
 
 # 联通Unicom config
 # 应用地址，请向开发人员索取

Controller/CloudStorage.py

@@ -21,7 +21,7 @@ from django.http import JsonResponse, HttpResponseRedirect, HttpResponse
 from django.views.generic.base import View
 
 from Ansjer.config import SERVER_DOMAIN, PAYPAL_CRD, SERVER_DOMAIN_SSL, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, \
-    AWS_ARN, OAUTH_ACCESS_TOKEN_SECRET, DETECT_PUSH_DOMAINS, CONFIG_INFO, CONFIG_CN
+    AWS_ARN, OAUTH_ACCESS_TOKEN_SECRET, DETECT_PUSH_DOMAINS, CONFIG_INFO, CONFIG_CN, BINOCULAR_DEVICE_TYPE
 from Controller.CheckUserData import DataValid
 from Controller.CloudPhoto.CloudServiceController import CloudServiceController
 from Controller.PaymentCycle import Paypal
@@ -490,7 +490,7 @@ class CloudStorageView(View):
         if device_info_qs[0]['vodPrimaryUserID'] != user_id:
             return response.json(10034)
         now_time = int(time.time())
-        if device_type in [34, 37]:  # 枪球设备开通云存不区分通道
+        if device_type in BINOCULAR_DEVICE_TYPE:  # 枪球设备开通云存不区分通道
             uid_bucket_qs = UID_Bucket.objects.filter(uid=uid, endTime__gte=now_time)
         else:
             uid_bucket_qs = UID_Bucket.objects.filter(uid=uid, endTime__gte=now_time, channel=channel)
@@ -511,7 +511,7 @@ class CloudStorageView(View):
             else:
                 type_list = [int(event_types)]
         split_vod_hls_obj = SplitVodHlsObject()
-        if device_type in [34, 37]:
+        if device_type in BINOCULAR_DEVICE_TYPE:
             vod_hls_qs = split_vod_hls_obj.get_vod_hls_data(uid=uid,
                                                             end_time__gte=now_time,
                                                             start_time__range=(start_time, end_time),
@@ -694,7 +694,7 @@ class CloudStorageView(View):
         if not device_info_qs.exists() or device_info_qs[0]['vodPrimaryUserID'] != user_id:
             return response.json(12)
         device_type = device_info_qs[0]['Type']
-        if device_type in [34, 37]:  # 枪球设备开通云存不区分通道
+        if device_type in BINOCULAR_DEVICE_TYPE:  # 枪球设备开通云存不区分通道
             uid_bucket_qs = UID_Bucket.objects.filter(uid=uid)
         else:
             uid_bucket_qs = UID_Bucket.objects.filter(channel=channel, uid=uid)
@@ -1796,7 +1796,7 @@ class CloudStorageView(View):
             return response.json(10034)
         now_time = int(time.time())
         device_type = device_info_qs[0]['Type']
-        if device_type in [34, 37]:  # 枪球设备开通云存不区分通道
+        if device_type in BINOCULAR_DEVICE_TYPE:  # 枪球设备开通云存不区分通道
             uid_bucket_qs = UID_Bucket.objects.filter(uid=uid, endTime__gte=now_time).values(
                 'bucket_id').order_by(
                 'addTime')
@@ -1811,7 +1811,7 @@ class CloudStorageView(View):
         #     'date').filter(uid=uid, endTime__gte=now_time, channel=channel).annotate(count=Count('time')).order_by(
         #     '-date')[:31]
         split_vod_hls_obj = SplitVodHlsObject()
-        if device_type in [34, 37]:  # 枪球设备开通云存不区分通道
+        if device_type in BINOCULAR_DEVICE_TYPE:  # 枪球设备开通云存不区分通道
             vod_hls_qs = split_vod_hls_obj.get_vod_hls_date(uid=uid, end_time__gte=now_time)
         else:
             vod_hls_qs = split_vod_hls_obj.get_vod_hls_date(uid=uid, end_time__gte=now_time, channel=channel)