|
@@ -236,6 +236,7 @@ class oa2RtspStartView(TemplateView):
|
|
|
VVDHCVBYDKFMJRWA111A
|
|
|
'''
|
|
|
access_token = request_dict.get("access_token", '')
|
|
|
+ app_name = request_dict.get("app_name", 'zosi smart')
|
|
|
st = request_dict.get("st", 0)
|
|
|
id = request_dict.get("id", '')
|
|
|
|
|
@@ -335,13 +336,14 @@ class oa2RtspStartView(TemplateView):
|
|
|
#----------/新增关闭流的线程
|
|
|
stop_time = int(time.time()) + 2*60
|
|
|
expirationTime = time.strftime('%Y-%m-%dT%H:%MZ',time.localtime(stop_time))
|
|
|
+ logger.info('app_name:', app_name)
|
|
|
res_json = {
|
|
|
'endpointId': id,
|
|
|
- 'manufacturerName': 'zosi smart',
|
|
|
+ 'manufacturerName': app_name,
|
|
|
'manufacturerId': 'zosi-ACCC8E5E7513',
|
|
|
'modelName': 'P1425-LE',
|
|
|
'friendlyName': nick,
|
|
|
- 'description': 'Camera connected via zosi smart',
|
|
|
+ 'description': 'Camera connected via {}'.format(app_name),
|
|
|
"expirationTime": expirationTime,
|
|
|
"idleTimeoutSeconds": 5,
|
|
|
#'resolutions': [{'width': 1280, 'height': 720}],
|
|
@@ -441,10 +443,12 @@ class oa2DiscoveryDevice(TemplateView):
|
|
|
def validate(self, request_dict):
|
|
|
# 增加对code和client_id的校验代码,返回access_token和refresh_token
|
|
|
access_token = request_dict.get("access_token", None)
|
|
|
+ app_name = request_dict.get("app_name", 'zosi smart')
|
|
|
region = request_dict.get("region", 'cn')
|
|
|
logger = logging.getLogger('django')
|
|
|
logger.info('-----access_token')
|
|
|
logger.info(access_token)
|
|
|
+ logger.info('app_name:', app_name)
|
|
|
try:
|
|
|
user_qs = UserModel.objects.get(access_token=access_token)
|
|
|
except Exception as e:
|
|
@@ -525,11 +529,11 @@ class oa2DiscoveryDevice(TemplateView):
|
|
|
RTSP_PREFIX=RTSP_PREFIX)
|
|
|
ur_data = {
|
|
|
'endpointId': uid_a['uid'],
|
|
|
- 'manufacturerName': 'zosi smart',
|
|
|
+ 'manufacturerName': app_name,
|
|
|
'manufacturerId': 'zosi-ACCC8E5E7513',
|
|
|
'modelName': 'P1425-LE',
|
|
|
'friendlyName': uid_a['nick'],
|
|
|
- 'description': 'Camera connected via zosi smart',
|
|
|
+ 'description': 'Camera connected via {}'.format(app_name),
|
|
|
'resolutions': [{'width': 1280, 'height': 720}],
|
|
|
'videoCodecs': ['H264'],
|
|
|
'audioCodecs': ['ACC'],
|