Skip to content

C
chat_webview
Commit 7faebae6 by Lee Munkyeong
Options

Merge branch 'features/release_sp3_collaboration_picture' into 'release_sp3' 

Features/release sp3 collaboration picture

See merge request !80
parents 3e501fd3 9a9ef3f9
Showing with 980 additions and 108 deletions
public_new/chat_room.html
......@@ -102,7 +102,7 @@
<div class="footer_content_b">
<div class="d-flex flex-row justify-content-around h-100">
<div class="footer_item">
<a href="collaboration_voice.html">
<a href="javascript:CHAT_UI.startCollaboration(collaborationType.AUDIO);">
<img src="icon/icon_phone.png" alt="通話アイコン">
<p>通話</p>
</a>
......@@ -114,13 +114,13 @@
</a>
</div>
<div class="footer_item">
<a href="collaboration_picture.html">
<a href="javascript:CHAT_UI.startCollaboration(collaborationType.CAMERA);">
<img src="icon/icon_photo.png" alt="画像アイコン">
<p>画像</p>
</a>
</div>
<div class="footer_item">
<a href="collaboration_video.html">
<a href="javascript:CHAT_UI.startCollaboration(collaborationType.VIDEO);">
<img src="icon/icon_movie.png" alt="動画アイコン">
<p>動画</p>
</a>
......@@ -188,7 +188,7 @@
webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
webkit.messageHandlers.getGlobalParameter.postMessage({});
}
function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
CHAT_SERVER_URL = chatServerUrl;
CMS_SERVER_URL = cmsServerUrl;
......@@ -196,7 +196,6 @@
IS_MOBILE = isMobile;
IS_ONLINE = isOnline;
CHAT_UI.loadMessages(CHAT.globalLoginParameter.roomId, CHAT.globalLoginParameter.roomName);
};
</script>
</body>
......
public_new/collaboration_documents.html
......@@ -14,6 +14,7 @@
<link rel="stylesheet" href="./css/collaboration.css">
<link rel="stylesheet" href="./css/footer.css">
<link rel="stylesheet" href="./css/font-awesome.css">
<link rel="stylesheet" href="./css/share.css">
</head>
<body>
......@@ -35,11 +36,13 @@
</header><!-- header -->
<!-- 拡大縮小機能 -->
<!--#include virtual="zoom.html" -->
<div id="zoom"></div>
<!-- コンテンツ -->
<main id="collabo_main">
<div class="document_wrap">
<div class="coview_share_body coview_share_area" id="coviewShare" style="z-index: 1;">
</div>
</div>
</main>
......@@ -77,26 +80,23 @@
</div>
<!-- オーバーレイ　メニュー -->
<!--#include virtual="collaboration_video_overlay_menu.html" -->
<div id="collaboration_video_overlay_menu"></div>
<!-- オーバーレイ　ユーザーリスト -->
<div id="overlay_user_list" class="overlay noscroll">
<!--#include virtual="collabotarion_overlay_user_list.html" -->
<div id="collabotarion_overlay_user_list"></div>
</div>
<!-- キャプチャ　モーダル -->
<!--#include virtual="modal_collabo_capture.html" -->
<div id="modal_document_selector"></div>
<!-- キャプチャ　モーダル -->
<div id="modal_collabo_capture"></div>
<!-- プロフィールモーダル -->
<!--#include virtual="modal_collabo_profile.html" -->
<!--#include virtual="modal_collabo_profile2.html" -->
<div id="modal_collabo_profile"></div>
<div id="modal_collabo_profile2"></div>
<!-- ホスト変更モーダル -->
<!--#include virtual="modal_collabo_change_host.html" -->
<div id="modal_collabo_change_host"></div>
<!-- ホストリクエストモーダル -->
<!--#include virtual="modal_collabo_host_request.html" -->
<div id="modal_collabo_host_request"></div>
<!-- フッター -->
<footer id="collabo_footer_menu" class="active">
<button type="button" name="button" class="footer_menu_btn"></button>
......@@ -143,15 +143,83 @@
</div>
</footer>
<!-- フッター -->
<!--#include virtual="footer_collabo.html" -->
<div id="footer_collabo"></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>
<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/chat.js"></script>
<script src="./js/common.js"></script>
<script src="./js/constant.js"></script>
<script src="./js/collaboration.js"></script>
<script src="./js/common.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://app.coview.co.kr:7443/coview_api.js"></script>
<script src="./js/share.js"></script>
<script>
$("#footer_collabo").load("./footer_collabo.html");
$("#modal_collabo_host_request").load("./modal_collabo_host_request.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");
$("#collabotarion_overlay_user_list").load("./collabotarion_overlay_user_list.html");
$("#collaboration_video_overlay_menu").load("./collaboration_video_overlay_menu.html");
$("#zoom").load("./zoom.html");
$("#modal_document_selector").load();
let CHAT_SERVER_URL = '';
let CMS_SERVER_URL = '';
let ASSET_PATH = './';
let PLATFORM = '';
let IS_MOBILE = true;
let IS_ONLINE = false;
let collaborationJoinFlg = 0;
if (typeof(android) != "undefined") {
android.getLoginParameter();
android.getGlobalParameter();
} else {
}
async function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
console.log('-------------------------------------');
CHAT_SERVER_URL = chatServerUrl;
CMS_SERVER_URL = cmsServerUrl;
PLATFORM = platform;
IS_MOBILE = isMobile;
IS_ONLINE = isOnline;
if (CHAT_UTIL.isIOS()) {
} else if (CHAT_UTIL.isAndroid()) {
collaborationJoinFlg = android.getCollaborationJoinFlg();
console.log(collaborationJoinFlg);
}
console.log(PLATFORM);
globalUserInfo.coWorkType = collaborationTypeKey.AUDIO;
CHAT_SOCKET.connectSocket();
socket.emit('join', CHAT.globalLoginParameter, function() {
console.log('join Chat Socket finishi');
});
CHAT_UI.displayDocumentSelectScreen();
};
</script>
</body>
</html>
\ No newline at end of file
public_new/collaboration_picture.html
......@@ -14,6 +14,7 @@
<link rel="stylesheet" href="./css/collaboration.css">
<link rel="stylesheet" href="./css/footer.css">
<link rel="stylesheet" href="./css/font-awesome.css">
<link rel="stylesheet" href="./css/share.css">
</head>
<body>
......@@ -35,14 +36,23 @@
</header><!-- header -->
<!-- 拡大縮小機能 -->
<!--#include virtual="zoom.html" -->
<div id="zoom"></div>
<!-- コンテンツ -->
<main id="collabo_main">
<main id="collabo_main" class="none">
<div class="document_wrap">
<div class="coview_share_body coview_share_area" id="coviewShare" style="z-index: 1;">
</div>
</div>
</main>
<div class="coview_share_photo_select_bubble none">
<button id="coviewSharePhotoCamera" class="coview_share_photo_select_bubble_in_button cam">
</button>
<BR>
<button id="coviewSharePhotoGalary" class="coview_share_photo_select_bubble_in_button gal">
</button>
</div>
<!-- ユーザー追加オーバーレイ -->
<div id="overlay_add_user_list" class="none">
<nav>
......@@ -77,26 +87,21 @@
</div>
<!-- オーバーレイ　メニュー -->
<!--#include virtual="collaboration_video_overlay_menu.html" -->
<div id="collaboration_video_overlay_menu"></div>
<!-- オーバーレイ　ユーザーリスト -->
<div id="overlay_user_list" class="overlay noscroll">
<!--#include virtual="collabotarion_overlay_user_list.html" -->
<div id="collabotarion_overlay_user_list"></div>
</div>
<!-- キャプチャ　モーダル -->
<!--#include virtual="modal_collabo_capture.html" -->
<div id="modal_collabo_capture"></div>
<!-- プロフィールモーダル -->
<!--#include virtual="modal_collabo_profile.html" -->
<!--#include virtual="modal_collabo_profile2.html" -->
<div id="modal_collabo_profile"></div>
<div id="modal_collabo_profile2"></div>
<!-- ホスト変更モーダル -->
<!--#include virtual="modal_collabo_change_host.html" -->
<div id="modal_collabo_change_host"></div>
<!-- ホストリクエストモーダル -->
<!--#include virtual="modal_collabo_host_request.html" -->
<div id="modal_collabo_host_request"></div>
<!-- フッター -->
<footer id="collabo_footer_menu" class="active">
<button type="button" name="button" class="footer_menu_btn"></button>
......@@ -104,7 +109,7 @@
<div class="d-flex align-items-center h-100">
<div class="footer_menu_item">
<a href="#">
<div class="img_wrap bg_blue">
<div class="img_wrap bg_red" id="penBtn">
<img src="icon/icon_collabo_pen_white.png" alt="ペン">
</div>
</a>
......@@ -118,7 +123,7 @@
</div>
<div class="footer_menu_item">
<a href="#">
<div class="img_wrap bg_blue">
<div class="img_wrap bg_blue" id="eraserBtn">
<img src="icon/icon_collabo_delete_white.png" alt="削除">
</div>
</a>
......@@ -143,15 +148,73 @@
</div>
</footer>
<!-- フッター -->
<!--#include virtual="footer_collabo.html" -->
<div id="footer_collabo"></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>
<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/chat.js"></script>
<script src="./js/common.js"></script>
<script src="./js/constant.js"></script>
<script src="./js/collaboration.js"></script>
<script src="./js/common.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://app.coview.co.kr:7443/coview_api.js"></script>
<script src="./js/share.js"></script>
<script>
$("#footer_collabo").load("./footer_collabo.html");
$("#modal_collabo_host_request").load("./modal_collabo_host_request.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");
$("#collabotarion_overlay_user_list").load("./collabotarion_overlay_user_list.html");
$("#collaboration_video_overlay_menu").load("./collaboration_video_overlay_menu.html");
$("#zoom").load("./zoom.html");
let CHAT_SERVER_URL = '';
let CMS_SERVER_URL = '';
let ASSET_PATH = './';
let PLATFORM = '';
let IS_MOBILE = true;
let IS_ONLINE = false;
let collaborationJoinFlg = 0;
if (typeof(android) != "undefined") {
android.getLoginParameter();
android.getGlobalParameter();
} else {
}
async function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
CHAT_SERVER_URL = chatServerUrl;
CMS_SERVER_URL = cmsServerUrl;
PLATFORM = platform;
IS_MOBILE = isMobile;
IS_ONLINE = isOnline;
if (CHAT_UTIL.isIOS()) {
} else if (CHAT_UTIL.isAndroid()) {
collaborationJoinFlg = android.getCollaborationJoinFlg();
console.log(collaborationJoinFlg);
}
globalUserInfo.coWorkType = collaborationTypeKey.CAMERA;
CHAT_SOCKET.connectSocket();
socket.emit('join', CHAT.globalLoginParameter, function() {
});
};
</script>
</body>
</html>
\ No newline at end of file
public_new/collaboration_video.html
......@@ -14,6 +14,7 @@
<link rel="stylesheet" href="./css/collaboration.css">
<link rel="stylesheet" href="./css/footer.css">
<link rel="stylesheet" href="./css/font-awesome.css">
<link rel="stylesheet" href="./css/share.css">
</head>
<body>
......@@ -35,14 +36,24 @@
</header><!-- header -->
<!-- 拡大縮小機能 -->
<!--#include virtual="zoom.html" -->
<div id="zoom"></div>
<!-- コンテンツ -->
<main id="collabo_main">
<main id="collabo_main" class="none">
<div class="document_wrap">
<div class="coview_share_body coview_share_area" id="coviewShare" style="z-index: 1;">
</div>
</div>
</main>
<div class="coview_share_photo_select_bubble none">
<button id="coviewSharePhotoCamera" class="coview_share_photo_select_bubble_in_button cam">
</button>
<BR>
<button id="coviewSharePhotoGalary" class="coview_share_photo_select_bubble_in_button gal">
</button>
</div>
<!-- ユーザー追加オーバーレイ -->
<div id="overlay_add_user_list" class="none">
<nav>
......@@ -77,25 +88,21 @@
</div>
<!-- オーバーレイ　メニュー -->
<!--#include virtual="collaboration_video_overlay_menu.html" -->
<div id="collaboration_picture_overlay_menu"></div>
<!-- オーバーレイ　ユーザーリスト -->
<div id="overlay_user_list" class="overlay noscroll">
<!--#include virtual="collabotarion_overlay_user_list.html" -->
<div id="collabotarion_overlay_user_list"></div>
</div>
<!-- キャプチャ　モーダル -->
<!--#include virtual="modal_collabo_capture.html" -->
<div id="modal_collabo_capture"></div>
<!-- プロフィールモーダル -->
<!--#include virtual="modal_collabo_profile.html" -->
<!--#include virtual="modal_collabo_profile2.html" -->
<div id="modal_collabo_profile"></div>
<div id="modal_collabo_profile2"></div>
<!-- ホスト変更モーダル -->
<!--#include virtual="modal_collabo_change_host.html" -->
<div id="modal_collabo_change_host"></div>
<!-- ホストリクエストモーダル -->
<!--#include virtual="modal_collabo_host_request.html" -->
<div id="modal_collabo_host_request"></div>
<!-- フッター -->
<footer id="collabo_footer_menu" class="active">
......@@ -104,7 +111,7 @@
<div class="d-flex align-items-center h-100">
<div class="footer_menu_item">
<a href="#">
<div class="img_wrap bg_blue">
<div class="img_wrap bg_red" id="penBtn">
<img src="icon/icon_collabo_pen_white.png" alt="ペン">
</div>
</a>
......@@ -118,7 +125,7 @@
</div>
<div class="footer_menu_item">
<a href="#">
<div class="img_wrap bg_blue">
<div class="img_wrap bg_blue" id="eraserBtn">
<img src="icon/icon_collabo_delete_white.png" alt="削除">
</div>
</a>
......@@ -126,8 +133,9 @@
</div>
<div class="d-flex align-items-center h-100">
<div class="footer_menu_item">
<a href="#" data-toggle="modal" data-target="#captyaModal">
<div class="img_wrap wide bg_blue">
<!-- <a href="#" data-toggle="modal" data-target="#captyaModal">-->
<a href="#">
<div class="img_wrap wide bg_blue" id="captureBtn">
<img src="icon/icon_collabo_capture.png" alt="キャプチャ">
<span>キャプチャ</span>
</div>
......@@ -137,15 +145,72 @@
</div>
</footer>
<!-- フッター -->
<!--#include virtual="footer_collabo.html" -->
<div id="footer_collabo"></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>
<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/chat.js"></script>
<script src="./js/common.js"></script>
<script src="./js/constant.js"></script>
<script src="./js/collaboration.js"></script>
<script src="./js/common.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://app.coview.co.kr:7443/coview_api.js"></script>
<script src="./js/share.js"></script>
</body>
<script>
$("#footer_collabo").load("./footer_collabo.html");
$("#modal_collabo_host_request").load("./modal_collabo_host_request.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");
$("#collabotarion_overlay_user_list").load("./collabotarion_overlay_user_list.html");
$("#collaboration_picture_overlay_menu").load("./collaboration_picture_overlay_menu.html");
$("#zoom").load("./zoom.html");
let CHAT_SERVER_URL = '';
let CMS_SERVER_URL = '';
let ASSET_PATH = './';
let PLATFORM = '';
let IS_MOBILE = true;
let IS_ONLINE = false;
let collaborationJoinFlg = 0;
if (typeof(android) != "undefined") {
android.getLoginParameter();
android.getGlobalParameter();
} else {
}
async function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
CHAT_SERVER_URL = chatServerUrl;
CMS_SERVER_URL = cmsServerUrl;
PLATFORM = platform;
IS_MOBILE = isMobile;
IS_ONLINE = isOnline;
if (CHAT_UTIL.isIOS()) {
} else if (CHAT_UTIL.isAndroid()) {
collaborationJoinFlg = android.getCollaborationJoinFlg();
console.log(collaborationJoinFlg);
}
globalUserInfo.coWorkType = collaborationTypeKey.VIDEO;
CHAT_SOCKET.connectSocket();
socket.emit('join', CHAT.globalLoginParameter, function() {
});
};
</script>
</html>
\ No newline at end of file
public_new/collaboration_voice.html
......@@ -14,6 +14,7 @@
<link rel="stylesheet" href="./css/collaboration.css">
<link rel="stylesheet" href="./css/footer.css">
<link rel="stylesheet" href="./css/font-awesome.css">
<link rel="stylesheet" href="./css/share.css">
</head>
<body>
......@@ -35,7 +36,11 @@
<!-- コンテンツ -->
<main id="collabo_main">
<!--#include virtual="collabotarion_overlay_user_list.html" -->
<div class="document_wrap">
<div class="coview_share_body coview_share_area" id="coviewShare" style="z-index: 1;">
</div>
</div>
<!-- <div id="collabotarion_overlay_user_list"></div>-->
</main>
<!-- ユーザー追加オーバーレイ -->
......@@ -72,31 +77,90 @@
</div>
<!-- オーバーレイ　メニュー -->
<!--#include virtual="collaboration_voice_overlay_menu.html" -->
<div id="collaboration_voice_overlay_menu"></div>
<!-- キャプチャ　モーダル -->
<!--#include virtual="modal_collabo_capture.html" -->
<div id="modal_collabo_capture"></div>
<!-- プロフィールモーダル -->
<!--#include virtual="modal_collabo_profile.html" -->
<!--#include virtual="modal_collabo_profile2.html" -->
<div id="modal_collabo_profile"></div>
<div id="modal_collabo_profile2"></div>
<!-- ホスト変更モーダル -->
<!--#include virtual="modal_collabo_change_host.html" -->
<div id="modal_collabo_change_host"></div>
<!-- ホストリクエストモーダル -->
<!--#include virtual="modal_collabo_host_request.html" -->
<div id="modal_collabo_host_request"></div>
<!-- フッター -->
<!--#include virtual="footer_collabo.html" -->
<div id="footer_collabo"></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>
<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/chat.js"></script>
<script src="./js/common.js"></script>
<script src="./js/constant.js"></script>
<script src="./js/collaboration.js"></script>
<script src="./js/common.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://app.coview.co.kr:7443/coview_api.js"></script>
<script src="./js/share.js"></script>
<script>
$("#footer_collabo").load("./footer_collabo.html");
$("#modal_collabo_host_request").load("./modal_collabo_host_request.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");
$("#collabotarion_overlay_user_list").load("./collabotarion_overlay_user_list.html");
$("#collaboration_picture_overlay_menu").load("./collaboration_picture_overlay_menu.html");
$("#zoom").load("./zoom.html");
let CHAT_SERVER_URL = '';
let CMS_SERVER_URL = '';
let ASSET_PATH = './';
let PLATFORM = '';
let IS_MOBILE = true;
let IS_ONLINE = false;
let collaborationJoinFlg = 0;
if (typeof(android) != "undefined") {
android.getLoginParameter();
android.getGlobalParameter();
} else {
}
async function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
CHAT_SERVER_URL = chatServerUrl;
CMS_SERVER_URL = cmsServerUrl;
PLATFORM = platform;
IS_MOBILE = isMobile;
IS_ONLINE = isOnline;
if (CHAT_UTIL.isIOS()) {
} else if (CHAT_UTIL.isAndroid()) {
collaborationJoinFlg = android.getCollaborationJoinFlg();
console.log(collaborationJoinFlg);
}
globalUserInfo.coWorkType = collaborationTypeKey.AUDIO;
CHAT_SOCKET.connectSocket();
socket.emit('join', CHAT.globalLoginParameter, function() {
});
};
</script>
</body>
</html>
\ No newline at end of file
public_new/css/chat.css
......@@ -603,6 +603,7 @@ input[name="tab_item"] {
/* 自分の会話 */
.room_right {
margin-left: 40%;
position: relative;
margin-bottom: 20px;
max-width: 75%;
......@@ -675,8 +676,10 @@ input[name="tab_item"] {
/* 通話エリア */
.collabo_area_container {
max-width: 320px;
padding-bottom: 20px;
width: 320px;
margin: 0 auto;
display: table;
}
.collabo_date span {
font-size: 12px;
......
public_new/css/share.css 0 → 100644
#coviewShareMainBtn{
padding-top: 9px;
}
.coview_share_area{
display: none;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100vh;
z-index: 1050;
}
.coview_share_title{
background-color: #095395!important;
border-color: #095395!important;
width: 100%;
height: 58px;
}
.coview_share_body{
width: 100%;
height: 100%;
}
.coview_share_dropdown_bar{
display: none;
list-style: none;
padding: unset;
margin: unset;
/* padding-top: 58px; */
background: #000;
position: absolute;
width: 100%;
top: 57px;
left: 0px;
padding-top: 10px;
}
.coview_share_dropdown_bar ul{
list-style: none;
padding: unset;
margin: unset;
}
.coview_share_dropdown_bar li{
display: inline-block;
width: 24%;
height: 75px;
line-height: 52px;
margin: unset;
padding: unset;
background: #000;
text-align: center;
}
.coview_share_dropdown_btn{
background: transparent;
border: none;
width: 100%;
padding: unset;
text-align: center;
}
.coview_share_dropdown_btn img{
width: 38px;
height: 38px;
vertical-align: middle;
}
.coview_share_dropdown_btn span{
display: block;
color: #fff;
margin-top: -11px;
font-size: 0.85em;
}
.coview_share_title_left_area{
display: inline-block;
height: 58px;
line-height: 58px;
padding: 0;
margin: 0;
}
.coview_share_title_btn{
display: inline-block;
margin-left: 10px;
margin-top: 4px;
color: #fff;
}
.coview_share_title_name{
display: inline-block;
height: 58px;
line-height: 58px;
padding: 0;
margin: 0;
color: #fff;
}
.coview_share_photo_select_bubble{
display: none;
position: absolute;
padding: 2px;
background: #3e3e3e;
border-radius: 5px;
margin-top: 156px;
margin-left: 117px;
font-size: 12px;
}
.coview_share_photo_select_bubble:after{
border-top: 0 solid transparent;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-bottom: 10px solid #3e3e3e;
content: "";
position: absolute;
top: -10px;
left: 22px;
}
.coview_share_photo_select_bubble_in_button{
width: 106px;
height: 39px;
border: none;
text-align: left;
}
.coview_share_photo_select_bubble_in_button.cam{
border-top-left-radius: 5px;
border-top-right-radius: 5px;
}
.coview_share_photo_select_bubble_in_button.gal{
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
border-top: solid 0.7px #000;
}
.coview_share_photo_select_bubble_in_button_img{
width: 27%;
}
.coview_share_photo_select_bubble_in_button_text{
margin-left: 5px;
}
.coview_share_request{
width: 100%;
height: 4em;
background-image: linear-gradient(to top, #82b127, #30c8d2);
color: #fff;
border: none;
border-radius: 5px;
}
.coview_on_screen_btn_area {
display: none; !important;
}
.coview_on_media_btn_back {
top: 70px !important;
}
#localVideo {
top: 0px !important;
}
public_new/footer_collabo.html
......@@ -3,20 +3,20 @@
<div class="d-flex justify-content-around h-100">
<div class="footer_item">
<a href="#">
<div class="img_wrap bg_gray">
<div class="img_wrap bg_red" id="micBtn">
<img src="icon/icon_voice_gray.png" alt="音声">
</div>
</a>
</div>
<div class="footer_item">
<a href="#">
<div class="img_wrap bg_gray">
<div class="img_wrap bg_gray" id="recordBtn">
<img src="icon/icon_record.png" alt="録音">
</div>
</a>
</div>
<div class="footer_item">
<a href="chat_room.html">
<a href="javascript:Coview_exitCollaboration();">
<div class="img_wrap bg_red">
<img src="icon/icon_tell.png" alt="通話">
</div>
......
public_new/js/chat-db.js
......@@ -299,4 +299,13 @@ CHAT_DB.addFavoriteGroup = function(groupId) {
return false;
}
}
};
\ No newline at end of file
};
CHAT_DB.getContentList = function() {
if (CHAT_UTIL.isIOS()) {
//TODO ローカルDBからダウンロード済のコンテンツを取得
} else if (CHAT_UTIL.isAndroid()) {
return JSON.parse(android.getContentList());
}
};
public_new/js/chat-ui.js
......@@ -554,7 +554,7 @@ CHAT_UI.scrollToBottom = function() {
const scrollHeight = messages.prop('scrollHeight');
//messages.scrollTop(scrollHeight);
$('html, body').animate({
scrollTop: scrollHeight
scrollTop: 9999999
}, 500);
};
......@@ -881,6 +881,7 @@ CHAT_UI.htmlElementTextInitialize = function(languageCode) {
// FIXME 追加読み込みの場合は差分の画像のみ監視すべきだが、現状新規入室時にしか対応出来ていない。
CHAT_UI.waitForLoadingImage = function(div, callback) {
var imgs = div.find("img");
console.log(imgs);
var count = imgs.length;
if (count==0)
callback();
......@@ -888,6 +889,7 @@ CHAT_UI.waitForLoadingImage = function(div, callback) {
imgs.one( "load" , function( e ) {
// イメージが読み込まれた
loaded++;
console.log('++');
if ( loaded === count ) {
callback();
}
......@@ -1091,7 +1093,10 @@ CHAT_UI.refreshRoomList = function(roomType) {
if (room.messageType == messageType.TEXT || room.messageType == messageType.TEXT) displayMsg = room.message;
if (room.messageType == messageType.IMAGE) displayMsg = getLocalizedString("image");
if (room.messageType == messageType.VIDEO) displayMsg = getLocalizedString("video");
if (room.messageType == messageType.COMMUNICATIONSTART) displayMsg = getLocalizedString("collaboration_start");
if (room.messageType == messageType.COMMUNICATIONEND) displayMsg = getLocalizedString("collaboration_end");
var attendUserName = [];
room.attendUsers.forEach(function(user) {
user.profileUrl = CHAT.getProfileImgUrl(user.profileUrl);
attendUserName.push(user.shopMemberName);
......@@ -1197,6 +1202,11 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
, function(text) {
systemMessageTemplate = text;
});
var openCollaborationMessageTemplate;
$.get({ url: "./template/template_open_collaboration_message.html", async: false }
, function(text) {
openCollaborationMessageTemplate = text;
});
var topUserListTemplate;
$.get({ url: "./template/template_chatroom_user_list.html", async: false }
, function(text) {
......@@ -1234,6 +1244,9 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
if (message.messageType == messageType.SYSTEM) {
template = systemMessageTemplate;
}
if (message.messageType == messageType.COMMUNICATIONSTART) {
template = openCollaborationMessageTemplate;
}
let messageTime = CHAT_UTIL.formatDate(message.insertDate);
// ユーザの様式を読み込む
......@@ -1271,20 +1284,44 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
}
checkBeforeDate = messageTime.createdAtDay;
beforeDate = message.insertDate;
let html = Mustache.render(template, {
text: message.message,
from: message.loginId,
shopMemberId: message.shopMemberId,
profileImage: message.profileUrl,
createdAtDay: messageTime.createdAtDay,
createdAtTime: messageTime.createdAtTime,
createdAtYear: message.insertDate.substring(0,4) + getLocalizedString('year') + ' ',
unreadCount: message.unreadCount > 999 ? "999+" : message.unreadCount,
isOtherYear: isOtherYear,
isToday: isToday
});
html = message.message.includes('attachedImages') || message.message.includes('attachedVideos') ? CHAT_UTIL.htmlDecode(html) : html;
workVal = html + workVal;
if (message.messageType == messageType.COMMUNICATIONSTART || message.messageType == messageType.COMMUNICATIONEND) {
var collaborationInfo = JSON.parse(message.message);
var userInCollaboration = JSON.parse(android.getUserInfoList(collaborationInfo.userList));
userInCollaboration.forEach(function(user) {
user.profileUrl = CHAT.getProfileImgUrl(user.profileUrl);
})
let html = Mustache.render(template, {
roomName: roomName,
userCount: userInCollaboration.length,
userList: userInCollaboration.length > 3 ? userInCollaboration.slice(0, 3) : userInCollaboration,
insertDate: message.insertDate,
collaborationType: collaborationInfo.collaborationType,
isToday: isToday,
createdAtDay: messageTime.createdAtDay,
createdAtTime: messageTime.createdAtTime,
createdAtYear: message.insertDate.substring(0,4) + getLocalizedString('year') + ' ',
isOtherYear: isOtherYear
});
html = message.message.includes('attachedImages') || message.message.includes('attachedVideos') ? CHAT_UTIL.htmlDecode(html) : html;
workVal = html + workVal;
} else {
let html = Mustache.render(template, {
text: message.message,
from: message.loginId,
shopMemberId: message.shopMemberId,
profileImage: message.profileUrl,
createdAtDay: messageTime.createdAtDay,
createdAtTime: messageTime.createdAtTime,
createdAtYear: message.insertDate.substring(0,4) + getLocalizedString('year') + ' ',
unreadCount: message.unreadCount,
isOtherYear: isOtherYear,
isToday: isToday
});
html = message.message.includes('attachedImages') || message.message.includes('attachedVideos') ? CHAT_UTIL.htmlDecode(html) : html;
workVal = html + workVal;
}
})
// メッセージの画面描画
......@@ -1305,6 +1342,7 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
CHAT_UI.waitForLoadingImage(jQueryMessages, CHAT_UI.scrollToBottom);
// ユーザ削除ボタン表示しない
$("#userSelectionDeleteBtn").hide();
setInterval(updateDuration, 1000);
CHAT_UI.scrollToBottom();
};
......@@ -2395,4 +2433,35 @@ CHAT_UI.displayExistRoom = function(roomId) {
android.joinRoom(roomId, '');
}
return;
}
CHAT_UI.joinCollaboration = function(collaborationType) {
if (CHAT_UTIL.isIOS()) {
//TODO IOS
} else if (CHAT_UTIL.isAndroid()) {
android.joinCollaboration(collaborationType);
}
}
CHAT_UI.startCollaboration = function(collaborationType) {
if (CHAT_UTIL.isIOS()) {
//TODO IOS
} else if (CHAT_UTIL.isAndroid()) {
android.startCollaboration(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');
}
\ No newline at end of file
public_new/js/chat-util.js
......@@ -89,3 +89,47 @@ CHAT_UTIL.findDow = function(data) {
}
return dow;
}
function msToTime(s) {
var ms = s % 1000;
s = (s - ms) / 1000;
var secs = s % 60;
s = (s - secs) / 60;
var mins = s % 60;
var hrs = (s - mins) / 60;
return hrs + ':' + mins + ':' + secs;
}
function updateDuration() {
var now = new Date();
$('.collaboration_duration').each(function(index, item) {
var insertDateString = $(item).data('insertdate');
insertDateString = insertDateString.toString();
var year = insertDateString.substring(0,4);
var month = insertDateString.substring(4,6);
var day = insertDateString.substring(6,8);
var hour = insertDateString.substring(8,10);
var min = insertDateString.substring(10,12);
var sec = insertDateString.substring(12,14);
var insertDate = new Date(year, month-1 , day, hour, min, sec);
$(item).html(msToTime(now - insertDate));
});
}
CHAT_UTIL.getCollaborationType = function(key) {
switch(key) {
case collaborationTypeKey.AUDIO:
return collaborationType.AUDIO;
break;
case collaborationTypeKey.CAMERA:
return collaborationType.CAMERA;
break;
case collaborationTypeKey.VIDEO:
return collaborationType.VIDEO;
break;
default:
return 0;
break;
}
}
\ No newline at end of file
public_new/js/chat.js
......@@ -8,6 +8,9 @@ CHAT.globalIsInvite = false;
//ログイン中の部屋情報を保存する変数
CHAT.globalLoginParameter;
// fermi coview share
let globalUserInfo = new Object();
CHAT.saveRoomInfo = function(roomId, roomName) {
CHAT.globalLoginParameter.roomId = roomId;
CHAT.globalLoginParameter.roomName = roomName;
......@@ -241,7 +244,16 @@ getLoginParameter = function(sid, loginId, shopName, roomId = undefined, roomNam
if (!languageCode) {
languageCode = "en"
}
CHAT_UI.htmlElementTextInitialize(languageCode)
// fermi coview share
globalUserInfo.sid = sid;
globalUserInfo.loginId = loginId;
globalUserInfo.shopName = shopName;
globalUserInfo.roomId = roomId;
globalUserInfo.roomName = roomName;
globalUserInfo.languageCode = languageCode;
CHAT_UI.htmlElementTextInitialize(languageCode);
CHAT_UI.dismissLoadingIndicator();
}
......@@ -410,6 +422,7 @@ $(function() {
var beforeHeight;
var beforeScroll;
window.addEventListener("resize", function() {
console.log('aaaa');
var afterHeight = window.innerHeight;
if (beforeHeight > afterHeight) {
//キーボード表示時
......
public_new/js/collaboration.js
......@@ -76,6 +76,8 @@ $(function () {
// ユーザー招待メンバー検索
$(".add_user_btn").click(function () {
$("#overlay_add_user_list").removeClass("none");
$.ajax({
url: "collaboration_overlay_add_user_list.html",
......@@ -84,5 +86,48 @@ $(function () {
}).done(function (data) {
$("#add_user_list").html(data);
});
});
$('#penBtn').click(function () {
$('#coviewPenCtrBtn').click();
if ($('#penBtn').hasClass('bg_red')) {
$('#penBtn').removeClass('bg_red');
$('#penBtn').addClass('bg_blue');
} else {
$('#penBtn').addClass('bg_red');
$('#penBtn').removeClass('bg_blue');
}
})
$('#eraserBtn').click(function () {
$('#coviewEraserCtrBtn').click();
})
$('#micBtn').click(function () {
$('#coviewMicCtrBtn').click();
if ($('#micBtn').hasClass('bg_red')) {
$('#micBtn').removeClass('bg_red');
$('#micBtn').addClass('bg_blue');
} else {
$('#micBtn').removeClass('bg_blue');
$('#micBtn').addClass('bg_red');
}
})
$('#captureBtn').click(function () {
$('#coviewCaptureCtrBtn').click();
})
$('#recordBtn').click(function () {
$('#coviewRecCtrBtn').click();
if ($('#recordBtn').hasClass('bg_gray')) {
$('#recordBtn').removeClass('bg_gray');
$('#recordBtn').addClass('bg_red');
} else {
$('#recordBtn').addClass('bg_gray');
$('#recordBtn').removeClass('bg_red');
}
})
});
public_new/js/constant.js
......@@ -14,7 +14,8 @@ const messageType = {
IMAGE : 1 ,
VIDEO : 2 ,
SYSTEM : 3 ,
COMMUNICATION : 4
COMMUNICATIONSTART : 4,
COMMUNICATIONEND : 5
}
const userAPICmd = {
......@@ -36,6 +37,18 @@ const nameCardAreaId = {
USER : "userNamecard"
}
const collaborationTypeKey = {
AUDIO : "audio",
CAMERA : "camera",
VIDEO : "video"
}
const collaborationType = {
AUDIO : 0,
CAMERA : 2,
VIDEO : 3
}
const makeRoomFlg = {
NAME_CARD : 0,
MAKE_ROOM : 1
......
public_new/js/language_en.js
......@@ -88,5 +88,7 @@ $.lang.en = {
"thursday":"thursday",
"friday":"friday",
"saturday":"saturday",
"sunday":"sunday"
"sunday":"sunday",
"collaboration_start":"collaboration start",
"collaboration_end":"collaboration end"
}
public_new/js/language_ja.js
......@@ -88,5 +88,7 @@ $.lang.ja = {
"thursday":"木曜日",
"friday":"金曜日",
"saturday":"土曜日",
"sunday":"日曜日"
"sunday":"日曜日",
"collaboration_start":"協業中",
"collaboration_end":"協業終了"
}
public_new/js/language_ko.js
......@@ -88,5 +88,7 @@ $.lang.ko = {
"thursday":"목요일",
"friday":"금요일",
"saturday":"토요일",
"sunday":"일요일"
"sunday":"일요일",
"collaboration_start":"협업중",
"collaboration_end":"협업종료"
}
public_new/js/share.js 0 → 100644
/* --------------------------------------------------- */
/* Functions */
/* --------------------------------------------------- */
let coview_api = new CoviewApi();
$(function(){
var coviewApiActive = coview_api.Init(
{
testSTRParam : "param1",
testNUMParam : 77,
testBOOLParam : false,
coview_api_srv_addr: "https://app.coview.co.kr:7443",
coview_wrap_id : "coviewShare",
coview_api_key: "8dda7092c5820d663"
}
);
// special button IN Chat ui
$("#coviewShareMainBtn").on("click", function(e){
e.stopPropagation();
if($(".coview_share_dropdown_bar").is(':visible') == true){
Coview_shareDropdownHide();
if($(".coview_share_photo_select_bubble").is(':visible') == true){
$(".coview_share_photo_select_bubble").slideUp();
}
}
else{
$(".coview_share_dropdown_bar").slideDown();
}
});
$("#coviewShareCloseButton").on("click", function(e){
coview_api.LeaveRoom();
$(".coview_share_area").hide();
});
$("body").on("click", function(){
Coview_shareDropdownHide();
});
$(document).on("click", ".coview_share_request", function(){
console.log("globalUserInfo", globalUserInfo);
if($(this).hasClass("video") == true){
globalUserInfo.coWorkType = "video";
$(".coview_share_title_name").text("LIVE");
}
else{
globalUserInfo.coWorkType = "image";
$(".coview_share_title_name").text("IMAGE");
}
coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
Coview_moveToVideoShareArea();
});
// $('#coviewShareRequestVideo').bind('click', function()
// console.log("globalUserInfo", globalUserInfo);
// globalUserInfo.coWorkType = "video";
// coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
// });
/* --------------------------------------------------- */
/* Video, photo, chat, doc */
/* --------------------------------------------------- */
$("#coviewShareChat").on("click", function(){
console.log("ON click coviewShareChat");
});
$("#coviewSharePhoto").on("click", function(e){
e.stopPropagation();
console.log("ON click coviewSharePhoto");
if($(".coview_share_photo_select_bubble").is(':visible') == true){
$(".coview_share_photo_select_bubble").slideUp();
}
else{
$(".coview_share_photo_select_bubble").slideDown();
}
});
$("#coviewSharePhotoCamera").on("click", function(){
$(".coview_share_photo_select_bubble").hide();
globalUserInfo.coWorkType = "camera";
coview_api.CreateRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
Coview_moveToVideoShareArea();
$(".coview_share_title_name").text("カメラ");
});
$("#coviewSharePhotoGalary").on("click", function(){
$(".coview_share_photo_select_bubble").hide();
globalUserInfo.coWorkType = "galary";
coview_api.CreateRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
Coview_moveToVideoShareArea();
$(".coview_share_title_name").text("ライブラリ");
});
$("#coviewShareLive").on("click", function(){
console.log("ON click coviewShareLive");
globalUserInfo.coWorkType = "video";
console.log("globalUserInfo", globalUserInfo);
// var chars = "0123456789";
// var string_length = 6;
// var randomstring = '';
// for (var i=0; i<string_length; i++) {
// var rnum = Math.floor(Math.random() * chars.length);
// randomstring += chars.substring(rnum,rnum+1);
// }
// coview_api.CreateRoom(randomstring, globalUserInfo.coWorkType);
coview_api.CreateRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
Coview_moveToVideoShareArea();
$(".coview_share_title_name").text("LIVE");
});
$("#coviewShareDoc").on("click", function(){
console.log("ON click coviewShareDoc");
alert("INTO a document share mode (only audio)");
globalUserInfo.coWorkType = "audio";
});
coview_api.addEventListener ("ready", function () {
console.log("=============> READY : ready for coview api");
coview_api.Login(globalUserInfo.loginId);
});
coview_api.addEventListener ("start", function () {
console.log("=============> START : share start");
$("#loadingIndicator").removeClass("full_active");
});
coview_api.addEventListener ("destroy", function () {
console.log("=============> START : share start");
coview_api.LeaveRoom();
$(".coview_share_area").hide();
$("#loadingIndicator").removeClass("full_active");
});
coview_api.addEventListener ("message", async function (event, json) {
console.log("+++ addEventListener", json);
console.log("processMessage api = ", json.api);
switch (json.api){
case "LoginResponse":
console.log('------------------------------');
console.log(globalUserInfo.coWorkType);
console.log(collaborationJoinFlg);
if (collaborationJoinFlg == '1') {
coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
} else if (collaborationJoinFlg == '0') {
coview_api.CreateRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
}
Coview_moveToVideoShareArea();
break;
case "CreateRoomResponse":
if(json.resultCode == 200){
var coviewInviteMessage = "" + messageSeperator + messageType.COMMUNICATIONSTART + messageSeperator + CHAT_UTIL.getCollaborationType(globalUserInfo.coWorkType);
socket.emit('createMessage', {
text: coviewInviteMessage
}, 0);
}
else{
}
break;
case "joinRoomInfoResponse":
if(json.resultCode == 200){
}
else{
// alert(json.resultMsg + "(" + json.resultCode + ")" );
alert("Not exist sharing call (" + json.resultCode + ")\nPlease using share menu.");
coview_api.LeaveRoom();
$(".coview_share_area").hide();
$("#loadingIndicator").removeClass("full_active");
}
break;
default:
console.log('Unrecognized api', json);
break;
}
});
});
function Coview_shareDropdownHide(){
$(".coview_share_dropdown_bar").slideUp();
$(".coview_share_photo_select_bubble").slideUp();
}
function Coview_moveToVideoShareArea(){
$("#loadingIndicator").addClass("full_active");
$(".coview_share_area").show();
$('#collabo_main').removeClass('none');
}
function Coview_exitCollaboration(){
coview_api.LeaveRoom();
CHAT_UI.joinRoom(CHAT.globalLoginParameter.roomId, CHAT.globalLoginParameter.name);
}
public_new/template/template_document_list.html 0 → 100644
<div class="modal fade capture_modal" id="captyaModal" tabindex="-1" role="dialog" aria-labelledby="captyaModal"
aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header border-0 pb-0">
<span>スクリーンキャプチャー</span>
</div>
<div class="modal-body">
<div class="img_wrap">
<img src="img/capture.png" alt="キャプチャ画像">
</div>
<p>filename.jpg</p>
</div>
<div class="modal-footer border-0 justify-content-center">
<button type="button" class="profile_favorite_btn bg_white border_gray text_blue" data-dismiss="modal"
aria-label="Close">
<div class="d-flex flex-column">
<span>キャンセル</span>
</div>
</button>
<button type="button" class="profile_phone_btn border-0 bg_navy text_white">
<div class="d-flex flex-column">
<span>共有</span>
</div>
</button>
<button type="button" class="profile_chat_btn border-0 bg_blue text_white">
<div class="d-flex flex-column">
<span>保存</span>
</div>
</button>
</div>
</div>
</div>
</div>
\ No newline at end of file
public_new/template/template_group_list.html
<li class="d-flex align-items-center">
<li class="d-flex align-items-center" style="border-bottom: 1px solid #e2e8f0;">
<a href="#" class="w-100" onclick="CHAT_UI.refreshAllGroupSearch({{id}});">
<div class="chat_item d-flex flex-row align-items-center">
<div class="chat_item_l">
......
public_new/template/template_open_collaboration_message.html
......@@ -2,27 +2,32 @@
<div class="collabo_area_container">
<!-- 時刻 -->
<div class="collabo_date text-right">
<span>12:23 PM</span>
{{#isToday}}
<span>{{createdAtTime}}</span>
{{/isToday}}
{{^isToday}}
<span>{{createdAtDay}}</span><span>{{createdAtTime}}</span>
{{/isToday}}
</div>
<div class="collabo_area">
<div class="collabo_desc">
<div class="collabo_room_name d-flex flex-row">
<span>ルーム名ルーム名ルーム名ルーム名</span>
<span>{{roomName}}</span>
<span>の通話</span>
</div>
<div class="d-flex flex-row justify-content-between">
<div class="collabo_user_list d-flex flex-row">
<div class="img_wrap"><img src="img/noImage.png" alt="プロフィール画像"></div>
<div class="img_wrap"><img src="img/noImage.png" alt="プロフィール画像"></div>
<div class="img_wrap"><img src="img/noImage.png" alt="プロフィール画像"></div>
<div class="num"><span>10</span></div>
{{#userList}}
<div class="img_wrap"><img src="{{profileUrl}}" onError="this.src='./img/noImage.png'"></div>
{{/userList}}
<div class="num"><span>{{userCount}}</span></div>
</div>
<div class="collabo_time">
<span>1:10:20</span>
<span class="collaboration_duration" data-insertDate="{{insertDate}}"></span>
</div>
</div>
<div class="collabo_btn">
<button type="button" name="button">
<button type="button" name="button" onclick="CHAT_UI.joinCollaboration({{collaborationType}})">
<img src="icon/icon_profile_phone.png" alt="通話">
<span>参加する</span>
</button>
......
public_new/template/template_user_list.html
<ul class="p-0 chat_make_room_list">
<ul class="p-0 chat_make_room_list" style="margin-top: 0px !important;border-top: none !important;">
{{#userList}}
<li class="d-flex align-items-center">
<a href="javascript:return false;" onclick="CHAT_UI.makeNameCard({{shopMemberId}})" style="width: 100%;">
<div class="chat_item d-flex flex-row align-items-center">
<div class="chat_item_l">
<div class="thumbnail">
<div class="img_wrap"><img src="{{profileUrl}}" onError="this.src='./img/noImage.png'" /></div>
<div class="img_wrap"><img src="{{profileUrl}}" onError="this.src='./img/noImage.png'"/></div>
</div>
</div>
<div class="chat_item_m px-0">
......
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