Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
chat_webview
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
abookCommunication
chat_webview
Commits
ac02f3e4
Commit
ac02f3e4
authored
Apr 16, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ルーム開設画面からルーム開設する場合既存のルームがあればアラート表示
parent
9c802a74
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
public_new/js/chat-ui.js
+5
-5
public_new/js/constant.js
+5
-0
No files found.
public_new/js/chat-ui.js
View file @
ac02f3e4
...
...
@@ -691,7 +691,7 @@ CHAT_UI.showConfirmView = function(isInvite) {
//todo android create room api
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
createChatRoom
(
"1"
,
userIdList
.
join
(
','
),
newRoomName
);
android
.
createChatRoom
(
"1"
,
userIdList
.
join
(
','
),
newRoomName
,
makeRoomFlg
.
MAKE_ROOM
);
}
else
{
webkit
.
messageHandlers
.
createChatRoom
.
postMessage
({
"roomType"
:
"1"
,
"userIdList"
:
userIdList
.
join
(
','
),
"roomName"
:
newRoomName
});
}
...
...
@@ -784,7 +784,7 @@ CHAT_UI.showConfirmView = function(isInvite) {
// ルーム名のtrimmingした後、URIencodingを行う
const
encodedRoomName
=
encodeURIComponent
(
trimmedRoomName
);
android
.
createChatRoom
(
"1"
,
userIdList
.
join
(
','
),
encodedRoomName
);
android
.
createChatRoom
(
"1"
,
userIdList
.
join
(
','
),
encodedRoomName
,
makeRoomFlg
.
MAKE_ROOM
);
}
}
...
...
@@ -1530,7 +1530,7 @@ CHAT_UI.startChat = function(userShopMemberId,userName) {
// 参加ユーザ名でルーム名を生成
let
newRoomName
=
CHAT
.
globalLoginParameter
.
loginId
+
','
+
userName
;
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
createChatRoom
(
chatRoomType
.
DM
,
userIdList
.
join
(
','
),
newRoomName
);
android
.
createChatRoom
(
chatRoomType
.
DM
,
userIdList
.
join
(
','
),
newRoomName
,
makeRoomFlg
.
NAME_CARD
);
}
else
{
webkit
.
messageHandlers
.
createChatRoom
.
postMessage
({
"roomType"
:
chatRoomType
.
DM
,
"userIdList"
:
userIdList
.
join
(
','
),
"roomName"
:
newRoomName
});
}
...
...
@@ -2011,7 +2011,7 @@ CHAT_UI.showMakeRoomConfirmView = function() {
// 参加ユーザ名でルーム名を生成
let
newRoomName
=
CHAT
.
globalLoginParameter
.
loginId
+
','
+
userNameList
.
join
(
','
);
android
.
createChatRoom
(
"1"
,
userIdList
.
join
(
','
),
newRoomName
);
android
.
createChatRoom
(
"1"
,
userIdList
.
join
(
','
),
newRoomName
,
makeRoomFlg
.
MAKE_ROOM
);
}
else
if
(
trimmedRoomName
.
includes
(
';'
)
||
trimmedRoomName
.
includes
(
'/'
)
||
trimmedRoomName
.
includes
(
'?'
)
||
trimmedRoomName
.
includes
(
':'
)
||
trimmedRoomName
.
includes
(
"@"
)
||
trimmedRoomName
.
includes
(
'&'
)
||
trimmedRoomName
.
includes
(
'='
)
||
trimmedRoomName
.
includes
(
"+"
)
||
trimmedRoomName
.
includes
(
'$'
)
||
trimmedRoomName
.
includes
(
","
)
||
trimmedRoomName
.
includes
(
'-'
)
...
...
@@ -2055,7 +2055,7 @@ CHAT_UI.showMakeRoomConfirmView = function() {
// ルーム名のtrimmingした後、URIencodingを行う
const
encodedRoomName
=
encodeURIComponent
(
trimmedRoomName
);
android
.
createChatRoom
(
"1"
,
userIdList
.
join
(
','
),
encodedRoomName
);
android
.
createChatRoom
(
"1"
,
userIdList
.
join
(
','
),
encodedRoomName
,
makeRoomFlg
.
MAKE_ROOM
);
}
});
...
...
public_new/js/constant.js
View file @
ac02f3e4
...
...
@@ -36,5 +36,10 @@ const nameCardAreaId = {
USER
:
"userNamecard"
}
const
makeRoomFlg
=
{
NAME_CARD
:
0
,
MAKE_ROOM
:
1
}
const
messageSeperator
=
"<::split>"
;
const
dataMessageScheme
=
"::NOT_MESSAGE"
;
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