Merge branch 'bug/#44034_image_not_zoom_in_modal' into debug/console_logs

public_new/css/chat.css

@@ -817,8 +817,16 @@ input[name="tab_item"] {
   width: 100%!important;
   width: 100%!important;
 }
 }
 .modal-body #modal_image {
 .modal-body #modal_image {
-    width: 100%;
-    height: 100%;
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+
+.picture-modal {
+  max-width: 85vw;
+  max-height: 85vh;
+  width: 100%;
+  height: 100%;
 }
 }
 
 
 .menu_modal .modal-body ul {
 .menu_modal .modal-body ul {

public_new/js/common/common.js

@@ -147,21 +147,33 @@ Common.getProfileImgUrl = function (path) {
     return "./img/noImage.png";
     return "./img/noImage.png";
   } else if (path.includes("/mnt")) {
   } else if (path.includes("/mnt")) {
     const userInfo = path.split("/").reverse();
     const userInfo = path.split("/").reverse();
-    return (
-      serverInfo.cmsURL +
-      "/chatapi/user?profileFileName=" +
-      userInfo[0] +
-      "&profileGetLoginId=" +
-      userInfo[1] +
-      "&sid=" +
-      currentUserInfo.sid +
-      "&cmd=12"
-    );
+
+    if (deviceInfo.isiOS()) {
+      const receivedString = NativeBridgeDataSource.getCachedImage(userInfo[1]);
+      if (receivedString == "" || receivedString == undefined) {
+        return Common.generateProfileImgURLFromServer(userInfo[0], userInfo[1]);
+      }
+      return "data:image/"+userInfo[0].split('.').pop()+";base64," + receivedString;
+    }
+    return Common.generateProfileImgURLFromServer(userInfo[0], userInfo[1]);
   } else {
   } else {
     return path;
     return path;
   }
   }
 };
 };
 
 
+Common.generateProfileImgURLFromServer = function (fileName, loginID) {
+  return (
+    serverInfo.cmsURL +
+    "/chatapi/user?profileFileName=" +
+    fileName +
+    "&profileGetLoginId=" +
+    loginID +
+    "&sid=" +
+    currentUserInfo.sid +
+    "&cmd=12"
+  );
+};
+
 Common.startCollaboration = function (collaborationType) {
 Common.startCollaboration = function (collaborationType) {
   console.log(
   console.log(
     "peacekim:: Common.startCollaboration type: " + collaborationType
     "peacekim:: Common.startCollaboration type: " + collaborationType

public_new/js/common/constant.js

@@ -142,7 +142,7 @@ const SOCKET_KEY = {
   CREATE_TEXT: "createText",
   CREATE_TEXT: "createText",
   CREATE_IMAGE: "createImage",
   CREATE_IMAGE: "createImage",
   CREATE_VIDEO: "createVideo",
   CREATE_VIDEO: "createVideo",
-  COMMUNICATION: "communication",  
+  COMMUNICATION: "communication",
   GET_GROUP_LIST: "getGroupList",
   GET_GROUP_LIST: "getGroupList",
   LEAVE_ROOM: "leaveRoom",
   LEAVE_ROOM: "leaveRoom",
 };
 };
@@ -190,6 +190,7 @@ const NATIVE_KEY_IOS = {
   getUserListByLoginId: "getUserListByLoginId",
   getUserListByLoginId: "getUserListByLoginId",
   getMessageListFromMessageId: "getMessageListFromMessageId",
   getMessageListFromMessageId: "getMessageListFromMessageId",
   updatePreMessage: "updatePreMessage",
   updatePreMessage: "updatePreMessage",
+  getCachedImage: "getCachedImage",
 };
 };
 
 
-const BIZ_TASK_YELL_URL = "https://biztaskyell.abookcloud.com";
+const BIZ_TASK_YELL_URL = "https://biztaskyell.abookcloud.com";
\ No newline at end of file

public_new/js/common/native-bridge-datasource.js

@@ -415,4 +415,10 @@ NativeBridgeDataSource.getHostRequestFlg = function () {
   } else {
   } else {
     return android.getHostRequestFlg();
     return android.getHostRequestFlg();
   }
   }
-};
+};
\ No newline at end of file
+
+NativeBridgeDataSource.getCachedImage = function (loginID) {
+  if (deviceInfo.isiOS()) {
+    return callNativeApp(NATIVE_KEY_IOS.getCachedImage, { loginID: loginID });
+  }
+};

public_new/js/views/archive/archive.js

@@ -211,7 +211,7 @@ ArchiveUI.appendImageTypePlayer = function (filePath) {
 ArchiveUI.appendVideoTypePlayer = function (filePath) {
 ArchiveUI.appendVideoTypePlayer = function (filePath) {
   if (deviceInfo.isiOS()) {
   if (deviceInfo.isiOS()) {
     $("#archive_player").prepend(
     $("#archive_player").prepend(
-      '<video class="archive_player" controls autoplay muted playsinline controlsList="nodownload"><source src="' +
+      '<video class="archive_player" controls autoplay playsinline controlsList="nodownload"><source src="' +
         filePath +
         filePath +
         '" type="video/mp4"><source src="' +
         '" type="video/mp4"><source src="' +
         filePath +
         filePath +
@@ -223,7 +223,7 @@ ArchiveUI.appendVideoTypePlayer = function (filePath) {
     $("#archive_player").prepend(
     $("#archive_player").prepend(
       '<video class="archive_player" src=' +
       '<video class="archive_player" src=' +
         filePath +
         filePath +
-        ' controls autoplay muted playsinline controlsList="nodownload"></video>'
+        ' controls autoplay playsinline controlsList="nodownload"></video>'
     );
     );
   }
   }
 };
 };

public_new/modal_chat_picture.html

@@ -6,7 +6,7 @@
           <span aria-hidden="true">&times;</span>
           <span aria-hidden="true">&times;</span>
         </button>
         </button>
       </div>
       </div>
-      <div class="modal-body">
+      <div class="modal-body" style="height: 85vh!important; max-height: 85vh;">
         <div class="picture-modal">
         <div class="picture-modal">
           <img src="" id="modal_image">
           <img src="" id="modal_image">
         </div>
         </div>