Skip to content

C
chat_webview
Commit 18ae1836 by Kim Peace
Options

Merge commit 'cbd17702' into… 

Merge commit 'cbd17702' into bug/#44048_picture_select_on_picture_collaboration
parents e7dfd579 cbd17702
Showing with 47 additions and 34 deletions
public_new/chat_room.html
......@@ -8,7 +8,7 @@
content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
<title>LiveTaskyell</title>
<!--<link rel="stylesheet" href="./css/notosansjp.css">-->
<link rel="stylesheet" href="./fontawesome/css/all.css" >
<link rel="stylesheet" href="./fontawesome/css/all.css">
<link rel="stylesheet" href="./css/bootstrap.min.css">
<link rel="stylesheet" href="./css/jquery-ui.min.css">
<link rel="stylesheet" href="./css/common.css">
......@@ -44,8 +44,8 @@
<div class="col-4 pl-0">
<div class="nav-item text-right">
<a href="#" class="search_menu mx-2"><img src="icon/icon_search.svg" alt="検索"></a>
<a href="#" data-toggle="modal" data-target="#menuModalCenter" class="menu-modal-btn" id="roomMenu" class="none mx-1"><img
src="icon/icon_room_menu.svg" alt="メニュー"></a>
<a href="#" data-toggle="modal" data-target="#menuModalCenter" class="menu-modal-btn" id="roomMenu"
class="none mx-1"><img src="icon/icon_room_menu.svg" alt="メニュー"></a>
</div>
</div><!-- .col -->
</div><!-- .row -->
......@@ -105,24 +105,23 @@
</a>
</div>
<div class="footer_item">
<a href="javascript:Common.startCollaboration(COLLABORATION_TYPE.DOCUMENT);">
<img src="icon/icon_paste.svg" alt="文書アイコン">
<p>文書</p>
<a href="javascript:Common.startCollaboration(COLLABORATION_TYPE.VIDEO);">
<img src="icon/icon_movie.svg" alt="動画アイコン">
<p>動画</p>
</a>
</div>
<div class="footer_item">
<a href="javascript:Common.startCollaboration(COLLABORATION_TYPE.CAMERA);">
<img src="icon/icon_photo.svg" alt="画像アイコン">
<p>画像</p>
<img src="icon/icon_photo.svg" alt="写真アイコン">
<p>写真</p>
</a>
</div>
<div class="footer_item">
<a href="javascript:Common.startCollaboration(COLLABORATION_TYPE.VIDEO);">
<img src="icon/icon_movie.svg" alt="動画アイコン">
<p>動画</p>
<a href="javascript:Common.startCollaboration(COLLABORATION_TYPE.DOCUMENT);">
<img src="icon/icon_paste.svg" alt="文書アイコン">
<p>文書</p>
</a>
</div>
<!--リリース後開発予定-->
<div class="footer_item">
<a href="javascript:Common.startCollaboration(COLLABORATION_TYPE.BOARD);">
<img src="icon/icon_whiteboard_gray.svg" alt="ホワイトボードアイコン">
......
public_new/collaboration.html
......@@ -27,7 +27,7 @@
<div class="d-flex align-items-center h-100">
<div class="collabo_nav_l text-left w-100">
<div class="d-flex flex-row">
<span class="collabo-label collaboration_contents voice_contents">音声<span class="host_contents"> /
<span class="collabo-label collaboration_contents voice_contents">通話<span class="host_contents"> /
司会者</span><span class="none"> / 参加者</span></span>
<span class="collabo-label collaboration_contents video_contents">動画<span class="host_contents"> /
司会者</span><span class="none"> / 参加者</span></span>
......
public_new/collaboration_overlay_menu.html
......@@ -8,9 +8,9 @@
<a href="javascript:changeCollaboration(COLLABORATION_TYPE.AUDIO);"
class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_headset.svg" alt="音声共有">
<img src="icon/icon_collabo_headset.svg" alt="通話共有">
</div>
<span>音声</span>
<span>通話</span>
</a>
</div>
<div class="item hide rounded-circle shadow m-2 item02">
......
public_new/footer_collabo.html
......@@ -9,7 +9,7 @@
</div>
</a>
</div>
<div class="footer_item mx-md-3 collaboration_contents picture_contents video_contents document_contents board_contents">
<div class="footer_item mx-md-3 collaboration_contents picture_contents video_contents board_contents">
<a href="javascript:togglePen();">
<div class="d-flex flex-column justify-content-center align-items-center" id="penBtn">
<div class="t-icon pen disable"></div>
......@@ -17,7 +17,7 @@
</div>
</a>
</div>
<div class="footer_item mx-md-3 collaboration_contents picture_contents video_contents document_contents board_contents">
<div class="footer_item mx-md-3 collaboration_contents picture_contents video_contents board_contents">
<a href="javascript:toggleEraser();">
<div class="d-flex flex-column justify-content-center align-items-center"　id="eraserBtn">
<div class="t-icon delete"></div>
......
public_new/js/common/native-bridge-delegate.js
......@@ -224,7 +224,11 @@ NativeBridgeDelegate.finishCollaboration = function (needsAndroid = false) {
if (deviceInfo.isiOS()) {
webkit.messageHandlers.finishCollaboration.postMessage({});
} else if (needsAndroid) {
android.finishCollaboration();
try {
android.finishCollaboration();
} catch (error) {
console.error(error);
}
}
};
......
public_new/js/utils/chat-util.js
......@@ -132,14 +132,24 @@ CHAT_UTIL.getCollaborationType = function (collaborationNumber) {
CHAT_UTIL.getCollaborationTypeNumber = function (collaborationType) {
switch (collaborationType) {
case 0:
case "0":
case COLLABORATION_TYPE.AUDIO:
return COLLABORATION_TYPE_NUMBER.AUDIO;
case 2:
case "2":
case COLLABORATION_TYPE.CAMERA:
return COLLABORATION_TYPE_NUMBER.CAMERA;
case 3:
case "3":
case COLLABORATION_TYPE.VIDEO:
return COLLABORATION_TYPE_NUMBER.VIDEO;
case 4:
case "4":
case COLLABORATION_TYPE.DOCUMENT:
return COLLABORATION_TYPE_NUMBER.DOCUMENT;
case 5:
case "5":
case COLLABORATION_TYPE.BOARD:
return COLLABORATION_TYPE_NUMBER.BOARD;
default:
......
public_new/js/views/archive/archive.js
......@@ -181,7 +181,7 @@ ArchiveUI.appendPlayer = function (archive) {
);
switch (archive.archiveType) {
case "0": // 画像
case "0": // 写真
case 0:
ArchiveUI.appendImageTypePlayer(archiveFilePath);
break;
......@@ -189,7 +189,7 @@ ArchiveUI.appendPlayer = function (archive) {
case 1:
ArchiveUI.appendVideoTypePlayer(archiveFilePath);
break;
case "2": // 音声
case "2": // 通話
case 2:
ArchiveUI.appendVoiceTypePlayer(archiveFilePath);
break;
......@@ -315,13 +315,13 @@ ArchiveUI.refreshArchiveScreen = function () {
archiveList.forEach(function (archive) {
var typeImage = "";
switch (archive.archiveType) {
case ARCHIVE_TYPE.PICTURE: // 画像
case ARCHIVE_TYPE.PICTURE: // 写真
typeImage = "icon/icon_collabo_picture.svg";
break;
case ARCHIVE_TYPE.VIDEO: // 動画
typeImage = "icon/icon_collabo_videocam.svg";
break;
case ARCHIVE_TYPE.VOICE: // 音声
case ARCHIVE_TYPE.VOICE: // 通話
typeImage = "icon/icon_collabo_headset.svg";
break;
case ARCHIVE_TYPE.DOCUMENT: // 文書
......
public_new/js/views/collaboration/fermi-web-socket-message-handler.js
......@@ -248,16 +248,16 @@ FermiWebSocketMessageHandler.changeHostApplyForHost = function (data) {
}
NativeBridgeDelegate.setHostRequestFlg(HostRequestFlag.DOING);
waitMillisecond(500);
if (confirm(getLocalizedString("norify_request_host_change", hostID))) {
CoviewBridge.changeHost(hostID);
NativeBridgeDelegate.setHostRequestFlg(HostRequestFlag.DONE);
} else {
FermiWebSocketBridge.hostRequestReject(hostID);
}
FermiWebSocketBridge.hostRequestDone(hostID);
//PIPモード終了時に0.5秒のアニメーションの影響で画面崩れ発生問題対応で、0.5秒後にアラート表示
setTimeout(function() {
if (confirm(getLocalizedString("norify_request_host_change", hostID))) {
CoviewBridge.changeHost(hostID);
NativeBridgeDelegate.setHostRequestFlg(HostRequestFlag.DONE);
} else {
FermiWebSocketBridge.hostRequestReject(hostID);
}
FermiWebSocketBridge.hostRequestDone(hostID);
}, 500);
};
// HOST_REQUEST_DONE
......
public_new/js/views/collaboration/share-event-listener.js
......@@ -459,7 +459,7 @@ CoviewBridge.finishCollaboration = function () {
Common.showLoadingIndicator();
coview_api.LeaveRoom();
if (coview_api.getRoomUsers()) {
NativeBridgeDelegate.finishCollaboration();
NativeBridgeDelegate.finishCollaboration(true);
}
globalUserInfo.isLeaved = true;
......
public_new/search_message_archive_list.html
......@@ -41,7 +41,7 @@
<div class="archive_item d-flex flex-row align-items-center w-100">
<div class="arhive_img">
<div class="img_wrap bg_blue">
<img src="icon/icon_collabo_headset.svg" alt="音声" />
<img src="icon/icon_collabo_headset.svg" alt="通話" />
</div>
</div>
<div class="archive_desc">
......
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