master #3

Merged
bichangxiong merged 19 commits from master into prod 2025-08-29 18:46:27 +08:00
2 changed files with 4 additions and 4 deletions
Showing only changes of commit ac293e862a - Show all commits

View File

@@ -147,7 +147,7 @@ function streamProxy(nodeData: any, cb: Function) {
if (nodeData.nvrIp) { if (nodeData.nvrIp) {
params = { params = {
videoIp: nodeData.nvrIp, videoIp: nodeData.nvrIp,
videoPort: nodeData.nvrPort, videoPort: 554,
factoryNo: nodeData.nvrFactoryNo, factoryNo: nodeData.nvrFactoryNo,
account: nodeData.nvrAccount, account: nodeData.nvrAccount,
pwd: nodeData.nvrPwd, pwd: nodeData.nvrPwd,
@@ -156,7 +156,7 @@ function streamProxy(nodeData: any, cb: Function) {
} else { } else {
params = { params = {
videoIp: nodeData.deviceIp, videoIp: nodeData.deviceIp,
videoPort: nodeData.devicePort, videoPort: 554,
factoryNo: nodeData.factoryNo, factoryNo: nodeData.factoryNo,
account: nodeData.deviceAccount, account: nodeData.deviceAccount,
pwd: nodeData.devicePwd, pwd: nodeData.devicePwd,

View File

@@ -274,7 +274,7 @@ function streamProxy(nodeData: any, cb: Function) {
if (nodeData.nvrIp) { if (nodeData.nvrIp) {
params = { params = {
videoIp: nodeData.nvrIp, videoIp: nodeData.nvrIp,
videoPort: nodeData.nvrPort, videoPort: 554,
factoryNo: nodeData.nvrFactoryNo, factoryNo: nodeData.nvrFactoryNo,
account: nodeData.nvrAccount, account: nodeData.nvrAccount,
pwd: nodeData.nvrPwd, pwd: nodeData.nvrPwd,
@@ -283,7 +283,7 @@ function streamProxy(nodeData: any, cb: Function) {
} else { } else {
params = { params = {
videoIp: nodeData.deviceIp, videoIp: nodeData.deviceIp,
videoPort: nodeData.devicePort, videoPort: 554,
factoryNo: nodeData.factoryNo, factoryNo: nodeData.factoryNo,
account: nodeData.deviceAccount, account: nodeData.deviceAccount,
pwd: nodeData.devicePwd, pwd: nodeData.devicePwd,