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
d12c2257
Commit
d12c2257
authored
Jun 10, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed for chat-ui js
parent
2f0d9078
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
189 additions
and
131 deletions
+189
-131
public_new/chat.html
+1
-0
public_new/chat_change_room_name.html
+11
-4
public_new/chat_make_room.html
+1
-0
public_new/chat_make_room_confirm.html
+1
-0
public_new/chat_room.html
+12
-5
public_new/collaboration.html
+15
-7
public_new/collaboration_documents.html
+56
-52
public_new/collaboration_picture.html
+9
-3
public_new/collaboration_video.html
+11
-5
public_new/collaboration_voice.html
+7
-3
public_new/collaboration_whiteboard.html
+7
-3
public_new/contact.html
+1
-0
public_new/js/chat-db-foriOS.js
+0
-39
public_new/js/chat-db.js
+2
-2
public_new/js/chat-ui.js
+14
-8
public_new/js/chat.js
+1
-0
public_new/js/constant.js
+40
-0
No files found.
public_new/chat.html
View file @
d12c2257
...
...
@@ -115,6 +115,7 @@
<script
src=
"./js/chat-ui.js"
></script>
<script
src=
"./js/chat-util.js"
></script>
<script
src=
"./js/chat-db.js"
></script>
<script
src=
"./js/chat-db-foriOS.js"
></script>
<script>
String
.
prototype
.
replaceAll
=
function
(
org
,
dest
)
{
return
this
.
split
(
org
).
join
(
dest
);
...
...
public_new/chat_change_room_name.html
View file @
d12c2257
...
...
@@ -43,8 +43,11 @@
<main
id=
"chat_change_room_name"
>
<!-- ルーム名入力 -->
<div
class=
"room_name"
>
<label
for=
"room_name"
><h2>
ルーム名
</h2></label>
<input
type=
"text"
class=
"input_name_room"
name=
"room_name"
placeholder=
"ルーム名を入力してください"
id=
"roomNameInput"
maxlength=
"20"
>
<label
for=
"room_name"
>
<h2>
ルーム名
</h2>
</label>
<input
type=
"text"
class=
"input_name_room"
name=
"room_name"
placeholder=
"ルーム名を入力してください"
id=
"roomNameInput"
maxlength=
"20"
>
</div>
<!-- ルーム名変更ボタン -->
...
...
@@ -72,10 +75,14 @@
<script
src=
"./js/chat-ui.js"
></script>
<script
src=
"./js/chat-util.js"
></script>
<script
src=
"./js/chat-db.js"
></script>
<script
src=
"./js/chat-db-foriOS.js"
></script>
<script
src=
"./js/chat-websocket.js"
></script>
<script
src=
"./js/chat-websocket-message.js"
></script>
<script
src=
"./js/chat-websocket-refresh-group-list.js"
></script>
<script
src=
"./js/chat-websocket-refresh-user-list-in-group.js"
></script>
<script
src=
"./js/chat-room.js"
></script>
<script>
String
.
prototype
.
replaceAll
=
function
(
org
,
dest
)
{
String
.
prototype
.
replaceAll
=
function
(
org
,
dest
)
{
return
this
.
split
(
org
).
join
(
dest
);
}
let
CHAT_SERVER_URL
=
''
;
...
...
@@ -86,7 +93,7 @@
let
IS_ONLINE
=
false
;
let
roomId
=
0
;
$
(
"#loadingArea"
).
load
(
"./loading.html"
);
if
(
typeof
(
android
)
!=
"undefined"
)
{
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
getLoginParameter
();
android
.
getGlobalParameter
();
}
else
{
...
...
public_new/chat_make_room.html
View file @
d12c2257
...
...
@@ -144,6 +144,7 @@
<script
src=
"./js/chat-ui.js"
></script>
<script
src=
"./js/chat-util.js"
></script>
<script
src=
"./js/chat-db.js"
></script>
<script
src=
"./js/chat-db-foriOS.js"
></script>
<script>
String
.
prototype
.
replaceAll
=
function
(
org
,
dest
)
{
return
this
.
split
(
org
).
join
(
dest
);
...
...
public_new/chat_make_room_confirm.html
View file @
d12c2257
...
...
@@ -80,6 +80,7 @@
<script
src=
"./js/chat-ui.js"
></script>
<script
src=
"./js/chat-util.js"
></script>
<script
src=
"./js/chat-db.js"
></script>
<script
src=
"./js/chat-db-foriOS.js"
></script>
<script>
String
.
prototype
.
replaceAll
=
function
(
org
,
dest
)
{
return
this
.
split
(
org
).
join
(
dest
);
...
...
public_new/chat_room.html
View file @
d12c2257
...
...
@@ -44,7 +44,8 @@
<div
class=
"col-4 pl-0"
>
<div
class=
"nav-item text-right"
>
<a
href=
"#"
class=
"search_menu"
><img
src=
"icon/icon_search.png"
alt=
"検索"
></a>
<a
href=
"#"
data-toggle=
"modal"
data-target=
"#menuModalCenter"
id=
"roomMenu"
class=
"none"
><img
src=
"icon/icon_room_menu.png"
alt=
"メニュー"
></a>
<a
href=
"#"
data-toggle=
"modal"
data-target=
"#menuModalCenter"
id=
"roomMenu"
class=
"none"
><img
src=
"icon/icon_room_menu.png"
alt=
"メニュー"
></a>
</div>
</div>
<!-- .col -->
</div>
<!-- .row -->
...
...
@@ -94,8 +95,10 @@
<input
class=
"d-none"
type=
"file"
name=
"image"
id=
"videoInputTag"
accept=
"video/mp4"
>
</form>
</div>
<input
type=
"text"
name=
"message"
class=
"message_input_form"
id=
"messageInput"
placeholder=
"メッセージを入力してください"
maxlength=
"600"
>
<button
type=
"button"
name=
"button"
class=
"message_input_send none"
id=
"messageSend"
onclick=
"CHAT_UI.sendMessage(this);"
>
送信
</button>
<input
type=
"text"
name=
"message"
class=
"message_input_form"
id=
"messageInput"
placeholder=
"メッセージを入力してください"
maxlength=
"600"
>
<button
type=
"button"
name=
"button"
class=
"message_input_send none"
id=
"messageSend"
onclick=
"CHAT_UI.sendMessage(this);"
>
送信
</button>
</div>
</div>
<!-- フッター下 -->
...
...
@@ -160,7 +163,11 @@
<script
src=
"./js/chat-ui.js"
></script>
<script
src=
"./js/chat-util.js"
></script>
<script
src=
"./js/chat-db.js"
></script>
<script
src=
"./js/chat-db-foriOS.js"
></script>
<script
src=
"./js/chat-websocket.js"
></script>
<script
src=
"./js/chat-websocket-message.js"
></script>
<script
src=
"./js/chat-websocket-refresh-group-list.js"
></script>
<script
src=
"./js/chat-websocket-refresh-user-list-in-group.js"
></script>
<script
src=
"./js/chat-room.js"
></script>
<script>
function
imageModal
(
image
)
{
...
...
@@ -168,7 +175,7 @@
$
(
'#pictureModalCenter'
).
modal
(
'show'
);
}
String
.
prototype
.
replaceAll
=
function
(
org
,
dest
)
{
String
.
prototype
.
replaceAll
=
function
(
org
,
dest
)
{
return
this
.
split
(
org
).
join
(
dest
);
}
...
...
@@ -183,7 +190,7 @@
$
(
"#chatMenuModal"
).
load
(
"./modal_chat_menu.html"
);
$
(
"#loadingArea"
).
load
(
"./loading.html"
);
if
(
typeof
(
android
)
!=
"undefined"
)
{
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
getLoginParameter
();
android
.
getGlobalParameter
();
android
.
saveSelectedUserList
(
""
);
...
...
public_new/collaboration.html
View file @
d12c2257
...
...
@@ -27,10 +27,12 @@
</div>
<div
class=
"collabo_nav_r"
>
<div
class=
"text-right d-flex align-items-center"
>
<button
type=
"button"
name=
"button"
class=
"btn user_btn collaboration_contents picture_contents video_contents board_contents"
></button>
<button
type=
"button"
name=
"button"
class=
"btn user_btn collaboration_contents picture_contents video_contents board_contents"
></button>
<button
type=
"button"
name=
"button"
class=
"btn add_user_btn none"
></button>
<button
type=
"button"
name=
"button"
class=
"btn menu_btn host_contents"
></button>
<button
type=
"button"
name=
"button"
class=
"btn start_pip_btn collaboration_contents document_contents"
onclick=
"startPipMode();"
></button>
<button
type=
"button"
name=
"button"
class=
"btn start_pip_btn collaboration_contents document_contents"
onclick=
"startPipMode();"
></button>
<!-- <button type="button" name="button" class="btn exit_btn" onclick="Coview_exitCollaboration();"></button> -->
</div>
</div>
...
...
@@ -57,7 +59,7 @@
<!-- ユーザー追加オーバーレイ -->
<div
id=
"add_user_list"
></div>
<div
id=
"modal_add_user_confirm"
></div>
<div
id=
"modal_add_user_confirm"
></div>
<!-- オーバーレイ メニュー -->
<div
id=
"collaboration_picture_overlay_menu"
></div>
...
...
@@ -169,11 +171,15 @@
<script
src=
"./js/chat-ui.js"
></script>
<script
src=
"./js/chat-util.js"
></script>
<script
src=
"./js/chat-db.js"
></script>
<script
src=
"./js/chat-db-foriOS.js"
></script>
<script
src=
"./js/language.js"
></script>
<script
src=
"./js/language_ko.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/language_ja.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/language_en.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/chat-websocket.js"
></script>
<script
src=
"./js/chat-websocket-message.js"
></script>
<script
src=
"./js/chat-websocket-refresh-group-list.js"
></script>
<script
src=
"./js/chat-websocket-refresh-user-list-in-group.js"
></script>
<script
src=
"https://biztaskyell.abookcloud.com/coview_api.js"
></script>
<script
src=
"./js/share.js"
></script>
<script>
...
...
@@ -198,7 +204,7 @@
let
joinMeetingId
=
0
;
let
androidVersion
=
0
;
if
(
typeof
(
android
)
!=
"undefined"
)
{
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
getLoginParameter
();
android
.
getGlobalParameter
();
roomType
=
android
.
getRoomType
();
...
...
@@ -213,7 +219,7 @@
}
function
startPipMode
()
{
if
(
typeof
(
android
)
!=
"undefined"
)
{
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
startPipMode
();
}
else
{
webkit
.
messageHandlers
.
startPipMode
.
postMessage
({});
...
...
@@ -226,7 +232,7 @@
}
}
String
.
prototype
.
replaceAll
=
function
(
org
,
dest
)
{
String
.
prototype
.
replaceAll
=
function
(
org
,
dest
)
{
return
this
.
split
(
org
).
join
(
dest
);
}
...
...
@@ -253,10 +259,11 @@
globalUserInfo
.
coWorkType
=
CHAT_UTIL
.
getCoviewTypeFromCollaborationType
(
joinCollaborationType
);
if
(
collaborationJoinFlg
!=
'2'
)
{
CHAT_SOCKET
.
connectSocket
();
socket
.
emit
(
'join'
,
CHAT
.
globalLoginParameter
,
function
()
{
socket
.
emit
(
'join'
,
CHAT
.
globalLoginParameter
,
function
()
{
});
}
};
</script>
</body>
</html>
\ No newline at end of file
public_new/collaboration_documents.html
View file @
d12c2257
...
...
@@ -20,8 +20,8 @@
</head>
<body>
<!-- ナビメニュー -->
<header
id=
"collabo_header"
>
<!-- ナビメニュー -->
<header
id=
"collabo_header"
>
<div
class=
"d-flex align-items-center h-100"
>
<div
class=
"collabo_nav_l text-left w-100"
>
</div>
...
...
@@ -33,65 +33,69 @@
</div>
</div>
</div>
</header>
<!-- header -->
</header>
<!-- header -->
<!-- コンテンツ -->
<main
id=
"collabo_main"
class=
"none"
>
<!-- コンテンツ -->
<main
id=
"collabo_main"
class=
"none"
>
<div
class=
"document_wrap"
>
<div
class=
"coview_share_body coview_share_area"
id=
"coviewShare"
style=
"z-index: 1;"
>
</div>
</div>
</main>
</main>
<!-- オーバーレイ メニュー -->
<div
id=
"collaboration_voice_overlay_menu"
></div>
<!-- オーバーレイ ユーザーリスト -->
<div
id=
"overlay_user_list"
class=
"overlay slidein"
style=
"z-index: 3;"
>
<!-- オーバーレイ メニュー -->
<div
id=
"collaboration_voice_overlay_menu"
></div>
<!-- オーバーレイ ユーザーリスト -->
<div
id=
"overlay_user_list"
class=
"overlay slidein"
style=
"z-index: 3;"
>
<div
id=
"collaboration_overlay_user_list"
></div>
</div>
</div>
<!-- プロフィールモーダル -->
<div
id=
"userProfileModalInCollaboration"
></div>
<div
id=
"modal_collabo_profile2"
></div>
<div
id=
"add_user_list"
></div>
<div
id=
"modal_add_user_confirm"
></div>
<!-- ホスト変更モーダル -->
<div
id=
"modal_collabo_change_host"
></div>
<!-- プロフィールモーダル -->
<div
id=
"userProfileModalInCollaboration"
></div>
<div
id=
"modal_collabo_profile2"
></div>
<div
id=
"add_user_list"
></div>
<div
id=
"modal_add_user_confirm"
></div>
<!-- ホスト変更モーダル -->
<div
id=
"modal_collabo_change_host"
></div>
<!-- ホストリクエストモーダル -->
<div
id=
"modal_collabo_host_request"
></div>
<!-- ホストリクエストモーダル -->
<div
id=
"modal_collabo_host_request"
></div>
<!-- フッター -->
<div
id=
"footer_collabo"
></div>
<div
id=
"loadingArea"
></div>
<div
class=
"pip_indicator none"
onclick=
"finishPipMode();"
>
<!-- フッター -->
<div
id=
"footer_collabo"
></div>
<div
id=
"loadingArea"
></div>
<div
class=
"pip_indicator none"
onclick=
"finishPipMode();"
>
<div
style=
"vertical-align: middle;display: table-cell;"
>
協業中
</div>
</div>
<script
src=
"./js/libs/jquery-3.3.1.min.js"
></script>
<script
src=
"./js/libs/socket.io.js"
></script>
<script
src=
"./js/libs/moment.js"
></script>
<script
src=
"./js/libs/locale/ko.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/libs/locale/ja.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/libs/mustache.min.js"
></script>
<script
src=
"./js/libs/bootstrap.min.js"
></script>
<script
src=
"./js/libs/jquery.mark.min.js"
></script>
<script
src=
"./js/constant.js"
></script>
<script
src=
"./js/collaboration.js"
></script>
<script
src=
"./js/common.js"
></script>
<script
src=
"./js/loading.js"
></script>
<script
src=
"./js/chat.js"
></script>
<script
src=
"./js/chat-ui.js"
></script>
<script
src=
"./js/chat-util.js"
></script>
<script
src=
"./js/chat-db.js"
></script>
<script
src=
"./js/language.js"
></script>
<script
src=
"./js/language_ko.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/language_ja.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/language_en.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/chat-websocket.js"
></script>
<script
src=
"https://biztaskyell.abookcloud.com/coview_api.js"
></script>
<script
src=
"./js/share.js"
></script>
<script>
</div>
<script
src=
"./js/libs/jquery-3.3.1.min.js"
></script>
<script
src=
"./js/libs/socket.io.js"
></script>
<script
src=
"./js/libs/moment.js"
></script>
<script
src=
"./js/libs/locale/ko.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/libs/locale/ja.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/libs/mustache.min.js"
></script>
<script
src=
"./js/libs/bootstrap.min.js"
></script>
<script
src=
"./js/libs/jquery.mark.min.js"
></script>
<script
src=
"./js/constant.js"
></script>
<script
src=
"./js/collaboration.js"
></script>
<script
src=
"./js/common.js"
></script>
<script
src=
"./js/loading.js"
></script>
<script
src=
"./js/chat.js"
></script>
<script
src=
"./js/chat-ui.js"
></script>
<script
src=
"./js/chat-util.js"
></script>
<script
src=
"./js/chat-db.js"
></script>
<script
src=
"./js/chat-db-foriOS.js"
></script>
<script
src=
"./js/language.js"
></script>
<script
src=
"./js/language_ko.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/language_ja.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/language_en.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/chat-websocket.js"
></script>
<script
src=
"./js/chat-websocket-message.js"
></script>
<script
src=
"./js/chat-websocket-refresh-group-list.js"
></script>
<script
src=
"./js/chat-websocket-refresh-user-list-in-group.js"
></script>
<script
src=
"https://biztaskyell.abookcloud.com/coview_api.js"
></script>
<script
src=
"./js/share.js"
></script>
<script>
$
(
"#footer_collabo"
).
load
(
"./footer_collabo.html"
);
$
(
"#modal_collabo_host_request"
).
load
(
"./modal_collabo_host_request.html"
);
$
(
"#modal_collabo_change_host"
).
load
(
"./modal_collabo_change_host.html"
);
...
...
@@ -109,7 +113,7 @@
let
IS_ONLINE
=
false
;
let
collaborationJoinFlg
=
0
;
if
(
typeof
(
android
)
!=
"undefined"
)
{
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
getLoginParameter
();
android
.
getGlobalParameter
();
}
else
{
...
...
@@ -118,7 +122,7 @@
}
function
startPipMode
()
{
if
(
typeof
(
android
)
!=
"undefined"
)
{
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
startPipMode
();
}
else
if
(
CHAT_UTIL
.
isIOS
())
{
webkit
.
messageHandlers
.
startPipMode
.
postMessage
({});
...
...
@@ -144,7 +148,7 @@
}
globalUserInfo
.
coWorkType
=
CollaborationTypeKey
.
DOCUMENT
;
CHAT_SOCKET
.
connectSocket
();
socket
.
emit
(
'join'
,
CHAT
.
globalLoginParameter
,
function
()
{
socket
.
emit
(
'join'
,
CHAT
.
globalLoginParameter
,
function
()
{
});
};
...
...
public_new/collaboration_picture.html
View file @
d12c2257
...
...
@@ -55,7 +55,7 @@
<!-- ユーザー追加オーバーレイ -->
<div
id=
"add_user_list"
></div>
<div
id=
"modal_add_user_confirm"
></div>
<div
id=
"modal_add_user_confirm"
></div>
<!-- オーバーレイ メニュー -->
<div
id=
"collaboration_picture_overlay_menu"
></div>
...
...
@@ -144,11 +144,15 @@
<script
src=
"./js/chat-ui.js"
></script>
<script
src=
"./js/chat-util.js"
></script>
<script
src=
"./js/chat-db.js"
></script>
<script
src=
"./js/chat-db-foriOS.js"
></script>
<script
src=
"./js/language.js"
></script>
<script
src=
"./js/language_ko.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/language_ja.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/language_en.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/chat-websocket.js"
></script>
<script
src=
"./js/chat-websocket-message.js"
></script>
<script
src=
"./js/chat-websocket-refresh-group-list.js"
></script>
<script
src=
"./js/chat-websocket-refresh-user-list-in-group.js"
></script>
<script
src=
"https://biztaskyell.abookcloud.com/coview_api.js"
></script>
<script
src=
"./js/share.js"
></script>
<script>
...
...
@@ -170,7 +174,7 @@
let
collaborationJoinFlg
=
0
;
let
roomType
;
if
(
typeof
(
android
)
!=
"undefined"
)
{
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
getLoginParameter
();
android
.
getGlobalParameter
();
roomType
=
android
.
getRoomType
();
...
...
@@ -199,10 +203,11 @@
globalUserInfo
.
coWorkType
=
CollaborationTypeKey
.
CAMERA
;
if
(
collaborationJoinFlg
!=
'2'
)
{
CHAT_SOCKET
.
connectSocket
();
socket
.
emit
(
'join'
,
CHAT
.
globalLoginParameter
,
function
()
{
socket
.
emit
(
'join'
,
CHAT
.
globalLoginParameter
,
function
()
{
});
}
};
</script>
</body>
</html>
\ No newline at end of file
public_new/collaboration_video.html
View file @
d12c2257
...
...
@@ -54,7 +54,7 @@
<!-- ユーザー追加オーバーレイ -->
<div
id=
"add_user_list"
></div>
<div
id=
"modal_add_user_confirm"
></div>
<div
id=
"modal_add_user_confirm"
></div>
<!-- オーバーレイ メニュー -->
<div
id=
"collaboration_video_overlay_menu"
></div>
...
...
@@ -102,7 +102,7 @@
</div>
<div
class=
"d-flex align-items-center h-100"
>
<div
class=
"footer_menu_item"
>
<!-- <a href="#" data-toggle="modal" data-target="#captyaModal">-->
<!-- <a href="#" data-toggle="modal" data-target="#captyaModal">-->
<a
href=
"#"
>
<div
class=
"img_wrap wide bg_blue"
id=
"captureBtn"
>
<img
src=
"icon/icon_collabo_capture.png"
alt=
"キャプチャ"
>
...
...
@@ -131,11 +131,15 @@
<script
src=
"./js/chat-ui.js"
></script>
<script
src=
"./js/chat-util.js"
></script>
<script
src=
"./js/chat-db.js"
></script>
<script
src=
"./js/chat-db-foriOS.js"
></script>
<script
src=
"./js/language.js"
></script>
<script
src=
"./js/language_ko.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/language_ja.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/language_en.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/chat-websocket.js"
></script>
<script
src=
"./js/chat-websocket-message.js"
></script>
<script
src=
"./js/chat-websocket-refresh-group-list.js"
></script>
<script
src=
"./js/chat-websocket-refresh-user-list-in-group.js"
></script>
<script
src=
"https://biztaskyell.abookcloud.com/coview_api.js"
></script>
<script
src=
"./js/share.js"
></script>
</body>
...
...
@@ -158,7 +162,7 @@
let
collaborationJoinFlg
=
0
;
let
roomType
;
if
(
typeof
(
android
)
!=
"undefined"
)
{
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
getLoginParameter
();
android
.
getGlobalParameter
();
roomType
=
android
.
getRoomType
();
...
...
@@ -187,9 +191,10 @@
globalUserInfo
.
coWorkType
=
CollaborationTypeKey
.
VIDEO
;
if
(
collaborationJoinFlg
!=
'2'
)
{
CHAT_SOCKET
.
connectSocket
();
socket
.
emit
(
'join'
,
CHAT
.
globalLoginParameter
,
function
()
{
socket
.
emit
(
'join'
,
CHAT
.
globalLoginParameter
,
function
()
{
});
}
};
</script>
</script>
</html>
\ No newline at end of file
public_new/collaboration_voice.html
View file @
d12c2257
...
...
@@ -54,7 +54,7 @@
<div
id=
"userProfileModalInCollaboration"
></div>
<div
id=
"modal_collabo_profile2"
></div>
<!-- ユーザー追加オーバーレイ -->
<div
id=
"add_user_list"
></div>
<div
id=
"add_user_list"
></div>
<div
id=
"modal_add_user_confirm"
></div>
<!-- ホスト変更モーダル -->
<div
id=
"modal_collabo_change_host"
></div>
...
...
@@ -78,11 +78,15 @@
<script
src=
"./js/chat-ui.js"
></script>
<script
src=
"./js/chat-util.js"
></script>
<script
src=
"./js/chat-db.js"
></script>
<script
src=
"./js/chat-db-foriOS.js"
></script>
<script
src=
"./js/language.js"
></script>
<script
src=
"./js/language_ko.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/language_ja.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/language_en.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/chat-websocket.js"
></script>
<script
src=
"./js/chat-websocket-message.js"
></script>
<script
src=
"./js/chat-websocket-refresh-group-list.js"
></script>
<script
src=
"./js/chat-websocket-refresh-user-list-in-group.js"
></script>
<script
src=
"https://biztaskyell.abookcloud.com/coview_api.js"
></script>
<script
src=
"./js/share.js"
></script>
<script>
...
...
@@ -103,7 +107,7 @@
let
collaborationJoinFlg
=
0
;
let
roomType
;
if
(
typeof
(
android
)
!=
"undefined"
)
{
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
getLoginParameter
();
android
.
getGlobalParameter
();
roomType
=
android
.
getRoomType
();
...
...
@@ -132,7 +136,7 @@
globalUserInfo
.
coWorkType
=
CollaborationTypeKey
.
AUDIO
;
if
(
collaborationJoinFlg
!=
'2'
)
{
CHAT_SOCKET
.
connectSocket
();
socket
.
emit
(
'join'
,
CHAT
.
globalLoginParameter
,
function
()
{
socket
.
emit
(
'join'
,
CHAT
.
globalLoginParameter
,
function
()
{
});
}
};
...
...
public_new/collaboration_whiteboard.html
View file @
d12c2257
...
...
@@ -54,7 +54,7 @@
<!-- ユーザー追加オーバーレイ -->
<div
id=
"add_user_list"
></div>
<div
id=
"modal_add_user_confirm"
></div>
<div
id=
"modal_add_user_confirm"
></div>
<!-- オーバーレイ メニュー -->
<div
id=
"collaboration_picture_overlay_menu"
></div>
...
...
@@ -136,11 +136,15 @@
<script
src=
"./js/chat-ui.js"
></script>
<script
src=
"./js/chat-util.js"
></script>
<script
src=
"./js/chat-db.js"
></script>
<script
src=
"./js/chat-db-foriOS.js"
></script>
<script
src=
"./js/language.js"
></script>
<script
src=
"./js/language_ko.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/language_ja.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/language_en.js"
charset=
"UTF-8"
></script>
<script
src=
"./js/chat-websocket.js"
></script>
<script
src=
"./js/chat-websocket-message.js"
></script>
<script
src=
"./js/chat-websocket-refresh-group-list.js"
></script>
<script
src=
"./js/chat-websocket-refresh-user-list-in-group.js"
></script>
<script
src=
"https://biztaskyell.abookcloud.com/coview_api.js"
></script>
<script
src=
"./js/share.js"
></script>
<script>
...
...
@@ -162,7 +166,7 @@
let
collaborationJoinFlg
=
0
;
let
roomType
;
if
(
typeof
(
android
)
!=
"undefined"
)
{
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
getLoginParameter
();
android
.
getGlobalParameter
();
roomType
=
android
.
getRoomType
();
...
...
@@ -190,7 +194,7 @@
globalUserInfo
.
coWorkType
=
CollaborationTypeKey
.
BOARD
;
if
(
collaborationJoinFlg
!=
'2'
)
{
CHAT_SOCKET
.
connectSocket
();
socket
.
emit
(
'join'
,
CHAT
.
globalLoginParameter
,
function
()
{
socket
.
emit
(
'join'
,
CHAT
.
globalLoginParameter
,
function
()
{
});
}
};
...
...
public_new/contact.html
View file @
d12c2257
...
...
@@ -191,6 +191,7 @@
<script
src=
"./js/chat-ui.js"
></script>
<script
src=
"./js/chat-util.js"
></script>
<script
src=
"./js/chat-db.js"
></script>
<script
src=
"./js/chat-db-foriOS.js"
></script>
<script>
String
.
prototype
.
replaceAll
=
function
(
org
,
dest
)
{
return
this
.
split
(
org
).
join
(
dest
);
...
...
public_new/js/chat-db-foriOS.js
View file @
d12c2257
const
NATIVE_KEY_IOS
=
{
getBeforeRoomType
:
"getBeforeRoomType"
,
getRoomType
:
"getRoomType"
,
removeFavoriteUser
:
"removeFavoriteUser"
,
addFavoriteUser
:
"addFavoriteUser"
,
removeFavoriteGroup
:
"removeFavoriteGroup"
,
addFavoriteGroup
:
"addFavoriteGroup"
,
getCollaborationJoinFlg
:
"getCollaborationJoinFlg"
,
getUserInfoList
:
"getUserInfoList"
,
createContentView
:
"createContentView"
,
getToMoveGroupId
:
"getToMoveGroupId"
,
getJoinCollaborationType
:
"getJoinCollaborationType"
,
getHostRequestFlg
:
"getHostRequestFlg"
,
getRoomList
:
"getRoomList"
,
getMyInfo
:
"getMyInfo"
,
getMessages
:
"getMessages"
,
getFavoriteUsersNotInRoom
:
"getFavoriteUsersNotInRoom"
,
getFavoriteUsers
:
"getFavoriteUsers"
,
getFavoriteGroups
:
"getFavoriteGroups"
,
getMyGroupUsers
:
"getMyGroupUsers"
,
getGroupInfo
:
"getGroupInfo"
,
getGroupInfoForAddUser
:
"getGroupInfoForAddUser"
,
getSelectedUserList
:
"getSelectedUserList"
,
getNameCardData
:
"getNameCardData"
,
getMyGroupShopMemberByName
:
"getMyGroupShopMemberByName"
,
getMyGroupShopMemberNotInRoomByName
:
"getMyGroupShopMemberNotInRoomByName"
,
getAllGroupShopMemberByName
:
"getAllGroupShopMemberByName"
,
getAllGroupShopMemberNotInRoomByName
:
"getAllGroupShopMemberNotInRoomByName"
,
getGroupByName
:
"getGroupByName"
,
getUsersInRoom
:
"getUsersInRoom"
,
getArchiveList
:
"getArchiveList"
,
getArchiveByName
:
"getArchiveByName"
,
getArchiveDetail
:
"getArchiveDetail"
,
searchMessages
:
"searchMessages"
,
getMyGroupUsersNotInRoom
:
"getMyGroupUsersNotInRoom"
,
getUserInfo
:
"getUserInfo"
,
getUserListByLoginId
:
"getUserListByLoginId"
,
};
// ios用
function
callNativeApp
(
iosKey
,
jsonData
)
{
console
.
log
(
"callNativeApp called"
);
...
...
public_new/js/chat-db.js
View file @
d12c2257
includeJs
(
"./js/chat-db-foriOS.js"
);
// 名前空間
var
CHAT_DB
=
{};
includeJs
(
"./js/chat-db-foriOS.js"
);
//ロカールDBからルーム一覧情報を取得
CHAT_DB
.
getRoomList
=
function
(
roomType
,
keyWord
)
{
if
(
CHAT_UTIL
.
isIOS
())
{
...
...
public_new/js/chat-ui.js
View file @
d12c2257
...
...
@@ -945,19 +945,25 @@ CHAT_UI.refreshRoomList = function (roomType) {
}
var displayMsg;
//TODO 協業の場合処理追加必要
if (
room.messageType == MessageType.TEXT ||
room.messageType == MessageType.TEXT
)
switch (room.messageType) {
case MessageType.TEXT:
displayMsg = room.message;
if (room.messageType == MessageType.IMAGE)
break;
case MessageType.IMAGE:
displayMsg = getLocalizedString("image");
if (room.messageType == MessageType.VIDEO)
break;
case MessageType.VIDEO:
displayMsg = getLocalizedString("video");
if (room.messageType == MessageType.COMMUNICATIONSTART)
break;
case MessageType.COMMUNICATIONSTART:
displayMsg = getLocalizedString("collaboration_start");
if (room.messageType == MessageType.COMMUNICATIONEND)
break;
case MessageType.COMMUNICATIONEND:
displayMsg = getLocalizedString("collaboration_end");
break;
default:
break;
}
var attendUserName = [];
room.attendUsers.forEach(function (user) {
...
...
public_new/js/chat.js
View file @
d12c2257
...
...
@@ -402,6 +402,7 @@ document.addEventListener("DOMContentLoaded", function () {
$
(
"#searchMessage"
).
addClass
(
"onfocus"
);
$
(
".chat_list"
).
removeClass
(
"none"
);
});
$
(
".chat_room_src_form .cancel"
).
click
(
function
()
{
$
(
".nav_item_wrap"
).
removeClass
(
"none"
);
$
(
".footer-wrap"
).
removeClass
(
"none"
);
...
...
public_new/js/constant.js
View file @
d12c2257
...
...
@@ -110,3 +110,42 @@ const SOCKET_KEY = {
RETRY_JOIN_PROCESS
:
"retryJoinProcess"
,
JOIN
:
"join"
};
const
NATIVE_KEY_IOS
=
{
getBeforeRoomType
:
"getBeforeRoomType"
,
getRoomType
:
"getRoomType"
,
removeFavoriteUser
:
"removeFavoriteUser"
,
addFavoriteUser
:
"addFavoriteUser"
,
removeFavoriteGroup
:
"removeFavoriteGroup"
,
addFavoriteGroup
:
"addFavoriteGroup"
,
getCollaborationJoinFlg
:
"getCollaborationJoinFlg"
,
getUserInfoList
:
"getUserInfoList"
,
createContentView
:
"createContentView"
,
getToMoveGroupId
:
"getToMoveGroupId"
,
getJoinCollaborationType
:
"getJoinCollaborationType"
,
getHostRequestFlg
:
"getHostRequestFlg"
,
getRoomList
:
"getRoomList"
,
getMyInfo
:
"getMyInfo"
,
getMessages
:
"getMessages"
,
getFavoriteUsersNotInRoom
:
"getFavoriteUsersNotInRoom"
,
getFavoriteUsers
:
"getFavoriteUsers"
,
getFavoriteGroups
:
"getFavoriteGroups"
,
getMyGroupUsers
:
"getMyGroupUsers"
,
getGroupInfo
:
"getGroupInfo"
,
getGroupInfoForAddUser
:
"getGroupInfoForAddUser"
,
getSelectedUserList
:
"getSelectedUserList"
,
getNameCardData
:
"getNameCardData"
,
getMyGroupShopMemberByName
:
"getMyGroupShopMemberByName"
,
getMyGroupShopMemberNotInRoomByName
:
"getMyGroupShopMemberNotInRoomByName"
,
getAllGroupShopMemberByName
:
"getAllGroupShopMemberByName"
,
getAllGroupShopMemberNotInRoomByName
:
"getAllGroupShopMemberNotInRoomByName"
,
getGroupByName
:
"getGroupByName"
,
getUsersInRoom
:
"getUsersInRoom"
,
getArchiveList
:
"getArchiveList"
,
getArchiveByName
:
"getArchiveByName"
,
getArchiveDetail
:
"getArchiveDetail"
,
searchMessages
:
"searchMessages"
,
getMyGroupUsersNotInRoom
:
"getMyGroupUsersNotInRoom"
,
getUserInfo
:
"getUserInfo"
,
getUserListByLoginId
:
"getUserListByLoginId"
,
};
\ No newline at end of file
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