Skip to content

C
chat_webview
Commit 507009f6 by Takatoshi Miura
Options

Fermi製コード追加

parent 5903e9b8
Showing with 182 additions and 1 deletions
public/css/chat.css
......@@ -759,3 +759,157 @@ a.article:hover {
color: white;
text-align: center;
}
/* --------------------------------------------------- */
/* COLLABORATION STYLE */
/* --------------------------------------------------- */
#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: calc(100vh - 58px);
}
.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;
}
public/index.html
......@@ -26,6 +26,20 @@
</script>
</head>
<body>
<!-- coview share -->
<div class="coview_share_area">
<div class="coview_share_title">
<div class="coview_share_title_left_area col-3">
<button class="btn coview_share_title_btn" type="button" id="coviewShareCloseButton">
<i class="fa fa-times"></i>
</button>
</div>
<div class="navbar-brand col-6 mr-0 coview_share_title_name text-center" href="#">LIVE</div>
</div>
<div class="coview_share_body" id="coviewShare">
</div>
</div>
<nav class="navbar navbar-expand navbar-dark bg-primary fixed-top flex-md-nowrap p-2 shadow">
<ul class="navbar-nav col-3" id="navbarLeft">
<button class="btn btn-primary" type="button" id="backButton">
......
public/js/chat-ui.js
......@@ -473,7 +473,7 @@ $('a[data-toggle="pill"]').on('show.bs.tab', function (e) {
CHAT.globalSelectedUserList = [];
break;
case '#pills-contact':
$('#namecard').html('');
$('#homeButton').show();
......@@ -1065,6 +1065,8 @@ CHAT_UI.refreshRoomList = function(roomType) {
let obj = $(jQuery.parseHTML(html)).on('click', function() {
let roomId = $(this).data('roomId');
let roomName = $(this).data('roomname');
globalUserInfo.roomId = roomId;
globalUserInfo.roomName = roomName;
CHAT_UI.joinRoom(roomId,roomName);
//TODO ルームに入る処理追加必要
});
......
public/js/chat.js
......@@ -8,6 +8,9 @@ CHAT.globalIsInvite = false;
//ログイン中の部屋情報を保存する変数
CHAT.globalLoginParameter;
// 協業用
let globalUserInfo = new Object()
CHAT.saveRoomInfo = function(roomId, roomName) {
CHAT.globalLoginParameter.roomId = roomId;
CHAT.globalLoginParameter.roomName = roomName;
......@@ -230,6 +233,14 @@ getLoginParameter = function(sid, loginId, shopName, roomId = undefined, roomNam
}
CHAT_UI.htmlElementTextInitialize(languageCode)
// 協業用
globalUserInfo.sid = sid;
globalUserInfo.loginId = loginId;
globalUserInfo.shopName = shopName;
globalUserInfo.roomId = roomId;
globalUserInfo.roomName = roomName;
globalUserInfo.languageCode = languageCode;
if (IS_ONLINE == 'true') {
socket.emit('join', loginParam, function(err) {
if (err) {
......
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