Merge branch 'develop' of gitlab.agentec.jp:abookCommunication/chat_webview into…

Merge branch 'develop' of gitlab.agentec.jp:abookCommunication/chat_webview into feature/finish_all_collaboration

public_new/js/chat-db.js

@@ -313,15 +313,6 @@ CHAT_DB.addFavoriteGroup = function(groupId) {
     }
     }
 };
 };
 
 
-
-CHAT_DB.getContentList = function() {
-    if (CHAT_UTIL.isIOS()) {
-        //TODO ローカルDBからダウンロード済のコンテンツを取得
-    } else if (CHAT_UTIL.isAndroid()) {
-        return JSON.parse(android.getContentList());
-    }
-};
-
 CHAT_DB.getUserListByLoginId = function(loginIdList) {
 CHAT_DB.getUserListByLoginId = function(loginIdList) {
     console.log(loginIdList);
     console.log(loginIdList);
     if (CHAT_UTIL.isIOS()) {
     if (CHAT_UTIL.isIOS()) {

public_new/js/chat-ui.js

@@ -1905,7 +1905,11 @@ CHAT_UI.refreshArchiveDetailScreen = function(archiveId) {
             break;
             break;
         case "2": // 音声
         case "2": // 音声
         case 2:
         case 2:
-            $('#archive_player').prepend('<audio class="archive_audio_player" src=' + archiveFilePath + ' controls controlsList="nodownload"></audio>');
+            if (CHAT_UTIL.isIOS()) {
+                $('#archive_player').prepend('<audio class="archive_audio_player" controls controlsList="nodownload"><source src="'+archiveFilePath+'" type="audio/mp3"><source src="'+archiveFilePath+'" type="audio/wav"><source src="'+archiveFilePath+'" type="audio/ogg"></audio>');
+            } else {
+                $('#archive_player').prepend('<audio class="archive_audio_player" src=' + archiveFilePath + ' controls controlsList="nodownload"></audio>');
+            }
             $('#archive_player').prepend('<img class="archive_player" src=' + "./img/capture.png" + ' />');
             $('#archive_player').prepend('<img class="archive_player" src=' + "./img/capture.png" + ' />');
             break;
             break;
         case "3": // 文書
         case "3": // 文書

public_new/js/chat.js

@@ -383,7 +383,9 @@ $(function() {
         var afterWidth = window.innerWidth;
         var afterWidth = window.innerWidth;
         var moreScroll = beforeHeight - afterHeight;
         var moreScroll = beforeHeight - afterHeight;
         if (beforeHeight > afterHeight && (beforeHeight - afterHeight) > 50) {
         if (beforeHeight > afterHeight && (beforeHeight - afterHeight) > 50) {
-            if (beforeWidth == afterWidth) {
+            if (CHAT_UTIL.isIOS()) {
+                window.scrollTo(0, beforeScroll + moreScroll);
+            } else if (beforeWidth == afterWidth) {
                 //キーボード表示時
                 //キーボード表示時
                 $('.room_container').css('margin-bottom', 0);
                 $('.room_container').css('margin-bottom', 0);
                 window.scrollTo(0, beforeScroll + moreScroll - $('.footer_content_b').height());
                 window.scrollTo(0, beforeScroll + moreScroll - $('.footer_content_b').height());
@@ -393,7 +395,9 @@ $(function() {
             }
             }
         } else if (beforeHeight < afterHeight) {
         } else if (beforeHeight < afterHeight) {
             $('.room_container').css('margin-bottom', footerHeight);
             $('.room_container').css('margin-bottom', footerHeight);
-            if (beforeWidth == afterWidth) {
+            if (CHAT_UTIL.isIOS()) {
+                window.scrollTo(0, beforeScroll + moreScroll);
+            } else if (beforeWidth == afterWidth) {
                 //キーボード非表示
                 //キーボード非表示
                 window.scrollTo(0, beforeScroll + moreScroll + $('.footer_content_b').height());
                 window.scrollTo(0, beforeScroll + moreScroll + $('.footer_content_b').height());
             } else {
             } else {

public_new/js/share.js

@@ -240,6 +240,7 @@ $(function () {
 
 
   coview_api.addEventListener("start", function () {
   coview_api.addEventListener("start", function () {
     console.log("=============> START : share start");
     console.log("=============> START : share start");
+    scrollLockON();
     $("#loadingIndicator").removeClass("full_active");
     $("#loadingIndicator").removeClass("full_active");
   });
   });
 
 
@@ -259,17 +260,6 @@ $(function () {
     $("#loadingIndicator").removeClass("full_active");
     $("#loadingIndicator").removeClass("full_active");
   });
   });
 
 
-  coview_api.addEventListener("hostbye", function () {
-    console.log("=============> HOST BYE : share hostbye");
-    alert(getLocalizedString("inform_exit_host_collaboration"));
-    var isDocument = false;
-    if (joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) {
-      isDocument = true;
-    }
-    Coview_exitCollaboration(isDocument);
-    $("#loadingIndicator").removeClass("full_active");
-  });
-
   coview_api.addEventListener("destroy", function () {
   coview_api.addEventListener("destroy", function () {
     console.log("=============> DESTROY : share destroy");
     console.log("=============> DESTROY : share destroy");
     alert(getLocalizedString("inform_exit_host_collaboration"));
     alert(getLocalizedString("inform_exit_host_collaboration"));
@@ -492,17 +482,28 @@ function changeCollaboration(changeCollaborationType) {
   fw.sendToMsg('others', 'CHANGE_COLLABORATION', {"collaborationType": changeCollaborationType, "newMeetingId": newMeetingId});
   fw.sendToMsg('others', 'CHANGE_COLLABORATION', {"collaborationType": changeCollaborationType, "newMeetingId": newMeetingId});
 }
 }
 
 
-document.addEventListener('touchmove', function (e) {
-    if (CHAT_UTIL.isIOS()) {
-        if ($(e.target).closest('.add_user_modal').length > 0
-            || $(e.target).closest('#overlay_user_list').length > 0)
-        {
-            e.stopPropagation();
-        } else {
-            e.preventDefault();
-        }
-    }
-}, {passive: false});
+var scrollLock = function (e) {
+  if (CHAT_UTIL.isIOS()) {
+    if ($(e.target).closest('.add_user_modal').length > 0
+      || $(e.target).closest('#overlay_user_list').length > 0
+      || $(e.target).closest('.pip_indicator').length > 0)
+    {
+      e.stopPropagation();
+    } else {
+      e.preventDefault();
+    }    
+  }
+}
+
+let collaboScreen = document.getElementById('collabo_main');
+
+function scrollLockON() {
+  collaboScreen.addEventListener('touchmove', scrollLock, {passive: false});
+}
+
+function scrollLockOFF() {
+  collaboScreen.removeEventListener('touchmove', scrollLock, {passive: false});
+}
 
 
 function initCollaborationUI(changeCollaborationType){
 function initCollaborationUI(changeCollaborationType){
   $('#coviewEraserCtrBtn').click();
   $('#coviewEraserCtrBtn').click();
@@ -572,6 +573,7 @@ function initCollaborationUI(changeCollaborationType){
 }
 }
 
 
 function Coview_exitCollaboration(isDocument = false) {
 function Coview_exitCollaboration(isDocument = false) {
+  scrollLockOFF();
   if (isDocument) {
   if (isDocument) {
     if (CHAT_UTIL.isIOS()) {
     if (CHAT_UTIL.isIOS()) {
       webkit.messageHandlers.exitMeetingRoom.postMessage({});
       webkit.messageHandlers.exitMeetingRoom.postMessage({});