Commit 8361eed9 by Lee Munkyeong

43271対応

parent ea1457f8
......@@ -142,7 +142,12 @@
PLATFORM = platform;
IS_MOBILE = isMobile;
IS_ONLINE = isOnline;
console.log("onChat");
if (CHAT_UTIL.isAndroid()) {
var needHostAlert = android.getExitHostAlert();
if (needHostAlert) {
alert(getLocalizedString("inform_exit_host_collaboration"));
}
}
CHAT_UI.refreshRoomList(ChatRoomType.GROUP);
CHAT_UI.dismissLoadingIndicator();
};
......
......@@ -56,7 +56,6 @@
</div>
</main>
<div id="loadingArea"></div>
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/socket.io.js"></script>
<script src="./js/libs/moment.js"></script>
......@@ -92,7 +91,6 @@
let IS_MOBILE = true;
let IS_ONLINE = false;
let roomId = 0;
$("#loadingArea").load("./loading.html");
if (typeof (android) != "undefined") {
android.getLoginParameter();
android.getGlobalParameter();
......
......@@ -208,6 +208,12 @@
PLATFORM = platform;
IS_MOBILE = isMobile;
IS_ONLINE = isOnline;
if (CHAT_UTIL.isAndroid()) {
var needHostAlert = android.getExitHostAlert();
if (needHostAlert) {
alert(getLocalizedString("inform_exit_host_collaboration"));
}
}
CHAT_UI.loadMessages(CHAT.globalLoginParameter.roomId, CHAT.globalLoginParameter.roomName);
};
</script>
......
......@@ -390,6 +390,9 @@ document.addEventListener("DOMContentLoaded", function () {
if (joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) {
isDocument = true;
}
if (CHAT_UTIL.isAndroid()) {
android.setExitHostAlert();
}
if (isDocument) {
if (CHAT_UTIL.isIOS()) {
webkit.messageHandlers.exitMeetingRoom.postMessage({});
......@@ -414,7 +417,6 @@ document.addEventListener("DOMContentLoaded", function () {
webkit.messageHandlers.showExitHostAlert.postMessage({});
return;
}
alert(getLocalizedString("inform_exit_host_collaboration"));
$("#loadingIndicator").removeClass("full_active");
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment