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
991b4885
Commit
991b4885
authored
May 20, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
アンドロイド8以下バージョンでの処理追加。
parent
7daa79f1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
5 deletions
+23
-5
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java
+23
-5
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java
View file @
991b4885
...
...
@@ -123,11 +123,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
//private final String NETWORK_ERROR_PLACE_HOLDER = "file:///android_asset/chat/public/networkError.html";
private
final
String
CHAT_PAGE_URL
=
"file:///android_asset/chat/public_new/chat.html"
;
private
final
String
CHAT_ROOM_PAGE_URL
=
"file:///android_asset/chat/public_new/chat_room.html"
;
private
final
String
PICTURE_COLLABORATION_PAGE_URL
=
"file:///android_asset/chat/public_new/collaboration_picture.html"
;
private
final
String
VIDEO_COLLABORATION_PAGE_URL
=
"file:///android_asset/chat/public_new/collaboration_video.html"
;
private
final
String
VOICE_COLLABORATION_PAGE_URL
=
"file:///android_asset/chat/public_new/collaboration_voice.html"
;
private
final
String
DOCUMENT_COLLABORATION_PAGE_URL
=
"file:///android_asset/chat/public_new/collaboration_documents.html"
;
private
final
String
WHITE_BOARD_COLLABORATION_PAGE_URL
=
"file:///android_asset/chat/public_new/collaboration_whiteboard.html"
;
private
final
String
COLLABORATION_PAGE_URL
=
"file:///android_asset/chat/public_new/collaboration.html"
;
private
final
String
DEFAULT_CHECKSUM
=
"0000000000"
;
//AISDevelop
...
...
@@ -1350,6 +1345,13 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
}
@JavascriptInterface
public
void
joinChangedCollaboration
(
String
collaborationType
,
String
meetingId
)
throws
NetworkDisconnectedException
,
AcmsException
{
joinMeetingId
=
Integer
.
parseInt
(
meetingId
);
collaborationJoinFlg
=
ABookCommConstants
.
FLAG
.
COLLABORATION_JOIN_FLG
.
JOIN
;
AcmsClient
.
getInstance
(
ABVEnvironment
.
getInstance
().
networkAdapter
).
joinCollaboration
(
sid
,
roomId
.
intValue
());
}
@JavascriptInterface
public
void
inviteCollaboration
(
String
inviteUserIds
,
String
collaborationType
)
throws
NetworkDisconnectedException
,
AcmsException
{
AcmsClient
.
getInstance
(
ABVEnvironment
.
getInstance
().
networkAdapter
).
inviteCollaboration
(
sid
,
roomId
.
intValue
(),
roomName
,
inviteUserIds
,
collaborationType
);
}
...
...
@@ -1484,6 +1486,11 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
public
void
changeCollaboration
(
int
changeCollaborationType
,
int
meetingId
)
throws
NetworkDisconnectedException
,
AcmsException
{
AcmsClient
.
getInstance
(
ABVEnvironment
.
getInstance
().
networkAdapter
).
changeCollaboration
(
sid
,
roomId
.
intValue
(),
changeCollaborationType
,
meetingId
);
}
@JavascriptInterface
public
int
getAndroidVersion
()
{
return
Build
.
VERSION
.
SDK_INT
;
}
}
/**
...
...
@@ -1591,6 +1598,10 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
}
private
void
moveCollaborationScreen
(
Integer
collaborationType
)
{
if
(
collaborationType
.
equals
(
ABookCommConstants
.
FLAG
.
COLLABORATION_TYPE
.
DOCUMENT
)
&&
!
isValidVersion
())
{
mChatWebView
.
loadUrl
(
"javascript:alert(getLocalizedString('not_support_version'));"
);
return
;
}
mCollaborationType
=
collaborationType
;
mChatWebView
.
post
(
new
Runnable
()
{
@Override
...
...
@@ -1774,4 +1785,11 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
return
eventPrevent
;
}
public
boolean
isValidVersion
()
{
if
(
Build
.
VERSION
.
SDK_INT
<
Build
.
VERSION_CODES
.
O
)
{
return
false
;
}
return
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