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
4d107e23
Commit
4d107e23
authored
May 10, 2021
by
Kang Donghun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ルームタイプによって協業中にユーザー招待ボタンを非表示にするように修正
parent
7df31a73
Hide 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/ShowPushMessageDailogActivity.java
+3
-3
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
+1
-1
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ShowPushMessageDailogActivity.java
View file @
4d107e23
...
...
@@ -139,10 +139,10 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
Logger
.
d
(
"tempDate"
,
"date : "
+
tempDate
);
}
if
(!
StringUtil
.
isNullOrEmpty
(
collaborationType
))
{
ActivityHandlingHelper
.
getInstance
().
startChatWebviewActivityWithCollaboration
(
roomId
,
roomName
,
collaborationType
);
}
else
{
if
(
StringUtil
.
isNullOrEmpty
(
collaborationType
))
{
ActivityHandlingHelper
.
getInstance
().
startChatWebviewActivity
(
roomId
,
roomName
);
}
else
{
ActivityHandlingHelper
.
getInstance
().
startChatWebviewActivityWithCollaboration
(
roomId
,
roomName
,
collaborationType
);
}
}
}
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
View file @
4d107e23
...
...
@@ -273,8 +273,8 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
e
.
printStackTrace
();
}
Integer
integerRoomId
=
Integer
.
parseInt
(
roomId
.
toString
());
roomType
=
communicationLogic
.
getChatRoom
(
integerRoomId
).
type
.
toString
();
if
(
StringUtil
.
isNullOrEmpty
(
collaborationType
))
{
roomType
=
communicationLogic
.
getChatRoom
(
integerRoomId
).
type
.
toString
();
String
parameterData
=
"sid="
+
sid
+
"&loginId="
+
loginId
+
"&shopName="
+
shopName
+
"&roomId="
+
roomId
+
"&roomName="
+
roomName
+
fixedParam
;
mChatWebView
.
postUrl
(
CHAT_ROOM_PAGE_URL
,
parameterData
.
getBytes
());
}
else
{
...
...
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