Merge branch 'feature/43020_協業の切り替えで、マイクがオフなのにハウリングする' into 'develop'

協業切替ても音声on,offが維持されるように修正

See merge request !157

public_new/js/collaboration.js

@@ -188,11 +188,9 @@ $(function () {
   $('#micBtn').click(function () {
   $('#micBtn').click(function () {
     $('#coviewMicCtrBtn').click();
     $('#coviewMicCtrBtn').click();
     if ($('#micBtn').hasClass('bg_red')) {
     if ($('#micBtn').hasClass('bg_red')) {
-        $('#micBtn').removeClass('bg_red');
-        $('#micBtn').addClass('bg_blue');
+        micOn();
     } else {
     } else {
-        $('#micBtn').removeClass('bg_blue');
-        $('#micBtn').addClass('bg_red');
+        micOff();
     }
     }
   })
   })
 
 
@@ -220,3 +218,15 @@ function penOff() {
     $('#penBtn').removeClass('bg_blue');
     $('#penBtn').removeClass('bg_blue');
   }
   }
 };
 };
+
+function micOn() {
+  coview_api.MicMuteControl('off');
+  $('#micBtn').addClass('bg_blue');
+  $('#micBtn').removeClass('bg_red');
+};
+
+function micOff() {
+  coview_api.MicMuteControl('on');
+  $('#micBtn').removeClass('bg_blue');
+  $('#micBtn').addClass('bg_red');
+};

public_new/js/share.js

@@ -434,6 +434,11 @@ function changeCollaboration(changeCollaborationType) {
       coview_api.ChangeCollaboration('audio');
       coview_api.ChangeCollaboration('audio');
       break;
       break;
   }
   }
+  if ($('#micBtn').hasClass('bg_red')) {
+    micOff();
+  } else {
+    micOn();
+  }
   penOff();
   penOff();
   if (CHAT_UTIL.isIOS()) {
   if (CHAT_UTIL.isIOS()) {
     webkit.messageHandlers.changeCollaboration.postMessage({"changeCollaborationType": changeCollaborationType, "meetingId": newMeetingId});
     webkit.messageHandlers.changeCollaboration.postMessage({"changeCollaborationType": changeCollaborationType, "meetingId": newMeetingId});