Browse Source

修改摄像头快照接口响应

locky 3 weeks ago
parent
commit
37f322b789
1 changed files with 8 additions and 27 deletions
  1. 8 27
      controller/index.py

+ 8 - 27
controller/index.py

@@ -1004,15 +1004,13 @@ class GetSnapshotView(View):
         return self.validate(request_dict)
 
     def validate(self, request_dict):
-        try:
-            uid = request_dict.get("uid", None)
-            access_token = request_dict.get("access_token", None)
-            correlation_token = request_dict.get('correlation_token', None)
+        uid = request_dict.get("uid", None)
+        access_token = request_dict.get("access_token", None)
 
-            if not all([uid, access_token, correlation_token]):
-                return JsonResponse({'result_code': '444', '错误': '参数错误'})
+        if not all([uid, access_token]):
+            return JsonResponse({'result_code': '444', '错误': '参数错误'})
 
-            # 2. 验证用户和设备
+        try:
             user = UserModel.objects.get(access_token=access_token)
             if not user.uid_rtsp.filter(uid=uid).exists():
                 return JsonResponse({'result_code': '500', '错误': '用户数据不存在'})
@@ -1024,29 +1022,12 @@ class GetSnapshotView(View):
                 args=(uid, region),
                 daemon=True
             ).start()
-
-            # 5. 返回Alexa延迟响应
-            return JsonResponse({
-                "event": {
-                    "header": {
-                        "namespace": "Alexa",
-                        "name": "DeferredResponse",
-                        "messageId": get_uuid(),
-                        "correlationToken": correlation_token,
-                        "payloadVersion": "3"
-                    },
-                    "endpoint": {
-                        "endpointId": uid
-                    },
-                    "payload": {
-                        "estimatedDeferralInSeconds": 7
-                    }
-                }
-            })
+            return JsonResponse({'result_code': '0'})
 
         except Exception as e:
             logger.error(f"Error: {str(e)}")
-            return JsonResponse({'error': 'INTERNAL_ERROR'}, status=500)
+            return JsonResponse({'result_code': '500', 'error_msg': 'error_line:{}, error_msg:{}'.
+                                format(e.__traceback__.tb_lineno, repr(e))})
 
     @staticmethod
     def _send_mqtt_snapshot_command(uid, region):