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,19 +140,31 @@ 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();
+
+    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 {
+    return path;
+  }
+};
+
+Common.generateProfileImgURLFromServer = function (fileName, loginID) {
   return (
   return (
     serverInfo.cmsURL +
     serverInfo.cmsURL +
     "/chatapi/user?profileFileName=" +
     "/chatapi/user?profileFileName=" +
-      userInfo[0] +
+    fileName +
     "&profileGetLoginId=" +
     "&profileGetLoginId=" +
-      userInfo[1] +
+    loginID +
     "&sid=" +
     "&sid=" +
     currentUserInfo.sid +
     currentUserInfo.sid +
     "&cmd=12"
     "&cmd=12"
   );
   );
-  } else {
-    return path;
-  }
 };
 };
 
 
 Common.startCollaboration = function (collaborationType) {
 Common.startCollaboration = function (collaborationType) {

public_new/js/common/constant.js

@@ -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";

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

@@ -416,3 +416,9 @@ NativeBridgeDataSource.getHostRequestFlg = function () {
     return android.getHostRequestFlg();
     return android.getHostRequestFlg();
   }
   }
 };
 };
+
+NativeBridgeDataSource.getCachedImage = function (loginID) {
+  if (deviceInfo.isiOS()) {
+    return callNativeApp(NATIVE_KEY_IOS.getCachedImage, { loginID: loginID });
+  }
+};