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
58b1a46c
Commit
58b1a46c
authored
Feb 16, 2023
by
Kazuyuki Hida
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ダッシュボードからの遷移はダッシュボードに戻るようにした。
parent
bf61e732
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
1 deletions
+17
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java
+17
-1
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java
View file @
58b1a46c
...
...
@@ -52,6 +52,8 @@ import jp.agentec.abook.abv.ui.common.view.ABVPopupListWindow;
import
jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper
;
import
jp.agentec.abook.abv.ui.viewer.view.CheckFormWebview
;
import
static
jp
.
agentec
.
abook
.
abv
.
bl
.
common
.
constant
.
ABookKeys
.
STATUS_CODE
;
//TODO: later 遠隔連動関連はContentView,NoPdfViewと共通しているので要集約
public
class
HTMLWebViewActivity
extends
ParentWebViewActivity
{
private
static
final
String
TAG
=
"HTMLWebViewActivity"
;
...
...
@@ -71,6 +73,8 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
private
JsInf
jsInf
=
new
JsInf
();
private
ValueCallback
<
Uri
[]>
mUploadMessage
;
private
boolean
fromDashboard
=
false
;
@Override
public
void
onCreate
(
Bundle
savedInstanceState
)
{
Logger
.
i
(
TAG
,
"onCreate"
);
...
...
@@ -90,7 +94,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
final
String
url
=
intent
.
getStringExtra
(
"LINKURL"
);
// LinkURL
mOperationId
=
intent
.
getLongExtra
(
ABookKeys
.
OPERATION_ID
,
-
1
);
// OperationId
fromDashboard
=
url
.
contains
(
"taskKey"
);
// ***** WebViewセット
...
...
@@ -335,6 +339,18 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
if
(
url
.
contains
(
ABookKeys
.
ABOOK_CHECK_API
))
{
commonShouldOverrideUrlLoading
(
uri
,
null
);
}
if
(
fromDashboard
&&
url
.
contains
(
ABookKeys
.
CMD_CHANGE_DISPLAY_STATUS
))
{
// ダッシュボードに戻る
String
statusCode
=
uri
.
getQueryParameter
(
STATUS_CODE
);
if
(
statusCode
.
equals
(
"0"
))
{
handler
.
post
(
new
Runnable
()
{
@Override
public
void
run
()
{
finishActivity
();
}
});
}
}
return
true
;
}
return
false
;
...
...
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