修改广播的文字，增加查询服务器地址的接口

languages/en.js

@@ -48,6 +48,10 @@ module.exports = {
     updateTime: 'Update time',
     save: 'Save',
     saveSuccess: 'Save successfully! ',
+    saveFailed: 'Save failed! ',
+    saveAgain: 'Reconnect, please click Save again! ',
+    systemNoReturnMessage: 'The system has no return message!',
+    failedGetReturnMessage: 'Failed to get the return message!',
     notDevelopedYet: 'Not yet developed',
     keywords: 'Please enter a search keyword',
     chooseLang: 'Choose language',
@@ -553,12 +557,18 @@ module.exports = {
     repeatDay: 'Start Day',
     play: 'Play',
     stop: 'Stop',
+    playManually: 'Play manually',
+    audition: 'Audition',
+    playbackSuccessful: 'Playback successful',
+    auditionEnd: 'End of audition',
     playOrder: 'Play order',
     playOrderMsg: 'Playing order is required',
     broadcastFrameGroup: 'Broadcast area',
     otherBroadcastFrameGroup: 'Other broadcast positions',
     broadcastInfo: 'Broadcast information',
-    broadcastFile: 'Broadcast file'
+    broadcastFile: 'Broadcast file',
+    broadcastLoadFailed: 'Failed to load broadcast plug-in! ',
+    broadPlugInError: 'Broadcast plug-in error: '
   },
   event: {
     eventEdit: 'Edit button event',

languages/zh-CN.js

@@ -49,6 +49,10 @@ module.exports = {
     updateTime: '更新时间',
     save: '保存',
     saveSuccess: '保存成功！',
+    saveFailed: '保存失败',
+    saveAgain: '重新连接，请再次点击保存',
+    systemNoReturnMessage: '系统无返回消息！',
+    failedGetReturnMessage: '未能得到返回消息！',
     notDevelopedYet: '暂未开发',
     keywords: '请输入搜索关键字',
     chooseLang: '选择语言',
@@ -555,12 +559,18 @@ module.exports = {
     repeatDay: '开启日',
     play: '播放',
     stop: '停止',
+    playManually: '手动播放',
+    audition: '试听',
+    auditionEnd: '试听结束',
+    playbackSuccessful: '播放成功',
     playOrder: '播放顺序',
     playOrderMsg: '播放顺序必填',
     broadcastFrameGroup: '广播区域',
     otherBroadcastFrameGroup: '其他广播位置',
     broadcastInfo: '广播信息',
-    broadcastFile: '广播文件'
+    broadcastFile: '广播文件',
+    broadcastLoadFailed: '加载广播插件失败',
+    broadPlugInError: '广播插件错误：'
   },
   event: {
     eventEdit: '编辑按钮事件',

src/api/calling-broadcast.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import {mediaRequest} from "../utils/request";
+import { mediaRequest } from '../utils/request'
 
 /**
  * 广播设置相关接口
@@ -56,7 +56,6 @@ export function get(id, params) {
   })
 }
 
-
 /** 查询某科室下的指定区域广播信息 */
 export function getBoardCast(partid, zoneIndex) {
   return request({

src/api/ncs_service_info.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+/** 服务器配置 */
+export function getServiceInfo() {
+  return request({
+    url: `/ncs_url/server_info`,
+    method: 'get',
+    loading: false
+  })
+}

src/views/ncs-broadcast/index.vue

@@ -37,7 +37,7 @@
       />
     </ag-grid-layout>
 
-    <el-dialog title="手动播放" width="300" :visible="manulPlay" :show-close="false">
+    <el-dialog :title="this.$t('broadcast.playManually')" width="300" :visible="manulPlay" :show-close="false">
       <el-row>
         <el-col :span="24">
           {{auditionTotalMsg}}
@@ -52,11 +52,11 @@
         <el-progress :show-text="false" :text-inside="true" :stroke-width="30" :percentage="auditionPositionPercent" status="success"></el-progress>
       </el-row>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="stopBroadcast(currentRow)">停止</el-button>
+        <el-button type="primary" @click="stopBroadcast(currentRow)">{{ this.$t('broadcast.stop') }}</el-button>
       </span>
     </el-dialog>
 
-    <el-dialog title="试听" width="300" :visible="stream!==null" :show-close="false">
+    <el-dialog :title="this.$t('broadcast.audition')" width="300" :visible="stream!==null" :show-close="false">
       <el-row>
         <el-col :span="24">
           {{auditionTotalMsg}}
@@ -74,7 +74,7 @@
         <audio ref="audio" loop autoplay playsinline :srcObject.prop="stream" v-if="stream" style="width: 300px;height:100px;"></audio>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="streamingStop(true)">停止</el-button>
+        <el-button type="primary" @click="streamingStop(true)">{{ this.$t('broadcast.stop') }}</el-button>
       </span>
     </el-dialog>
 
@@ -205,6 +205,7 @@
 import { AG_GRID_LOCALE_CN } from '@/utils/AgGridVueLocaleCn'
 import ButtonCellRenderList from '@/components/AgGridCellRender/ButtonCellRenderList'
 import * as API_Broadcast from '@/api/calling-broadcast'
+import * as API_ServiceInfo from '@/api/ncs_service_info'
 import { unix2Date } from '@/utils/Foundation'
 import * as API_FrameGroup from '@/api/ncs_frameGroup'
 import ListFilter from '@/components/AgGridCustomFilter/ListFilter'
@@ -229,7 +230,8 @@ export default {
   components: { ButtonCellRenderList, ListFilter, RadioFilter },
   data() {
     return {
-      rtcServer: "ws://192.168.1.54:20022/janus",
+      // rtcServer: "ws://192.168.1.54:20022/janus",
+      rtcServer:  "",
       opaqueId: "streaming-"+randomString(12),
       janus: null,  //实例
       pluginHandle: null,   //插件
@@ -409,7 +411,7 @@ export default {
                 buttonSize: 'mini',
                 disabled: param.data.broadcast_mode !== 1 || !param.data.status
               },{
-                label: '试听',
+                label: this.$t('broadcast.audition'),
                 buttonSize: 'mini',
                 buttonType: 'success',
                 onClick: () => {
@@ -425,7 +427,7 @@ export default {
         filter: false,
         pinned: 'right',
         lockPinned: true,
-        width: 290,
+        width: this.$i18n.locale === 'zh' ? 290 : 300,
         resizable: false,
         sortable: false
       }
@@ -457,21 +459,30 @@ export default {
       ]
     })
     this.getAllFrameGroups()
+    if (this.rtcServer === null || this.rtcServer === "") {
+      this.getRtcServer()
+    }
 
     this.initAuditionWebSocket()
-    Janus.init({
-      debug: false,
-      dependencies: Janus.useDefaultDependencies(),
-      callback: () => {
-        this.connect(this.rtcServer)
-      }
-    })
+    // Janus.init({
+    //   debug: false,
+    //   dependencies: Janus.useDefaultDependencies(),
+    //   callback: () => {
+    //     if (this.rtcServer !== null && this.rtcServer !== "") {
+    //       this.connect(this.rtcServer)
+    //     }
+    //   }
+    // })
 
     const _this = this
     //每分钟检查一次websocket状态，如果掉线，则重连
     setInterval(function() {
       if (_this.janus === null) {
-        _this.connect(this.rtcServer)
+        if (_this.rtcServer !== null && _this.rtcServer !== "") {
+          _this.connect(this.rtcServer)
+        } else {
+          this.getRtcServer()
+        }
       }
       if (_this.websock === null) {
         _this.initAuditionWebSocket()
@@ -524,7 +535,7 @@ export default {
         } else {
           this.$message({
             type: 'success',
-            message: '播放成功'
+            message: this.$t('broadcast.playbackSuccessful')
           })
           row.playing = true
           this.gridApi.redrawRows()
@@ -697,8 +708,12 @@ export default {
           this.formmodel.part_id = this.$store.getters.partId
           //判断 janus 是否连接状态
           if (this.janus === null) {
-            this.connect(this.rtcServer)
-            this.$message.error('重新连接，请再次点击保存')
+            if (this.rtcServer === null || this.rtcServer === ""){
+              this.getRtcServer()
+            } else {
+              this.connect(this.rtcServer)
+            }
+            this.$message.error(this.$t('action.saveAgain'))
             return
           }
 
@@ -708,7 +723,7 @@ export default {
               if (result.id) {
                 this.createStreaming(result.id, result.audio_port);
               } else {
-                this.$message.error('保存失败')
+                this.$message.error(this.$t('action.saveFailed'))
                 return
               }
             } else {
@@ -806,7 +821,7 @@ export default {
         this.streamingStop(false)
         this.$message({
           type: 'success',
-          message: '试听结束'
+          message: this.$t('broadcast.auditionEnd')
         })
       }
     },
@@ -836,8 +851,8 @@ export default {
           this.attachPlugin()
         },
         error: (error) => {
-          console.log('加载广播插件失败', error)
-          _this.$alert('加载广播插件失败','系统提示',{
+          console.log(this.$t('broadcast.broadcastLoadFailed'), error)
+          _this.$alert(this.$t('broadcast.broadcastLoadFailed'), this.$t('action.systemPrompt'),{
             confirmButtonText: this.$t('action.yes'),
             callback: action => {
               _this.janus = null
@@ -862,7 +877,7 @@ export default {
           },
           error: function(error) {
             console.log("  -- Error attaching plugin... ", error)
-            this.$alert('广播插件错误：' + error,'系统提示')
+            this.$alert(this.$t('broadcast.broadPlugInError') + error, this.$t('action.systemPrompt'))
           },
           iceState: function(state) {
             console.log("ICE state changed to " + state)
@@ -969,7 +984,7 @@ export default {
 // streaming: "created"
           console.log('result===', result)
           if(!result) {
-            _this.$alert('系统无返回消息!', '系统提示', {
+            _this.$alert(this.$t('action.systemNoReturnMessage'), this.$t('action.systemPrompt'), {
               confirmButtonText: this.$t('action.yes'),
               callback: action => {
               }
@@ -994,7 +1009,7 @@ export default {
         if(!result) {
           _this.$message({
             type: 'error',
-            message: '未能得到返回消息!'
+            message: this.$t('action.failedGetReturnMessage')
           })
           return;
         }
@@ -1024,6 +1039,23 @@ export default {
     },
     onCleanup() {
       this.stream = null
+    },
+    getRtcServer() {
+      API_ServiceInfo.getServiceInfo().then(r => {
+        const result = r
+        console.log("result", result)
+        this.rtcServer = "ws://" +  r.rtc_public_ip + ":" + r.rtc_port + "/janus"
+
+        Janus.init({
+          debug: false,
+          dependencies: Janus.useDefaultDependencies(),
+          callback: () => {
+            if (this.rtcServer !== null && this.rtcServer !== "") {
+              this.connect(this.rtcServer)
+            }
+          }
+        })
+      })
     }
   }
 }