Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/scene_wisdom

js/main_2020_show.js

@@ -15802,7 +15802,7 @@ window.Modernizr = function(n, e, t) {
                                           if(data2.code == 0){
                                             loadMonitor({
                                                 id:"monitor",
-                                                url:  data2.data.external.wsFlv    //'http://14.215.216.123:18080/rtp/00A153DF/hls.m3u8'
+                                                url:  data2.data.external.hls    //'http://14.215.216.123:18080/rtp/00A153DF/hls.m3u8'
                                             }) 
                                           }
                                      },"获取视频地址失败" )