Merge branch 'refs/heads/master' into develop-add-api-key

web_src/src/components/MediaServerManger.vue

@@ -10,7 +10,8 @@
     <el-row :gutter="12">
       <el-col :span="num" v-for="item in mediaServerList" :key="item.id">
         <el-card shadow="hover" :body-style="{ padding: '0px'}" class="server-card">
-          <div class="card-img-zlm"></div>
+          <div v-if="item.type === 'zlm'" class="card-img-zlm"></div>
+          <div v-if="item.type === 'abl'" class="card-img-abl"></div>
           <div style="padding: 14px;text-align: left">
             <span style="font-size: 16px">{{item.id}}</span>
             <el-button v-if="!item.defaultServer" icon="el-icon-edit" style="padding: 0;float: right;" type="text" @click="edit(item)">编辑</el-button>
@@ -154,6 +155,13 @@
     background-size: contain;
     margin: 0 auto;
   }
+  .card-img-abl{
+    width: 200px; height: 200px;
+    background: url('~@static/images/abl-logo.jpg') no-repeat center;
+    background-position: center;
+    background-size: contain;
+    margin: 0 auto;
+  }
   .server-card-status-online{
     position: absolute;
     right: 20px;

web_src/src/components/dialog/MediaServerEdit.vue

@@ -20,6 +20,12 @@
           <el-form-item label="SECRET" prop="secret">
             <el-input v-model="mediaServerForm.secret" placeholder="媒体服务SECRET"  clearable :disabled="mediaServerForm.defaultServer"></el-input>
           </el-form-item>
+          <el-form-item label="类型" prop="type">
+            <el-select v-model="mediaServerForm.type" style="float: left; width: 100%" >
+              <el-option key="zlm" label="ZLMediaKit" value="zlm"></el-option>
+              <el-option key="abl" label="ABLMediaServer" value="abl"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <div style="float: right;">
               <el-button type="primary" v-if="currentStep === 1 && serverCheck === 1" @click="next" >下一步</el-button>
@@ -170,7 +176,7 @@ export default {
         hookIp: "",
         sdpIp: "",
         streamIp: "",
-        secret: "035c73f7-bb6b-4889-a715-d9eb2d1925cc",
+        secret: "",
         httpPort: "",
         httpSSlPort: "",
         recordAssistPort: "",
@@ -182,6 +188,7 @@ export default {
         rtpProxyPort: "",
         rtspPort: "",
         rtspSSLPort: "",
+        type: "zlm",
       },
       rtpPortRange1:30000,
       rtpPortRange2:30500,
@@ -330,7 +337,7 @@ export default {
         hookIp: "",
         sdpIp: "",
         streamIp: "",
-        secret: "035c73f7-bb6b-4889-a715-d9eb2d1925cc",
+        secret: "",
         httpPort: "",
         httpSSlPort: "",
         recordAssistPort: "",

web_src/src/components/service/MediaServer.js

@@ -45,7 +45,8 @@ class MediaServer{
       params: {
         ip: param.ip,
         port: param.httpPort,
-        secret: param.secret
+        secret: param.secret,
+        type: param.type
       }
     }).then(function (res) {
       if (typeof (callback) == "function") callback(res.data)