Skip to content

C
chat_webview
Commit ac05490a by Kim Peace
Options

Removed and Fixed chat-add-user

parent 4fce1a70
Showing with 32 additions and 60 deletions
public_new/chat_add_user.html
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
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 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/bootstrap.min.css">
<link rel="stylesheet" href="./css/common.css"> <link rel="stylesheet" href="./css/common.css">
<link rel="stylesheet" href="./css/chat.css"> <link rel="stylesheet" href="./css/chat.css">
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<!-- ナビメニュー --> <!-- ナビメニュー -->
<nav> <nav>
<div class="row h-100 align-items-center"> <div class="row h-100 align-items-center">
<div class="col-4 pr-0"> <div class="col-10 pr-0">
<div class="nav-item"> <div class="nav-item">
<div class="nav_prev"> <div class="nav_prev">
<a href="chat_room.html"><span>ルーム</span></a> <a href="chat_room.html"><span>ルーム</span></a>
...@@ -66,18 +66,19 @@ ...@@ -66,18 +66,19 @@
<div id="myGroupListForMakeRoom"></div> <div id="myGroupListForMakeRoom"></div>
</div> </div>
</div> </div>
</div>
<div class="tab_content" id="tab2_content"> <div class="tab_content" id="tab2_content">
<div class="breadcrumb" id="groupPathAreaForAddUser"></div> <div class="breadcrumb" id="groupPathAreaForAddUser"></div>
<div class="chat_list"> <div class="chat_list">
<!-- 全グループ --> <!-- 全グループ -->
<ul class="p-0 chat_make_room_list"> <ul class="p-0 chat_make_room_list">
<li class="d-flex align-items-center" id="rootGroupArea"> <li class="d-flex align-items-center" id="rootGroupArea">
<a href="#" class="w-100" id="rootGroupBtnForAddUser"> <a href="#" class="w-100" id="rootGroupBtnForAddUser">
<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">
<div class="thumbnail-icon"> <div class="thumbnail-icon">
<img src="icon/icon_prev_top.svg" alt="トップグループに戻る" /> <img src="icon/icon_prev_top.svg" alt="トップグループに戻る" />
</div>
</div> </div>
<div class="chat_item_m px-0"> <div class="chat_item_m px-0">
<div class="d-flex flex-column"> <div class="d-flex flex-column">
...@@ -87,15 +88,15 @@ ...@@ -87,15 +88,15 @@
</div> </div>
</div> </div>
</div> </div>
</div> </a>
</a> </li>
</li> <li class="d-flex align-items-center" id="parentGroupArea">
<li class="d-flex align-items-center" id="parentGroupArea"> <a href="#" class="w-100" id="parentGroupBtnForAddUser">
<a href="#" class="w-100" id="parentGroupBtnForAddUser"> <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"> <div class="thumbnail-icon">
<div class="thumbnail-icon"> <img src="icon/icon_prev.svg" alt="上位グループに戻る" />
<img src="icon/icon_prev.svg" alt="上位グループに戻る" /> </div>
</div> </div>
<div class="chat_item_m px-0"> <div class="chat_item_m px-0">
<div class="d-flex flex-column"> <div class="d-flex flex-column">
...@@ -105,14 +106,14 @@ ...@@ -105,14 +106,14 @@
</div> </div>
</div> </div>
</div> </div>
</a> </a>
</li> </li>
<div id="childGroupListAreaForAddUser"></div> <div id="childGroupListAreaForAddUser"></div>
<div id="userInGroupListForAddUser"></div> <div id="userInGroupListForAddUser"></div>
</ul> </ul>
</div>
</div> </div>
</div> </div>
</div>
<div class="chat_make_room"> <div class="chat_make_room">
<ul class="overlay_src_msg" style="padding-inline-start: 20px;"> <ul class="overlay_src_msg" style="padding-inline-start: 20px;">
</ul> </ul>
......
public_new/js/common/native-bridge-delegate.js
...@@ -117,7 +117,7 @@ NativeBridgeDelegate.joinCollaboration = function ( ...@@ -117,7 +117,7 @@ NativeBridgeDelegate.joinCollaboration = function (
NativeBridgeDelegate.inviteUsers = function (userIDList) { NativeBridgeDelegate.inviteUsers = function (userIDList) {
if (typeof android != "undefined") { if (typeof android != "undefined") {
android.inviteUsers(userIDList, false); android.inviteUsers(userIDList);
} else { } else {
webkit.messageHandlers.inviteUsers.postMessage({ webkit.messageHandlers.inviteUsers.postMessage({
userIdList: userIDList, userIdList: userIDList,
...@@ -146,7 +146,7 @@ NativeBridgeDelegate.finishPIPMode = function (needsAndroid = false) { ...@@ -146,7 +146,7 @@ NativeBridgeDelegate.finishPIPMode = function (needsAndroid = false) {
if (deviceInfo.isiOS()) { if (deviceInfo.isiOS()) {
webkit.messageHandlers.finishPipMode.postMessage({}); webkit.messageHandlers.finishPipMode.postMessage({});
} else if (needsAndroid && typeof android != "undefined") { } else if (needsAndroid && typeof android != "undefined") {
android.finishPip(); android.finishPIP();
} }
}; };
......
public_new/js/views/collaboration/share-event-listener.js
...@@ -32,34 +32,6 @@ CoviewBridge.bindStartEvent = function () { ...@@ -32,34 +32,6 @@ CoviewBridge.bindStartEvent = function () {
}); });
}; };
CollaborationFeature.checkAndRetryCamera = async function () {
if (!deviceInfo.isAndroid()) {
return;
}
if (globalUserInfo.collaborationType != COLLABORATION_TYPE.VIDEO) {
return;
}
if (g_newStream != null) {
return;
}
try {
const cameraStream = await navigator.mediaDevices.getUserMedia(
options.constraints
);
if (cameraStream != null && options.isMainMan) {
ORGcreateLocalVideo(options.constraints);
} else {
setTimeout(() => {
CollaborationFeature.checkAndRetryCamera();
}, 1000);
}
} catch (error) {
setTimeout(() => {
CollaborationFeature.checkAndRetryCamera();
}, 1000);
}
};
/************** /**************
* Scroll Lock * Scroll Lock
**************/ **************/
...@@ -143,7 +115,6 @@ CoviewBridge.bindMessageEvent = function () { ...@@ -143,7 +115,6 @@ CoviewBridge.bindMessageEvent = function () {
case "CreateRoomResponse": case "CreateRoomResponse":
if (json.resultCode == 200) { if (json.resultCode == 200) {
CollaborationFeature.didReceiveCreateRoomResponseMessage(); CollaborationFeature.didReceiveCreateRoomResponseMessage();
CollaborationFeature.checkAndRetryCamera();
} }
break; break;
case "joinRoomInfoResponse": case "joinRoomInfoResponse":
......
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