Skip to content

C
chat_webview
Commit 2c6664a3 by Lee Munkyeong
Options

Merge branch 'feature/android6以下の対応' into 'develop' 

アンドロイド8以下バージョンでのアラート追加、キャプチャー機能修正

See merge request !135
parents 695e99dc 8c3b7809
Showing with 59 additions and 33 deletions
public_new/chat_room.html
...@@ -102,30 +102,30 @@ ...@@ -102,30 +102,30 @@
<div class="footer_content_b"> <div class="footer_content_b">
<div class="d-flex flex-row justify-content-around h-100"> <div class="d-flex flex-row justify-content-around h-100">
<div class="footer_item"> <div class="footer_item">
<a href="javascript:CHAT_UI.startCollaboration(collaborationType.AUDIO);"> <a href="javascript:CHAT_UI.startCollaboration(COLLABORATION_TYPE.AUDIO);">
<img src="icon/icon_phone.png" alt="通話アイコン"> <img src="icon/icon_phone.png" alt="通話アイコン">
<p>通話</p> <p>通話</p>
</a> </a>
</div> </div>
<div class="footer_item"> <div class="footer_item">
<img src="icon/icon_paste.png" alt="文書アイコン" onclick="CHAT_UI.startCollaboration(collaborationType.DOCUMENT);"> <img src="icon/icon_paste.png" alt="文書アイコン" onclick="CHAT_UI.startCollaboration(COLLABORATION_TYPE.DOCUMENT);">
<p>文書</p> <p>文書</p>
</div> </div>
<div class="footer_item"> <div class="footer_item">
<a href="javascript:CHAT_UI.startCollaboration(collaborationType.CAMERA);"> <a href="javascript:CHAT_UI.startCollaboration(COLLABORATION_TYPE.CAMERA);">
<img src="icon/icon_photo.png" alt="画像アイコン"> <img src="icon/icon_photo.png" alt="画像アイコン">
<p>画像</p> <p>画像</p>
</a> </a>
</div> </div>
<div class="footer_item"> <div class="footer_item">
<a href="javascript:CHAT_UI.startCollaboration(collaborationType.VIDEO);"> <a href="javascript:CHAT_UI.startCollaboration(COLLABORATION_TYPE.VIDEO);">
<img src="icon/icon_movie.png" alt="動画アイコン"> <img src="icon/icon_movie.png" alt="動画アイコン">
<p>動画</p> <p>動画</p>
</a> </a>
</div> </div>
<!--リリース後開発予定--> <!--リリース後開発予定-->
<div class="footer_item"> <div class="footer_item">
<img src="icon/icon_whiteboard_gray.png" alt="ホワイトボードアイコン" onclick="javascript:CHAT_UI.startCollaboration(collaborationType.BOARD);"> <img src="icon/icon_whiteboard_gray.png" alt="ホワイトボードアイコン" onclick="javascript:CHAT_UI.startCollaboration(COLLABORATION_TYPE.BOARD);">
<p>ボード</p> <p>ボード</p>
</div> </div>
</div> </div>
...@@ -174,6 +174,7 @@ ...@@ -174,6 +174,7 @@
let PLATFORM = ''; let PLATFORM = '';
let IS_MOBILE = true; let IS_MOBILE = true;
let IS_ONLINE = false; let IS_ONLINE = false;
let androidVersion = 0;
$("#pictureModal").load("./modal_chat_picture.html"); $("#pictureModal").load("./modal_chat_picture.html");
$("#chatMenuModal").load("./modal_chat_menu.html"); $("#chatMenuModal").load("./modal_chat_menu.html");
$("#loadingArea").load("./loading.html"); $("#loadingArea").load("./loading.html");
...@@ -182,6 +183,7 @@ ...@@ -182,6 +183,7 @@
android.getLoginParameter(); android.getLoginParameter();
android.getGlobalParameter(); android.getGlobalParameter();
android.saveSelectedUserList(""); android.saveSelectedUserList("");
androidVersion = android.getAndroidVersion();
} else { } else {
webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({}); webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
webkit.messageHandlers.getGlobalParameter.postMessage({}); webkit.messageHandlers.getGlobalParameter.postMessage({});
......
public_new/collaboration.html
...@@ -195,6 +195,7 @@ ...@@ -195,6 +195,7 @@
let roomType; let roomType;
let joinCollaborationType = 0; let joinCollaborationType = 0;
let joinMeetingId = 0; let joinMeetingId = 0;
let androidVersion = 0;
if (typeof(android) != "undefined") { if (typeof(android) != "undefined") {
android.getLoginParameter(); android.getLoginParameter();
...@@ -236,7 +237,13 @@ ...@@ -236,7 +237,13 @@
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
joinCollaborationType = android.getJoinCollaborationType(); joinCollaborationType = android.getJoinCollaborationType();
collaborationJoinFlg = android.getCollaborationJoinFlg(); collaborationJoinFlg = android.getCollaborationJoinFlg();
androidVersion = android.getAndroidVersion();
if (joinCollaborationType == COLLABORATION_TYPE.DOCUMENT && androidVersion < ANDROID_SDK_VERSION.O) {
alert(getLocalizedString('not_support_version'));
android.openCommunicationHome();
}
} }
initCollaborationUI(joinCollaborationType); initCollaborationUI(joinCollaborationType);
globalUserInfo.coWorkType = CHAT_UTIL.getCoviewTypeFromCollaborationType(joinCollaborationType); globalUserInfo.coWorkType = CHAT_UTIL.getCoviewTypeFromCollaborationType(joinCollaborationType);
if (collaborationJoinFlg != '2') { if (collaborationJoinFlg != '2') {
......
public_new/collaboration_overlay_menu.html
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<div class="overlay_menu h-100 d-flex justify-content-center align-items-center"> <div class="overlay_menu h-100 d-flex justify-content-center align-items-center">
<div class="menu_wrap"> <div class="menu_wrap">
<div class="menu d-flex flex-row flex-wrap"> <div class="menu d-flex flex-row flex-wrap">
<div class="item collaboration_contents picture_contents video_contents document_contents board_contents"> <div class="item collaboration_contents picture_contents document_contents board_contents video_contents">
<a href="javascript:changeCollaboration(collaborationType.AUDIO);" <a href="javascript:changeCollaboration(COLLABORATION_TYPE.AUDIO);"
class="d-flex flex-column align-items-center"> class="d-flex flex-column align-items-center">
<div class="img_wrap"> <div class="img_wrap">
<img src="icon/icon_collabo_headset.png" alt="音声共有"> <img src="icon/icon_collabo_headset.png" alt="音声共有">
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</a> </a>
</div> </div>
<div class="item collaboration_contents picture_contents voice_contents document_contents board_contents"> <div class="item collaboration_contents picture_contents voice_contents document_contents board_contents">
<a href="javascript:changeCollaboration(collaborationType.VIDEO);" <a href="javascript:changeCollaboration(COLLABORATION_TYPE.VIDEO);"
class="d-flex flex-column align-items-center"> class="d-flex flex-column align-items-center">
<div class="img_wrap"> <div class="img_wrap">
<img src="icon/icon_collabo_videocam.png" alt="動画共有"> <img src="icon/icon_collabo_videocam.png" alt="動画共有">
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</a> </a>
</div> </div>
<div class="item collaboration_contents video_contents voice_contents document_contents board_contents"> <div class="item collaboration_contents video_contents voice_contents document_contents board_contents">
<a href="javascript:changeCollaboration(collaborationType.CAMERA);" <a href="javascript:changeCollaboration(COLLABORATION_TYPE.CAMERA);"
class="d-flex flex-column align-items-center"> class="d-flex flex-column align-items-center">
<div class="img_wrap"> <div class="img_wrap">
<img src="icon/icon_collabo_picture.png" alt="写真共有"> <img src="icon/icon_collabo_picture.png" alt="写真共有">
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</a> </a>
</div> </div>
<div class="item collaboration_contents video_contents voice_contents picture_contents board_contents"> <div class="item collaboration_contents video_contents voice_contents picture_contents board_contents">
<a href="javascript:changeCollaboration(collaborationType.DOCUMENT);" <a href="javascript:changeCollaboration(COLLABORATION_TYPE.DOCUMENT);"
class="d-flex flex-column align-items-center"> class="d-flex flex-column align-items-center">
<div class="img_wrap"> <div class="img_wrap">
<img src="icon/icon_collabo_document.png" alt="文書共有"> <img src="icon/icon_collabo_document.png" alt="文書共有">
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</a> </a>
</div> </div>
<div class="item collaboration_contents video_contents voice_contents picture_contents document_contents"> <div class="item collaboration_contents video_contents voice_contents picture_contents document_contents">
<a href="javascript:changeCollaboration(collaborationType.BOARD);" <a href="javascript:changeCollaboration(COLLABORATION_TYPE.BOARD);"
class="d-flex flex-column align-items-center"> class="d-flex flex-column align-items-center">
<div class="img_wrap"> <div class="img_wrap">
<img src="icon/icon_collabo_whiteboard.png" alt="落書き"> <img src="icon/icon_collabo_whiteboard.png" alt="落書き">
......
public_new/collaboration_picture_overlay_menu.html
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="menu_wrap"> <div class="menu_wrap">
<div class="menu d-flex flex-row flex-wrap"> <div class="menu d-flex flex-row flex-wrap">
<div class="item collaboration_contents picture_contents video_contents document_contents board_contents"> <div class="item collaboration_contents picture_contents video_contents document_contents board_contents">
<a href="javascript:changeCollaboration(collaborationType.AUDIO);" <a href="javascript:changeCollaboration(COLLABORATION_TYPE.AUDIO);"
class="d-flex flex-column align-items-center"> class="d-flex flex-column align-items-center">
<div class="img_wrap"> <div class="img_wrap">
<img src="icon/icon_collabo_headset.png" alt="音声共有"> <img src="icon/icon_collabo_headset.png" alt="音声共有">
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</a> </a>
</div> </div>
<div class="item collaboration_contents picture_contents voice_contents document_contents board_contents"> <div class="item collaboration_contents picture_contents voice_contents document_contents board_contents">
<a href="javascript:changeCollaboration(collaborationType.VIDEO);" <a href="javascript:changeCollaboration(COLLABORATION_TYPE.VIDEO);"
class="d-flex flex-column align-items-center"> class="d-flex flex-column align-items-center">
<div class="img_wrap"> <div class="img_wrap">
<img src="icon/icon_collabo_videocam.png" alt="動画共有"> <img src="icon/icon_collabo_videocam.png" alt="動画共有">
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</a> </a>
</div> </div>
<div class="item collaboration_contents video_contents voice_contents picture_contents board_contents"> <div class="item collaboration_contents video_contents voice_contents picture_contents board_contents">
<a href="javascript:changeCollaboration(collaborationType.DOCUMENT);" <a href="javascript:changeCollaboration(COLLABORATION_TYPE.DOCUMENT);"
class="d-flex flex-column align-items-center"> class="d-flex flex-column align-items-center">
<div class="img_wrap"> <div class="img_wrap">
<img src="icon/icon_collabo_document.png" alt="文書共有"> <img src="icon/icon_collabo_document.png" alt="文書共有">
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</a> </a>
</div> </div>
<div class="item collaboration_contents video_contents voice_contents picture_contents document_contents"> <div class="item collaboration_contents video_contents voice_contents picture_contents document_contents">
<a href="javascript:changeCollaboration(collaborationType.BOARD);" <a href="javascript:changeCollaboration(COLLABORATION_TYPE.BOARD);"
class="d-flex flex-column align-items-center"> class="d-flex flex-column align-items-center">
<div class="img_wrap"> <div class="img_wrap">
<img src="icon/icon_collabo_whiteboard.png" alt="落書き"> <img src="icon/icon_collabo_whiteboard.png" alt="落書き">
......
public_new/js/chat-ui.js
...@@ -900,7 +900,6 @@ CHAT_UI.waitForLoadingVideo = function(div, callback) { ...@@ -900,7 +900,6 @@ CHAT_UI.waitForLoadingVideo = function(div, callback) {
CHAT_UI.waitForLoadingImage = function(div, callback) { CHAT_UI.waitForLoadingImage = function(div, callback) {
var imgs = div.find("img"); var imgs = div.find("img");
console.log(imgs);
var count = imgs.length; var count = imgs.length;
if (count==0) if (count==0)
callback(); callback();
...@@ -908,7 +907,6 @@ CHAT_UI.waitForLoadingImage = function(div, callback) { ...@@ -908,7 +907,6 @@ CHAT_UI.waitForLoadingImage = function(div, callback) {
imgs.one( "load" , function( e ) { imgs.one( "load" , function( e ) {
// イメージが読み込まれた // イメージが読み込まれた
loaded++; loaded++;
console.log('++');
if ( loaded === count ) { if ( loaded === count ) {
callback(); callback();
} }
...@@ -1662,7 +1660,7 @@ CHAT_UI.startVoice = function(userShopMemberId, userName) { ...@@ -1662,7 +1660,7 @@ CHAT_UI.startVoice = function(userShopMemberId, userName) {
} else { } else {
webkit.messageHandlers.createChatRoom.postMessage({"roomType": "1", "userIdList": userIdList.join(','), "roomName": newRoomName, "screenFlg": makeRoomFlg.NAME_CARD, "isVoice": true}); webkit.messageHandlers.createChatRoom.postMessage({"roomType": "1", "userIdList": userIdList.join(','), "roomName": newRoomName, "screenFlg": makeRoomFlg.NAME_CARD, "isVoice": true});
} }
CHAT_UI.startCollaboration(collaborationType.AUDIO); CHAT_UI.startCollaboration(COLLABORATION_TYPE.AUDIO);
} }
CHAT_UI.makeNameCard = function(shopMemberId) { CHAT_UI.makeNameCard = function(shopMemberId) {
...@@ -2481,6 +2479,10 @@ CHAT_UI.joinCollaboration = function(collaborationType, meetingId = 0) { ...@@ -2481,6 +2479,10 @@ CHAT_UI.joinCollaboration = function(collaborationType, meetingId = 0) {
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
webkit.messageHandlers.joinCollaboration.postMessage({"collaborationType": collaborationType, "meetingId": meetingId}); webkit.messageHandlers.joinCollaboration.postMessage({"collaborationType": collaborationType, "meetingId": meetingId});
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
if (collaborationType == COLLABORATION_TYPE.DOCUMENT && androidVersion < ANDROID_SDK_VERSION.O) {
alert(getLocalizedString('not_support_version'));
return;
}
android.joinCollaboration(collaborationType, meetingId); android.joinCollaboration(collaborationType, meetingId);
} }
} }
...@@ -2489,6 +2491,10 @@ CHAT_UI.startCollaboration = function(collaborationType) { ...@@ -2489,6 +2491,10 @@ CHAT_UI.startCollaboration = function(collaborationType) {
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
webkit.messageHandlers.startCollaboration.postMessage(collaborationType); webkit.messageHandlers.startCollaboration.postMessage(collaborationType);
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
if (collaborationType == COLLABORATION_TYPE.DOCUMENT && androidVersion < ANDROID_SDK_VERSION.O) {
alert(getLocalizedString('not_support_version'));
return;
}
android.startCollaboration(collaborationType); android.startCollaboration(collaborationType);
} }
} }
......
public_new/js/chat-util.js
...@@ -120,13 +120,13 @@ function updateDuration() { ...@@ -120,13 +120,13 @@ function updateDuration() {
CHAT_UTIL.getCollaborationType = function(key) { CHAT_UTIL.getCollaborationType = function(key) {
switch(key) { switch(key) {
case collaborationTypeKey.AUDIO: case collaborationTypeKey.AUDIO:
return collaborationType.AUDIO; return COLLABORATION_TYPE.AUDIO;
case collaborationTypeKey.CAMERA: case collaborationTypeKey.CAMERA:
return collaborationType.CAMERA; return COLLABORATION_TYPE.CAMERA;
case collaborationTypeKey.VIDEO: case collaborationTypeKey.VIDEO:
return collaborationType.VIDEO; return COLLABORATION_TYPE.VIDEO;
case collaborationTypeKey.DOCUMENT: case collaborationTypeKey.DOCUMENT:
return collaborationType.DOCUMENT; return COLLABORATION_TYPE.DOCUMENT;
default: default:
return 0; return 0;
} }
...@@ -134,17 +134,17 @@ CHAT_UTIL.getCollaborationType = function(key) { ...@@ -134,17 +134,17 @@ CHAT_UTIL.getCollaborationType = function(key) {
CHAT_UTIL.getCoviewTypeFromCollaborationType = function(joinCollaborationType) { CHAT_UTIL.getCoviewTypeFromCollaborationType = function(joinCollaborationType) {
switch(joinCollaborationType) { switch(joinCollaborationType) {
case collaborationType.AUDIO: case COLLABORATION_TYPE.AUDIO:
console.log(collaborationTypeKey.AUDIO); console.log(collaborationTypeKey.AUDIO);
return collaborationTypeKey.AUDIO; return collaborationTypeKey.AUDIO;
case collaborationType.CAMERA: case COLLABORATION_TYPE.CAMERA:
console.log(collaborationTypeKey.CAMERA); console.log(collaborationTypeKey.CAMERA);
return collaborationTypeKey.CAMERA; return collaborationTypeKey.CAMERA;
case collaborationType.VIDEO: case COLLABORATION_TYPE.VIDEO:
return collaborationTypeKey.VIDEO; return collaborationTypeKey.VIDEO;
case collaborationType.DOCUMENT: case COLLABORATION_TYPE.DOCUMENT:
return collaborationTypeKey.DOCUMENT; return collaborationTypeKey.DOCUMENT;
case collaborationType.BOARD: case COLLABORATION_TYPE.BOARD:
return collaborationTypeKey.BOARD; return collaborationTypeKey.BOARD;
default: default:
return 0; return 0;
......
public_new/js/constant.js
...@@ -45,7 +45,7 @@ const collaborationTypeKey = { ...@@ -45,7 +45,7 @@ const collaborationTypeKey = {
BOARD : "board" BOARD : "board"
} }
const collaborationType = { const COLLABORATION_TYPE = {
AUDIO : 0, AUDIO : 0,
CAMERA : 2, CAMERA : 2,
VIDEO : 3, VIDEO : 3,
...@@ -58,5 +58,9 @@ const makeRoomFlg = { ...@@ -58,5 +58,9 @@ const makeRoomFlg = {
MAKE_ROOM : 1 MAKE_ROOM : 1
} }
const ANDROID_SDK_VERSION = {
O : 26
}
const messageSeperator = "<::split>"; const messageSeperator = "<::split>";
const dataMessageScheme = "::NOT_MESSAGE"; const dataMessageScheme = "::NOT_MESSAGE";
public_new/js/language_en.js
...@@ -95,5 +95,7 @@ $.lang.en = { ...@@ -95,5 +95,7 @@ $.lang.en = {
"error_empty_room_name" : "Please input room name.", "error_empty_room_name" : "Please input room name.",
"inform_exit_host_collaboration" : "The host has terminated the collaboration.", "inform_exit_host_collaboration" : "The host has terminated the collaboration.",
"request_capture" : " request Screen capture.(if you confirm this request, capture the screen and change the host)", "request_capture" : " request Screen capture.(if you confirm this request, capture the screen and change the host)",
"host_change_notify" : "host changed to %@" "host_change_notify" : "host changed to %@",
"not_support_version" : "did not support this device version.",
"err_target_android_version_not_support" : "did not support document collaboration on this user's device version."
} }
public_new/js/language_ja.js
...@@ -95,5 +95,7 @@ $.lang.ja = { ...@@ -95,5 +95,7 @@ $.lang.ja = {
"error_empty_room_name" : "ルーム名を入力してください。", "error_empty_room_name" : "ルーム名を入力してください。",
"inform_exit_host_collaboration" : "ホストが協業を終了しました。", "inform_exit_host_collaboration" : "ホストが協業を終了しました。",
"request_capture" : "様がキャプチャーをリクエストしました。（確認時画面をキャプチャーし、ホストを変更します。）", "request_capture" : "様がキャプチャーをリクエストしました。（確認時画面をキャプチャーし、ホストを変更します。）",
"host_change_notify" : "ホストが%@様に変更されました。" "host_change_notify" : "ホストが%@様に変更されました。",
"not_support_version" : "現在の端末バージョンでは利用できません。",
"err_target_android_version_not_support" : "対象ユーザの端末バージョンでは文書協業が利用できません。"
} }
\ No newline at end of file
public_new/js/language_ko.js
...@@ -95,5 +95,7 @@ $.lang.ko = { ...@@ -95,5 +95,7 @@ $.lang.ko = {
"error_empty_room_name" : "룸명을 입력해주세요.", "error_empty_room_name" : "룸명을 입력해주세요.",
"inform_exit_host_collaboration" : "호스트가 협업을 종료하였습니다.", "inform_exit_host_collaboration" : "호스트가 협업을 종료하였습니다.",
"request_capture" : "님이 화면캡처를 요청하셨습니다.(확인시 화면을캡처하고 호스트를 변경합니다.)", "request_capture" : "님이 화면캡처를 요청하셨습니다.(확인시 화면을캡처하고 호스트를 변경합니다.)",
"host_change_notify" : "호스트가 %@님으로 변경되었습니다." "host_change_notify" : "호스트가 %@님으로 변경되었습니다.",
"not_support_version" : "현재단말버전에서는 지원되지않는기능입니다.",
"err_target_android_version_not_support" : "해당 유저의 단말버전에서는 문서협업이 이용불가능합니다."
} }
public_new/modal_collabo_profile.html
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</button> </button>
{{/isFavorite}} {{/isFavorite}}
{{#isHost}} {{#isHost}}
<button type="button" class="ch_host_btn border-0 bg_green text_white" onclick="Coview_changeHost('{{loginId}}');" > <button type="button" class="ch_host_btn border-0 bg_green text_white" onclick="hostChangeRequest('{{loginId}}');" >
<div class="d-flex flex-column"> <div class="d-flex flex-column">
<div class="img_wrap"> <div class="img_wrap">
<img src="icon/icon_change_host.png" alt="ホスト変更"> <img src="icon/icon_change_host.png" alt="ホスト変更">
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</button> </button>
{{/isHost}} {{/isHost}}
{{^isHost}} {{^isHost}}
<button type="button" class="ch_host_btn border-0 bg_grey text_white" onclick="Coview_changeHost('{{loginId}}');" disabled> <button type="button" class="ch_host_btn border-0 bg_grey text_white" onclick="hostChangeRequest('{{loginId}}');" disabled>
<div class="d-flex flex-column"> <div class="d-flex flex-column">
<div class="img_wrap"> <div class="img_wrap">
<img src="icon/icon_change_host.png" alt="ホスト変更"> <img src="icon/icon_change_host.png" alt="ホスト変更">
......
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