|
|
@@ -206,7 +206,7 @@ class deviceStatus(TemplateView):
|
|
|
messageId = str(uuid.uuid4()).strip()
|
|
|
bearer_access_token = "Bearer {access_token}".format(access_token=access_token)
|
|
|
headers = {"content-type": "application/json", "Authorization": bearer_access_token}
|
|
|
- endpoints = self.append_endpoint(data_list, channel)
|
|
|
+ endpoints = self.append_endpoint(data_list, channel, skill_name)
|
|
|
payload_json = {
|
|
|
"event": {
|
|
|
"header": {
|
|
|
@@ -412,17 +412,17 @@ class deviceStatus(TemplateView):
|
|
|
format(e.__traceback__.tb_lineno, repr(e)))
|
|
|
return response.json(10, res={'msg': '上报状态异常'})
|
|
|
|
|
|
- def append_endpoint(self, data_list, channel):
|
|
|
+ def append_endpoint(self, data_list, channel, skill_name):
|
|
|
# 组织 endpoints 数据
|
|
|
endpoints = []
|
|
|
for data in data_list:
|
|
|
endpointId = data['UID'] if channel == 1 else data['UID'] + '_' + str(data['channel'])
|
|
|
endpoint = {
|
|
|
"endpointId": endpointId,
|
|
|
- "manufacturerName": "zosi smart",
|
|
|
+ "manufacturerName": skill_name,
|
|
|
"modelName": "P1425-LE",
|
|
|
"friendlyName": data['uid_nick'],
|
|
|
- "description": "Camera connected via zosi smart",
|
|
|
+ "description": "Camera connected via {}".format(skill_name),
|
|
|
"displayCategories": ["CAMERA"],
|
|
|
"capabilities": [
|
|
|
{
|
linhaohong