Browse Source

视频改动

lincl 3 years ago
parent
commit
9974545fb0
3 changed files with 15 additions and 13 deletions
  1. 1 1
      src/Main.vue
  2. 2 1
      src/assets/js/ajaxurl.js
  3. 12 11
      src/components/videoChat/video-chat.vue

+ 1 - 1
src/Main.vue

@ -80,7 +80,7 @@ export default {
      ajaxUrl.imServer =
        "https://" + data.server_host + ":" + data.port + "/api/v2";
      //ajaxUrl.videoScoketUrl = data.server_host + ":8443/groupcall";
      ajaxUrl.videoScoketUrl = data.server_host + ":" + data.port + "/groupcall";
      // ajaxUrl.videoScoketUrl = data.server_host + ":" + data.port + "/groupcall";
      window.localStorage.setItem(
        "serverUrl",
        "https://" + data.server_host + ":" + data.port

+ 2 - 1
src/assets/js/ajaxurl.js

@ -10,6 +10,7 @@ export default {
  imServer: serverUrl + "/api/v2",
  socketUrl: serverUrl,
  imgUploadUrl: imgUploadUrl,
  videoScoketUrl: serverUrl + '/groupcall',
  // videoScoketUrl: serverUrl + '/groupcall',
  videoScoketUrl: 'https://hlwyy.xmzsh.com/groupcall',
  localSocket: 'http://localhost:30001'
}

+ 12 - 11
src/components/videoChat/video-chat.vue

@ -10,9 +10,9 @@
            <div class="member-panel fl">
                <div class="c-fff c-f14 plr15 pt10">参与人员:</div>
                <ul class="clearfix p-list">
                    <li v-show="chatMembers1.length >0" v-for="member in chatMembers1" :key="member.code || member.id" :class="{'small': chatMembers1.length >=4, 'main': mainVideo == (member.code || member.id)}">
                        <div class="participant" :id="'par_'+(member.code || member.id)" @click="setMainVideo(member.code || member.id)">
                            <video :id="'video_'+ (member.code || member.id )" autoplay="" :poster="getPhoto(member.avatar)"></video>
                    <li v-show="chatMembers1.length >0" v-for="member in chatMembers1" :key="member.code || member.id" :class="{'small': chatMembers1.length >=4, 'main': mainVideo == (member.name || member.id)}">
                        <div class="participant" :id="'par_'+(member.name || member.id)" @click="setMainVideo(member.name || member.id)">
                            <video :id="'video_'+ (member.name || member.id )" autoplay="" :poster="getPhoto(member.avatar)"></video>
                            <span class="name c-nowrap">{{member.name}}</span>
                        </div>
                    </li>
@ -161,13 +161,14 @@ export default {
                return {
                        "iceServers":[
                            {
                                urls:"stun:27.154.233.186:3478"
                                
                                urls:"stun:117.24.13.79:3478"
                            },
                            {
                                url:"turn:27.154.233.186:3478",
                                urls:["turn:27.154.233.186:3478"],
                                username:"kurento",
                                credential: "kurento"
                                urls:"stun:117.24.13.79:3478",
                                urls:["stun:117.24.13.79:3478"],
                                username:"jkzl",
                                credential: "jkzl"
                            }
                        ]
                    }
@ -208,7 +209,7 @@ export default {
        this.docInfo = storage.getItem(storage.API_LOGIN_DOCTOR);
        this.userId = this.docInfo.uid,
        this.userName = this.docInfo.name;
        this.mainVideo = this.userId;
        this.mainVideo = this.docInfo.name;
        this.modalBoxOffset = $(".v--modal-box").offset();
@ -249,7 +250,7 @@ export default {
            for(var i=0; i<this.chatMembers1.length; i++){
                o = this.chatMembers1[i]
                if(o.mobile==this.userId){
                    this.userCode = o.code || o.id
                    this.userCode = o.name || o.id
                    this.mainVideo = this.userCode;
                }
            }
@ -275,7 +276,7 @@ export default {
            //     participants[o.code] = o;
            // });
            _.map(this.chatMembers1, function(o){
                participants[o.code] = o;
                participants[o.name] = o;
                return o;
            })