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
c36e0fe5
Commit
c36e0fe5
authored
May 16, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'communication/#414_board_collaboration' into 'communication/develop'
ボード協業実装 See merge request
!148
parents
17680174
076e8c17
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookCommConstants.java
+2
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java
+9
-0
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookCommConstants.java
View file @
c36e0fe5
...
@@ -120,6 +120,8 @@ public interface ABookCommConstants {
...
@@ -120,6 +120,8 @@ public interface ABookCommConstants {
Integer
AUDIO
=
0
;
Integer
AUDIO
=
0
;
Integer
CAMERA
=
2
;
Integer
CAMERA
=
2
;
Integer
VIDEO
=
3
;
Integer
VIDEO
=
3
;
Integer
DOCUMENT
=
4
;
Integer
BOARD
=
5
;
}
}
interface
COLLABORATION_JOIN_FLG
{
interface
COLLABORATION_JOIN_FLG
{
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java
View file @
c36e0fe5
...
@@ -128,6 +128,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
...
@@ -128,6 +128,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
private
final
String
VIDEO_COLLABORATION_PAGE_URL
=
"file:///android_asset/chat/public_new/collaboration_video.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
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
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
DEFAULT_CHECKSUM
=
"0000000000"
;
private
final
String
DEFAULT_CHECKSUM
=
"0000000000"
;
//AISDevelop
//AISDevelop
...
@@ -1575,6 +1576,14 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
...
@@ -1575,6 +1576,14 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
}
}
});
});
break
;
break
;
case
5
:
mChatWebView
.
post
(
new
Runnable
()
{
@Override
public
void
run
()
{
mChatWebView
.
loadUrl
(
WHITE_BOARD_COLLABORATION_PAGE_URL
);
}
});
break
;
default
:
default
:
break
;
break
;
}
}
...
...
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