Skip to content

C
chat_webview
Commit 6116448a by Lee Munkyeong
Options

文書協業実装

parent 5ad65dc3
Showing with 108 additions and 181 deletions
public_new/chat_room.html
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
</a> </a>
</div> </div>
<div class="footer_item"> <div class="footer_item">
<img src="icon/icon_paste.png" alt="文書アイコン" onclick="alert(getLocalizedString('notify_not_released'));"> <img src="icon/icon_paste.png" alt="文書アイコン" onclick="javascript:CHAT_UI.startCollaboration(collaborationType.DOCUMENT);">
<p>文書</p> <p>文書</p>
</div> </div>
<div class="footer_item"> <div class="footer_item">
......
public_new/collaboration_documents.html
...@@ -5,179 +5,96 @@ ...@@ -5,179 +5,96 @@
<!-- Required meta tags --> <!-- Required meta tags -->
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" <meta name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0"> content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
<title>LiveTaskyell</title> <title>LiveTaskyell</title>
<link rel="stylesheet" href="./css/notosansjp.css"> <link rel="stylesheet" href="./css/notosansjp.css">
<link href="./fontawesome/css/all.css" rel="stylesheet"> <link href="./fontawesome/css/all.css" rel="stylesheet">
<link rel="stylesheet" href="./css/bootstrap.min.css"> <link rel="stylesheet" href="./css/bootstrap.min.css">
<link rel="stylesheet" href="./css/common.css"> <link rel="stylesheet" href="./css/common.css">
<link rel="stylesheet" href="./css/contact.css">
<link rel="stylesheet" href="./css/collaboration.css"> <link rel="stylesheet" href="./css/collaboration.css">
<link rel="stylesheet" href="./css/footer.css"> <link rel="stylesheet" href="./css/footer.css">
<link rel="stylesheet" href="./css/loading.css">
<link rel="stylesheet" href="./css/font-awesome.css"> <link rel="stylesheet" href="./css/font-awesome.css">
<link rel="stylesheet" href="./css/share.css"> <link rel="stylesheet" href="./css/share.css">
</head> </head>
<body> <body>
<!-- ナビメニュー --> <!-- ナビメニュー -->
<header id="collabo_header"> <header id="collabo_header">
<div class="d-flex align-items-center h-100"> <div class="d-flex align-items-center h-100">
<div class="collabo_nav_l text-left w-100"> <div class="collabo_nav_l text-left w-100">
通話中
<span>15:20</span>
</div>
<div class="collabo_nav_r">
<div class="text-right d-flex align-items-center">
<button type="button" name="button" class="btn user_btn"></button>
<button type="button" name="button" class="btn add_user_btn"></button>
<button type="button" name="button" class="btn menu_btn"></button>
</div>
</div>
</div> </div>
</header><!-- header --> <div class="collabo_nav_r">
<div class="text-right d-flex align-items-center">
<!-- 拡大縮小機能 --> <button type="button" name="button" class="btn add_user_btn"></button>
<div id="zoom"></div> <button type="button" name="button" class="btn menu_btn" onclick="android.startPipMode();"></button>
<!-- コンテンツ -->
<main id="collabo_main">
<div class="document_wrap">
<div class="coview_share_body coview_share_area" id="coviewShare" style="z-index: 1;">
</div> </div>
</div> </div>
</main>
<!-- ユーザー追加オーバーレイ -->
<div id="overlay_add_user_list" class="none">
<nav>
<div class="row h-100 align-items-center">
<div class="col-4 pr-0">
<div class="nav-item">
<a href="#" class="close_btn">閉じる</a>
</div>
</div>
<div class="col-4 p-0">
<div class="nav-item p-0">
<h1 class="nav-ttl">ユーザー選択</h1>
</div>
</div>
<div class="col-4 pl-0">
<div class="nav-item text-right">
<a href="#" class="inv_btn">招待</a>
</div>
</div><!-- .col -->
</div><!-- .row -->
</nav><!-- nav -->
<!-- ユーザー検索 -->
<div class="search_form">
<form>
<input type="search" name="search" placeholder="ユーザー検索" maxlength="30">
<span class="src_icon"></span>
<a href="#" class="cancel none">キャンセル</a>
</form>
</div>
<!-- ユーザーリスト -->
<div id="add_user_list"></div>
</div> </div>
</header><!-- header -->
<!-- オーバーレイ　メニュー --> <!-- コンテンツ -->
<div id="collaboration_video_overlay_menu"></div> <main id="collabo_main" class="none">
<!-- オーバーレイ　ユーザーリスト --> <div class="document_wrap">
<div id="overlay_user_list" class="overlay noscroll"> <div class="coview_share_body coview_share_area" id="coviewShare" style="z-index: 1;">
<div id="collabotarion_overlay_user_list"></div>
</div>
<div id="modal_document_selector"></div>
<!-- キャプチャ　モーダル -->
<div id="modal_collabo_capture"></div>
<!-- プロフィールモーダル -->
<div id="modal_collabo_profile"></div>
<div id="modal_collabo_profile2"></div>
<!-- ホスト変更モーダル -->
<div id="modal_collabo_change_host"></div>
<!-- ホストリクエストモーダル -->
<div id="modal_collabo_host_request"></div>
<!-- フッター -->
<footer id="collabo_footer_menu" class="active">
<button type="button" name="button" class="footer_menu_btn"></button>
<div class="footer_menu-wrap d-flex justify-content-around h-100">
<div class="d-flex align-items-center h-100">
<div class="footer_menu_item">
<a href="#">
<div class="img_wrap bg_blue">
<img src="icon/icon_collabo_pen_white.png" alt="ペン">
</div>
</a>
</div>
<div class="footer_menu_item">
<a href="#">
<div class="img_wrap bg_blue">
<img src="icon/icon_collabo_place_white.png" alt="場所">
</div>
</a>
</div>
<div class="footer_menu_item">
<a href="#">
<div class="img_wrap bg_blue">
<img src="icon/icon_collabo_delete_white.png" alt="削除">
</div>
</a>
</div>
</div>
<div class="d-flex align-items-center h-100">
<div class="footer_menu_item">
<a href="#">
<div class="img_wrap bg_gray">
<img src="icon/icon_collabo_rewind_white.png" alt="戻る">
</div>
</a>
</div>
<div class="footer_menu_item">
<a href="#">
<div class="img_wrap bg_gray">
<img src="icon/icon_collabo_forward_white.png" alt="進む">
</div>
</a>
</div>
</div>
</div> </div>
</footer> </div>
<!-- フッター --> </main>
<div id="footer_collabo"></div>
<!-- オーバーレイ　メニュー -->
<script src="./js/libs/jquery-3.3.1.min.js"></script> <div id="collaboration_voice_overlay_menu"></div>
<script src="./js/libs/socket.io.js"></script> <!-- オーバーレイ　ユーザーリスト -->
<script src="./js/libs/moment.js"></script> <div id="overlay_user_list" class="overlay slidein" style="z-index: 3;">
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script> <div id="collaboration_overlay_user_list"></div>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script> </div>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script> <!-- プロフィールモーダル -->
<script src="./js/libs/jquery.mark.min.js"></script> <div id="userProfileModalInCollaboration"></div>
<script src="./js/constant.js"></script> <div id="modal_collabo_profile2"></div>
<script src="./js/collaboration.js"></script> <div id="add_user_list" ></div>
<script src="./js/common.js"></script> <div id="modal_add_user_confirm" ></div>
<script src="./js/chat.js"></script> <!-- ホスト変更モーダル -->
<script src="./js/chat-ui.js"></script> <div id="modal_collabo_change_host"></div>
<script src="./js/chat-util.js"></script>
<script src="./js/chat-db.js"></script> <!-- ホストリクエストモーダル -->
<script src="./js/language.js"></script> <div id="modal_collabo_host_request"></div>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script> <!-- フッター -->
<script src="./js/language_en.js" charset="UTF-8"></script> <div id="footer_collabo"></div>
<script src="./js/chat-websocket.js"></script> <div id="loadingArea"></div>
<script src="https://livetaskyell.abookcloud.com/coview_api.js"></script> <script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/share.js"></script> <script src="./js/libs/socket.io.js"></script>
<script> <script src="./js/libs/moment.js"></script>
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script>
<script src="./js/libs/jquery.mark.min.js"></script>
<script src="./js/constant.js"></script>
<script src="./js/collaboration.js"></script>
<script src="./js/common.js"></script>
<script src="./js/loading.js"></script>
<script src="./js/chat.js"></script>
<script src="./js/chat-ui.js"></script>
<script src="./js/chat-util.js"></script>
<script src="./js/chat-db.js"></script>
<script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<script src="./js/chat-websocket.js"></script>
<script src="https://livetaskyell.abookcloud.com/coview_api.js"></script>
<script src="./js/share.js"></script>
<script>
$("#footer_collabo").load("./footer_collabo.html"); $("#footer_collabo").load("./footer_collabo.html");
$("#modal_collabo_host_request").load("./modal_collabo_host_request.html"); $("#modal_collabo_host_request").load("./modal_collabo_host_request.html");
$("#modal_collabo_change_host").load("./modal_collabo_change_host.html"); $("#modal_collabo_change_host").load("./modal_collabo_change_host.html");
$("#modal_collabo_profile2").load("./modal_collabo_profile2.html");
$("#modal_collabo_profile").load("./modal_collabo_profile.html");
$("#modal_collabo_capture").load("./modal_collabo_capture.html"); $("#modal_collabo_capture").load("./modal_collabo_capture.html");
$("#collabotarion_overlay_user_list").load("./collabotarion_overlay_user_list.html"); $("#modal_collabo_profile2").load("./modal_collabo_profile2.html");
$("#collaboration_video_overlay_menu").load("./collaboration_video_overlay_menu.html"); $("#loadingArea").load("./loading.html");
$("#zoom").load("./zoom.html"); $("#collaboration_voice_overlay_menu").load("./collaboration_voice_overlay_menu.html");
$("#modal_document_selector").load(); $("#add_user_list").load("./modal_add_user_list.html");
let CHAT_SERVER_URL = ''; let CHAT_SERVER_URL = '';
let CMS_SERVER_URL = ''; let CMS_SERVER_URL = '';
...@@ -195,33 +112,26 @@ ...@@ -195,33 +112,26 @@
webkit.messageHandlers.getGlobalParameter.postMessage({}); webkit.messageHandlers.getGlobalParameter.postMessage({});
} }
async function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) { async function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
console.log('-------------------------------------');
CHAT_SERVER_URL = chatServerUrl; CHAT_SERVER_URL = chatServerUrl;
CMS_SERVER_URL = cmsServerUrl; CMS_SERVER_URL = cmsServerUrl;
PLATFORM = platform; PLATFORM = platform;
IS_MOBILE = isMobile; IS_MOBILE = isMobile;
IS_ONLINE = isOnline; IS_ONLINE = isOnline;
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
collaborationJoinFlg = CHAT_DB.getCollaborationJoinFlg(); collaborationJoinFlg = CHAT_DB.getCollaborationJoinFlg();
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
collaborationJoinFlg = android.getCollaborationJoinFlg(); collaborationJoinFlg = android.getCollaborationJoinFlg();
console.log(collaborationJoinFlg); console.log(collaborationJoinFlg);
} }
console.log(PLATFORM); globalUserInfo.coWorkType = collaborationTypeKey.DOCUMENT;
globalUserInfo.coWorkType = collaborationTypeKey.AUDIO;
CHAT_SOCKET.connectSocket(); CHAT_SOCKET.connectSocket();
socket.emit('join', CHAT.globalLoginParameter, function() { socket.emit('join', CHAT.globalLoginParameter, function() {
console.log('join Chat Socket finishi');
}); });
CHAT_UI.displayDocumentSelectScreen();
};
};
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
public_new/footer_collabo.html
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</a> </a>
</div> </div>
<div class="footer_item"> <div class="footer_item">
<a href="javascript:Coview_exitCollaboration();"> <a href="javascript:Coview_exitCollaboration(isDocument);">
<div class="img_wrap bg_red"> <div class="img_wrap bg_red">
<img src="icon/icon_tell.png" alt="通話"> <img src="icon/icon_tell.png" alt="通話">
</div> </div>
......
public_new/js/chat-ui.js
...@@ -2484,20 +2484,6 @@ CHAT_UI.startCollaboration = function(collaborationType) { ...@@ -2484,20 +2484,6 @@ CHAT_UI.startCollaboration = function(collaborationType) {
} }
} }
CHAT_UI.displayDocumentSelectScreen = function() {
var documentList = CHAT_DB.getContentList();
var documentTemplate;
$.get({ url: "./template/template_document_list.html", async: false }
, function(text) {
documentTemplate = text;
});
let html = Mustache.render(documentTemplate, {
documentList: documentList
});
let obj = jQuery.parseHTML(html);
$('#overlay_document_list').append(obj);
$('#overlay_document_list').removeClass('none');
}
CHAT_UI.refreshJoinedCollaboration = function(loginIdList, hostName) { CHAT_UI.refreshJoinedCollaboration = function(loginIdList, hostName) {
CHAT_UI.showLoadingIndicator(); CHAT_UI.showLoadingIndicator();
......
public_new/js/chat-util.js
...@@ -128,6 +128,9 @@ CHAT_UTIL.getCollaborationType = function(key) { ...@@ -128,6 +128,9 @@ CHAT_UTIL.getCollaborationType = function(key) {
case collaborationTypeKey.VIDEO: case collaborationTypeKey.VIDEO:
return collaborationType.VIDEO; return collaborationType.VIDEO;
break; break;
case collaborationTypeKey.DOCUMENT:
return collaborationType.DOCUMENT;
break;
default: default:
return 0; return 0;
break; break;
......
public_new/js/constant.js
...@@ -40,13 +40,15 @@ const nameCardAreaId = { ...@@ -40,13 +40,15 @@ const nameCardAreaId = {
const collaborationTypeKey = { const collaborationTypeKey = {
AUDIO : "audio", AUDIO : "audio",
CAMERA : "camera", CAMERA : "camera",
VIDEO : "video" VIDEO : "video" ,
DOCUMENT : "document"
} }
const collaborationType = { const collaborationType = {
AUDIO : 0, AUDIO : 0,
CAMERA : 2, CAMERA : 2,
VIDEO : 3 VIDEO : 3,
DOCUMENT : 4
} }
const makeRoomFlg = { const makeRoomFlg = {
......
public_new/js/share.js
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
/* Functions */ /* Functions */
/* --------------------------------------------------- */ /* --------------------------------------------------- */
let coview_api = new CoviewApi(); let coview_api = new CoviewApi();
var isDocument = false;
$(function() { $(function() {
var coviewApiActive = coview_api.Init( var coviewApiActive = coview_api.Init(
{ {
...@@ -150,19 +151,36 @@ $(function() { ...@@ -150,19 +151,36 @@ $(function() {
console.log('------------------------------'); console.log('------------------------------');
console.log(globalUserInfo.coWorkType); console.log(globalUserInfo.coWorkType);
console.log(collaborationJoinFlg); console.log(collaborationJoinFlg);
if (globalUserInfo.coWorkType == collaborationTypeKey.DOCUMENT) {
isDocument = true;
globalUserInfo.coWorkType = collaborationTypeKey.AUDIO;
}
if (collaborationJoinFlg == '1') { if (collaborationJoinFlg == '1') {
coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType); coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
} else if (collaborationJoinFlg == '0') { } else if (collaborationJoinFlg == '0') {
coview_api.CreateRoom(globalUserInfo.roomId, globalUserInfo.coWorkType); coview_api.CreateRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
} }
if (isDocument) {
if (CHAT_UTIL.isIOS()) {
//TODO 画面を縮小し、会議室に入場する処理
} else if (CHAT_UTIL.isAndroid()) {
android.startContentView();
}
}
Coview_moveToVideoShareArea(); Coview_moveToVideoShareArea();
break; break;
case "CreateRoomResponse": case "CreateRoomResponse":
if (json.resultCode == 200) { if (json.resultCode == 200) {
var coviewInviteMessage = "" + messageSeperator + messageType.COMMUNICATIONSTART + messageSeperator + CHAT_UTIL.getCollaborationType(globalUserInfo.coWorkType); var coviewInviteMessage;
if (isDocument) {
coviewInviteMessage = "" + messageSeperator + messageType.COMMUNICATIONSTART + messageSeperator + CHAT_UTIL.getCollaborationType(collaborationTypeKey.DOCUMENT);
} else {
coviewInviteMessage = "" + messageSeperator + messageType.COMMUNICATIONSTART + messageSeperator + CHAT_UTIL.getCollaborationType(globalUserInfo.coWorkType);
}
socket.emit('createMessage', { socket.emit('createMessage', {
text: coviewInviteMessage text: coviewInviteMessage
}, 0); }, 0);
} else { } else {
} }
break; break;
...@@ -214,7 +232,14 @@ function Coview_moveToVideoShareArea() { ...@@ -214,7 +232,14 @@ function Coview_moveToVideoShareArea() {
$('#collabo_main').removeClass('none'); $('#collabo_main').removeClass('none');
} }
function Coview_exitCollaboration() { function Coview_exitCollaboration(isDocument) {
if (isDocument) {
if (CHAT_UTIL.isIOS()) {
//TODO IOS会議室退場処理
} else if (CHAT_UTIL.isAndroid()) {
android.exitMeetingRoom();
}
}
coview_api.LeaveRoom(); coview_api.LeaveRoom();
CHAT_UI.joinRoom(CHAT.globalLoginParameter.roomId, CHAT.globalLoginParameter.name); CHAT_UI.joinRoom(CHAT.globalLoginParameter.roomId, CHAT.globalLoginParameter.name);
} }
......
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