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
3ff012b5
Commit
3ff012b5
authored
Sep 08, 2020
by
Kim Jinsung
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'features/1.2.360_ogawa-y' into 'features/1.2.360'
チャットサーバーURLをパラメータとして渡すように修正 See merge request
!73
parents
db73bda5
84e099b5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
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/home/activity/ChatWebviewActivity.java
View file @
3ff012b5
...
@@ -108,7 +108,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
...
@@ -108,7 +108,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
String
lastRoomId
=
PreferenceUtil
.
getUserPref
(
getApplicationContext
(),
AppDefType
.
UserPrefKey
.
CHAT_LAST_ROOMID
,
""
);
String
lastRoomId
=
PreferenceUtil
.
getUserPref
(
getApplicationContext
(),
AppDefType
.
UserPrefKey
.
CHAT_LAST_ROOMID
,
""
);
mChatWebView
.
addJavascriptInterface
(
jsInf
,
"android"
);
mChatWebView
.
addJavascriptInterface
(
jsInf
,
"android"
);
String
fixedParam
=
"&platform=android&isMobile=true
"
;
String
fixedParam
=
"&platform=android&isMobile=true
&chatServerUrl="
+
ABVEnvironment
.
getInstance
().
websocketServerHttpUrl
;
//ページをロード
//ページをロード
if
(
roomId
!=
0
&&
roomName
!=
null
)
{
// by push message
if
(
roomId
!=
0
&&
roomName
!=
null
)
{
// by push message
String
parameterData
=
"sid="
+
sid
+
"&loginId="
+
loginId
+
"&shopName="
+
shopName
+
"&roomId="
+
roomId
+
"&roomName="
+
roomName
+
fixedParam
;
String
parameterData
=
"sid="
+
sid
+
"&loginId="
+
loginId
+
"&shopName="
+
shopName
+
"&roomId="
+
roomId
+
"&roomName="
+
roomName
+
fixedParam
;
...
...
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