Эх сурвалжийг харах

支持37双通道设备类型

peng 1 жил өмнө
parent
commit
475e6efe18

+ 3 - 3
Controller/CloudStorage.py

@@ -483,7 +483,7 @@ class CloudStorageView(View):
         if device_info_qs[0]['vodPrimaryUserID'] != user_id:
         if device_info_qs[0]['vodPrimaryUserID'] != user_id:
             return response.json(10034)
             return response.json(10034)
         now_time = int(time.time())
         now_time = int(time.time())
-        if device_type == 34:  # 枪球设备开通云存不区分通道
+        if device_type in [34, 37]:  # 枪球设备开通云存不区分通道
             uid_bucket_qs = UID_Bucket.objects.filter(uid=uid, endTime__gte=now_time)
             uid_bucket_qs = UID_Bucket.objects.filter(uid=uid, endTime__gte=now_time)
         else:
         else:
             uid_bucket_qs = UID_Bucket.objects.filter(uid=uid, endTime__gte=now_time, channel=channel)
             uid_bucket_qs = UID_Bucket.objects.filter(uid=uid, endTime__gte=now_time, channel=channel)
@@ -504,7 +504,7 @@ class CloudStorageView(View):
             else:
             else:
                 type_list = [int(event_types)]
                 type_list = [int(event_types)]
         split_vod_hls_obj = SplitVodHlsObject()
         split_vod_hls_obj = SplitVodHlsObject()
-        if device_type == 34:
+        if device_type in [34, 37]:
             vod_hls_qs = split_vod_hls_obj.get_vod_hls_data(uid=uid,
             vod_hls_qs = split_vod_hls_obj.get_vod_hls_data(uid=uid,
                                                             end_time__gte=now_time,
                                                             end_time__gte=now_time,
                                                             start_time__range=(start_time, end_time),
                                                             start_time__range=(start_time, end_time),
@@ -687,7 +687,7 @@ class CloudStorageView(View):
         if not device_info_qs.exists() or device_info_qs[0]['vodPrimaryUserID'] != user_id:
         if not device_info_qs.exists() or device_info_qs[0]['vodPrimaryUserID'] != user_id:
             return response.json(12)
             return response.json(12)
         device_type = device_info_qs[0]['Type']
         device_type = device_info_qs[0]['Type']
-        if device_type == 34:  # 枪球设备开通云存不区分通道
+        if device_type in [34, 37]:  # 枪球设备开通云存不区分通道
             uid_bucket_qs = UID_Bucket.objects.filter(uid=uid)
             uid_bucket_qs = UID_Bucket.objects.filter(uid=uid)
         else:
         else:
             uid_bucket_qs = UID_Bucket.objects.filter(channel=channel, uid=uid)
             uid_bucket_qs = UID_Bucket.objects.filter(channel=channel, uid=uid)