|
@@ -101,12 +101,15 @@ class DetectControllerView(View):
|
|
if p['is_st'] == 1:
|
|
if p['is_st'] == 1:
|
|
p['img'] = img_bucket.sign_url('GET', '{uid}/{channel}/{time}.jpeg'.
|
|
p['img'] = img_bucket.sign_url('GET', '{uid}/{channel}/{time}.jpeg'.
|
|
format(uid=devUid, channel=p['Channel'], time=eventTime), 300)
|
|
format(uid=devUid, channel=p['Channel'], time=eventTime), 300)
|
|
- p['img_list'] = img_bucket.sign_url('GET', '{uid}/{channel}/{time}.jpeg'.
|
|
|
|
- format(uid=devUid, channel=p['Channel'], time=eventTime), 300)
|
|
|
|
|
|
+ p['img_list'] = [img_bucket.sign_url('GET', '{uid}/{channel}/{time}.jpeg'.
|
|
|
|
+ format(uid=devUid, channel=p['Channel'], time=eventTime), 300)]
|
|
elif p['is_st'] == 2:
|
|
elif p['is_st'] == 2:
|
|
# 列表装载回放时间戳标记
|
|
# 列表装载回放时间戳标记
|
|
vodqs = VodHlsModel.objects.filter(uid=uid, channel=p['Channel'], time=eventTime) \
|
|
vodqs = VodHlsModel.objects.filter(uid=uid, channel=p['Channel'], time=eventTime) \
|
|
.values("bucket__bucket", "bucket__endpoint")
|
|
.values("bucket__bucket", "bucket__endpoint")
|
|
|
|
+ print('xxxxxx')
|
|
|
|
+ print(vodqs)
|
|
|
|
+ print('xxxxxx')
|
|
if vodqs.exists():
|
|
if vodqs.exists():
|
|
bucket_name = vodqs[0]['bucket__bucket']
|
|
bucket_name = vodqs[0]['bucket__bucket']
|
|
endpoint = vodqs[0]['bucket__endpoint']
|
|
endpoint = vodqs[0]['bucket__endpoint']
|