Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abook_check
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
abook_android
abook_check
Commits
893d16ef
Commit
893d16ef
authored
May 11, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
文書協業実装
parent
86abd366
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
1 deletions
+24
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
+2
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
+22
-0
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
View file @
893d16ef
...
...
@@ -469,13 +469,14 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
// }
}
else
{
// 会議室退室ボタン非表示
if
(
exitMeetingBtn
!=
null
)
{
exitMeetingBtn
.
setVisibility
(
View
.
GONE
);
RelativeLayout
.
LayoutParams
params
=
new
RelativeLayout
.
LayoutParams
(
WC
,
WC
);
params
.
addRule
(
RelativeLayout
.
ALIGN_PARENT_RIGHT
);
params
.
addRule
(
RelativeLayout
.
CENTER_VERTICAL
);
params
.
rightMargin
=
(
int
)
(
getResources
().
getDisplayMetrics
().
density
*
5
);
subMenuBtn
.
setLayoutParams
(
params
);
}
// if (helpButton != null && helpButton.getVisibility() == View.VISIBLE) {
// helpButton.setLayoutParams(params);
// }
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
View file @
893d16ef
...
...
@@ -1374,6 +1374,28 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
return
communicationLogic
.
getUserListByLoginId
(
loginIdList
);
}
@JavascriptInterface
public
String
createContentView
()
{
Integer
meetingId
=
null
;
try
{
connectMeetingServer
();
List
<
MeetingDto
>
meetingList
=
meetingManager
.
getMeetingList
(
mSkey
);
for
(
MeetingDto
meeting
:
meetingList
)
{
if
(
meeting
.
title
.
equals
(
"Collaboration__"
+
roomId
)
&&
meetingManager
.
isOwner
())
{
meetingManager
.
deleteMeeting
(
meeting
.
meetingId
,
mSkey
);
}
}
meetingId
=
meetingManager
.
createMeeting
(
mSkey
,
"Collaboration_"
+
roomId
,
roomId
.
toString
());
meetingManager
.
join
(
meetingId
,
mSkey
,
roomId
.
toString
(),
true
);
}
catch
(
Exception
e
)
{
mChatWebView
.
loadUrl
(
"javascript:alert('"
+
"会議室サーバに接続できませんでした。"
+
"');"
);
}
PictureInPictureParams
.
Builder
mPipBuilder
=
new
PictureInPictureParams
.
Builder
();
enterPictureInPictureMode
(
mPipBuilder
.
build
());
return
meetingId
.
toString
();
}
@JavascriptInterface
public
void
startContentView
(
String
joinMeetingId
)
{
Integer
meetingId
;
...
...
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