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
2b11ca45
Commit
2b11ca45
authored
May 11, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
コードレビュー対応。
parent
4acde339
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
+2
-2
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
View file @
2b11ca45
...
@@ -1386,7 +1386,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
...
@@ -1386,7 +1386,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
meetingManager
.
deleteMeeting
(
meeting
.
meetingId
,
mSkey
);
meetingManager
.
deleteMeeting
(
meeting
.
meetingId
,
mSkey
);
}
}
}
}
meetingId
=
meetingManager
.
createMeeting
(
mSkey
,
"Collaboration_"
+
roomId
,
roomId
.
toString
());
meetingId
=
meetingManager
.
createMeeting
(
mSkey
,
"Collaboration_"
+
roomId
,
roomId
.
toString
());
meetingManager
.
join
(
meetingId
,
mSkey
,
roomId
.
toString
(),
true
);
meetingManager
.
join
(
meetingId
,
mSkey
,
roomId
.
toString
(),
true
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
mChatWebView
.
loadUrl
(
"javascript:alert('"
+
"会議室サーバに接続できませんでした。"
+
"');"
);
mChatWebView
.
loadUrl
(
"javascript:alert('"
+
"会議室サーバに接続できませんでした。"
+
"');"
);
...
@@ -1408,7 +1408,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
...
@@ -1408,7 +1408,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
}
}
}
}
if
(
collaborationJoinFlg
==
0
)
{
if
(
collaborationJoinFlg
==
0
)
{
meetingId
=
meetingManager
.
createMeeting
(
mSkey
,
"Collaboration_"
+
roomId
,
roomId
.
toString
());
meetingId
=
meetingManager
.
createMeeting
(
mSkey
,
"Collaboration_"
+
roomId
,
roomId
.
toString
());
meetingManager
.
join
(
meetingId
,
mSkey
,
roomId
.
toString
(),
true
);
meetingManager
.
join
(
meetingId
,
mSkey
,
roomId
.
toString
(),
true
);
}
else
{
}
else
{
meetingManager
.
join
(
Integer
.
parseInt
(
joinMeetingId
),
mSkey
,
roomId
.
toString
(),
true
);
meetingManager
.
join
(
Integer
.
parseInt
(
joinMeetingId
),
mSkey
,
roomId
.
toString
(),
true
);
...
...
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