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
6f3fe281
Commit
6f3fe281
authored
May 20, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
コードレビュー対応。
parent
3cb4cff1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
8 deletions
+7
-8
public_new/js/share.js
+7
-8
No files found.
public_new/js/share.js
View file @
6f3fe281
...
...
@@ -154,7 +154,7 @@ $(function () {
captureAndShareImage
(
CMS_SERVER_URL
+
'/chatapi/file/uploadArchive'
,
data
.
payload
.
name
);
}
}
else
if
(
data
.
type
===
"SEND_HOST_CHANGE_SIGNAL"
)
{
if
(
g_username
==
data
.
payload
.
name
)
{
if
(
g_username
==
data
.
payload
.
name
)
{
fw
.
sendToMsg
(
'others'
,
'SEND_HOST_CHANGE_DONE_SIGNAL'
,
{
host
:
g_username
});
$
(
".coview_on_media_image_crown"
).
show
();
$
(
".coview_on_screen_btn.owner"
).
show
();
...
...
@@ -162,7 +162,6 @@ $(function () {
$
(
".coview_share_title_right_area"
).
show
();
g_isMainMan
=
true
;
g_isMainManUsername
=
g_username
;
//g_agentID = g_username;
options
.
constraints
=
{
audio
:
true
,
video
:
true
};
g_localStream
=
await
createLocalVideo
(
options
.
constraints
);
ChangeAgentStream
(
g_localStream
);
...
...
@@ -601,7 +600,7 @@ function captureAndShareImage(urls, changeHostName) {
var
w
,
h
;
var
video
=
document
.
getElementById
(
"localVideo"
);
var
canvas
=
document
.
createElement
(
'canvas'
);
if
(
clientOrientaionState
==
1
)
{
if
(
clientOrientaionState
==
1
)
{
canvas
.
width
=
w
=
680
;
canvas
.
height
=
h
=
515
;
}
else
{
...
...
@@ -621,7 +620,7 @@ function captureAndShareImage(urls, changeHostName) {
$
(
canvasRemote
).
attr
(
"height"
,
$
(
snapshots
[
cpatureViewIndex
]).
attr
(
"height"
));
$
(
canvasRemote
).
attr
(
"width"
,
$
(
snapshots
[
cpatureViewIndex
]).
attr
(
"width"
));
console
.
log
(
'url'
,
URL
.
createObjectURL
(
blob
));
if
(
$
(
".canvas_wrap"
).
css
(
"width"
).
replace
(
"px"
,
""
)
/
$
(
".canvas_wrap"
).
css
(
"height"
).
replace
(
"px"
,
""
)
<
$
(
canvas
).
attr
(
"width"
)
/
$
(
canvas
).
attr
(
"height"
)
)
{
if
(
$
(
".canvas_wrap"
).
css
(
"width"
).
replace
(
"px"
,
""
)
/
$
(
".canvas_wrap"
).
css
(
"height"
).
replace
(
"px"
,
""
)
<
$
(
canvas
).
attr
(
"width"
)
/
$
(
canvas
).
attr
(
"height"
)
)
{
var
h
=
$
(
".canvas_wrap"
).
css
(
"width"
).
replace
(
"px"
,
""
)
*
(
$
(
canvas
).
attr
(
"height"
)
/
$
(
canvas
).
attr
(
"width"
));
var
w
=
$
(
".canvas_wrap"
).
css
(
"width"
).
replace
(
"px"
,
""
);
$
(
canvasRemote
).
css
(
"height"
,
h
);
...
...
@@ -648,7 +647,7 @@ function captureAndShareImage(urls, changeHostName) {
formData
.
append
(
"imgFile"
,
blob
,
uploadFileName
);
var
uploadUrl
=
location
.
protocol
+
"//"
+
location
.
hostname
+
":"
+
location
.
port
+
"/upload/create"
;
if
(
!
location
.
port
)
{
if
(
!
location
.
port
)
{
uploadUrl
=
location
.
protocol
+
"//"
+
location
.
hostname
+
"/upload/create"
;
}
$
.
ajax
({
...
...
@@ -657,8 +656,8 @@ function captureAndShareImage(urls, changeHostName) {
data
:
formData
,
processData
:
false
,
contentType
:
false
,
success
:
function
(
res
)
{
setTimeout
(
function
(){
success
:
function
(
res
)
{
setTimeout
(
function
()
{
SendFileShare
(
uploadFileName
);
$
(
"#coviewCaptureCtrBtn"
).
hide
();
$
(
"#coviewRecCtrBtn"
).
hide
();
...
...
@@ -669,7 +668,7 @@ function captureAndShareImage(urls, changeHostName) {
fw
.
sendToMsg
(
'others'
,
'SEND_HOST_CHANGE_SIGNAL'
,
{
"name"
:
changeHostName
});
},
1500
);
},
error
:
function
(
err
)
{
error
:
function
(
err
)
{
console
.
log
(
err
);
}
});
...
...
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