2 Commity f897e2db86 ... 309416d5bf

Autor SHA1 Wiadomość Data
  wzz 309416d5bf Merge branch 'develop' of http://192.168.20.45/Sky/ROBOT-APP into develop 2 lat temu
  wzz ac879428a9 修改视频红外连接 2 lat temu
2 zmienionych plików z 9 dodań i 3 usunięć
  1. 6 0
      code/HBX/.idea/vcs.xml
  2. 3 3
      code/HBX/pages/native/work.nvue

+ 6 - 0
code/HBX/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>

+ 3 - 3
code/HBX/pages/native/work.nvue

@@ -250,9 +250,9 @@
 				this.Aindex = index
 				index == 1 ?
 					this.videoSrc =
-					`rtsp://${this.robotData.ptzLoginUser}:${this.robotData.ptzPassword}@${this.robotData.ip}:554/h265/ch01/main/av_stream` :
+					`rtsp://${this.robotData.ptzLoginUser}:${this.robotData.ptzPassword}@${this.robotData.domainName}:554/h265/ch01/main/av_stream` :
 					this.videoSrc =
-					`rtsp://${this.robotData.ptzLoginUser}:${this.robotData.ptzPassword}@${this.robotData.ip}:554/h265/ch02/main/av_stream`
+					`rtsp://${this.robotData.ptzLoginUser}:${this.robotData.ptzPassword}@${this.robotData.domainName}:554/h265/ch02/main/av_stream`
 
 			},
 			changePicker(e) {
@@ -261,7 +261,7 @@
 				this.pickeIndex = e.detail.value
 				this.robotData = data
 				this.robotName = data.robotName
-				this.videoSrc = `rtsp://${data.ptzLoginUser}:${data.ptzPassword}@${data.ip}:554/h264/ch01/main/av_stream`
+				this.videoSrc = `rtsp://${data.ptzLoginUser}:${data.ptzPassword}@${data.domainName}:554/h264/ch01/main/av_stream`
 				this.getEnvData()
 				console.log(this.videoSrc)
 			},