Merge branch 'feat/zl' into 'develop'

save

See merge request !73

src/components/IM/diagnosis-live.vue

@@ -84,11 +84,9 @@ export default {
   watch: {
     currentChat(newVal, oldVal) {
       if(newVal !== oldVal && newVal.imTeamId){
-        const {imTeamId, diagnoseLogId, doctorTrtcEntryStatus, userTrtcEntryStatus} = this.currentChat;
+        const {imTeamId, diagnoseLogId,} = this.currentChat;
         this.tid = imTeamId;
         this.diagnoseLogId = diagnoseLogId;
-        // this.doctorTrtcEntryStatus = doctorTrtcEntryStatus;
-        // this.userTrtcEntryStatus = userTrtcEntryStatus;
         this.init();
       }
     }
@@ -316,7 +314,6 @@ export default {
           .then(() => {
             Promise.all([this.rtc.join()]).then((res) => {
               this.ispending();
-              this.muteLocalAudio();
               let t = setTimeout(() => {
                 closeLoading(this);
                 this.muteLocalAudio();

src/utils/RtcClient.js

@@ -198,8 +198,6 @@ class RtcClient {
   //对于本地流，调用该方法会触发远端 Client.on('unmute-audio') 事件。
   //音频轨道默认是开启的，若你调用 muteAudio() 后可用该方法重新启用音频。
   unmuteLocalAudio() {
-    const a = this.localStream_.getAudioTrack();
-    console.log('---a',a);
     this.localStream_.unmuteAudio();
   }
 
@@ -251,7 +249,7 @@ class RtcClient {
     this.client_.on('peer-leave', evt => {
       const userId = evt.userId;
       console.log('有远程同伴离开房间：' + userId);
-      this.remove(userId)
+      this.removeUserList(userId)
     });
 
 
@@ -345,7 +343,7 @@ class RtcClient {
       this.remoteStreams_ = this.remoteStreams_.filter(stream => {
         return stream.getId() !== id;
       });
-      this.remove(uid)
+      this.removeUserList(uid)
     });
 
     // 流更新
@@ -401,7 +399,7 @@ class RtcClient {
   }
 
   // 移除视频数组
-  remove(userId) {
+  removeUserList(userId) {
     for(let i = 0; i < this.viewslist.length; i++) {
       if (this.viewslist[i] && this.viewslist[i].userId == userId) {
         this.viewslist[i] = null