摄像头添加编辑问题

Modules/Camera/Services/CameraServices.php

@@ -97,8 +97,8 @@ class CameraServices
                 $code_stream = 'sub';
             }
 
-            if ($params['user_name'] && $params['password'] && $params['ip'] && $params['port'] && $params['com_number']) {
-                $url  = 'rtsp://' . $params['user_name'] . ':' . $params['password'] . '@';
+            if ($params['user_name'] && $params['pass'] && $params['ip'] && $params['port'] && $params['com_number']) {
+                $url  = 'rtsp://' . $params['user_name'] . ':' . $params['pass'] . '@';
                 $url .= $params['ip'] . ':' . $params['port'] . '/' . 'h264' . '/' . 'ch' . $params['com_number'] . '/';
                 $url .= $code_stream . '/av_stream';  //sub 子码流 main 主码流
             } else {
@@ -111,8 +111,8 @@ class CameraServices
                 $code_stream = 'sub';
             }
 
-            if ($params['user_name'] && $params['password'] && $params['ip'] && $params['port'] && $params['com_number']) {
-                $url  = 'rtsp://' . $params['user_name'] . ':' . $params['password'] . '@';
+            if ($params['user_name'] && $params['pass'] && $params['ip'] && $params['port'] && $params['com_number']) {
+                $url  = 'rtsp://' . $params['user_name'] . ':' . $params['pass'] . '@';
                 $url .= $params['ip'] . ':' . $params['port'] . '/cam/realmonitor?channel=' . $params['com_number'] . '&';
                 $url .= 'subtype=' . $code_stream;
             } else {
@@ -125,8 +125,8 @@ class CameraServices
                 $code_stream = 'sub';
             }
 
-            if ($params['user_name'] && $params['password'] && $params['ip'] && $params['port'] && $params['com_number']) {
-                $url  = 'rtsp://' . $params['user_name'] . ':' . $params['password'] . '@';
+            if ($params['user_name'] && $params['pass'] && $params['ip'] && $params['port'] && $params['com_number']) {
+                $url  = 'rtsp://' . $params['user_name'] . ':' . $params['pass'] . '@';
                 $url .= $params['ip'] . ':' . $params['port'] . '/unicast/c' . $params['com_number'] . '/s';
                 $url .= $code_stream.'/live';
             } else {