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
8f8d1e29
Commit
8f8d1e29
authored
Aug 20, 2021
by
onuma
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
AppDefTypeに、loginId を追加した。
parent
8624f482
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/push/ABVFcmListenerService.java
+1
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/appinfo/AppDefType.java
+1
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
+5
-5
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/push/ABVFcmListenerService.java
View file @
8f8d1e29
...
...
@@ -81,7 +81,7 @@ public class ABVFcmListenerService extends FirebaseMessagingService {
String
pushSendLoginId
=
""
;
long
pushSendDate
=
0
;
String
textMessage
=
""
;
String
strRoomType
=
""
;
String
strRoomType
=
""
;
Log
.
d
(
TAG
,
"tempMsg : "
+
tempMsg
);
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/appinfo/AppDefType.java
View file @
8f8d1e29
...
...
@@ -147,5 +147,6 @@ public interface AppDefType {
String
roomType
=
"roomType"
;
String
fromClassName
=
"fromClassName"
;
String
shopName
=
"shopName"
;
String
loginId
=
"loginId"
;
}
}
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
View file @
8f8d1e29
...
...
@@ -1640,9 +1640,9 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
intent
.
putExtra
(
"sid"
,
sid
);
String
loginId
=
ABVDataCache
.
getInstance
().
getMemberInfo
().
loginId
;
String
shopName
=
ABVDataCache
.
getInstance
().
getUrlPath
();
intent
.
putExtra
(
"loginId"
,
loginId
);
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
loginId
,
loginId
);
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
shopName
,
shopName
);
if
(
dto
!=
null
)
{
if
(
dto
!=
null
)
{
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
roomId
,
dto
.
roomId
);
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
roomName
,
dto
.
roomName
);
}
...
...
@@ -1661,7 +1661,7 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
intent
.
putExtra
(
"sid"
,
sid
);
String
loginId
=
ABVDataCache
.
getInstance
().
getMemberInfo
().
loginId
;
String
shopName
=
ABVDataCache
.
getInstance
().
getUrlPath
();
intent
.
putExtra
(
"loginId"
,
loginId
);
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
loginId
,
loginId
);
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
shopName
,
shopName
);
intent
.
setClassName
(
mContext
.
getPackageName
(),
className
);
intent
.
setFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TOP
);
...
...
@@ -1680,7 +1680,7 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
intent
.
putExtra
(
"sid"
,
sid
);
String
loginId
=
ABVDataCache
.
getInstance
().
getMemberInfo
().
loginId
;
String
shopName
=
ABVDataCache
.
getInstance
().
getUrlPath
();
intent
.
putExtra
(
"loginId"
,
loginId
);
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
loginId
,
loginId
);
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
shopName
,
shopName
);
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
roomId
,
roomId
);
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
roomName
,
roomName
);
...
...
@@ -1718,7 +1718,7 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
intent
.
putExtra
(
"sid"
,
sid
);
String
loginId
=
ABVDataCache
.
getInstance
().
getMemberInfo
().
loginId
;
String
shopName
=
ABVDataCache
.
getInstance
().
getUrlPath
();
intent
.
putExtra
(
"loginId"
,
loginId
);
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
loginId
,
loginId
);
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
collaborationType
,
collaborationType
);
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
shopName
,
shopName
);
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
roomId
,
roomId
);
...
...
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