|
|
@@ -20,6 +20,7 @@ from django.shortcuts import render_to_response
|
|
|
from django.http import JsonResponse
|
|
|
from object.ResObject import ResObject
|
|
|
import subprocess
|
|
|
+import uuid
|
|
|
# from gevent.pool import Pool
|
|
|
from model.models import UserModel,UidRtspModel
|
|
|
from object.tkObject import tkObject
|
|
|
@@ -307,7 +308,7 @@ class oa2RtspStartView(TemplateView):
|
|
|
'protocols': ['RTSP'],
|
|
|
'authorizationTypes': ['NONE'],
|
|
|
'uri': rtsp_uri,
|
|
|
- 'msg': send_flag,
|
|
|
+ # 'msg': send_flag,
|
|
|
'uid':UID,
|
|
|
'pwd':PWD,
|
|
|
'msg':MSG
|
|
|
@@ -396,6 +397,63 @@ class oa2DiscoveryDevice(TemplateView):
|
|
|
# 增加对code和client_id的校验代码，返回access_token和refresh_token
|
|
|
access_token = request_dict.get("access_token", None)
|
|
|
region = request_dict.get("region", 'cn')
|
|
|
+ logger = logging.getLogger('django')
|
|
|
+
|
|
|
+ api_uri = 'http://api.amazonalexa.com/v3/events'
|
|
|
+ requests_data = {
|
|
|
+ "event": {
|
|
|
+ "header": {
|
|
|
+ "namespace": "Alexa.Discovery",
|
|
|
+ "name": "AddOrUpdateReport",
|
|
|
+ "payloadVersion": "3",
|
|
|
+ "messageId": str(uuid.uuid4()),
|
|
|
+ },
|
|
|
+ "payload": {
|
|
|
+ "endpoints": {
|
|
|
+ "endpointId": 'HVTLKFJM6KDTAF9J111A',
|
|
|
+ "manufacturerName": 'Zosi smart',
|
|
|
+ "modelName": 'P1425-LE',
|
|
|
+ "friendlyName": 'Camera one',
|
|
|
+ "description": 'Camera one',
|
|
|
+ "displayCategories": ['CAMERA'],
|
|
|
+ "cookie": {},
|
|
|
+ "capabilities": [
|
|
|
+ {
|
|
|
+ "type": 'AlexaInterface',
|
|
|
+ "interface": 'Alexa.CameraStreamController',
|
|
|
+ "version": '3',
|
|
|
+ "cameraStreamConfigurations": [
|
|
|
+ {
|
|
|
+ "protocols": ['RTSP'],
|
|
|
+ "resolutions": [{'width': 1280, 'height': 720}],
|
|
|
+ "authorizationTypes": ['NONE'],
|
|
|
+ "videoCodecs": ['H264'],
|
|
|
+ "audioCodecs": ['ACC']
|
|
|
+ }]
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "type": 'AlexaInterface',
|
|
|
+ "interface": 'Alexa.MediaMetadata',
|
|
|
+ "version": '3',
|
|
|
+ "proactivelyReported": True,
|
|
|
+ # "retrievable": True
|
|
|
+
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ },
|
|
|
+ "scope": {
|
|
|
+ "type": "BearerToken",
|
|
|
+ "token": access_token
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ request_res = requests.post(url=api_uri, data=requests_data)
|
|
|
+ request_json = request_res.json()
|
|
|
+ logger.info('1111-----request_json--------------------')
|
|
|
+ logger.info(request_json)
|
|
|
+
|
|
|
|
|
|
try:
|
|
|
user_qs = UserModel.objects.get(access_token=access_token)
|
|
|
@@ -411,7 +469,6 @@ class oa2DiscoveryDevice(TemplateView):
|
|
|
print(res_json)
|
|
|
|
|
|
|
|
|
- logger = logging.getLogger('django')
|
|
|
logger.info('开始打印---------------------------')
|
|
|
logger.info(userID)
|
|
|
logger.info(res_json)
|
chanjunkai