修正分享链接端口错误

tudousi001 · Nov 18, 2022 · da31d60 · da31d60
1 parent abb72f6
commit da31d60
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 30 deletions.
diff --git a/src/view/device/PlayForm.jsx b/src/view/device/PlayForm.jsx
@@ -34,10 +34,14 @@ export default class PlayForm extends React.Component {
 			{
 				this.setState({
                     playUrl:{
-                        flv:`${apiDomin}/`+this.state.channel.app+'/'+this.state.channel.mainId+'.live.flv',
-                        hls:`${apiDomin}/`+this.state.channel.app+'/'+this.state.channel.mainId+'/hls.m3u8',
-                        rtmp:`${apiDomin}/`+this.state.channel.app+'/'+this.state.channel.mainId,
-                        rtsp:`${apiDomin}/`+this.state.channel.app+'/'+this.state.channel.mainId,
+                        flv:res.data.playUrl[1],
+                        hls:res.data.playUrl[4],
+                        rtmp:res.data.playUrl[3],
+                        rtsp:res.data.playUrl[2],
+                        // flv:`${apiDomin}/`+this.state.channel.app+'/'+this.state.channel.mainId+'.live.flv',
+                        // hls:`${apiDomin}/`+this.state.channel.app+'/'+this.state.channel.mainId+'/hls.m3u8',
+                        // rtmp:`${apiDomin}/`+this.state.channel.app+'/'+this.state.channel.mainId,
+                        // rtsp:`${apiDomin}/`+this.state.channel.app+'/'+this.state.channel.mainId,
                     }
                 })
 			}

diff --git a/src/view/player/ZLPlayer.jsx b/src/view/player/ZLPlayer.jsx
@@ -10,7 +10,7 @@ import ReactTimeout from "react-timeout";
 import classNames from "classnames";
 import {apiDomin} from "../../config/apiconfig";
 import AKStreamPlayer from '../../component/RvJessibuca/App.js';
-
+import {StreamLive} from "../../service/channel";
 
 @ReactTimeout
 export default class ZLPlayer extends React.Component {
@@ -76,30 +76,39 @@ export default class ZLPlayer extends React.Component {
         const ua = UAParser(global.navigator.userAgent);
         this.channelParams = queryString.parse(this.props.location.search);
 
-        const {mediaServerIp, vhost, app, stream, iframe=false} = this.channelParams;
-		const urldata = {
-			play_addrs:{
-				flv:`${apiDomin}/`+app+'/'+stream+'.live.flv',
-				hls:`${apiDomin}/`+app+'/'+stream+'/hls.m3u8',
-				rtmp:`${apiDomin}/`+app+'/'+stream,
-                rtsp:`${apiDomin}/`+app+'/'+stream,
+        const {mediaServerIp,mediaServerId, vhost, app, stream, iframe=false} = this.channelParams;
+
+        StreamLive(mediaServerId,stream).then(res => {
+			if(res._success && res._statusCode === 200 && res.data)
+			{
+                const urldata = {
+                    play_addrs:{
+                        flv:res.data.playUrl[1],
+                        hls:res.data.playUrl[4],
+                        rtmp:res.data.playUrl[3],
+                        rtsp:res.data.playUrl[2],
+                    }
+                }
+
+                this.setState({
+                    loading: true,
+                    iframe
+                }, () => {
+                    this.setState({
+                        channelData: urldata,
+                        currentUrl:urldata.play_addrs.flv,
+                        params: this.channelParams,
+                    }, () => {
+                        this.changePlayType("flvjs")
+                    })
+                    this.setState({
+                        loading: false,
+                    })
+                })
+
 			}
-		}
-
-        this.setState({
-            loading: true,
-            iframe
-        }, () => {
-			this.setState({
-			    channelData: urldata,
-                currentUrl:urldata.play_addrs.flv,
-			    params: this.channelParams,
-			}, () => {
-			    this.changePlayType("flvjs")
-			})
-			this.setState({
-			    loading: false,
-			})
+
+
         })
 
         this.loadData(this.state.recordparams)

diff --git a/src/view/plaza/Plaza.jsx b/src/view/plaza/Plaza.jsx
@@ -60,12 +60,12 @@ class MediaChannel extends React.Component {
                         }
 						console.log(snapshotPath)
                         // snapshotPath += "/"+ item.app+"/"+item.stream+".png"
-						snapshotPath += `${apiDomin}/`+item.app+"/"+item.mediaServerStreamInfo.stream+".flv"
+						snapshotPath += `${apiDomin}/`+item.app+"/"+item.mediaServerStreamInfo.stream+".live.flv"
                         return (
                             <List.Item className={"channel-py"}>
                                 <div className={"channel-py-snap"} onClick={()=>{
                                     const w=window.open('about:blank');
-                                    w.location.href=`/play?mediaServerIp=${item.mediaServerStreamInfo.mediaServerIp}&vhost=${item.vhost}&app=${item.app}&stream=${item.mediaServerStreamInfo.stream}`;
+                                    w.location.href=`/play?mediaServerIp=${item.mediaServerStreamInfo.mediaServerIp}&mediaServerId=${mediaServerId}&vhost=${item.vhost}&app=${item.app}&stream=${item.mediaServerStreamInfo.stream}`;
                                 }}>
                                     <RvImage src={snapshotPath} fallbackSrc={black}/>
                                 </div>