Merge branch 'dev' into test

Controller/DetectControllerV2.py

@@ -392,7 +392,7 @@ class DetectControllerViewV2(View):
                                                                      Params={'Bucket': 'foreignpush', 'Key': ts},
                                                                      ExpiresIn=3600)
                         p['img_list'] = [thumb]
-            elif p['is_st'] == 3:
+            elif p['is_st'] == 3 or p['is_st'] == 4:
                 # 列表装载回放时间戳标记
                 p['img_list'] = []
                 for i in range(p['is_st']):