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
2f3c8449
Commit
2f3c8449
authored
May 31, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#42838(資料閲覧ができないものがある)対応。
parent
1f21bd7d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
7 deletions
+16
-7
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
+16
-7
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
View file @
2f3c8449
...
...
@@ -174,11 +174,11 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
@Override
public
void
run
()
{
try
{
intent
.
setFlags
(
Intent
.
FLAG_ACTIVITY_SINGLE_TOP
);
intent
.
setFlags
(
Intent
.
FLAG_ACTIVITY_SINGLE_TOP
|
intent
.
FLAG_ACTIVITY_NEW_TASK
);
if
(
page
!=
null
)
{
intent
.
putExtra
(
ABVActivity
.
PAGE
,
page
);
}
startContentActivity
(
mContext
,
intent
,
null
,
Intent
.
FLAG_ACTIVITY_SINGLE_TOP
,
contentId
);
startContentActivity
(
mContext
,
intent
,
null
,
Intent
.
FLAG_ACTIVITY_SINGLE_TOP
|
intent
.
FLAG_ACTIVITY_NEW_TASK
,
contentId
);
}
catch
(
Exception
e
)
{
Logger
.
e
(
TAG
,
"startContentActivity contentId="
+
contentId
,
e
);
showToast
(
mContext
.
getString
(
R
.
string
.
E113
));
...
...
@@ -384,15 +384,24 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
recordContentReadLog
(
context
,
contentId
);
}
Activity
act
=
getCurrentActivity
();
if
(
act
instanceof
ChatWebviewActivity
)
{
act
=
getActivity
(
OperationRelatedContentActivity
.
class
);
//AbookCommの文書協業の場合(ChatWebviewがPIPモードの場合)既存Contextでなく以前のActivityから画面を遷移する。
ChatWebviewActivity
chatWebViewActivity
=
getActivity
(
ChatWebviewActivity
.
class
);
if
(
chatWebViewActivity
!=
null
&&
chatWebViewActivity
.
isInPictureInPictureMode
())
{
context
=
getCurrentActivity
();
intent
.
removeFlags
(
Intent
.
FLAG_ACTIVITY_SINGLE_TOP
|
intent
.
FLAG_ACTIVITY_NEW_TASK
);
intent
.
setFlags
(
Intent
.
FLAG_ACTIVITY_SINGLE_TOP
);
if
(
context
instanceof
ChatWebviewActivity
)
{
Stack
<
ABVAuthenticatedActivity
>
stack
=
getCurrentActivityStack
();
if
(
stack
.
size
()
>
1
){
context
=
stack
.
get
(
stack
.
size
()-
2
);
}
}
}
intent
.
setClass
(
act
,
ContentViewActivity
.
class
);
if
(!
StringUtil
.
equalsAny
(
contentType
,
ContentJSON
.
KEY_HTML_TYPE
,
ContentJSON
.
KEY_LINK_TYPE
,
ContentJSON
.
KEY_ENQUETE_TYPE
,
ContentJSON
.
KEY_EXAM_TYPE
,
ContentJSON
.
KEY_PANO_MOVIE_TYPE
,
ContentJSON
.
KEY_PANO_IMAGE_TYPE
,
ContentJSON
.
KEY_OBJECTVR_TYPE
))
{
ac
t
.
startActivity
(
intent
);
contex
t
.
startActivity
(
intent
);
}
}
...
...
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