Merge branch 'bug/offline' into 'develop'

Bug/offline

See merge request !240

public_new/js/common/common.js

@@ -111,6 +111,9 @@ Common.refreshForOnline = function () {
   if (typeof Namecard != "undefined") {
   if (typeof Namecard != "undefined") {
     Namecard.refreshForOnline();
     Namecard.refreshForOnline();
   }
   }
+  if (document.readyState == "complete") {
+    Common.dismissLoadingIndicator();
+  }
 };
 };
 
 
 Common.refreshForOffline = function () {
 Common.refreshForOffline = function () {
@@ -137,21 +140,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) {
   if (deviceInfo.isAndroid()) {
   if (deviceInfo.isAndroid()) {
     if (
     if (

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 });
+  }
+};