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
afa1861d
Commit
afa1861d
authored
Sep 13, 2021
by
Kim Jinsung
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
作業一覧画面からプッシュメッセージ受信でチャットルーム接続できない問題対応
parent
a8bb02dc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java
+0
-4
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
+4
-0
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java
View file @
afa1861d
...
@@ -1276,10 +1276,6 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
...
@@ -1276,10 +1276,6 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
* プッシュメッセージがあるので、チャットルームに遷移する。
* プッシュメッセージがあるので、チャットルームに遷移する。
*/
*/
public
boolean
goChatRoom
(
final
Intent
intent
,
final
String
targetActivityName
,
final
String
baseActivityName
)
{
public
boolean
goChatRoom
(
final
Intent
intent
,
final
String
targetActivityName
,
final
String
baseActivityName
)
{
//一度チャットルームを開いたのかチェックし、開いたらい何もしない
if
(!
getABVUIDataCache
().
isChatPushMessageOpenOperationList
)
{
return
false
;
}
if
(!
StringUtil
.
isNullOrEmpty
(
intent
.
getStringExtra
(
AppDefType
.
ChatPushMessageKey
.
roomName
))
&&
if
(!
StringUtil
.
isNullOrEmpty
(
intent
.
getStringExtra
(
AppDefType
.
ChatPushMessageKey
.
roomName
))
&&
intent
.
getLongExtra
(
AppDefType
.
ChatPushMessageKey
.
roomId
,
'0'
)
>
0
)
{
intent
.
getLongExtra
(
AppDefType
.
ChatPushMessageKey
.
roomId
,
'0'
)
>
0
)
{
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
View file @
afa1861d
...
@@ -582,9 +582,13 @@ public class OperationListActivity extends ABVUIActivity {
...
@@ -582,9 +582,13 @@ public class OperationListActivity extends ABVUIActivity {
screenRefresh
();
screenRefresh
();
// プッシュメッセージがある場合の処理
// プッシュメッセージがある場合の処理
//一度チャットルームを開いたのかチェックし、開いたらい何もしない
if
(
getABVUIDataCache
().
isChatPushMessageOpenOperationList
)
{
if
(
goChatRoom
(
getIntent
(),
ChatWebViewActivity
.
class
.
getName
(),
OperationListActivity
.
class
.
getName
()))
{
if
(
goChatRoom
(
getIntent
(),
ChatWebViewActivity
.
class
.
getName
(),
OperationListActivity
.
class
.
getName
()))
{
getABVUIDataCache
().
isChatPushMessageOpenOperationList
=
false
;
return
;
return
;
}
}
}
// 報告画面から作業一覧へ戻った時の同期処理
// 報告画面から作業一覧へ戻った時の同期処理
final
long
operationId
=
getUserPref
(
AppDefType
.
UserPrefKey
.
SYNC_TARGET_OPERATION_ID
,
-
1L
);
final
long
operationId
=
getUserPref
(
AppDefType
.
UserPrefKey
.
SYNC_TARGET_OPERATION_ID
,
-
1L
);
...
...
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