diff --git a/Tech/Presenter/PlayerPresenter.cs b/Tech/Presenter/PlayerPresenter.cs index 4f57b91..6eb4b14 100644 --- a/Tech/Presenter/PlayerPresenter.cs +++ b/Tech/Presenter/PlayerPresenter.cs @@ -13,9 +13,10 @@ namespace Tech_Demo.Presenter view.Presenter = this; } - public Equipment GetEquipment() + public string GetEquipmentUrl() { - return new Equipment {Id = 1, Name = "设备1", Ip = "192.168.1.110", Url = @"rtsp://10.211.55.2:8554/rains", Type = 1}; + var equipment = new Equipment {Id = 1, Name = "设备1", Ip = "192.168.1.110", Url = @"rtsp://10.211.55.2:8554/rains", Type = 1}; + return equipment.Url; } } } \ No newline at end of file diff --git a/Tech/View/Impl/PlayerView.cs b/Tech/View/Impl/PlayerView.cs index 530ebd2..ab795be 100644 --- a/Tech/View/Impl/PlayerView.cs +++ b/Tech/View/Impl/PlayerView.cs @@ -157,8 +157,7 @@ namespace Tech_Demo ":network-caching=100", ":rtsp-tcp" }; // { ":network-caching=100", ":rtsp -tcp", ":no-audio" }; // --avcodec-hw={any,d3d11va,dxva2,none} // var videoUri = new Uri(@"rtsp://admin:abc123456@192.168.1.233:554/h264/ch33/main/av_stream"); - var equipment = Presenter.GetEquipment(); - var videoUri = new Uri(equipment.Url); + var videoUri = new Uri(Presenter.GetEquipmentUrl()); if (videoView.MediaPlayer == null) { var libVlc = new LibVLC(enableDebugLogs: true);