Merge branch 'communication/ABCOMM-663_ios_record' into 'develop'

ABCOMM-663_ios_record_iosレコード機能実装

See merge request !137

public_new/js/chat-ui.js

@@ -1800,7 +1800,11 @@ CHAT_UI.refreshArchiveDetailScreen = function(archiveId) {
             break;
             break;
         case "1": // 動画
         case "1": // 動画
         case 1:
         case 1:
-            $('#archive_player').prepend('<video class="archive_player" src=' + archiveFilePath + ' controls autoplay muted playsinline controlsList="nodownload"></video>');
+            if (CHAT_UTIL.isIOS()) {
+                $('#archive_player').prepend('<video class="archive_player" controls autoplay muted playsinline controlsList="nodownload"><source src="'+archiveFilePath+'" type="video/mp4"><source src="'+archiveFilePath+'" type="video/ogv"><source src="'+archiveFilePath+'" type="video/webm"></video>');
+            } else {
+                $('#archive_player').prepend('<video class="archive_player" src=' + archiveFilePath + ' controls autoplay muted playsinline controlsList="nodownload"></video>');
+            }
             break;
             break;
         case "2": // 音声
         case "2": // 音声
         case 2:
         case 2:

public_new/js/share.js

@@ -7,6 +7,7 @@ var isBoard = false;
 let isLeaved = false;
 let isLeaved = false;
 let timeInterval = null;
 let timeInterval = null;
 var backgroundFileName;
 var backgroundFileName;
+var isIos;
 
 
 $(function () {
 $(function () {
   var coviewApiActive = coview_api.Init({
   var coviewApiActive = coview_api.Init({
@@ -140,7 +141,7 @@ $(function () {
         initCollaborationUI(joinCollaborationType);
         initCollaborationUI(joinCollaborationType);
 
 
         if (CHAT_UTIL.isIOS()) {
         if (CHAT_UTIL.isIOS()) {
-          //TODO JoinCollaborationAPI
+          webkit.messageHandlers.joinChangedCollaboration.postMessage({"joinCollaborationType": joinCollaborationType, "meetingId": data.payload.newMeetingId});
           webkit.messageHandlers.joinMeetingRoom.postMessage(data.payload.newMeetingId);
           webkit.messageHandlers.joinMeetingRoom.postMessage(data.payload.newMeetingId);
         } else if (CHAT_UTIL.isAndroid()) {
         } else if (CHAT_UTIL.isAndroid()) {
           android.joinChangedCollaboration(joinCollaborationType, data.payload.newMeetingId);
           android.joinChangedCollaboration(joinCollaborationType, data.payload.newMeetingId);
@@ -551,6 +552,7 @@ function hostSearchInterval() {
         $('.video_contents_host').removeClass('none');
         $('.video_contents_host').removeClass('none');
         $('.video_contents_user').addClass('none');
         $('.video_contents_user').addClass('none');
       }
       }
+      if (CHAT_UTIL.isIOS()) isIos = true;
     } else {
     } else {
       $('.host_contents').addClass('none');
       $('.host_contents').addClass('none');
       if (joinCollaborationType == COLLABORATION_TYPE.CAMERA) {
       if (joinCollaborationType == COLLABORATION_TYPE.CAMERA) {