Merge branch 'dev' into test

Controller/AiController.py

@@ -1085,7 +1085,7 @@ class AiView(View):
             elif p['is_st'] == 3:
                 # 列表装载回放时间戳标记
                 p['img_list'] = []
-                for i in range(p['is_st']):
+                for i in range(4):
                     thumbspng = '{uid}/{channel}/{time}_{st}.jpg'.format(uid=devUid, channel=p['Channel'], time=eventTime, st=i)
                     response_url = aws_s3_client.generate_presigned_url('get_object',
                                                                              ExpiresIn=300,