|
|
@@ -491,7 +491,7 @@ class CloudStorageView(View):
|
|
|
if device_info_qs[0]['vodPrimaryUserID'] != user_id:
|
|
|
return response.json(10034)
|
|
|
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)
|
|
|
else:
|
|
|
uid_bucket_qs = UID_Bucket.objects.filter(uid=uid, endTime__gte=now_time, channel=channel)
|
|
|
@@ -512,7 +512,7 @@ class CloudStorageView(View):
|
|
|
else:
|
|
|
type_list = [int(event_types)]
|
|
|
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,
|
|
|
end_time__gte=now_time,
|
|
|
start_time__range=(start_time, end_time),
|
|
|
@@ -695,7 +695,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 == 34: # 枪球设备开通云存不区分通道
|
|
|
+ if device_type in [34, 37]: # 枪球设备开通云存不区分通道
|
|
|
uid_bucket_qs = UID_Bucket.objects.filter(uid=uid)
|
|
|
else:
|
|
|
uid_bucket_qs = UID_Bucket.objects.filter(channel=channel, uid=uid)
|
|
|
@@ -756,7 +756,7 @@ class CloudStorageView(View):
|
|
|
uid_set_qs = UidSetModel.objects.filter(uid=uid)
|
|
|
if not uid_set_qs.exists():
|
|
|
return response.json(12)
|
|
|
- if device_type == 34: # 枪球设备开通云存不区分通道
|
|
|
+ if device_type in [34, 37]: # 枪球设备开通云存不区分通道
|
|
|
uid_bucket_qs = UID_Bucket.objects.filter(uid=uid)
|
|
|
else:
|
|
|
uid_bucket_qs = UID_Bucket.objects.filter(channel=channel, uid=uid)
|
