Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
chat_webview
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abookCommunication
chat_webview
Commits
6116448a
Commit
6116448a
authored
May 10, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
文書協業実装
parent
5ad65dc3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
36 additions
and
20 deletions
+36
-20
public_new/chat_room.html
+1
-1
public_new/collaboration_documents.html
+0
-0
public_new/footer_collabo.html
+1
-1
public_new/js/chat-ui.js
+0
-14
public_new/js/chat-util.js
+3
-0
public_new/js/constant.js
+4
-2
public_new/js/share.js
+27
-2
No files found.
public_new/chat_room.html
View file @
6116448a
...
...
@@ -108,7 +108,7 @@
</a>
</div>
<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=
"
javascript:CHAT_UI.startCollaboration(collaborationType.DOCUMENT
);"
>
<p>
文書
</p>
</div>
<div
class=
"footer_item"
>
...
...
public_new/collaboration_documents.html
View file @
6116448a
This diff is collapsed.
Click to expand it.
public_new/footer_collabo.html
View file @
6116448a
...
...
@@ -16,7 +16,7 @@
</a>
</div>
<div
class=
"footer_item"
>
<a
href=
"javascript:Coview_exitCollaboration();"
>
<a
href=
"javascript:Coview_exitCollaboration(
isDocument
);"
>
<div
class=
"img_wrap bg_red"
>
<img
src=
"icon/icon_tell.png"
alt=
"通話"
>
</div>
...
...
public_new/js/chat-ui.js
View file @
6116448a
...
...
@@ -2484,20 +2484,6 @@ CHAT_UI.startCollaboration = function(collaborationType) {
}
}
CHAT_UI
.
displayDocumentSelectScreen
=
function
()
{
var
documentList
=
CHAT_DB
.
getContentList
();
var
documentTemplate
;
$
.
get
({
url
:
"./template/template_document_list.html"
,
async
:
false
}
,
function
(
text
)
{
documentTemplate
=
text
;
});
let
html
=
Mustache
.
render
(
documentTemplate
,
{
documentList
:
documentList
});
let
obj
=
jQuery
.
parseHTML
(
html
);
$
(
'#overlay_document_list'
).
append
(
obj
);
$
(
'#overlay_document_list'
).
removeClass
(
'none'
);
}
CHAT_UI
.
refreshJoinedCollaboration
=
function
(
loginIdList
,
hostName
)
{
CHAT_UI
.
showLoadingIndicator
();
...
...
public_new/js/chat-util.js
View file @
6116448a
...
...
@@ -128,6 +128,9 @@ CHAT_UTIL.getCollaborationType = function(key) {
case
collaborationTypeKey
.
VIDEO
:
return
collaborationType
.
VIDEO
;
break
;
case
collaborationTypeKey
.
DOCUMENT
:
return
collaborationType
.
DOCUMENT
;
break
;
default
:
return
0
;
break
;
...
...
public_new/js/constant.js
View file @
6116448a
...
...
@@ -40,13 +40,15 @@ const nameCardAreaId = {
const
collaborationTypeKey
=
{
AUDIO
:
"audio"
,
CAMERA
:
"camera"
,
VIDEO
:
"video"
VIDEO
:
"video"
,
DOCUMENT
:
"document"
}
const
collaborationType
=
{
AUDIO
:
0
,
CAMERA
:
2
,
VIDEO
:
3
VIDEO
:
3
,
DOCUMENT
:
4
}
const
makeRoomFlg
=
{
...
...
public_new/js/share.js
View file @
6116448a
...
...
@@ -2,6 +2,7 @@
/* Functions */
/* --------------------------------------------------- */
let
coview_api
=
new
CoviewApi
();
var
isDocument
=
false
;
$
(
function
()
{
var
coviewApiActive
=
coview_api
.
Init
(
{
...
...
@@ -150,19 +151,36 @@ $(function() {
console
.
log
(
'------------------------------'
);
console
.
log
(
globalUserInfo
.
coWorkType
);
console
.
log
(
collaborationJoinFlg
);
if
(
globalUserInfo
.
coWorkType
==
collaborationTypeKey
.
DOCUMENT
)
{
isDocument
=
true
;
globalUserInfo
.
coWorkType
=
collaborationTypeKey
.
AUDIO
;
}
if
(
collaborationJoinFlg
==
'1'
)
{
coview_api
.
JoinRoom
(
globalUserInfo
.
roomId
,
globalUserInfo
.
coWorkType
);
}
else
if
(
collaborationJoinFlg
==
'0'
)
{
coview_api
.
CreateRoom
(
globalUserInfo
.
roomId
,
globalUserInfo
.
coWorkType
);
}
if
(
isDocument
)
{
if
(
CHAT_UTIL
.
isIOS
())
{
//TODO 画面を縮小し、会議室に入場する処理
}
else
if
(
CHAT_UTIL
.
isAndroid
())
{
android
.
startContentView
();
}
}
Coview_moveToVideoShareArea
();
break
;
case
"CreateRoomResponse"
:
if
(
json
.
resultCode
==
200
)
{
var
coviewInviteMessage
=
""
+
messageSeperator
+
messageType
.
COMMUNICATIONSTART
+
messageSeperator
+
CHAT_UTIL
.
getCollaborationType
(
globalUserInfo
.
coWorkType
);
var
coviewInviteMessage
;
if
(
isDocument
)
{
coviewInviteMessage
=
""
+
messageSeperator
+
messageType
.
COMMUNICATIONSTART
+
messageSeperator
+
CHAT_UTIL
.
getCollaborationType
(
collaborationTypeKey
.
DOCUMENT
);
}
else
{
coviewInviteMessage
=
""
+
messageSeperator
+
messageType
.
COMMUNICATIONSTART
+
messageSeperator
+
CHAT_UTIL
.
getCollaborationType
(
globalUserInfo
.
coWorkType
);
}
socket
.
emit
(
'createMessage'
,
{
text
:
coviewInviteMessage
},
0
);
}
else
{
}
break
;
...
...
@@ -214,7 +232,14 @@ function Coview_moveToVideoShareArea() {
$
(
'#collabo_main'
).
removeClass
(
'none'
);
}
function
Coview_exitCollaboration
()
{
function
Coview_exitCollaboration
(
isDocument
)
{
if
(
isDocument
)
{
if
(
CHAT_UTIL
.
isIOS
())
{
//TODO IOS会議室退場処理
}
else
if
(
CHAT_UTIL
.
isAndroid
())
{
android
.
exitMeetingRoom
();
}
}
coview_api
.
LeaveRoom
();
CHAT_UI
.
joinRoom
(
CHAT
.
globalLoginParameter
.
roomId
,
CHAT
.
globalLoginParameter
.
name
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment