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
6ae5a11e
Commit
6ae5a11e
authored
Apr 15, 2021
by
Kim Jinsung
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug #42436 3D表示領域で長押しするとメモ作成画面表示で3D操作不能になる
parent
fd6a2268
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
14 deletions
+20
-14
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/ZoomRelativeLayout.java
+20
-14
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/ZoomRelativeLayout.java
View file @
6ae5a11e
...
...
@@ -844,19 +844,6 @@ public class ZoomRelativeLayout extends RelativeLayout {
//if (!mScaleDetector.isInProgress() && pageScrollView.isScrollable()) {
//스크롤 픽스 상태였을 경우 메모 추가가 안 되어서
if
(!
mScaleDetector
.
isInProgress
()
&&
mPageScrollView
.
isMemocheck
())
{
// MemoAction
for
(
int
i
=
0
;
i
<
getChildCount
();
i
++)
{
View
child
=
getChildAt
(
i
);
if
(
child
instanceof
Action3DImageView
)
{
Action3DImageView
a3dv
=
(
Action3DImageView
)
child
;
if
(
a3dv
.
getEventFlg
()
==
true
)
{
// 3Dモードの場合は長押しメモ処理を行わない
return
;
}
}
}
// PDF画面外側をタッチしているかチェック
mPdfScale
=
Math
.
min
(
getWidth
()
/
(
float
)
mPdfSize
.
width
,
getHeight
()
/
(
float
)
mPdfSize
.
height
);
float
marginX
=
getMarginX
(
mPdfScale
);
...
...
@@ -868,7 +855,26 @@ public class ZoomRelativeLayout extends RelativeLayout {
return
;
}
if
(
mContentDto
!=
null
)
{
showMemoMenu
(
x
,
y
);
//Android10以上ではAction3DImageViewの長押しイベントより、ZoomRelativeLayoutの長押しイベントが先に呼ばれる問題対応
//Androidバージョンチェックせずに全部対象とする。(0.3秒後にメモ表示するように修正)
getHandler
().
postDelayed
(
new
Runnable
()
{
@Override
public
void
run
()
{
//3DView表示領域チェック
for
(
int
i
=
0
;
i
<
getChildCount
();
i
++)
{
View
child
=
getChildAt
(
i
);
if
(
child
instanceof
Action3DImageView
)
{
Action3DImageView
a3dv
=
(
Action3DImageView
)
child
;
if
(
a3dv
.
getEventFlg
()
==
true
)
{
// 3Dモードの場合は長押しメモ処理を行わない
Logger
.
d
(
TAG
,
"a3dv.getEventFlg() == true"
);
return
;
}
}
}
showMemoMenu
(
x
,
y
);
}
},
300
);
}
}
...
...
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