Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	web_src/src/components/dialog/devicePlayer.vue
#	web_src/src/components/live.vue

web_src/src/components/dialog/devicePlayer.vue

@@ -121,6 +121,10 @@
                                   <el-tag >RTC:</el-tag>
                                   <span>{{ streamInfo.rtc.url }}</span>
                                 </el-dropdown-item>
+                                <el-dropdown-item :command="streamInfo.rtcs.url">
+                                  <el-tag >RTCS:</el-tag>
+                                  <span>{{ streamInfo.rtcs }}</span>
+                                </el-dropdown-item>
                                 <el-dropdown-item :command="streamInfo.rtmp.url">
                                   <el-tag >RTMP:</el-tag>
                                   <span>{{ streamInfo.rtmp.url }}</span>
@@ -322,7 +326,7 @@ export default {
             player: {
               jessibuca : ["ws_flv", "wss_flv"],
               livePlayer : ["ws_flv", "wss_flv"],
-              webRTC: ["rtc", "rtc"],
+              webRTC: ["rtc", "rtcs"],
             },
             videoHistory: {
                 date: '',
@@ -393,7 +397,7 @@ export default {
         changePlayer: function (tab) {
             console.log(this.player[tab.name][0])
             this.activePlayer = tab.name;
-            this.videoUrl = this.streamInfo[this.player[tab.name][0]].url
+            this.videoUrl = this.getUrlByStreamInfo()
             console.log(this.videoUrl)
         },
         openDialog: function (tab, deviceId, channelId, param) {

web_src/src/components/dialog/rtcPlayer.vue

@@ -51,7 +51,7 @@ export default {
             });
 
             webrtcPlayer.on(ZLMRTCClient.Events.WEBRTC_ON_REMOTE_STREAMS,(e)=>{//获取到了远端流，可以播放
-                console.error('播放成功',e.streams)
+                console.log('播放成功',e.streams)
                 this.eventcallbacK("playing", "播放成功")
             });
 
@@ -59,7 +59,7 @@ export default {
                 console.error('offer anwser 交换失败',e)
                 this.eventcallbacK("OFFER ANSWER ERROR ", "offer anwser 交换失败")
                 if (e.code ==-400 && e.msg=="流不存在"){
-                    console.log("111111")
+                    console.log("流不存在")
                     this.timer = setTimeout(()=>{
                         this.webrtcPlayer.close();
                         this.play(url)