Skip to content

C
chat_webview
Commit 2a5914e5 by Kang Donghun
Options

Merge branch 'release_sp3' of gitlab.agentec.jp:abookCommunication/chat_webview into release_sp3 

# Conflicts:
#	public_new/js/chat-ui.js
parents 44d8dd9c de7a33d3
Showing with 173 additions and 22 deletions
public_new/collaboration_picture.html
...@@ -27,12 +27,14 @@ ...@@ -27,12 +27,14 @@
<div class="collabo_nav_r"> <div class="collabo_nav_r">
<div class="text-right d-flex align-items-center"> <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 user_btn"></button>
<button type="button" name="button" class="btn exit_btn" onclick="Coview_exitCollaboration();"></button> <!-- <button type="button" name="button" class="btn exit_btn" onclick="Coview_exitCollaboration();"></button> -->
</div> </div>
</div> </div>
</div> </div>
</header><!-- header --> </header><!-- header -->
<!-- 拡大縮小機能 -->
<div id="zoom"></div>
<!-- コンテンツ --> <!-- コンテンツ -->
<main id="collabo_main" class="none"> <main id="collabo_main" class="none">
<div class="document_wrap"> <div class="document_wrap">
...@@ -59,9 +61,64 @@ ...@@ -59,9 +61,64 @@
<div id="collaboration_overlay_user_list"></div> <div id="collaboration_overlay_user_list"></div>
</div> </div>
<!-- キャプチャ　モーダル -->
<div id="modal_collabo_capture"></div>
<!-- プロフィールモーダル --> <!-- プロフィールモーダル -->
<div id="userProfileModalInCollaboration"></div> <div id="userProfileModalInCollaboration"></div>
<div id="modal_collabo_profile2"></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_red" id="penBtn">
<img src="icon/icon_collabo_pen_white.png" alt="ペン">
</div>
</a>
</div>
<div class="footer_menu_item none">
<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" id="eraserBtn">
<img src="icon/icon_collabo_delete_white.png" alt="削除">
</div>
</a>
</div>
</div>
<div class="d-flex align-items-center h-100 none">
<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>
</footer>
<!-- フッター -->
<div id="footer_collabo"></div>
<div id="loadingArea"></div>
<script src="./js/libs/jquery-3.3.1.min.js"></script> <script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/socket.io.js"></script> <script src="./js/libs/socket.io.js"></script>
...@@ -87,8 +144,14 @@ ...@@ -87,8 +144,14 @@
<script src="https://livetaskyell.abookcloud.com/coview_api.js"></script> <script src="https://livetaskyell.abookcloud.com/coview_api.js"></script>
<script src="./js/share.js"></script> <script src="./js/share.js"></script>
<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_capture").load("./modal_collabo_capture.html");
$("#modal_collabo_profile2").load("./modal_collabo_profile2.html"); $("#modal_collabo_profile2").load("./modal_collabo_profile2.html");
$("#loadingArea").load("./loading.html");
$("#collaboration_picture_overlay_menu").load("./collaboration_picture_overlay_menu.html"); $("#collaboration_picture_overlay_menu").load("./collaboration_picture_overlay_menu.html");
$("#zoom").load("./zoom.html");
let CHAT_SERVER_URL = ''; let CHAT_SERVER_URL = '';
let CMS_SERVER_URL = ''; let CMS_SERVER_URL = '';
......
public_new/collaboration_video.html
...@@ -26,12 +26,14 @@ ...@@ -26,12 +26,14 @@
<div class="collabo_nav_r"> <div class="collabo_nav_r">
<div class="text-right d-flex align-items-center"> <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 user_btn"></button>
<button type="button" name="button" class="btn exit_btn" onclick="Coview_exitCollaboration();"></button> <!-- <button type="button" name="button" class="btn exit_btn" onclick="Coview_exitCollaboration();"></button> -->
</div> </div>
</div> </div>
</div> </div>
</header><!-- header --> </header><!-- header -->
<!-- 拡大縮小機能 -->
<div id="zoom"></div>
<!-- コンテンツ --> <!-- コンテンツ -->
<main id="collabo_main" class="none"> <main id="collabo_main" class="none">
<div class="document_wrap"> <div class="document_wrap">
...@@ -48,12 +50,18 @@ ...@@ -48,12 +50,18 @@
</button> </button>
</div> </div>
<!-- ユーザー追加オーバーレイ -->
<div id="add_user_list"></div>
<!-- オーバーレイ　メニュー --> <!-- オーバーレイ　メニュー -->
<div id="collaboration_video_overlay_menu"></div> <div id="collaboration_video_overlay_menu"></div>
<!-- オーバーレイ　ユーザーリスト --> <!-- オーバーレイ　ユーザーリスト -->
<div id="overlay_user_list" class="overlay noscroll"> <div id="overlay_user_list" class="overlay noscroll">
<div id="collaboration_overlay_user_list"></div> <div id="collaboration_overlay_user_list"></div>
</div> </div>
<!-- キャプチャ　モーダル -->
<div id="modal_collabo_capture"></div>
<!-- プロフィールモーダル --> <!-- プロフィールモーダル -->
<div id="userProfileModalInCollaboration"></div> <div id="userProfileModalInCollaboration"></div>
<div id="modal_collabo_profile2"></div> <div id="modal_collabo_profile2"></div>
...@@ -61,9 +69,51 @@ ...@@ -61,9 +69,51 @@
<div id="modal_collabo_change_host"></div> <div id="modal_collabo_change_host"></div>
<!-- ホストリクエストモーダル --> <!-- ホストリクエストモーダル -->
<div id="modal_collabo_host_request"></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_red" id="penBtn">
<img src="icon/icon_collabo_pen_white.png" alt="ペン">
</div>
</a>
</div>
<div class="footer_menu_item none">
<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" id="eraserBtn">
<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 none">
<!-- <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>
</a>
</div>
</div>
</div>
</footer>
<!-- フッター --> <!-- フッター -->
<div id="footer_collabo"></div> <div id="footer_collabo"></div>
<div id="loadingArea"></div> <div id="loadingArea"></div>
<script src="./js/libs/jquery-3.3.1.min.js"></script> <script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/socket.io.js"></script> <script src="./js/libs/socket.io.js"></script>
<script src="./js/libs/moment.js"></script> <script src="./js/libs/moment.js"></script>
...@@ -89,9 +139,14 @@ ...@@ -89,9 +139,14 @@
<script src="./js/share.js"></script> <script src="./js/share.js"></script>
</body> </body>
<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_capture").load("./modal_collabo_capture.html");
$("#modal_collabo_profile2").load("./modal_collabo_profile2.html"); $("#modal_collabo_profile2").load("./modal_collabo_profile2.html");
$("#loadingArea").load("./loading.html");
$("#collaboration_video_overlay_menu").load("./collaboration_video_overlay_menu.html"); $("#collaboration_video_overlay_menu").load("./collaboration_video_overlay_menu.html");
$("#zoom").load("./zoom.html");
let CHAT_SERVER_URL = ''; let CHAT_SERVER_URL = '';
let CMS_SERVER_URL = ''; let CMS_SERVER_URL = '';
......
public_new/contact.html
...@@ -217,8 +217,11 @@ ...@@ -217,8 +217,11 @@
PLATFORM = platform; PLATFORM = platform;
IS_MOBILE = isMobile; IS_MOBILE = isMobile;
IS_ONLINE = isOnline; IS_ONLINE = isOnline;
let groupId = android.getToMoveGroupId();
let groupId;
if (typeof(android) != "undefined") {
groupId = android.getToMoveGroupId();
}
if (groupId != "" && groupId != undefined) { if (groupId != "" && groupId != undefined) {
CHAT_UI.refreshAllGroupSearch(groupId); CHAT_UI.refreshAllGroupSearch(groupId);
android.setToMoveGroupId(""); android.setToMoveGroupId("");
......
public_new/css/chat.css
...@@ -801,6 +801,38 @@ input[name="tab_item"] { ...@@ -801,6 +801,38 @@ input[name="tab_item"] {
height: fit-content; height: fit-content;
} }
#favoriteList > ul > li:nth-child(1) {
border-top: 0px !important;
}
#userInGroupList > ul > li:nth-child(1) {
border-top: 0px !important;
}
.chat_make_room_list {
margin-top: 0px !important;
}
#favoriteListForMakeRoom > ul > li:nth-child(1) {
border-top: 0px !important;
}
#userInGroupListForMakeRoom > ul > li:nth-child(1) {
border-top: 0px !important;
}
#childGroupListAreaForMakeRoom > li:nth-child(1) {
border-top: 0px !important;
}
#userInGroupListForAddUser > ul > li:nth-child(1) {
border-top: 0px !important;
}
#childGroupListAreaForAddUser > li:nth-child(1) {
border-top: 0px !important;
}
@media screen and (max-width: 768px) { @media screen and (max-width: 768px) {
/* chat item */ /* chat item */
.tab_item { .tab_item {
......
public_new/css/collaboration.css
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
/**************************** main *************************/ /**************************** main *************************/
#collabo_main { #collabo_main {
height: calc(100vh - 50px); height: calc(100vh - 180px);
position: relative; position: relative;
margin-bottom: 120px; margin-bottom: 120px;
} }
......
public_new/css/share.css
...@@ -144,6 +144,14 @@ ...@@ -144,6 +144,14 @@
border-radius: 5px; border-radius: 5px;
} }
.coview_on_screen_btn_area {
display: none !important;
}
#localVideo {
top: 0px !important;
}
.coview_on_media_btn_back { .coview_on_media_btn_back {
top: 70px !important; top: 70px !important;
} }
......
public_new/js/chat-db.js
...@@ -325,7 +325,7 @@ CHAT_DB.getContentList = function() { ...@@ -325,7 +325,7 @@ CHAT_DB.getContentList = function() {
CHAT_DB.getUserListByLoginId = function(loginIdList) { CHAT_DB.getUserListByLoginId = function(loginIdList) {
console.log(loginIdList); console.log(loginIdList);
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
//TODO ローカルDBからダウンロード済のコンテンツを取得 return JSON.parse(callNativeApp("getUserListByLoginId", {"loginIdList": loginIdList.join(",")}));
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
return JSON.parse(android.getUserListByLoginId(loginIdList.join(","))); return JSON.parse(android.getUserListByLoginId(loginIdList.join(",")));
} }
......
public_new/js/chat-ui.js
...@@ -1306,7 +1306,7 @@ CHAT_UI.loadMessages = function(roomId, roomName) { ...@@ -1306,7 +1306,7 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
var collaborationInfo; var collaborationInfo;
var userInCollaboration; var userInCollaboration;
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
collaborationInfo = message.message; collaborationInfo = JSON.parse(message.message);
userInCollaboration = JSON.parse(CHAT_DB.getUserInfoList(collaborationInfo.userList)); userInCollaboration = JSON.parse(CHAT_DB.getUserInfoList(collaborationInfo.userList));
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
collaborationInfo = JSON.parse(message.message); collaborationInfo = JSON.parse(message.message);
...@@ -1349,15 +1349,6 @@ CHAT_UI.loadMessages = function(roomId, roomName) { ...@@ -1349,15 +1349,6 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
}) })
// メッセージの画面描画 // メッセージの画面描画
jQueryMessages.prepend(workVal); jQueryMessages.prepend(workVal);
// iOSは協業ボタンを非活性化
if (CHAT_UTIL.isIOS()) {
$('.footer_content_b a').css('pointer-events', 'none');
$('.footer_content_b .footer_item').on('click', function() {
alert('選択した機能は現在ご利用になれません。');
});
}
CHAT_UI.waitForLoadingImage(jQueryMessages, CHAT_UI.scrollToBottom); CHAT_UI.waitForLoadingImage(jQueryMessages, CHAT_UI.scrollToBottom);
CHAT_UI.waitForLoadingVideo(jQueryMessages, CHAT_UI.scrollToBottom); CHAT_UI.waitForLoadingVideo(jQueryMessages, CHAT_UI.scrollToBottom);
// ユーザ削除ボタン表示しない // ユーザ削除ボタン表示しない
...@@ -2847,4 +2838,4 @@ CHAT_UI.confirmInviteUserListInCollaboration = function() { ...@@ -2847,4 +2838,4 @@ CHAT_UI.confirmInviteUserListInCollaboration = function() {
} }
$('#modalAddUserConfirm').modal('hide'); $('#modalAddUserConfirm').modal('hide');
}); });
} }
\ No newline at end of file
public_new/js/libs/socket.io.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
public_new/template/template_add_user_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.refreshAllGroupForAddUser({{id}});"> <a href="#" class="w-100" onclick="CHAT_UI.refreshAllGroupForAddUser({{id}});">
<div class="chat_item d-flex flex-row align-items-center"> <div class="chat_item d-flex flex-row align-items-center">
<div class="chat_item_l"> <div class="chat_item_l">
......
public_new/template/template_make_room_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.refreshAllGroupForMakeRoom({{id}});"> <a href="#" class="w-100" onclick="CHAT_UI.refreshAllGroupForMakeRoom({{id}});">
<div class="chat_item d-flex flex-row align-items-center"> <div class="chat_item d-flex flex-row align-items-center">
<div class="chat_item_l"> <div class="chat_item_l">
......
public_new/template/template_user_name_card.html
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
</div> </div>
</button> </button>
{{/isFavorite}} {{/isFavorite}}
<button type="button" class="border-0 bg_gray"> <button type="button" class="border-0 bg_green">
<div class="d-flex flex-column"> <div class="d-flex flex-column">
<div class="img_wrap"> <div class="img_wrap">
<img src="icon/icon_profile_phone.png" alt="通話" onclick="alert(getLocalizedString('notify_not_released'));"> <img src="icon/icon_profile_phone.png" alt="通話">
</div> </div>
<span>通話</span> <span>通話</span>
</div> </div>
......
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