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
697b7184
Commit
697b7184
authored
May 21, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'communication/ABCOMM-663_ios_record' into 'develop'
ABCOMM-663_ios_record_iosレコード機能実装 See merge request
!137
parents
52a90315
21cca38d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
public_new/js/chat-ui.js
+5
-1
public_new/js/share.js
+3
-1
No files found.
public_new/js/chat-ui.js
View file @
697b7184
...
...
@@ -1800,7 +1800,11 @@ CHAT_UI.refreshArchiveDetailScreen = function(archiveId) {
break
;
case
"1"
:
// 動画
case
1
:
$
(
'#archive_player'
).
prepend
(
'<video class="archive_player" src='
+
archiveFilePath
+
' controls autoplay muted playsinline controlsList="nodownload"></video>'
);
if
(
CHAT_UTIL
.
isIOS
())
{
$
(
'#archive_player'
).
prepend
(
'<video class="archive_player" controls autoplay muted playsinline controlsList="nodownload"><source src="'
+
archiveFilePath
+
'" type="video/mp4"><source src="'
+
archiveFilePath
+
'" type="video/ogv"><source src="'
+
archiveFilePath
+
'" type="video/webm"></video>'
);
}
else
{
$
(
'#archive_player'
).
prepend
(
'<video class="archive_player" src='
+
archiveFilePath
+
' controls autoplay muted playsinline controlsList="nodownload"></video>'
);
}
break
;
case
"2"
:
// 音声
case
2
:
...
...
public_new/js/share.js
View file @
697b7184
...
...
@@ -7,6 +7,7 @@ var isBoard = false;
let
isLeaved
=
false
;
let
timeInterval
=
null
;
var
backgroundFileName
;
var
isIos
;
$
(
function
()
{
var
coviewApiActive
=
coview_api
.
Init
({
...
...
@@ -140,7 +141,7 @@ $(function () {
initCollaborationUI
(
joinCollaborationType
);
if
(
CHAT_UTIL
.
isIOS
())
{
//TODO JoinCollaborationAPI
webkit
.
messageHandlers
.
joinChangedCollaboration
.
postMessage
({
"joinCollaborationType"
:
joinCollaborationType
,
"meetingId"
:
data
.
payload
.
newMeetingId
});
webkit
.
messageHandlers
.
joinMeetingRoom
.
postMessage
(
data
.
payload
.
newMeetingId
);
}
else
if
(
CHAT_UTIL
.
isAndroid
())
{
android
.
joinChangedCollaboration
(
joinCollaborationType
,
data
.
payload
.
newMeetingId
);
...
...
@@ -551,6 +552,7 @@ function hostSearchInterval() {
$
(
'.video_contents_host'
).
removeClass
(
'none'
);
$
(
'.video_contents_user'
).
addClass
(
'none'
);
}
if
(
CHAT_UTIL
.
isIOS
())
isIos
=
true
;
}
else
{
$
(
'.host_contents'
).
addClass
(
'none'
);
if
(
joinCollaborationType
==
COLLABORATION_TYPE
.
CAMERA
)
{
...
...
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