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
0b73c58f
You need to sign in or sign up before continuing.
Commit
0b73c58f
authored
Jun 04, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
アラート対応追加。
parent
37617ade
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
0 deletions
+12
-0
ABVJE_Res_Default_Android/res/values-ja/strings.xml
+1
-0
ABVJE_Res_Default_Android/res/values-ko/strings.xml
+2
-0
ABVJE_Res_Default_Android/res/values/strings.xml
+1
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java
+8
-0
No files found.
ABVJE_Res_Default_Android/res/values-ja/strings.xml
View file @
0b73c58f
...
@@ -1484,6 +1484,7 @@
...
@@ -1484,6 +1484,7 @@
<string
name=
"msg_invite_collaboration"
>
協業に招待されました。
</string>
<string
name=
"msg_invite_collaboration"
>
協業に招待されました。
</string>
<string
name=
"msg_wait_for_host"
>
ホストが文書を選択中です
</string>
<string
name=
"msg_wait_for_host"
>
ホストが文書を選択中です
</string>
<string
name=
"msg_rejected_by_host"
>
ホストの変更依頼は拒否されました。
</string>
<string
name=
"msg_rejected_by_host"
>
ホストの変更依頼は拒否されました。
</string>
<string
name=
"msg_invalid_parameters"
>
通信に失敗しました。チャットルームに戻ります。
</string>
<!-- 連続作業 -->
<!-- 連続作業 -->
<string
name=
"msg_error_all_process_delete"
>
全削除の送信に失敗しました。
</string>
<string
name=
"msg_error_all_process_delete"
>
全削除の送信に失敗しました。
</string>
...
...
ABVJE_Res_Default_Android/res/values-ko/strings.xml
View file @
0b73c58f
...
@@ -1492,4 +1492,5 @@
...
@@ -1492,4 +1492,5 @@
<string
name=
"msg_invite_collaboration"
>
협업에 초대되셨습니다.
</string>
<string
name=
"msg_invite_collaboration"
>
협업에 초대되셨습니다.
</string>
<string
name=
"msg_wait_for_host"
>
호스트가 문서를 선택중입니다.
</string>
<string
name=
"msg_wait_for_host"
>
호스트가 문서를 선택중입니다.
</string>
<string
name=
"msg_rejected_by_host"
>
호스트가 요청을 거절하셨습니다.
</string>
<string
name=
"msg_rejected_by_host"
>
호스트가 요청을 거절하셨습니다.
</string>
<string
name=
"msg_invalid_parameters"
>
통신에 실패했습니다. 채팅룸으로 돌아갑니다.
</string>
</resources>
</resources>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values/strings.xml
View file @
0b73c58f
...
@@ -1489,4 +1489,5 @@
...
@@ -1489,4 +1489,5 @@
<string
name=
"msg_invite_collaboration"
>
You are invited to collaboration.
</string>
<string
name=
"msg_invite_collaboration"
>
You are invited to collaboration.
</string>
<string
name=
"msg_wait_for_host"
>
Please wait for selecting document by host
</string>
<string
name=
"msg_wait_for_host"
>
Please wait for selecting document by host
</string>
<string
name=
"msg_rejected_by_host"
>
Rejected host request.
</string>
<string
name=
"msg_rejected_by_host"
>
Rejected host request.
</string>
<string
name=
"msg_invalid_parameters"
>
Communication failed. Return to the chat room.
</string>
</resources>
</resources>
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java
View file @
0b73c58f
...
@@ -388,6 +388,8 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
...
@@ -388,6 +388,8 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
mChatWebView
.
loadUrl
(
"javascript:$('#hostRequestModal').modal('hide');"
);
mChatWebView
.
loadUrl
(
"javascript:$('#hostRequestModal').modal('hide');"
);
mChatWebView
.
loadUrl
(
"javascript:$('#userNameCardInCollaboration').modal('hide');"
);
mChatWebView
.
loadUrl
(
"javascript:$('#userNameCardInCollaboration').modal('hide');"
);
message
=
getString
(
R
.
string
.
msg_rejected_by_host
);
message
=
getString
(
R
.
string
.
msg_rejected_by_host
);
}
else
if
(
message
.
contains
(
"Invalid Parameters"
))
{
message
=
getString
(
R
.
string
.
msg_invalid_parameters
);
}
}
final
String
tempMessage
=
message
;
final
String
tempMessage
=
message
;
...
@@ -411,6 +413,12 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
...
@@ -411,6 +413,12 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
}
else
if
(
tempMessage
.
equals
(
getString
(
R
.
string
.
msg_error_chat_join
)))
{
}
else
if
(
tempMessage
.
equals
(
getString
(
R
.
string
.
msg_error_chat_join
)))
{
getLogin
();
getLogin
();
finish
();
finish
();
}
else
if
(
tempMessage
.
equals
(
getString
(
R
.
string
.
msg_invalid_parameters
)))
{
if
(
roomId
!=
null
)
{
mChatWebView
.
loadUrl
(
String
.
format
(
"javascript:CHAT_UI.joinRoom('%s', '%s');"
,
roomId
.
toString
(),
roomName
.
toString
()));
}
else
{
mChatWebView
.
loadUrl
(
CHAT_PAGE_URL
);
}
}
}
}
}
});
});
...
...
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