Commit e8a6082a by Takatoshi Miura

Merge commit '239d9c72' into…

Merge commit '239d9c72' into origin/release_sp3_ios_collaboration_document
parents d9af5309 239d9c72
...@@ -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="CHAT_UI.startCollaboration(collaborationType.DOCUMENT);">
<p>文書</p> <p>文書</p>
</div> </div>
<div class="footer_item"> <div class="footer_item">
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<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 add_user_btn"></button> <button type="button" name="button" class="btn add_user_btn"></button>
<button type="button" name="button" class="btn menu_btn" onclick="android.startPipMode();"></button> <button type="button" name="button" class="btn start_pip_btn" onclick="android.startPipMode();"></button>
</div> </div>
</div> </div>
</div> </div>
...@@ -63,6 +63,10 @@ ...@@ -63,6 +63,10 @@
<!-- フッター --> <!-- フッター -->
<div id="footer_collabo"></div> <div id="footer_collabo"></div>
<div id="loadingArea"></div> <div id="loadingArea"></div>
<div class="pip_indicator none">
<div style="vertical-align: middle;display: table-cell;">協業中
</div>
</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>
...@@ -122,7 +126,6 @@ ...@@ -122,7 +126,6 @@
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);
} }
globalUserInfo.coWorkType = collaborationTypeKey.DOCUMENT; globalUserInfo.coWorkType = collaborationTypeKey.DOCUMENT;
CHAT_SOCKET.connectSocket(); CHAT_SOCKET.connectSocket();
......
...@@ -125,6 +125,9 @@ ...@@ -125,6 +125,9 @@
.btn.exit_btn { .btn.exit_btn {
background-image: url("../icon/icon_close.png"); background-image: url("../icon/icon_close.png");
} }
.btn.start_pip_btn {
background-image: url("../icon/icon_start_pip.png");
}
.btn.menu_btn.hide, .btn.menu_btn.hide,
.btn.add_user_btn.hide, .btn.add_user_btn.hide,
.btn.user_btn.hide { .btn.user_btn.hide {
...@@ -860,6 +863,20 @@ input[name="tab_item"] { ...@@ -860,6 +863,20 @@ input[name="tab_item"] {
max-width: 1280px; max-width: 1280px;
} }
.pip_indicator {
display: table;
vertical-align: middle;
font-size: xxx-large;
top: 0px;
width: 100%;
height: 100vh;
background-color: steelblue;
color: azure;
position: fixed;
z-index: 1000;
text-align: center;
}
@media screen and (max-width: 768px) { @media screen and (max-width: 768px) {
/* chat item */ /* chat item */
.tab_item { .tab_item {
......
...@@ -1312,7 +1312,10 @@ CHAT_UI.loadMessages = function(roomId, roomName) { ...@@ -1312,7 +1312,10 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
collaborationInfo = JSON.parse(message.message); collaborationInfo = JSON.parse(message.message);
userInCollaboration = JSON.parse(android.getUserInfoList(collaborationInfo.userList)); userInCollaboration = JSON.parse(android.getUserInfoList(collaborationInfo.userList));
} }
var meetingId = 0;
if (typeof collaborationInfo.meetingId != 'undefined') {
meetingId = collaborationInfo.meetingId;
}
userInCollaboration.forEach(function(user) { userInCollaboration.forEach(function(user) {
user.profileUrl = CHAT.getProfileImgUrl(user.profileUrl); user.profileUrl = CHAT.getProfileImgUrl(user.profileUrl);
}) })
...@@ -1322,6 +1325,7 @@ CHAT_UI.loadMessages = function(roomId, roomName) { ...@@ -1322,6 +1325,7 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
userList: userInCollaboration.length > 3 ? userInCollaboration.slice(0, 3) : userInCollaboration, userList: userInCollaboration.length > 3 ? userInCollaboration.slice(0, 3) : userInCollaboration,
insertDate: message.insertDate, insertDate: message.insertDate,
collaborationType: collaborationInfo.collaborationType, collaborationType: collaborationInfo.collaborationType,
meetingId: meetingId,
isToday: isToday, isToday: isToday,
createdAtDay: messageTime.createdAtDay, createdAtDay: messageTime.createdAtDay,
createdAtTime: messageTime.createdAtTime, createdAtTime: messageTime.createdAtTime,
...@@ -2468,11 +2472,12 @@ CHAT_UI.displayExistRoom = function(roomId) { ...@@ -2468,11 +2472,12 @@ CHAT_UI.displayExistRoom = function(roomId) {
return; return;
} }
CHAT_UI.joinCollaboration = function(collaborationType) { CHAT_UI.joinCollaboration = function(collaborationType, meetingId = 0) {
console.log(meetingId);
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
webkit.messageHandlers.joinCollaboration.postMessage(collaborationType); webkit.messageHandlers.joinCollaboration.postMessage(collaborationType);
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
android.joinCollaboration(collaborationType); android.joinCollaboration(collaborationType, meetingId);
} }
} }
......
...@@ -180,7 +180,7 @@ $(function() { ...@@ -180,7 +180,7 @@ $(function() {
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
webkit.messageHandlers.startContentView.postMessage({"meetingId": meetingId}); webkit.messageHandlers.startContentView.postMessage({"meetingId": meetingId});
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
android.startContentView(meetingId); android.startContentView();
} }
} }
} else if (collaborationJoinFlg == '0') { } else if (collaborationJoinFlg == '0') {
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</div> </div>
</div> </div>
<div class="collabo_btn"> <div class="collabo_btn">
<button type="button" name="button" onclick="CHAT_UI.joinCollaboration({{collaborationType}})"> <button type="button" name="button" onclick="CHAT_UI.joinCollaboration({{collaborationType}}, {{meetingId}})">
<img src="icon/icon_profile_phone.png" alt="通話"> <img src="icon/icon_profile_phone.png" alt="通話">
<span>参加する</span> <span>参加する</span>
</button> </button>
......
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