app_name -> skill_name

controller/index.py

@@ -234,7 +234,7 @@ class oa2RtspStartView(TemplateView):
         st = request_dict.get("st", 0)
         uid = request_dict.get("id", '')
         access_token = request_dict.get("access_token", '')
-        app_name = request_dict.get("app_name", 'zosi smart')
+        skill_name = request_dict.get("skill_name", 'zosi smart')
 
         user_qs = UserModel.objects.filter(access_token=access_token)
         if not user_qs.exists():
@@ -260,7 +260,7 @@ class oa2RtspStartView(TemplateView):
         MSG = '{}://{}:8554/{}'.format(RTSP_PREFIX, RESP_SERVER_DOMAIN, stream_name)
 
         logger = logging.getLogger('django')
-        logger.info('------{} 开始向设备下发推流指令------'.format(app_name))
+        logger.info('------{} 开始向设备下发推流指令------'.format(skill_name))
 
         # 此处后续应该用异步去发送指令
         if int(st) == 1:
@@ -301,9 +301,9 @@ class oa2RtspStartView(TemplateView):
             'uri': rtsp_uri,
             'endpointId': uid,
             'friendlyName': nick,
-            'manufacturerName': app_name,
+            'manufacturerName': skill_name,
             'expirationTime': expirationTime,
-            'description': 'Camera connected via {}'.format(app_name),
+            'description': 'Camera connected via {}'.format(skill_name),
 
             'audioCodecs': 'ACC',
             'videoCodecs': 'H264',
@@ -370,11 +370,11 @@ class oa2DiscoveryDevice(TemplateView):
 
     def validate(self, request_dict):
         # 增加对code和client_id的校验代码，返回access_token和refresh_token
-        app_name = request_dict.get("app_name", 'zosi smart')
+        skill_name = request_dict.get("skill_name", 'zosi smart')
         access_token = request_dict.get("access_token", None)
 
         logger = logging.getLogger('django')
-        logger.info('--------{} 开始搜索设备--------'.format(app_name))
+        logger.info('--------{} 开始搜索设备--------'.format(skill_name))
 
         user_qs = UserModel.objects.filter(access_token=access_token)
         if not user_qs.exists():
@@ -467,8 +467,8 @@ class oa2DiscoveryDevice(TemplateView):
                 'uri': rtsp_uri,
                 'endpointId': uid,
                 'friendlyName': nick,
-                'manufacturerName': app_name,
-                'description': 'Camera connected via {}'.format(app_name),
+                'manufacturerName': skill_name,
+                'description': 'Camera connected via {}'.format(skill_name),
 
                 'protocols': ['RTSP'],
                 'audioCodecs': ['ACC'],
@@ -591,7 +591,7 @@ class powerController(TemplateView):
     def power_controller(self, request_dict):
         uid = request_dict.get('uid', '')
         access_token = request_dict.get('access_token', '')
-        app_name = request_dict.get('app_name', 'zosi smart')
+        skill_name = request_dict.get('skill_name', 'zosi smart')
         power_controller = request_dict.get('power_controller', '')
 
         user_qs = UserModel.objects.filter(access_token=access_token)
@@ -603,7 +603,7 @@ class powerController(TemplateView):
             return JsonResponse({'result_code': '500', '错误': 'uid数据不存在'})
 
         logger = logging.getLogger('django')
-        logger.info('{} 唤醒设备 {}'.format(app_name, uid))
+        logger.info('{} 唤醒设备 {}'.format(skill_name, uid))
         # 请求MQTT发布消息
         url = '{}/iot/requestPublishMessage'.format(SERVER_PREFIX_TEST)    # 测试服务器
         requests_data = {'UID': uid, 'MSG': power_controller}   # TurnOn, TurnOff