img list

Controller/DetectController.py

@@ -99,22 +99,21 @@ class DetectControllerView(View):
             devUid = p['devUid']
             eventTime = p['eventTime']
             if p['is_st'] == 1:
-                p['img'] = [img_bucket.sign_url('GET', '{uid}/{channel}/{time}.jpeg'.
-                                                format(uid=devUid, channel=p['Channel'], time=eventTime), 300)]
+                p['img'] = img_bucket.sign_url('GET', '{uid}/{channel}/{time}.jpeg'.
+                                                format(uid=devUid, channel=p['Channel'], time=eventTime), 300)
             elif p['is_st'] == 2:
                 # 列表装载回放时间戳标记
-                pass
-                # vodqs = VodHlsModel.objects.filter(uid=uid, channel=p['Channel'], time=eventTime) \
-                #     .values("bucket__bucket", "bucket__endpoint")
-                # bucket_name = vodqs[0]['bucket__bucket']
-                # endpoint = vodqs[0]['bucket__endpoint']
-                # bucket = oss2.Bucket(auth, endpoint, bucket_name)
-                # ts = '{uid}/vod{channel}/{etime}/ts0.ts'.format(uid=devUid, channel=p['Channel'], etime=eventTime)
-                # thumb0 = bucket.sign_url('GET', ts, 3600, params={'x-oss-process': 'video/snapshot,t_0000,w_700'})
-                # thumb1 = bucket.sign_url('GET', ts, 3600, params={'x-oss-process': 'video/snapshot,t_1000,w_700'})
-                # thumb2 = bucket.sign_url('GET', ts, 3600, params={'x-oss-process': 'video/snapshot,t_2000,w_700'})
-                # thumb3 = bucket.sign_url('GET', ts, 3600, params={'x-oss-process': 'video/snapshot,t_3000,w_700'})
-                # p['img'] = [thumb0, thumb1, thumb2, thumb3]
+                vodqs = VodHlsModel.objects.filter(uid=uid, channel=p['Channel'], time=eventTime) \
+                    .values("bucket__bucket", "bucket__endpoint")
+                bucket_name = vodqs[0]['bucket__bucket']
+                endpoint = vodqs[0]['bucket__endpoint']
+                bucket = oss2.Bucket(auth, endpoint, bucket_name)
+                ts = '{uid}/vod{channel}/{etime}/ts0.ts'.format(uid=devUid, channel=p['Channel'], etime=eventTime)
+                thumb0 = bucket.sign_url('GET', ts, 3600, params={'x-oss-process': 'video/snapshot,t_0000,w_700'})
+                thumb1 = bucket.sign_url('GET', ts, 3600, params={'x-oss-process': 'video/snapshot,t_1000,w_700'})
+                thumb2 = bucket.sign_url('GET', ts, 3600, params={'x-oss-process': 'video/snapshot,t_2000,w_700'})
+                thumb3 = bucket.sign_url('GET', ts, 3600, params={'x-oss-process': 'video/snapshot,t_3000,w_700'})
+                p['gif'] = [thumb0, thumb1, thumb2, thumb3]
             if devUid in uid_type_dict.keys():
                 p['uid_type'] = uid_type_dict[devUid]
             else: