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
da86f3ab
Commit
da86f3ab
authored
Sep 12, 2021
by
Kim Jinsung
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ソースコード指摘事項反映
parent
551c127d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java
+6
-6
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/action/VideoMountAction.java
+1
-1
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java
View file @
da86f3ab
...
...
@@ -2643,7 +2643,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
//文書協業接続時、機能制限する(動作再生、音声再生)
if
(
actionInfoJSON
.
getActionType
()
==
ActionInfoJSON
.
VIDEO_ACTION
||
actionInfoJSON
.
getActionType
()
==
ActionInfoJSON
.
MUSIC_ACTION
)
{
if
(
isCo
nnectedCollaboration
())
{
if
(
isCo
llaborationConnected
())
{
return
;
}
}
...
...
@@ -3190,7 +3190,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
@Override
public
void
onClick
(
View
view
)
{
//文書協業接続中には差し替え動作機能制限
if
(
isCo
nnectedCollaboration
())
{
if
(
isCo
llaborationConnected
())
{
return
;
}
if
(
meetingManager
.
isSendable
())
{
...
...
@@ -3308,7 +3308,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
private
void
videoOnClick
(
PageObjectJSON
pageObject
,
int
pageidx
)
{
//文書協業接続中には全画面動画制御
if
(
isCo
nnectedCollaboration
())
{
if
(
isCo
llaborationConnected
())
{
return
;
}
if
(
mPageScrollView
.
isZooming
()
==
false
)
{
...
...
@@ -3503,7 +3503,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
@Override
public
void
onClick
(
View
view
)
{
//文書協業接続時には音声アクション制限
if
(
isCo
nnectedCollaboration
())
{
if
(
isCo
llaborationConnected
())
{
return
;
}
if
(
meetingManager
.
isSendable
())
{
...
...
@@ -3533,7 +3533,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
@Override
public
void
onClick
(
View
view
)
{
//文書協業接続時には音声アクション制限
if
(
isCo
nnectedCollaboration
())
{
if
(
isCo
llaborationConnected
())
{
return
;
}
if
(
meetingManager
.
isSendable
())
{
...
...
@@ -5584,7 +5584,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
* 文書協業接続中の値を返して、接続中にはエラーダイアログ表示
* @return YES:接続中、NO:非接続
* */
public
boolean
isCo
nnectedCollaboration
()
{
public
boolean
isCo
llaborationConnected
()
{
if
(
isCollaboration
)
{
showSimpleAlertDialog
(
R
.
string
.
msg_fail_collaboration_not_action_allow
);
}
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/action/VideoMountAction.java
View file @
da86f3ab
...
...
@@ -346,7 +346,7 @@ public class VideoMountAction {
private
void
videoOnClick
(
RelativeLayout
contentPageView
)
{
//文書協業接続中、埋め込み動画制限
if
(
mActivity
.
isCo
nnectedCollaboration
())
{
if
(
mActivity
.
isCo
llaborationConnected
())
{
return
;
}
...
...
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