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
575d4f86
Commit
575d4f86
authored
Sep 06, 2022
by
NGUYEN HOANG SON
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improve footer of related content screen
parent
75aefbdd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
4 deletions
+30
-4
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
+23
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java
+7
-4
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
View file @
575d4f86
...
@@ -697,6 +697,29 @@ public class OperationListActivity extends ABVUIActivity {
...
@@ -697,6 +697,29 @@ public class OperationListActivity extends ABVUIActivity {
activityResultFlg
=
false
;
activityResultFlg
=
false
;
}
}
@Override
protected
void
onNewIntent
(
Intent
intent
)
{
super
.
onNewIntent
(
intent
);
String
activeTab
=
intent
.
getStringExtra
(
"activeTab"
);
if
(
mCheckWebView
!=
null
&&
activeTab
!=
null
)
{
String
jsUrl
=
null
;
if
(
activeTab
.
contentEquals
(
"dashboard"
))
{
jsUrl
=
"javascript:CHK_Footer.goDashboard();"
;
}
else
if
(
activeTab
.
contentEquals
(
"operationList"
))
{
jsUrl
=
"javascript:CHK_Footer.goOperationList();"
;
}
if
(
jsUrl
!=
null
)
{
final
String
url
=
jsUrl
;
runOnUiThread
(
new
Runnable
()
{
@Override
public
void
run
()
{
mCheckWebView
.
loadUrl
(
url
);
}
});
}
}
}
// 検索ダイアログ表示
// 検索ダイアログ表示
private
void
showSearchDialog
()
{
private
void
showSearchDialog
()
{
contentRefresher
.
stopRefresh
();
contentRefresher
.
stopRefresh
();
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java
View file @
575d4f86
...
@@ -333,14 +333,14 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
...
@@ -333,14 +333,14 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
mDashboardHomeButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
mDashboardHomeButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
@Override
public
void
onClick
(
View
v
)
{
public
void
onClick
(
View
v
)
{
backToHome
();
backToHome
(
"dashboard"
);
}
}
});
});
// 作業のホーム画面へ
// 作業のホーム画面へ
mOperationHomeButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
mOperationHomeButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
@Override
public
void
onClick
(
View
v
)
{
public
void
onClick
(
View
v
)
{
backToHome
();
backToHome
(
"operationList"
);
}
}
});
});
...
@@ -416,11 +416,14 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
...
@@ -416,11 +416,14 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
/**
/**
* 作業一覧へ戻る
* 作業一覧へ戻る
*/
*/
private
void
backToHome
()
{
private
void
backToHome
(
String
activeTab
)
{
Intent
intent
=
new
Intent
();
Intent
intent
=
new
Intent
();
intent
.
setClass
(
OperationRelatedContentActivity
.
this
,
OperationListActivity
.
class
);
intent
.
setClass
(
OperationRelatedContentActivity
.
this
,
OperationListActivity
.
class
);
intent
.
setFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TOP
|
Intent
.
FLAG_ACTIVITY_SINGLE_TOP
);
intent
.
setFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TOP
|
Intent
.
FLAG_ACTIVITY_SINGLE_TOP
);
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
baseActivityName
,
OperationRelatedContentActivity
.
class
.
getName
());
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
baseActivityName
,
OperationRelatedContentActivity
.
class
.
getName
());
if
(
activeTab
!=
null
&&
activeTab
.
length
()
>
0
)
{
intent
.
putExtra
(
"activeTab"
,
activeTab
);
}
// 左へ移動しながら戻る
// 左へ移動しながら戻る
startActivity
(
intent
,
NaviConsts
.
Left
);
startActivity
(
intent
,
NaviConsts
.
Left
);
}
}
...
@@ -490,7 +493,7 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
...
@@ -490,7 +493,7 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
if
(
isCollaboration
)
{
if
(
isCollaboration
)
{
return
true
;
return
true
;
}
}
backToHome
();
backToHome
(
""
);
return
true
;
return
true
;
}
}
return
super
.
onKeyUp
(
keyCode
,
event
);
return
super
.
onKeyUp
(
keyCode
,
event
);
...
...
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